From nobody Mon Apr 1 02:11:40 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4V7Dz131c8z5GxHQ; Mon, 1 Apr 2024 02:11: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 4V7Dz05tq1z49VT; Mon, 1 Apr 2024 02:11:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711937500; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=N38aq129gxwc9ngT595oPbzrsRZ0zJhGQOkGXSjU7oo=; b=JLN0cF831q7kMudNPjZRLz8WfM7cSkcC5s4xPMN0rw0vtUzatC5hJ8zpsf/vA29GcOdwEh Brl9bw7Dtbami0HobTpc6cxxNlxb/JPFaGdKyC8ykSYpCm2zS9yEQnfB3WEyW8w5eT46L1 sNpO6MukiVjcnqaq7Z7eeLqWHU8kUoasdFrRgnl7kZHthYkkNrTv0cAw0RaCIKdfD6LnR7 H8U0jzxh+QcVq0iWY4YnmJXJmLnKtiN19ZhKaGlDfsWIWpfZrCENfwlBnTcU32eXezacs/ g4ZcDUre/C48cpLWZy4qms7DBCzdctjIO2NvSQB9/sas2ekpetdtfhVt57yWHA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711937500; a=rsa-sha256; cv=none; b=I9YwR0ELLjr9hv1RkUp6giCLhJm1LkF2qtYcES9jkvDxx5MYerIHGg2zqfDKzGR+5mGSvL 88ceF2hbD2KQi3bk5QxaUPSEOTjQIhX/gEnXmsYaSfQ8ZhA1lgJbKoWHn0dAE6TvXY93su L86kUX3DSTYTex2BloxZFiAk7PP2U4VCayiwGJviBZYGJMMeMF8d7ak1Z85dt0/9v/dY0a mxzu17YjjTXRuzAD/QgRqCHtfrlo3V2n3i+z6yPUJDStcLlyTRVS9z0d8dZOOWALrOHhU2 Uy741d0ODQxkcfZzB8m9GUXpGuPKsHF1PzySU5wjA7VU4G2sgjJ/CgqlOXtLXw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711937500; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=N38aq129gxwc9ngT595oPbzrsRZ0zJhGQOkGXSjU7oo=; b=HWI/uAnZET4WoBRmQtR3puLaZe9yVAANfSGiMoNNEFL+5th0ARAGcT5ODtCLvf/TykufhI XE3JdyidpPp1E3Pqcm1qYryoDcFXMEluvKEZRItuxr0alxbDwQgMmuHoR7dLpVz1zH+yzM V8DGRJ9iC4s9wRByzktYAW30H8h58o8Y9PX8vhNCGKunkpOHM3HUZhnaMKJqANCVnYyXcL spqxlLL+m0lKRm2gPn+XlZbOx6aB6Q64HczoiBHDyTOPnvyzEDNM4AFYM1KOs4IDjDEh3x 3Em1tJRtw/xeMkTWbFKbg5VRNOr0EySkwbyYCZ7oJodmTQNAbS9DqrKX+ccVpA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4V7Dz05PWNz13F4; Mon, 1 Apr 2024 02:11: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 4312BeBv090808; Mon, 1 Apr 2024 02:11:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4312BepR090805; Mon, 1 Apr 2024 02:11:40 GMT (envelope-from git) Date: Mon, 1 Apr 2024 02:11:40 GMT Message-Id: <202404010211.4312BepR090805@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: 71f16d2efe7e - stable/14 - nfsd.8: Document ways to minimize Copy operation times List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rmacklem X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 71f16d2efe7e9e6ba15620d5ecf6c22051feebfd Auto-Submitted: auto-generated The branch stable/14 has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=71f16d2efe7e9e6ba15620d5ecf6c22051feebfd commit 71f16d2efe7e9e6ba15620d5ecf6c22051feebfd Author: Rick Macklem AuthorDate: 2024-03-18 22:40:41 +0000 Commit: Rick Macklem CommitDate: 2024-04-01 02:10:40 +0000 nfsd.8: Document ways to minimize Copy operation times For NFSv4.2, a Copy operation can take a long time to complete. If there is a concurrent ExchangeID or DelegReturn operation which requires the exclusive lock on all NFSv4 state, this can result in a stall of the nfsd server. This patch documents ways to avoid this problem. This is a content change. (cherry picked from commit 8f13abb4fd2f3c5d25bde830607a4aec6cec42d9) --- usr.sbin/nfsd/nfsd.8 | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/usr.sbin/nfsd/nfsd.8 b/usr.sbin/nfsd/nfsd.8 index 0a9f6f82c85f..1c04bad3a042 100644 --- a/usr.sbin/nfsd/nfsd.8 +++ b/usr.sbin/nfsd/nfsd.8 @@ -27,7 +27,7 @@ .\" .\" @(#)nfsd.8 8.4 (Berkeley) 3/29/95 .\" -.Dd March 22, 2023 +.Dd March 16, 2024 .Dt NFSD 8 .Os .Sh NAME @@ -355,3 +355,25 @@ to be set to one on the MDS as a workaround. Linux 5.n kernels appear to have been patched such that this .Xr sysctl 8 does not need to be set. +.Pp +For NFSv4.2, a Copy operation can take a long time to complete. +If there is a concurrent ExchangeID or DelegReturn operation +which requires the exclusive lock on all NFSv4 state, this can +result in a +.Dq stall +of the +.Nm +server. +If your storage is on ZFS without block cloning enabled, +setting the +.Xr sysctl 8 +.Va vfs.zfs.dmu_offset_next_sync +to 0 can often avoid this problem. +It is also possible to set the +.Xr sysctl 8 +.Va vfs.nfsd.maxcopyrange +to 10-100 megabytes to try and reduce Copy operation times. +As a last resort, setting +.Xr sysctl 8 +.Va vfs.nfsd.maxcopyrange +to 0 disables the Copy operation. From nobody Mon Apr 1 02:17:16 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4V7F5S2hcbz5GxlT; Mon, 1 Apr 2024 02:17:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4V7F5S1tzdz4BsG; Mon, 1 Apr 2024 02:17:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711937836; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=x0y1Rk67ZktnnbzUn/SdhCuMpvd1OfPhPLedj8bPc80=; b=I/v95hBAvZM3Me2vxn3kQbhTGj7S/d8EE41t8dGL3Wj8nouKzOY/x1x7orUvgzUK51gQNR M6GL7QE1+8FMTZUrlvdNtpoioyJB2bz3+5Bbtbx8jvSJT0JRCEAted/PHFpoeNyz3o6LSB W1hJDHEGJ52/TbkQ9/oNH5olLwTbV4fbiewMishxmPhvg9AVj57XZmy8f8wETF1zB7GiJC +02yukxwSvtylGQAxofaF3PvowlZxjrCVivGP+m4bvRd7P+sXCuWPxAJ+lW5LiDa3JB25L D3qbCyodsoiDjisN+zz5kFQlnTjQA5vE0InzTCLW3jZbNBun8Tp8dw9zoWYFkg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711937836; a=rsa-sha256; cv=none; b=S8jFdvUKu18656JOJtUyCTBavXK5al9sjx3kOEAaV/MP/3LnHbGlsxsKAzCXA1uchwimRs V84vLL6baMa657G0ARDvIpJhsat3Aq6kbWHZLLv8k9ZlWndxqEix+FPS9pdNaLiFf1QKip eVilB2i4m3dDACz4Wau4Tdvn0HQuGWRkrMCABGIdW8eHlMfwZAAdv6dIoQHC+NLNUNSBXk 6xMtuuIqzDpmYKhoOGnL6QIbVeRyYryji9NggnL/paOn7m4vICvTaPElLYndOlpVFM7bXO Sc1tHMPv4+4SZssbbZnMl5E0XOACK04wD5k7K7abLeBHa7GgDErhbqDr5yEu0w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711937836; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=x0y1Rk67ZktnnbzUn/SdhCuMpvd1OfPhPLedj8bPc80=; b=kstxErgzP8hQVKqTSmmCZFqRBA5KRwOPLU96A54yRTHZD6KsQt/8t7FnCxUlGch3FSeUJf F8qnIytMcSvUYSkVhzLRSI7TX74XWvZIQCy2EStvcKsbeblfJ4fzTFrOmw0X31gpn/z+OR 16CCYMm/BW3Tw51PJZTLjWLDISsc/+tWyHdrwj9qIcPlao+3PupI5QUns4KoL/aep9P9l5 eoD9MbZIt35aETcX9qi+HLns1Hm/3UpWodYCxWPytSAkN/5P0mAA7dSY2Nrje0GPlAuJl8 iXBLkRqnYbaAmgV5LhMG313HnGcQ1oVvmxKL2r1Kg9NMkibkXRhSBv12s7niBA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4V7F5S1VlKz12pV; Mon, 1 Apr 2024 02:17:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 4312HGe3093509; Mon, 1 Apr 2024 02:17:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4312HGRp093506; Mon, 1 Apr 2024 02:17:16 GMT (envelope-from git) Date: Mon, 1 Apr 2024 02:17:16 GMT Message-Id: <202404010217.4312HGRp093506@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: 23a48a469a4e - stable/13 - nfsd.8: Document ways to minimize Copy operation times List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rmacklem X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 23a48a469a4e6ce7b69620084513a7bf9b0fb939 Auto-Submitted: auto-generated The branch stable/13 has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=23a48a469a4e6ce7b69620084513a7bf9b0fb939 commit 23a48a469a4e6ce7b69620084513a7bf9b0fb939 Author: Rick Macklem AuthorDate: 2024-03-18 22:40:41 +0000 Commit: Rick Macklem CommitDate: 2024-04-01 02:16:36 +0000 nfsd.8: Document ways to minimize Copy operation times For NFSv4.2, a Copy operation can take a long time to complete. If there is a concurrent ExchangeID or DelegReturn operation which requires the exclusive lock on all NFSv4 state, this can result in a stall of the nfsd server. This patch documents ways to avoid this problem. This is a content change. (cherry picked from commit 8f13abb4fd2f3c5d25bde830607a4aec6cec42d9) --- usr.sbin/nfsd/nfsd.8 | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/usr.sbin/nfsd/nfsd.8 b/usr.sbin/nfsd/nfsd.8 index 0a9f6f82c85f..1c04bad3a042 100644 --- a/usr.sbin/nfsd/nfsd.8 +++ b/usr.sbin/nfsd/nfsd.8 @@ -27,7 +27,7 @@ .\" .\" @(#)nfsd.8 8.4 (Berkeley) 3/29/95 .\" -.Dd March 22, 2023 +.Dd March 16, 2024 .Dt NFSD 8 .Os .Sh NAME @@ -355,3 +355,25 @@ to be set to one on the MDS as a workaround. Linux 5.n kernels appear to have been patched such that this .Xr sysctl 8 does not need to be set. +.Pp +For NFSv4.2, a Copy operation can take a long time to complete. +If there is a concurrent ExchangeID or DelegReturn operation +which requires the exclusive lock on all NFSv4 state, this can +result in a +.Dq stall +of the +.Nm +server. +If your storage is on ZFS without block cloning enabled, +setting the +.Xr sysctl 8 +.Va vfs.zfs.dmu_offset_next_sync +to 0 can often avoid this problem. +It is also possible to set the +.Xr sysctl 8 +.Va vfs.nfsd.maxcopyrange +to 10-100 megabytes to try and reduce Copy operation times. +As a last resort, setting +.Xr sysctl 8 +.Va vfs.nfsd.maxcopyrange +to 0 disables the Copy operation. From nobody Mon Apr 1 03:36:17 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4V7Grf3X7gz5FMpG; Mon, 1 Apr 2024 03:36:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4V7Grd6tS4z4HnM; Mon, 1 Apr 2024 03:36:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711942578; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gtLKmMbD4wwJFb78iOIpT1Rcg+6WVx0MaoMvrcr3vcI=; b=YRoAVJkN/p3aOPuYQAqR6/X2spmtT/aCSR1Gb0GQmJvjGOuhQuQc/C0slSohakuummMQ2C pmYNtVPPqNBixMSDJUwXCpufMHCGi/wOTN9R+07K+UQjoUoSJpqyEfi0UksWby3v93bXi2 RN04KFGWfPjpom8yYbeUVNvgkm9FOhf6uYQCdvA/Qn8EEgKfOyagcnXOTUYzPAKNksrelX jYn501nIYB8wq/JnbeCp1q4NBDAD+WTi3cTWlPuwBR+Y0vd8/nfEQcdA9Bndp3duZYKq0y TPLLkuM8q3GG+/4pUSpRGf7c6HOTSNIonl/g5B27syI1a69hszGYPEYZ5tseSQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711942578; a=rsa-sha256; cv=none; b=ANQu89IB60utC2RxXSTCvZ/6ooZ5zeui+RWAP43qhEyMwCf2bNK2HnT67Yzm+po7//TEO1 K0OjM/7VulrUCpy+hk0CYcMXMmywGRt7VHRbi/lWB5fHJbuHw1NEp+VCc+JYhgYjCgz5Wd AbMnYXn4PiHDwISF9jUXACqNE3RPAF2SLfPo/d3dEAr4mHkgET6oJAKPtRm9KxlngrWFBf xFXD0nWZ3DufBw6vcJuz1UkRRp5ZvrPBc5VgwKacPyGrOxBRTdKHCwC3QV94mHxsGtFgji wvH1WrC8wnxFdBGMGCsjIetVqAsaq54lt7xJHFHTT9uld9Qn1T5hlRvxVymLaQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711942578; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gtLKmMbD4wwJFb78iOIpT1Rcg+6WVx0MaoMvrcr3vcI=; b=DtOEvAZohpV5XngJ17Hj8DxCIvt7haWtjIBoTy6fI5OwBzZ5BtV9ww9iztFPZjSJEuRhLU /SbBaJ6aXgFxvkAo+eBQ0dce4zte92ADuGo7vI6ZzQPTWQ8HU8Z7E9hLJM3jGQs6QxFwCg IxeUPMQbaoQhG7ER1tHohrmZW7rNkmqcJZ03axrTn5DwFmy5RuTXGFaYkk3Qv7vnPjX5Gd GeV370nek1d96K92Y6kk+dDe8wzwGEfUSEzReuiWjWDrID/x366qUT7RGlizEixdGXcpo8 5XrkN4b3DDm+h8KlS2j3qscWoirqdLxu0PxKqgCx8NVBmM64FpQ/yxkD8US2lQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4V7Grd6VJVz15RZ; Mon, 1 Apr 2024 03:36: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 4313aHDG030575; Mon, 1 Apr 2024 03:36:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4313aHGJ030572; Mon, 1 Apr 2024 03:36:17 GMT (envelope-from git) Date: Mon, 1 Apr 2024 03:36:17 GMT Message-Id: <202404010336.4313aHGJ030572@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Eugene Grosbein Subject: git: 319a5d086b50 - main - if_bridge: use IF_MINMTU List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: eugen X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 319a5d086b50f38618b62c78e83b12931f00b508 Auto-Submitted: auto-generated The branch main has been updated by eugen: URL: https://cgit.FreeBSD.org/src/commit/?id=319a5d086b50f38618b62c78e83b12931f00b508 commit 319a5d086b50f38618b62c78e83b12931f00b508 Author: Eugene Grosbein AuthorDate: 2024-04-01 03:31:51 +0000 Commit: Eugene Grosbein CommitDate: 2024-04-01 03:35:59 +0000 if_bridge: use IF_MINMTU Replace incorrect constant 576 with IF_MINMTU to check for minumum MTU. This unbreaks bridging tap interfaces with small mtu. MFC after: 1 week --- sys/net/if_bridge.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/net/if_bridge.c b/sys/net/if_bridge.c index fe5de468bf28..31758733adb1 100644 --- a/sys/net/if_bridge.c +++ b/sys/net/if_bridge.c @@ -960,7 +960,7 @@ bridge_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data) case SIOCSIFMTU: oldmtu = sc->sc_ifp->if_mtu; - if (ifr->ifr_mtu < 576) { + if (ifr->ifr_mtu < IF_MINMTU) { error = EINVAL; break; } From nobody Mon Apr 1 07:34:35 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4V7N7c0JYYz5Fqk5; Mon, 1 Apr 2024 07:34:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4V7N7b6WjGz4k6B; Mon, 1 Apr 2024 07:34:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711956875; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4Dux3zrwOGtt5R3l+cIy7iNZBn7eWD7GPIzfQC2DjPc=; b=e+So13rsYvwe2YwSip2YQ1fMUv6RcVNfLqzp4IEx+DBxzSiwQl4PH2749DD/Qer/19uG9F WJDW7YUNfpsCOMLs5qoXqoVxlvxN4uhMvt8Gpr1YK8otX5GbJmjDK+XouD9UC87fpPtKbi BaeLuMrnyRCAFtTiDsbdDn/LQhiOu/Sc/t1FAElOmRS8UcCukrPwFTW9lDWJUsQuIZNGIt Sqb2VGtbih0qlYZD6CLiyqN0C6wssf8wWuyXvUFfxISpNwsCvggZ09vW5xF8XHGTYEIvbY 1/l5WBU/OMxb9w5e1Id+yliZqPr1UqrnQwvEKTUNie64Avg7UOnQAA+l/sDEvg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711956875; a=rsa-sha256; cv=none; b=gBtxi6mSljWfsBhgljTBy0ZQuvIzNLsXm+4PknbIXR8O+zqI0R6hKJgS5q0QsDwVveQkAT F/QjismOFzICSSFQAM2rH4EY3T0EWg158B4p+ZREJkZ+x4vZlwpRp8T5IuhbmouAcAt42i G50uBT/OQFRigIsGuuq4uOs/7jyNPufp/pcatoigJuSQY4Wtpsaec9Kdo+Ezndbc+b/cYj agJnpw8wuri+RmXYC2aX9jKxsCoHpA7Pa9ktPotnVVV9cxIu0Z16Y1v3dhuAR/jfEhBSyz h661O1qpPYPdPAM1l/58mvIPI3THm4MpUciY5T9H0A1yqKC2mXoBs0cWyHSYPA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711956875; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4Dux3zrwOGtt5R3l+cIy7iNZBn7eWD7GPIzfQC2DjPc=; b=oOovrqnoogKAoyZl0a2s93JbXmxRaLgooMFuSq2HlSdtQdM1AIiFnWA3R2m21qharPs1UF xGzmyATtQ56hmdBRWnWGPVFJSnEflp5Cf8WNP4uR+b665OmzbmIKbWoVebfMtV+X5q49vY MDogYRUKs+JtMnbylNFrAA7g4KUxZUMBLDlk2aIGl8W1Cjk12FPxlqlJlUw8E7udBr+l/R YkIbVCwsQS9LvCdk80+vqob8YuwvdT+naPWrmL2czZv1+gArJzRNb7/lFfcRDmLw+1dzKE 3GUhpYxQK8jCMYQ6+LTjqyPsASdoV4Sd6QbbgBnZa3/wTKXHGIc64UVKJ6Boew== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4V7N7b67CWz1Bym; Mon, 1 Apr 2024 07:34:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 4317YZnT037611; Mon, 1 Apr 2024 07:34:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4317YZke037607; Mon, 1 Apr 2024 07:34:35 GMT (envelope-from git) Date: Mon, 1 Apr 2024 07:34:35 GMT Message-Id: <202404010734.4317YZke037607@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: 0ade521bac78 - stable/13 - pfsync: fix use of invalidated stack variable List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 0ade521bac78929941081b6757e45316befd79f7 Auto-Submitted: auto-generated The branch stable/13 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=0ade521bac78929941081b6757e45316befd79f7 commit 0ade521bac78929941081b6757e45316befd79f7 Author: Kristof Provost AuthorDate: 2024-03-24 08:46:31 +0000 Commit: Kristof Provost CommitDate: 2024-04-01 07:33:36 +0000 pfsync: fix use of invalidated stack variable Calls to pfsync_send_plus() pass pointers to stack variables. If pfsync_sendout() then fails it retains the pointer to these stack variables, accesing them later. Allocate a buffer and copy the data instead, so that we can retain the pointer safely. Reported by: CI KASAN, markj MFC after: 1 week (cherry picked from commit 81debbd60e5773e812e9227a2003ea88699580be) --- sys/netpfil/pf/if_pfsync.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/sys/netpfil/pf/if_pfsync.c b/sys/netpfil/pf/if_pfsync.c index 939a4d5451a9..a08a8334683a 100644 --- a/sys/netpfil/pf/if_pfsync.c +++ b/sys/netpfil/pf/if_pfsync.c @@ -419,6 +419,9 @@ pfsync_clone_destroy(struct ifnet *ifp) MPASS(TAILQ_EMPTY(&b->b_deferrals)); PFSYNC_BUCKET_UNLOCK(b); + free(b->b_plus, M_PFSYNC); + b->b_plus = NULL; + callout_drain(&b->b_tmo); } @@ -1557,6 +1560,7 @@ pfsync_drop(struct pfsync_softc *sc) } b->b_len = PFSYNC_MINPKT; + free(b->b_plus, M_PFSYNC); b->b_plus = NULL; } } @@ -1669,6 +1673,7 @@ pfsync_sendout(int schedswi, int c) bcopy(b->b_plus, m->m_data + offset, b->b_pluslen); offset += b->b_pluslen; + free(b->b_plus, M_PFSYNC); b->b_plus = NULL; } @@ -2287,13 +2292,21 @@ pfsync_send_plus(void *plus, size_t pluslen) PFSYNC_BUCKET_LOCK(b); + MPASS(b->b_plus == NULL); + if (b->b_len + pluslen > sc->sc_ifp->if_mtu) pfsync_sendout(1, b->b_id); - b->b_plus = plus; + b->b_plus = malloc(pluslen, M_PFSYNC, M_NOWAIT); + if (b->b_plus == NULL) + goto out; + + memcpy(b->b_plus, plus, pluslen); b->b_len += (b->b_pluslen = pluslen); pfsync_sendout(1, b->b_id); + +out: PFSYNC_BUCKET_UNLOCK(b); } From nobody Mon Apr 1 07:34:36 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4V7N7c3Ydrz5FqpY; Mon, 1 Apr 2024 07:34:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4V7N7c2ncJz4kMP; Mon, 1 Apr 2024 07:34:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711956876; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BhoVhRDOmuklbYJafNPgym+h00R78tBluonLl1lYlmI=; b=vdKVP3OOJ8QGZnHD5E2H5Lr0Xui/tF5yg6pCx5o9vs2v2oyy5zP/QOfn9d1oY0q2OGoL3X 8dLGVKFBbY05a381eSv1qgzhSWHO8U/Ir0k3SpwEsrTMo1/orMc0+7sVUHYQ8b6UjuHK1z BN36I0plzrJc212CfDWW47eKyfqB85KydbCfTQ8rJVJXx6E0EJ8Kp5gEwXR/wQs8ocVdCd JDGVTmS48HBUdJJykLg9I+ynEZjOxJ8U9xfTr3/afeIpeuzZRAvKCO8LUkTz8jzhTLGBt9 ML+Q+cIIAZRF5jU0EJ019XMzXSYVGzWIh+JLOuQW36w8ZqSYc5YdyyVvV9y0HA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711956876; a=rsa-sha256; cv=none; b=QvA93uDRksO08lFq6ZtYSS2wyOj3wET6NkSBoiwtdC7wv+YJTK4Y6iokKHhiWz5HgtQtRi DKYafQVCEvq8p7gB7mVUoKDpyHLcCtULg2Hn0HacHhqfQFioAogh/j7IQc14dNSc5A156R NE7lXAY3f+f9BOA/SR/nx4Wppn7dadzoaIL1V2qQMzFdRUobZSIgGIv6DKK6J6B6tr2jSk EHYzYdv1sWHQeR89R+Zf7gzP7kURPYMcAUFrt4oHA6Vkodpe/TImGNrYxw4MiaWwDctvqK YxMehYn1GOEYVGeT+dXcwvhQvmwHlA2RxZNf0uDwApgU337kMpyX4BfvXnq4KA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711956876; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BhoVhRDOmuklbYJafNPgym+h00R78tBluonLl1lYlmI=; b=cmx6CguvB7BVECXY1ePxVqRCZ09qWo0IiV5oG2AJC+tcy8MyRRzoscHVreumii1MNxwMfg DQhIh1n9cZcqV2V2oGcj3qLT1+Z7xRRQk90dATetGF3y3hj8PBS+ahDeA6GqrK7Xe/djaG dCcbVfqn6iblB/FzMTorAAQh9IymhHp3PvqAZEO8XvSkXX44Y2lEX4TvXMetbnZTpdgZ9D mHSKC9U8qxFBLIcM63LD7ytep2LNnVq3XHcQ2ZAqojLCwxPPhXE6bWLtkQZGw7I2S4U455 Fzhut+XxjlGsEcUH030M30NMBsd7edE4G7Bz8Tiz5DBA9MPtcwPT9U9Rt8DXIQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4V7N7c2Nnpz1C8Y; Mon, 1 Apr 2024 07:34:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 4317YaG1037708; Mon, 1 Apr 2024 07:34:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4317YaWQ037705; Mon, 1 Apr 2024 07:34:36 GMT (envelope-from git) Date: Mon, 1 Apr 2024 07:34:36 GMT Message-Id: <202404010734.4317YaWQ037705@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: 2fed983ceb66 - stable/14 - pf: fix use-after-free List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 2fed983ceb6678fbe2facb20627248a5fae6cf7a Auto-Submitted: auto-generated The branch stable/14 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=2fed983ceb6678fbe2facb20627248a5fae6cf7a commit 2fed983ceb6678fbe2facb20627248a5fae6cf7a Author: Kristof Provost AuthorDate: 2024-03-23 16:02:50 +0000 Commit: Kristof Provost CommitDate: 2024-04-01 07:33:32 +0000 pf: fix use-after-free If we fragment the packet in pf_route() the first transmitted packet will free the pf_mtag we have stored in pf_pdesc (pd). Ensure we update that pointer for every packet to avoid using a freed pointer in pf_dummynet_route(). Reported by: CI KASAN, markj MFC after: 1 week (cherry picked from commit a1ecbc57011758257b85c3e9f51efc93ac93169d) --- sys/netpfil/pf/pf.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c index e19370cc7333..b0b0a02afaf4 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -7374,6 +7374,7 @@ pf_route(struct mbuf **m, struct pf_krule *r, struct ifnet *oifp, if (error == 0) { m_clrprotoflags(m0); md = m0; + pd->pf_mtag = pf_find_mtag(md); error = pf_dummynet_route(pd, s, r, ifp, sintosa(&dst), &md); if (md != NULL) From nobody Mon Apr 1 07:34:36 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4V7N7d2NRrz5Fqxl; Mon, 1 Apr 2024 07:34: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 4V7N7d0QZgz4kGH; Mon, 1 Apr 2024 07:34:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711956877; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DCELliUr/OHnQbBUgtDozNb9GJ2IxZNck/o6hfiIBzc=; b=oGXh/V6B0ggqaPBg86z50khVuF78/goFopON/aCKua5QMmw9obWb7M/xw2vRwWcNs5TSpO DSom77vvTRuTvSvL5o00gRmmJCVNe9Hu9WU4TpGrO0+DMR9biyIdLapnuiFS7/xULngG+x wTdxzN/7RUKntvgdHmURSWfo6qSWf74xDhr/C83dJQ0LybKtyk4CFt4Ce5Ci9Fd37x1wrs FCrkG2IJ7kDoNZX4veaAJRrLRAz5bWQfBggsEq+TepT2EhCszRej2salbRta71Tzv7V8OG 7DNlha9imRKTGYcc5LqgQuhYkskAoUF7JBF1IPtqrJWUhvi+w2/hOadsZFZl/Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711956877; a=rsa-sha256; cv=none; b=BAHjOxcSwDm4dTlj/FbnRhjYATiiPpup0xjKqyIx4T/p7bD92YrB16+krwSJ1TtzCggZIa yeQa4EBhtvJT9OKgJgSdc9mpfWg19UzkNxRcoP+VV8da9PRgZgpfwNX4yaseYDbTfzB2Il SCP+G45e/LqkKJeOcNXEeXQuSe5REqeYmlkNBoPqCzIB3Y2WsuowG65rJNiWi0gPdLikP1 OpY8bPyViXQ9BbpUVKyNKQl+pUW5rE9TXoXMO5yYEeMFiVeVfbR/9aNL5MdhgdACihIjL/ Nq3tpD6LQbkrKLwNhNCOPLVSskLBpSlDEqgvuH3GWm9rWMOOl0hxJSentV6mLw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711956877; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DCELliUr/OHnQbBUgtDozNb9GJ2IxZNck/o6hfiIBzc=; b=L8nM+lpqY99Oi1xHCs5bXevv96qvOaQ4MkD5SdhLspFSIyD2NI2wPHW+kyCDCSlR7n6OWK SprK4jFp0Ik9cfjrsK/75kcnBLWqApMCfbRHUABEDT6Lj2qf2rhQmjk9nxu7Az760CTUJp Uo+YWLVt1NmLMqm+JoSqWbK5anE7NOf0stPe/RRjy+mUIrbv41keL7lbURt3GJO5a5pwyC eujhaj6Bwfu/dOlTGzcPMihmwqyYQRA6RqQpgEAQ6NlcFvtkUuC/KQLQ64wODO4BWamnMz g2amD35Fp552MNNGU1eDN4NdzveDrBlnAbd2JQcpcxHSj9RgqdCaXz0UY0vq3Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4V7N7d02zRz1CXD; Mon, 1 Apr 2024 07:34: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 4317YaXt037756; Mon, 1 Apr 2024 07:34:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4317YaQd037753; Mon, 1 Apr 2024 07:34:36 GMT (envelope-from git) Date: Mon, 1 Apr 2024 07:34:36 GMT Message-Id: <202404010734.4317YaQd037753@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: e0a58ef24a3b - stable/13 - pfsync: cope with multiple pending plus messages List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: e0a58ef24a3baf5ed4cc09a798b9fe2d85408052 Auto-Submitted: auto-generated The branch stable/13 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=e0a58ef24a3baf5ed4cc09a798b9fe2d85408052 commit e0a58ef24a3baf5ed4cc09a798b9fe2d85408052 Author: Kristof Provost AuthorDate: 2024-03-24 15:08:52 +0000 Commit: Kristof Provost CommitDate: 2024-04-01 07:33:36 +0000 pfsync: cope with multiple pending plus messages It's possible for pfsync to add a plus message when one is already queued. Append both, rather than overwriting the already pending one. MFC after: 1 week (cherry picked from commit caccf6d3c008d3c778986734c2705cdae849a877) --- sys/netpfil/pf/if_pfsync.c | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/sys/netpfil/pf/if_pfsync.c b/sys/netpfil/pf/if_pfsync.c index a08a8334683a..d4d3c521a568 100644 --- a/sys/netpfil/pf/if_pfsync.c +++ b/sys/netpfil/pf/if_pfsync.c @@ -202,7 +202,7 @@ struct pfsync_bucket TAILQ_HEAD(, pfsync_upd_req_item) b_upd_req_list; TAILQ_HEAD(, pfsync_deferral) b_deferrals; u_int b_deferred; - void *b_plus; + uint8_t *b_plus; size_t b_pluslen; struct ifaltq b_snd; @@ -421,6 +421,7 @@ pfsync_clone_destroy(struct ifnet *ifp) free(b->b_plus, M_PFSYNC); b->b_plus = NULL; + b->b_pluslen = 0; callout_drain(&b->b_tmo); } @@ -1562,6 +1563,7 @@ pfsync_drop(struct pfsync_softc *sc) b->b_len = PFSYNC_MINPKT; free(b->b_plus, M_PFSYNC); b->b_plus = NULL; + b->b_pluslen = 0; } } @@ -1675,6 +1677,7 @@ pfsync_sendout(int schedswi, int c) free(b->b_plus, M_PFSYNC); b->b_plus = NULL; + b->b_pluslen = 0; } subh = (struct pfsync_subheader *)(m->m_data + offset); @@ -2289,20 +2292,28 @@ pfsync_send_plus(void *plus, size_t pluslen) { struct pfsync_softc *sc = V_pfsyncif; struct pfsync_bucket *b = &sc->sc_buckets[0]; + uint8_t *newplus; PFSYNC_BUCKET_LOCK(b); - MPASS(b->b_plus == NULL); - if (b->b_len + pluslen > sc->sc_ifp->if_mtu) pfsync_sendout(1, b->b_id); - b->b_plus = malloc(pluslen, M_PFSYNC, M_NOWAIT); - if (b->b_plus == NULL) + newplus = malloc(pluslen + b->b_pluslen, M_PFSYNC, M_NOWAIT); + if (newplus == NULL) goto out; - memcpy(b->b_plus, plus, pluslen); - b->b_len += (b->b_pluslen = pluslen); + if (b->b_plus != NULL) { + memcpy(newplus, b->b_plus, b->b_pluslen); + free(b->b_plus, M_PFSYNC); + } else { + MPASS(b->b_pluslen == 0); + } + memcpy(newplus + b->b_pluslen, plus, pluslen); + + b->b_plus = newplus; + b->b_pluslen += pluslen; + b->b_len += pluslen; pfsync_sendout(1, b->b_id); From nobody Mon Apr 1 07:34:37 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4V7N7d6ZF0z5Fr0Y; Mon, 1 Apr 2024 07:34: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 4V7N7d3W4vz4kPY; Mon, 1 Apr 2024 07:34:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711956877; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0qnN7/yuOH52MwvQFhwI+E7e2FZPUFfeAlI+JHm5Idk=; b=stdtJGpYQNCr3gz1w2llC4x3YTkOl/UDyE6ZRnjJtkV8G3v83vWQ88Lej0Q0ABFSRFaRcB 8IyVP+buAO4QpqBECVvjVWmR5oGVmNfumewCFr47XlBT0smFtJpkhmkScGj9npJY7PQf2V 7AvlhrmwVKj4AqRwIsQnq47YwOjVKERFv9Q665rcaE9PWQShsds04VAhE7uzMwyLoQ/PAY 1cF8X2LtYACqNQ8nl1m3lA8ILaHabAxVBcjbtQWANYpH/tdN4APGbO7FhwplEUD8bPpZXE LGNJt18rEZD0N3TtBirW276aaX67teA2DNPgDsMmRDG+0++v/nyUswu8TsFabQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711956877; a=rsa-sha256; cv=none; b=gMi4bd31GfX5JoP2zFASPx0wSUA4/stuv3i+dKozVolIovuCQTtjyvvQk221s0GYtr4bki JQhUv3m+5NlyjyMefltExF3PF0dy10Wqv8EI1TnqNoPsUdqqufPl77qv1gmWH+fteHOLXD jLFQ2+w75X/Aux7q+/Qe4nmVfeevtIX3JEsqRWzT08k6CA/jfTooCL7+T9MlcRe7Y6pBLc KlZNOrkj2/Y0LhLTQYAfawcHrLSoqIVAtw/wcSSeXEnz4hUu8dtM74WMqKmFZIeFxgPBa9 gpq8s26tn4Lj3nmDL9JByH75V1HF9bYK1g2DNuHCrEmGXoaJEPwYTZiMXQTctA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711956877; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0qnN7/yuOH52MwvQFhwI+E7e2FZPUFfeAlI+JHm5Idk=; b=sz6qnvwLg7A92c+tDFOFe3Wn7JuZ+wr3NPdUjVmxAejWQc/GtxT1x0DCa0xiOK9lp7BG2U ZWu1d+jpgoRTvMXeg+V6VkYvvYSYXIOX3vVhrUL9zsH3jAHPb77ykt19F+OOHRqkn8/CJK vXWV03MVdPMyoHRemTPWY4be8oeQg+5leP3VeAecjWC8KBfk63Og76lGjIL9vFV+KbDqHn aXZDc66+TMCJ6/Om/CUGYJ6QISVHb1/1JLyl2ritjkdrTyyi3KO2fWORDqnH8ewoYd+PvV fH8JJwCsalSn5ug934H6K7oYM1lSkvVsY3mm3sX3y40Chex4FkPCCqGHSwaCgQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4V7N7d36kkz1Byn; Mon, 1 Apr 2024 07:34: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 4317YbnD037804; Mon, 1 Apr 2024 07:34:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4317Ybm5037801; Mon, 1 Apr 2024 07:34:37 GMT (envelope-from git) Date: Mon, 1 Apr 2024 07:34:37 GMT Message-Id: <202404010734.4317Ybm5037801@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: f5c0005567b4 - stable/14 - pfsync: fix use of invalidated stack variable List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: f5c0005567b4f029297ffc5b5c7c2925b2608ba1 Auto-Submitted: auto-generated The branch stable/14 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=f5c0005567b4f029297ffc5b5c7c2925b2608ba1 commit f5c0005567b4f029297ffc5b5c7c2925b2608ba1 Author: Kristof Provost AuthorDate: 2024-03-24 08:46:31 +0000 Commit: Kristof Provost CommitDate: 2024-04-01 07:33:32 +0000 pfsync: fix use of invalidated stack variable Calls to pfsync_send_plus() pass pointers to stack variables. If pfsync_sendout() then fails it retains the pointer to these stack variables, accesing them later. Allocate a buffer and copy the data instead, so that we can retain the pointer safely. Reported by: CI KASAN, markj MFC after: 1 week (cherry picked from commit 81debbd60e5773e812e9227a2003ea88699580be) --- sys/netpfil/pf/if_pfsync.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/sys/netpfil/pf/if_pfsync.c b/sys/netpfil/pf/if_pfsync.c index 41eab7be515d..5df5824c93b8 100644 --- a/sys/netpfil/pf/if_pfsync.c +++ b/sys/netpfil/pf/if_pfsync.c @@ -474,6 +474,9 @@ pfsync_clone_destroy(struct ifnet *ifp) MPASS(TAILQ_EMPTY(&b->b_deferrals)); PFSYNC_BUCKET_UNLOCK(b); + free(b->b_plus, M_PFSYNC); + b->b_plus = NULL; + callout_drain(&b->b_tmo); } @@ -1766,6 +1769,7 @@ pfsync_drop(struct pfsync_softc *sc) } b->b_len = PFSYNC_MINPKT; + free(b->b_plus, M_PFSYNC); b->b_plus = NULL; } } @@ -1906,6 +1910,7 @@ pfsync_sendout(int schedswi, int c) bcopy(b->b_plus, m->m_data + offset, b->b_pluslen); offset += b->b_pluslen; + free(b->b_plus, M_PFSYNC); b->b_plus = NULL; } @@ -2563,13 +2568,21 @@ pfsync_send_plus(void *plus, size_t pluslen) PFSYNC_BUCKET_LOCK(b); + MPASS(b->b_plus == NULL); + if (b->b_len + pluslen > sc->sc_ifp->if_mtu) pfsync_sendout(1, b->b_id); - b->b_plus = plus; + b->b_plus = malloc(pluslen, M_PFSYNC, M_NOWAIT); + if (b->b_plus == NULL) + goto out; + + memcpy(b->b_plus, plus, pluslen); b->b_len += (b->b_pluslen = pluslen); pfsync_sendout(1, b->b_id); + +out: PFSYNC_BUCKET_UNLOCK(b); } From nobody Mon Apr 1 07:34:38 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4V7N7f5bW3z5Fqpd; Mon, 1 Apr 2024 07:34: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 4V7N7f44fLz4kPf; Mon, 1 Apr 2024 07:34:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711956878; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XiiJ6KkCKWoyrNANwywbwhzpWXUwx6zyEW4YlL4zNBg=; b=fW+cCjABCWgu7afhUMRZiaCnMKqoisHVJBezz4mMYW77nO8i6kVfV9mK0UED6PuDHNe0gq eyDkls4BCBMDmpBBuaVNObGpw6jLw8bTpdU8bvirtoA6bmspeO/KpeV58KomRAwhbSc1b2 HctYYcSqC373HlPF3AVV3GysfJ3DSAk6PxY1OdNl8RsChh2tEtvukVxxo3bn8n6CaoE70I 5hMGTrlfSVexDyXsxw/T3hZWbMrMS/4b/AEyXYQNwG/GiC1eNgJ5Mx/+WUUNz2RItLyEI8 FjvyZPk3fUsLGjD33S9pRm2auum9WnX94agjyCzNSPb9G5Gc5kgQ77RZhnQZ5w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711956878; a=rsa-sha256; cv=none; b=yp6hK2dHWTg+Oy0s1fUj5XFFMtMHQreTdepdOs5vfj51C6MLMz6Z3/VzpgeZRTPdqbkqc+ 4h39IP9+tjO95wyi0kNlUPNLYhcWsO6ZbulBbKl+TMwXKQU1/2o9zBbCMFNh4TLSwBxFZD osrsp4S7E6atEoLxRVheCQpVqV3NkRr8qv8Tc7Ocn68ihgomiRhpP7XC3BY++qO8Z6Ngio dbM9rZ/e50Zc0EXJ+A9HA6YxmTNIrGyQawIjCLNj7S+RajT6iNG1bcmrG9Y2GcOhBXAfA+ 1agYyz3DJCpS1ApfEYZHxLSo9qho65DdFR6MoIBjO7GOxxwcgTleCzmjjTmcwQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711956878; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XiiJ6KkCKWoyrNANwywbwhzpWXUwx6zyEW4YlL4zNBg=; b=RUxWTcaVD6t7SouMP7rhz60Qxs/Cx6uriSG2LhwZQTTz7DFiwVJy4h7L/c4cZC9DjlU2RP yPVc5SWD2R+fk8SxQKTNqari/lePYTNqcHGVD24B+eWI9HS5yvrytuSRzSRS+v+aCYChd7 /IFyWKae7kF0RZCF0/dOpMnaXIaGdlGb3OJEQFBjNhyQcJoH71I4vWBa8h8jwDbTHc5hvr 83VCNzKrvLHgRdXREDHFToYby3H08rsAkaSedqBrWd1+Ej/oDvTy+hxPZxaOhDX5lcuKkz zNA+cugpt90LnTTls7ovp0IpTxT6NEV2z24uNdvYwkAX+w9OtK89ApjUg7+5wA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4V7N7f3hxcz1C44; Mon, 1 Apr 2024 07:34: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 4317Ycve037880; Mon, 1 Apr 2024 07:34:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4317YcMv037877; Mon, 1 Apr 2024 07:34:38 GMT (envelope-from git) Date: Mon, 1 Apr 2024 07:34:38 GMT Message-Id: <202404010734.4317YcMv037877@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: ab872ab0bf19 - stable/14 - pfsync: cope with multiple pending plus messages List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: ab872ab0bf195e872ed8d955aab3b2a537a230cd Auto-Submitted: auto-generated The branch stable/14 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=ab872ab0bf195e872ed8d955aab3b2a537a230cd commit ab872ab0bf195e872ed8d955aab3b2a537a230cd Author: Kristof Provost AuthorDate: 2024-03-24 15:08:52 +0000 Commit: Kristof Provost CommitDate: 2024-04-01 07:33:32 +0000 pfsync: cope with multiple pending plus messages It's possible for pfsync to add a plus message when one is already queued. Append both, rather than overwriting the already pending one. MFC after: 1 week (cherry picked from commit caccf6d3c008d3c778986734c2705cdae849a877) --- sys/netpfil/pf/if_pfsync.c | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/sys/netpfil/pf/if_pfsync.c b/sys/netpfil/pf/if_pfsync.c index 5df5824c93b8..def06cd0c113 100644 --- a/sys/netpfil/pf/if_pfsync.c +++ b/sys/netpfil/pf/if_pfsync.c @@ -239,7 +239,7 @@ struct pfsync_bucket TAILQ_HEAD(, pfsync_upd_req_item) b_upd_req_list; TAILQ_HEAD(, pfsync_deferral) b_deferrals; u_int b_deferred; - void *b_plus; + uint8_t *b_plus; size_t b_pluslen; struct ifaltq b_snd; @@ -476,6 +476,7 @@ pfsync_clone_destroy(struct ifnet *ifp) free(b->b_plus, M_PFSYNC); b->b_plus = NULL; + b->b_pluslen = 0; callout_drain(&b->b_tmo); } @@ -1771,6 +1772,7 @@ pfsync_drop(struct pfsync_softc *sc) b->b_len = PFSYNC_MINPKT; free(b->b_plus, M_PFSYNC); b->b_plus = NULL; + b->b_pluslen = 0; } } @@ -1912,6 +1914,7 @@ pfsync_sendout(int schedswi, int c) free(b->b_plus, M_PFSYNC); b->b_plus = NULL; + b->b_pluslen = 0; } subh = (struct pfsync_subheader *)(m->m_data + offset); @@ -2565,20 +2568,28 @@ pfsync_send_plus(void *plus, size_t pluslen) { struct pfsync_softc *sc = V_pfsyncif; struct pfsync_bucket *b = &sc->sc_buckets[0]; + uint8_t *newplus; PFSYNC_BUCKET_LOCK(b); - MPASS(b->b_plus == NULL); - if (b->b_len + pluslen > sc->sc_ifp->if_mtu) pfsync_sendout(1, b->b_id); - b->b_plus = malloc(pluslen, M_PFSYNC, M_NOWAIT); - if (b->b_plus == NULL) + newplus = malloc(pluslen + b->b_pluslen, M_PFSYNC, M_NOWAIT); + if (newplus == NULL) goto out; - memcpy(b->b_plus, plus, pluslen); - b->b_len += (b->b_pluslen = pluslen); + if (b->b_plus != NULL) { + memcpy(newplus, b->b_plus, b->b_pluslen); + free(b->b_plus, M_PFSYNC); + } else { + MPASS(b->b_pluslen == 0); + } + memcpy(newplus + b->b_pluslen, plus, pluslen); + + b->b_plus = newplus; + b->b_pluslen += pluslen; + b->b_len += pluslen; pfsync_sendout(1, b->b_id); From nobody Mon Apr 1 10:12:11 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4V7RdX6j2cz5G8TH; Mon, 1 Apr 2024 10:12:16 +0000 (UTC) (envelope-from der_marner15@hotmail.de) Received: from EUR02-VI1-obe.outbound.protection.outlook.com (mail-vi1eur02olkn20801.outbound.protection.outlook.com [IPv6:2a01:111:f403:2e07::801]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mail.protection.outlook.com", Issuer "DigiCert Cloud Services CA-1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4V7RdX0KMYz5210; Mon, 1 Apr 2024 10:12:15 +0000 (UTC) (envelope-from der_marner15@hotmail.de) Authentication-Results: mx1.freebsd.org; dkim=pass header.d=HOTMAIL.DE header.s=selector1 header.b=cf3zd1KQ; dmarc=pass (policy=none) header.from=hotmail.de; spf=pass (mx1.freebsd.org: domain of der_marner15@hotmail.de designates 2a01:111:f403:2e07::801 as permitted sender) smtp.mailfrom=der_marner15@hotmail.de; arc=pass ("microsoft.com:s=arcselector9901:i=1") ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=JRQO5FJ0E3eKnsZip47rK23emUIzp/6r7+lJnHdpYFWjt80OJAuHmmw748WZZ9ofgyg+HCUIDoaDAWbxpWkfOWig41ZyJWe2eyNNdfY0pspGBfZa9aiKbPquWB89dCajgOENSropHvDEdgwpiWlbjCyObiAU7WVJ7TcfPeTHsZtp8OyVJLJA5GwNPF8g5lm+wVVo+N5yG/Jz15q0SPUEXkGvD+z6xWxcXiOLL41mAsCdtJq9vustZn6zCgyrFp8ZzX9OnequwnS+P1BdgsZmxa+Jy2rWxK0gZPO64VytomJClolrauOjU7umPRxZC/jDXTmZ/bdQZWPnDiEuNVcrHw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=vaYMvVuUOGs2IzH/AGiev1G7v++0sYYNbIXrNv9P5NI=; b=IfuIyltmfWdlHIXfnryJkR259g/JauMSMoiD8UGGeVvyWS6L2fywjSCdx29h9fw02J3xKU+6ho8IAIV/HIImuNhRtrH9MUUcgxU7v+LHzDEy5FyoFum2c3Dsh5etvmmW2zEWUAbCn/8l8ubJu9Dbm3SwrwyBlxR3VIwWs+s1zaeqPoCpBXdfCFl+v//CEGiz+w2Q+sZqt4mTr4uDDv7NAP4lHCENmyoWVP8WsjgYYqHr2mZiEpyIXTlmyKC3dLisqzIyHUNm+K9qmMmk6fFywZZk9KB22bYFXdAsOcnuxSRFGy3jhTz5sQMUSrefDpOhg77sZeXJ09b6UbVU3mb95Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=HOTMAIL.DE; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=vaYMvVuUOGs2IzH/AGiev1G7v++0sYYNbIXrNv9P5NI=; b=cf3zd1KQsDSGov4/sQktcL/Oeloso/FgTQVUtpjcf49Kif0mbBOTswdfvcbXh+5jdWDiiWKs2X2qGXjYdvo424O1j9xB4AWRuohLVZ1mXopmGM+3Go3hYkNgenD5CgVQKbfEwHdYUdBO/wCkLKGwQX45SWWsZxdWDLkDVm+OLPSs6kdcTB7qvn3TBxZ4NLJC3hDdThM/bN4qgQuCs4/3naOZC618davm8R4Wp9PJAc3EVS24F368LGCL9cmPfyEyDpWnp6TrbQVx/BIuG2nFKHmWoWo+Oc/enDinIBK/vW6IzgSfYZB/pJemFY0tnWXnzts33g6LXdVf5BBpfeILPQ== Received: from GV1PR08MB7900.eurprd08.prod.outlook.com (2603:10a6:150:5f::22) by DB4PR08MB9336.eurprd08.prod.outlook.com (2603:10a6:10:3f3::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7409.46; Mon, 1 Apr 2024 10:12:11 +0000 Received: from GV1PR08MB7900.eurprd08.prod.outlook.com ([fe80::f2c1:45f0:e697:fba3]) by GV1PR08MB7900.eurprd08.prod.outlook.com ([fe80::f2c1:45f0:e697:fba3%7]) with mapi id 15.20.7409.042; Mon, 1 Apr 2024 10:12:11 +0000 From: eweweew rob To: Andriy Gapon CC: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Subject: Re: git: 4d1161f094dd - main - subr_bus: report DEVICE_SUSPEND failures Thread-Topic: git: 4d1161f094dd - main - subr_bus: report DEVICE_SUSPEND failures Thread-Index: AQHaUgcaidHVkBbdB0+dOoK9IRr/LbFTlf0+ Date: Mon, 1 Apr 2024 10:12:11 +0000 Message-ID: References: <202401281321.40SDLneL052092@gitrepo.freebsd.org> In-Reply-To: Accept-Language: de-DE, en-US Content-Language: de-DE X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ms-exchange-messagesentrepresentingtype: 1 x-tmn: [A21GrYCleZkuPIZ+WVF+lsK4ecYQUn49] x-ms-publictraffictype: Email x-ms-traffictypediagnostic: GV1PR08MB7900:EE_|DB4PR08MB9336:EE_ x-ms-office365-filtering-correlation-id: 10c0b1e1-4ef0-416a-1e02-08dc5234323f x-ms-exchange-slblob-mailprops: P1EfU6pZOd/HYFjY5/jwU/oNwO6yEX/78bZ20Agqkk4uu7IqQryTqmnhV/Ruo0y6w81ImXMASwOlliD4aUsfNbRs3uAIXYOJrDDKGvBLd9AC0EwOHZr40mlHdbLedZxR6YX+ZC9o96plcB7AmXvgsG5m/SHeG+ER+LsbiZEbom6SITL+pyYTSEKVi4vKTbpaOksoc2rv/jTLTdJXBn0Gz+KRRAh0p/aEdsd10PIBFMOMI42nWGPs3BV1NLBgLyP0gUheUJMpLn286UPOnTurZBNlY8vSLJQ306qkMBMzVavULZpWxHuRRUU/gfhdBlno98Q/HNUml5orfRFaBblQMql9epIzl+KbnpYMbVdA3lLpAN8Kx9nDT52mlSEwN3gklc05LJQiE2o8FRgXj/vKNHean4+qTcLKeXA3HafGyDwSgPByxduzYJALZ+aaoitsR8gqm9B6JsYKrRFoJ9ZgFC6/LA52iQ4OxA09hjBsmbWXfJKoyjcoM8Q17tjefXXSEwuOr6WCOwpuJutY5ePOl3o1mwceIUpei95O4HXqEmyRZNPJibH2KgONZPb48kg5dAOCv0pAZ6miciL5Mf6fRk2gVS86Zm718tvByZUFmN1HicRf0KeRTF74E37oR36n/q/DjYCgNNFXk8uyp4IV792BBxeGrTxDfr8cYBiwdE9ITjsSABdDIRPY+HEpsFxbNvaMvDm2RmHAj+GvalaDNZG3oDMZjzQwV+fYZvorqxcDWQQav2W28vN6HFufMoOfRVVRMzdu5urGU1GPrO0D3SBCiEHKbZLiDL/BjtZTG+Hc8Q/Z/ITf+A== x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: +imziAxv0VBrKj10sNmNyxv7ov7vgLkCsXsx0dsw2Ty6vBA+ikUyaaqLKx8xaLSiURp1WAQHHH8DzCwlpektoL4c7uxMthCdQvpwZFeNRiX90PeB8/S1gyX577i2icgeYRbUMUmmVB3fAZh8BlKdW9B6n6eVk0plg/6STOKNqtkgx48axbha/OzkNtiZxXsC+TtF0Kk/+VOhV9sD5P5UpCPdsUn4t2Eq1ATBBSQoEg1UAQ7imvmnt7gxjqjMYTWmkNCJZauyPs7OZTmAESovI6WnJthE+Uz2dHqkYYt5PnHer+ByVsD2i2H22HZlOnLqzd+GD8KYk+35AXhZ4NyWCDoc0mBqhvZMe+GU0GACRJQ/M62eZG2Bu3Id6O6O4BaJfvphuEZ+8/zcYjKy2jOUjveufL7ttYZ7guHoJcXOeVsDp9An5AOifb6yfKVMb+z3UicMrpvMC6vTFQAKnSPmiLOgoFJGuZuKrCFwY4ppjWoHjLn4cVvcs5w6KusGSlRHGKVO5FABwdVM6S7v/QrYQBKs1ubidQtWBgk/IQOm/mkAoSi9W3f6KUujbUn0YPm07ugB6onguGsb1hVGZZCOJHwt/zjYouqgx8lbZ8FXi9vzVN04mEf4WiO6PtQFraPAaehxUVogJhGiVlci5HIPUn7/C7fv/74CDVXW91NHm72Jy+MPTK9wX95tsVVzB7Rm x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?utf-8?B?aGVQM2JoZXlsZzcrd0UycmI5dTFIbVQ4U244V3BIOSszZHhhQUZOK2dWUjl1?= =?utf-8?B?V3p1T3dxV0c3NmJ4RlZQTC9xYi8wcnYvNzAxbXNEYlN3alhscjNXRGVEbzlP?= =?utf-8?B?c3hiUGMvallNelFiZXdlb2tvRzZPZjJNTzZ3cjJuQVJFOFpveHZOWEN2N08v?= =?utf-8?B?VEZxRlNlbFhtQmpuWFRKMjZINlptekhtK2d4aitZU01INncrcHRoYWYralQ3?= =?utf-8?B?Q1N6ekxaZ0svdmdVYll5WlFSckttanJWejQ3NWdMZFFuTmNNVzRzdFRYcVpM?= =?utf-8?B?Z2JGZVhXNkk3ZkxER29KRW9uY1JlQlhvMnJmRUVVUXNHb255bExiYnN2RU9x?= =?utf-8?B?UGZNUG1nOGFvbXd5Wks1NE1ZUXVjbXM5d3ljNzQrR0d6cEdFaEIrWmVGaTFG?= =?utf-8?B?UGVkRm43TzBtZVpiSEFnVjl6WmpYY2ZpcXZ0eGFObXA4d0NPaDRmZlhQQm5X?= =?utf-8?B?Mk8yZjc5N280TTU0WjVKQjNIamxYTndka2lidngzd1c2YkxvZXpBS2t3WEVS?= =?utf-8?B?NHJoakVOMXRnWElBeUtsTDJqa04vcVhaakN5OEVHcmZGQWRKOG9JYmxiMkg3?= =?utf-8?B?R2N6SnVnU3J6T2VQdi80TVFuUU1uUVNtUGVaYittV2JmS3dCSU1WSVJ0S2Uy?= =?utf-8?B?UTZGM2RoOUxvL25zUGo4dElHOXlIbmV0bWdVRDRoNks2Z0JrakcxSStKUVlZ?= =?utf-8?B?dGdhc1ZyNG5wNkhGNUk5c3lQT2g0OENKaGFjQzRuNUl5aW5YSVZ2TzdOM0ZU?= =?utf-8?B?azhrb2M3amkyVG9ENEgvM3YxRHhNVWpnZGVKN0o5eDBzMFRNMXhXZjh6TGxp?= =?utf-8?B?RXhxaUw2OTFBcjZTMlNwanJNSEpRYVJLRmxhSStZZFhNRFl4OUV5ZWZmTlI5?= =?utf-8?B?d1I2ZWRBWmJZazUyWE9xYmJyOG94YjZiZmJNblFyR3d2RVhMeHhsRkt0RVJv?= =?utf-8?B?b05PRXEvRHkzV0VsbmQxUVk5UkpVKzQ0U0wxenhLWkVmdUhNb0lxaDZ0ZHF0?= =?utf-8?B?Z3p4dzQ3Wjc1S2JXTkxzQk1rTC9vSTJNS2ZVcm9RYXRKbWd6N01hUkw0MVBn?= =?utf-8?B?S2U0OE5qeE9waWZab1p5VEhyTk5BN0RkdTVINU1DdS9laWRva0hXb0tzdzhv?= =?utf-8?B?UlhRMXhMczJHd1RJaExXbDAxeXBuZkNweVRqeVNEZ2g2Vkx0ZVp2L3RMcVpH?= =?utf-8?B?Y0R4aWNXZUhQRWNyUUo0emdXQmQxdWtpc0IyNlpRS2RUdm93Y0U2ajVwTXo5?= =?utf-8?B?NWNtT1lXYTVnMmtxN3NXdkphTmcybEJzS1JEa1lIL1BqUGRENFRGTEx3MS9H?= =?utf-8?B?OExScUJacHdqN0JCVkV5SDRjcXQ0KzlqNm5hNUkxR3N0aElSeWlPb0YybUFu?= =?utf-8?B?ejJmaFJVQmlvTHpIdlp1akQ2MlBnUWpjYTZ2TEQ0cGFtcWdhbXpwOUtsWEpE?= =?utf-8?B?c2pDdzNTekUvOU5ubndYUVAzZVdZbmlSZnAvQ0ZNZklEM1VXRFo1SkZMRURT?= =?utf-8?B?VzJEamg5b0Z0UXMxQmU1UnZBbTdtQUg1QXFya24yYmp6T3B3Q0lZMUlpSG0x?= =?utf-8?B?bW1iUWljbGx6UXU4V0s0UitPZXJ3dTc3RW9mRWI5cHRiU21rZFZraWozL0lR?= =?utf-8?B?SEt5Zm1LNHdFYTVxZjFkbStYbWpWZEU3Rjk2TGhTRGV3SmRRSy9qK3ZXd3BK?= =?utf-8?Q?BXEKkJpwjcoi6ghXJbIy?= Content-Type: multipart/alternative; boundary="_000_GV1PR08MB790079E9050227030C97769D803F2GV1PR08MB7900eurp_" List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 X-OriginatorOrg: sct-15-20-4755-11-msonline-outlook-37dd7.templateTenant X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: GV1PR08MB7900.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-CrossTenant-Network-Message-Id: 10c0b1e1-4ef0-416a-1e02-08dc5234323f X-MS-Exchange-CrossTenant-originalarrivaltime: 01 Apr 2024 10:12:11.3938 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-rms-persistedconsumerorg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB4PR08MB9336 X-Spamd-Bar: -- X-Spamd-Result: default: False [-2.98 / 15.00]; ARC_ALLOW(-1.00)[microsoft.com:s=arcselector9901:i=1]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_SPAM_SHORT(0.92)[0.922]; DMARC_POLICY_ALLOW(-0.50)[hotmail.de,none]; R_SPF_ALLOW(-0.20)[+ip6:2a01:111:f403::/49]; R_DKIM_ALLOW(-0.20)[HOTMAIL.DE:s=selector1]; MIME_BASE64_TEXT(0.10)[]; MIME_GOOD(-0.10)[multipart/alternative,text/plain]; FREEMAIL_ENVFROM(0.00)[hotmail.de]; MISSING_XM_UA(0.00)[]; FREEMAIL_FROM(0.00)[hotmail.de]; TO_DN_SOME(0.00)[]; MIME_TRACE(0.00)[0:+,1:+,2:~]; ASN(0.00)[asn:8075, ipnet:2a01:111:f000::/36, country:US]; FROM_EQ_ENVFROM(0.00)[]; FROM_HAS_DN(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; TO_DN_EQ_ADDR_SOME(0.00)[]; RCVD_TLS_LAST(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; MLMMJ_DEST(0.00)[dev-commits-src-all@freebsd.org,dev-commits-src-main@freebsd.org]; DKIM_TRACE(0.00)[HOTMAIL.DE:+] X-Rspamd-Queue-Id: 4V7RdX0KMYz5210 --_000_GV1PR08MB790079E9050227030C97769D803F2GV1PR08MB7900eurp_ Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 R29vZCBhZnRlcm5vb24sDQoNCkNvdWxkIHlvdSBwbGVhc2UgdW5zdWJzY3JpYmUgbWUgZnJvbSB0 aGUgZ3JvdXA/DQoNCkdyZWV0cw0KDQpBbmRyw6kNCl9fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fDQpGcm9tOiBvd25lci1kZXYtY29tbWl0cy1zcmMtYWxsQGZyZWVic2Qub3JnIDxvd25l ci1kZXYtY29tbWl0cy1zcmMtYWxsQGZyZWVic2Qub3JnPiBvbiBiZWhhbGYgb2YgUXVpbmN5IE1j cmFlIDxxZ21jcmFlQHlhaG9vLmNvbT4NClNlbnQ6IFN1bmRheSwgSmFudWFyeSAyOCwgMjAyNCA1 OjI4OjIzIFBNDQpUbzogQW5kcml5IEdhcG9uIDxhdmdAZnJlZWJzZC5vcmc+DQpDYzogc3JjLWNv bW1pdHRlcnNAZnJlZWJzZC5vcmcgPHNyYy1jb21taXR0ZXJzQGZyZWVic2Qub3JnPjsgZGV2LWNv bW1pdHMtc3JjLWFsbEBmcmVlYnNkLm9yZyA8ZGV2LWNvbW1pdHMtc3JjLWFsbEBmcmVlYnNkLm9y Zz47IGRldi1jb21taXRzLXNyYy1tYWluQGZyZWVic2Qub3JnIDxkZXYtY29tbWl0cy1zcmMtbWFp bkBmcmVlYnNkLm9yZz4NClN1YmplY3Q6IFJlOiBnaXQ6IDRkMTE2MWYwOTRkZCAtIG1haW4gLSBz dWJyX2J1czogcmVwb3J0IERFVklDRV9TVVNQRU5EIGZhaWx1cmVzDQoNCkdvb2QgYWZ0ZXJub29u LA0KDQpDb3VsZCB5b3UgcGxlYXNlIHVuc3Vic2NyaWJlIG1lIGZyb20gdGhlIGdyb3VwPw0KDQpR dWluY3kNClNlbnQgZnJvbSBteSBpUGhvbmUNCg0KPiBPbiBKYW4gMjgsIDIwMjQsIGF0IDk6MjHi gK9BTSwgQW5kcml5IEdhcG9uIDxhdmdAZnJlZWJzZC5vcmc+IHdyb3RlOg0KPg0KPiDvu79UaGUg YnJhbmNoIG1haW4gaGFzIGJlZW4gdXBkYXRlZCBieSBhdmc6DQo+DQo+IFVSTDogaHR0cHM6Ly9j Z2l0LkZyZWVCU0Qub3JnL3NyYy9jb21taXQvP2lkPTRkMTE2MWYwOTRkZDkwNDI4ODQ3ZjdlNTk4 OTc2N2U5OTU3MDU1ZjQNCj4NCj4gY29tbWl0IDRkMTE2MWYwOTRkZDkwNDI4ODQ3ZjdlNTk4OTc2 N2U5OTU3MDU1ZjQNCj4gQXV0aG9yOiAgICAgQW5kcml5IEdhcG9uIDxhdmdARnJlZUJTRC5vcmc+ DQo+IEF1dGhvckRhdGU6IDIwMjMtMDEtMDMgMDg6Mzk6MzIgKzAwMDANCj4gQ29tbWl0OiAgICAg QW5kcml5IEdhcG9uIDxhdmdARnJlZUJTRC5vcmc+DQo+IENvbW1pdERhdGU6IDIwMjQtMDEtMjgg MTM6MjE6MDkgKzAwMDANCj4NCj4gICAgc3Vicl9idXM6IHJlcG9ydCBERVZJQ0VfU1VTUEVORCBm YWlsdXJlcw0KPg0KPiAgICBUaGlzIGdyZWF0bHkgYWlkcyB3aXRoIGRpYWdub3Npbmcgc3lzdGVt IHN1c3BlbmQgZmFpbHVyZXMgd2hlbg0KPiAgICB0aGV5IGFyZSBkdWUgdG8gYSBkZXZpY2UgZHJp dmVyIG9yIGhhcmR3YXJlLg0KPiAtLS0NCj4gc3lzL2tlcm4vc3Vicl9idXMuYyB8IDYgKysrKyst DQo+IDEgZmlsZSBjaGFuZ2VkLCA1IGluc2VydGlvbnMoKyksIDEgZGVsZXRpb24oLSkNCj4NCj4g ZGlmZiAtLWdpdCBhL3N5cy9rZXJuL3N1YnJfYnVzLmMgYi9zeXMva2Vybi9zdWJyX2J1cy5jDQo+ IGluZGV4IDIxYzI4MzVmMmFlNi4uYzA2ZjNkZjBjOWM5IDEwMDY0NA0KPiAtLS0gYS9zeXMva2Vy bi9zdWJyX2J1cy5jDQo+ICsrKyBiL3N5cy9rZXJuL3N1YnJfYnVzLmMNCj4gQEAgLTM0NjMsOCAr MzQ2MywxMiBAQCBidXNfZ2VuZXJpY19zdXNwZW5kX2NoaWxkKGRldmljZV90IGRldiwgZGV2aWNl X3QgY2hpbGQpDQo+DQo+ICAgIGVycm9yID0gREVWSUNFX1NVU1BFTkQoY2hpbGQpOw0KPg0KPiAt ICAgIGlmIChlcnJvciA9PSAwKQ0KPiArICAgIGlmIChlcnJvciA9PSAwKSB7DQo+ICAgICAgICBj aGlsZC0+ZmxhZ3MgfD0gREZfU1VTUEVOREVEOw0KPiArICAgIH0gZWxzZSB7DQo+ICsgICAgICAg IHByaW50ZigiREVWSUNFX1NVU1BFTkQoJXMpIGZhaWxlZDogJWRcbiIsDQo+ICsgICAgICAgICAg ICBkZXZpY2VfZ2V0X25hbWV1bml0KGNoaWxkKSwgZXJyb3IpOw0KPiArICAgIH0NCj4NCj4gICAg cmV0dXJuIChlcnJvcik7DQo+IH0NCj4NCg0KDQo= --_000_GV1PR08MB790079E9050227030C97769D803F2GV1PR08MB7900eurp_ Content-Type: text/html; charset="utf-8" Content-Transfer-Encoding: base64 PGh0bWw+DQo8aGVhZD4NCjxtZXRhIGh0dHAtZXF1aXY9IkNvbnRlbnQtVHlwZSIgY29udGVudD0i dGV4dC9odG1sOyBjaGFyc2V0PXV0Zi04Ij4NCjwvaGVhZD4NCjxib2R5Pg0KPGRpdiBkaXI9ImF1 dG8iPkdvb2QgYWZ0ZXJub29uLDwvZGl2Pg0KPGRpdiBkaXI9ImF1dG8iPjxicj4NCjwvZGl2Pg0K PGRpdiBkaXI9ImF1dG8iPkNvdWxkIHlvdSBwbGVhc2UgdW5zdWJzY3JpYmUgbWUgZnJvbSB0aGUg Z3JvdXA/PC9kaXY+DQo8ZGl2IGRpcj0iYXV0byI+PGJyPg0KPC9kaXY+DQo8ZGl2IGRpcj0iYXV0 byI+R3JlZXRzPC9kaXY+DQo8ZGl2IGRpcj0iYXV0byI+PGJyPg0KPC9kaXY+DQo8ZGl2IGRpcj0i YXV0byI+QW5kcsOpJm5ic3A7PC9kaXY+DQo8aHIgc3R5bGU9ImRpc3BsYXk6aW5saW5lLWJsb2Nr O3dpZHRoOjk4JSIgdGFiaW5kZXg9Ii0xIj4NCjxkaXYgaWQ9ImRpdlJwbHlGd2RNc2ciIGRpcj0i bHRyIj48Zm9udCBmYWNlPSJDYWxpYnJpLCBzYW5zLXNlcmlmIiBzdHlsZT0iZm9udC1zaXplOjEx cHQiIGNvbG9yPSIjMDAwMDAwIj48Yj5Gcm9tOjwvYj4gb3duZXItZGV2LWNvbW1pdHMtc3JjLWFs bEBmcmVlYnNkLm9yZyAmbHQ7b3duZXItZGV2LWNvbW1pdHMtc3JjLWFsbEBmcmVlYnNkLm9yZyZn dDsgb24gYmVoYWxmIG9mIFF1aW5jeSBNY3JhZSAmbHQ7cWdtY3JhZUB5YWhvby5jb20mZ3Q7PGJy Pg0KPGI+U2VudDo8L2I+IFN1bmRheSwgSmFudWFyeSAyOCwgMjAyNCA1OjI4OjIzIFBNPGJyPg0K PGI+VG86PC9iPiBBbmRyaXkgR2Fwb24gJmx0O2F2Z0BmcmVlYnNkLm9yZyZndDs8YnI+DQo8Yj5D Yzo8L2I+IHNyYy1jb21taXR0ZXJzQGZyZWVic2Qub3JnICZsdDtzcmMtY29tbWl0dGVyc0BmcmVl YnNkLm9yZyZndDs7IGRldi1jb21taXRzLXNyYy1hbGxAZnJlZWJzZC5vcmcgJmx0O2Rldi1jb21t aXRzLXNyYy1hbGxAZnJlZWJzZC5vcmcmZ3Q7OyBkZXYtY29tbWl0cy1zcmMtbWFpbkBmcmVlYnNk Lm9yZyAmbHQ7ZGV2LWNvbW1pdHMtc3JjLW1haW5AZnJlZWJzZC5vcmcmZ3Q7PGJyPg0KPGI+U3Vi amVjdDo8L2I+IFJlOiBnaXQ6IDRkMTE2MWYwOTRkZCAtIG1haW4gLSBzdWJyX2J1czogcmVwb3J0 IERFVklDRV9TVVNQRU5EIGZhaWx1cmVzPC9mb250Pg0KPGRpdj4mbmJzcDs8L2Rpdj4NCjwvZGl2 Pg0KPGRpdiBjbGFzcz0iQm9keUZyYWdtZW50Ij48Zm9udCBzaXplPSIyIj48c3BhbiBzdHlsZT0i Zm9udC1zaXplOjExcHQ7Ij4NCjxkaXYgY2xhc3M9IlBsYWluVGV4dCI+R29vZCBhZnRlcm5vb24s PGJyPg0KPGJyPg0KQ291bGQgeW91IHBsZWFzZSB1bnN1YnNjcmliZSBtZSBmcm9tIHRoZSBncm91 cD88YnI+DQo8YnI+DQpRdWluY3k8YnI+DQpTZW50IGZyb20gbXkgaVBob25lPGJyPg0KPGJyPg0K Jmd0OyBPbiBKYW4gMjgsIDIwMjQsIGF0IDk6MjHigK9BTSwgQW5kcml5IEdhcG9uICZsdDthdmdA ZnJlZWJzZC5vcmcmZ3Q7IHdyb3RlOjxicj4NCiZndDsgPGJyPg0KJmd0OyDvu79UaGUgYnJhbmNo IG1haW4gaGFzIGJlZW4gdXBkYXRlZCBieSBhdmc6PGJyPg0KJmd0OyA8YnI+DQomZ3Q7IFVSTDog PGEgaHJlZj0iaHR0cHM6Ly9jZ2l0LkZyZWVCU0Qub3JnL3NyYy9jb21taXQvP2lkPTRkMTE2MWYw OTRkZDkwNDI4ODQ3ZjdlNTk4OTc2N2U5OTU3MDU1ZjQiPg0KaHR0cHM6Ly9jZ2l0LkZyZWVCU0Qu b3JnL3NyYy9jb21taXQvP2lkPTRkMTE2MWYwOTRkZDkwNDI4ODQ3ZjdlNTk4OTc2N2U5OTU3MDU1 ZjQ8L2E+PGJyPg0KJmd0OyA8YnI+DQomZ3Q7IGNvbW1pdCA0ZDExNjFmMDk0ZGQ5MDQyODg0N2Y3 ZTU5ODk3NjdlOTk1NzA1NWY0PGJyPg0KJmd0OyBBdXRob3I6Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5i c3A7IEFuZHJpeSBHYXBvbiAmbHQ7YXZnQEZyZWVCU0Qub3JnJmd0Ozxicj4NCiZndDsgQXV0aG9y RGF0ZTogMjAyMy0wMS0wMyAwODozOTozMiArMDAwMDxicj4NCiZndDsgQ29tbWl0OiZuYnNwOyZu YnNwOyZuYnNwOyZuYnNwOyBBbmRyaXkgR2Fwb24gJmx0O2F2Z0BGcmVlQlNELm9yZyZndDs8YnI+ DQomZ3Q7IENvbW1pdERhdGU6IDIwMjQtMDEtMjggMTM6MjE6MDkgKzAwMDA8YnI+DQomZ3Q7IDxi cj4NCiZndDsmbmJzcDsmbmJzcDsmbmJzcDsgc3Vicl9idXM6IHJlcG9ydCBERVZJQ0VfU1VTUEVO RCBmYWlsdXJlczxicj4NCiZndDsgPGJyPg0KJmd0OyZuYnNwOyZuYnNwOyZuYnNwOyBUaGlzIGdy ZWF0bHkgYWlkcyB3aXRoIGRpYWdub3Npbmcgc3lzdGVtIHN1c3BlbmQgZmFpbHVyZXMgd2hlbjxi cj4NCiZndDsmbmJzcDsmbmJzcDsmbmJzcDsgdGhleSBhcmUgZHVlIHRvIGEgZGV2aWNlIGRyaXZl ciBvciBoYXJkd2FyZS48YnI+DQomZ3Q7IC0tLTxicj4NCiZndDsgc3lzL2tlcm4vc3Vicl9idXMu YyB8IDYgKysrKystPGJyPg0KJmd0OyAxIGZpbGUgY2hhbmdlZCwgNSBpbnNlcnRpb25zKCspLCAx IGRlbGV0aW9uKC0pPGJyPg0KJmd0OyA8YnI+DQomZ3Q7IGRpZmYgLS1naXQgYS9zeXMva2Vybi9z dWJyX2J1cy5jIGIvc3lzL2tlcm4vc3Vicl9idXMuYzxicj4NCiZndDsgaW5kZXggMjFjMjgzNWYy YWU2Li5jMDZmM2RmMGM5YzkgMTAwNjQ0PGJyPg0KJmd0OyAtLS0gYS9zeXMva2Vybi9zdWJyX2J1 cy5jPGJyPg0KJmd0OyArKysgYi9zeXMva2Vybi9zdWJyX2J1cy5jPGJyPg0KJmd0OyBAQCAtMzQ2 Myw4ICszNDYzLDEyIEBAIGJ1c19nZW5lcmljX3N1c3BlbmRfY2hpbGQoZGV2aWNlX3QgZGV2LCBk ZXZpY2VfdCBjaGlsZCk8YnI+DQomZ3Q7IDxicj4NCiZndDsmbmJzcDsmbmJzcDsmbmJzcDsgZXJy b3IgPSBERVZJQ0VfU1VTUEVORChjaGlsZCk7PGJyPg0KJmd0OyA8YnI+DQomZ3Q7IC0mbmJzcDsm bmJzcDsmbmJzcDsgaWYgKGVycm9yID09IDApPGJyPg0KJmd0OyArJm5ic3A7Jm5ic3A7Jm5ic3A7 IGlmIChlcnJvciA9PSAwKSB7PGJyPg0KJmd0OyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNw OyZuYnNwOyZuYnNwOyBjaGlsZC0mZ3Q7ZmxhZ3MgfD0gREZfU1VTUEVOREVEOzxicj4NCiZndDsg KyZuYnNwOyZuYnNwOyZuYnNwOyB9IGVsc2Ugezxicj4NCiZndDsgKyZuYnNwOyZuYnNwOyZuYnNw OyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyBwcmludGYoJnF1b3Q7REVWSUNFX1NVU1BFTkQoJXMp IGZhaWxlZDogJWRcbiZxdW90Oyw8YnI+DQomZ3Q7ICsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsm bmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsgZGV2aWNlX2dldF9uYW1l dW5pdChjaGlsZCksIGVycm9yKTs8YnI+DQomZ3Q7ICsmbmJzcDsmbmJzcDsmbmJzcDsgfTxicj4N CiZndDsgPGJyPg0KJmd0OyZuYnNwOyZuYnNwOyZuYnNwOyByZXR1cm4gKGVycm9yKTs8YnI+DQom Z3Q7IH08YnI+DQomZ3Q7IDxicj4NCjxicj4NCjxicj4NCjwvZGl2Pg0KPC9zcGFuPjwvZm9udD48 L2Rpdj4NCjwvYm9keT4NCjwvaHRtbD4NCg== --_000_GV1PR08MB790079E9050227030C97769D803F2GV1PR08MB7900eurp_-- From nobody Mon Apr 1 13:19:07 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4V7Wn73QzGz5GT1S; Mon, 1 Apr 2024 13:19: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 4V7Wn71ZS5z4CsY; Mon, 1 Apr 2024 13:19:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711977547; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Pz2CFU9Gz80eypZt1NtMS2ar5LZqpFjeHf5xMwDn3Xw=; b=mFkOKF1BaODY0vJmIT/4yNB0qttbPc2/NxjGun4cXB6cH2hrVfTErgcrifvKbDXJI2T+Hm GNwIj1x6LMQP6/akUND9CB2ZKWb8GnYcT6gGIxGW90PJ3Gkq+Gd6vG88qcZ7OIYqKqPiv3 Uvp2fx5UQyLlbD0kZq2urtPajC4ZJwsKra8+KDE7WqHjM8dCTvSgQh8DnLpMqEy2hBVTHr sQ1YukVvC6DLertSQ1JT4j/ppeZJMM6aDH5BKfKB1FNubrCqGHWwt4AG8LMAl1Lqv+TPhN aeqY5OslkWm4cCE9L+Z78s47C/KjAwQg7mm4BYG+Hk96HX33TSC2nNBypRs3mw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711977547; a=rsa-sha256; cv=none; b=UiJv1aCLczct783f4HiTuJXIVV/H6xg/eX4hF7AcPotuHoLPbbPEQ+Z9JFvSpd5Mj43HFk 9dvOOZd8m11h7B5jHmd9Q88VToI6ZS7MV44yYqdCdb4ZDRDolNyYany+BpXq0vqtiTnRC0 I7gvzr8LXY+tgFJw0HnLSq/teAy6HB6KyvJtuJbcYchxeL2bQXqc5g9/aOjDyjVeEX34Yy ubOMOiroEkqqFV57yTebt6ja401zHd7SYsfkl2i2r6+TN/QUq+DlzbQcsPsQ6KFGUa05rz 8ntyx+IkAl4hjSqc9W6Q9JYIc+AEgOEKmGMVAowurbsTIVrLcWg2q65xN1wW6w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711977547; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Pz2CFU9Gz80eypZt1NtMS2ar5LZqpFjeHf5xMwDn3Xw=; b=o8bFcZv7DjP0QvDlMDMrKOpnTe5ZCb2oQAU2ZXIanHhaOb+ypg+xPjHXZ+QUpMQ2PhRUy8 84jpvaeY4DhasBCVbSp5+emQtaGyKdXkGOSM4wuXx+Vhmu38+HjLjok7ZH5znk4NQWCcnc YkQLozXsjMuKehgsRdze1chg0xsd3iH/8BfnVRv0z13kHoZVR7hU+Tpv8L/sEqq1VJzfGp hl+Ob0owdUV4H9kBH6+DbtYfGUkBwP1dSTppQG8vyiMzKBz0BPk5iPHlXfcgHpMelaJlMf +N7dWF9ddCjMNfedtT5zg7Y+47d2FKZQqfut4ppNa4Vgj30saHV2m1N0YHPy9w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4V7Wn718sjz1MPx; Mon, 1 Apr 2024 13:19: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 431DJ7Wm017074; Mon, 1 Apr 2024 13:19:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 431DJ73m017071; Mon, 1 Apr 2024 13:19:07 GMT (envelope-from git) Date: Mon, 1 Apr 2024 13:19:07 GMT Message-Id: <202404011319.431DJ73m017071@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: 125c4560bc70 - main - usr.bin: Make lorder conditional on MK_TOOLCHAIN. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 125c4560bc70971b950d035cfcd2255b89984011 Auto-Submitted: auto-generated The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=125c4560bc70971b950d035cfcd2255b89984011 commit 125c4560bc70971b950d035cfcd2255b89984011 Author: Dag-Erling Smørgrav AuthorDate: 2024-04-01 13:18:35 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2024-04-01 13:18:35 +0000 usr.bin: Make lorder conditional on MK_TOOLCHAIN. MFC after: 1 week Reviewed by: allanjude, markj Differential Revision: https://reviews.freebsd.org/D44558 --- tools/build/mk/OptionalObsoleteFiles.inc | 6 ++++++ usr.bin/Makefile | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index 896f3e5ec43d..60fe97949f0c 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -8364,6 +8364,12 @@ OLD_FILES+=usr/share/man/man3/elftc_set_timestamps.3.gz OLD_FILES+=usr/share/man/man3/elftc_timestamp.3.gz OLD_FILES+=usr/share/man/man3/elftc_string_table_create.3.gz OLD_FILES+=usr/share/man/man3/elftc_version.3.gz +# usr.bin/lorder +OLD_FILES+=usr/bin/lorder +OLD_FILES+=usr/tests/usr.bin/lorder/Kyuafile +OLD_FILES+=usr/tests/usr.bin/lorder/lorder_test +OLD_DIRS+=usr/tests/usr.bin/lorder +# usr.bin/yacc OLD_FILES+=usr/tests/usr.bin/yacc/Kyuafile OLD_FILES+=usr/tests/usr.bin/yacc/btyacc_calc1.y OLD_FILES+=usr/tests/usr.bin/yacc/btyacc_demo.y diff --git a/usr.bin/Makefile b/usr.bin/Makefile index 84b7c4dc4dec..0a584a18d14a 100644 --- a/usr.bin/Makefile +++ b/usr.bin/Makefile @@ -83,7 +83,6 @@ SUBDIR= alias \ logins \ logname \ look \ - lorder \ lsvfs \ lzmainfo \ m4 \ @@ -268,6 +267,7 @@ SUBDIR.${MK_TOOLCHAIN}+= file2c SUBDIR.${MK_TOOLCHAIN}+= gprof SUBDIR.${MK_TOOLCHAIN}+= indent SUBDIR.${MK_TOOLCHAIN}+= lex +SUBDIR.${MK_TOOLCHAIN}+= lorder SUBDIR.${MK_TOOLCHAIN}+= mkstr SUBDIR.${MK_TOOLCHAIN}+= rpcgen SUBDIR.${MK_TOOLCHAIN}+= unifdef From nobody Mon Apr 1 17:23:47 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4V7dCR4mTCz5GSp2; Mon, 1 Apr 2024 17:23: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 4V7dCR4CWRz4ftf; Mon, 1 Apr 2024 17:23:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711992227; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ejatPFrOKIgLF+Ca0Tmtbmp1R2cISRnN6ZubXmYYwDU=; b=vJaD3nP/4TfC73c+HaR1rP9wVbs0DyqQlhkymWviH3KmahzUulYZdzN/10iUe02htGU3nT 7OFNuPZraEqHFxtD/IH24O7F0zBUPIDbf4c5lz/nh10mxxMe70mIFpqmmp9/RLKr64p1+o P3tcIyZjkTBcvxBdb5KGYPowB3VWzsRqXmhse/SaIW3gN/gMGbsbLnZdq2O0eDJrw0Be9L QcABQ+NMZnOUoeWyztDzKhy8ICcN6drihM92FJAHnthJthfHY906kBZqbyW4PeV8mbMiqX LMSBP/VBUBalzR3JjaJ5V1TU3lu5jeM031B/i8JiOzD93IIMyCZvV/gNxyJIpQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711992227; a=rsa-sha256; cv=none; b=mz8DiUdnDVNGVN4ICDyRNZV25QlD/8dQwf04QpqMU1CUbabCAcVlc3gtgPFURGfyN+lDnJ SIHePFs0yEFd/mVXICthuPvbpH7dfuFAK9UwcM9/RieWPluBRFUjb523pBNbc4uAJ9Eg+e f0VGFl/a7p3W8izosQ6Hq2EKa8mGGPe8VTDcC97btZlzeIiwGDFXmplrTbA1yPT1x9/kXx XQ8nhgXeMa/zhYn497WKstv1HH7khe20i4YDY8ZaP2DMmVR4kE23WdmPdYCu21WTAtMfGd jVMnDt/DWisr9/XPsNgcH3kVlUJTL57VuCsyD2mzdvqlHmByiVVQgu5RqR0YfQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711992227; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ejatPFrOKIgLF+Ca0Tmtbmp1R2cISRnN6ZubXmYYwDU=; b=uwsMYZaXrfwwpZwuFju4xlOtJJRNDZ3eUzbkVi/rPdsCrNX5c5ktsogSAsiDc/BDY+VDSE WqUJYPJjxSrc2hnR/9a9bJhbqpL4O6GGKJLoNQv5MqIXeypdHjh03KKZ4EGzqmfF7JfXZw sTCqLpBLHFXU8mRnAdkPsqS+1PGXRUw4QtGL6bfb6P5ewOYOuMLX+M1YyKd2s30E51bbeY 3KaMazSJh/7vQYrx1s4w17TiPXDqTYUQUOXfDsEPEArBywNDoh4TF9fP9/CeQWkzn5zP4f E3M/PVKmlAiylibElVOz1sx77ybx22MkWjaSM9ylFjfIcvJXn0YA76Rrm1efeg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4V7dCR3lm4zDyX; Mon, 1 Apr 2024 17:23: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 431HNljG040125; Mon, 1 Apr 2024 17:23:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 431HNlNf040122; Mon, 1 Apr 2024 17:23:47 GMT (envelope-from git) Date: Mon, 1 Apr 2024 17:23:47 GMT Message-Id: <202404011723.431HNlNf040122@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 63613e3ba1e1 - main - wg: Use ENETUNREACH when transmitting to a non-existent peer List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 63613e3ba1e188e9fece43e1613bd697f04b345e Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=63613e3ba1e188e9fece43e1613bd697f04b345e commit 63613e3ba1e188e9fece43e1613bd697f04b345e Author: Mark Johnston AuthorDate: 2024-04-01 17:20:55 +0000 Commit: Mark Johnston CommitDate: 2024-04-01 17:23:32 +0000 wg: Use ENETUNREACH when transmitting to a non-existent peer The old errno value used is specifically for Capsicum and shouldn't be co-opted in this way. It has special handling in the generic syscall layer (see syscallret()). OpenBSD returns ENETUNREACH in this case; let's do the same thing. Reviewed by: kevans, imp MFC after: 2 weeks Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D44582 --- sys/dev/wg/if_wg.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/sys/dev/wg/if_wg.c b/sys/dev/wg/if_wg.c index 42c426ac1819..bb61917ee4fc 100644 --- a/sys/dev/wg/if_wg.c +++ b/sys/dev/wg/if_wg.c @@ -251,9 +251,6 @@ struct wg_softc { #define MAX_LOOPS 8 #define MTAG_WGLOOP 0x77676c70 /* wglp */ -#ifndef ENOKEY -#define ENOKEY ENOTCAPABLE -#endif #define GROUPTASK_DRAIN(gtask) \ gtaskqueue_drain((gtask)->gt_taskqueue, &(gtask)->gt_task) @@ -2115,7 +2112,7 @@ wg_xmit(if_t ifp, struct mbuf *m, sa_family_t af, uint32_t mtu) BPF_MTAP2_AF(ifp, m, pkt->p_af); if (__predict_false(peer == NULL)) { - rc = ENOKEY; + rc = ENETUNREACH; goto err_xmit; } From nobody Mon Apr 1 17:44:37 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4V7dgT74v5z5GVd5; Mon, 1 Apr 2024 17:44:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4V7dgT6Vrdz4hjT; Mon, 1 Apr 2024 17:44:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711993477; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8JBzfzBDvIDr5UOChKX/CRHAG+/S+xRjxb4Wcob+bPs=; b=HW9wYIuLJGWtNuPjd/o/lTtojPQ+oZK/UOO7nFZKpgIQmMd5DF1Z3IlLs7aEiJAi87Sz78 4EWMQ9zsdhq3Z+7S8a0W5Dk4JTHirvN6YsaPuc3oq2E28FWldHXyUizcaKhnTZ6ImZdqej FFnexxEfjuYXNqOPZy0oUcz7Cj93Wd0ZMqgyIeWYcSavI5VuApJ3Ulcg55Kb7UIcgV7nbU o+ByWhImlFPmalCbsQqYu9rNkTe9IPSJLBs0/av+1WDyTrJwBZUTINGiKunDnIw2Oo1E5Q G59euSAd8a4ETpzyge1JH/hUdg0SQfPs6TM3c1ntZOJHsi8AktUSvxTIdZCQ+w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711993477; a=rsa-sha256; cv=none; b=kuoxS5SmSfxSV9l+07AuIXlRgdW+9kt7e1UPs8oB8zDi1l0+IHsTGtyG+q7Q6PZNL72FIz CtsD0qsLyABhc5lryHk+Y6HfjCdD+t723ujbOTBg8UfWuQ8m0TaHCw57BFFO30/PYuzlZC 5mWGS+JVQHgTIrGhMv3YA6H+v4rv2ddThXEp86ZwquEj/LkP+N2NpEw2HqEvm9aro1/IGk Tx+nJ4VeBJZJFNuyO3FaJf3SWxGiYgkGzxZ4dYQGwuWnQXAPTIYRag26ASrztJMt/vH9Tg SVusFxU15JGwdt5cg9EA233CNkMzCr5C/hnOkrTonmR8URaoK/+GQbcJPlQdyw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711993477; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8JBzfzBDvIDr5UOChKX/CRHAG+/S+xRjxb4Wcob+bPs=; b=Qti8wReWyValLEtSRBaWHBLB+AgWP2L/AsbBmCRSyHcnG7sXozALTPYUDvdJF9CQ/6xeXh 6mn6RPYGye7Bw7ZBE9YF1dcHYPy/ublDOHrOin+HuQkJf+v/64AtXnJsNmLr4noD5ktDwL 5eHathG5irgfWJpt1HbRdCvqCLY50kVxmF6pTymND/g773G6w86dRettbmPTlc2g5HnKCi I9dRxzhFq0OrRvB0ncexnyeoug8Grzki3/sDbTRMcqW477fuTFkpcVBnlECNfqseCw9K+C NbG8jt+iZDA/5f2CoOq6jrVJjZcer7O7rz/AJHI0nPE7Dk26nVLhZtZoQTcBHg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4V7dgT5vHrzFhB; Mon, 1 Apr 2024 17:44:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 431HibAF074302; Mon, 1 Apr 2024 17:44:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 431HibWo074299; Mon, 1 Apr 2024 17:44:37 GMT (envelope-from git) Date: Mon, 1 Apr 2024 17:44:37 GMT Message-Id: <202404011744.431HibWo074299@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: aaa1806f68ef - main - cp: Correct the list of non-portable flags. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: aaa1806f68ef3102a9b888a03360f166b88618c8 Auto-Submitted: auto-generated The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=aaa1806f68ef3102a9b888a03360f166b88618c8 commit aaa1806f68ef3102a9b888a03360f166b88618c8 Author: Dag-Erling Smørgrav AuthorDate: 2024-04-01 17:28:53 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2024-04-01 17:29:31 +0000 cp: Correct the list of non-portable flags. MFC after: 1 week Sponsored by: Klara, Inc. Reviewed by: kevans Differential Revision: https://reviews.freebsd.org/D44576 --- bin/cp/cp.1 | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/bin/cp/cp.1 b/bin/cp/cp.1 index 66d4ab04f5d3..d37776dda4d3 100644 --- a/bin/cp/cp.1 +++ b/bin/cp/cp.1 @@ -29,7 +29,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd December 14, 2023 +.Dd March 28, 2024 .Dt CP 1 .Os .Sh NAME @@ -309,12 +309,14 @@ differ as they copy special files as normal files while recreating a hierarchy. .Pp The +.Fl a , .Fl l , +.Fl N , +.Fl n , .Fl s , .Fl v , -.Fl x and -.Fl n +.Fl x options are non-standard and their use in scripts is not recommended. .Sh SEE ALSO .Xr mv 1 , From nobody Mon Apr 1 17:44:38 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4V7dgW0vkDz5GVd7; Mon, 1 Apr 2024 17:44:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4V7dgW09lQz4htn; Mon, 1 Apr 2024 17:44:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711993479; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ttWtcHkv0HcTjBapCTc4lZXXIHeXqrfCfVtAJlOqscI=; b=Fi/m5D6Qo5rNtso4+x8kTOVAxeO6rZdDIoQ9q/Imv8zh3k4//pgphike1tX64FF5kXw4UW UEd4g6LLHWH8kU2WmNuVryNoswKdaMOJrY3p1EnDhLOXfKhaxbSvP/RxmTbrnS/51vUNI5 iQsSYyZ+pJDtRASlrWU9EPK60giwjHXrDWArZTeFmJm0ZZ4+xxoWSHmGE5O4thpLdtDtEH 8PURkr8501CbYJ5gxQFygN3fLP+ELHYl+XvQwECXL1R8Y+kkR60L0brzfO0hc2conP18vt yQwofGYsdu1AR3nBgRFvTTNIF8Rw5/QdSePWyZ4NT9xhb+5J/ns3ipLAELhhCw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711993479; a=rsa-sha256; cv=none; b=YSdmYW84ZWK4KN5cx6Xk8ZhEvxLOCYi32QvQUyJfzMwmbkUwge5eLmnLj21FquFuc5t/U3 5QEOLW5cvUZ7nNcg7Z05cpy3ZVyvFC5Y4Pk+aXHIiVsyhETMrcTqY2xYeKohi6Nrm4WJLB 3ScsTu08NhC1FP8Z3IDETefsr2ANIP+cswJqSytXtU0RX492caIu8kILVj19ZYisZaJPno d88lUhrCBBCxSUKSWQGqwg1JfTibGrdz1dwlqHy3LKIQEdd3w1vw391GmzetEYQ5HSflKQ 50HHxyCvKCXr3ThJRNlx8yscNYC7bq6V3+K49jngNvERlHK/JGY72AvSdszeRw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711993479; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ttWtcHkv0HcTjBapCTc4lZXXIHeXqrfCfVtAJlOqscI=; b=R8hdUhr0uD21kV8tlP3TExbQz+IkxOZRXZcVO8jd9Vux8ritdYanWiqsqfo8t710DdjCuR t0D5cF4IeCEsoC/VV841DMn3yeI2A8IOnhSGDpnY6YRk7wwotiQyOEaG9OyzYBM5G0Nmwf 6yIdKA1VSdIB1mFU01Q8se5Lk+0/vv9dZBC7+jymMr9nLstjSyLUiGZQxg+OsMnt5ze/fJ e+NP+GjLm9f5bVs4X6HrHB45IFH/bE/13yIFMzBhPDE0NyEzy6dkUP47ae43bIxSNwLvVc PJ95ljuK2y/xjgZLfY6v/QkIsTMPcsvk70J0iAox8zxoFnLwJ66KCVRoFpr5Qg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4V7dgV6WQVzFwh; Mon, 1 Apr 2024 17:44:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 431HicgQ074350; Mon, 1 Apr 2024 17:44:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 431HicxH074347; Mon, 1 Apr 2024 17:44:38 GMT (envelope-from git) Date: Mon, 1 Apr 2024 17:44:38 GMT Message-Id: <202404011744.431HicxH074347@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: dd286b0dc187 - main - cp: Improved conformance when copying directories. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: dd286b0dc187c351a9537a363840245d5505b15b Auto-Submitted: auto-generated The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=dd286b0dc187c351a9537a363840245d5505b15b commit dd286b0dc187c351a9537a363840245d5505b15b Author: Dag-Erling Smørgrav AuthorDate: 2024-04-01 17:28:58 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2024-04-01 17:29:31 +0000 cp: Improved conformance when copying directories. * When copying a directory, if the destination exists and is not a directory, we would previously emit an error message and exit. The correct behavior according to POSIX is to emit an error message and continue without descending further into the source directory. * When copying a directory, if the destination does not exist and we fail to create it, we would previously emit an error message and exit. The correct behavior according to POSIX is to emit an error message and continue. Whether to descend further into the source directory is explicitly left unspecified; GNU cp does not, which seems to me to be the safer and less surprising option, so let's not either. MFC after: 1 week Sponsored by: Klara, Inc. Reviewed by: kevans Differential Revision: https://reviews.freebsd.org/D44577 --- bin/cp/cp.c | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/bin/cp/cp.c b/bin/cp/cp.c index 14d1cc2a3f75..02b879006a4f 100644 --- a/bin/cp/cp.c +++ b/bin/cp/cp.c @@ -506,9 +506,13 @@ copy(char *argv[], enum op type, int fts_options, struct stat *root_stat) * umask blocks owner writes, we fail. */ if (dne) { - if (mkdir(to.p_path, - curr->fts_statp->st_mode | S_IRWXU) < 0) - err(1, "%s", to.p_path); + mode = curr->fts_statp->st_mode | S_IRWXU; + if (mkdir(to.p_path, mode) != 0) { + warn("%s", to.p_path); + (void)fts_set(ftsp, curr, FTS_SKIP); + badcp = rval = 1; + break; + } /* * First DNE with a NULL root_stat is the root * path, so set root_stat. We can't really @@ -517,14 +521,19 @@ copy(char *argv[], enum op type, int fts_options, struct stat *root_stat) * first directory we created and use that. */ if (root_stat == NULL && - stat(to.p_path, &created_root_stat) == -1) { - err(1, "stat"); - } else if (root_stat == NULL) { - root_stat = &created_root_stat; + stat(to.p_path, &created_root_stat) != 0) { + warn("%s", to.p_path); + (void)fts_set(ftsp, curr, FTS_SKIP); + badcp = rval = 1; + break; } + if (root_stat == NULL) + root_stat = &created_root_stat; } else if (!S_ISDIR(to_stat.st_mode)) { - errno = ENOTDIR; - err(1, "%s", to.p_path); + warnc(ENOTDIR, "%s", to.p_path); + (void)fts_set(ftsp, curr, FTS_SKIP); + badcp = rval = 1; + break; } /* * Arrange to correct directory attributes later From nobody Mon Apr 1 19:18:57 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4V7gmK4SWyz5Gg1t; Mon, 1 Apr 2024 19:18:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4V7gmK3wSJz4s8p; Mon, 1 Apr 2024 19:18:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711999137; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RoW4YY9YDyPbmjjnwsqUZg9mCtkeIdjzSi4RhNI05Wk=; b=sQLyMJvXaEcec8CvMVf9bG3X1RCn+YpB3vg7VcfGX1npqv9z0qHVonjdycK1CzVoGtkqOT ND8TNV+fiODcyekPpNuMwneuHmQ+SKFkMEcgDykFT+CNPcTdXNPzrMTGkr8AfoBBFg09eM x8iHF8PNJ7hCgMJdu1Tl1kNY0rFmf8yHRfpCd3yJo8fnDra8gVj0eIXlACmlj3MK0EhdNX z2z2jsT6SyMYc7vv9hrI+IMKDlGGgMPqnZoLwsU1wORKvJv3MIUapF6/lsgamt7iBPxici Tqe6PocR2SK8kxx4i+3EdFD/B1+8crC1kDcI72AilP4EAemHB5tO2CWmiPE49g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711999137; a=rsa-sha256; cv=none; b=VSrIRvpTWqCTS+hEdQ9W6Hjh0uJll1+49Fdt8szy77CyhazlNjJSIeBrVezbx/5U/JdbKT VZdKGS2xuRkte7U9n7Eg6/yC+9VrvJzMafOZDGO9EN2jmykPCq8aUiEd2s0lUkVMRGB0gt +DkiTnVcmMC07rG6RGNvJYRY0wFkd5MzIlREXqgd5txMIS492Ou8EF01MHsn7oBjCjFflb A/AkHhwx58hl6ymK9ImGFoOPMZbgAJSZgdnohkoAiE6A2U9FS3AHJualsHzYVUCpm8CA2E jqxUBSVTgsITmw6On6hQ6z61MpCjkPm5DM+rvbVmWrEkzWwTt44MBnIrI/M+tA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711999137; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RoW4YY9YDyPbmjjnwsqUZg9mCtkeIdjzSi4RhNI05Wk=; b=HufT/R9ItwHE/1bJjIXaNyAGUNbnPPeGaPU+yfmpGmCzkAMYp/n6Tk5BCGVIIl+fdlP8/j y7wbih25GLPbTmd7EwUJc3xBSyMzeTNK6Xp7nJMr/vy7ABKbRAr2MgNUjBNgmjDmrfkDbx 12sab2n+1vDhusjO1fkHzAaGmUAHT5FZ8CKkAFcFl6UaEMZc+B6dRy90klp4rJEh6e0jIl yuJ9H0tpz2SQselaLms8C5NE0AlIqA8Jcv47Ajm4Sl4i/5SCrT10ueAuZpK9khXedF1W3f G0QSsOo9JDTjSnKf08rj1EL/hK1N3V2zEfi9GizfAXt8tlRThfUovt3iis93wA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4V7gmK3NwPzHrm; Mon, 1 Apr 2024 19:18: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 431JIvEN027656; Mon, 1 Apr 2024 19:18:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 431JIvUO027653; Mon, 1 Apr 2024 19:18:57 GMT (envelope-from git) Date: Mon, 1 Apr 2024 19:18:57 GMT Message-Id: <202404011918.431JIvUO027653@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Osipov Subject: git: e54b9d17f82d - stable/14 - freebsd-update: mark "cron" as fetched as "fetch" itself List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: michaelo X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: e54b9d17f82d5cb5efd84826706205442e6352cd Auto-Submitted: auto-generated The branch stable/14 has been updated by michaelo: URL: https://cgit.FreeBSD.org/src/commit/?id=e54b9d17f82d5cb5efd84826706205442e6352cd commit e54b9d17f82d5cb5efd84826706205442e6352cd Author: Michael Osipov AuthorDate: 2024-03-14 16:39:47 +0000 Commit: Michael Osipov CommitDate: 2024-04-01 19:18:15 +0000 freebsd-update: mark "cron" as fetched as "fetch" itself The change in 33bd05c3187d7b49c80cf1b0132b405c105d0833 was incomplete because it did not mark "cron" as ISFETCHED=1 although it performs the same operations as "install", but less output and does not perform a hard exit. Mark result as such and make "install" know that updates have been fetched. PR: 277699 Approved by: jrm (mentor), emaste, cperciva MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D44356 --- usr.sbin/freebsd-update/freebsd-update.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/usr.sbin/freebsd-update/freebsd-update.sh b/usr.sbin/freebsd-update/freebsd-update.sh index 551d40418240..9af6e8d711ed 100644 --- a/usr.sbin/freebsd-update/freebsd-update.sh +++ b/usr.sbin/freebsd-update/freebsd-update.sh @@ -3457,6 +3457,7 @@ cmd_cron () { [ ${VERBOSELEVEL} = "debug" ]; then mail -s "`hostname` security updates" ${MAILTO} < ${TMPFILE} fi + ISFETCHED=1 rm ${TMPFILE} } From nobody Mon Apr 1 19:20:08 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4V7gnh1jvgz5GgPZ; Mon, 1 Apr 2024 19:20: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 4V7gnh1BSxz4snL; Mon, 1 Apr 2024 19:20:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711999208; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Nd/m+NzGkZbPWGhyjDGTFTd19/mmo0P1ynp309fauEI=; b=R2oKoZkvYMoM8jtig5iBJlvqCcEEbpJGidNUWwOqrH+vr1Ov/l8w0LzZL+BYoI9C6Rrp0H xgrUBlAYd57iBBqWN+nhKHilYTabu7ezp8uR+dNnUwbu618Y8sot6cztva6FAAWlCwGOUl smRsnnYvogdq9ErRxgpbhnievrKI5EPK4dsfX23Xn02IIfhEX37wLICArw3wUgZvHe0Ib5 kBpA/eno10geEG3lmE3V6XVKPP4ptnrB0K/vOd4+NBxmLUwFXPk9FJ8OpCOOiNWpMOAJpw x4Vy2hG5XbVeUQsnJxPNixkxFEgtDVUD5hW49D/oYfqiF0jh7bK76mTMYROFLg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711999208; a=rsa-sha256; cv=none; b=qiX2RW6hik+0m8uCJ2fIEGY5K5Gp7PAor+oJVbY7j85fZsNornfZJfg1T4mtdB2q7o6Dbe 4dEQVypBzOgqulaYxRBeg/0aWaRVLvTEOr5mLuD958/xiBRgXoXE16Vs0QCcuPAcuX/3Vb xrTIjPMIthfwglwdGOeT0VhQNbXb59yu1oRSckqFN5+17QjEvom3BNemf3zYxdk1PlYMrw UbQ0glIponKT8VuhorG4B4g37XJYMiXJSxN4Uc7bV+QfAqXevNcxOi7bZ4EyrmWj57Ihha Z50gm0A06oJJrVm7z+nZ6CzFC5HG62H+x7Rdv9Y3S2ebD5DrNv2irK7+0xhfDg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711999208; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Nd/m+NzGkZbPWGhyjDGTFTd19/mmo0P1ynp309fauEI=; b=s00i0zL1PER7QbqCVD5azKba5w9AWgSLHrdFcA2oiMbgMB25BMDrGDFEB0wo/5fTlKWxfz RIq9bRCEAyBiQt/IyttBgWmetgzMZL1/fqVBOJvJ/KVLGM0qW8X60kRJy7g5ilW5W6c+5B u1eBL31N3YqXtbcn5wMrM+Amrw1rOdrC5PGC66rELgGo1dNCat4eT6Ree0rCpKdmGcRWcS zbwAOtYYjHuiZLXUL52Isc+0rSxBnSOplO+OE+hEWpnyWngeKc0XDjI6K8NOuDCRtcLL8x MdRrA157BnC3tljvTE+e/t16qumU4QjfReBos3KMqAu0v8N2nRq3AkqCoA/5cQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4V7gnh0nwkzHjc; Mon, 1 Apr 2024 19:20: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 431JK8Nm031201; Mon, 1 Apr 2024 19:20:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 431JK8tQ031197; Mon, 1 Apr 2024 19:20:08 GMT (envelope-from git) Date: Mon, 1 Apr 2024 19:20:08 GMT Message-Id: <202404011920.431JK8tQ031197@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Osipov Subject: git: fc5208028a78 - stable/13 - freebsd-update: mark "cron" as fetched as "fetch" itself List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: michaelo X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: fc5208028a78b014bdb1c77264c5b8c1823f9281 Auto-Submitted: auto-generated The branch stable/13 has been updated by michaelo: URL: https://cgit.FreeBSD.org/src/commit/?id=fc5208028a78b014bdb1c77264c5b8c1823f9281 commit fc5208028a78b014bdb1c77264c5b8c1823f9281 Author: Michael Osipov AuthorDate: 2024-03-14 16:39:47 +0000 Commit: Michael Osipov CommitDate: 2024-04-01 19:19:50 +0000 freebsd-update: mark "cron" as fetched as "fetch" itself The change in 33bd05c3187d7b49c80cf1b0132b405c105d0833 was incomplete because it did not mark "cron" as ISFETCHED=1 although it performs the same operations as "install", but less output and does not perform a hard exit. Mark result as such and make "install" know that updates have been fetched. PR: 277699 Approved by: jrm (mentor), emaste, cperciva MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D44356 --- usr.sbin/freebsd-update/freebsd-update.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/usr.sbin/freebsd-update/freebsd-update.sh b/usr.sbin/freebsd-update/freebsd-update.sh index 551d40418240..9af6e8d711ed 100644 --- a/usr.sbin/freebsd-update/freebsd-update.sh +++ b/usr.sbin/freebsd-update/freebsd-update.sh @@ -3457,6 +3457,7 @@ cmd_cron () { [ ${VERBOSELEVEL} = "debug" ]; then mail -s "`hostname` security updates" ${MAILTO} < ${TMPFILE} fi + ISFETCHED=1 rm ${TMPFILE} } From nobody Mon Apr 1 19:57:22 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4V7hcf5Fmyz5Gl9j; Mon, 1 Apr 2024 19:57:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4V7hcf4nXPz3yhv; Mon, 1 Apr 2024 19:57:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712001442; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/YfNoQuIsIzRffGXqFOENuXLz9wO1iIy0u5CVz9EAdg=; b=QR69S6YV0dDQwOn8FnFykTWQXROHmleD1xxH+ziFYcccdvTWjRCuzIMFfGMIUFmS9jvfHo wlgcO2YcCCNUvqiOZiuqv3xflIp74HpstJUTXhobN2egk5p/HPixKVQUxb5M0cxUQD35+2 Wo+kQfVTlxQzKoIO/c29KOyKAvjW0bwIajMa+yGb6vso72zznIkwe6tdE377Gw98gPX5+D 269bF+MO74HhDn7nMQO0p4pM5PQN2aQ568lebqrXEyeCdTj04Qq7p/vW5qwK6SRpQakGuW bTpbidmC/57a5A/PDqon8G5o9SbsYuxCQOit+Scao2aEgBeTHKyExnV6IVxkkw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712001442; a=rsa-sha256; cv=none; b=rMRmK48CgZrZ/2sYW+NvsJl5fv0UH9GtoYgoaIOqFbmkqAW9qf4b2Lrk3bG861ZvdX5HvG gYIeI90Xi55/xtWYu4Ec61EUU7AZGaiQYltKkduWUfxWnPXo2dtccZqwWwVTBoQ+JGIY4w 2V+SulJ6Drm5uVLRwXKqraJRF+EKE+zc9Ue9C21BNvEClOoYW/BOYa4QyeOMEgptGW/ZXZ LfV/RIwAuGmSLaxBXEwXsbp8S2ExZBrg1WaFVNqKGhJ5ShwjtP0MhgOhv+jTSykeqKoA4Q XTBfMY3AQkTpHos8CbMA7R+yjyierL76g7msvpfU7RaG7f3YfEdY3vQvSsW4Lg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712001442; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/YfNoQuIsIzRffGXqFOENuXLz9wO1iIy0u5CVz9EAdg=; b=X81Pqbp5DKYfsgtcX7knIm33s/FtT7TyOVM+p1hqGC7I2X3NpIlp1L0StVi6Gr810qzcZ8 Bxqex9ZiekFgHhXRqS8CSrOH2+wYzHQG1tTUIm/UZa7psy/RpTVSURg8pX6i++vxYsosip kOB1Ftl7MQViFF8RiI8v1Gpiq4+zsmE5GLRPuEU/w2A9D6z3gY+lJLPm+gaeuait2WGYhw 3DET3s0M9wON59/lFg3ZWB8njaHpNNgdlmmm453W8ZsW7SfRt0wXekqlQlUO4gyPc0Hm4t lUcVTo3FEwhgw4MZLnnEUjOYAIHL3ZGgL6/0aHgQrkEu5aXz1O+9CdnWLzeLAg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4V7hcf4Nn5zJhy; Mon, 1 Apr 2024 19:57:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 431JvMxD094483; Mon, 1 Apr 2024 19:57:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 431JvMfC094480; Mon, 1 Apr 2024 19:57:22 GMT (envelope-from git) Date: Mon, 1 Apr 2024 19:57:22 GMT Message-Id: <202404011957.431JvMfC094480@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Tuexen Subject: git: b600644fdd6c - main - tcp hpts: improve consistency List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b600644fdd6cefb1b90d76fdd5aa595946611a7d Auto-Submitted: auto-generated The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=b600644fdd6cefb1b90d76fdd5aa595946611a7d commit b600644fdd6cefb1b90d76fdd5aa595946611a7d Author: Michael Tuexen AuthorDate: 2024-04-01 19:51:59 +0000 Commit: Michael Tuexen CommitDate: 2024-04-01 19:51:59 +0000 tcp hpts: improve consistency The target_slot argument of max_slots_available() can be NULL. Therefore, check for this in all places. Right now, all callers provide non-NULL pointer. Reported by: Coverity Scan CID: 1527732 Reviewed by: rrs MFC after: 3 days Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D44527 --- sys/netinet/tcp_hpts.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/netinet/tcp_hpts.c b/sys/netinet/tcp_hpts.c index 222f8e0229dd..1e6578429acd 100644 --- a/sys/netinet/tcp_hpts.c +++ b/sys/netinet/tcp_hpts.c @@ -759,7 +759,8 @@ max_slots_available(struct tcp_hpts_entry *hpts, uint32_t wheel_slot, uint32_t * * "0". */ counter_u64_add(combined_wheel_wrap, 1); - *target_slot = hpts->p_nxt_slot; + if (target_slot) + *target_slot = hpts->p_nxt_slot; return (0); } else { /* From nobody Mon Apr 1 23:13:02 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4V7myQ4P14z5FMJn; Mon, 1 Apr 2024 23:13:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4V7myQ3qnGz4Mbn; Mon, 1 Apr 2024 23:13:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712013182; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fn0jes5oNsc36PTvRX56OYop+sbXAMdw0MuNcQ/PphA=; b=dBSVLtWi7fZONOHMRP05WVFAwMt8WWqkPxVrumnOV7EyreT6I7FXGtIV8BRv6MxeFtcf8h qzZjK1gPQwomkO4FcbxWx0xv4JKhL/EoJy3nkYLABAVuodCjQ9KkFFmqjON4WN7mdwSl9D yQkNbBvN+jl+IziHgcie5X/wEh3qV6EXC8fIvvHkuWINhhW145ufT9/2PzwLixlUIOlsRC 2UMd6amCwIcnbI8Wiez3kDbH75Hkw26D3jGYPSr7lURPBrrxGUUdFJeg4Ukz/RepVrGw7P Q8XlzMo8MJ+1MdDztPUlx3POL9SJUhpnohGE6QVX54wylVc6gdkyGYB4zuZdCw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712013182; a=rsa-sha256; cv=none; b=XkVoroP2xiTrvisQdiz6G2i+9DZLpeU7DHJ5LsU+zhhXTjlp6Qovj4pMQw659X25og3c0N pT7+YDr4PFMSYruCNaTln2X97RDrD0rTafA2wtTszwkGqbipoImAq5U4dWEwJxpHF/c7XZ 7z7bs/R65DLVOnevMRQN7e9JZtA0hHlTHvJNolkUcbR2Oz27mXMzKLgvtx+Nn0kYodoY1s g2aIh+J+HxL+pBW/QRpdrmlPN4eWCQz7CrH1ZDCxyCJ1pMvQ+vWcmCAEOXYJM62YiTkn/a hKEmCsIHBn5M3Afsk4b+sP1yn+b4rAy2zyu57ZlcLl/vKv3Mb/a6H1QX1+o8Ug== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712013182; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fn0jes5oNsc36PTvRX56OYop+sbXAMdw0MuNcQ/PphA=; b=v8mxjH6b04BxdV5LO5Ju8c9sRwLj3K3crtSQubByQYH6lEKbv8J7HtRKfLcrcLBRBdpcA2 f67iwMaUfLiT6LSMi6ocN4nENOlD9nxRhpolRNT4nOqdIkJlWIZCZKCS+jXCC0gEuHCmZD 5hpBSJl4rSiRlr4oGbN3iqzdgnWEGiY8PYUbSVS+oPYLmkkL31C9/XVHVN0ajzHnAWWFfh 4SlQK+LZFAxzx586VlDUlbjJKn0IMbGRqqw8qSxCF9DaBmVBjnZfPWwNAJeP0JW4IGSs0w 6efMilGkr7TOpFuylP2LAx37IHdGuoB3JiulWfwPvNoeHpQeCp7UWcjGmS4qzA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4V7myQ3N4nzQB6; Mon, 1 Apr 2024 23:13:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 431ND28B032869; Mon, 1 Apr 2024 23:13:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 431ND25Y032866; Mon, 1 Apr 2024 23:13:02 GMT (envelope-from git) Date: Mon, 1 Apr 2024 23:13:02 GMT Message-Id: <202404012313.431ND25Y032866@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 77c3e564b4b6 - main - ptrace tests: Fix a signed/unsigned integer comparison List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 77c3e564b4b65443a9d3298e0aec4c1387acd55e Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=77c3e564b4b65443a9d3298e0aec4c1387acd55e commit 77c3e564b4b65443a9d3298e0aec4c1387acd55e Author: Mark Johnston AuthorDate: 2024-04-01 23:10:36 +0000 Commit: Mark Johnston CommitDate: 2024-04-01 23:12:50 +0000 ptrace tests: Fix a signed/unsigned integer comparison Reported by: Jenkins Fixes: 43b4da44118e ("ptrace tests: Add a test using PROC_REAP_KILL to kill a traced debuggee") --- tests/sys/kern/ptrace_test.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/sys/kern/ptrace_test.c b/tests/sys/kern/ptrace_test.c index b65c84144ad0..675d90e144ae 100644 --- a/tests/sys/kern/ptrace_test.c +++ b/tests/sys/kern/ptrace_test.c @@ -4410,7 +4410,7 @@ ATF_TC_BODY(ptrace__reap_kill_stopped, tc) prk.rk_sig = SIGTERM; error = procctl(P_PID, getpid(), PROC_REAP_KILL, &prk); REQUIRE_EQ(error, 0); - REQUIRE_EQ(1, prk.rk_killed); + REQUIRE_EQ(1u, prk.rk_killed); REQUIRE_EQ(-1, prk.rk_fpid); } From nobody Mon Apr 1 23:47:27 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4V7nk75nqvz5FRVf; Mon, 1 Apr 2024 23: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 4V7nk75DX4z4QB6; Mon, 1 Apr 2024 23: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=1712015247; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Nx0+kTGqdXxg7KwbFAAOov37N62LmVx4ySTz+Mxql78=; b=Pz1MllZ6rAfzHZGhYtsEMGJu9XxC2k9gdEcuZpQPfVP6vGmuId487z4siLiF5RjW3SnQst pIZjuTTiTRGfy8CwJ5i2ZWDFfaMwVPcU3CeJNZWa0zDaUl1zAojDT+8F55Y2wgBn6B7fUu bCUGRbXUHJXOxxF2ZoJ11oQOg2JPLkIQGE3roTqEeosmrs8OENnZRvYIbLgey0SLfKTeJv M5KhSdV0ahlQTjy9YO5TpMt9uBDU/ujBLEKZeKM4Jak0GcOovVr6Ueoe8NIVpp7qF14Rb7 5nBNkMy+FDGzX3rn46AP/txLD8xZEWhjdPnvBLO0/n/fBEBIoF6JtlroSxgNIw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712015247; a=rsa-sha256; cv=none; b=angC23pd6iMVCcC13oESh2knPNiHFF2GETKYtuGTVX3ZFHXPbLW2KvYjtFT0gtnbfQYQ0P XuqhuNWSZ9m/yeq0zCjYxMuUST0GkegGboW0DFeC0nf+CUVe3/5/y2j0LZRCvl2V/N9/NC xdVOQmtKxrnJWDztC6ZgqR/skpCgXW9rbgDu19G8I8tKXaGmv4njztBvDgm/tnjyuMbPEa tX4mg8mqrsKLslGychDLYWZ9rSlpE/pR2ndMjLdszwxsCse9nHeLq6zGeKCBeg+bhXMXNx zH2MBNBqFnDyRxr7sH8M5QWKBsVIQBcjvIutjiY3eNOeNalDTPVi4msW+HKoMQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712015247; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Nx0+kTGqdXxg7KwbFAAOov37N62LmVx4ySTz+Mxql78=; b=jdv6cQv+l8RsP2WhyG7peC8+3dbhmOUf4nhlMuH7wK91M9VE0TfBEf6f6mHby2HHQPuvh2 ksEWAHn3JbmA0LEW0EJDM1b6D9ClQSZGwLHwbo91GHygYCO8L16LpRfM+KZ2TFXpdpOx7n bffsdKoQdgZmgxUG3I1lKp/htueWnst/wzQqcGsG0AKGjsmGxGVHwfMBS+8QDZWsrx8d32 ehDOm+I9IgIX65mNmLK3m4QbAD+x8VfKj6BM1sqYY+O8bRqSQYEc8pBBW7W9SPtY4N1Hnw yWF1LjQqN0NpuDHr00eP1w0cmSvubeAWXQPRBxXgHK93Z/R8TlkHDN0NHOEqVQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4V7nk74jfXzR1w; Mon, 1 Apr 2024 23: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 431NlRdH083897; Mon, 1 Apr 2024 23: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 431NlRiY083894; Mon, 1 Apr 2024 23:47:27 GMT (envelope-from git) Date: Mon, 1 Apr 2024 23:47:27 GMT Message-Id: <202404012347.431NlRiY083894@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: faf66c373ab7 - stable/14 - ath(4): always enable 11n List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: faf66c373ab7aef4bd2c9c90c0298a31c74da677 Auto-Submitted: auto-generated The branch stable/14 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=faf66c373ab7aef4bd2c9c90c0298a31c74da677 commit faf66c373ab7aef4bd2c9c90c0298a31c74da677 Author: Bjoern A. Zeeb AuthorDate: 2024-02-18 18:16:24 +0000 Commit: Bjoern A. Zeeb CommitDate: 2024-04-01 23:46:10 +0000 ath(4): always enable 11n Enabling 11n for ath(4) so far was handled by a kernel option, which was only enabled for certain kernel configurations. In order to allow loading ath(4) as a module with 11n support on all platforms, remove the kernel option and unconditionally enable 11n in ath(4). Reported by: pkubaj Reviewed by: adrian, imp (cherry picked from commit 89c1e54a71cc4e04d4c575ee6df956a12e163cde) --- sys/amd64/conf/GENERIC | 1 - sys/arm/conf/ARMADA38X | 1 - sys/conf/options | 1 - sys/dev/ath/if_athvar.h | 1 + sys/i386/conf/GENERIC | 1 - sys/powerpc/conf/GENERIC64 | 1 - sys/powerpc/conf/GENERIC64LE | 1 - 7 files changed, 1 insertion(+), 6 deletions(-) diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC index a88f5713de72..ab1c3856051b 100644 --- a/sys/amd64/conf/GENERIC +++ b/sys/amd64/conf/GENERIC @@ -291,7 +291,6 @@ device wlan_amrr # AMRR transmit rate control algorithm device ath # Atheros CardBus/PCI NICs device ath_hal # Atheros CardBus/PCI chip support options AH_AR5416_INTERRUPT_MITIGATION # AR5416 interrupt mitigation -options ATH_ENABLE_11N # Enable 802.11n support for AR5416 and later device ath_rate_sample # SampleRate tx rate control for ath #device bwi # Broadcom BCM430x/BCM431x wireless NICs. #device bwn # Broadcom BCM43xx wireless NICs. diff --git a/sys/arm/conf/ARMADA38X b/sys/arm/conf/ARMADA38X index d0c7ddcef60b..bb7ef098f350 100644 --- a/sys/arm/conf/ARMADA38X +++ b/sys/arm/conf/ARMADA38X @@ -90,7 +90,6 @@ device wlan # 802.11 support device ath # Atheros CardBus/PCI NICs device ath_hal device ath_rate_sample -options ATH_ENABLE_11N # CESA device cesa diff --git a/sys/conf/options b/sys/conf/options index c4da2e595ea3..afeb4bd83c06 100644 --- a/sys/conf/options +++ b/sys/conf/options @@ -814,7 +814,6 @@ ATH_TXBUF opt_ath.h ATH_RXBUF opt_ath.h ATH_DIAGAPI opt_ath.h ATH_TX99_DIAG opt_ath.h -ATH_ENABLE_11N opt_ath.h ATH_ENABLE_DFS opt_ath.h ATH_EEPROM_FIRMWARE opt_ath.h ATH_ENABLE_RADIOTAP_VENDOR_EXT opt_ath.h diff --git a/sys/dev/ath/if_athvar.h b/sys/dev/ath/if_athvar.h index f706b360946a..96c4318d5987 100644 --- a/sys/dev/ath/if_athvar.h +++ b/sys/dev/ath/if_athvar.h @@ -59,6 +59,7 @@ /* * 802.11n requires more TX and RX buffers to do AMPDU. */ +#define ATH_ENABLE_11N /* 802.11n support for AR5416 and later */ #ifdef ATH_ENABLE_11N #define ATH_TXBUF 512 #define ATH_RXBUF 512 diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC index c8e9cd439d74..1a57015d0dcc 100644 --- a/sys/i386/conf/GENERIC +++ b/sys/i386/conf/GENERIC @@ -250,7 +250,6 @@ device wlan_amrr # AMRR transmit rate control algorithm device ath # Atheros CardBus/PCI NICs device ath_hal # Atheros CardBus/PCI chip support options AH_AR5416_INTERRUPT_MITIGATION # AR5416 interrupt mitigation -options ATH_ENABLE_11N # Enable 802.11n support for AR5416 and later device ath_rate_sample # SampleRate tx rate control for ath #device bwi # Broadcom BCM430x/BCM431x wireless NICs. #device bwn # Broadcom BCM43xx wireless NICs. diff --git a/sys/powerpc/conf/GENERIC64 b/sys/powerpc/conf/GENERIC64 index c413e37b44fb..1e91a4cc9455 100644 --- a/sys/powerpc/conf/GENERIC64 +++ b/sys/powerpc/conf/GENERIC64 @@ -234,7 +234,6 @@ device wlan_amrr # AMRR transmit rate control algorithm device ath # Atheros CardBus/PCI NICs device ath_hal # Atheros CardBus/PCI chip support options AH_AR5416_INTERRUPT_MITIGATION # AR5416 interrupt mitigation -options ATH_ENABLE_11N # Enable 802.11n support for AR5416 and later device ath_rate_sample # SampleRate tx rate control for ath # FireWire support diff --git a/sys/powerpc/conf/GENERIC64LE b/sys/powerpc/conf/GENERIC64LE index 83cf664bd5d7..d05308b9f0b9 100644 --- a/sys/powerpc/conf/GENERIC64LE +++ b/sys/powerpc/conf/GENERIC64LE @@ -230,7 +230,6 @@ device wlan_amrr # AMRR transmit rate control algorithm device ath # Atheros CardBus/PCI NICs device ath_hal # Atheros CardBus/PCI chip support options AH_AR5416_INTERRUPT_MITIGATION # AR5416 interrupt mitigation -options ATH_ENABLE_11N # Enable 802.11n support for AR5416 and later device ath_rate_sample # SampleRate tx rate control for ath # FireWire support From nobody Mon Apr 1 23:47:28 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4V7nk91jpGz5FRSH; Mon, 1 Apr 2024 23:47:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4V7nk85tSqz4QCf; Mon, 1 Apr 2024 23:47:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712015248; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ODACNkdORah275F8Pl9m8KIKT5WcX29f5kE9A3ZGPYM=; b=x2xnQuCrbgog29Qb9XM+S/wciFgxt2dNRr0heDKzpPGMOOC358oilWsLEXA02MFSQHP1tF bNCpWd6IjBXCFzN9BmZHiD4oZrr8eGtYJ2Z6wSSs6CMd3WxCZq280SurRQpscSKF9Dy8Gm m/iaYTOXnWUrr9TEpQiGYD9Qh/ww07uI4MHHZsRP8sHhOG2+FyCsZVbx6ff4AE8CW3O46s 6ZeKeYo+BVavVDQh57NEwm2bGgy1Rif+YI/CcPZgWPzyCVILVj/u2c7zjwuMUDpzLOZ/ez 9dPmwk727ohqqypg6kWAn/PwyH/R2o/cX+24/dMpIqukiwsdAg2cZrC/IwnOcg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712015248; a=rsa-sha256; cv=none; b=BZACSUnSCL4CZ/5iZHLy0gmoDqfXOCuf1mT6ZFjSvP1RFwMtf8HUMiMLUgnTIl2KDxebhG DdxVnLYlHtWkmWpArg9r18tPmo0TitJKW8JivNZErDuQs1r5hhYOBD+VqiR3GN9l44XPuc 6DqBq/b1+NE7/Y/nZEHRTJef2jf5VnxZkRKu7cW22UOSrQbEGpwhIvrBTNN17huDo6QeCT GPneMHpYSXNQzTM3moSvRDNEZKBzEwZFMSqvd5IZ0dRSXrCDUv2XiqrfJ4TqXMWy7CrG5h w0S0fRosgS7PmUiuYnrvLQCug5HnNg5LRPJWjnZ+FTARCmCLjviikh9Zu5iWRg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712015248; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ODACNkdORah275F8Pl9m8KIKT5WcX29f5kE9A3ZGPYM=; b=VALqJ7XJzRXwZ515ab78unWHAJrBcp7tihDAuVpqrcTNHGNrgtVVa9XL8OmawIzOISkbXy ZqjWvBQPHSExzIynFOoOgQ2WDIkeXBjQI8Ipf9/43H9exoTRPGp/nBeWLuJTa30ZiMrOTc R5zc8xCEnG6Z1m8nB7VEdlc3AMdWplII1f91xis1nksGXMXXXGpAspXvy5zUHpLUFBatOk P+CwjqLlld6t1w9NzvFk6WhTW91w6uIatwal5ToTQ9r4yKDdh0EYw7VvRq4N58OTov2SFD uJqO+uzmQJK8NxRuZXRKAudCDqFfUgC/BD6bUhRS2P3MbC/5CxfRx98NHxm+FQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4V7nk85VbmzR5J; Mon, 1 Apr 2024 23:47: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 431NlSFv083948; Mon, 1 Apr 2024 23:47:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 431NlS2g083945; Mon, 1 Apr 2024 23:47:28 GMT (envelope-from git) Date: Mon, 1 Apr 2024 23:47:28 GMT Message-Id: <202404012347.431NlS2g083945@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 21b6420f67cf - stable/14 - ath_hal/ar9300: allow JUPITER cards to read eeprom List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 21b6420f67cff32e69452a7e3822af37659eb4b8 Auto-Submitted: auto-generated The branch stable/14 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=21b6420f67cff32e69452a7e3822af37659eb4b8 commit 21b6420f67cff32e69452a7e3822af37659eb4b8 Author: Bjoern A. Zeeb AuthorDate: 2024-03-12 21:22:36 +0000 Commit: Bjoern A. Zeeb CommitDate: 2024-04-01 23:46:10 +0000 ath_hal/ar9300: allow JUPITER cards to read eeprom In ar9300_eeprom_read_word() also allow JUPITER cards read the eeprom instead of returning an error. While this will not help all the 9462, 9485, 9565 OEM cards to work, it will make debugging of the next steps a lot easier. While here fix a typo in the error message if we do not get CAL. PR: 255337 Tested by: John Nielsen (john jnielsen net) Reviewed by: adrian (cherry picked from commit f254aad33dfb5ce18b6b97b7d036b420310e9ed5) --- sys/contrib/dev/ath/ath_hal/ar9300/ar9300_eeprom.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_eeprom.c b/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_eeprom.c index 0251222c50b4..073428c8fa71 100644 --- a/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_eeprom.c +++ b/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_eeprom.c @@ -225,7 +225,7 @@ ar9300_eeprom_restore_something(struct ath_hal *ah, ar9300_eeprom_t *mptr, HAL_BOOL ar9300_eeprom_read_word(struct ath_hal *ah, u_int off, u_int16_t *data) { - if (AR_SREV_OSPREY(ah) || AR_SREV_POSEIDON(ah)) + if (AR_SREV_OSPREY(ah) || AR_SREV_POSEIDON(ah) || AR_SREV_JUPITER(ah)) { (void) OS_REG_READ(ah, AR9300_EEPROM_OFFSET + (off << AR9300_EEPROM_S)); if (!ath_hal_wait(ah, @@ -4319,7 +4319,7 @@ ar9300_eeprom_restore_internal(struct ath_hal *ah, ar9300_eeprom_t *mptr, } #endif if (nptr < 0) { - ath_hal_printf(ah, "%s[%d] No vaid CAL, calling default template\n", + ath_hal_printf(ah, "%s[%d] No valid CAL, calling default template\n", __func__, __LINE__); nptr = ar9300_eeprom_restore_something(ah, mptr, mdata_size); } From nobody Mon Apr 1 23:47:29 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4V7nkB05prz5FRP2; Mon, 1 Apr 2024 23:47:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4V7nk96XsDz4Q7c; Mon, 1 Apr 2024 23:47:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712015249; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZekT35PTutV3ZQUxiXQUlSAvF7/3fYHOT3BINSJYOwM=; b=ycNNDpom8s0vZY/kf/sRMEGfI4gXhPzZD/+SfjZo1bc9MlVpRNjglpTZ1Xp6vqwxKsFjEH Z6tj/NFMmeIKzWjoedZmqohcfxmQA+zzoOYYVOry6h4HtjHPoAbler4Fgg9oZpL3PqKJMb BKRaQ2dxwSjktrCBkFEDYC2MccOroCXjLEc0snC9+q+fGoGB7Bu8S7gegAdRwAFH88mgXX HTIDDLfyJ/hzoNcuoGy8EZzWjDaNX1FFxPfB3lzJTm5418JHHe6HuovpXyrm1foXEguWQ1 ZjqVxyMCPqPFEeTrWWvcXGjnTPq2PC9GtX9joMONU5XI04A6UZl5EISGsPhyLQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712015249; a=rsa-sha256; cv=none; b=bj8U+Wl/b6giq/X75EG0+nKmB2yBxnGuPS40YhVOC6xqwt5DkWUnaE0l/cEKhL7yKjQsmM zLMnXtC65w96AVUuJA+Y8MVjL7OeymWNsy0Na50eoOQMq4ystYR3PhLh15g5ooqF85XnFN YrROl86gqYaNutETFrWJIWUb5T1ZXFJT1kPBhLnSvtdeiPz4OnJfX/J39VY/txCKeM77m+ WZPDpkjSzEpfCGBq8n8tRhy4sZ8rebztsEOiqq5mReiWAlhokpPeApAR4d1rIl81mmd6j6 5zPQYyFJL+ZmrVXHBIvfj3Uj6EiIuBByCBV5LNYeN1D38rMvM1EQtbv9B2Flww== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712015249; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZekT35PTutV3ZQUxiXQUlSAvF7/3fYHOT3BINSJYOwM=; b=rtcDa1w8Jun2u9DiKNriIi2IKNpEImSKLETpk83sDwJ5UoRVrEIX9sy6cvrEx5KVRoc3l5 HxONbJYYH93rBDKHRUsbPloauuoecEjjCMNpadZJ7n331e3X6wRp3B3PB9chO+2hW25D5u salgF/y9gRoelEcXfbxJTfSZYa5/w7JOatsn791dzrkil3zD3bjmTmNxKGEG7+StGFbhN3 vl8Vcle7155PpC896I2cXSQLBeODMuminK8zmP6ovAKNmp0BSYUujg/ztrJE+9+NNdtMZz xwlATaAtWpClfEFCW6AGb9sa0SH2S2yIsvjeX0pCa71wfeBuQJyZgGM5W2fukQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4V7nk968zTzQnD; Mon, 1 Apr 2024 23:47:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 431NlTal084002; Mon, 1 Apr 2024 23:47:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 431NlTBs083999; Mon, 1 Apr 2024 23:47:29 GMT (envelope-from git) Date: Mon, 1 Apr 2024 23:47:29 GMT Message-Id: <202404012347.431NlTBs083999@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 4bce8178af85 - stable/14 - iicbus/mux/pca954x: add support for PCA9546 I2C Switch List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 4bce8178af8544cf0cc2cfc742bbe50ad43af738 Auto-Submitted: auto-generated The branch stable/14 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=4bce8178af8544cf0cc2cfc742bbe50ad43af738 commit 4bce8178af8544cf0cc2cfc742bbe50ad43af738 Author: Bjoern A. Zeeb AuthorDate: 2024-02-21 09:10:55 +0000 Commit: Bjoern A. Zeeb CommitDate: 2024-04-01 23:46:10 +0000 iicbus/mux/pca954x: add support for PCA9546 I2C Switch Add support for the 4 channel I2C switch from NXP by adding a new description struct and the list entries. Compared to x=[2345] which require code to support the INT, for this one no further changes are needed. Tested on: WHLE-LS1088A using a SPF+ Reviewed by: imp (cherry picked from commit c81df1c112621803abe6a43aa89238c830e86b72) --- sys/dev/iicbus/mux/pca954x.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/sys/dev/iicbus/mux/pca954x.c b/sys/dev/iicbus/mux/pca954x.c index aebd55d6c311..befa0db39172 100644 --- a/sys/dev/iicbus/mux/pca954x.c +++ b/sys/dev/iicbus/mux/pca954x.c @@ -3,7 +3,7 @@ * * Copyright (c) 2019 Ian Lepore * Copyright (c) 2020-2021 Andriy Gapon - * Copyright (c) 2022 Bjoern A. Zeeb + * Copyright (c) 2022-2024 Bjoern A. Zeeb * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -69,6 +69,13 @@ static struct pca954x_descr pca9540_descr = { .enable = 0x04, }; +static struct pca954x_descr pca9546_descr = { + .partname = "pca9546", + .description = "PCA9546 I2C Switch", + .type = PCA954X_SW, + .numchannels = 4, +}; + static struct pca954x_descr pca9547_descr = { .partname = "pca9547", .description = "PCA9547 I2C Mux", @@ -87,6 +94,7 @@ static struct pca954x_descr pca9548_descr = { #ifdef FDT static struct ofw_compat_data compat_data[] = { { "nxp,pca9540", (uintptr_t)&pca9540_descr }, + { "nxp,pca9546", (uintptr_t)&pca9546_descr }, { "nxp,pca9547", (uintptr_t)&pca9547_descr }, { "nxp,pca9548", (uintptr_t)&pca9548_descr }, { NULL, 0 }, @@ -94,6 +102,7 @@ static struct ofw_compat_data compat_data[] = { #else static struct pca954x_descr *part_descrs[] = { &pca9540_descr, + &pca9546_descr, &pca9547_descr, &pca9548_descr, }; From nobody Mon Apr 1 23:47:30 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4V7nkD0ZbVz5FRSL; Mon, 1 Apr 2024 23:47:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4V7nkC0hwtz4Q3M; Mon, 1 Apr 2024 23:47:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712015251; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0pLPaqIv5i4rSmcETzybOT0if6B91HEm4FkQdNwRKDA=; b=bz5Nq2FbYud7vFkNsQgsNduEZ4F7vjdr78q1rusoVQ2IkZnk9mSEAk8CiI9Dj0fESZ6M4A dVRrQajnlCl2hX8gTbhlvbdZNb45tL14CnvOL5Zrs+S+u359UqzQ2bwTQFceTxlhYbpACV vuejhzMBJuxa5OCIQQj/xNYi8C5LqrcKJ9s5Nh81Wtin+duGVF3IBBXV4Gz6kYcqP97Bbr cklqvXRkfvmYNgLDCEK06u2CetNsC2LWHKwEIOOLJPut0vVSG0NW73JXK4AUHrmcUXUTn1 1IGb7ZcreqYliwhMwTwt5I94E+t30KzQtFYvTIqxFP/9Pc9LGDkyG6SLpbV+zQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712015251; a=rsa-sha256; cv=none; b=uhgXsjSV0FwxRImdkwpz8uWQVBHobc3FWtW646eOHyz+i9XCgITxdhIe6MftCV3Mv2GFj8 /PNb+Huz1cGWRSjxZ26ggdM5p922GSI/26/Vx5lcbQ5ejDZ3m1GMb+IzR6jdWx5dyro4wD h7FD71B9Z2FlxisftYk56vuX3RJvBaYFsQfFDij2whrQjreqewnFnMTcFNOXtVgaeYE7Yu CM7a17ydICfCkaLPU7sKuCIyUGsun2SKEmGuvKld+ZnxB4ut5p+m3EXelEwXT1jis07gRg YK6PQ4rkv0hIWV8XhYmv6AWLNG1FWF//J2dpD2EFiE4Xsr5Vjgm191fxbw0Uww== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712015251; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0pLPaqIv5i4rSmcETzybOT0if6B91HEm4FkQdNwRKDA=; b=OAmdPzDb8QbBKuz1h7w/WbGOGO0uCip3GeiFr7Ai40biukfi/LgkOIpPeFVbNT/0LZHPuq mxi6bceXJqYBRIy9d/hGbJsyRbmzSLTWecPfhLKPkfrV7w7/S9wxf11ch8nP5+z0GDtmK9 oMzlr7kKPkvpaPgZtPZpHkJ/FFL4j0vtuy6cJ02w4d/w0L2OpVBhHVwohuX82jEwLBBXVE WCh3IVQIKEw12bIUAXmQFbArP1YZp+poaX/W8N+RkspAfYcoOwZeiJ6Gbg5iWx9/Vzi7Kk RJQBddKtW4iJqCWFFuLt7bEbX4rrtEiLVph26SdtxCnfQugVh3JfNvtF+CpSSQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4V7nkC06BWzQbk; Mon, 1 Apr 2024 23:47:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 431NlUiG084053; Mon, 1 Apr 2024 23:47:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 431NlUnk084050; Mon, 1 Apr 2024 23:47:30 GMT (envelope-from git) Date: Mon, 1 Apr 2024 23:47:30 GMT Message-Id: <202404012347.431NlUnk084050@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: dd167e59079b - stable/14 - LinuxKPI: 802.11: implement a deferred RX path List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: dd167e59079b65a53a45744055db6634f3c19a56 Auto-Submitted: auto-generated The branch stable/14 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=dd167e59079b65a53a45744055db6634f3c19a56 commit dd167e59079b65a53a45744055db6634f3c19a56 Author: Bjoern A. Zeeb AuthorDate: 2024-02-12 16:03:13 +0000 Commit: Bjoern A. Zeeb CommitDate: 2024-04-01 23:46:10 +0000 LinuxKPI: 802.11: implement a deferred RX path Some calls, e.g., action frames cause us to call through all the way down to firmware from the RX path without any deferral in net80211. For LinuxKPI and iwlwifi this goes (with omissions) like this: lkpi_napi_task -> linuxkpi_ieee80211_rx -> ieee80211_input_mimo -> sta_input -> ht_recv_action_ba_addba_request -> lkpi_ic_ampdu_rx_start -> iwl_mvm_mac_ampdu_action -> iwl_trans_txq_send_hcmd. At that point we are waiting for an interrupt from the firmware but given the lkpi_napi_task has not finished (and may have more to dispatch based on budget and what was received) we will not see the new interrupt/fw response. With no answer from the firmware, the software timeout in the driver kills the command and the firmware and issues a complete restart. Implement the deferred RX path in LinuxKPI for the moment. At a later point we should carefully shift this into net80211. This fixes the hangs for (*ic_ampdu_rx_start)() calls with iwlwifi. PR: 276083 Reviewed by: cc (cherry picked from commit 759a996d610d9354aac5c48a6bdc9cedcba2f48b) --- sys/compat/linuxkpi/common/src/linux_80211.c | 134 ++++++++++++++++++++++++--- sys/compat/linuxkpi/common/src/linux_80211.h | 31 +++++++ 2 files changed, 154 insertions(+), 11 deletions(-) diff --git a/sys/compat/linuxkpi/common/src/linux_80211.c b/sys/compat/linuxkpi/common/src/linux_80211.c index e365e0f574e4..57b3609b2290 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211.c +++ b/sys/compat/linuxkpi/common/src/linux_80211.c @@ -145,6 +145,7 @@ const struct cfg80211_ops linuxkpi_mac80211cfgops = { static struct lkpi_sta *lkpi_find_lsta_by_ni(struct lkpi_vif *, struct ieee80211_node *); static void lkpi_80211_txq_task(void *, int); +static void lkpi_80211_lhw_rxq_task(void *, int); static void lkpi_ieee80211_free_skb_mbuf(void *); #ifdef LKPI_80211_WME static int lkpi_wme_update(struct lkpi_hw *, struct ieee80211vap *, bool); @@ -4272,6 +4273,12 @@ linuxkpi_ieee80211_alloc_hw(size_t priv_len, const struct ieee80211_ops *ops) TAILQ_INIT(&lhw->scheduled_txqs[ac]); } + /* Deferred RX path. */ + LKPI_80211_LHW_RXQ_LOCK_INIT(lhw); + TASK_INIT(&lhw->rxq_task, 0, lkpi_80211_lhw_rxq_task, lhw); + mbufq_init(&lhw->rxq, IFQ_MAXLEN); + lhw->rxq_stopped = false; + /* * XXX-BZ TODO make sure there is a "_null" function to all ops * not initialized. @@ -4297,11 +4304,42 @@ void linuxkpi_ieee80211_iffree(struct ieee80211_hw *hw) { struct lkpi_hw *lhw; + struct mbuf *m; lhw = HW_TO_LHW(hw); free(lhw->ic, M_LKPI80211); lhw->ic = NULL; + /* + * Drain the deferred RX path. + */ + LKPI_80211_LHW_RXQ_LOCK(lhw); + lhw->rxq_stopped = true; + LKPI_80211_LHW_RXQ_UNLOCK(lhw); + + /* Drain taskq, won't be restarted due to rxq_stopped being set. */ + while (taskqueue_cancel(taskqueue_thread, &lhw->rxq_task, NULL) != 0) + taskqueue_drain(taskqueue_thread, &lhw->rxq_task); + + /* Flush mbufq (make sure to release ni refs!). */ + m = mbufq_dequeue(&lhw->rxq); + while (m != NULL) { + struct m_tag *mtag; + + mtag = m_tag_locate(m, MTAG_ABI_LKPI80211, LKPI80211_TAG_RXNI, NULL); + if (mtag != NULL) { + struct lkpi_80211_tag_rxni *rxni; + + rxni = (struct lkpi_80211_tag_rxni *)(mtag + 1); + ieee80211_free_node(rxni->ni); + } + m_freem(m); + m = mbufq_dequeue(&lhw->rxq); + } + KASSERT(mbufq_empty(&lhw->rxq), ("%s: lhw %p has rxq len %d != 0\n", + __func__, lhw, mbufq_len(&lhw->rxq))); + LKPI_80211_LHW_RXQ_LOCK_DESTROY(lhw); + /* Cleanup more of lhw here or in wiphy_free()? */ LKPI_80211_LHW_TXQ_LOCK_DESTROY(lhw); LKPI_80211_LHW_SCAN_LOCK_DESTROY(lhw); @@ -4796,6 +4834,66 @@ linuxkpi_ieee80211_scan_completed(struct ieee80211_hw *hw, return; } +static void +lkpi_80211_lhw_rxq_rx_one(struct lkpi_hw *lhw, struct mbuf *m) +{ + struct ieee80211_node *ni; + struct m_tag *mtag; + int ok; + + ni = NULL; + mtag = m_tag_locate(m, MTAG_ABI_LKPI80211, LKPI80211_TAG_RXNI, NULL); + if (mtag != NULL) { + struct lkpi_80211_tag_rxni *rxni; + + rxni = (struct lkpi_80211_tag_rxni *)(mtag + 1); + ni = rxni->ni; + } + + if (ni != NULL) { + ok = ieee80211_input_mimo(ni, m); + ieee80211_free_node(ni); /* Release the reference. */ + if (ok < 0) + m_freem(m); + } else { + ok = ieee80211_input_mimo_all(lhw->ic, m); + /* mbuf got consumed. */ + } + +#ifdef LINUXKPI_DEBUG_80211 + if (linuxkpi_debug_80211 & D80211_TRACE_RX) + printf("TRACE %s: handled frame type %#0x\n", __func__, ok); +#endif +} + +static void +lkpi_80211_lhw_rxq_task(void *ctx, int pending) +{ + struct lkpi_hw *lhw; + struct mbufq mq; + struct mbuf *m; + + lhw = ctx; + +#ifdef LINUXKPI_DEBUG_80211 + if (linuxkpi_debug_80211 & D80211_TRACE_RX) + printf("%s:%d lhw %p pending %d mbuf_qlen %d\n", + __func__, __LINE__, lhw, pending, mbufq_len(&lhw->rxq)); +#endif + + mbufq_init(&mq, IFQ_MAXLEN); + + LKPI_80211_LHW_RXQ_LOCK(lhw); + mbufq_concat(&mq, &lhw->rxq); + LKPI_80211_LHW_RXQ_UNLOCK(lhw); + + m = mbufq_dequeue(&mq); + while (m != NULL) { + lkpi_80211_lhw_rxq_rx_one(lhw, m); + m = mbufq_dequeue(&mq); + } +} + /* For %list see comment towards the end of the function. */ void linuxkpi_ieee80211_rx(struct ieee80211_hw *hw, struct sk_buff *skb, @@ -5019,20 +5117,34 @@ skip_device_ts: } #endif + /* + * Attach meta-information to the mbuf for the deferred RX path. + * Currently this is best-effort. Should we need to be hard, + * drop the frame and goto err; + */ if (ni != NULL) { - ok = ieee80211_input_mimo(ni, m); - ieee80211_free_node(ni); - if (ok < 0) - m_freem(m); - } else { - ok = ieee80211_input_mimo_all(ic, m); - /* mbuf got consumed. */ + struct m_tag *mtag; + struct lkpi_80211_tag_rxni *rxni; + + mtag = m_tag_alloc(MTAG_ABI_LKPI80211, LKPI80211_TAG_RXNI, + sizeof(*rxni), IEEE80211_M_NOWAIT); + if (mtag != NULL) { + rxni = (struct lkpi_80211_tag_rxni *)(mtag + 1); + rxni->ni = ni; /* We hold a reference. */ + m_tag_prepend(m, mtag); + } } -#ifdef LINUXKPI_DEBUG_80211 - if (linuxkpi_debug_80211 & D80211_TRACE_RX) - printf("TRACE %s: handled frame type %#0x\n", __func__, ok); -#endif + LKPI_80211_LHW_RXQ_LOCK(lhw); + if (lhw->rxq_stopped) { + LKPI_80211_LHW_RXQ_UNLOCK(lhw); + m_freem(m); + goto err; + } + + mbufq_enqueue(&lhw->rxq, m); + taskqueue_enqueue(taskqueue_thread, &lhw->rxq_task); + LKPI_80211_LHW_RXQ_UNLOCK(lhw); IMPROVE(); diff --git a/sys/compat/linuxkpi/common/src/linux_80211.h b/sys/compat/linuxkpi/common/src/linux_80211.h index d25614de56dc..b0156a5ade3f 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211.h +++ b/sys/compat/linuxkpi/common/src/linux_80211.h @@ -76,6 +76,18 @@ if (linuxkpi_debug_80211 & D80211_TRACE_MODE_HT) \ printf("%s:%d: XXX LKPI80211 IMPROVE_HT\n", __func__, __LINE__) +#define MTAG_ABI_LKPI80211 1707696513 /* LinuxKPI 802.11 KBI */ + +/* + * Deferred RX path. + * We need to pass *ni along (and possibly more in the future so + * we use a struct right from the start. + */ +#define LKPI80211_TAG_RXNI 0 /* deferred RX path */ +struct lkpi_80211_tag_rxni { + struct ieee80211_node *ni; /* MUST hold a reference to it. */ +}; + struct lkpi_radiotap_tx_hdr { struct ieee80211_radiotap_header wt_ihdr; uint8_t wt_flags; @@ -192,6 +204,11 @@ struct lkpi_hw { /* name it mac80211_sc? */ uint32_t txq_generation[IEEE80211_NUM_ACS]; TAILQ_HEAD(, lkpi_txq) scheduled_txqs[IEEE80211_NUM_ACS]; + /* Deferred RX path. */ + struct task rxq_task; + struct mbufq rxq; + struct mtx rxq_mtx; + /* Scan functions we overload to handle depending on scan mode. */ void (*ic_scan_curchan)(struct ieee80211_scan_state *, unsigned long); @@ -240,6 +257,7 @@ struct lkpi_hw { /* name it mac80211_sc? */ bool update_mc; bool update_wme; + bool rxq_stopped; /* Must be last! */ struct ieee80211_hw hw __aligned(CACHE_LINE_SIZE); @@ -304,6 +322,19 @@ struct lkpi_wiphy { #define LKPI_80211_LHW_TXQ_UNLOCK_ASSERT(_lhw) \ mtx_assert(&(_lhw)->txq_mtx, MA_NOTOWNED) +#define LKPI_80211_LHW_RXQ_LOCK_INIT(_lhw) \ + mtx_init(&(_lhw)->rxq_mtx, "lhw-rxq", NULL, MTX_DEF | MTX_RECURSE); +#define LKPI_80211_LHW_RXQ_LOCK_DESTROY(_lhw) \ + mtx_destroy(&(_lhw)->rxq_mtx); +#define LKPI_80211_LHW_RXQ_LOCK(_lhw) \ + mtx_lock(&(_lhw)->rxq_mtx) +#define LKPI_80211_LHW_RXQ_UNLOCK(_lhw) \ + mtx_unlock(&(_lhw)->rxq_mtx) +#define LKPI_80211_LHW_RXQ_LOCK_ASSERT(_lhw) \ + mtx_assert(&(_lhw)->rxq_mtx, MA_OWNED) +#define LKPI_80211_LHW_RXQ_UNLOCK_ASSERT(_lhw) \ + mtx_assert(&(_lhw)->rxq_mtx, MA_NOTOWNED) + #define LKPI_80211_LHW_LVIF_LOCK(_lhw) sx_xlock(&(_lhw)->lvif_sx) #define LKPI_80211_LHW_LVIF_UNLOCK(_lhw) sx_xunlock(&(_lhw)->lvif_sx) From nobody Mon Apr 1 23:47:32 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4V7nkD3nFdz5FRCT; Mon, 1 Apr 2024 23:47:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4V7nkD1Zfgz4QMN; Mon, 1 Apr 2024 23:47:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712015252; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yDf33JmlG2JZCuApfD0dyewA6RmuuWdKVjj4hrEOh+4=; b=IhYk55sgaR6D302kprgKLh6e4qoHvT2xYFQJ9Vst1mSuuZ/jQbdy2oOG5PnaWL0Rl1bpJ2 iNcT+x+wcYgqtgRuqoCLtM+GKvejTvvGBeTkDKAki7loRYOLony0J2UDKMtTt2sqdfKZHb vuqUIZ9rl3ZtQ8ZF+jVAjzTt7FSmPsywGYFF9SfM1t6QV+0Z66/I1xIRq+nXGLHjEliexI 0gCej+EcmHcgtm+A9xe2JsmSVhbyecDqvsHb+3O1w38yS7nxFwcUkz31mt9KfU+EaWDZDm UcBqIsn/yAVzsCZgDN1Pi1vHIGZpjVwOsuO8sthbs7YdxNI6N6eNIY+SjlN17w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712015252; a=rsa-sha256; cv=none; b=dVE+HL3jM94j4DALly/JXAAaQxiOCOc3y1koxU2K9qUnfxfPolMRWY8M4Qplod46zCy7uD epaWW/CKp/XqiTQDmFxl28+abQNZCAzONtezg3PC+sKMD8mIJQleE1h6r6xeLzu7N7oWId wzFtY3NF15wp5hui4KAnU97ndr+7ejUxN+57Wn2iU2ZWZi0wbOeN/kqmVL4/3dq8bsJG3a tPAUeDJMABC7S21lKBHyIIsoS94rqPK0iz8e7Zh/dGAdkR/3TQcb4GYmQSo+6dBMiya7fe sQmVQYpozj4yMkLnEU+FyffBkCudGwwFOfxS+Ay1vP3EsYtf1LQtEsmzj+61JQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712015252; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yDf33JmlG2JZCuApfD0dyewA6RmuuWdKVjj4hrEOh+4=; b=BJYfCfMJO1zGuzkhD3kwaICVz5LmAw5ZZ6rEPRJowgFDCOKke8JGvuvRGvVlTb+uKyiRYw JFtk1a8KFrdNjb1nB/hB3Mu8zktTC+u2nNdLCqZbGWw8iRP8gpNiGWBV2cVlzfglR9q+Gu 7+ueG5kDZZaMI13MHaFwvE+wgv8FC/jbBwzd3hPpCsQWgOjewBH6c+dxwg6ON0PUE81iLD vX4O2XscFchyQrVK9UZmujIJ9gu9rQyulTogrtLIreriQxWDIN2uNjl4WA6Fw8N6dPTJIs F/ZuRvjG1oeIlTdsNWKLQpKrx0OJs3fv444vqIXO1BqgZuMCZfHJAiqHv3JU7g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4V7nkD18TczR6y; Mon, 1 Apr 2024 23:47: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 431NlWLp084112; Mon, 1 Apr 2024 23:47:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 431NlWdb084109; Mon, 1 Apr 2024 23:47:32 GMT (envelope-from git) Date: Mon, 1 Apr 2024 23:47:32 GMT Message-Id: <202404012347.431NlWdb084109@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: e74405a4d648 - stable/14 - LinuxKPI: 802.11: return proper value for IEEE80211_CRYPTO_AES_CCM List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: e74405a4d6488194a8e6d83a6637a181864f221c Auto-Submitted: auto-generated The branch stable/14 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=e74405a4d6488194a8e6d83a6637a181864f221c commit e74405a4d6488194a8e6d83a6637a181864f221c Author: Bjoern A. Zeeb AuthorDate: 2024-03-04 23:03:58 +0000 Commit: Bjoern A. Zeeb CommitDate: 2024-04-01 23:46:10 +0000 LinuxKPI: 802.11: return proper value for IEEE80211_CRYPTO_AES_CCM In case of LKPI_80211_HW_CRYPTO we convert from LinuxKPI cipher_suites to net80211 ic_cryptocaps fields. For WLAN_CIPHER_SUITE_CCMP we accidentally returned the bit number instead of the shifted value which leads to ieee80211_crypto_newkey() setting IEEE80211_KEY_SWCRYPT, which in turned lead to us trying to decode the frame again despite HW had already done it. This was found out of a discussion in D43634. Reviewed by: cc, adrian (cherry picked from commit 906521f8176b13533556d742db4ab28e847b85c0) --- sys/compat/linuxkpi/common/src/linux_80211.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/compat/linuxkpi/common/src/linux_80211.c b/sys/compat/linuxkpi/common/src/linux_80211.c index 57b3609b2290..d5a97009200f 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211.c +++ b/sys/compat/linuxkpi/common/src/linux_80211.c @@ -547,7 +547,7 @@ lkpi_l80211_to_net80211_cyphers(uint32_t wlan_cipher_suite) case WLAN_CIPHER_SUITE_TKIP: return (IEEE80211_CRYPTO_TKIP); case WLAN_CIPHER_SUITE_CCMP: - return (IEEE80211_CIPHER_AES_CCM); + return (IEEE80211_CRYPTO_AES_CCM); case WLAN_CIPHER_SUITE_WEP104: return (IEEE80211_CRYPTO_WEP); case WLAN_CIPHER_SUITE_AES_CMAC: From nobody Mon Apr 1 23:47:33 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4V7nkG5sQzz5FRQ6; Mon, 1 Apr 2024 23:47:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4V7nkF2V1Fz4QH2; Mon, 1 Apr 2024 23:47:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712015253; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EDpYMNKya1M+gRZaAJmKVZd9O5Qt6kvTNEiWh9q4hjw=; b=Aw/HH74iTxOQ6sww2q4gPRHZoQg45DTui3gg8ALrYWAc/P2Gf0xxp+V/4nd7mhw8NfsHo+ o0CwwTFBdB653gISWsFKxkfXy5QfMhtKPMSmSSFfLi40Pqlc1MRImdKT9A1iDDs0lqVdpg HI7SgMxQwZSrWow16DuSB/CJwZwObHhB9mRL6jcIkRlRJJCXyw1Bp8Y3yOluSX8Z8/iYIw pb2Rh9Cscnv3BVH25IMUMctCbuYnMRY/dz8AKMPsoduUs/3drC/G11+JIfO6a64ZqFis4N j3SY91iHrMe+9mOiKj5OweFxvNAKljie1vR54EyPK++UxsJd7aRUF200DGvimw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712015253; a=rsa-sha256; cv=none; b=skLeRcyaOr4lP+dtrNrH37EoklWt+3cplTaWtjQMz1aQx8YWUOaYfdudtkzge6y7iTlBOm 1WRFh+Mgm0z0nATIUwj5KuA12zFIB0lNE4wYDG1jY1zM9phsMNwF1P44fl4aCioEtunrdT VVR0mmncuDIj6bVeWxWPI1LfixUqIeutlE86ZnP6rkbFDWn5Z0PgIi4VTpuJS52vcMFTl1 Q/yIKCf8qjlO2QvkqzDJ4Vqd4Ua3SMacNOhHLIyVNjYsKdi5O6ZH+V0zVxfsFYob1uGu4K JBmVtqfXYg5pGBoaYYPzY64j/uS9tIZd4KBlV5Y6D6ENMBX8zyvASDVz/Hirow== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712015253; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EDpYMNKya1M+gRZaAJmKVZd9O5Qt6kvTNEiWh9q4hjw=; b=jhROE+N6dmt8Pj/p1pMohK2Sm5cuakXewxNplMHEy8nD0LD5g7Z8pesLGYThCUAEKkxiZd 6gW9v0UUacZlkE9Ot0GgHJGPoVkDrcY15sw2+2iumxuH2AUhpuQmdilANZGQvYy3H/a4Od s44qEcZdNRyi9P7F47ALdrt5boAIQODUf48PZ7VulcRvZPmMjxhCVSi9NB+MYpafDq9s9u Z9+tRXLI2zYyszNkycuOS3/VZXm56n/VW7LSC7lJKHwWTeAR5LjqoBfWrG981TmbXBv8kf LPdp/FzC3JmslTRSMc67TD970oKFDKCr9PxTfn2TAQGE5S82z3/v8Cp9o0gaRQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4V7nkF21KTzQSv; Mon, 1 Apr 2024 23:47:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 431NlX6Z084175; Mon, 1 Apr 2024 23:47:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 431NlX9x084172; Mon, 1 Apr 2024 23:47:33 GMT (envelope-from git) Date: Mon, 1 Apr 2024 23:47:33 GMT Message-Id: <202404012347.431NlX9x084172@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: d1aff3556656 - stable/14 - vf_i2c: split up and add ACPI attachments in addition to FDT List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: d1aff3556656bf85a2a0f07963264ad5d2ddc704 Auto-Submitted: auto-generated The branch stable/14 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=d1aff3556656bf85a2a0f07963264ad5d2ddc704 commit d1aff3556656bf85a2a0f07963264ad5d2ddc704 Author: Pierre-Luc Drouin AuthorDate: 2024-03-22 22:12:07 +0000 Commit: Bjoern A. Zeeb CommitDate: 2024-04-01 23:46:10 +0000 vf_i2c: split up and add ACPI attachments in addition to FDT Move the code from the arm specific to the iicbus controller directory. Split up between general logic and bus attachment code. Add support for ACPI attachment in addition to FDT. Tested by: bz (LS1088a FDT), Pierre-Luc Drouin (Honeycomb, ACPI) Based on: D24917 by Val Packett (initial early version) (cherry picked from commit 5ca8e32633c4ffbbcd6762e5888b6a4ba0708c6c) --- sys/arm/freescale/vybrid/files.vybrid | 3 +- sys/conf/files.arm64 | 4 +- .../iicbus/controller}/vybrid/vf_i2c.c | 240 +++++++++++---------- sys/dev/iicbus/controller/vybrid/vf_i2c.h | 75 +++++++ sys/dev/iicbus/controller/vybrid/vf_i2c_acpi.c | 101 +++++++++ sys/dev/iicbus/controller/vybrid/vf_i2c_fdt.c | 122 +++++++++++ sys/modules/Makefile | 2 + sys/modules/vf_i2c/Makefile | 14 ++ 8 files changed, 440 insertions(+), 121 deletions(-) diff --git a/sys/arm/freescale/vybrid/files.vybrid b/sys/arm/freescale/vybrid/files.vybrid index b39cbbfd83cf..dff5892e9931 100644 --- a/sys/arm/freescale/vybrid/files.vybrid +++ b/sys/arm/freescale/vybrid/files.vybrid @@ -9,7 +9,8 @@ arm/freescale/vybrid/vf_edma.c standard arm/freescale/vybrid/vf_dmamux.c standard arm/freescale/vybrid/vf_port.c standard arm/freescale/vybrid/vf_adc.c standard -arm/freescale/vybrid/vf_i2c.c optional iicbus +dev/iicbus/controller/vybrid/vf_i2c.c optional iicbus +dev/iicbus/controller/vybrid/vf_i2c_fdt.c optional iicbus fdt arm/freescale/vybrid/vf_tcon.c optional vt arm/freescale/vybrid/vf_dcu4.c optional vt arm/freescale/vybrid/vf_nfc.c optional nand diff --git a/sys/conf/files.arm64 b/sys/conf/files.arm64 index 15ae804bfb0f..218571d0e23a 100644 --- a/sys/conf/files.arm64 +++ b/sys/conf/files.arm64 @@ -628,7 +628,9 @@ tegra210_xusb.fw optional tegra210_xusb_fw \ clean "tegra210_xusb.fw" # NXP -arm/freescale/vybrid/vf_i2c.c optional vf_i2c iicbus soc_nxp_ls +dev/iicbus/controller/vybrid/vf_i2c.c optional vf_i2c iicbus soc_nxp_ls +dev/iicbus/controller/vybrid/vf_i2c_acpi.c optional vf_i2c iicbus acpi soc_nxp_ls +dev/iicbus/controller/vybrid/vf_i2c_fdt.c optional vf_i2c iicbus fdt soc_nxp_ls arm64/qoriq/qoriq_dw_pci.c optional pci fdt soc_nxp_ls arm64/qoriq/qoriq_gpio_pic.c optional gpio fdt soc_nxp_ls arm64/qoriq/qoriq_therm.c optional pci fdt soc_nxp_ls diff --git a/sys/arm/freescale/vybrid/vf_i2c.c b/sys/dev/iicbus/controller/vybrid/vf_i2c.c similarity index 75% rename from sys/arm/freescale/vybrid/vf_i2c.c rename to sys/dev/iicbus/controller/vybrid/vf_i2c.c index 0bda13ef31d2..7a6ec3948e13 100644 --- a/sys/arm/freescale/vybrid/vf_i2c.c +++ b/sys/dev/iicbus/controller/vybrid/vf_i2c.c @@ -2,7 +2,7 @@ * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2014 Ruslan Bukin - * All rights reserved. + * Copyright (c) 2024 Pierre-Luc Drouin * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -29,13 +29,14 @@ /* * Vybrid Family Inter-Integrated Circuit (I2C) * Chapter 48, Vybrid Reference Manual, Rev. 5, 07/2013 + * + * The current implementation is based on the original driver by Ruslan Bukin, + * later modified by Dawid Górecki, and split into FDT and ACPI drivers by Val + * Packett. */ -/* - * This driver is based on the I2C driver for i.MX - */ - -#include +#include +#include #include #include #include @@ -51,17 +52,11 @@ #include "iicbus_if.h" -#include -#include -#include - -#include - #include #include #include -#include +#include #define I2C_IBAD 0x0 /* I2C Bus Address Register */ #define I2C_IBFD 0x1 /* I2C Bus Frequency Divider Register */ @@ -86,42 +81,44 @@ #define IBIC_BIIE (1 << 7) /* Bus Idle Interrupt Enable bit. */ #define I2C_IBDBG 0x6 /* I2C Bus Debug Register */ +#define DIV_REG_UNSET 0xFF + +#define READ1(_sc, _reg) bus_space_read_1(_sc->bst, _sc->bsh, _reg) +#define WRITE1(_sc, _reg, _val) bus_space_write_1(_sc->bst,\ + _sc->bsh, _reg, _val) + #ifdef DEBUG #define vf_i2c_dbg(_sc, fmt, args...) \ device_printf((_sc)->dev, fmt, ##args) +#ifdef DEBUG2 +#undef WRITE1 +#define WRITE1(_sc, _reg, _val) ({\ + vf_i2c_dbg(_sc, "WRITE1 REG 0x%02X VAL 0x%02X\n",_reg,_val);\ + bus_space_write_1(_sc->bst, _sc->bsh, _reg, _val);\ + }) +#undef READ1 +#define READ1(_sc, _reg) ({\ + uint32_t ret=bus_space_read_1(_sc->bst, _sc->bsh, _reg);\ + vf_i2c_dbg(_sc, "READ1 REG 0x%02X RETURNS 0x%02X\n",_reg,ret);\ + ret;\ + }) +#endif #else #define vf_i2c_dbg(_sc, fmt, args...) #endif -#define HW_UNKNOWN 0x00 -#define HW_MVF600 0x01 -#define HW_VF610 0x02 - static int i2c_repeated_start(device_t, u_char, int); static int i2c_start(device_t, u_char, int); static int i2c_stop(device_t); static int i2c_reset(device_t, u_char, u_char, u_char *); static int i2c_read(device_t, char *, int, int *, int, int); static int i2c_write(device_t, const char *, int, int *, int); -static phandle_t i2c_get_node(device_t, device_t); struct i2c_div_type { uint32_t reg_val; uint32_t div; }; -struct i2c_softc { - struct resource *res[2]; - bus_space_tag_t bst; - bus_space_handle_t bsh; - clk_t clock; - uint32_t freq; - device_t dev; - device_t iicbus; - struct mtx mutex; - uintptr_t hwtype; -}; - static struct resource_spec i2c_spec[] = { { SYS_RES_MEMORY, 0, RF_ACTIVE }, { SYS_RES_IRQ, 0, RF_ACTIVE }, @@ -144,49 +141,15 @@ static struct i2c_div_type vf610_div_table[] = { { 0x3F, 3840 }, { 0x7B, 4096 }, { 0x7D, 5120 }, { 0x7E, 6144 }, }; -static const struct ofw_compat_data i2c_compat_data[] = { - {"fsl,mvf600-i2c", HW_MVF600}, - {"fsl,vf610-i2c", HW_VF610}, - {NULL, HW_UNKNOWN} -}; - -static int -i2c_probe(device_t dev) -{ - - if (!ofw_bus_status_okay(dev)) - return (ENXIO); - - if (!ofw_bus_search_compatible(dev, i2c_compat_data)->ocd_data) - return (ENXIO); - - device_set_desc(dev, "Vybrid Family Inter-Integrated Circuit (I2C)"); - return (BUS_PROBE_DEFAULT); -} - -static int -i2c_attach(device_t dev) +int +vf_i2c_attach_common(device_t dev) { - struct i2c_softc *sc; - phandle_t node; + struct vf_i2c_softc *sc; int error; sc = device_get_softc(dev); - sc->dev = dev; - sc->hwtype = ofw_bus_search_compatible(dev, i2c_compat_data)->ocd_data; - node = ofw_bus_get_node(dev); - error = clk_get_by_ofw_index(dev, node, 0, &sc->clock); - if (error != 0) { - sc->freq = 0; - device_printf(dev, "Parent clock not found.\n"); - } else { - if (OF_hasprop(node, "clock-frequency")) - OF_getencprop(node, "clock-frequency", &sc->freq, - sizeof(sc->freq)); - else - sc->freq = 100000; - } + vf_i2c_dbg(sc, "i2c attach common\n"); mtx_init(&sc->mutex, device_get_nameunit(dev), "I2C", MTX_DEF); @@ -201,8 +164,25 @@ i2c_attach(device_t dev) sc->bst = rman_get_bustag(sc->res[0]); sc->bsh = rman_get_bushandle(sc->res[0]); + mtx_lock(&sc->mutex); + WRITE1(sc, I2C_IBIC, IBIC_BIIE); + if (sc->freq == 0) { + uint8_t div_reg; + + div_reg = READ1(sc, I2C_IBFD); + + if (div_reg != 0x00) { + sc->freq = UINT32_MAX; + device_printf(dev, "Using existing bus frequency divider register value (0x%02X).\n", div_reg); + } else { + device_printf(dev, "Bus frequency divider value appears unset, defaulting to low I2C bus speed.\n"); + } + } + + mtx_unlock(&sc->mutex); + sc->iicbus = device_add_child(dev, "iicbus", -1); if (sc->iicbus == NULL) { device_printf(dev, "could not add iicbus child"); @@ -219,10 +199,18 @@ i2c_attach(device_t dev) static int i2c_detach(device_t dev) { - struct i2c_softc *sc; + struct vf_i2c_softc *sc; int error = 0; sc = device_get_softc(dev); + vf_i2c_dbg(sc, "i2c detach\n"); + + mtx_lock(&sc->mutex); + + if (sc->freq == 0) { + vf_i2c_dbg(sc, "Writing 0x00 to clock divider register\n"); + WRITE1(sc, I2C_IBFD, 0x00); + } error = bus_generic_detach(dev); if (error != 0) { @@ -238,6 +226,8 @@ i2c_detach(device_t dev) bus_release_resources(dev, i2c_spec, sc->res); + mtx_unlock(&sc->mutex); + mtx_destroy(&sc->mutex); return (0); @@ -245,7 +235,7 @@ i2c_detach(device_t dev) /* Wait for transfer interrupt flag */ static int -wait_for_iif(struct i2c_softc *sc) +wait_for_iif(struct vf_i2c_softc *sc) { int retry; @@ -263,7 +253,7 @@ wait_for_iif(struct i2c_softc *sc) /* Wait for free bus */ static int -wait_for_nibb(struct i2c_softc *sc) +wait_for_nibb(struct vf_i2c_softc *sc) { int retry; @@ -279,7 +269,7 @@ wait_for_nibb(struct i2c_softc *sc) /* Wait for transfer complete+interrupt flag */ static int -wait_for_icf(struct i2c_softc *sc) +wait_for_icf(struct vf_i2c_softc *sc) { int retry; @@ -298,8 +288,9 @@ wait_for_icf(struct i2c_softc *sc) } /* Get ACK bit from last write */ static bool -tx_acked(struct i2c_softc *sc) +tx_acked(struct vf_i2c_softc *sc) { + vf_i2c_dbg(sc, "i2c get ACK bit from last write\n"); return (READ1(sc, I2C_IBSR) & IBSR_RXAK) ? false : true; @@ -308,7 +299,7 @@ tx_acked(struct i2c_softc *sc) static int i2c_repeated_start(device_t dev, u_char slave, int timeout) { - struct i2c_softc *sc; + struct vf_i2c_softc *sc; int error; int reg; @@ -356,7 +347,7 @@ i2c_repeated_start(device_t dev, u_char slave, int timeout) static int i2c_start(device_t dev, u_char slave, int timeout) { - struct i2c_softc *sc; + struct vf_i2c_softc *sc; int error; int reg; @@ -406,7 +397,7 @@ i2c_start(device_t dev, u_char slave, int timeout) static int i2c_stop(device_t dev) { - struct i2c_softc *sc; + struct vf_i2c_softc *sc; sc = device_get_softc(dev); @@ -429,45 +420,53 @@ i2c_stop(device_t dev) return (IIC_NOERR); } -static uint32_t +static uint8_t i2c_get_div_val(device_t dev) { - struct i2c_softc *sc; - uint64_t clk_freq; - int error, i; + struct vf_i2c_softc *sc; + uint8_t div_reg = DIV_REG_UNSET; sc = device_get_softc(dev); + if (sc->freq == UINT32_MAX) + return div_reg; +#ifndef FDT + div_reg = vf610_div_table[nitems(vf610_div_table) - 1].reg_val; +#else if (sc->hwtype == HW_MVF600) - return 20; - - if (sc->freq == 0) - return vf610_div_table[nitems(vf610_div_table) - 1].reg_val; - - error = clk_get_freq(sc->clock, &clk_freq); - if (error != 0) { - device_printf(dev, "Could not get parent clock frequency. " - "Using default divider.\n"); - return vf610_div_table[nitems(vf610_div_table) - 1].reg_val; + div_reg = MVF600_DIV_REG; + else if (sc->freq == 0) + div_reg = vf610_div_table[nitems(vf610_div_table) - 1].reg_val; + else { + uint64_t clk_freq; + int error, i; + + error = clk_get_freq(sc->clock, &clk_freq); + if (error != 0) { + device_printf(dev, "Could not get parent clock frequency. " + "Using default divider.\n"); + div_reg = vf610_div_table[nitems(vf610_div_table) - 1].reg_val; + } else { + + for (i = 0; i < nitems(vf610_div_table) - 1; i++) + if ((clk_freq / vf610_div_table[i].div) <= sc->freq) + break; + div_reg = vf610_div_table[i].reg_val; + } } - - for (i = 0; i < nitems(vf610_div_table) - 1; i++) - if ((clk_freq / vf610_div_table[i].div) <= sc->freq) - break; - - return vf610_div_table[i].reg_val; +#endif + vf_i2c_dbg(sc, "Writing 0x%02X to clock divider register\n", div_reg); + return div_reg; } static int i2c_reset(device_t dev, u_char speed, u_char addr, u_char *oldadr) { - struct i2c_softc *sc; - uint32_t div; + struct vf_i2c_softc *sc; + uint8_t div_reg; sc = device_get_softc(dev); - div = i2c_get_div_val(dev); - vf_i2c_dbg(sc, "Div val: %02x\n", div); - + div_reg = i2c_get_div_val(dev); vf_i2c_dbg(sc, "i2c reset\n"); switch (speed) { @@ -484,7 +483,9 @@ i2c_reset(device_t dev, u_char speed, u_char addr, u_char *oldadr) DELAY(1000); - WRITE1(sc, I2C_IBFD, div); + if(div_reg != DIV_REG_UNSET) + WRITE1(sc, I2C_IBFD, div_reg); + WRITE1(sc, I2C_IBCR, 0x0); /* Enable i2c */ DELAY(1000); @@ -497,7 +498,7 @@ i2c_reset(device_t dev, u_char speed, u_char addr, u_char *oldadr) static int i2c_read(device_t dev, char *buf, int len, int *read, int last, int delay) { - struct i2c_softc *sc; + struct vf_i2c_softc *sc; int error; sc = device_get_softc(dev); @@ -549,7 +550,7 @@ i2c_read(device_t dev, char *buf, int len, int *read, int last, int delay) static int i2c_write(device_t dev, const char *buf, int len, int *sent, int timeout) { - struct i2c_softc *sc; + struct vf_i2c_softc *sc; int error; sc = device_get_softc(dev); @@ -580,20 +581,20 @@ i2c_write(device_t dev, const char *buf, int len, int *sent, int timeout) return (IIC_NOERR); } -static phandle_t -i2c_get_node(device_t bus, device_t dev) -{ - - return ofw_bus_get_node(bus); -} - static device_method_t i2c_methods[] = { - DEVMETHOD(device_probe, i2c_probe), - DEVMETHOD(device_attach, i2c_attach), + /* Device interface */ DEVMETHOD(device_detach, i2c_detach), - DEVMETHOD(ofw_bus_get_node, i2c_get_node), + /* Device interface */ + DEVMETHOD(bus_setup_intr, bus_generic_setup_intr), + DEVMETHOD(bus_teardown_intr, bus_generic_teardown_intr), + DEVMETHOD(bus_alloc_resource, bus_generic_alloc_resource), + DEVMETHOD(bus_release_resource, bus_generic_release_resource), + DEVMETHOD(bus_activate_resource, bus_generic_activate_resource), + DEVMETHOD(bus_deactivate_resource, bus_generic_deactivate_resource), + DEVMETHOD(bus_adjust_resource, bus_generic_adjust_resource), + /* iicbus interface */ DEVMETHOD(iicbus_callback, iicbus_null_callback), DEVMETHOD(iicbus_repeated_start, i2c_repeated_start), DEVMETHOD(iicbus_start, i2c_start), @@ -602,10 +603,11 @@ static device_method_t i2c_methods[] = { DEVMETHOD(iicbus_read, i2c_read), DEVMETHOD(iicbus_write, i2c_write), DEVMETHOD(iicbus_transfer, iicbus_transfer_gen), - { 0, 0 } + DEVMETHOD_END }; -static DEFINE_CLASS_0(i2c, i2c_driver, i2c_methods, sizeof(struct i2c_softc)); -DRIVER_MODULE(vybrid_i2c, simplebus, i2c_driver, 0, 0); -DRIVER_MODULE(iicbus, i2c, iicbus_driver, 0, 0); -DRIVER_MODULE(ofw_iicbus, i2c, ofw_iicbus_driver, 0, 0); +driver_t vf_i2c_driver = { + "i2c", + i2c_methods, + sizeof(struct vf_i2c_softc), +}; diff --git a/sys/dev/iicbus/controller/vybrid/vf_i2c.h b/sys/dev/iicbus/controller/vybrid/vf_i2c.h new file mode 100644 index 000000000000..8be6e2d86324 --- /dev/null +++ b/sys/dev/iicbus/controller/vybrid/vf_i2c.h @@ -0,0 +1,75 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2014 Ruslan Bukin + * Copyright (c) 2024 Pierre-Luc Drouin + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +/* + * Vybrid Family Inter-Integrated Circuit (I2C) + * Chapter 48, Vybrid Reference Manual, Rev. 5, 07/2013 + * + * The current implementation is based on the original driver by Ruslan Bukin, + * later modified by Dawid Górecki, and split into FDT and ACPI drivers by Val + * Packett. + */ + +#ifndef __VF_I2C_H__ +#define __VF_I2C_H__ + +#include "opt_acpi.h" +#include "opt_platform.h" + +#ifdef FDT +#include +#endif + +#define VF_I2C_DEVSTR "Vybrid Family Inter-Integrated Circuit (I2C)" + +#define HW_MVF600 0x01 +#define HW_VF610 0x02 + +#define MVF600_DIV_REG 0x14 + +#define VF_I2C_DEFAULT_BUS_SPEED 100000 + +struct vf_i2c_softc { + struct resource *res[2]; + bus_space_tag_t bst; + bus_space_handle_t bsh; + uint32_t freq; + device_t dev; + device_t iicbus; + struct mtx mutex; + uintptr_t hwtype; +#ifdef FDT + clk_t clock; +#endif +}; + +extern driver_t vf_i2c_driver; + +device_attach_t vf_i2c_attach_common; + +#endif /* !__VF_I2C_H__ */ diff --git a/sys/dev/iicbus/controller/vybrid/vf_i2c_acpi.c b/sys/dev/iicbus/controller/vybrid/vf_i2c_acpi.c new file mode 100644 index 000000000000..03f5c99a45c6 --- /dev/null +++ b/sys/dev/iicbus/controller/vybrid/vf_i2c_acpi.c @@ -0,0 +1,101 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2024 Pierre-Luc Drouin + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +/* + * Vybrid Family Inter-Integrated Circuit (I2C) + * Chapter 48, Vybrid Reference Manual, Rev. 5, 07/2013 + * + * The current implementation is based on the original driver by Ruslan Bukin, + * later modified by Dawid Górecki, and split into FDT and ACPI drivers by Val + * Packett. + */ + +#include "opt_acpi.h" + +#include +#include +#include +#include +#include +#include + +#include +#include + +#include +#include +#include + +#include + +static char *vf_i2c_ids[] = { + "NXP0001", + NULL +}; + +static int +vf_i2c_acpi_probe(device_t dev) +{ + int rv; + + if (acpi_disabled("vf_i2c")) + return (ENXIO); + + rv = ACPI_ID_PROBE(device_get_parent(dev), dev, vf_i2c_ids, NULL); + if (rv > 0) + return (rv); + + device_set_desc(dev, VF_I2C_DEVSTR); + return (BUS_PROBE_DEFAULT); +} + +static int +vf_i2c_acpi_attach(device_t dev) +{ + struct vf_i2c_softc *sc; + + sc = device_get_softc(dev); + sc->dev = dev; + sc->hwtype = HW_VF610; + sc->freq = 0; + + return (vf_i2c_attach_common(dev)); +} + +static device_method_t vf_i2c_acpi_methods[] = { + /* Device interface */ + DEVMETHOD(device_probe, vf_i2c_acpi_probe), + DEVMETHOD(device_attach, vf_i2c_acpi_attach), + DEVMETHOD_END +}; + +DEFINE_CLASS_1(vf_i2c_acpi, vf_i2c_acpi_driver, vf_i2c_acpi_methods, + sizeof(struct vf_i2c_softc), vf_i2c_driver); + +DRIVER_MODULE(vf_i2c_acpi, acpi, vf_i2c_acpi_driver, 0, 0); +DRIVER_MODULE(iicbus, vf_i2c_acpi, iicbus_driver, 0, 0); +DRIVER_MODULE(acpi_iicbus, vf_i2c_acpi, acpi_iicbus_driver, 0, 0); diff --git a/sys/dev/iicbus/controller/vybrid/vf_i2c_fdt.c b/sys/dev/iicbus/controller/vybrid/vf_i2c_fdt.c new file mode 100644 index 000000000000..935f389ab516 --- /dev/null +++ b/sys/dev/iicbus/controller/vybrid/vf_i2c_fdt.c @@ -0,0 +1,122 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2014 Ruslan Bukin + * Copyright (c) 2024 Pierre-Luc Drouin + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +/* + * Vybrid Family Inter-Integrated Circuit (I2C) + * Chapter 48, Vybrid Reference Manual, Rev. 5, 07/2013 + * + * The current implementation is based on the original driver by Ruslan Bukin, + * later modified by Dawid Górecki, and split into FDT and ACPI drivers by Val + * Packett. + */ + +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include + +#include + +#include + +static const struct ofw_compat_data vf_i2c_compat_data[] = { + {"fsl,mvf600-i2c", HW_MVF600}, + {"fsl,vf610-i2c", HW_VF610}, + {NULL, 0} +}; + +static int +vf_i2c_fdt_probe(device_t dev) +{ + + if (!ofw_bus_status_okay(dev)) + return (ENXIO); + + if (ofw_bus_search_compatible(dev, vf_i2c_compat_data)->ocd_data == 0) + return (ENXIO); + + device_set_desc(dev, VF_I2C_DEVSTR); + return (BUS_PROBE_DEFAULT); +} + +static int +vf_i2c_fdt_attach(device_t dev) +{ + struct vf_i2c_softc *sc; + phandle_t node; + int error; + + sc = device_get_softc(dev); + sc->dev = dev; + sc->hwtype = ofw_bus_search_compatible(dev, vf_i2c_compat_data)->ocd_data; + node = ofw_bus_get_node(dev); + + error = clk_get_by_ofw_index(dev, node, 0, &sc->clock); + if (error != 0) { + sc->freq = 0; + device_printf(dev, "Parent clock not found.\n"); + } else { + if (OF_hasprop(node, "clock-frequency")) + OF_getencprop(node, "clock-frequency", &sc->freq, + sizeof(sc->freq)); + else + sc->freq = VF_I2C_DEFAULT_BUS_SPEED; + } + return (vf_i2c_attach_common(dev)); +} + +static phandle_t +vf_i2c_get_node(device_t bus, device_t dev) +{ + return (ofw_bus_get_node(bus)); +} + +static device_method_t vf_i2c_fdt_methods[] = { + /* Device interface */ + DEVMETHOD(device_probe, vf_i2c_fdt_probe), + DEVMETHOD(device_attach, vf_i2c_fdt_attach), + + /* ofw_bus interface */ + DEVMETHOD(ofw_bus_get_node, vf_i2c_get_node), + DEVMETHOD_END +}; + +DEFINE_CLASS_1(vf_i2c_fdt, vf_i2c_fdt_driver, vf_i2c_fdt_methods, + sizeof(struct vf_i2c_softc), vf_i2c_driver); + +DRIVER_MODULE(vf_i2c_fdt, simplebus, vf_i2c_fdt_driver, 0, 0); +DRIVER_MODULE(iicbus, vf_i2c_fdt, iicbus_driver, 0, 0); +DRIVER_MODULE(ofw_iicbus, vf_i2c_fdt, ofw_iicbus_driver, 0, 0); + diff --git a/sys/modules/Makefile b/sys/modules/Makefile index 4dedd440017f..b6327ec224af 100644 --- a/sys/modules/Makefile +++ b/sys/modules/Makefile @@ -396,6 +396,7 @@ SUBDIR= \ unionfs \ usb \ ${_vesa} \ + ${_vf_i2c} \ virtio \ vge \ ${_viawd} \ @@ -686,6 +687,7 @@ _dpaa2= dpaa2 _sff= sff _em= em _hyperv= hyperv +_vf_i2c= vf_i2c .if !empty(OPT_FDT) _allwinner= allwinner diff --git a/sys/modules/vf_i2c/Makefile b/sys/modules/vf_i2c/Makefile new file mode 100644 index 000000000000..53c9f9948ac8 --- /dev/null +++ b/sys/modules/vf_i2c/Makefile @@ -0,0 +1,14 @@ +.PATH: ${SRCTOP}/sys/dev/iicbus/controller/vybrid + +KMOD= vf_i2c +SRCS= vf_i2c.c vf_i2c.h +SRCS+= device_if.h bus_if.h iicbus_if.h +SRCS+= opt_acpi.h opt_platform.h + +SRCS.DEV_ACPI= vf_i2c_acpi.c acpi_if.h + +.if !empty(OPT_FDT) +SRCS+= vf_i2c_fdt.c ofw_bus_if.h clknode_if.h +.endif + +.include From nobody Mon Apr 1 23:47:34 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4V7nkG6JT9z5FRHZ; Mon, 1 Apr 2024 23:47:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4V7nkG41Xcz4QHF; Mon, 1 Apr 2024 23:47:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712015254; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dWu2nrLRSEzYrvl0Svc8IIYYlAv9WtE/4lDjCgOlw9Y=; b=kgt4XpyjmoJ21pmFfsecAOUSTtGUKB7iHPjAfY/ENNlW4pZPd5bjYg4Q8T+uApzZTzhk6N 64L4L3DZeE6rNvosaCaWfxxI3CEWWTNFuex9F5fNP9Ouke8ZPwzzSw5FeaOJwK73/RLIr1 m6gzaFrZI5APsRF9YadPNjFbpV1fIEoEmSiAnT4KWp1pMDcxzbFwmS3tFHbdF62Q1HUKxj +wcsCX2gVA6HMH9mEVL6TWExzpEzrvpj67qAUBpuW1/VK5IBYQFmuGQCv7e2p9IPFkpfnm 6/3Pk5ELoMYsPvvKqcHcJma6IOuS5Di7d+z4A4o/9NOyD2OABviDQtsDbYBAVA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712015254; a=rsa-sha256; cv=none; b=n/Z/lzyBIFww8WPpkdduM8vraTxRcVEKirW4a3rYT7w77UyclnZ/RPiAlc65P6UELQx9qJ RTH86kwwKYG1GRVJ0whhQ9W4JCmqftJn0CJI/+LlVr347FVSpX4Mr6igJU732WM7N2ei+3 RGpsHGDY9CM094uMEmBywFlL8nY98qpt81We9xabWH1rrWvgcrCBtJ6iEDk8UEduWVRzSC u0AMnMK/pbTmFSYJDSlhDu9Zew33A3zGRdia6bHdcFW6EBiKcSzNEvte7Oorb4275402fk HE16GK72Q8ROnQUCRI0SrBwd9L387c0nIZWZvveL0NFK30+SHByT1BBsYBfqsA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712015254; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dWu2nrLRSEzYrvl0Svc8IIYYlAv9WtE/4lDjCgOlw9Y=; b=hCSzlt1dn1pI7LRVcvtGVnB3Jv/CpzmxUnwvPe0mLcRFXKnmfGrK9ZNOZOCBpBpjiZwT8l AHHIU6HKGsu3RULiEu56HCuUxyRWg/X9wX9LrIVxLfa3X5Tun2Vu+IRTo+XvDuT+/99qXl qrPAZv3xjjtzpi/JrESPehyBkmhmENKOyndX9Ir7sWLc4KDf9RKaPYNN13hoBivuHohjng 086MH3yxxR4kTNra1henu7Fp6U6Y8erNFL/Xtat0K7QObmLLGe1rKyxj2u+0ygmVGATPBj xPHzY51bzt8k2K52MfuTvtMTb0dAeHv/avW2zUgCAnCbNXJCWWFxTdzmA6iCkQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4V7nkG39C6zR70; Mon, 1 Apr 2024 23:47:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 431NlYa9084220; Mon, 1 Apr 2024 23:47:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 431NlYhq084217; Mon, 1 Apr 2024 23:47:34 GMT (envelope-from git) Date: Mon, 1 Apr 2024 23:47:34 GMT Message-Id: <202404012347.431NlYhq084217@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 4197e21ed39c - stable/14 - vf_i2c: update I2C controller logic List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 4197e21ed39c28d261a9cb08e6cb6fc351902a3a Auto-Submitted: auto-generated The branch stable/14 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=4197e21ed39c28d261a9cb08e6cb6fc351902a3a commit 4197e21ed39c28d261a9cb08e6cb6fc351902a3a Author: Pierre-Luc Drouin AuthorDate: 2024-03-22 22:13:04 +0000 Commit: Bjoern A. Zeeb CommitDate: 2024-04-01 23:46:11 +0000 vf_i2c: update I2C controller logic Update the I2C controller logic to be more consistent with the newer version of the controller reference manual. This makes it work better on modern LS/LX platforms and avoids unnecessary delays. Also fixes a lock leak. Tested by: bz (LS1088a FDT), Pierre-Luc Drouin (Honeycomb, ACPI) (cherry picked from commit 44847114bd4c61ed3dfcc879fa0d7deb452e12d3) --- sys/dev/iicbus/controller/vybrid/vf_i2c.c | 148 ++++++++++--------------- sys/dev/iicbus/controller/vybrid/vf_i2c.h | 3 +- sys/dev/iicbus/controller/vybrid/vf_i2c_acpi.c | 3 +- sys/dev/iicbus/controller/vybrid/vf_i2c_fdt.c | 3 +- 4 files changed, 65 insertions(+), 92 deletions(-) diff --git a/sys/dev/iicbus/controller/vybrid/vf_i2c.c b/sys/dev/iicbus/controller/vybrid/vf_i2c.c index 7a6ec3948e13..d3c3664af78c 100644 --- a/sys/dev/iicbus/controller/vybrid/vf_i2c.c +++ b/sys/dev/iicbus/controller/vybrid/vf_i2c.c @@ -28,7 +28,8 @@ /* * Vybrid Family Inter-Integrated Circuit (I2C) - * Chapter 48, Vybrid Reference Manual, Rev. 5, 07/2013 + * Originally based on Chapter 48, Vybrid Reference Manual, Rev. 5, 07/2013 + * Currently based on Chapter 21, LX2160A Reference Manual, Rev. 1, 10/2021 * * The current implementation is based on the original driver by Ruslan Bukin, * later modified by Dawid Górecki, and split into FDT and ACPI drivers by Val @@ -184,6 +185,7 @@ vf_i2c_attach_common(device_t dev) mtx_unlock(&sc->mutex); sc->iicbus = device_add_child(dev, "iicbus", -1); + if (sc->iicbus == NULL) { device_printf(dev, "could not add iicbus child"); mtx_destroy(&sc->mutex); @@ -233,24 +235,6 @@ i2c_detach(device_t dev) return (0); } -/* Wait for transfer interrupt flag */ -static int -wait_for_iif(struct vf_i2c_softc *sc) -{ - int retry; - - retry = 1000; - while (retry --) { - if (READ1(sc, I2C_IBSR) & IBSR_IBIF) { - WRITE1(sc, I2C_IBSR, IBSR_IBIF); - return (IIC_NOERR); - } - DELAY(10); - } - - return (IIC_ETIMEOUT); -} - /* Wait for free bus */ static int wait_for_nibb(struct vf_i2c_softc *sc) @@ -272,14 +256,24 @@ static int wait_for_icf(struct vf_i2c_softc *sc) { int retry; + uint8_t ibsr; + + vf_i2c_dbg(sc, "i2c wait for transfer complete + interrupt flag\n"); retry = 1000; while (retry --) { - if (READ1(sc, I2C_IBSR) & IBSR_TCF) { - if (READ1(sc, I2C_IBSR) & IBSR_IBIF) { - WRITE1(sc, I2C_IBSR, IBSR_IBIF); - return (IIC_NOERR); + ibsr = READ1(sc, I2C_IBSR); + + if (ibsr & IBSR_IBIF) { + WRITE1(sc, I2C_IBSR, IBSR_IBIF); + + if (ibsr & IBSR_IBAL) { + WRITE1(sc, I2C_IBSR, IBSR_IBAL); + return (IIC_EBUSBSY); } + + if (ibsr & IBSR_TCF) + return (IIC_NOERR); } DELAY(10); } @@ -309,30 +303,24 @@ i2c_repeated_start(device_t dev, u_char slave, int timeout) mtx_lock(&sc->mutex); - WRITE1(sc, I2C_IBAD, slave); - if ((READ1(sc, I2C_IBSR) & IBSR_IBB) == 0) { + vf_i2c_dbg(sc, "cant i2c repeat start: bus is no longer busy\n"); mtx_unlock(&sc->mutex); return (IIC_EBUSERR); } - /* Set repeated start condition */ - DELAY(10); - reg = READ1(sc, I2C_IBCR); reg |= (IBCR_RSTA | IBCR_IBIE); WRITE1(sc, I2C_IBCR, reg); - DELAY(10); - /* Write target address - LSB is R/W bit */ WRITE1(sc, I2C_IBDR, slave); - error = wait_for_iif(sc); + error = wait_for_icf(sc); if (!tx_acked(sc)) { - vf_i2c_dbg(sc, - "cant i2c start: missing ACK after slave addres\n"); + mtx_unlock(&sc->mutex); + vf_i2c_dbg(sc, "cant i2c repeat start: missing ACK after slave address\n"); return (IIC_ENOACK); } @@ -357,27 +345,32 @@ i2c_start(device_t dev, u_char slave, int timeout) mtx_lock(&sc->mutex); - WRITE1(sc, I2C_IBAD, slave); + error = wait_for_nibb(sc); - if (READ1(sc, I2C_IBSR) & IBSR_IBB) { + /* Reset controller if bus is still busy. */ + if (error == IIC_ETIMEOUT) { + WRITE1(sc, I2C_IBCR, IBCR_MDIS); + DELAY(1000); + WRITE1(sc, I2C_IBCR, IBCR_NOACK); + error = wait_for_nibb(sc); + } + + if (error != 0) { mtx_unlock(&sc->mutex); - vf_i2c_dbg(sc, "cant i2c start: IIC_EBUSBSY\n"); - return (IIC_EBUSERR); + vf_i2c_dbg(sc, "cant i2c start: %i\n", error); + return (error); } /* Set start condition */ - reg = (IBCR_MSSL | IBCR_NOACK | IBCR_IBIE); + reg = (IBCR_MSSL | IBCR_NOACK | IBCR_IBIE | IBCR_TXRX); WRITE1(sc, I2C_IBCR, reg); - DELAY(100); - - reg |= (IBCR_TXRX); - WRITE1(sc, I2C_IBCR, reg); + WRITE1(sc, I2C_IBSR, IBSR_IBIF); /* Write target address - LSB is R/W bit */ WRITE1(sc, I2C_IBDR, slave); - error = wait_for_iif(sc); + error = wait_for_icf(sc); if (error != 0) { mtx_unlock(&sc->mutex); vf_i2c_dbg(sc, "cant i2c start: iif error\n"); @@ -386,8 +379,7 @@ i2c_start(device_t dev, u_char slave, int timeout) mtx_unlock(&sc->mutex); if (!tx_acked(sc)) { - vf_i2c_dbg(sc, - "cant i2c start: missing QACK after slave addres\n"); + vf_i2c_dbg(sc, "cant i2c start: missing ACK after slave address\n"); return (IIC_ENOACK); } @@ -405,16 +397,9 @@ i2c_stop(device_t dev) mtx_lock(&sc->mutex); - WRITE1(sc, I2C_IBCR, IBCR_NOACK | IBCR_IBIE); - - DELAY(100); + if ((READ1(sc, I2C_IBCR) & IBCR_MSSL) != 0) + WRITE1(sc, I2C_IBCR, IBCR_NOACK | IBCR_IBIE); - /* Reset controller if bus still busy after STOP */ - if (wait_for_nibb(sc) == IIC_ETIMEOUT) { - WRITE1(sc, I2C_IBCR, IBCR_MDIS); - DELAY(1000); - WRITE1(sc, I2C_IBCR, IBCR_NOACK); - } mtx_unlock(&sc->mutex); return (IIC_NOERR); @@ -469,27 +454,14 @@ i2c_reset(device_t dev, u_char speed, u_char addr, u_char *oldadr) div_reg = i2c_get_div_val(dev); vf_i2c_dbg(sc, "i2c reset\n"); - switch (speed) { - case IIC_FAST: - case IIC_SLOW: - case IIC_UNKNOWN: - case IIC_FASTEST: - default: - break; - } - mtx_lock(&sc->mutex); WRITE1(sc, I2C_IBCR, IBCR_MDIS); - DELAY(1000); - if(div_reg != DIV_REG_UNSET) WRITE1(sc, I2C_IBFD, div_reg); WRITE1(sc, I2C_IBCR, 0x0); /* Enable i2c */ - DELAY(1000); - mtx_unlock(&sc->mutex); return (IIC_NOERR); @@ -511,36 +483,34 @@ i2c_read(device_t dev, char *buf, int len, int *read, int last, int delay) if (len) { if (len == 1) - WRITE1(sc, I2C_IBCR, IBCR_IBIE | IBCR_MSSL | \ - IBCR_NOACK); + WRITE1(sc, I2C_IBCR, IBCR_IBIE | IBCR_MSSL | IBCR_NOACK); else WRITE1(sc, I2C_IBCR, IBCR_IBIE | IBCR_MSSL); /* dummy read */ READ1(sc, I2C_IBDR); - DELAY(1000); - } - while (*read < len) { - error = wait_for_icf(sc); - if (error != 0) { - mtx_unlock(&sc->mutex); - return (error); - } + while (*read < len) { + error = wait_for_icf(sc); + if (error != 0) { + mtx_unlock(&sc->mutex); + return (error); + } - if ((*read == len - 2) && last) { - /* NO ACK on last byte */ - WRITE1(sc, I2C_IBCR, IBCR_IBIE | IBCR_MSSL | \ - IBCR_NOACK); - } + if (last) { + if (*read == len - 2) { + /* NO ACK on last byte */ + WRITE1(sc, I2C_IBCR, IBCR_IBIE | IBCR_MSSL | IBCR_NOACK); - if ((*read == len - 1) && last) { - /* Transfer done, remove master bit */ - WRITE1(sc, I2C_IBCR, IBCR_IBIE | IBCR_NOACK); - } + } else if (*read == len - 1) { + /* Transfer done, remove master bit */ + WRITE1(sc, I2C_IBCR, IBCR_IBIE | IBCR_NOACK); + } + } - *buf++ = READ1(sc, I2C_IBDR); - (*read)++; + *buf++ = READ1(sc, I2C_IBDR); + (*read)++; + } } mtx_unlock(&sc->mutex); @@ -563,7 +533,7 @@ i2c_write(device_t dev, const char *buf, int len, int *sent, int timeout) while (*sent < len) { WRITE1(sc, I2C_IBDR, *buf++); - error = wait_for_iif(sc); + error = wait_for_icf(sc); if (error != 0) { mtx_unlock(&sc->mutex); return (error); diff --git a/sys/dev/iicbus/controller/vybrid/vf_i2c.h b/sys/dev/iicbus/controller/vybrid/vf_i2c.h index 8be6e2d86324..7eb9025893ed 100644 --- a/sys/dev/iicbus/controller/vybrid/vf_i2c.h +++ b/sys/dev/iicbus/controller/vybrid/vf_i2c.h @@ -28,7 +28,8 @@ /* * Vybrid Family Inter-Integrated Circuit (I2C) - * Chapter 48, Vybrid Reference Manual, Rev. 5, 07/2013 + * Originally based on Chapter 48, Vybrid Reference Manual, Rev. 5, 07/2013 + * Currently based on Chapter 21, LX2160A Reference Manual, Rev. 1, 10/2021 * * The current implementation is based on the original driver by Ruslan Bukin, * later modified by Dawid Górecki, and split into FDT and ACPI drivers by Val diff --git a/sys/dev/iicbus/controller/vybrid/vf_i2c_acpi.c b/sys/dev/iicbus/controller/vybrid/vf_i2c_acpi.c index 03f5c99a45c6..0b18926ee2df 100644 --- a/sys/dev/iicbus/controller/vybrid/vf_i2c_acpi.c +++ b/sys/dev/iicbus/controller/vybrid/vf_i2c_acpi.c @@ -27,7 +27,8 @@ /* * Vybrid Family Inter-Integrated Circuit (I2C) - * Chapter 48, Vybrid Reference Manual, Rev. 5, 07/2013 + * Originally based on Chapter 48, Vybrid Reference Manual, Rev. 5, 07/2013 + * Currently based on Chapter 21, LX2160A Reference Manual, Rev. 1, 10/2021 * * The current implementation is based on the original driver by Ruslan Bukin, * later modified by Dawid Górecki, and split into FDT and ACPI drivers by Val diff --git a/sys/dev/iicbus/controller/vybrid/vf_i2c_fdt.c b/sys/dev/iicbus/controller/vybrid/vf_i2c_fdt.c index 935f389ab516..def5ce109caf 100644 --- a/sys/dev/iicbus/controller/vybrid/vf_i2c_fdt.c +++ b/sys/dev/iicbus/controller/vybrid/vf_i2c_fdt.c @@ -28,7 +28,8 @@ /* * Vybrid Family Inter-Integrated Circuit (I2C) - * Chapter 48, Vybrid Reference Manual, Rev. 5, 07/2013 + * Originally based on Chapter 48, Vybrid Reference Manual, Rev. 5, 07/2013 + * Currently based on Chapter 21, LX2160A Reference Manual, Rev. 1, 10/2021 * * The current implementation is based on the original driver by Ruslan Bukin, * later modified by Dawid Górecki, and split into FDT and ACPI drivers by Val From nobody Mon Apr 1 23:49:50 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4V7nmt3HJMz5FRHn; Mon, 1 Apr 2024 23:49:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4V7nmt2kfnz4S51; Mon, 1 Apr 2024 23:49:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712015390; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=C02FeL7WufYWy3SsH9TasBvK3/Zxsr6x1SVh19gZx8I=; b=rHxEA1Grffdy18yThNt0Nr+00FaAmeu6yqjqIlZ12rCT01XxM3O7+i6JHEX0vZWWHqzFtY bn4sti6cjgMxTxx4TZ5eMSPWVrWZR3ChRlBNMi/62SneuSkwyi7+n568VQqYMIvf+wQT0k XPuWN6dSPiGVFm/Ec1Arygo8xaU1t13/VrdUVu5Lq/+lPVmTdQbQjrvAxfD1phOOyXNIA+ OPS1dtSl2LdmfP4Mx8frCtbc5tMRokSk6B/dof+22XDiXgFjl1mij7BXNEfD31Qw68QoMz dNQg7g4z4fMRZFGKYiSFxz2BcQ/VuRGym3NY3z5Yk6nnNyB0oSSyPVxJlS5aAw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712015390; a=rsa-sha256; cv=none; b=C4dbKvg35fpMO2ZqVV1SXFQmEU2QtNSVVjKoEXzyjhOf4fmk2w8rQ47Spmm+QtlIeKTN0J Gg0Mwz2b+qKSrgeq/LQJ9T9xkyyCTti3QnmjDZSgUjZzWfnNXPGX2qHQUisxdY4Mc2cS6n M7PAWLnfZ5AYzYWkJEgD42wXDVA2e7gegaV/C216pBriUSZa2lbgr2+mdWfXHyePsjmtJM h0ehQas19sc7OnJI+hxM7lC/GeTIISemKtB1xzCNIdb5xV7ZHmBTOCMevnEuWWtcJPx6AG S4Md2aLToueKGHSx3mwU18D6+37REUojVktJZ0p99iFDrrPIeqb1OXkc72HinQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712015390; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=C02FeL7WufYWy3SsH9TasBvK3/Zxsr6x1SVh19gZx8I=; b=ewOWsFXczcIwLz9Px9knxQncN9TV9anlkvdYwRkif3fybsnbcM9Hote51y5uf5FYQawBVt Zub4L2pAoUJLQZ7fzzXvKfxLDI70nBJj6w80vKSSr/9kt7KZ+kh2P6sz1wtfLXlyR58Hek cSZScoJ/EAiCkO/M+1dDHPBM2Z+kULPxIyDMrhX/4VE/5CYIiQ57nJ4UQgjI2x6b8KsYBT L/NB+AoxT2P0kDPgGczKJQiLlayEiJ/8F19wtJMWmXDCXnxNLKYyeGGFSA6hoNc+M/3ZfM UC1YaBrFNaYfXP2XhXFrSUQp+LM/RHZh8avSXg08pF5uNlfAzXza48iQL0ksXA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4V7nmt2KRDzR1x; Mon, 1 Apr 2024 23:49:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 431NnoWw084674; Mon, 1 Apr 2024 23:49:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 431NnomJ084671; Mon, 1 Apr 2024 23:49:50 GMT (envelope-from git) Date: Mon, 1 Apr 2024 23:49:50 GMT Message-Id: <202404012349.431NnomJ084671@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: 87c576a25a1f - stable/14 - release: rework distributions list List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 87c576a25a1f79730843b20a843b69e3f21f77f6 Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=87c576a25a1f79730843b20a843b69e3f21f77f6 commit 87c576a25a1f79730843b20a843b69e3f21f77f6 Author: Ed Maste AuthorDate: 2024-01-22 14:49:02 +0000 Commit: Ed Maste CommitDate: 2024-04-01 23:49:25 +0000 release: rework distributions list Components like base.txz and ports.txz are called distributions in the installer, and with the introduction of pkgbase we will start dealing with normal pkg packages in the installer. Rename EXTRA_PACKAGES to DISTRIBUTIONS, and move base.txz and kernel.txz to that list. This introduces no functional change but is a small cleanup in advance of some pkgbase experimentation. Reviewed by: cperciva Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D43544 (cherry picked from commit 2e9b8c8c1e3938335e17e63049887f8e8c6e11bc) --- release/Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/release/Makefile b/release/Makefile index 92d0106384a6..2cf6efe2e231 100644 --- a/release/Makefile +++ b/release/Makefile @@ -75,12 +75,12 @@ VOLUME_LABEL= FreeBSD_Install NOPORTS= true .endif -EXTRA_PACKAGES= +DISTRIBUTIONS= base.txz kernel.txz .if !defined(NOPORTS) -EXTRA_PACKAGES+= ports.txz +DISTRIBUTIONS+= ports.txz .endif .if !defined(NOSRC) -EXTRA_PACKAGES+= src.txz +DISTRIBUTIONS+= src.txz .endif RELEASE_TARGETS= ftp @@ -287,7 +287,7 @@ mini-memstick: mini-memstick.img mini-memstick.img: bootonly cd bootonly && sh ${.CURDIR}/${TARGET}/make-memstick.sh .${NO_ROOT:D/METALOG} ../${.TARGET} -packagesystem: base.txz kernel.txz ${EXTRA_PACKAGES} +packagesystem: ${DISTRIBUTIONS} sh ${.CURDIR}/scripts/make-manifest.sh *.txz > MANIFEST touch ${.TARGET} From nobody Mon Apr 1 23:50:45 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4V7nnx3RBmz5FRps; Mon, 1 Apr 2024 23:50: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 4V7nnx1b1Lz4SDM; Mon, 1 Apr 2024 23:50:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712015445; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NMVkEgjTc+Du/NYOJfPZSIY8dsNHeOVVNDP2JH6pY+U=; b=cmpfTmZCGkEYdYPrZMmVhGYyluBIgqneia7v73DK0Pil20tVMdvQ42u9fE4XH6YFBGC/Z9 eYIIK8aebGuAHi9IjEpGNn+SWXfqmSnVwq32tHKQ/n5+2bJlh3aEPfrZsCYwRevaEinHB2 UqKeJkkUDPsL2WGUDDdWcmhqkbFI7CndWMCK6N3YhAZk9CEWtegSseDMcxWp0gUJ7HyRcm UwUYPOZnx+XnuR3vCVwoyW9m1eUjjpHU6uEgirFjC/jcwlfqYylRbWYDvh+Kxxa81JKsbK p/WxorQjQVPoftCuFjXQvtTLT2QQQ9iO6BZxfMjHCs0xgG2xLNYuCSDW2N/O8Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712015445; a=rsa-sha256; cv=none; b=s/EOTeGcEZ2IuxQZ8vww+VhXTcjdJXtY5FFUQ44AtbMT3RrcObJpgNzcwcCXwDoHyaRxKj WuyND5UrydcdZXItxV6y8P9rdyqajGFRBUfKRs1QavRvlL96Vx16+jUzGKq6ge1gqomkj0 1f3qSBpPmlNJJQMgtD48wrYFCzEJMJELbacnTw3qSOGV5dmGm/mF26AuWsUS1X0ytzPF9k YKUn7xNgmUBWW/tX5l+twpgIJ740kFz9sf9v2rNFGj0691ldB2xFgDoVO9cw7zuEMImfpP Y61R+Mi5BGZPk8hYwolW1dME9lbq8NEILsVxK0xphkGgAmjIZBaxsn6FV3ggPw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712015445; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NMVkEgjTc+Du/NYOJfPZSIY8dsNHeOVVNDP2JH6pY+U=; b=abFR6gjHg1oPFwiRV2ItKmToSuhOUXWKR/VdKaJzYAn6x04WLD07T2vz7i7pZGvxSGAQv0 DvaYLdW0Ac+IRYK3kRYUS3d2AJQB4Sv7RDWn6Una8/FXW+K+uVN/h5z6emV4MmeiKE1S+v Qlrfh7tzHFz9S4kM99Qx2pA8xL63Hh0Ff34X/ewqmjrsSl7cTYHG3SK/vabkRNKpaklFWW 36Rkc7qva/4bXGdi2wDyYhiVbDhA1Ae2ICyqIScBrAJLoEayropYwd0Pw5LgpfNJEkZmKh 05kM+rhumXtvxsI5eFqOyYByVVxtu9qYG9JGQici6dgFwLKvA5r5SmgNb0lcwg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4V7nnx1C2VzQbv; Mon, 1 Apr 2024 23:50:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 431Noj5u094412; Mon, 1 Apr 2024 23:50:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 431NojCl094409; Mon, 1 Apr 2024 23:50:45 GMT (envelope-from git) Date: Mon, 1 Apr 2024 23:50:45 GMT Message-Id: <202404012350.431NojCl094409@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: 7249e0d28c23 - stable/14 - crunch: remove fdisk from examples List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 7249e0d28c2327318a5869d41f506edaddc94adb Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=7249e0d28c2327318a5869d41f506edaddc94adb commit 7249e0d28c2327318a5869d41f506edaddc94adb Author: Ed Maste AuthorDate: 2024-01-23 18:28:07 +0000 Commit: Ed Maste CommitDate: 2024-04-01 23:49:26 +0000 crunch: remove fdisk from examples It has been deprecated for a long time; gpart should be used instead. The man page was updated in 2015 to declare it obsolete (b8c19fd719945). (cherry picked from commit 1f41c1c1a3a9883ed4b239ed3ec2f4cf183ce1e8) --- usr.sbin/crunch/examples/filesystem.conf | 2 +- usr.sbin/crunch/examples/fixit.conf | 2 +- usr.sbin/crunch/examples/really-big.conf | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/usr.sbin/crunch/examples/filesystem.conf b/usr.sbin/crunch/examples/filesystem.conf index 5be30f528cce..c9a6cf0ce018 100644 --- a/usr.sbin/crunch/examples/filesystem.conf +++ b/usr.sbin/crunch/examples/filesystem.conf @@ -12,7 +12,7 @@ ln sh - ln sh -sh # /sbin -progs disklabel fdisk init mount newfs reboot umount +progs disklabel init mount newfs reboot umount ln reboot halt ln reboot fastboot ln reboot fasthalt diff --git a/usr.sbin/crunch/examples/fixit.conf b/usr.sbin/crunch/examples/fixit.conf index 5596d58c45f1..7c6539cf8aa5 100644 --- a/usr.sbin/crunch/examples/fixit.conf +++ b/usr.sbin/crunch/examples/fixit.conf @@ -21,7 +21,7 @@ ln sh -sh # init invokes the shell this way # /sbin stuff -progs chown clri disklabel dump dmesg fdisk fsck ifconfig init +progs chown clri disklabel dump dmesg fsck ifconfig init progs mknod mount newfs ping reboot restore swapon umount ln dump rdump ln restore rrestore diff --git a/usr.sbin/crunch/examples/really-big.conf b/usr.sbin/crunch/examples/really-big.conf index e6624a1ad836..12c08b73936f 100644 --- a/usr.sbin/crunch/examples/really-big.conf +++ b/usr.sbin/crunch/examples/really-big.conf @@ -22,7 +22,7 @@ ln sh -sh srcdirs /usr/src/sbin -progs bim clri disklabel dmesg dump dumpfs fdisk fsck halt +progs bim clri disklabel dmesg dump dumpfs fsck halt progs ifconfig init mknod modload modunload mount mount_isofs progs mount_lofs mount_msdosfs mountd progs newfs nfsd nfsiod ping quotacheck reboot restore route routed savecore From nobody Tue Apr 2 00:59:33 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4V7qKV2t7Vz5FZpb; Tue, 2 Apr 2024 00:59:42 +0000 (UTC) (envelope-from zlei@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4V7qKV22Tzz4XyB; Tue, 2 Apr 2024 00:59:42 +0000 (UTC) (envelope-from zlei@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712019582; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=IYCF4wcBNwb65UtuNY0VXd+BRxyNJdie0uyBzTWVSiY=; b=U9Kon8lsJqBTn0SztJmx7RcjqOPDV2d6i+CrVVwo43tDvqOQ5vtsMSuk5Bh+EATMkyva1z 3S8uQ24zUXBwGevk/CIgQNGCNw4lU+nVe170YKdC01mPzumRNrjyLxHckAyk25X8lbgJdU yUvFoUuguQzBlgOPoOwpXfTquOH/b0sCUxt+axGlOHH+HHBwhAhRUZD0YWvJIkAGFtAWZP DLXVhG4El7+R6Zpc+DDpFPaK38xeQ2LPJBnVPAxWtYdAQmCzAHGDGzgxBDS8YqwZdLxqKS mK/ZW8hags6lFa9l5xKfOyT9rOQBU5RoXIJ0zXK26u72gU8WUPzV0WqSKJGBrA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712019582; a=rsa-sha256; cv=none; b=QBsB199rUtItkefRkVlmPtgBx+5mgZ8VoSJ2uKyujd89FXbZeUiZMm4IvUtnZU/O5++169 k6qjx3i/Kc2O2hNxs7CyK4ohGKuEFPghhQpAbcRNNwl+mEX8muMj0JA5VvAadfCmY4NJ7p vsm/qqQPdEJPxar9dVQn3KYTYWZdEeSim5+TMoNzQKFpHoTN5vWLWntWkcyIx8mCvlpXfA 9Gx/uJmkZPmRh2yTxkalPMDY3D7rPRo3Ro+8bYortWjlsrv+OH8D4Z59qbdz+gUXt5kcF2 71oFMH0kbuzA1CPIqRHbnA6Thld4hvHhVwKV6o1XKM8COUK/tiYxt5ci5zhAMg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712019582; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=IYCF4wcBNwb65UtuNY0VXd+BRxyNJdie0uyBzTWVSiY=; b=oqukn/ZxZFeq/AkBWprs9u5wxkiGykk+WKLM8wHvvCr1fSN6oyo2L+VzNnhsNYOKSOXPO0 5MHmMrQ5Mw2nzrCTBQ8pbZx/D8QJlTYzRx7mwm/2vEIuwaW5PaZAZsnorVzDTTeZJPLU0u GEYIFZCOW7ERUeoGjdwrCdRxEfBrC3OtnaZhH7XFgv6IN/nSLlnDpOmcJvRrmFn+OfvIfM GuPU0VKkgmH2d/6Ey8pALxALgc+amTGyWkWC+tlA0AHMpbItpbFQEyD4x0LK12jJ04ue8Q T+PV8Rqr3FFlZv+3sSK0Iw+fTYsJUBTjznO9aQPalrpY6X0WBYjGbd2+6dChzQ== Received: from smtpclient.apple (unknown [IPv6:2001:19f0:6001:9db:98f0:9fe0:3545:10]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) (Authenticated sender: zlei/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4V7qKS759wz1PCd; Tue, 2 Apr 2024 00:59:40 +0000 (UTC) (envelope-from zlei@FreeBSD.org) From: Zhenlei Huang Message-Id: Content-Type: multipart/alternative; boundary="Apple-Mail=_FD3BFEC7-1909-421F-B544-1A90D3B1EA1B" List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3696.120.41.1.8\)) Subject: Re: git: 63613e3ba1e1 - main - wg: Use ENETUNREACH when transmitting to a non-existent peer Date: Tue, 2 Apr 2024 08:59:33 +0800 In-Reply-To: <202404011723.431HNlNf040122@gitrepo.freebsd.org> Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" To: Mark Johnston References: <202404011723.431HNlNf040122@gitrepo.freebsd.org> X-Mailer: Apple Mail (2.3696.120.41.1.8) --Apple-Mail=_FD3BFEC7-1909-421F-B544-1A90D3B1EA1B Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=us-ascii I can confirm this fixes = https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=3D266712 = . > On Apr 2, 2024, at 1:23 AM, Mark Johnston wrote: >=20 > The branch main has been updated by markj: >=20 > URL: = https://cgit.FreeBSD.org/src/commit/?id=3D63613e3ba1e188e9fece43e1613bd697= f04b345e >=20 > commit 63613e3ba1e188e9fece43e1613bd697f04b345e > Author: Mark Johnston > AuthorDate: 2024-04-01 17:20:55 +0000 > Commit: Mark Johnston > CommitDate: 2024-04-01 17:23:32 +0000 >=20 > wg: Use ENETUNREACH when transmitting to a non-existent peer >=20 > The old errno value used is specifically for Capsicum and shouldn't = be > co-opted in this way. It has special handling in the generic = syscall > layer (see syscallret()). OpenBSD returns ENETUNREACH in this = case; > let's do the same thing. >=20 > Reviewed by: kevans, imp > MFC after: 2 weeks > Sponsored by: Klara, Inc. > Differential Revision: https://reviews.freebsd.org/D44582 > --- > sys/dev/wg/if_wg.c | 5 +---- > 1 file changed, 1 insertion(+), 4 deletions(-) >=20 > diff --git a/sys/dev/wg/if_wg.c b/sys/dev/wg/if_wg.c > index 42c426ac1819..bb61917ee4fc 100644 > --- a/sys/dev/wg/if_wg.c > +++ b/sys/dev/wg/if_wg.c > @@ -251,9 +251,6 @@ struct wg_softc { >=20 > #define MAX_LOOPS 8 > #define MTAG_WGLOOP 0x77676c70 /* wglp */ > -#ifndef ENOKEY > -#define ENOKEY ENOTCAPABLE > -#endif >=20 > #define GROUPTASK_DRAIN(gtask) \ > gtaskqueue_drain((gtask)->gt_taskqueue, &(gtask)->gt_task) > @@ -2115,7 +2112,7 @@ wg_xmit(if_t ifp, struct mbuf *m, sa_family_t = af, uint32_t mtu) > BPF_MTAP2_AF(ifp, m, pkt->p_af); >=20 > if (__predict_false(peer =3D=3D NULL)) { > - rc =3D ENOKEY; > + rc =3D ENETUNREACH; > goto err_xmit; > } >=20 --Apple-Mail=_FD3BFEC7-1909-421F-B544-1A90D3B1EA1B Content-Transfer-Encoding: quoted-printable Content-Type: text/html; charset=us-ascii I = can confirm this fixes https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=3D266712&= nbsp;.

On Apr 2, 2024, at 1:23 AM, Mark Johnston = <markj@freebsd.org> wrote:

The = branch main has been updated by markj:

URL: = https://cgit.FreeBSD.org/src/commit/?id=3D63613e3ba1e188e9fece4= 3e1613bd697f04b345e

commit = 63613e3ba1e188e9fece43e1613bd697f04b345e
Author: =     Mark Johnston <markj@FreeBSD.org>
AuthorDate: 2024-04-01 17:20:55 +0000
Commit: =     Mark Johnston <markj@FreeBSD.org>
CommitDate: 2024-04-01 17:23:32 +0000

   wg: Use ENETUNREACH when transmitting to a = non-existent peer

   The = old errno value used is specifically for Capsicum and shouldn't be
   co-opted in this way.  It has special = handling in the generic syscall
   layer = (see syscallret()).  OpenBSD returns ENETUNREACH in this case;
   let's do the same thing.

   Reviewed by:    kevans, = imp
   MFC after: =      2 weeks
=    Sponsored by:   Klara, Inc.
=    Differential Revision:  https://reviews.freebsd.org/D44582
---
sys/dev/wg/if_wg.c | 5 +----
1 file changed, = 1 insertion(+), 4 deletions(-)

diff --git = a/sys/dev/wg/if_wg.c b/sys/dev/wg/if_wg.c
index = 42c426ac1819..bb61917ee4fc 100644
--- = a/sys/dev/wg/if_wg.c
+++ b/sys/dev/wg/if_wg.c
@@ -251,9 +251,6 @@ struct wg_softc {

#define MAX_LOOPS 8
#define = MTAG_WGLOOP = 0x77676c70 /* wglp */
-#ifndef ENOKEY
-#define ENOKEY = ENOTCAPABLE
-#endif

= #define = GROUPTASK_DRAIN(gtask) \
= gtaskqueue_drain((gtask)->gt_taskqueue, = &(gtask)->gt_task)
@@ -2115,7 +2112,7 @@ = wg_xmit(if_t ifp, struct mbuf *m, sa_family_t af, uint32_t mtu)
= BPF_MTAP2_AF(ifp, m, pkt->p_af);

= = if (__predict_false(peer =3D=3D NULL)) {
- rc =3D = ENOKEY;
+ rc =3D ENETUNREACH;
= = = goto err_xmit;
}




= --Apple-Mail=_FD3BFEC7-1909-421F-B544-1A90D3B1EA1B-- From nobody Tue Apr 2 02:19:22 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4V7s5Q6yhdz5FlDh; Tue, 2 Apr 2024 02:19:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4V7s5Q6RLHz4h4s; Tue, 2 Apr 2024 02:19:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712024362; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ABJEsE5d135f3pUgE7eyE5hHUKNQjvrRngQFyHM6JbA=; b=Qpyqemb17rXy+bUBp+I05nkQW6vhIrOmmEanCZjX+q4LNPtaLXiz8XjR9eBX8HFU0vTurP lFYB1rDvSbU4tOH4MW6zqeX2zQWQaor9iub1SxYrYNeDD0sdjp6J/3nekqRVd6rjjWHdAa I328InWNtUiKm58D4yCoZITkpDsLcuIVmBNJ3FjdLprqtbc4DZ88s61Qsf4w4EC7X4N2oJ dPiwPNwVtPkCtzfd9qP4xXYPq0VGrel4vFPIkXNcD3UOZRQIfef2+nW960Ttk1e5FSo9re 8eISCA4sE7dtpAIs0LbR2TVDJ1CHdF+idcYDn5+EdfS9cAYDS92/JVIp1hU3Xw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712024362; a=rsa-sha256; cv=none; b=Dge3aV3Ghrwn1MCqXBMyMfXEFX7dXYsP4T63TprOqqjy8WasVU146o+uHFumBGYeF66Em3 YBZnDyYMxwkbhwazl/3tSOq54WEpQXD5uFU7GwroueXoJMIKzHcejkOjWNu9JZjXc5rCtf xaeYHO3PCpLyf4P9brX7lxkrpNNf/nhE7v0hbAaualplGDw9OabZEY+NgR/Of/BrOl5kVp nc5zGm1rwb5/7pKJJfTb38F0A7fTIIzbqDattMQOBUvao7joRmyY8F485WAlcREGq94bwY rJ3uGBaMUD2nheySxQjip97wATaQ2d7yg9CSMrQdXxtvE0Cr/ck3A6YkMHMJUg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712024362; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ABJEsE5d135f3pUgE7eyE5hHUKNQjvrRngQFyHM6JbA=; b=ROwnM04la8ONLJGFiSKDFaFNbFY1Jy/vvAHmjp+zFflIFpudUxqi9QLRxfFY9cu3vS7Ns3 OQ26U+ZsK4m026aaAF5ro+uxgx43hH6p1C0X/vMqXhnnso7VNyGucNMg5kuVheXGJ4HPw0 Na+UjGwoziUFtHZmKkBmTUj21MqeRKHmBhgRS5abtTwHpaw9dzTYeV2qimZhAcZWL1JW7Z bpnswR3yPw4BE3bNu2GibpmdKqsDvn9rMlSg1Lh2pWBSQt33+BdoxQXP24LQqMCyZZd/Lv fCA8+oSxJGyaz9Tomvmhs8G2hVUZFW/V0NwsRkVHnxjXyHwYBgsWoE2cvBnUOA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4V7s5Q5wJqzX3r; Tue, 2 Apr 2024 02:19:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 4322JM28037518; Tue, 2 Apr 2024 02:19:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4322JMXH037515; Tue, 2 Apr 2024 02:19:22 GMT (envelope-from git) Date: Tue, 2 Apr 2024 02:19:22 GMT Message-Id: <202404020219.4322JMXH037515@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Justin Hibbits Subject: git: 44aac9115f75 - stable/14 - powerpc: Bump maximum number of FDT reserved mem entries List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhibbits X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 44aac9115f75fc98c955758c202e0025ae4a0876 Auto-Submitted: auto-generated The branch stable/14 has been updated by jhibbits: URL: https://cgit.FreeBSD.org/src/commit/?id=44aac9115f75fc98c955758c202e0025ae4a0876 commit 44aac9115f75fc98c955758c202e0025ae4a0876 Author: Shawn Anastasio AuthorDate: 2024-02-27 19:40:50 +0000 Commit: Justin Hibbits CommitDate: 2024-04-02 02:09:57 +0000 powerpc: Bump maximum number of FDT reserved mem entries Newer firmware on POWER systems, including v2.10 of the Talos II and Blackbird firmware can end up reserving more than 32 memory regions in the device tree, which exceeded an assumption made by ofw_machdep.c's excise_fdt_reserved(). Bump the maximum number of FDT reservations to the next power of 2 in order to fix booting on newer firmware. PR: 277097 Reviewed by: jhibbits Differential Revision: https://reviews.freebsd.org/D44015 (cherry picked from commit b52dceb838116391996909ff50b49f950ee01f48) --- sys/powerpc/ofw/ofw_machdep.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/powerpc/ofw/ofw_machdep.c b/sys/powerpc/ofw/ofw_machdep.c index f850efa6c713..6d7b0b01fc84 100644 --- a/sys/powerpc/ofw/ofw_machdep.c +++ b/sys/powerpc/ofw/ofw_machdep.c @@ -426,7 +426,7 @@ excise_msi_region(struct mem_region *avail, int asz) static int excise_fdt_reserved(struct mem_region *avail, int asz) { - struct mem_region fdtmap[32]; + struct mem_region fdtmap[64]; ssize_t fdtmapsize; phandle_t chosen; int j, fdtentries; From nobody Tue Apr 2 05:39:08 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4V7xWw2s0Cz5G7bW; Tue, 2 Apr 2024 05:39:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4V7xWw2L3Gz43Jr; Tue, 2 Apr 2024 05:39:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712036348; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LloRsuNik73cDyc+NSfSUUSYqRHjbMLV6kMWAFdxitI=; b=r1/cC8OV7L08e7VcLlh64DsRlbW3B1NO8T031uxgKDBiR+zQ4EJpaSE4gvas/wMR7tSIMD gYVjf7G7iLVao+JP0aM9dGwwIZJT5h8tzrYXEr9hWzNdDIJzjuihS1rsD4JJSmj9BjkJ/B WBKlccVEeRqhro9XgvnAgvbShQV4hejCOJi9FDIhiJc3wuyvyqLBKzHFMljuRS/h91q2a+ hUN+aNwuu/Ta1GdejhVpp0r9vDx9u5W93wTxF37ZvJiRO9AZBr/D3Tg6Qk1B7dmUiqGRAV zA1Vv2RV5f4/9o/qzjFCqnt81wOIhfDmHnXmIZt6gTOzx5+9J8RFCCZHKs9HrA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712036348; a=rsa-sha256; cv=none; b=pQWDgMjIX53NUwio63AU0t4yKRSaKVF+O31eNDgP77DUtE2jeFtHLAta7KEuw2HeTXMumP +kuB3laJXHgW134lWuCOoRKtH1DgTCp1olJmAajXjWuTHKY2aEUyoII5lnUp8ob0onFy2o 1j5cbz4+xRL2NJ8jfhKq0DtVYY9036MZlj3kTeYJjMGECK3RrfZJ/qz3B8zGJGmTBQmBML TmtrSlcVbu06mQpjfURXoQhsrE6fBmIOv0QLrrmMtAjX3Yb+/yPiZSuCFpsrwxyuwaRN5y +p4EuLchFCrYmS7Q+xnbmWyDqg/1XTEAGcQc003987P4iIx5uUFlnAzkSHc4Yg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712036348; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LloRsuNik73cDyc+NSfSUUSYqRHjbMLV6kMWAFdxitI=; b=JWaMfYX2wKjI3lZEFOdePBDfNCmlungimib87X9kBJJ5XlDPEVyV+yi5l+w9efeqKkTR4f QP3aCJ+LGsiQdsFuo9VUBcXLHk6462E4kkBk9uN2Y2KpEnbZQ8ac0rSW4cHSEXzMsSenbO WAY6tNqm8rSSu2XdOdTeZnkopisXEKgdLRx/yv6LA9j6c20pcQ2v8VtTI7Q8DUQ1+lntPe ayiLLntxxB05wdPodeJAxU49iD1O93fGcmWm11pfYqDAm48m6uTzPnj+sDzEuNil6G75nP WL8hEQ92A6eJvN3CFeTn9BFTzk78joLxp7E9V18MPFR7WU4Rl6jNqBnJl2QDVA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4V7xWw1q9TzcdY; Tue, 2 Apr 2024 05:39: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 4325d8w3076023; Tue, 2 Apr 2024 05:39:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4325d84N076020; Tue, 2 Apr 2024 05:39:08 GMT (envelope-from git) Date: Tue, 2 Apr 2024 05:39:08 GMT Message-Id: <202404020539.4325d84N076020@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Emmanuel Vadot Subject: git: 2db2566f55b0 - main - fwget: Add needed firmware for Radeon 780M GPU List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2db2566f55b06d80e28c932ec30b5730815d95a2 Auto-Submitted: auto-generated The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=2db2566f55b06d80e28c932ec30b5730815d95a2 commit 2db2566f55b06d80e28c932ec30b5730815d95a2 Author: Philipp Ost AuthorDate: 2024-04-02 05:38:00 +0000 Commit: Emmanuel Vadot CommitDate: 2024-04-02 05:38:00 +0000 fwget: Add needed firmware for Radeon 780M GPU PR: 278115 --- usr.sbin/fwget/pci/pci_video_amd | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/usr.sbin/fwget/pci/pci_video_amd b/usr.sbin/fwget/pci/pci_video_amd index 1cea101d6465..5f89b12dce7c 100644 --- a/usr.sbin/fwget/pci/pci_video_amd +++ b/usr.sbin/fwget/pci/pci_video_amd @@ -143,5 +143,12 @@ pci_video_amd() addpkg "gpu-firmware-amd-kmod-smu-13-0-0" addpkg "gpu-firmware-amd-kmod-vcn-4-0-0" ;; + 0x15bf) + addpkg "gpu-firmware-amd-kmod-gc-11-0-1" + addpkg "gpu-firmware-amd-kmod-psp-13-0-4" + addpkg "gpu-firmware-amd-kmod-dcn-3-1-4" + addpkg "gpu-firmware-amd-kmod-sdma-6-0-1" + addpkg "gpu-firmware-amd-kmod-vcn-4-0-2" + ;; esac } From nobody Tue Apr 2 07:24:17 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4V7zsG0XJLz5GKqn; Tue, 2 Apr 2024 07:24:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4V7zsF6vDBz4Gth; Tue, 2 Apr 2024 07:24:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712042658; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Od5eLS81RgmiB1eG+sa77dhuhHt5FyEcxuL9Uwus7zI=; b=Ir8ahJo+OukN5bwwksL1c7uBiIWQY+qGeKfa2aXSy44sFpFEZGOmYsX70EUhVy8RC0287M D6JPg33OxUiZcDzFOgSNrWv+GS5j84uzI1c2FsvbM6xzIvSLikiRfCQcNyHeOOwEFzesad r00ctYTbguYlT9h16PQ6b9UGa8ND4UZeaaF7WXXbjUiElArs1cFI36scsMlrTiO04/1VEN qvguRH6Sl1jV2uUlahZTC0v3o+majjt+rkkhp3xmBBKdB072I7VcjeAFhFNO5U6Bt4qkE2 R4SSa/7kcpeNEY6D/XkLeTaI/8MgHTFTOfKR39UBrkq4wSEEA7BWUZZMUKlr+A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712042658; a=rsa-sha256; cv=none; b=EBMY++tn3kq2MkOzBMUHgzqnSCR/nkKfuBVgoKmAGE1gfAtlKM1LPIBGR0uzBeZTZtuQHr oOlsz8Y1b3pZw7GJoup85sF+A3ZfRUOHNj3SaZXiiJBhYJfyNvd2TTTCto0k5raSULr8mG MW689NxoytfJFuvA071gVl/DuQhFEQqOp71FhPb+GLB0heiJw4ol82Kw5ASeXpuwB1vi5o b9w1/+hc01p9BbmENy541V/re4r/pF0k7py6sRLtzozGcgpr82d+L/4P1b4twfvD24LwPp vgzuYhwpDDYOD6OJLFm63tvI5uJgcVoAKTQysF0P560bWMtGEms/5/6g0985QQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712042658; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Od5eLS81RgmiB1eG+sa77dhuhHt5FyEcxuL9Uwus7zI=; b=dZ+Gfid6ijGUiXlIBMGdLp8U/sXZfqQFqKGJRinL+D/sXgrSahNtab16g1KK1mryVJkVC5 sVpKHmyFb3SSp0Jg8w9mc8V8WC0xR5noiw0lBsl+BBQCH6j7R6P8F8pNOMyLUYb7gIqz+q gbl2wJWUtdwV4CCp+KC7OhGgFgDwUQnPKUTd14NFsTO9qsCX9CKb24hMA+lXzol4nrxS5r QXcdEhyaTty4ASImn5yV+5NAXlnFViWKiglc+jPxqPScL/dXO7v+3hqGwM147JDy9byZ2D YrUVuz96VfIFCRrk0EEzA6mpRvMQDYH2ZkbK5vxeTAURRHHe5xNVNtuun+ooDQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4V7zsF6VfYzgTQ; Tue, 2 Apr 2024 07:24: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 4327OH5A060704; Tue, 2 Apr 2024 07:24:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4327OH84060701; Tue, 2 Apr 2024 07:24:17 GMT (envelope-from git) Date: Tue, 2 Apr 2024 07:24:17 GMT Message-Id: <202404020724.4327OH84060701@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Lawrence Stewart Subject: git: 743d4b7cc5e2 - main - Fix the logic which determines if the destination Q variable can represent the source Q variable's value with full accuracy. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: lstewart X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 743d4b7cc5e217a2120b3b5d4d1b284e1e5b7ea2 Auto-Submitted: auto-generated The branch main has been updated by lstewart: URL: https://cgit.FreeBSD.org/src/commit/?id=743d4b7cc5e217a2120b3b5d4d1b284e1e5b7ea2 commit 743d4b7cc5e217a2120b3b5d4d1b284e1e5b7ea2 Author: Lawrence Stewart AuthorDate: 2024-04-02 05:07:04 +0000 Commit: Lawrence Stewart CommitDate: 2024-04-02 06:16:00 +0000 Fix the logic which determines if the destination Q variable can represent the source Q variable's value with full accuracy. The new logic is mostly self explanatory except for the value fit checks. If b has fewer integer bits than a, 0 == (Q_GIABSVAL(a) & (~Q_TC(a, 0) << Q_NIBITS(b))) is checking that a's integer value does not have high-order bits set above what b is capable of storing. If b has fewer fractional bits than a, 0 == (Q_GFABSVAL(a) & ~(~Q_TC(a, 0) << (Q_NFBITS(a) - Q_NFBITS(b))))) is checking that a's fractional value does not have low-order bits set below what b is capable of storing. Obtained from: Netflix, Inc. MFC afer: 1 week --- sys/sys/qmath.h | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/sys/sys/qmath.h b/sys/sys/qmath.h index fa5acdb985be..bfaad75e77ee 100644 --- a/sys/sys/qmath.h +++ b/sys/sys/qmath.h @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2018 Netflix, Inc. + * Copyright (c) 2018-2024 Netflix, Inc. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -378,15 +378,18 @@ typedef u64q_t umaxq_t; #define Q_QMINQ(a, b) (Q_LT(a, b) ? (a) : (b)) /* - * Test if 'a' can be represented by 'b' with full accuracy (T) or not (F). - * The type casting has to be done to a's type so that any truncation caused by - * the casts will not affect the logic. + * Test if 'a' can be represented by 'b' with full accuracy (0) or not + * (EOVERFLOW). If 'b' has fewer integer and/or fractional bits than 'a', + * the integer and fractional values stored in 'a' must fit in the available + * number of integer and fractional bits in 'b'. */ -#define Q_QCANREPQ(a, b) \ - ((((Q_LTZ(a) && Q_SIGNED(b)) || !Q_LTZ(a)) && \ - Q_GIABSVAL(a) <= Q_TC(a, Q_IMAXVAL(b)) && \ - Q_GFABSVAL(a) <= Q_TC(a, Q_FMAXVAL(b))) ? \ - 0 : EOVERFLOW) +#define Q_QCANREPQ(a, b) (( \ + (!Q_LTZ(a) || Q_SIGNED(b)) \ + && ( Q_NIBITS(a) <= Q_NIBITS(b) \ + || 0 == (Q_GIABSVAL(a) & (~Q_TC(a, 0) << Q_NIBITS(b)))) \ + && ( Q_NFBITS(a) <= Q_NFBITS(b) \ + || 0 == (Q_GFABSVAL(a) & ~(~Q_TC(a, 0) << (Q_NFBITS(a) - Q_NFBITS(b))))) \ + ) ? 0 : EOVERFLOW) /* Test if raw integer value 'i' can be represented by 'q' (T) or not (F). */ #define Q_QCANREPI(q, i) \ From nobody Tue Apr 2 08:59:40 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4V81zJ6l7vz5G4ZH; Tue, 2 Apr 2024 08:59:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4V81zJ6DMRz4VM6; Tue, 2 Apr 2024 08:59:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712048380; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9Jbx2XDpo8Xv1ES0eAcnTwD08eazOi9U6yoG3mS67Ek=; b=qroNVbTrznkkYMHawao/o4tF5dcxpFlO5YRxA65DWlS5bXZLWiRemvZtA9IzZnX7jhThhS or8RS3bVK4byu8BcUY7c1G7HuDzA5hVe4YFI7A7JW5OeiEBPD7QtOa6qB0HAa7UMOfc0rR Kcfd9xWfdX6LudKjh9+Lo2Pg0lrL/xlD/ks6hUiPHxmhuMLpARVPzsEYwu4AjWZZGQlfbp PNle2sr+kc4xXgh2S5+5nbo7NtAaLMDJR/XUP5f88oo/a8L93gKZCXzaggb9zVcUffzCHQ VUkExhU1sBiuOks7YrjARbvBJxeuXab7lIEnZeLg+MPuMnoboTRteJJcQwY90A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712048380; a=rsa-sha256; cv=none; b=xxKhv/cFY/s6b3D9YJQs8XwLI95oQWt2UCgPuW5sXGwgo2LKFJne8HEqNpnp58TJrOHW1y v2JnRbVwuMQb1hjzXT4nbYlLhJCZcjwlkHJV4lok7Hkt+jiVTUYnLZc5mAJt/Ok+VLA/OX Q1bQvkOFXNAlYLMYzz3eM6WqDC+IyObFMgXTcd5f7Yc9Jr4vPuQ+ye1XnsMu0gY9z0ALKg EBuPtnSkKbmgDYEtvohRYhsy9M2sENlfJPCrmghMx5cGdlw6DWn/wav0r4bQIN8zFlYFet gbXMAhsF5KuddzXy/lj5DgcVlTPfKfiTmWE2Rvw4Z6O6OV1TCg83Mlz3P8ggIQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712048380; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9Jbx2XDpo8Xv1ES0eAcnTwD08eazOi9U6yoG3mS67Ek=; b=Qck/5KuRobR2iwGlKqMrEuMicwwMXUQ7/VoljLeOmsTsPPTwpV53xqMuqw1zNk3l4V1NSc Q9ZZLLY3eEDcUclcJbpcU7M4mQWPNpFGR1FtLVYZL893pc4mHN8R64dJ4kxH8sWonYqmWW yuKCU3feXkpUg6MU6n1sG6ClqNUvQsUxTJKCKWdhOenqgA4ORSMog/vLbvMYf5Fz3XJUxp 1lZ0XMpYtRh5W2GtNRTmaJvYaogCmHnNaHqNfN8pTI9zeAkYh/CBtBHwC5LqILl74jzcMO 6Jaqz+6Cph8ePN33RNh/h9e/zzDzuRIvBA1yEKOROf6wGmDjzyj5Wx/KLu+UHg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4V81zJ5qX4zjZ3; Tue, 2 Apr 2024 08:59: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 4328xexX014597; Tue, 2 Apr 2024 08:59:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4328xett014594; Tue, 2 Apr 2024 08:59:40 GMT (envelope-from git) Date: Tue, 2 Apr 2024 08:59:40 GMT Message-Id: <202404020859.4328xett014594@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: b40ed1134d67 - stable/14 - x86: test the right CPUID bit when checking for XSAVEOPT support List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: b40ed1134d6763ef8a24f6fe2f0f219dba5d3f6e Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=b40ed1134d6763ef8a24f6fe2f0f219dba5d3f6e commit b40ed1134d6763ef8a24f6fe2f0f219dba5d3f6e Author: Konstantin Belousov AuthorDate: 2024-03-25 10:34:06 +0000 Commit: Konstantin Belousov CommitDate: 2024-04-02 08:58:20 +0000 x86: test the right CPUID bit when checking for XSAVEOPT support (cherry picked from commit 960d151eaa1ecde109accc30ca0c3306551d8e58) --- sys/amd64/amd64/fpu.c | 5 ++++- sys/i386/i386/npx.c | 8 ++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/sys/amd64/amd64/fpu.c b/sys/amd64/amd64/fpu.c index 3432e62bf7f8..63fcf7b0a361 100644 --- a/sys/amd64/amd64/fpu.c +++ b/sys/amd64/amd64/fpu.c @@ -236,9 +236,12 @@ fpurestore_fxrstor(void *addr) DEFINE_IFUNC(, void, fpusave, (void *)) { + u_int cp[4]; + if (!use_xsave) return (fpusave_fxsave); - if ((cpu_stdext_feature & CPUID_EXTSTATE_XSAVEOPT) != 0) { + cpuid_count(0xd, 0x1, cp); + if ((cp[0] & CPUID_EXTSTATE_XSAVEOPT) != 0) { return ((cpu_stdext_feature & CPUID_STDEXT_NFPUSG) != 0 ? fpusave_xsaveopt64 : fpusave_xsaveopt3264); } diff --git a/sys/i386/i386/npx.c b/sys/i386/i386/npx.c index 26def3f433f1..9cbb1340e9d1 100644 --- a/sys/i386/i386/npx.c +++ b/sys/i386/i386/npx.c @@ -317,9 +317,13 @@ fpusave_fnsave(union savefpu *addr) DEFINE_IFUNC(, void, fpusave, (union savefpu *)) { - if (use_xsave) - return ((cpu_stdext_feature & CPUID_EXTSTATE_XSAVEOPT) != 0 ? + u_int cp[4]; + + if (use_xsave) { + cpuid_count(0xd, 0x1, cp); + return ((cp[0] & CPUID_EXTSTATE_XSAVEOPT) != 0 ? fpusave_xsaveopt : fpusave_xsave); + } if (cpu_fxsr) return (fpusave_fxsave); return (fpusave_fnsave); From nobody Tue Apr 2 08:59:41 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4V81zL0brdz5G4d2; Tue, 2 Apr 2024 08:59:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4V81zL08L1z4VCw; Tue, 2 Apr 2024 08:59:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712048382; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HaKcjFk7EqM7Ky0WjbKCyJKHcgn6J8in7P4ls6/QGXw=; b=Yv+zxZ57DuLo6rc7VltPP7Rx4Cv6ow9h0tAx2b6rQzlZMsk+J2HLRueuvBABWCpG40RBsB Ubp+jBlgNTOjIquV2JA9BZwpi+b0pPtmjrfieMiHz/qoywSM15pGpaFKPkt8OIRtMGH8SN VuxmkDXRhDkYTZaVHjppOMWvmfvpv05cupwoqdFyzuEMqLedLisiYt01FO/TxEj8WRZGQg zUMcIdoMTEYgt+ctctyPACQ0Qh0Kei05s0WIu8wCJ5RaULaIlvdXWR3PoICgniXPFWNxGO zClSGU+tpN/Vw/zp2dQtdazuK2DP1e/Wrw/f+e1/KqqmDKavVI782KgiQb29Tw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712048382; a=rsa-sha256; cv=none; b=Uq+IvhNwGL2ub/0ARDf6Sm8+DFEO9esVBP9+QK5zYiqrapxYhf9DrmTRQNTjP+ypJXatMX k2V6hfJmqWfkxPKrHB7hr/14PjxYRHkhzUN1CTwH0wxzgHTo2ZI9BWgeOxxtk1fY7ZTVSp pCNqZv+KQ253zvhoONS15e7sRL7E8fI92K9GWSmHJMMGz8NtYC9Y73+mVsXbeFBKc49DTw 7VRYGyX6ypCCVwV28rILdxa1mkVjgsBYMZoQVYdHb3yxgLv2Bm6WC2GJSoQYCmDvgVjrzC WCB8DK+PHpm1Mwhqzjbs5m9nBvsHOSBhsGqtfiu/7Re/WxK2CoxIcr4L5GtqOg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712048382; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HaKcjFk7EqM7Ky0WjbKCyJKHcgn6J8in7P4ls6/QGXw=; b=fCr36WunRDdNlBTa9k//6LWxEnfR9uPxWMY+ZYv/p5iPDmuy2TZuoDmK/xW0eukdXMX/vp A5myY03GKMXdUOs6BrxK601pVQdjScwJ06Ajx5Hq+Kq6OaenpmOy8i+vgO8aJMag/QBh1p NVaiZrAVtBNqnU0on373dBmgzjF7IkwlvCk/SvEvHCuR2rD8dK3orTgbhpibGjegE4Abcy /AuKaSdsPGeJtfHEAmoKHDQgqKleKxBNTeIOduF3/cvvEWiLJ6ZIuFgDnHd1cYI2vRRkEx rocANruFJ4AaADXP2O9fpaIiMFNFEnHjoSbT1J0dNZWQDTZqNRRDt3IC7rCMaA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4V81zK6tTGzj2S; Tue, 2 Apr 2024 08:59:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 4328xfq6014651; Tue, 2 Apr 2024 08:59:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4328xflP014648; Tue, 2 Apr 2024 08:59:41 GMT (envelope-from git) Date: Tue, 2 Apr 2024 08:59:41 GMT Message-Id: <202404020859.4328xflP014648@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: 38c74c46b220 - stable/14 - amd64: initialize td_frame stack area for init(8) main thread List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 38c74c46b220d8f74335026c4dcca0ab368789d2 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=38c74c46b220d8f74335026c4dcca0ab368789d2 commit 38c74c46b220d8f74335026c4dcca0ab368789d2 Author: Konstantin Belousov AuthorDate: 2024-03-25 12:10:43 +0000 Commit: Konstantin Belousov CommitDate: 2024-04-02 08:58:20 +0000 amd64: initialize td_frame stack area for init(8) main thread (cherry picked from commit e0c92dd2b7e62e4f8281c9ad1d31465bb32f9e3b) --- sys/kern/init_main.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/kern/init_main.c b/sys/kern/init_main.c index a8df9f84a29a..8d650c7ea084 100644 --- a/sys/kern/init_main.c +++ b/sys/kern/init_main.c @@ -787,6 +787,7 @@ start_init(void *dummy) */ KASSERT((td->td_pflags & TDP_EXECVMSPC) == 0, ("nested execve")); + memset(td->td_frame, 0, sizeof(*td->td_frame)); oldvmspace = p->p_vmspace; error = kern_execve(td, &args, NULL, oldvmspace); KASSERT(error != 0, From nobody Tue Apr 2 08:59:43 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4V81zM3f4Tz5G4ky; Tue, 2 Apr 2024 08:59:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4V81zM19hRz4VGX; Tue, 2 Apr 2024 08:59:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712048383; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MsP/zc8gCusSNUacYUbyJWrPZBBH4MA+sIr2OdzA5iA=; b=LpBeyGFwkp/ZXMuotneD0EqJ6XoN7nSZk9lmfRTyvpxZ+py01m+eiBto7QqtwsUxHVAfU6 /LHG2FpgLXCj5RbhJzmft/r5TV8nMGsOKAKiYLxK5yZVa0n6FusDPK2V3j4jYR28tqbang oVQoHgQJR18XIQ0K86ZUbTaBBb3JTVZxY/jjwQMvkD4qaj0/+PVydI1WoOeyWY+9VXbPHs XLYa5p5v5WpbkAeKmhqaWic6PFd2FljGi6/Llrsk5JMWAdNrjkTjR/7xyG2Ultd3/m7U9t 6wWrc8AuHMvs7PsjMAAZF+obzPhebXkd3m+xazp4R5f1dI6a3KX1NkWg9+ElZA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712048383; a=rsa-sha256; cv=none; b=cwrICnsMtdVV6vhrKuZqQqrWTj7xxILc8XDMxt7Bdt9N8fhSbCR0Aj6vgvJ1i/1cGQN3Aq OlZdkwAKTjFVsFca+64pHg6csG/Xk10d8V0GYCXY6feIA6pAhMzS4z5CWQRRYyPvQptPpT hLaG1xIh8H4nrgg1W/Jr3ZzzYBky1/rxjI2kqyhVBcUL9Ev5omvYlMPcdlJ4OmyDOgIl1M sS1inHm+8xPY3pb01r2qiCy+CEYVtH62Ad5R2i8Hbu61QQlRBu/Yacf1/2rvQqzk12pn/N L0XZCOOudIpRQdWbce2w12XyOtDoY9QpT/x8oxv40bO15KosdTI2DTvZEnyGkA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712048383; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MsP/zc8gCusSNUacYUbyJWrPZBBH4MA+sIr2OdzA5iA=; b=jU6sEtscrlH6c14s2FIVVLbwFUfBT/HjanxiHcKcSC7f8cijVlKs/Jmi5EcQ2uA56cpDmH 1x2NLnSl90O6LYhbK0w+7qz2wrNvUjbb8p46Q/l6E9ahK+mxRzPSYARPfzK41tNZMheF9X W16KpzK8hxCfjhq+FB1omsxvyCzqrKHkohMZ5NHDzPaeiiWAEhVQnYeWsLG6uZU2V0Wb12 k+jXJedyxO4xqxTZjVBUPuXc4Mrj8L3580GKZ+u4rayPqIHdHWN6l9NtpO8oJyanBemxfh 5MDemXJfTXMKcYQHAowAOUygN+9vpXMzfixAX/HZx4H34G3os2dvjluh8wxNsQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4V81zM0nTTzj2T; Tue, 2 Apr 2024 08:59:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 4328xhIN014714; Tue, 2 Apr 2024 08:59:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4328xhKQ014710; Tue, 2 Apr 2024 08:59:43 GMT (envelope-from git) Date: Tue, 2 Apr 2024 08:59:43 GMT Message-Id: <202404020859.4328xhKQ014710@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: 38fdb37047ea - stable/14 - x86: handle MXCSR from XSAVEOPT when x87 state was optimized List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 38fdb37047ead625b97b82e8f6532ed7bc404ee3 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=38fdb37047ead625b97b82e8f6532ed7bc404ee3 commit 38fdb37047ead625b97b82e8f6532ed7bc404ee3 Author: Konstantin Belousov AuthorDate: 2024-03-27 11:01:44 +0000 Commit: Konstantin Belousov CommitDate: 2024-04-02 08:58:20 +0000 x86: handle MXCSR from XSAVEOPT when x87 state was optimized PR: 275322 (cherry picked from commit 1c091d11261a3c8cc3728b92760e65242c0f5949) --- sys/amd64/amd64/fpu.c | 21 +++++++++++++++++++++ sys/i386/i386/npx.c | 21 +++++++++++++++++++++ 2 files changed, 42 insertions(+) diff --git a/sys/amd64/amd64/fpu.c b/sys/amd64/amd64/fpu.c index 63fcf7b0a361..8a0666fc0614 100644 --- a/sys/amd64/amd64/fpu.c +++ b/sys/amd64/amd64/fpu.c @@ -853,7 +853,10 @@ fpugetregs(struct thread *td) struct pcb *pcb; uint64_t *xstate_bv, bit; char *sa; + struct savefpu *s; + uint32_t mxcsr, mxcsr_mask; int max_ext_n, i, owned; + bool do_mxcsr; pcb = td->td_pcb; critical_enter(); @@ -884,10 +887,28 @@ fpugetregs(struct thread *td) bit = 1ULL << i; if ((xsave_mask & bit) == 0 || (*xstate_bv & bit) != 0) continue; + do_mxcsr = false; + if (i == 0 && (*xstate_bv & (XFEATURE_ENABLED_SSE | + XFEATURE_ENABLED_AVX)) != 0) { + /* + * x87 area was not saved by XSAVEOPT, + * but one of XMM or AVX was. Then we need + * to preserve MXCSR from being overwritten + * with the default value. + */ + s = (struct savefpu *)sa; + mxcsr = s->sv_env.en_mxcsr; + mxcsr_mask = s->sv_env.en_mxcsr_mask; + do_mxcsr = true; + } bcopy((char *)fpu_initialstate + xsave_area_desc[i].offset, sa + xsave_area_desc[i].offset, xsave_area_desc[i].size); + if (do_mxcsr) { + s->sv_env.en_mxcsr = mxcsr; + s->sv_env.en_mxcsr_mask = mxcsr_mask; + } *xstate_bv |= bit; } } diff --git a/sys/i386/i386/npx.c b/sys/i386/i386/npx.c index 9cbb1340e9d1..122452598f29 100644 --- a/sys/i386/i386/npx.c +++ b/sys/i386/i386/npx.c @@ -977,8 +977,11 @@ npxgetregs(struct thread *td) struct pcb *pcb; uint64_t *xstate_bv, bit; char *sa; + union savefpu *s; + uint32_t mxcsr, mxcsr_mask; int max_ext_n, i; int owned; + bool do_mxcsr; if (!hw_float) return (_MC_FPOWNED_NONE); @@ -1021,10 +1024,28 @@ npxgetregs(struct thread *td) bit = 1ULL << i; if ((xsave_mask & bit) == 0 || (*xstate_bv & bit) != 0) continue; + do_mxcsr = false; + if (i == 0 && (*xstate_bv & (XFEATURE_ENABLED_SSE | + XFEATURE_ENABLED_AVX)) != 0) { + /* + * x87 area was not saved by XSAVEOPT, + * but one of XMM or AVX was. Then we need + * to preserve MXCSR from being overwritten + * with the default value. + */ + s = (union savefpu *)sa; + mxcsr = s->sv_xmm.sv_env.en_mxcsr; + mxcsr_mask = s->sv_xmm.sv_env.en_mxcsr_mask; + do_mxcsr = true; + } bcopy((char *)npx_initialstate + xsave_area_desc[i].offset, sa + xsave_area_desc[i].offset, xsave_area_desc[i].size); + if (do_mxcsr) { + s->sv_xmm.sv_env.en_mxcsr = mxcsr; + s->sv_xmm.sv_env.en_mxcsr_mask = mxcsr_mask; + } *xstate_bv |= bit; } } From nobody Tue Apr 2 09:53:55 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4V839v5M5mz5G9hg; Tue, 2 Apr 2024 09:53: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 4V839v4sMqz4bsC; Tue, 2 Apr 2024 09:53:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712051635; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VheO/VpcUe6z6l0e4/3tPkX6FCVZJkW41rxI9Rpy+Rg=; b=ASkxQW2O8XFhzoUa9d0KqR9ipbDCa+2JEeqgYTmHHM4Si2SU2nlz7ZS4qXP+Zh9GmBarQH H1Uq530jEACCYLZVNz0+ImKa2EPBMdSr0D1Cof/xexAba2djYg2ddIvkBdoDvd6iKU4TKM Xa5CDQJ8+JDprjmjqATZ+I6qu/P+VQDTE45eqH2KSWFryJwOOlUizZFmZ0TjCon1ZF/j3w MKundY2FCiDcVXM4LFCJ4yGvisGUeQISGHgkWzMssvTJ4mMiyRc6JJGznGppifBDa1FDVR cqezOuZvKlGAS0WRCiR/A8pMl8z4f+NO/kaMsUclSyMekrpjR+nGa4KS6NafQw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712051635; a=rsa-sha256; cv=none; b=S6o6SAeHRdwM32Dez4a6HFhGTRG6qvgpA/yF/u1lC1uZsPYltvaUz/pJ7pkxaJuui4f5At LAQs087k/aFFMBgfOm8oa8lui8sli+AUoUWplI3ufVVi+Pb8PPf5sh1AGEqna6Ih8Gibux 9I/ndk/uWdbDTzPjtY1I5jJOOotYy4LIQ9gESGyPXNeRWm0gvGpjQg3ZZr2Tc5Urpz+UZi 7aCsNxdx3R/uct8P0lxvG6DBgfvv5KxZXb+RCf/jdF0bh6t2LTpPJpRmn9WbgKdRzHtTeA o17hy9abt+nwGFggYtEh880KLZ10w8zjfdFmJfhSKq0+RZwXf+MTQrZqSiL6fA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712051635; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VheO/VpcUe6z6l0e4/3tPkX6FCVZJkW41rxI9Rpy+Rg=; b=TiAB328w+jDmWxvpQdg9x3xuqa0425ncLols2LIcmsY5moSsBMfOjYO0Y/D8z54Z3XfLqM wgUuwbQbyktezxtsIlZ4Fsc+8yYdRIPKuecfjXx6J54dkmzHKa8tqW9+FSXN8hifE9hmrP E7ZMP2ctIcg1JEYe2fxFeVSEGDcXp3U9QOT2lfRJJ/WMKumgq/8O6I2a3V/yyl1u/OuPXq msmVJYFnoH5bBxzUCDj8AOE9EGC7lWWZeE3jTqoJgtuHGnUEmaVREOWXSZyByhgIi+tYAf Kknfa6Yq5ftSfPIL0geLMAAw4RXfoYc94a4FVUQMd6bMuLxy7DBeg+YgiQMCeQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4V839v4TQSzlQ5; Tue, 2 Apr 2024 09:53: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 4329rtKc015551; Tue, 2 Apr 2024 09:53:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4329rtAh015548; Tue, 2 Apr 2024 09:53:55 GMT (envelope-from git) Date: Tue, 2 Apr 2024 09:53:55 GMT Message-Id: <202404020953.4329rtAh015548@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 465e5f1b8b80 - stable/13 - ath_hal/ar9300: allow JUPITER cards to read eeprom List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 465e5f1b8b80bac313e83b4e62d7c532ffb320d6 Auto-Submitted: auto-generated The branch stable/13 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=465e5f1b8b80bac313e83b4e62d7c532ffb320d6 commit 465e5f1b8b80bac313e83b4e62d7c532ffb320d6 Author: Bjoern A. Zeeb AuthorDate: 2024-03-12 21:22:36 +0000 Commit: Bjoern A. Zeeb CommitDate: 2024-04-01 23:52:40 +0000 ath_hal/ar9300: allow JUPITER cards to read eeprom In ar9300_eeprom_read_word() also allow JUPITER cards read the eeprom instead of returning an error. While this will not help all the 9462, 9485, 9565 OEM cards to work, it will make debugging of the next steps a lot easier. While here fix a typo in the error message if we do not get CAL. PR: 255337 Tested by: John Nielsen (john jnielsen net) Reviewed by: adrian Differential Revision: https://reviews.freebsd.org/D44328 (cherry picked from commit f254aad33dfb5ce18b6b97b7d036b420310e9ed5) --- sys/contrib/dev/ath/ath_hal/ar9300/ar9300_eeprom.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_eeprom.c b/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_eeprom.c index 0251222c50b4..073428c8fa71 100644 --- a/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_eeprom.c +++ b/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_eeprom.c @@ -225,7 +225,7 @@ ar9300_eeprom_restore_something(struct ath_hal *ah, ar9300_eeprom_t *mptr, HAL_BOOL ar9300_eeprom_read_word(struct ath_hal *ah, u_int off, u_int16_t *data) { - if (AR_SREV_OSPREY(ah) || AR_SREV_POSEIDON(ah)) + if (AR_SREV_OSPREY(ah) || AR_SREV_POSEIDON(ah) || AR_SREV_JUPITER(ah)) { (void) OS_REG_READ(ah, AR9300_EEPROM_OFFSET + (off << AR9300_EEPROM_S)); if (!ath_hal_wait(ah, @@ -4319,7 +4319,7 @@ ar9300_eeprom_restore_internal(struct ath_hal *ah, ar9300_eeprom_t *mptr, } #endif if (nptr < 0) { - ath_hal_printf(ah, "%s[%d] No vaid CAL, calling default template\n", + ath_hal_printf(ah, "%s[%d] No valid CAL, calling default template\n", __func__, __LINE__); nptr = ar9300_eeprom_restore_something(ah, mptr, mdata_size); } From nobody Tue Apr 2 10:04:06 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4V83Pf2R4Wz5GCJM; Tue, 2 Apr 2024 10:04:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4V83Pf1pYrz4d48; Tue, 2 Apr 2024 10:04:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712052246; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JuBXXWiRdTMt7PvdCmSz14d+nc74MY3Bv6sC1W4pAZg=; b=Di4Vy8KosJPNI9gQi4ddwA2VWLAHBYOwZLIob5YAUiFRJiLEUYa7cZGZl510tR+aLh3/v9 EUuW4CODXU0VuquLkdz3wAcsqtt2Xh5ECZLC7qlnDHfMQP26pWef5HONOUlcHqGplXsK3/ XdtZ1l2+akwTwJhFunmWWr0lM8OfUVsmjeuEIipspgQrf+bRoZgCFwyJbATMOLxp45W3e0 yldu4d+dgdFNOp39BZZMTNuQ/y7U7GxDNXJaTlnrkueQ9cXOoSr2rBsMk5mCIST871vOp9 g/KiO9DdgTBd+9zW+xyrhfdkRGYPGrxDzretEwJVX0uNq06KPHihX3KpgOFi9Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712052246; a=rsa-sha256; cv=none; b=YT87E+SKF8QOq22GvObJ3pXoZdkpZ5N57USsEvPVCQGoAOGUE4p50xGCpUK/63TC0EVII0 IEuPlhIiMsEivI2J62CFveO/qu5wMIOFCRJKp5A4Qq9DUUBIcyAfdoUeCfUaxBo3b7Qy74 hm2J9V6Zx4ft1I41whZC6A3GtF7/ywe1A8uNpVCKklGK+4U5ZNAXWe8Jum/+Wih9YJ8Fv7 K45vrpWt4SOn+t12wVtLI2bLYLGG3ZepXx2UoddtFBHLhxEzTOayFEV9m4hvkSYsy9WnZO ez6RFX1UcZlzTiyyxr5shszV7qyPpOPZU4HeFO9V/zeeSQnucZSNn5YAoJyvuQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712052246; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JuBXXWiRdTMt7PvdCmSz14d+nc74MY3Bv6sC1W4pAZg=; b=EZlPSYXTc9m9ZU9ns3a/RjWN6SgKiCnU/sLvM5rJoOrayGzi+GNjGh4WiUPgmzlIgx1q0E n4NF17bF5rvE0veteFL/+4MqOkeDkEyA7+XJ2GffAxAEfdHVWwXt3M188TFvdfm7XCmqDr V0tkCWVcvWGhgcaKksrFfj3I6DjemUExG1KE6B8XfxDwqEpb4tzMd25h37FB9UEDJW5LBF wbbguBiW3JsNHFC5j6P5HzE03jKmvQjJzkyQt//wAfe8VN7z/vOvpmsfo3jz+anHN0e4J4 lM0+oK6zsbJBaru7X2lEfjsJfWT4XlTY6hVZtO5M6t5sjUKFVu2yA5P4XnqCAA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4V83Pf1Q6MzlpW; Tue, 2 Apr 2024 10:04:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 432A46b1033759; Tue, 2 Apr 2024 10:04:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 432A46ki033757; Tue, 2 Apr 2024 10:04:06 GMT (envelope-from git) Date: Tue, 2 Apr 2024 10:04:06 GMT Message-Id: <202404021004.432A46ki033757@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: ce707e674f79 - main - LinuxKPI: add PCI_VENDOR_ID_ITTIM List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ce707e674f7941c0743e72193c433fcf554a82b5 Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=ce707e674f7941c0743e72193c433fcf554a82b5 commit ce707e674f7941c0743e72193c433fcf554a82b5 Author: Bjoern A. Zeeb AuthorDate: 2024-04-02 09:40:42 +0000 Commit: Bjoern A. Zeeb CommitDate: 2024-04-02 10:03:31 +0000 LinuxKPI: add PCI_VENDOR_ID_ITTIM Add PCI_VENDOR_ID_ITTIM as needed by mt76. Sponsored by: The FreeBSD Foundation MFC after: 3 days --- sys/compat/linuxkpi/common/include/linux/pci_ids.h | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/compat/linuxkpi/common/include/linux/pci_ids.h b/sys/compat/linuxkpi/common/include/linux/pci_ids.h index f23cd7d6a124..b52ecc525db6 100644 --- a/sys/compat/linuxkpi/common/include/linux/pci_ids.h +++ b/sys/compat/linuxkpi/common/include/linux/pci_ids.h @@ -51,6 +51,7 @@ #define PCI_VENDOR_ID_HP 0x103c #define PCI_VENDOR_ID_IBM 0x1014 #define PCI_VENDOR_ID_INTEL 0x8086 +#define PCI_VENDOR_ID_ITTIM 0x0b48 #define PCI_VENDOR_ID_MEDIATEK 0x14c3 #define PCI_VENDOR_ID_MELLANOX 0x15b3 #define PCI_VENDOR_ID_QCOM 0x17cb From nobody Tue Apr 2 12:45:37 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4V87014KtKz5GXK3; Tue, 2 Apr 2024 12:45:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4V87013jfZz4vvT; Tue, 2 Apr 2024 12:45:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712061937; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7jRWsCiEEZrcyfJIGWplZtnhZ70iUYXA1AtZXzXKy3c=; b=WJXjtXIyM20iHHsZRVBe2343YYIPNx8pu67ZI2edQvPu60H/j7aEQGNx0b3DMSri731i2K S+4KlFebOtzgYJoEXBVciUs+LdUSpbH+D/LKTNeeks6MhNANr+OSvHISnfA6NJrz0imYUO CQJd4goSjwg/vXMSlSLJlx/d4Y/JzdVEoYsMJ0MeDAk6TlkFIsp0m9U3rGgtoxmP7Dz2l6 Unp4fZHk5Wg+stp1GcqxBIbB+i04yrd/i+ILdc+/24LgmhRhITnF2WxayLrl17AchcnB7u 9RX9QRmtF1iLVw8+9/5AqznVzpDSg95Dp2hio0J/rrk3W63/g41JezJ91Gv7OQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712061937; a=rsa-sha256; cv=none; b=uBvUaifiCjz1MsNt1WF5bXma10rWj/Wu82XLmY5YGl32UJIMPY8aVb4qGbjdOeVu4yjMUu mB3m6l5pZzCtwu98AccO95VT/+gzdN/SXP0RNzhMWnuIOkcYIdPJju404276+dMBQEgzXA xjeVthS/1stgBY6pl9rD+cZEptjWTynAMeqoWmhySyNrWGX8VdSUDewFikXWQQN1rYO+fD 7TZaYNGG/vPFJLNFX0PLJ3FGOJ6Lb0IMSOoL7Ip3ooae+5iHZhrN4Rh8ZcszruJFjUMcH1 Br6YHfWAruIHdlEiA3vQw2mBYovjvyVBVYoKJ4RoLwGYrZiA+Uw8RSrf9pCm8A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712061937; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7jRWsCiEEZrcyfJIGWplZtnhZ70iUYXA1AtZXzXKy3c=; b=GbuCItWxWReBHgLY0NzlodtGmisFko+JTF31Dg2MalensXnKr4KlboihBNcWBoE7U2tTgO iQZmOm8Q4lPk9D6V739eMhaSrIOoxigbrlEAE4+cMZxGUHsEztye06vFRDzbK89fWcJxGp TjLC2agBCRlWfmkmRYlqEa54xU3vrjexC5JBLewGuNQbxZ6tgWPi1qlyL+72n2yhnQ9oiR sBFvVZ9WPXfp+D6RqBWu+nAPxGq2NkvqJx/BaFEiJS7d1FGpgbaf9s4xMjxtpZCxAsSu0c zX30KaJ7+SmA0OkFwDnse44MmWkou3D2YZVsTFNkohduOAxfoAD9jNR0bnPYfw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4V87013Gmzzq31; Tue, 2 Apr 2024 12:45:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 432Cjbte003238; Tue, 2 Apr 2024 12:45:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 432CjbOt003235; Tue, 2 Apr 2024 12:45:37 GMT (envelope-from git) Date: Tue, 2 Apr 2024 12:45:37 GMT Message-Id: <202404021245.432CjbOt003235@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 918117116254 - main - freebsd-update: Fix typo in comment List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 91811711625482f3a5778939e9999f53a0bea22a Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=91811711625482f3a5778939e9999f53a0bea22a commit 91811711625482f3a5778939e9999f53a0bea22a Author: a-biardi AuthorDate: 2024-04-02 12:28:52 +0000 Commit: Ed Maste CommitDate: 2024-04-02 12:44:56 +0000 freebsd-update: Fix typo in comment s/patchname expansion/pathname expansion/ Signed-off-by: a.biardi@tiscali.it Pull-request: https://github.com/freebsd/freebsd-src/pull/1152 --- usr.sbin/freebsd-update/freebsd-update.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/freebsd-update/freebsd-update.sh b/usr.sbin/freebsd-update/freebsd-update.sh index 88a0a4439e50..4a6a8d78330b 100644 --- a/usr.sbin/freebsd-update/freebsd-update.sh +++ b/usr.sbin/freebsd-update/freebsd-update.sh @@ -2895,7 +2895,7 @@ backup_kernel () { (cd ${BASEDIR}/${KERNELDIR} && find . -type f $FINDFILTER -exec \ cp -pl '{}' ${BASEDIR}/${BACKUPKERNELDIR}/'{}' \;) - # Re-enable patchname expansion. + # Re-enable pathname expansion. set +f } From nobody Tue Apr 2 13:54:28 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4V88WS6tbzz5GfcD; Tue, 2 Apr 2024 13:54:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4V88WS5QzZz46RV; Tue, 2 Apr 2024 13:54:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712066068; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MtwtM7VCy5C0PVpvbTZcF4K9w0UOxdEp3YNQQTaKHR8=; b=tvh2inJorn4MUf7SK6AXQGTA0duJFbP6OjPdzJYH/rNdfnTF5alii+ZaF4YEfOYZA1RZkP rvKGeNMn/7NOY0f5usgjnpE41Htp2d4DObZysMkJSgAV5fFvTyr6qEfw97qAoKwAH8JKy5 NuF6dZPcho8ToRoRzo9IbIbhhbvS4mn5DSO4TqTNTykrY+4UdV4BonCchxqxedwykb/scG BTsKpAB0zerxGHPaF58//fM7QbiYc69p5/HzWs/rp8OyylkSne34k1w8DSbYNhmrAMB8k4 0GPr8kWnZNBWvY4ZH/oh6t0FhgwYb9dXZ+wcsW365FUsHguX/Frb3aS3+K5qUw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712066068; a=rsa-sha256; cv=none; b=a3ZLNvkBRnM3kgTiyTeCai4OzL7i7RWFoWgaI2PoMldMI9Z3swBVuTD3PzayFIlGnTBd19 UhNDTNiSE9CclZb6SEC0K4nIlDCX6bLmO4/XKvjic42dsOJOaNw78jjuhf+jEvjIoAX5cN yUq6qviKTHSYlsWRJOVUTZhAFZvBUpauCyxw0ekTjULlzwuHvZRM9dn9ttZkj0dkEnUiwL QtVTUb7t6e26KecH+8uEmR0m5MaeZ2VEwKIlyQoABp5LQvqd6OPrHTZ6+oR4bfgTwl5dKJ Dm5DJTheLTcUCoFRVZEE3jgX3W1vuTz+8qDKsJRZEeaXvv/WEnTqL1949t2Dew== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712066068; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MtwtM7VCy5C0PVpvbTZcF4K9w0UOxdEp3YNQQTaKHR8=; b=j3ipSDi2YJRK/hkyqx+55OCN65RxI8d2GMmmNfPLZYfiAR2NU9OESbs7zcMt8vwy4ZS14A PxA4KJHPevQNwm1h/DuR1tZuN2dOwtNDVXB3Peu5WgT6s3vCo9+aTao/JTgo24K1ad10Yp 9LxfRM/n5EdMqH5M7GUtf/v3VY1yLJl+Mdw1rGkwpoXu4MhuQaRCSoMpseKZzmePMVdp6o duPPEYppW3EUTAtQ7uvUvm31VD9AMGS1EVhlZqElJMvqlY3LNmQXVs0eSKKjTwJLXB6KJA AHQvU/csROPNAKK++eB7sWpjNQQwPZMJUiykuqNmjfVKaWY9OPFlIdqeKN1khQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4V88WS52STzsQj; Tue, 2 Apr 2024 13:54:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 432DsSjg021455; Tue, 2 Apr 2024 13:54:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 432DsSKd021452; Tue, 2 Apr 2024 13:54:28 GMT (envelope-from git) Date: Tue, 2 Apr 2024 13:54:28 GMT Message-Id: <202404021354.432DsSKd021452@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: 8db49fc84c53 - stable/14 - msgs: Use C99 bool instead of defining our own List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 8db49fc84c53dab69265fd9c1201a5fec336f343 Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=8db49fc84c53dab69265fd9c1201a5fec336f343 commit 8db49fc84c53dab69265fd9c1201a5fec336f343 Author: Collin Funk AuthorDate: 2024-02-06 12:40:05 +0000 Commit: Ed Maste CommitDate: 2024-04-02 13:53:51 +0000 msgs: Use C99 bool instead of defining our own Use stdbool.h definitions instead of defining non-standard ones. Signed-off-by: Collin Funk Pull-request: https://github.com/freebsd/freebsd-src/pull/1105 (cherry picked from commit 912b52a62c72ca9c96a396148a6b30ff9c0917e7) --- usr.bin/msgs/msgs.c | 97 ++++++++++++++++++++++++++--------------------------- 1 file changed, 47 insertions(+), 50 deletions(-) diff --git a/usr.bin/msgs/msgs.c b/usr.bin/msgs/msgs.c index e4b3b09efc81..980625bb3fd4 100644 --- a/usr.bin/msgs/msgs.c +++ b/usr.bin/msgs/msgs.c @@ -87,11 +87,10 @@ static char sccsid[] = "@(#)msgs.c 8.2 (Berkeley) 4/28/95"; #include #include #include +#include #include "pathnames.h" #define CMODE 0644 /* bounds file creation mode */ -#define NO 0 -#define YES 1 #define SUPERUSER 0 /* superuser uid */ #define DAEMON 1 /* daemon uid */ #define NLINES 24 /* default number of lines/crt screen */ @@ -103,8 +102,6 @@ static char sccsid[] = "@(#)msgs.c 8.2 (Berkeley) 4/28/95"; #define MORE "More? [ynq]" #define NOMORE "(No more) [q] ?" -typedef char bool; - static FILE *msgsrc; static FILE *newmsg; static const char *sep = "-"; @@ -122,11 +119,11 @@ static bool totty; static bool seenfrom; static bool seensubj; static bool blankline; -static bool printing = NO; -static bool mailing = NO; -static bool quitit = NO; -static bool sending = NO; -static bool intrpflg = NO; +static bool printing = false; +static bool mailing = false; +static bool quitit = false; +static bool sending = false; +static bool intrpflg = false; static uid_t uid; static int msg; static int prevmsg; @@ -137,14 +134,14 @@ static time_t t; static time_t keep; /* option initialization */ -static bool hdrs = NO; -static bool qopt = NO; -static bool hush = NO; -static bool send_msg = NO; -static bool locomode = NO; -static bool use_pager = NO; -static bool clean = NO; -static bool lastcmd = NO; +static bool hdrs = false; +static bool qopt = false; +static bool hush = false; +static bool send_msg = false; +static bool locomode = false; +static bool use_pager = false; +static bool clean = false; +static bool lastcmd = false; static jmp_buf tstpbuf; static void ask(const char *); @@ -200,35 +197,35 @@ main(int argc, char *argv[]) if (uid != SUPERUSER && uid != DAEMON) errx(1, "only the super-user can use the c flag"); - clean = YES; + clean = true; break; case 'f': /* silently */ - hush = YES; + hush = true; break; case 'h': /* headers only */ - hdrs = YES; + hdrs = true; break; case 'l': /* local msgs only */ - locomode = YES; + locomode = true; break; case 'o': /* option to save last message */ - lastcmd = YES; + lastcmd = true; break; case 'p': /* pipe thru 'more' during long msgs */ - use_pager = YES; + use_pager = true; break; case 'q': /* query only */ - qopt = YES; + qopt = true; break; case 's': /* sending TO msgs */ - send_msg = YES; + send_msg = true; break; default: @@ -246,13 +243,13 @@ main(int argc, char *argv[]) /* * Test access rights to the bounds file * This can be a little tricky. if(send_msg), then - * we will create it. We assume that if(send_msg), + * we will create it. We assume that if(send_msg), * then you have write permission there. * Else, it better be there, or we bail. */ - if (send_msg != YES) { + if (!send_msg) { if (stat(fname, &buf) < 0) { - if (hush != YES) { + if (!hush) { err(errno, "%s", fname); } else { exit(1); @@ -273,7 +270,7 @@ main(int argc, char *argv[]) if (clean || bounds == NULL) { /* relocate message bounds */ struct dirent *dp; struct stat stbuf; - bool seenany = NO; + bool seenany = false; DIR *dirp; dirp = opendir(_PATH_MSGS); @@ -314,7 +311,7 @@ main(int argc, char *argv[]) lastmsg = i; if (i < firstmsg) firstmsg = i; - seenany = YES; + seenany = true; } closedir(dirp); @@ -354,7 +351,7 @@ main(int argc, char *argv[]) fprintf(bounds, "%d %d\n", firstmsg, nextmsg); fclose(bounds); - sending = YES; + sending = true; if (ruptible) signal(SIGINT, onintr); @@ -368,10 +365,10 @@ main(int argc, char *argv[]) fflush(stdout); fprintf(newmsg, "From %s %sSubject: %s\n", ptr, ctime(&t), inbuf); - blankline = seensubj = YES; + blankline = seensubj = true; } else - blankline = seensubj = NO; + blankline = seensubj = false; for (;;) { fgets(inbuf, sizeof inbuf, stdin); if (feof(stdin) || ferror(stdin)) @@ -407,20 +404,20 @@ main(int argc, char *argv[]) snprintf(fname, sizeof(fname), "%s/%s", cp, MSGSRC); msgsrc = fopen(fname, "r"); if (msgsrc) { - newrc = NO; + newrc = false; fscanf(msgsrc, "%d\n", &nextmsg); fclose(msgsrc); if (nextmsg > lastmsg+1) { printf("Warning: bounds have been reset (%d, %d)\n", firstmsg, lastmsg); truncate(fname, (off_t)0); - newrc = YES; + newrc = true; } else if (!rcfirst) rcfirst = nextmsg - rcback; } else - newrc = YES; + newrc = true; msgsrc = fopen(fname, "r+"); if (msgsrc == NULL) msgsrc = fopen(fname, "w"); @@ -457,9 +454,9 @@ main(int argc, char *argv[]) #endif Lpp -= 6; /* for headers, etc. */ - already = NO; + already = false; prevmsg = firstmsg; - printing = YES; + printing = true; if (ruptible) signal(SIGINT, onintr); @@ -493,7 +490,7 @@ main(int argc, char *argv[]) if (totty) signal(SIGTSTP, onsusp); (void) setjmp(tstpbuf); - already = YES; + already = true; nlines = 2; if (seenfrom) { printf("Message %d:\nFrom %s %s", msg, from, date); @@ -548,7 +545,7 @@ cmnd: case 'q': /* FALLTHROUGH */ case 'Q': - quitit = YES; + quitit = true; printf("--Postponed--\n"); exit(0); /* NOTREACHED */ @@ -695,7 +692,7 @@ onintr(int unused __unused) sep = "Interrupt"; if (newmsg) fseeko(newmsg, (off_t)0, SEEK_END); - intrpflg = YES; + intrpflg = true; } } @@ -746,7 +743,7 @@ ask(const char *prompt) printf("%s ", prompt); fflush(stdout); - intrpflg = NO; + intrpflg = false; (void) fgets(inbuf, sizeof inbuf, stdin); if ((n = strlen(inbuf)) > 0 && inbuf[n - 1] == '\n') inbuf[n - 1] = '\0'; @@ -792,14 +789,14 @@ ask(const char *prompt) if (fd != -1) { snprintf(cmdbuf, sizeof(cmdbuf), _PATH_MAIL, fname); - mailing = YES; + mailing = true; } } if (fd == -1 || (cpto = fdopen(fd, "a")) == NULL) { if (fd != -1) close(fd); warn("%s", fname); - mailing = NO; + mailing = false; fseeko(newmsg, oldpos, SEEK_SET); ask(prompt); fclose(cpfrom); @@ -817,7 +814,7 @@ ask(const char *prompt) else { system(cmdbuf); unlink(fname); - mailing = NO; + mailing = false; } ask(prompt); } @@ -829,8 +826,8 @@ gfrsub(FILE *infile) off_t frompos; int count; - seensubj = seenfrom = NO; - local = YES; + seensubj = seenfrom = false; + local = true; subj[0] = from[0] = date[0] = '\0'; /* @@ -841,7 +838,7 @@ gfrsub(FILE *infile) /* * expected form starts with From */ - seenfrom = YES; + seenfrom = true; frompos = ftello(infile); ptr = from; in = nxtfld(inbuf); @@ -850,7 +847,7 @@ gfrsub(FILE *infile) while (*in && *in > ' ' && count-- > 0) { if (*in == ':' || *in == '@' || *in == '!') - local = NO; + local = false; *ptr++ = *in++; } } @@ -885,7 +882,7 @@ gfrsub(FILE *infile) * extract Subject line */ if (!seensubj && strncmp(inbuf, "Subj", 4)==0) { - seensubj = YES; + seensubj = true; frompos = ftello(infile); strlcpy(subj, nxtfld(inbuf), sizeof subj); } From nobody Tue Apr 2 13:56:39 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4V88Yz4Mwxz5GfZg; Tue, 2 Apr 2024 13:56:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4V88Yz3ZTLz46Zm; Tue, 2 Apr 2024 13:56:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712066199; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EqUqrwU+PKtiinXZQl+kDfqtNwNW4Ssm+kOOf9m5gMI=; b=ZNhUe82sUhR+iZJo0DwiMx9MFS4Q9uL/GQX2mgdZK89NfaKWCSG4nB4pcGiAjqBFXcExvH 414pkr2OXLV5lLzeYOiiAXlQlJEQyt5v8b/m8o5AE7s+BEVpDk684Nwu/y1HexYRXKaYsQ 3aBpM7n3iHeSOFL7yldSWX576qyCwmQrEBdF21nvSkVQa8s8RLwa0Ase8lTmR9Z6QMqMEE EojV+ljIltAMwEm5Zdv+KW2dV8AA4KnfFew10weA4vbuJiqhYdqZGxmDeNJ8qORZP0hvTp FcUp+p0dKMoMVy2gz/BP6PdD3Yio4A4d/iZvNGi3UYSzyDfhuJ3AbQsPea+iWw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712066199; a=rsa-sha256; cv=none; b=Rv20TEgokdggAUee4xaUpZa3s1aphik0BY9bq9LMMXhgmYasocc5M3EHALjnUCuYvIHkcJ 3h6Do/jdIIFgkQXJ20niLTFkPbOrOOJLmW3vOc1UggzjGwWxmT8y5Fowv7q6ahtsGQhvt5 LBRTV5q1BRyNzLvzsJn4q1reYqp5W5hgbURSH2HWweqem7UvC5fjIPcUQDKlwUJcxPLA+A lKHtbIMgSWgAEsMCKmj1pE6VsJseQ6IsXVrkx9G8O3KWckm50dr4AtnkNh1ZV5qBDZro+G nfhRvqO8p8JebemQhH3TNl9X2xTraQCgRxeqJTzZZkBY2TqwioGULytoIJVmqg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712066199; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EqUqrwU+PKtiinXZQl+kDfqtNwNW4Ssm+kOOf9m5gMI=; b=kGEA1/zM3ZSd4k0rzpxkE+uYJ41LQHI6+sg3MNMkb3Vv8/eKOnWe4Wo4YK0TqoaoHQdoHz 1++hEgH51H4BNJfKjbWzJnPvkwZzZi2Xyhg5U1JRdAE2ruid9zJBbIuiKkqNnoV5C8L2Aw R1KjDZaFn59HICR3xhtlO5GbMmMBGlWmbJAPriKxzK4y3C8gAwRhoRZ2+Tr6ZkSlAA2BVy tsg+KubbJteM9augf48dqDR70lgPHPTkIJE3zQh/DA5Gx5iUmZGPFKHazWuuoZDzLJ97my ve9VR8uK0XN9EFAR/foeCdLtymzZOQ7+g785WYYsxCJ/Bd6Q/7CESL2LI5jduA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4V88Yz37n7zsQk; Tue, 2 Apr 2024 13:56:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 432Duddu021983; Tue, 2 Apr 2024 13:56:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 432DudpH021980; Tue, 2 Apr 2024 13:56:39 GMT (envelope-from git) Date: Tue, 2 Apr 2024 13:56:39 GMT Message-Id: <202404021356.432DudpH021980@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: 9f9289901c86 - stable/14 - bsdlabel: add BUGS section documenting 8 partition limit List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 9f9289901c86e88c7eb357ecfe3334369356b1b0 Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=9f9289901c86e88c7eb357ecfe3334369356b1b0 commit 9f9289901c86e88c7eb357ecfe3334369356b1b0 Author: Ed Maste AuthorDate: 2024-03-25 22:25:05 +0000 Commit: Ed Maste CommitDate: 2024-04-02 13:56:28 +0000 bsdlabel: add BUGS section documenting 8 partition limit PR: 276517 (cherry picked from commit 7dc5c6c4120ee6d5a028a1e01cdc1bfbe9499634) --- sbin/bsdlabel/bsdlabel.8 | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/sbin/bsdlabel/bsdlabel.8 b/sbin/bsdlabel/bsdlabel.8 index 9228bba78d4b..a1ff2a78f1f0 100644 --- a/sbin/bsdlabel/bsdlabel.8 +++ b/sbin/bsdlabel/bsdlabel.8 @@ -504,3 +504,8 @@ The .Nm disklabel utility appeared in .Bx 4.3 Tahoe . +.Sh BUGS +.\" PR276517 +The disklabel scheme supports up to 20 partitions, but +.Nm +supports only 8 partitions. From nobody Tue Apr 2 13:57:26 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4V88Zt4KTXz5GfRs; Tue, 2 Apr 2024 13: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 4V88Zt36tsz46wP; Tue, 2 Apr 2024 13: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=1712066246; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+RsIKzI1ZeDVM8NbvJP0wfnhJxaRTvWWa6CHJC2lOOc=; b=Xbk4xUyjCGAEGHzHqM8I9Hz8moE5/aw7CEywpTa33GjqJWXgg17XbA6bPkEm12kxKWaTTU LnvizguqJz+0DyYalYWBg8xJNRNZpolmwqqkWL5HCBxQno7FhLtrZGlCeZCeREX74DLabM nOlD7hVxgQk4LuWFPWPjduBrhLTzjNUizd1xKREeDEnL1epP50DmHYSWCdsbUUYduXtI0z BBjytxYlT5KeYjIQQPhxJ7I1yd5hi2NPsJwtQLU5gNofTa4IxTQDxl2R813t7Ex5tK5d+9 1K8mIWnN0qj6Dj948g2cEJwQwJBgWdDu7OeFDaHCrEdspKukfytnh93crS/siw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712066246; a=rsa-sha256; cv=none; b=gcg/6YKVJtnlmgj/dCwDb2M07L+qaN70j6zTBJPw0XS+a1Q9lNGoAgLx2z7r6jJlJ29dfO oTt+vNnB4JyQGLNLDlOYlD1LwvfsXkt+WqhUHmx7zteF1RaqCQRm+Aczrs6/+b1Q/cL2Tp G1qGXhiYOaquiuMHAbB0TRT5NSu2MdljVdNOsi3UWlil4jS8OssuMQxiVX4bVjOEzRiD4x Zu5G45BOm4a5kQWnAAQQaVN+GkhKd5sdSCaBxlplKZClxKvU139uQDgi9FfyZ1MM7BzyKs awQLWvXx91JtNQRxR8M3pBQeQOl5l04wfqoExZW2iEgMt45fAPCaP7xEkGgfbw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712066246; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+RsIKzI1ZeDVM8NbvJP0wfnhJxaRTvWWa6CHJC2lOOc=; b=REzyBLG5gzvsAKB6E7Ru1kkh0ZQpjfKr5kYOZ+23r1tq0xJg/ct/zbMQt5K9x69uMaIaDQ d5OjWnMZJbddMESf82Xszt3MSBzO+fxGQ+Hhi93cudTzig6LF4ZG3uXdMlKTlg68tzTLyy TL3eSzBofV0LSbZJpwmdpV3/5YiCNm7BmXo2JM/C8+5Q8wMVTwzmnLMP4GNL3ZPJ8IRuCw gF7uCmUpIGSvDdTWE7UfzyU8vgjq+5cPfltpsrrcWswRVmYjtPyHoQ1J71LeXvR7CjaQeR v9inIIYDKsTDIGp/nZpZr1xIEXx8Y/t/s8a1AOAB/31sRuS3RyoV9TJ4L46GJw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4V88Zt2kn7zsQl; Tue, 2 Apr 2024 13:57: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 432DvQET022219; Tue, 2 Apr 2024 13:57:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 432DvQik022216; Tue, 2 Apr 2024 13:57:26 GMT (envelope-from git) Date: Tue, 2 Apr 2024 13:57:26 GMT Message-Id: <202404021357.432DvQik022216@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: 1f97fc87f1a6 - stable/14 - Cirrus-CI: Add manual Clang 18 jobs List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 1f97fc87f1a66e0154bd14032ad5a79b020248ae Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=1f97fc87f1a66e0154bd14032ad5a79b020248ae commit 1f97fc87f1a66e0154bd14032ad5a79b020248ae Author: Ed Maste AuthorDate: 2024-03-01 13:21:54 +0000 Commit: Ed Maste CommitDate: 2024-04-02 13:56:28 +0000 Cirrus-CI: Add manual Clang 18 jobs Work is in progress to import Clang/LLVM 18 as the base system compiler. llvm18-lite is not yet in the quarterly package set but but will be available in the not too distant future, and is available for src forks that switch to latest packages. Add manual llvm18 jobs now so that they can be used for testing. Sponsored by: The FreeBSD Foundation (cherry picked from commit 24235654f104d8613bbae1c44cd8f7c39b5fe8fe) --- .cirrus.yml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/.cirrus.yml b/.cirrus.yml index d84614321145..90d031a919f2 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -29,6 +29,14 @@ task: TARGET_ARCH: amd64 TOOLCHAIN: llvm17 TOOLCHAIN_PKG: ${TOOLCHAIN}-lite + - name: amd64-llvm18 World and kernel build and boot smoke test + only_if: $CIRRUS_REPO_FULL_NAME != 'freebsd/freebsd-src' + trigger_type: manual + env: + TARGET: amd64 + TARGET_ARCH: amd64 + TOOLCHAIN: llvm18 + TOOLCHAIN_PKG: ${TOOLCHAIN}-lite - name: arm64-llvm16 World and kernel build and boot smoke test only_if: $CIRRUS_REPO_FULL_NAME != 'freebsd/freebsd-src' trigger_type: manual @@ -45,6 +53,14 @@ task: TARGET_ARCH: aarch64 TOOLCHAIN: llvm17 TOOLCHAIN_PKG: ${TOOLCHAIN} + - name: arm64-llvm18 World and kernel build and boot smoke test + only_if: $CIRRUS_REPO_FULL_NAME != 'freebsd/freebsd-src' + trigger_type: manual + env: + TARGET: arm64 + TARGET_ARCH: aarch64 + TOOLCHAIN: llvm18 + TOOLCHAIN_PKG: ${TOOLCHAIN} - name: amd64-gcc12 World and kernel build and boot smoke test (manual) only_if: $CIRRUS_REPO_FULL_NAME != 'freebsd/freebsd-src' trigger_type: manual From nobody Tue Apr 2 13:58:50 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4V88cV5blrz5GfjX; Tue, 2 Apr 2024 13:58:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4V88cV50kpz47Rc; Tue, 2 Apr 2024 13:58:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712066330; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AHIVTjQ2vomXqpurCdcNUU9jM1EiEYL7ZliZbFXnJao=; b=pDjE5CRKYvJ/GCoK6vPchTmXfNgxayplD1Qb1/Duhyn4QgBIAiwvEm4hhQtgTadLh4of9F 3Ih3WAWEegtRHLJplZEKypdvMf6mzF8pZ6xpmFhZ5tBfF/z6QRAd02feKI9KLBz/PShFtI tKrnsdN3oZmU0lOUWRu1ocw0F+eYNV1GeACx1p+Uoj8AkJQnEKWIA/lsqxQYcyQbyip1Xi O8im4n8Hi5GbIlaIWDRjikNxtGZfOBRdMkI6SLuVjDydhZApZPnC/2ExUGwAke7W+TjLG8 7kzBCEn/RgPoXUNShef3zwylxzj+Tc20UEl2tEC5iiuqUou12yOm2FR7bC4G/Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712066330; a=rsa-sha256; cv=none; b=qPo4q+PDdteVeZ9M+tjf8qghnNk3wkgbVQdEmyZ19gK8JW8MoIKekkLgL+DSIOfYqALkC3 qJlhUEi50Qiwg1r7MOoozf4I+RPvHRVbdSly+4uguLyA5be3YcuMoGqEAWjnMtCZ58XcI2 z+ydHV4/8oSFl1VueFtRiCKRyhsaJkQlSyG0C3zC8TSbsEZxo5EFgemHkcSmJbGDUPiEI0 RiKSX6WP7/w+vVHBT/L7kx1uwPkFt8NRLicgwj0YI/Nh5lXEiEBbs48mBnInQ3dQCEURVb DClVG0pi0U3qAWKlEXHbbGT9PpNr5escLF0+rSidu/rs2Y2TgD56+yrWA2bl4Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712066330; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AHIVTjQ2vomXqpurCdcNUU9jM1EiEYL7ZliZbFXnJao=; b=OikfiYUmEtT/ho4wyRjuo2S32T74e+kN/C+Pi7TK57+kcpgQ2YsH06ktyPTnQAi3LBTxDC uiYuP+y3VJVDNeY1VTT1RZkR0XlJzxu71W53+fT25pD6LAQ9QJuDXw8OM0y22gFM7SCD8G pvYz8/CdQ9rUe0wHma4uf3fDzpW5XSlzoh3LURX+F5PEdoJ0ttjykE4rLdj0V5Yw5hS5rH +ROtWUUD/JUzePFptQmcQo13oKzXm/OBrrXgGDNXfolxr7bciiSu1s5ZcZMOklcAi8DGZq DPgymttoxOAxfKvo8KGVQw2GyscJb8XL9k+rNjxb+VBUGhHic12lE1pl4gSYGw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4V88cV4YXGzrjC; Tue, 2 Apr 2024 13:58:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 432Dwod9022515; Tue, 2 Apr 2024 13:58:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 432DwoWS022512; Tue, 2 Apr 2024 13:58:50 GMT (envelope-from git) Date: Tue, 2 Apr 2024 13:58:50 GMT Message-Id: <202404021358.432DwoWS022512@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: 51b2556ee60a - stable/13 - bsdlabel: add BUGS section documenting 8 partition limit List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 51b2556ee60a503f89064152a897722a2daaa199 Auto-Submitted: auto-generated The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=51b2556ee60a503f89064152a897722a2daaa199 commit 51b2556ee60a503f89064152a897722a2daaa199 Author: Ed Maste AuthorDate: 2024-03-25 22:25:05 +0000 Commit: Ed Maste CommitDate: 2024-04-02 13:58:37 +0000 bsdlabel: add BUGS section documenting 8 partition limit PR: 276517 (cherry picked from commit 7dc5c6c4120ee6d5a028a1e01cdc1bfbe9499634) (cherry picked from commit 9f9289901c86e88c7eb357ecfe3334369356b1b0) --- sbin/bsdlabel/bsdlabel.8 | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/sbin/bsdlabel/bsdlabel.8 b/sbin/bsdlabel/bsdlabel.8 index 9228bba78d4b..a1ff2a78f1f0 100644 --- a/sbin/bsdlabel/bsdlabel.8 +++ b/sbin/bsdlabel/bsdlabel.8 @@ -504,3 +504,8 @@ The .Nm disklabel utility appeared in .Bx 4.3 Tahoe . +.Sh BUGS +.\" PR276517 +The disklabel scheme supports up to 20 partitions, but +.Nm +supports only 8 partitions. From nobody Tue Apr 2 15:18:15 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4V8BN74MBrz5GpYf; Tue, 2 Apr 2024 15:18:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4V8BN73jTMz4KYm; Tue, 2 Apr 2024 15:18:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712071095; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ivro18lXASLYjoOW3EbERQ0ktkhw6U3Y2Q5qWU5cyZI=; b=kCrmV9FxXp9u30R/6+zXCoRZQ+RW/WkC2/zLEeKHsSiatHfbHkwYqVnj+pbVHX/p+HOY3R MimbUZ4zD+J36ZwCkfjZ0dXStb9emzgtTbt33Ng/Mm2RlpsmNBbEPaQkgt6vfJAd6UJ0oT Ht9akeuNQcNqugmr9twQ6XQ4XoofNzNF+U4+YKFX8tC2a/l3NaWYMZ/shVl3CfG2TdmuD+ THGhq8rRSaFd69BZ+rbT0WyHNEr/hRNm3ySkQHiBajQCiPdx81wMvU/PUne6BSpxmzZtRf tR3NnB3OzveXNqPcoItmk/CdLECkM726vMH3tk7eyZy1eqOyL7NHB2u5ui+kpA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712071095; a=rsa-sha256; cv=none; b=LtyywJLGRXE+AOeYaObyIwUj4RnRO0z6eJAJjun/FsR/D6K+632t+7Xc2ItkYrxPBe+kaT IVx+Z1ka8dkIGonb9QO0RhLBwuRQofSwVEr9pc4URpL4u9w2QKBmFwSUjFbrk3uIX2naSW EeiLy8unBuCuKiNeVkZfOtXjyGs1PzVWXNL/ho2MBGzExMeqwzLchRlv2vaAdOsLe5y8H0 2m3tu/xIEEVWtsmgH/rsWlH9pD/pNXD8ucEnUHE/CnFz4UCifQq4zZBTPnlDzQZ8kHfcXd JVS3EtpiXI2JptHQ0XqbirZ368d5n166hQGAL7ZwkVQQeNiAM8+19FXXPvZ9SA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712071095; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ivro18lXASLYjoOW3EbERQ0ktkhw6U3Y2Q5qWU5cyZI=; b=okRemvomIpoh6rd5vnE+l8HXFeLsXg2n+NmpNVPYE2HQUbVQ2/O+QDBP8PgzSPhIOGr0Eq ypQdf6rmJ7KwoXMx9AkmIQq+Gk4KtQdq+DM1Q68EiIEhJhCF0gOLS+6bfZWK4M4b1ApATj x70Pf1lpGRJMLBcNFQV4NtnJhsPtxvxgB9UYGcxKTBjgvQweS07RLtU1tX5LbKsfDFnSkf 1FAb8sG2Iv7JgroyhfHEtFCe7nF0dIQz/Uj6mx/M8lC3ut/sM1ZvZRhFkzpvb059CGFFJj UaMfJ6kjwJLQt8TYf+Z9OwmoJqIRlmK7ObSbPz73s2eHow/5QKqetCm+ivyJ0w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4V8BN73KY7zv28; Tue, 2 Apr 2024 15:18:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 432FIFvR057677; Tue, 2 Apr 2024 15:18:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 432FIFDL057674; Tue, 2 Apr 2024 15:18:15 GMT (envelope-from git) Date: Tue, 2 Apr 2024 15:18:15 GMT Message-Id: <202404021518.432FIFDL057674@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: d4676f565d9a - stable/13 - x86: test the right CPUID bit when checking for XSAVEOPT support List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: d4676f565d9ad0ec76acb50a930d26dc27dd8ce7 Auto-Submitted: auto-generated The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=d4676f565d9ad0ec76acb50a930d26dc27dd8ce7 commit d4676f565d9ad0ec76acb50a930d26dc27dd8ce7 Author: Konstantin Belousov AuthorDate: 2024-03-25 10:34:06 +0000 Commit: Konstantin Belousov CommitDate: 2024-04-02 15:18:00 +0000 x86: test the right CPUID bit when checking for XSAVEOPT support (cherry picked from commit 960d151eaa1ecde109accc30ca0c3306551d8e58) --- sys/amd64/amd64/fpu.c | 5 ++++- sys/i386/i386/npx.c | 8 ++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/sys/amd64/amd64/fpu.c b/sys/amd64/amd64/fpu.c index 073c56e4902d..18330cb58d3c 100644 --- a/sys/amd64/amd64/fpu.c +++ b/sys/amd64/amd64/fpu.c @@ -260,9 +260,12 @@ fpurestore_fxrstor(void *addr) DEFINE_IFUNC(, void, fpusave, (void *)) { + u_int cp[4]; + if (!use_xsave) return (fpusave_fxsave); - if ((cpu_stdext_feature & CPUID_EXTSTATE_XSAVEOPT) != 0) { + cpuid_count(0xd, 0x1, cp); + if ((cp[0] & CPUID_EXTSTATE_XSAVEOPT) != 0) { return ((cpu_stdext_feature & CPUID_STDEXT_NFPUSG) != 0 ? fpusave_xsaveopt64 : fpusave_xsaveopt3264); } diff --git a/sys/i386/i386/npx.c b/sys/i386/i386/npx.c index 628fab71499f..e7e8fc01fa6b 100644 --- a/sys/i386/i386/npx.c +++ b/sys/i386/i386/npx.c @@ -341,9 +341,13 @@ fpusave_fnsave(union savefpu *addr) DEFINE_IFUNC(, void, fpusave, (union savefpu *)) { - if (use_xsave) - return ((cpu_stdext_feature & CPUID_EXTSTATE_XSAVEOPT) != 0 ? + u_int cp[4]; + + if (use_xsave) { + cpuid_count(0xd, 0x1, cp); + return ((cp[0] & CPUID_EXTSTATE_XSAVEOPT) != 0 ? fpusave_xsaveopt : fpusave_xsave); + } if (cpu_fxsr) return (fpusave_fxsave); return (fpusave_fnsave); From nobody Tue Apr 2 15:18:16 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4V8BN86kBMz5Gpsf; Tue, 2 Apr 2024 15:18:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4V8BN84D46z4KYn; Tue, 2 Apr 2024 15:18:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712071096; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4/OLpLW2qrzX3mQh0qSGuy/UuEZBINmnWlVw+uyWUIs=; b=dNMLyP9fUpVlnZ6sg4X/x2NHjnA8WiofcV128u4qzlRxN3++pVghIyX6BSI3lD3M/OODce 1UpVRWU/nFAzJdV2cdP9a+ZZI50oZ6/yDh/jeETrNJQaB/3PhiXmlKh89g7v1aWsGgr1m1 gM0tjUhuc/cpGqHXlF7ycXXwwskSntp+wAnegOTJPF21XRHVF87RxtYxx5TY+1xF0gjnUa yt6VNeKDgpXo7LUHITm4PUpG+uWO8phSMqigZLG84LEO7iDmWpkImE2rp12d/LllKZSIN1 ihN04XOK8+WeBRfJN5cWx0aYEYl18BMEmcr8BRGLxUL4oz3+EP4+IB9XnMDv9w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712071096; a=rsa-sha256; cv=none; b=iieXHQX4S8IGzqH0bR7g3nqU9GANB8wTQ9Ca1MT/N5hWMOQBi+YzrbrYsfPyPHWug4t9Y9 dUhUeLkDXi1ubtkuGNu1dIZo5bxKgW4tampJXGxncSyLcntyonra5HYpeJTqfxQyg74fEb 2Jf0+tnsMujwQ02H9PkXJAAv19tR/g3nUMHiqN+hY0+DBIHL+B1o1XpAIg+fq98MebFBZY cfwgsvMZQ9kxvKWX645QhuoHdHOYxwtXUPNuVcmzq7STTMLB2TcRVqCw3inCmXowiMo7fU b1BR2eh6MDnw1vX5n2mFF+1uGY2Q2hfFFApR68LubQQxCLg7uD3ff1Wrno2p/w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712071096; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4/OLpLW2qrzX3mQh0qSGuy/UuEZBINmnWlVw+uyWUIs=; b=dT8Y9Tot45LREttAsV5Wwys1iY9nGnJCs6a+WkpX3HF9CDjaD223oddMvEDBQG7U5YhP03 untwNHR16/0gIcuTue3I1wT4uY/VAR+N0VHnNK+zz8nkMaRAF23rppb6jGbibk/NFrsviS TLBKHWiutA1i7yOr0yYA/yyvAPewou0cxgyx1ODWYlzbvyO3Wv0s3jGsQy2HXUsb/wBFhR kXPVbfL8bPjJ/a2DvoR7hvWuXtAsbvYYoS2/x3EHV7r2YDi1cdxsmeBH2Cl2Fz8jGmohlF 4P7Xmdog83Io0cKS3S4Q44ZPS5T6i/CttRc6qy1j2ytipAj6/9+AO9Dfp8B+Vg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4V8BN83pF0zttx; Tue, 2 Apr 2024 15:18:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 432FIGgh057736; Tue, 2 Apr 2024 15:18:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 432FIGD8057733; Tue, 2 Apr 2024 15:18:16 GMT (envelope-from git) Date: Tue, 2 Apr 2024 15:18:16 GMT Message-Id: <202404021518.432FIGD8057733@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: c787fedf1262 - stable/13 - amd64: initialize td_frame stack area for init(8) main thread List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: c787fedf1262c253faac09b95184e409b26c2f1e Auto-Submitted: auto-generated The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=c787fedf1262c253faac09b95184e409b26c2f1e commit c787fedf1262c253faac09b95184e409b26c2f1e Author: Konstantin Belousov AuthorDate: 2024-03-25 12:10:43 +0000 Commit: Konstantin Belousov CommitDate: 2024-04-02 15:18:00 +0000 amd64: initialize td_frame stack area for init(8) main thread (cherry picked from commit e0c92dd2b7e62e4f8281c9ad1d31465bb32f9e3b) --- sys/kern/init_main.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/kern/init_main.c b/sys/kern/init_main.c index 73d78ad16df3..1a8269b8b367 100644 --- a/sys/kern/init_main.c +++ b/sys/kern/init_main.c @@ -783,6 +783,7 @@ start_init(void *dummy) */ KASSERT((td->td_pflags & TDP_EXECVMSPC) == 0, ("nested execve")); + memset(td->td_frame, 0, sizeof(*td->td_frame)); oldvmspace = p->p_vmspace; error = kern_execve(td, &args, NULL, oldvmspace); KASSERT(error != 0, From nobody Tue Apr 2 15:18:17 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4V8BNB1RKnz5GpYh; Tue, 2 Apr 2024 15:18:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4V8BN95X9Tz4KhN; Tue, 2 Apr 2024 15:18:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712071097; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wTbXvDUZl4jstp5J67XiJGTlmaI9H1Y0c4NR4q+rZL0=; b=AWOHkupnOYuTmwio+DuNRnMou5daxkeB3f48XGYBFqzpoG6NuQefu+K+wDMeb/mPDDpC6r mx9k9zqWHrfg3xozNg3RQ5O2nXbI6F5ROoE3Pgc6RcPJHdUXLe5HIFgSSUK001unS6NRPK terpmwWg2KfCmH2zL7ddlq97Wrp3OD77Dn1MwzmmedC2PRN8u6/sa9dtoz27hBe9lp06Ng X9DL91F84sev3LtmJRzJhA1P8kjTxL6vKPwNd+huINgU4Y5ut3uLGMKTu0JbK4E3k4wstp 5XzUfhe/tmrmOdmwDt5ksHmeKtw6oGSpDbq6lQaCoyDmnXldXlOKk/t9//kjUQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712071097; a=rsa-sha256; cv=none; b=RoB8k/CIoChB/UBvKdJQc1bpmKlXudJ/iotwefCU+nAxcF1qIP3k782JfJ98lF5BtD3xp8 GoC8vEfalN12sDgV1OnEtRV2zfk8EKk7ZlFy8Byf1x5dzSVZR24WJU2a/Xp763+pVaPvrc r8iTCU99AXbDOQFwR/lJQ2rez4Y1qIJX2a/NSSfjUHk4CkIEDVI3rrwnKHVHKEwLTQaRpi EiciXRuQBRpelMLyfDNuJJVGgKMhJRGlj39ocT677wrMMRJQ+SbNyKE+qWMuKOv0C8cr9w bbHQFeJBy+FxPAUGIz7VTXv48CnaQNe0TGHJfyCiiLeyjwdW2ZTrwsUgieqekw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712071097; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wTbXvDUZl4jstp5J67XiJGTlmaI9H1Y0c4NR4q+rZL0=; b=IAkboDKj2Qb4BghZCCYFFzBFElpC2yumKUwTAIybaddGFh1Ldgdbwm4P3WI7LdOEJ+Eno8 1BQTSa7YBERZ8nWtq+jlrFzqhqw1ROUgAixJQtElEZxSuRztDucvf0f9r2xTSZbcw8/UbM bNAIjQ2dptBKr+rUvdsb69gwW6Lho8X+VVABUMJeZjr/l1O9MnsNrtWedVkCPqbup6pBLD iZQQNZpfBA8xU8l1G40JgAEpyqbVdzgu1JORLe11P6NIcX19838lUbFKP72ZpnCJFV5Vr5 mokCNP94aAnWjK7h5270J5BzySkYcmynKGBu17Wj6c0oNtNJV+oHgEeC1E3Ong== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4V8BN958FWzvN8; Tue, 2 Apr 2024 15:18: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 432FIHJU057793; Tue, 2 Apr 2024 15:18:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 432FIH1U057790; Tue, 2 Apr 2024 15:18:17 GMT (envelope-from git) Date: Tue, 2 Apr 2024 15:18:17 GMT Message-Id: <202404021518.432FIH1U057790@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: b79fb02b32d9 - stable/13 - x86: handle MXCSR from XSAVEOPT when x87 state was optimized List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: b79fb02b32d930b1940ad7a21cb17896c848d432 Auto-Submitted: auto-generated The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=b79fb02b32d930b1940ad7a21cb17896c848d432 commit b79fb02b32d930b1940ad7a21cb17896c848d432 Author: Konstantin Belousov AuthorDate: 2024-03-27 11:01:44 +0000 Commit: Konstantin Belousov CommitDate: 2024-04-02 15:18:00 +0000 x86: handle MXCSR from XSAVEOPT when x87 state was optimized PR: 275322 (cherry picked from commit 1c091d11261a3c8cc3728b92760e65242c0f5949) --- sys/amd64/amd64/fpu.c | 21 +++++++++++++++++++++ sys/i386/i386/npx.c | 21 +++++++++++++++++++++ 2 files changed, 42 insertions(+) diff --git a/sys/amd64/amd64/fpu.c b/sys/amd64/amd64/fpu.c index 18330cb58d3c..3f06033ae89a 100644 --- a/sys/amd64/amd64/fpu.c +++ b/sys/amd64/amd64/fpu.c @@ -875,7 +875,10 @@ fpugetregs(struct thread *td) struct pcb *pcb; uint64_t *xstate_bv, bit; char *sa; + struct savefpu *s; + uint32_t mxcsr, mxcsr_mask; int max_ext_n, i, owned; + bool do_mxcsr; pcb = td->td_pcb; critical_enter(); @@ -906,10 +909,28 @@ fpugetregs(struct thread *td) bit = 1ULL << i; if ((xsave_mask & bit) == 0 || (*xstate_bv & bit) != 0) continue; + do_mxcsr = false; + if (i == 0 && (*xstate_bv & (XFEATURE_ENABLED_SSE | + XFEATURE_ENABLED_AVX)) != 0) { + /* + * x87 area was not saved by XSAVEOPT, + * but one of XMM or AVX was. Then we need + * to preserve MXCSR from being overwritten + * with the default value. + */ + s = (struct savefpu *)sa; + mxcsr = s->sv_env.en_mxcsr; + mxcsr_mask = s->sv_env.en_mxcsr_mask; + do_mxcsr = true; + } bcopy((char *)fpu_initialstate + xsave_area_desc[i].offset, sa + xsave_area_desc[i].offset, xsave_area_desc[i].size); + if (do_mxcsr) { + s->sv_env.en_mxcsr = mxcsr; + s->sv_env.en_mxcsr_mask = mxcsr_mask; + } *xstate_bv |= bit; } } diff --git a/sys/i386/i386/npx.c b/sys/i386/i386/npx.c index e7e8fc01fa6b..09abf7c17438 100644 --- a/sys/i386/i386/npx.c +++ b/sys/i386/i386/npx.c @@ -1001,8 +1001,11 @@ npxgetregs(struct thread *td) struct pcb *pcb; uint64_t *xstate_bv, bit; char *sa; + union savefpu *s; + uint32_t mxcsr, mxcsr_mask; int max_ext_n, i; int owned; + bool do_mxcsr; if (!hw_float) return (_MC_FPOWNED_NONE); @@ -1045,10 +1048,28 @@ npxgetregs(struct thread *td) bit = 1ULL << i; if ((xsave_mask & bit) == 0 || (*xstate_bv & bit) != 0) continue; + do_mxcsr = false; + if (i == 0 && (*xstate_bv & (XFEATURE_ENABLED_SSE | + XFEATURE_ENABLED_AVX)) != 0) { + /* + * x87 area was not saved by XSAVEOPT, + * but one of XMM or AVX was. Then we need + * to preserve MXCSR from being overwritten + * with the default value. + */ + s = (union savefpu *)sa; + mxcsr = s->sv_xmm.sv_env.en_mxcsr; + mxcsr_mask = s->sv_xmm.sv_env.en_mxcsr_mask; + do_mxcsr = true; + } bcopy((char *)npx_initialstate + xsave_area_desc[i].offset, sa + xsave_area_desc[i].offset, xsave_area_desc[i].size); + if (do_mxcsr) { + s->sv_xmm.sv_env.en_mxcsr = mxcsr; + s->sv_xmm.sv_env.en_mxcsr_mask = mxcsr_mask; + } *xstate_bv |= bit; } } From nobody Tue Apr 2 16:57:04 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4V8DZ86t0Tz5FGQZ; Tue, 2 Apr 2024 16:57: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 4V8DZ84zX6z4f9v; Tue, 2 Apr 2024 16:57:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712077024; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WbW+TPMrp25sFV+FZha1D81DEC+UGmbz96fQ+xPd8tg=; b=fDMu4X9qDOfFv8uvZPuBIm9ZA7KtJcCRldd8G7SfylS3BebR0to1PU5qTgQE1URqlM2zgE Pz9MTMoB7Ux6O6wESvOnSKikgWG7sp1SLYUHpTZy6FYxA4mB/tSmgXGPR9vHFIl5RQozSt 6PK+uA0NIQeAtdJmeMzcqy1JX26HBu+8S2N4W/c7Y+liCJPXKk8DLS98ExZQeFEtc0s1mg YXa4K+pBkzyy1OgNmM35GNOHl2+GLqz2RdFcJ6gpKeRCA1uttVPOltA9lcixl8uQEF+HWB ptxtoIImtocAR1qfahsSiqeZsdS1EGkkJwJ3GjJCDUcx+HERobcP7d6EzKixMg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712077024; a=rsa-sha256; cv=none; b=V/8QhOwEtHL66hgenrwp+lV/aVROMzVCUTMKJebLekYtSsgfy5j5Xd4wsM0JfED+IFFMr9 puHvRix7K/XoUFo0H2Dj6iIIPPNdRqL1eo73//VV6OH9YJilPaxVyoTC/OPalGt42nI8gn OemQCpLcJPIMD0qiTyv+Heg+56wB5GbBgh7O1wrsqJfvEUsqWO2UdrXxIAKGgwIUvyxT8n DA9qf68VOTG997bzKtbwWMExpYUsu/VVbEpn90eDs0IDe6k4R8jweFost+CsiIE6Js73Ut tw20cnGRbyUBRaTnoQK+HQqIAVvq9i1BDOSb4pSr12r+GPkC/coSHNCHeT29qA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712077024; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WbW+TPMrp25sFV+FZha1D81DEC+UGmbz96fQ+xPd8tg=; b=IPZFY5PItoD2eEFh+w/VnNwT6BIkzr4IP5Tq72+2qmiuhV592PP9L4+jRz9RinnKU/W5Lf dm6qAxiSmM3/SKuxwgzdiXxfXNgsvwgP99CRmCKe/BfjAO/+krbaXRcQp1dzvmDB1W0Onr rw219RcueBiTbUTYe6JSSVARUJv4cTRdS9WJaMIUhGeuDQR0NifM0iAMlC9bkBf9r6BSlX 5vCA4upMhQdA78fJTk98dNqqwG/rlSTpKd0pcoZz00z37Cf/J1LiAvdvvePjPyTG2QhWc8 y2eHNC+h8uO6HmywjCkttBEqjjmHYNsYO02TsLkIv5MnHSJ/HCmE7gHtn6/UbQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4V8DZ84WpLzwl5; Tue, 2 Apr 2024 16:57:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 432Gv4HI026321; Tue, 2 Apr 2024 16:57:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 432Gv4NP026318; Tue, 2 Apr 2024 16:57:04 GMT (envelope-from git) Date: Tue, 2 Apr 2024 16:57:04 GMT Message-Id: <202404021657.432Gv4NP026318@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Christos Margiolis Subject: git: 9da3b645dbaa - main - sound: Move sndstat_prepare_pcm() to pcm/sndstat.c and remove sndstat_entry->handler List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9da3b645dbaaad724d524727d003fed7be05ff7c Auto-Submitted: auto-generated The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=9da3b645dbaaad724d524727d003fed7be05ff7c commit 9da3b645dbaaad724d524727d003fed7be05ff7c Author: Christos Margiolis AuthorDate: 2024-04-02 16:56:39 +0000 Commit: Christos Margiolis CommitDate: 2024-04-02 16:56:39 +0000 sound: Move sndstat_prepare_pcm() to pcm/sndstat.c and remove sndstat_entry->handler Since all sndstat_entry->handler fields point to sndstat_prepare_pcm(), we can just call the function directly, without assigning it to a function pointer and calling it indirectly. While here, move sndstat_prepare_pcm() to pcm/sndstat.c, as it is more suitable there. No functional change intended. Sponsored by: The FreeBSD Foundation MFC after: 2 weeks Reviewed by: dev_submerge.ch, markj Differential Revision: https://reviews.freebsd.org/D44571 --- sys/dev/sound/pcm/sndstat.c | 152 +++++++++++++++++++++++++++++++++++++++++--- sys/dev/sound/pcm/sound.c | 138 +--------------------------------------- sys/dev/sound/pcm/sound.h | 3 +- 3 files changed, 145 insertions(+), 148 deletions(-) diff --git a/sys/dev/sound/pcm/sndstat.c b/sys/dev/sound/pcm/sndstat.c index 32b47b8ee105..0279060181b3 100644 --- a/sys/dev/sound/pcm/sndstat.c +++ b/sys/dev/sound/pcm/sndstat.c @@ -49,6 +49,8 @@ #include #include +#include "feeder_if.h" + #define SS_TYPE_PCM 1 #define SS_TYPE_MIDI 2 #define SS_TYPE_SEQUENCER 3 @@ -73,7 +75,6 @@ struct sndstat_entry { TAILQ_ENTRY(sndstat_entry) link; device_t dev; char *str; - sndstat_handler handler; int type, unit; }; @@ -1050,7 +1051,7 @@ fail: /************************************************************************/ int -sndstat_register(device_t dev, char *str, sndstat_handler handler) +sndstat_register(device_t dev, char *str) { struct sndstat_entry *ent; struct sndstat_entry *pre; @@ -1073,7 +1074,6 @@ sndstat_register(device_t dev, char *str, sndstat_handler handler) ent->str = str; ent->type = type; ent->unit = unit; - ent->handler = handler; SNDSTAT_LOCK(); /* sorted list insertion */ @@ -1119,6 +1119,142 @@ sndstat_unregister(device_t dev) /************************************************************************/ +static int +sndstat_prepare_pcm(struct sbuf *s, device_t dev, int verbose) +{ + struct snddev_info *d; + struct pcm_channel *c; + struct pcm_feeder *f; + + d = device_get_softc(dev); + PCM_BUSYASSERT(d); + + if (CHN_EMPTY(d, channels.pcm)) { + sbuf_printf(s, " (mixer only)"); + return (0); + } + + if (verbose < 1) { + sbuf_printf(s, " (%s%s%s", + d->playcount ? "play" : "", + (d->playcount && d->reccount) ? "/" : "", + d->reccount ? "rec" : ""); + } else { + sbuf_printf(s, " (%dp:%dv/%dr:%dv", + d->playcount, d->pvchancount, + d->reccount, d->rvchancount); + } + sbuf_printf(s, "%s)%s", + ((d->playcount != 0 && d->reccount != 0) && + (d->flags & SD_F_SIMPLEX)) ? " simplex" : "", + (device_get_unit(dev) == snd_unit) ? " default" : ""); + + if (verbose <= 1) + return (0); + + sbuf_printf(s, "\n\t"); + sbuf_printf(s, "snddev flags=0x%b", d->flags, SD_F_BITS); + + CHN_FOREACH(c, d, channels.pcm) { + KASSERT(c->bufhard != NULL && c->bufsoft != NULL, + ("hosed pcm channel setup")); + + sbuf_printf(s, "\n\t"); + + sbuf_printf(s, "%s[%s]: ", + (c->parentchannel != NULL) ? + c->parentchannel->name : "", c->name); + sbuf_printf(s, "spd %d", c->speed); + if (c->speed != sndbuf_getspd(c->bufhard)) { + sbuf_printf(s, "/%d", + sndbuf_getspd(c->bufhard)); + } + sbuf_printf(s, ", fmt 0x%08x", c->format); + if (c->format != sndbuf_getfmt(c->bufhard)) { + sbuf_printf(s, "/0x%08x", + sndbuf_getfmt(c->bufhard)); + } + sbuf_printf(s, ", flags 0x%08x, 0x%08x", + c->flags, c->feederflags); + if (c->pid != -1) { + sbuf_printf(s, ", pid %d (%s)", + c->pid, c->comm); + } + sbuf_printf(s, "\n\t"); + + sbuf_printf(s, "interrupts %d, ", c->interrupts); + + if (c->direction == PCMDIR_REC) { + sbuf_printf(s, + "overruns %d, feed %u, hfree %d, " + "sfree %d [b:%d/%d/%d|bs:%d/%d/%d]", + c->xruns, c->feedcount, + sndbuf_getfree(c->bufhard), + sndbuf_getfree(c->bufsoft), + sndbuf_getsize(c->bufhard), + sndbuf_getblksz(c->bufhard), + sndbuf_getblkcnt(c->bufhard), + sndbuf_getsize(c->bufsoft), + sndbuf_getblksz(c->bufsoft), + sndbuf_getblkcnt(c->bufsoft)); + } else { + sbuf_printf(s, + "underruns %d, feed %u, ready %d " + "[b:%d/%d/%d|bs:%d/%d/%d]", + c->xruns, c->feedcount, + sndbuf_getready(c->bufsoft), + sndbuf_getsize(c->bufhard), + sndbuf_getblksz(c->bufhard), + sndbuf_getblkcnt(c->bufhard), + sndbuf_getsize(c->bufsoft), + sndbuf_getblksz(c->bufsoft), + sndbuf_getblkcnt(c->bufsoft)); + } + sbuf_printf(s, "\n\t"); + + sbuf_printf(s, "channel flags=0x%b", c->flags, CHN_F_BITS); + sbuf_printf(s, "\n\t"); + + sbuf_printf(s, "{%s}", + (c->direction == PCMDIR_REC) ? "hardware" : "userland"); + sbuf_printf(s, " -> "); + f = c->feeder; + while (f->source != NULL) + f = f->source; + while (f != NULL) { + sbuf_printf(s, "%s", f->class->name); + if (f->desc->type == FEEDER_FORMAT) { + sbuf_printf(s, "(0x%08x -> 0x%08x)", + f->desc->in, f->desc->out); + } else if (f->desc->type == FEEDER_MATRIX) { + sbuf_printf(s, "(%d.%d -> %d.%d)", + AFMT_CHANNEL(f->desc->in) - + AFMT_EXTCHANNEL(f->desc->in), + AFMT_EXTCHANNEL(f->desc->in), + AFMT_CHANNEL(f->desc->out) - + AFMT_EXTCHANNEL(f->desc->out), + AFMT_EXTCHANNEL(f->desc->out)); + } else if (f->desc->type == FEEDER_RATE) { + sbuf_printf(s, + "(0x%08x q:%d %d -> %d)", + f->desc->out, + FEEDER_GET(f, FEEDRATE_QUALITY), + FEEDER_GET(f, FEEDRATE_SRC), + FEEDER_GET(f, FEEDRATE_DST)); + } else { + sbuf_printf(s, "(0x%08x)", + f->desc->out); + } + sbuf_printf(s, " -> "); + f = f->parent; + } + sbuf_printf(s, "{%s}", + (c->direction == PCMDIR_REC) ? "userland" : "hardware"); + } + + return (0); +} + static int sndstat_prepare(struct sndstat_file *pf_self) { @@ -1149,12 +1285,10 @@ sndstat_prepare(struct sndstat_file *pf_self) sbuf_printf(s, " <%s>", device_get_desc(ent->dev)); if (snd_verbose > 0) sbuf_printf(s, " %s", ent->str); - if (ent->handler) { - /* XXX Need Giant magic entry ??? */ - PCM_ACQUIRE_QUICK(d); - ent->handler(s, ent->dev, snd_verbose); - PCM_RELEASE_QUICK(d); - } + /* XXX Need Giant magic entry ??? */ + PCM_ACQUIRE_QUICK(d); + sndstat_prepare_pcm(s, ent->dev, snd_verbose); + PCM_RELEASE_QUICK(d); sbuf_printf(s, "\n"); } if (k == 0) diff --git a/sys/dev/sound/pcm/sound.c b/sys/dev/sound/pcm/sound.c index b45ca30dc984..1517126210c4 100644 --- a/sys/dev/sound/pcm/sound.c +++ b/sys/dev/sound/pcm/sound.c @@ -74,142 +74,6 @@ SYSCTL_STRING(_hw_snd, OID_AUTO, version, CTLFLAG_RD, &snd_driver_version, */ struct unrhdr *pcmsg_unrhdr = NULL; -static int -sndstat_prepare_pcm(struct sbuf *s, device_t dev, int verbose) -{ - struct snddev_info *d; - struct pcm_channel *c; - struct pcm_feeder *f; - - d = device_get_softc(dev); - PCM_BUSYASSERT(d); - - if (CHN_EMPTY(d, channels.pcm)) { - sbuf_printf(s, " (mixer only)"); - return (0); - } - - if (verbose < 1) { - sbuf_printf(s, " (%s%s%s", - d->playcount ? "play" : "", - (d->playcount && d->reccount) ? "/" : "", - d->reccount ? "rec" : ""); - } else { - sbuf_printf(s, " (%dp:%dv/%dr:%dv", - d->playcount, d->pvchancount, - d->reccount, d->rvchancount); - } - sbuf_printf(s, "%s)%s", - ((d->playcount != 0 && d->reccount != 0) && - (d->flags & SD_F_SIMPLEX)) ? " simplex" : "", - (device_get_unit(dev) == snd_unit) ? " default" : ""); - - if (verbose <= 1) - return (0); - - sbuf_printf(s, "\n\t"); - sbuf_printf(s, "snddev flags=0x%b", d->flags, SD_F_BITS); - - CHN_FOREACH(c, d, channels.pcm) { - KASSERT(c->bufhard != NULL && c->bufsoft != NULL, - ("hosed pcm channel setup")); - - sbuf_printf(s, "\n\t"); - - sbuf_printf(s, "%s[%s]: ", - (c->parentchannel != NULL) ? - c->parentchannel->name : "", c->name); - sbuf_printf(s, "spd %d", c->speed); - if (c->speed != sndbuf_getspd(c->bufhard)) { - sbuf_printf(s, "/%d", - sndbuf_getspd(c->bufhard)); - } - sbuf_printf(s, ", fmt 0x%08x", c->format); - if (c->format != sndbuf_getfmt(c->bufhard)) { - sbuf_printf(s, "/0x%08x", - sndbuf_getfmt(c->bufhard)); - } - sbuf_printf(s, ", flags 0x%08x, 0x%08x", - c->flags, c->feederflags); - if (c->pid != -1) { - sbuf_printf(s, ", pid %d (%s)", - c->pid, c->comm); - } - sbuf_printf(s, "\n\t"); - - sbuf_printf(s, "interrupts %d, ", c->interrupts); - - if (c->direction == PCMDIR_REC) { - sbuf_printf(s, - "overruns %d, feed %u, hfree %d, " - "sfree %d [b:%d/%d/%d|bs:%d/%d/%d]", - c->xruns, c->feedcount, - sndbuf_getfree(c->bufhard), - sndbuf_getfree(c->bufsoft), - sndbuf_getsize(c->bufhard), - sndbuf_getblksz(c->bufhard), - sndbuf_getblkcnt(c->bufhard), - sndbuf_getsize(c->bufsoft), - sndbuf_getblksz(c->bufsoft), - sndbuf_getblkcnt(c->bufsoft)); - } else { - sbuf_printf(s, - "underruns %d, feed %u, ready %d " - "[b:%d/%d/%d|bs:%d/%d/%d]", - c->xruns, c->feedcount, - sndbuf_getready(c->bufsoft), - sndbuf_getsize(c->bufhard), - sndbuf_getblksz(c->bufhard), - sndbuf_getblkcnt(c->bufhard), - sndbuf_getsize(c->bufsoft), - sndbuf_getblksz(c->bufsoft), - sndbuf_getblkcnt(c->bufsoft)); - } - sbuf_printf(s, "\n\t"); - - sbuf_printf(s, "channel flags=0x%b", c->flags, CHN_F_BITS); - sbuf_printf(s, "\n\t"); - - sbuf_printf(s, "{%s}", - (c->direction == PCMDIR_REC) ? "hardware" : "userland"); - sbuf_printf(s, " -> "); - f = c->feeder; - while (f->source != NULL) - f = f->source; - while (f != NULL) { - sbuf_printf(s, "%s", f->class->name); - if (f->desc->type == FEEDER_FORMAT) { - sbuf_printf(s, "(0x%08x -> 0x%08x)", - f->desc->in, f->desc->out); - } else if (f->desc->type == FEEDER_MATRIX) { - sbuf_printf(s, "(%d.%d -> %d.%d)", - AFMT_CHANNEL(f->desc->in) - - AFMT_EXTCHANNEL(f->desc->in), - AFMT_EXTCHANNEL(f->desc->in), - AFMT_CHANNEL(f->desc->out) - - AFMT_EXTCHANNEL(f->desc->out), - AFMT_EXTCHANNEL(f->desc->out)); - } else if (f->desc->type == FEEDER_RATE) { - sbuf_printf(s, - "(0x%08x q:%d %d -> %d)", - f->desc->out, - FEEDER_GET(f, FEEDRATE_QUALITY), - FEEDER_GET(f, FEEDRATE_SRC), - FEEDER_GET(f, FEEDRATE_DST)); - } else { - sbuf_printf(s, "(0x%08x)", - f->desc->out); - } - sbuf_printf(s, " -> "); - f = f->parent; - } - sbuf_printf(s, "{%s}", - (c->direction == PCMDIR_REC) ? "userland" : "hardware"); - } - - return (0); -} - void * snd_mtxcreate(const char *desc, const char *type) { @@ -1109,7 +973,7 @@ pcm_register(device_t dev, void *devinfo, int numplay, int numrec) if (numplay > 0 || numrec > 0) d->flags |= SD_F_AUTOVCHAN; - sndstat_register(dev, d->status, sndstat_prepare_pcm); + sndstat_register(dev, d->status); return (dsp_make_dev(dev)); } diff --git a/sys/dev/sound/pcm/sound.h b/sys/dev/sound/pcm/sound.h index d95e3a29521c..b48aed7c2d6e 100644 --- a/sys/dev/sound/pcm/sound.h +++ b/sys/dev/sound/pcm/sound.h @@ -338,8 +338,7 @@ void snd_mtxassert(void *m); #define snd_mtxlock(m) mtx_lock(m) #define snd_mtxunlock(m) mtx_unlock(m) -typedef int (*sndstat_handler)(struct sbuf *s, device_t dev, int verbose); -int sndstat_register(device_t dev, char *str, sndstat_handler handler); +int sndstat_register(device_t dev, char *str); int sndstat_unregister(device_t dev); /* usage of flags in device config entry (config file) */ From nobody Tue Apr 2 17:28:39 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4V8FGc0GTDz5FL65; Tue, 2 Apr 2024 17:28:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4V8FGb6pdfz4jlM; Tue, 2 Apr 2024 17:28:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712078920; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=k+uLmaBa8x295w+OhfaCwFCFHAQhr9VeMYT5kL4vMPc=; b=RwuV71/er1yNJ3RuL7xccJf3ZC8lz56+30KInpewXUsd/HpoZlKBq/muIZn3+MQtlKZBqq UBy5+5Bj7Kramggb3hD0sE0cpLH4KSt3Wb6uB/WpOtWRTJv86fA/W0VLKhbb6omx4JGfk3 WRJrCIscUTCo9up3k2APboWzuOYtCm6sopdvgobTa3SeTV/f8InIbakiW/yJ51/BYvNCkO 6oxYbczPL8gYl0EYXi68FV1bUNM39pMdUP1sC3mtB6t7zWW64kmboc2WWOnF+zTidMtlPO COgQcgIWA5p+/IcmP2fy1qcz+GJ7FUpLAG8fgHVBwXHlXO5W5TFxLgHJtBUC4w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712078920; a=rsa-sha256; cv=none; b=dLRH9qt8vI4fXC3NPwFTCEYkRImS6wgKdvVQjyyq/nkmplL13VWvYtAkZfaCFKpNxevhB1 5SZMJs0vuyNni9TOm7oiBmilhyivMsvgDgPAtm60Re+IIytkeu27WxSr57HFQSJm2AzDqv PviCd1qXooD80DcyHnzYPHMBK7A5r7cCJVXUNLCReoD7VDv5yFTfiMh8YczarwDLt9vQ2w h632uG9xSdvz0LetflcVgRnGkVBn1B/zJJV+p90/gF908PLx065cCibQK7zXf0EgQMv7ou TK0jvvc8NQXX7ay2r/GQGwrQ/reGZVL0UQdjbQ2+pJusAGRbH7KnwR2yzs7T2Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712078920; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=k+uLmaBa8x295w+OhfaCwFCFHAQhr9VeMYT5kL4vMPc=; b=vYZ4ebnarhG1PRJ1+C8885bScjI5eTkF9UbBYi8ascjjqP2Jz8mLpZhSExnVNB+gpo1KY9 5WrcWB8InlPDNbmuAVuLhSwEfs42FVOO4x2dGeTvxdOUbkaBjmI5G0HWG1MEk1J8XmXMt6 mraqGvHUYpz02qxdqLfIh9/KJqM/V59MkbDcLpJt+5x+UGhx9AMjOjYsCNXdIYlnBuIFtY t7hGa6vaWqpOM2+2KWQilnF+CW5Fu2Hx7l5Z6L/aterGekQzfHHBzZPQrg+UI84uF8PAZC QQik1+nKhSiMsMSlblC3wEK3EFJGxpd49N0GFY5woNtaMiRDAChEpy2sMq9uxg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4V8FGb6Pyjzyjk; Tue, 2 Apr 2024 17:28:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 432HSdAL077692; Tue, 2 Apr 2024 17:28:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 432HSdrY077689; Tue, 2 Apr 2024 17:28:39 GMT (envelope-from git) Date: Tue, 2 Apr 2024 17:28:39 GMT Message-Id: <202404021728.432HSdrY077689@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Li-Wen Hsu Subject: git: 861f5b95b39f - main - acpidump(8) Fix typo in error message List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: lwhsu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 861f5b95b39fd8a6b10b7bddf29e284e5ba2c49a Auto-Submitted: auto-generated The branch main has been updated by lwhsu: URL: https://cgit.FreeBSD.org/src/commit/?id=861f5b95b39fd8a6b10b7bddf29e284e5ba2c49a commit 861f5b95b39fd8a6b10b7bddf29e284e5ba2c49a Author: SHENG-YI HONG AuthorDate: 2024-04-02 17:24:46 +0000 Commit: Li-Wen Hsu CommitDate: 2024-04-02 17:28:23 +0000 acpidump(8) Fix typo in error message acpidump(8) uses iasl(8) to parse acpi information. MFC after: 3 days Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D44596 --- usr.sbin/acpi/acpidump/acpi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/acpi/acpidump/acpi.c b/usr.sbin/acpi/acpidump/acpi.c index 3ebfefcc591f..8b749f100eac 100644 --- a/usr.sbin/acpi/acpidump/acpi.c +++ b/usr.sbin/acpi/acpidump/acpi.c @@ -2231,7 +2231,7 @@ aml_disassemble(ACPI_TABLE_HEADER *rsdt, ACPI_TABLE_HEADER *dsdp) goto out; } if (status != 0) { - fprintf(stderr, "iast exit status = %d\n", status); + fprintf(stderr, "iasl exit status = %d\n", status); } /* Dump iasl's output to stdout */ From nobody Tue Apr 2 20:44:14 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4V8KcG3gn1z5FjnZ; Tue, 2 Apr 2024 20:44:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4V8KcG2w3lz5457; Tue, 2 Apr 2024 20:44:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712090654; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=h8kG0+900V4HWM47iUAvo/laMZubWiQR1L0kJYHIyZ4=; b=e2P6VW1IrkTrmTbCRY/6nOAPCwLy9pKkR9swnG2cQ0OQCtWUz/F3UPQ2Pg/Xe+ueFSsxW4 8U2hakvvmi5i83VSW3gmYQb6TA2Of7ZOZXzjTRG4x9Qnpgu2vANeU836qdjYPduhgBZ8CB GcRmSW9eBPviU2CUEVIYjjilIWqroX+mCvbxl2I3DPtKSQ8w2vCsK/HJoJvA/Th5NmujpD tE/VBAzJ/vCSY+57biDwciM2zITrfbwPmnS6beNDsIUmFmLIeeED1cOocOzgv8aTg9MBsG XNGCiuZvqBo/m/EX7Qj6e71iQsbYkp+JjhKFQgsJdBF91lPUhOEjYO5Sy9J+Fw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712090654; a=rsa-sha256; cv=none; b=tHbO2yjqmv4iJ4Kq6CCllknM0MQ373svCVAiQ/gFJCUBpHY5XNjWtrsL0ndj1Dr7PpOWGI zPvanhbu7XO8dCtJlEW+zSBzCOHYaBDSH8Ea/6LHIO437shxyLmaW1hI4CF5uOjqQqkIlb 861FR/lMoDxoK44HJqyufry1kS4a6bLmF2dgsv5so/afeGTv2wu7NPNEXWrEgCUUzUAG6P +cJ6BiPqbrf7lwTYim6iJ3FLRyYhct/QmZhKW19+HLZ8HCC5aXbWBOxkC+Ws6SOiJpG0ZQ Y5ynEiEnFnjPp0purJy93/uQkJwl7xnSKIv3YN9MvDjB5Aw5FgQTVtCXIvCIGQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712090654; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=h8kG0+900V4HWM47iUAvo/laMZubWiQR1L0kJYHIyZ4=; b=LthXLtrm/OxFgb+7XjdhlJ1Z5j/WTEcVCTgZL/YWaoWnb0yNz/Gpo8x9EYqQCMu5rrmqQy p4KiovulzmOrtROnjT7JOWvZfvjpYWoQ63v8vUr3USXrGtB212Nhn2Qa6LqMl1zddS24nD 1nakoXg5S17cNhbPHubVnBe95VpqLMPd8c2zzB1f+NVuZJ6wU0dZW5A1jr4gmmktzDN+S8 zJ9l66RG5l/h0jLU8dhfOmsRPGAmlkIHyi95R4ssmna3GBdMtN94XEBBNGradqvm7YxbwD PjciTIZez/t4TbbnOYSdekK2ZqeOIZCfvu2uUKY8pG3FaTdPiuXjJuhB8v5PgQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4V8KcG2SLvz13w7; Tue, 2 Apr 2024 20:44:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 432KiERP015337; Tue, 2 Apr 2024 20:44:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 432KiEHH015334; Tue, 2 Apr 2024 20:44:14 GMT (envelope-from git) Date: Tue, 2 Apr 2024 20:44:14 GMT Message-Id: <202404022044.432KiEHH015334@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 794473e3101c - stable/14 - release.sh: Don't install git if already present List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 794473e3101c5e7764be7eea13429a1daac7b3e7 Auto-Submitted: auto-generated The branch stable/14 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=794473e3101c5e7764be7eea13429a1daac7b3e7 commit 794473e3101c5e7764be7eea13429a1daac7b3e7 Author: Colin Percival AuthorDate: 2024-03-29 07:10:50 +0000 Commit: Colin Percival CommitDate: 2024-04-02 20:44:03 +0000 release.sh: Don't install git if already present Prior to this commit, we install git from ports if there is a ports tree available and git is not installed, and we install git from pkg otherwise -- including the case where git is already installed. Rework the logic to not (re)install git at all if it is already installed. MFC after: 3 days (cherry picked from commit 6baddb6b117664f51e2b1d2427fced946913a08f) --- release/release.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/release/release.sh b/release/release.sh index 75278a12daa6..c9d0203debd4 100755 --- a/release/release.sh +++ b/release/release.sh @@ -252,11 +252,11 @@ extra_chroot_setup() { cp ${SRC_CONF} ${CHROOTDIR}/${SRC_CONF} fi - if [ -z "${NOGIT}" ]; then - # Install git from ports or packages if the ports tree is - # available and VCSCMD is unset. - _gitcmd="$(which git)" - if [ -d ${CHROOTDIR}/usr/ports -a -z "${_gitcmd}" ]; then + _gitcmd="$(which git)" + if [ -z "${NOGIT}" -a -z "${_gitcmd}" ]; then + # Install git from ports if the ports tree is available; + # otherwise install the pkg. + if [ -d ${CHROOTDIR}/usr/ports ]; then # Trick the ports 'run-autotools-fixup' target to do the right # thing. _OSVERSION=$(chroot ${CHROOTDIR} /usr/bin/uname -U) From nobody Tue Apr 2 20:44:54 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4V8Kd25YFWz5Fk4s; Tue, 2 Apr 2024 20:44:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4V8Kd24xwzz54Nf; Tue, 2 Apr 2024 20:44:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712090694; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qZVM726yTkuNRF5MvtCM68LT50JlFicniZAx1JbkQMo=; b=YQmAZGdguOU4DT+u8osapSdA/G2zsCasyz7zwj2imEgmCIvd2jeW5ovxyPeYPihGGSGAMo O+aLTezM7Gzpea/AjYGp6O65Ps9OUb8fHCKP+itwAI72SI1Gi6lpAFHHL0xb7yUaQU3Pmc 63w7rW/KigrD3I8fkNPH7O/3Hd9Am0qHVjUclPNSrOaGdAbg0/lIOQknDpnXoM8wGgG6ur YukRZ6BYTxDDd6NA4uKS3XeQj7w87tu2Ce44AprH60d+jEkXzyO7KB+jLB/QUObx4u7VEH q7cATycN+Ae/84g8OYlXIOp/wScEN0wh8jPMKukGlOOlPbF6bc80qlSx+qa/5g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712090694; a=rsa-sha256; cv=none; b=SeBiCSVGM7whlZcxDkGRHdKS0kudQl2cQJyEh5aOCmDCn3xq0XRel76Nv0JJw72IZjjUE2 g9nWZ6Yl8AGOw/TVdowzHP3nEY/RK9lDGyUllm9Czn1PBUd5MnnG3ktBCes3AWxBNsbLqy 2N3RLzHsVpd5ZHeQvay7wEl068z0xQqmtF6t6VHfA2O2790O4hLRquoGL3IzXsmqdq5S5x FWIaiL4Kej1YeXzy4QKm7+SPMDfDL/lab+Ts8X5zGwNNp0uwQQbTNgDud0/palBu6FIkBo n0jHDbKBZ+BrpYaw5Uo0E+NHHhNMap20Y0Eg77VlGaHHD3wrB5BekUtA0Eo0MQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712090694; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qZVM726yTkuNRF5MvtCM68LT50JlFicniZAx1JbkQMo=; b=EOsyTjkrIXJaOLKE8S7qzQ8BwXSssQS39sx4b0GwN8ELiz0EcAScaWXj0GcaC5HAiJwQ8Q cxuyccNtxuqkJe8nsbWHFqzKcAY57oTicqcNyAz/ZDarYkBda9++Mw2Mlq0UdzyMJDx05w ZGlddRl9dGPjbgx9XLtFTtq5Waz43nFPYgklgxOKsDDLGrsM5VDbgO15WnMjUafSDGU9um NePSTt1O0Mcxc/4/HLPEmAEYtOb0BA8oKGiYnYAGgVRhvhYDYSOWKisboeox57Urtx/7kY bbS00jiDgbJ4rH1m5DYcpZGdR8HoymF7CFctFtAjjLIk3QBOX3KvN13FvbUR7A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4V8Kd24TYfz14Ng; Tue, 2 Apr 2024 20:44:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 432Kissq015609; Tue, 2 Apr 2024 20:44:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 432KisTv015606; Tue, 2 Apr 2024 20:44:54 GMT (envelope-from git) Date: Tue, 2 Apr 2024 20:44:54 GMT Message-Id: <202404022044.432KisTv015606@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 853241218da2 - stable/13 - release.sh: Don't install git if already present List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 853241218da2d2eed02e76683b77842451fcdf0f Auto-Submitted: auto-generated The branch stable/13 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=853241218da2d2eed02e76683b77842451fcdf0f commit 853241218da2d2eed02e76683b77842451fcdf0f Author: Colin Percival AuthorDate: 2024-03-29 07:10:50 +0000 Commit: Colin Percival CommitDate: 2024-04-02 20:44:46 +0000 release.sh: Don't install git if already present Prior to this commit, we install git from ports if there is a ports tree available and git is not installed, and we install git from pkg otherwise -- including the case where git is already installed. Rework the logic to not (re)install git at all if it is already installed. MFC after: 3 days (cherry picked from commit 6baddb6b117664f51e2b1d2427fced946913a08f) --- release/release.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/release/release.sh b/release/release.sh index 75278a12daa6..c9d0203debd4 100755 --- a/release/release.sh +++ b/release/release.sh @@ -252,11 +252,11 @@ extra_chroot_setup() { cp ${SRC_CONF} ${CHROOTDIR}/${SRC_CONF} fi - if [ -z "${NOGIT}" ]; then - # Install git from ports or packages if the ports tree is - # available and VCSCMD is unset. - _gitcmd="$(which git)" - if [ -d ${CHROOTDIR}/usr/ports -a -z "${_gitcmd}" ]; then + _gitcmd="$(which git)" + if [ -z "${NOGIT}" -a -z "${_gitcmd}" ]; then + # Install git from ports if the ports tree is available; + # otherwise install the pkg. + if [ -d ${CHROOTDIR}/usr/ports ]; then # Trick the ports 'run-autotools-fixup' target to do the right # thing. _OSVERSION=$(chroot ${CHROOTDIR} /usr/bin/uname -U) From nobody Tue Apr 2 21:01:32 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4V8L0D4mwwz5FlXG; Tue, 2 Apr 2024 21:01: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 4V8L0D2XPwz55nL; Tue, 2 Apr 2024 21:01:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712091692; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aI4qnSOUC1OXssTPcBqrwqHoRZZIiAh69soMXjHQfqs=; b=dTiyxMF+py6zK74AhSsa+dTllQG06cGQRtMZhLhDE5CAIYVYJ/j8bdZXGOvpVR7LGouZHN uRq8KKFmGZcyesMQeY6ZWgoFHzyA7y26lEmNNP/ts9hrKzxBcupYNN4m0T+5jCTXy2Shy0 nMAWA15RWeHEvLYU7C/18Mmgk35EB80Gy3Zv7/aK+M8TyYfgkpjWhKViytyP9MA690Kp6o ij0Rlr3oESez82AbXa0e4hmVaOKnAU+j+Pt/DjlHSvThxWVa+H73rQT8YK3FRdUbHebpAR IQB5SivCSvxnujqG0/E6XEU70+flcp6BYaMLBqJzoMmeYzgpKXw5UH2oocZfyw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712091692; a=rsa-sha256; cv=none; b=kvvWOf0YBHXwTIryNZ/NU3TUduw3K6wT+x7dONhf3Y2xJsSmT3seIaGtYuzxz/JCuYkr/q r99tgq6pFEzKFxJhmyZW9zW7RdVAr223yYA1wwUd6LD+EFabhDFcY5HoISNQ/qbZhqQlWO 2AAhvzmA8V+prln0d3dlvIVmTqW9RUll0DCYaa5TwvVkn8iepBgdL08ljsQWdCb4c/YXrD ZGSXH+ZbV1/GG8EIyp5CTKtqxjGjHKZvYBwN3FlnxfTh1mPk/9eLxaIZVBqpWiBJRhZFry R4ANWRgeoZn1yt/dryERxJXaBdRJEKMPXrSKdcV92UrP5Zw86h0VBiBydZxAlg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712091692; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aI4qnSOUC1OXssTPcBqrwqHoRZZIiAh69soMXjHQfqs=; b=Txaus9HDl688ZMVYZRqZ3Rtf2lydpBO6sEIhKRp+XIVfKK259JBXjpxmryZwVuATlwGJqW rIKz3PiVjfyZdI8US0L+7NaqPzzrq9eLmEkbOuTvqid2Ub6UyLag8JtAtLB0rj7dCcOQc4 CQsp6IbeSJjM1bqW4YCI9F8vBJb55QWGbDX5pFMoE0rmjUpgzZugROtBu09u9C4qhZ8QZc uaGe3+dsb7R8F01Bv8ioh9WVxqd6jVAuAMcg8tVIn0ycyVvk0uSFEwoxGq98xqBep66FRW Avumr/fwUGcpduZgsmpY84r/C4Qx+DRxFPW3Z5l1P8wBXVEgV8eBBFJBRstH5g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4V8L0D28qMz14hr; Tue, 2 Apr 2024 21:01: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 432L1W5N045616; Tue, 2 Apr 2024 21:01:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 432L1WfI045613; Tue, 2 Apr 2024 21:01:32 GMT (envelope-from git) Date: Tue, 2 Apr 2024 21:01:32 GMT Message-Id: <202404022101.432L1WfI045613@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Cochard Subject: git: a92757146909 - main - OptionalObsoleteFiles: add missed cuda wrappers include files List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olivier X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a9275714690942e973ae69a3c179e3a435cf50dd Auto-Submitted: auto-generated The branch main has been updated by olivier: URL: https://cgit.FreeBSD.org/src/commit/?id=a9275714690942e973ae69a3c179e3a435cf50dd commit a9275714690942e973ae69a3c179e3a435cf50dd Author: Olivier Cochard AuthorDate: 2024-04-02 20:43:05 +0000 Commit: Olivier Cochard CommitDate: 2024-04-02 20:59:28 +0000 OptionalObsoleteFiles: add missed cuda wrappers include files Files introduced since clang 17.0.2. Approved by: dim Sponsored by: Netflix Differential Revision: https://reviews.freebsd.org/D44597 --- tools/build/mk/OptionalObsoleteFiles.inc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index 60fe97949f0c..77b671603f96 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -986,6 +986,8 @@ OLD_FILES+=usr/lib/clang/17/include/cmpccxaddintrin.h OLD_FILES+=usr/lib/clang/17/include/cpuid.h OLD_FILES+=usr/lib/clang/17/include/crc32intrin.h OLD_FILES+=usr/lib/clang/17/include/cuda_wrappers/algorithm +OLD_FILES+=usr/lib/clang/17/include/cuda_wrappers/bits/basic_string.h +OLD_FILES+=usr/lib/clang/17/include/cuda_wrappers/bits/basic_string.tcc OLD_FILES+=usr/lib/clang/17/include/cuda_wrappers/bits/shared_ptr_base.h OLD_DIRS+=usr/lib/clang/17/include/cuda_wrappers/bits OLD_FILES+=usr/lib/clang/17/include/cuda_wrappers/cmath From nobody Wed Apr 3 00:28:53 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4V8QbV1Gy4z5G4t9; Wed, 3 Apr 2024 00:28: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 4V8QbV0Sc9z4DqC; Wed, 3 Apr 2024 00:28:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712104134; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ALiQ75RXu0fy9NYzYi17Yz/gSqdAOVzsxV9gjh9bQ1o=; b=fvJmT8orn8zihe4VKEPx6G+KpYgI00unP8Ghg8VtPePrGXBXuiM+zCkVbJXae4Tht8+Rwy sqLycqXznUMVWeju40GBKBp696lFuhi0AGnaLxOPFkEYLmJcYreNiJlzy4ztBRh9tyFdtO vum220GsDYS2rqoB7DYyVodG4REumDZvnHs1TeupLsJe9AZvJQnHdqQNvyw6b1y5o8+tkv AJTeRIS5xmZNcqSim/kiwNg+a870geLVsUCkoEQZqwKiAA0FkWX61z9c+Hz/DuVwD7LzW1 mKASHqTzg3XUod7eA6oIfF6jkRXsu55D3wh/0tMamaPD57GRzxW7ImFHHSfCBA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712104134; a=rsa-sha256; cv=none; b=qvlSqxIEhyubryxq8Jb5nN65uREYLhiMAZLUAuE+PCmQF5rtBb/zCIU87bJwY49KidTDaq cY2GHCFBoZv8ztZOsQvS4qVMpI3/Y8domIAWrjX04gzWPnnq4Bt+YAqI2q42GnYzjh+MKF S7XdcyZDqbqn3CBPFzicMcEvbhBljv7mR0Cs/BPiSvl5IBd1HPPXryO+TDE6atvJRm4BWZ 0w2rkYAJFRxP5GAQR9YaePfSXsGsPS6AB3ItXIabKfOizQs2AnxslHVspoAo+fpKBT2tEW jHDbT/7fupclmKVrBsmSlSNNk59plBxh7bqTsf8+SPoZccIRhVRD6N1cfgV+7A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712104134; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ALiQ75RXu0fy9NYzYi17Yz/gSqdAOVzsxV9gjh9bQ1o=; b=FvLxVRm5cAdvpWLoQASwzQYGqUsx13jONybSEx6h7QHN5+JWfcB2GeYAs7vlxZ+ZP6BjL3 P/A8yCDzZKh8cTEel8eHbcgX7VMz056jgASqDBOzQbee5qNp45Eq0gyrX6F3gzegpFIKBv heTZudm5LwKzbzYYDhBPCYI6uPQe2ZuFbF/iCJC2bCeuwvUcO2Rn/tLQjMILrDNj2EufLW vr0nsPITb4w8m8sfFdI0dlxX766xHEgzuPSKeiYZX7zsnq0PrQHsZY1TBF940FdPrcxYdn brj0koeNvO+iUYYPz61S2vv3MZj3JC9fb9yU1Cew97UGZym0MipcPqzSWesa5Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4V8QbV03yQz19Jr; Wed, 3 Apr 2024 00:28:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 4330SrdS088377; Wed, 3 Apr 2024 00:28:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4330SrlR088374; Wed, 3 Apr 2024 00:28:53 GMT (envelope-from git) Date: Wed, 3 Apr 2024 00:28:53 GMT Message-Id: <202404030028.4330SrlR088374@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Cy Schubert Subject: git: beb5140a9d8f - stable/14 - hostapd: Work around lack of MLME support List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: beb5140a9d8f349866ef4ba8ada9d98faed2c770 Auto-Submitted: auto-generated The branch stable/14 has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=beb5140a9d8f349866ef4ba8ada9d98faed2c770 commit beb5140a9d8f349866ef4ba8ada9d98faed2c770 Author: Cy Schubert AuthorDate: 2024-02-27 03:34:09 +0000 Commit: Cy Schubert CommitDate: 2024-04-03 00:28:45 +0000 hostapd: Work around lack of MLME support hostap MLME uses Linux data structures and definitions not available in FreeBSD. The ability for hostapd to select the frequency (channel) depends Linux MLME, though strictly it's not required. Work around the Linux MLME requirement to configure device frequency. The detailed description is: hostapd will only set the channel (frequency) when Linux MLME is configured. Enabling NEED_AP_MLME will result in numerous build errors due do Linux data structures and definitions not available under FreeBSD. The code to set the frequency from the selected channel is only within the NEED_AP_MLME code path because without MLME, hostapd_get_hw_features() is an inline that always returns -1 whereas with MLME hostapd_get_hw_features() will obtain hardware features from the kernel. Until such time we simply set the frequency as configured. PR: 276375 (cherry picked from commit 84ed86380aeb566ffd8b957ba99c36ad345413ef) --- contrib/wpa/src/ap/hostapd.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/contrib/wpa/src/ap/hostapd.c b/contrib/wpa/src/ap/hostapd.c index 4b88641a2dde..a5cabc01f163 100644 --- a/contrib/wpa/src/ap/hostapd.c +++ b/contrib/wpa/src/ap/hostapd.c @@ -1698,6 +1698,20 @@ static int setup_interface2(struct hostapd_iface *iface) { iface->wait_channel_update = 0; +#ifdef __FreeBSD + /* XXX hostapd_get_hw_features() is an inline that always returns -1 + * because MLME will not build under FreeBSD due to its use of + * Linux definitions. Normally FreeBSD would uncondionally execute the + * "Not all drivers support..." block. Instead we #ifdef out the entire + * block of code instead of maintaining the fallacy that + * hostapd_get_hw_features() returns anything meaninful. + * + * Ideally WANT_AP_MLME should be taught about FreeBSD data structures + * and defintions. Instead we do this to enable channel selection in + * hostapd.conf. + */ + iface->freq = iface->conf->channel; +#else if (hostapd_get_hw_features(iface)) { /* Not all drivers support this yet, so continue without hw * feature data. */ @@ -1744,6 +1758,7 @@ static int setup_interface2(struct hostapd_iface *iface) if (iface->conf->ieee80211h) wpa_printf(MSG_DEBUG, "DFS support is enabled"); } +#endif return hostapd_setup_interface_complete(iface, 0); fail: From nobody Wed Apr 3 00:29:23 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4V8Qc40n68z5G526; Wed, 3 Apr 2024 00:29: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 4V8Qc404k7z4F32; Wed, 3 Apr 2024 00:29:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712104164; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Kv8+k+UWZnXPnFuxqCNjSfbBQp/5jc+KYsAdHMRZVVs=; b=bwnzQolmRve8ikLtz4uW28J1bOa43KFqqelPUJcydotCvcpSVsd0zecR891l6VYewODgsk cSNVtsD/sKJ8++pUJZXPs8TZKZP2yScyaRiMYikHfbxTI6NzB5Xcnl5XKjLQ59nEHBfkWG EE2ixANkj2AK0vZdEpqwvPNrbkmGFpogkB0YSc/vVH3J36vxIZW6vE8HIaaajO4ojyD9wa yN/OfUxCvRNFamdEbVXge2u8Tasz5+YsSaBuGa2Jx5Y9PaRptW29v06yyh+xuoEuaFnWE0 r8Vy34rBcld59Taw8RPwHGB0gtCX2QgiJWaM6O8Z58YQLOhGpSGTaEsqOxZR/Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712104164; a=rsa-sha256; cv=none; b=dCoYHcasE7LAjSmkNXnOuwh0qAIIbpcgWzvl7ZUtuxoNpyUpMBsEPfoIjtSciM4eKnwlM7 qs9eaNWko7qaqaMVNihkghZRDOl3HHf/HcIWErskpgg1YJCFeePIxjH5CoDFAIMzyrbWBh W9QQXFGPGRvxcV5uZT6dkvoFdPLdvF8QEHeIfxzRYZ7fBqWpjvX3OYwi/dahiJAcwS+WoL jTzcxz6rkaeGnmHK6fJTn+CuziGV2LYiSXso9XOMZlvRJQhTOSCJGaF6uXFDJFmGuPas2Q hvjJX8J4EBMlnJY9OBL0yEYh6OfoLHixmqc6Kvhn0IboMIvdU7JiLxw/TKB10Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712104164; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Kv8+k+UWZnXPnFuxqCNjSfbBQp/5jc+KYsAdHMRZVVs=; b=X33ARYKq+pNGv4COFBu2Z6dFuSNkfWupTODKlbMFYzxF4Hj6qP3bKxciE5/E1h/EJphjaJ tEGthuROq1IVCvI0i4jTY4OcyJNu5N4XJQT5ro49dfFvOQCLiQMNfMM5BjtkqQoD0Xt+fH 81yCoJtU3rm/rFu21O8FCb+MDN1CodVoktE4RJiOdQlcgPon89COE8/aOTWI0MugMew6et zZhT0aTJazHjUGz6LEJgAtZ/F/sjGZFaG9JaW6EKZgKyYzx/CqvBIBC3esDSYP1JdbCbUY VkqVyK/P8LpIQAPx2eQY0WzbRXFUhv05FZhAJfjAaldb+iODRpIviZtGuzPkBQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4V8Qc36ntKz19qK; Wed, 3 Apr 2024 00:29:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 4330TNQD088588; Wed, 3 Apr 2024 00:29:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4330TNM6088585; Wed, 3 Apr 2024 00:29:23 GMT (envelope-from git) Date: Wed, 3 Apr 2024 00:29:23 GMT Message-Id: <202404030029.4330TNM6088585@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Cy Schubert Subject: git: 0fb7c4a38c85 - stable/13 - hostapd: Work around lack of MLME support List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 0fb7c4a38c8527156b1d1eedd072787602a13c69 Auto-Submitted: auto-generated The branch stable/13 has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=0fb7c4a38c8527156b1d1eedd072787602a13c69 commit 0fb7c4a38c8527156b1d1eedd072787602a13c69 Author: Cy Schubert AuthorDate: 2024-02-27 03:34:09 +0000 Commit: Cy Schubert CommitDate: 2024-04-03 00:29:13 +0000 hostapd: Work around lack of MLME support hostap MLME uses Linux data structures and definitions not available in FreeBSD. The ability for hostapd to select the frequency (channel) depends Linux MLME, though strictly it's not required. Work around the Linux MLME requirement to configure device frequency. The detailed description is: hostapd will only set the channel (frequency) when Linux MLME is configured. Enabling NEED_AP_MLME will result in numerous build errors due do Linux data structures and definitions not available under FreeBSD. The code to set the frequency from the selected channel is only within the NEED_AP_MLME code path because without MLME, hostapd_get_hw_features() is an inline that always returns -1 whereas with MLME hostapd_get_hw_features() will obtain hardware features from the kernel. Until such time we simply set the frequency as configured. PR: 276375 (cherry picked from commit 84ed86380aeb566ffd8b957ba99c36ad345413ef) --- contrib/wpa/src/ap/hostapd.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/contrib/wpa/src/ap/hostapd.c b/contrib/wpa/src/ap/hostapd.c index 4b88641a2dde..a5cabc01f163 100644 --- a/contrib/wpa/src/ap/hostapd.c +++ b/contrib/wpa/src/ap/hostapd.c @@ -1698,6 +1698,20 @@ static int setup_interface2(struct hostapd_iface *iface) { iface->wait_channel_update = 0; +#ifdef __FreeBSD + /* XXX hostapd_get_hw_features() is an inline that always returns -1 + * because MLME will not build under FreeBSD due to its use of + * Linux definitions. Normally FreeBSD would uncondionally execute the + * "Not all drivers support..." block. Instead we #ifdef out the entire + * block of code instead of maintaining the fallacy that + * hostapd_get_hw_features() returns anything meaninful. + * + * Ideally WANT_AP_MLME should be taught about FreeBSD data structures + * and defintions. Instead we do this to enable channel selection in + * hostapd.conf. + */ + iface->freq = iface->conf->channel; +#else if (hostapd_get_hw_features(iface)) { /* Not all drivers support this yet, so continue without hw * feature data. */ @@ -1744,6 +1758,7 @@ static int setup_interface2(struct hostapd_iface *iface) if (iface->conf->ieee80211h) wpa_printf(MSG_DEBUG, "DFS support is enabled"); } +#endif return hostapd_setup_interface_complete(iface, 0); fail: From nobody Wed Apr 3 02:01:32 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4V8SfN4654z5GDH8; Wed, 3 Apr 2024 02:01: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 4V8SfN3BmRz4L6R; Wed, 3 Apr 2024 02:01:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712109692; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=K24V47JVRLuyhwDWkFce4JHkVsrWvEqi4h8L1II6sr0=; b=a5jI3Y/8vWRDCUP7CqEKVDRijnJwW+HZolGkc9jb8It1PBM9fHROKQHgOHb1bfhXpzPflJ Qw2f/0/dGWa4s2iJp04uxfDgZRuC0Gtcu/5KnD5m+4KJTlkz1RZ3wLS3zzjpVwF7D7StGH UtN7ixKgnWCHq4Y3mOEuaYnjqGh2nMFVT4yHk8KgqBQ+ylS9JgF1wanGubWgHPvfFkffea hnaTtdCtyTjd5XrMKqQ8j63fFLs8X5LSOPr5LzcDxkjfiEbVR/Ag+dkk693LXfxOtFxOsU TgBDMSsCU8gq8IwYhlolStZoxmAGpRMhII9VGHPtONx6QdFcmKUC5t45feyIEg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712109692; a=rsa-sha256; cv=none; b=p1Q6b6vsTWPSQVQ3Tqf+bISIvXEsWvsDYy7CHLKUZiFXZU4TNsXja840yAaX8aWv3h2Ot4 rPOrJDSJjcS3c9fQIwI4FwqBoL4bXvvFmPeZszy+aGUWydCDK5u0TAWUEgHcm0jA48LGa+ BDGYw9bjuDhYJ+OPrJATFf7FWxRjuqzci56E7H0nFUU9S83vxaO0v9Lw8S4d7GuIsYEWbn 8/Sm4VRXdS2mpimkSDWWYnm+ur5+B/42XRa+hpdLiW87lEGGPTgIMB24fLO1wU5X4/LgvD LPLtISixnp2x4CDyiL6fjnvaznMsYWnV54Q1GVTRSG3mIokDPcRWJh31byjMcw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712109692; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=K24V47JVRLuyhwDWkFce4JHkVsrWvEqi4h8L1II6sr0=; b=c7ekuElCCtUldqPLW05Xq+2mV7KV78y9ilQFHcTP1626fJgwqPN/K0j1zUNksRQXg5A7Pz 9M3x8/fs/9e+xBeavd4yvPGMhi04okbHvO5hw+Ot0dUyij1ryEqy/z/xYGylOFcHWdSFlw m+/XcnFzV+DwcY86cPil8sCV2B+iGm1Nrdfc5s+V9+/4LvTfW0yKnxbyecI7fRQyzxzpq7 xZkiLeej6WRtYGkwz+BV3+kuBQSLPv/DVNylsFuN86bGnVx9EnDLvt/BaL99YA8wOL5ZVs A7Hcplzhs0rTF+dH6CgOkI510Creex+C4XPi9qMC0M9b2ZMwUCLAdJ5io1dMEw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4V8SfN2pXXzDr6; Wed, 3 Apr 2024 02:01: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 43321WTg050691; Wed, 3 Apr 2024 02:01:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43321W9v050688; Wed, 3 Apr 2024 02:01:32 GMT (envelope-from git) Date: Wed, 3 Apr 2024 02:01:32 GMT Message-Id: <202404030201.43321W9v050688@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Lawrence Stewart Subject: git: 7eb92c502eb5 - main - Reinstate returning EOVERFLOW from stats_v1_blob_clone() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: lstewart X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7eb92c502eb503d808a51296e426de625239a0d9 Auto-Submitted: auto-generated The branch main has been updated by lstewart: URL: https://cgit.FreeBSD.org/src/commit/?id=7eb92c502eb503d808a51296e426de625239a0d9 commit 7eb92c502eb503d808a51296e426de625239a0d9 Author: Lawrence Stewart AuthorDate: 2024-04-02 06:34:25 +0000 Commit: Lawrence Stewart CommitDate: 2024-04-03 01:58:26 +0000 Reinstate returning EOVERFLOW from stats_v1_blob_clone() a0993376ec5f (from D43179) subtly changed stats_v1_blob_clone() to stop returning EOVERFLOW in the case where the user buffer is not large enough to receive the entire statsblob. This results in any consumers which are implemented to retry on receiving EOVERFLOW to instead give up after receiving an empty statsblob header. Fix by latching any errors recorded prior to copyout. Reviewed by: markj Obtained from: Netflix, Inc. MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D44585 Fixes: a0993376ec5f ("stats: Check for errors from copyout()") --- sys/kern/subr_stats.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/sys/kern/subr_stats.c b/sys/kern/subr_stats.c index 0f1b83a5783a..9fb8f8cbd74b 100644 --- a/sys/kern/subr_stats.c +++ b/sys/kern/subr_stats.c @@ -1078,9 +1078,9 @@ int stats_v1_blob_clone(struct statsblobv1 **dst, size_t dstmaxsz, struct statsblobv1 *src, uint32_t flags) { - int error; + int error, tmperror; - error = 0; + error = tmperror = 0; if (src == NULL || dst == NULL || src->cursz < sizeof(struct statsblob) || @@ -1131,14 +1131,16 @@ stats_v1_blob_clone(struct statsblobv1 **dst, size_t dstmaxsz, } #ifdef _KERNEL if (flags & SB_CLONE_USRDSTNOFAULT) - error = copyout_nofault(&(src->cursz), &((*dst)->cursz), + tmperror = copyout_nofault(&(src->cursz), &((*dst)->cursz), postcurszlen); else if (flags & SB_CLONE_USRDST) - error = copyout(&(src->cursz), &((*dst)->cursz), + tmperror = copyout(&(src->cursz), &((*dst)->cursz), postcurszlen); else #endif memcpy(&((*dst)->cursz), &(src->cursz), postcurszlen); + + error = error ? error : tmperror; } #ifdef _KERNEL out: From nobody Wed Apr 3 06:20:01 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4V8ZNd6zcvz5G6T8; Wed, 3 Apr 2024 06:20:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4V8ZNd6LnHz4gxM; Wed, 3 Apr 2024 06:20:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712125201; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zW/115B9DbVdster6edl58ZTBImAN+6EstcvU3Eo7rQ=; b=mtNySOc9ywXm0rxznQkb8/l9HqYlhO5VlARSffowyCbY8dOJoIsmWMIuEV3+g9AwDpvCzY c0xxF5xeRuqVYAho+VofIYvENWZiSCrB08gBDu70YpwiKShn6sRJJmihmYwYSat2VWCH4N leXK/UxV7JtSULZN9dSA/dSPwrMsdpKxTWtTGDqOE77w+jb3C29yl61QU/+Glu5TaqTvT4 qXaET52+ixGSwWexulTpE4L3WgrKsL+zW3SlsNJlMPhmMCY7AkpeJVwJWbbNGttMbfPONx teaBCnUQhOPVjfEvvQwAGSXhctX0RVCGp/0c8GaUohjxeQ48r/ntyXI/HJAvxg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712125201; a=rsa-sha256; cv=none; b=w+3Bty+mfKeo+cz6h8Slx8QTSNfhMzY5zyGy321oRLmydMJtiay5BP3T3C7vhAGHCy55sV QKE3fZJIwfBapE53XrnzLfym5q15S5fK1XeWnSetIPdlemj0FY/pLf1K6hL5Bp5Z8z7KsI wgAO5V/hPrBxnuLc1iDvOPkObMCQQrG7KpS6F0bffCQvOkB2dKhILF+ncHDW7002L50wT9 tze1n2N45L9nmbu3ie10rNMtXjD29j1s+TKKWIeELr1J2+rGmnT0COG5aEpvjnumDnjGg0 VYj7Uz8SW99lX21MG/f+ulcNkzHvSSVvGk87yCHZp5yf3sBHglZVgVkgILPVSw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712125201; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zW/115B9DbVdster6edl58ZTBImAN+6EstcvU3Eo7rQ=; b=TCCKDA+HQQ+HkF1kV7q9Hg5n7vKAO3omN5fWYWksCJki+PzMygFP2dmRdKdjlNBffu3xvY 2abGTr39LnrOg4Vue5gQaizHk+/jz8siLXXM9GRdIJZ851/SwiaOTRQ8yD6n+jbyP0FQDj mimaWK5z3uLdBVnpitr91PFCM++MzkKA+pYiEVCi4vPf/d3TQJRX8goLVytsLAmp/V3WEM 0FL1Rs3CDpKeiwAEhbab16GuHThl0SM0H0L4H2egWcK0SzrS5laWvrEF3XMEzGZN/PhoGU kCcEZadA0iiuqN9T0ulZ3lFrtpOC4BBTDr7YNwRC9xNaF0wj+XNGcvCWwCNncw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4V8ZNd5y8CzLg2; Wed, 3 Apr 2024 06:20: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 4336K1Au082357; Wed, 3 Apr 2024 06:20:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4336K1sm082352; Wed, 3 Apr 2024 06:20:01 GMT (envelope-from git) Date: Wed, 3 Apr 2024 06:20:01 GMT Message-Id: <202404030620.4336K1sm082352@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "David E. O'Brien" Subject: git: fde407464010 - main - Add SYSCTL_ADD_CONST_STRING(9) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: obrien X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fde4074640109356aee30d5984d19060d76ff5d8 Auto-Submitted: auto-generated The branch main has been updated by obrien: URL: https://cgit.FreeBSD.org/src/commit/?id=fde4074640109356aee30d5984d19060d76ff5d8 commit fde4074640109356aee30d5984d19060d76ff5d8 Author: David E. O'Brien AuthorDate: 2024-04-02 21:21:35 +0000 Commit: David E. O'Brien CommitDate: 2024-04-03 06:19:49 +0000 Add SYSCTL_ADD_CONST_STRING(9) Catch up with 10a1e981d (2019-03-19) so that one can do 'man SYSCTL_ADD_CONST_STRING' and not get "No manual entry for SYSCTL_ADD_CONST_STRING". Reviewed by: sjg --- share/man/man9/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/share/man/man9/Makefile b/share/man/man9/Makefile index 0d7cbf1b9854..b9fbc624d1ec 100644 --- a/share/man/man9/Makefile +++ b/share/man/man9/Makefile @@ -2161,6 +2161,7 @@ MLINKS+=syscall_helper_register.9 syscall_helper_unregister.9 \ syscall_helper_register.9 SYSCALL_INIT_HELPER_COMPAT_F.9 \ syscall_helper_register.9 SYSCALL_INIT_HELPER_F.9 MLINKS+=sysctl.9 SYSCTL_DECL.9 \ + sysctl.9 SYSCTL_ADD_CONST_STRING.9 \ sysctl.9 SYSCTL_ADD_INT.9 \ sysctl.9 SYSCTL_ADD_LONG.9 \ sysctl.9 SYSCTL_ADD_NODE.9 \ From nobody Wed Apr 3 06:25:26 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4V8ZVv1bdxz5G6yZ; Wed, 3 Apr 2024 06:25: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 4V8ZVv0hqbz4hkQ; Wed, 3 Apr 2024 06:25:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712125527; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oGZJ81AjUV4p+kAzy2pm+yoVoqeAAiDxN/3qcriwjAo=; b=DfPk7ptaciiyx9WgrL68ok2MKCyX19WgvyWgYq8ME+kIIPa9F3Gmb8ggdrf7E5us+1Mi2i orwKkm8WrREcI3O800RQHvwM2yrqWm05MOlAm8S05OuAH5PV5zEzlXPMqrQkyBjOuE0K+L Ks1/W9HNSrBsi8RO14cGwYexRujTcqTqmCb3aUVOfVE2AmiLrokFrdJ6tE4A43Q2f3brRm c38Cn7uyjXKmewTHxik9LQAsYGGuGRjHVF23yySL4wgzyew8vGBRTD+MU2VsYBuXVrlAfd Pcap6uK2atnfEUE9NguUdmPLFri7ZYMHISDUQU5NS+5kGkd5beazX7QClMx6FQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712125527; a=rsa-sha256; cv=none; b=GONl+ON4YG2RSLs7UYgooKVTnz6PNOq8/bRcqr9up/KvmrVRih6w0U7ulqk9nZNYTK1Grz 9Y7fkeY9evRxnUTpkwCmw5MyQlM5Y9TnCABqwUMctwOVU4++DgYUB42ZEgJ0774tf1OvsM h7Wf59VX0HkUW6MqTtSMtMLgFrWZTLEh+ywC0Dc8xOF2mVzUZuSW5ML8k/Xsj+yBixUUOz lGJjJ8U+VdpGVRNXYcS1HlDDgVNX+xP8skDfLMJhkIyDiWYQk31vcpEhTj2DcCU60cil8S xIa/ClRUVqRSjDew1IN3LxnQbM8vrjJPbZEtJQta8VuQ6Cc3ruAKUxD/b6o1Tw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712125527; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oGZJ81AjUV4p+kAzy2pm+yoVoqeAAiDxN/3qcriwjAo=; b=V+7brZ03V0Ys2Cqsq1ceA2noKSeQfdyj6gXywVeK7cWNtDrZWoFHHxJYysj/dUzPrk8G5w pPsX/GzTwmgQXMrWFRm4I/QSN6tCRgJ3PFA4urj4CsFXBsOI6Bejt4DWMOCBICQcV967Ox FW5acB0q+ltxoSxzgT4JVP30Nj0QzpxkjtZFD6y/6aPwsSPJlWA/ixBrqPUVumdZ5o82gu rQcdxwOQ8hXGnZ/yLw9ZH/1DH7fReSZj2GBKJNMZ4Fz9P/tFrBnh+67PJfeZt9Jlh6/R3i m5HhUgCDT9AyXQeyUrTqPy4Q5sTJ9KJCpFUHSCUCsHMcbv5Uj9zNaOMhW3srLQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4V8ZVv0BcpzLsg; Wed, 3 Apr 2024 06:25: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 4336PQKe096579; Wed, 3 Apr 2024 06:25:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4336PQ9u096576; Wed, 3 Apr 2024 06:25:26 GMT (envelope-from git) Date: Wed, 3 Apr 2024 06:25:26 GMT Message-Id: <202404030625.4336PQ9u096576@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: 41d9d301fbd0 - stable/14 - kern linker: Make linker_file_add_dependency() void List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 41d9d301fbd091eee159d8e6d70b60ff7d67c349 Auto-Submitted: auto-generated The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=41d9d301fbd091eee159d8e6d70b60ff7d67c349 commit 41d9d301fbd091eee159d8e6d70b60ff7d67c349 Author: Zhenlei Huang AuthorDate: 2024-03-27 04:02:32 +0000 Commit: Zhenlei Huang CommitDate: 2024-04-03 06:15:15 +0000 kern linker: Make linker_file_add_dependency() void The only possible return value has been zero since cee9542d51f0. No functional change intended. Reviewed by: dfr MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D44507 (cherry picked from commit 1c7307cf6763a295ea9896be9f197d40511c77ed) --- sys/kern/kern_linker.c | 30 ++++++++---------------------- 1 file changed, 8 insertions(+), 22 deletions(-) diff --git a/sys/kern/kern_linker.c b/sys/kern/kern_linker.c index 6ac2e694a4cf..2b220295f78e 100644 --- a/sys/kern/kern_linker.c +++ b/sys/kern/kern_linker.c @@ -144,7 +144,7 @@ struct modlist { typedef struct modlist *modlist_t; static modlisthead_t found_modules; -static int linker_file_add_dependency(linker_file_t file, +static void linker_file_add_dependency(linker_file_t file, linker_file_t dep); static caddr_t linker_file_lookup_symbol_internal(linker_file_t file, const char* name, int deps); @@ -779,7 +779,7 @@ linker_ctf_get(linker_file_t file, linker_ctf_t *lc) return (LINKER_CTF_GET(file, lc)); } -static int +static void linker_file_add_dependency(linker_file_t file, linker_file_t dep) { linker_file_t *newdeps; @@ -792,7 +792,6 @@ linker_file_add_dependency(linker_file_t file, linker_file_t dep) KLD_DPF(FILE, ("linker_file_add_dependency:" " adding %s as dependency for %s\n", dep->filename, file->filename)); - return (0); } /* @@ -1721,10 +1720,7 @@ restart: TAILQ_FOREACH_SAFE(lf, &depended_files, loaded, nlf) { if (linker_kernel_file) { linker_kernel_file->refs++; - error = linker_file_add_dependency(lf, - linker_kernel_file); - if (error) - panic("cannot add dependency"); + linker_file_add_dependency(lf, linker_kernel_file); } error = linker_file_lookup_set(lf, MDT_SETNAME, &start, &stop, NULL); @@ -1746,10 +1742,7 @@ restart: if (lf == mod->container) continue; mod->container->refs++; - error = linker_file_add_dependency(lf, - mod->container); - if (error) - panic("cannot add dependency"); + linker_file_add_dependency(lf, mod->container); } } /* @@ -2212,11 +2205,8 @@ linker_load_module(const char *kldname, const char *modname, error = ENOENT; break; } - if (parent) { - error = linker_file_add_dependency(parent, lfdep); - if (error) - break; - } + if (parent) + linker_file_add_dependency(parent, lfdep); if (lfpp) *lfpp = lfdep; } while (0); @@ -2245,9 +2235,7 @@ linker_load_dependencies(linker_file_t lf) sx_assert(&kld_sx, SA_XLOCKED); if (linker_kernel_file) { linker_kernel_file->refs++; - error = linker_file_add_dependency(lf, linker_kernel_file); - if (error) - return (error); + linker_file_add_dependency(lf, linker_kernel_file); } if (linker_file_lookup_set(lf, MDT_SETNAME, &start, &stop, NULL) != 0) @@ -2288,9 +2276,7 @@ linker_load_dependencies(linker_file_t lf) if (mod) { /* woohoo, it's loaded already */ lfdep = mod->container; lfdep->refs++; - error = linker_file_add_dependency(lf, lfdep); - if (error) - break; + linker_file_add_dependency(lf, lfdep); continue; } error = linker_load_module(NULL, modname, lf, verinfo, NULL); From nobody Wed Apr 3 06:26:55 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4V8ZXb4p85z5G74C; Wed, 3 Apr 2024 06:26: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 4V8ZXb4F9cz4hws; Wed, 3 Apr 2024 06:26:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712125615; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=O8F5MeYejUlXSHEG1/UpeVsk9+CBim1w3blk7AEtsdA=; b=utoFTSSSMFRAo4yRcyPqPwxpDBdsKtDUArHHv9JuJhiAHlK1CAFOgDbuL7VPoz34tnSHJX tToTzQRNZrhtAihY+1vDEWz5ZNrmSk59l4QvNi3J1dx7TMsChfoXUm3PpiUwEb0mug4ADv KXiNTs2Ed+nyaJRxXpW9IX9Iwk6Z8VSZXzHMD3rul1B2zTlBywTGo0WGvWXP8t8V+6f+iF uY8LSEBtMer6VFHpJiCo5G6ivXCc5vchOZvObSRiw57c/U0h2bq2Yc5xFayDtkCLS/hZyY 7gmwfxmldgOxUBqJR2kIlb6O0sGESoLVtxwng23JSCge2PY2aetoQFmNXv2mgg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712125615; a=rsa-sha256; cv=none; b=BKjFeZlXCMqoT0OJL2ISpy5DPgR+hrJ/+INgouxrm6YfhMvtAMUPOSXllx623rbpDoe6Xr ZOKIrkcu18v9jGeThkWsMyn1iht2Nn2cbw+qLEYmKnlVeK3xooTCUZ4TPKCq8xHbX4Vc39 eaBYxgxXU2di+NOFUx9d7+EHqS9ESDtM/pnERv4o9meHCar5C/1xZxDaoytN3R6Oo9EsCO 4C2UeUFQVUs8kh4knZSWsHnuYEomfKWHM5c2IU3DPvxKrWgPGxKm3qswbIoidi8L7/hHXc tdfv5wPwaC2HoozyHMP79y5455VTSHOnZWNpYxol90iHbqr/pokDu9IomYlsgA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712125615; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=O8F5MeYejUlXSHEG1/UpeVsk9+CBim1w3blk7AEtsdA=; b=f9JRyIl6EHcGELtiRhVlUyDmLmbMS/0yFTDnMb1XDQ+5i8xJpGxOjMynikR1y/HiWgplh8 q29WBEeWjLGPPEwCqv2+4NWz4uClj99JnClSEdikg351h6lg+2gbw33UVv7WKr1g6dQgut GhlbWRcNh0OckkCQNUlRNFGtZXI7gjAgNTEnLhDpY1+9fUBeGJb7Ny7QDgP8cdZl7kwN3z oo0XF2XITeZaTCYgx4v4Jwx1b+aZ+TRAo4/aOZmMMN2G+ebRWxoKD/kS4ouxBKjpJ1HvLD a8irldMVf9GZZN05WTWg14xa7IKygz0VkrrzZ2BMaCpPMmFiMtMLWC1mmX3TBQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4V8ZXb3rw8zMV4; Wed, 3 Apr 2024 06:26: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 4336QtWm097080; Wed, 3 Apr 2024 06:26:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4336QtHE097077; Wed, 3 Apr 2024 06:26:55 GMT (envelope-from git) Date: Wed, 3 Apr 2024 06:26:55 GMT Message-Id: <202404030626.4336QtHE097077@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "David E. O'Brien" Subject: git: 6e77fccf3445 - main - SYSCTL_ADD_CONST_STRING(9): HISTORY List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: obrien X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6e77fccf3445760d44ce132c9fc35d4a2f25ec0e Auto-Submitted: auto-generated The branch main has been updated by obrien: URL: https://cgit.FreeBSD.org/src/commit/?id=6e77fccf3445760d44ce132c9fc35d4a2f25ec0e commit 6e77fccf3445760d44ce132c9fc35d4a2f25ec0e Author: David E. O'Brien AuthorDate: 2024-04-03 06:25:39 +0000 Commit: David E. O'Brien CommitDate: 2024-04-03 06:25:39 +0000 SYSCTL_ADD_CONST_STRING(9): HISTORY Add information of where one may use this API. --- share/man/man9/sysctl.9 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/share/man/man9/sysctl.9 b/share/man/man9/sysctl.9 index 2a4370a5d67c..8c4ee71c96c6 100644 --- a/share/man/man9/sysctl.9 +++ b/share/man/man9/sysctl.9 @@ -1058,6 +1058,9 @@ The .Xr sysctl 8 utility first appeared in .Bx 4.4 . +.Nm SYSCTL_ADD_CONST_STRING +first appeared in +.Fx 12.1 . .Sh AUTHORS .An -nosplit The From nobody Wed Apr 3 06:39:07 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4V8Zph0nxsz5G8HM; Wed, 3 Apr 2024 06:39:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4V8Zph05J7z4jvh; Wed, 3 Apr 2024 06:39:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712126348; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hL4EEI0iC7/vpk4bVnlN9CasVFKAMP/2ciC2JSKQA3g=; b=eZRD/jH5YLjaMKvgvBjR9dz/vprhIR6BD9TtMDeiYX3a1haCQQsushzyyPsm35ngb/w4N5 gHHu5PSXAlr3jSYlCz2uq9Wmzy2BwiBRmHasMimjd5Xp3Ow2bfK2Y7Py+7kV2RG+jsJG9O HScmadc557CVf0atRUUVdtd+rxySflXBy3djk7KgUQMzKlgiH+T4wDaLtAOlX/2zSrl76S +10mJ2lrVMF1IEIJqIKJt72GxDkju/pktH+V4tDvEwvTLwjO74Ox0qG0qiG/V1oMf+5hUW DSiHO5wHPuWRKelN2NvCiX93z9x1l+/7QPxeN8tkkEdVFEFxPyGE2K3oIflKTA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712126348; a=rsa-sha256; cv=none; b=E0q8g/tMdofWZK0qToCAmSbIFt30lWNxQiU+/msDAuFrOhI9ONC+mtfAsZTTmyiMl5av+B hEclb4wHaAdVSToSQfajj6deCbjfWpkAGYFrhuUjuEULn0v+BuTF5tBY0s/7lNzjAAb7Oe UvWjX0q1bxYVudWSZ+M+dU6Jlkz2JyuBwAee8WecrgSZk1I8U+VvC2DjsFMy7YAk4WuuDP DERwKBvRtgRyfln7/94tOkZcDLemY5uCYYluv4AgYLr4/xUMGS63FrxGm1yhb6dDHnzbWN aZb0z4I2WgE5dl1xSoFRYgtrjYrA6B2zcwJOQlQd2WNrhKYr5WR+X2rASWaLEw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712126348; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hL4EEI0iC7/vpk4bVnlN9CasVFKAMP/2ciC2JSKQA3g=; b=FVPrUy15hORcn2fCPyWS+RQS/TCozIoG+wM5GZU7cHv/YzW4S6/Zogvr8tbls+fIfI/r7m cp4zNaV5dYgQL9kT8ZKP3/v5e7spGH/Erh+8NNfEZ+OpLyv+PBAHClUq1q017cHJtBb2gZ wLm7ilchb3UkpscVzLlpCJzb3f+C15JbDco1JIIWn14WV382ndSX7dJd3LjRfUFf+YTSLg /4u1j09GXmc/pk2pUr1tYbymQzl0FfN1PqVUEEI5FlGVTDIxZz5hDmZIGUSiS/9lxAgEV1 lm8FWhYQuhumaWHsPKLUBJ4LmMP4+Mr9KiHAzO4wnItAyo+e1DmZV9ngmFxkWA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4V8Zpg6hq1zMX5; Wed, 3 Apr 2024 06:39: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 4336d7fm013779; Wed, 3 Apr 2024 06:39:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4336d7Xu013776; Wed, 3 Apr 2024 06:39:07 GMT (envelope-from git) Date: Wed, 3 Apr 2024 06:39:07 GMT Message-Id: <202404030639.4336d7Xu013776@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: 223077d0a847 - stable/13 - kern linker: Make linker_file_add_dependency() void List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 223077d0a847509a14102719e04f2ae0666461f8 Auto-Submitted: auto-generated The branch stable/13 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=223077d0a847509a14102719e04f2ae0666461f8 commit 223077d0a847509a14102719e04f2ae0666461f8 Author: Zhenlei Huang AuthorDate: 2024-03-27 04:02:32 +0000 Commit: Zhenlei Huang CommitDate: 2024-04-03 06:26:57 +0000 kern linker: Make linker_file_add_dependency() void The only possible return value has been zero since cee9542d51f0. No functional change intended. Reviewed by: dfr MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D44507 (cherry picked from commit 1c7307cf6763a295ea9896be9f197d40511c77ed) (cherry picked from commit 41d9d301fbd091eee159d8e6d70b60ff7d67c349) --- sys/kern/kern_linker.c | 30 ++++++++---------------------- 1 file changed, 8 insertions(+), 22 deletions(-) diff --git a/sys/kern/kern_linker.c b/sys/kern/kern_linker.c index 87354e47d002..bc2f477997e0 100644 --- a/sys/kern/kern_linker.c +++ b/sys/kern/kern_linker.c @@ -143,7 +143,7 @@ struct modlist { typedef struct modlist *modlist_t; static modlisthead_t found_modules; -static int linker_file_add_dependency(linker_file_t file, +static void linker_file_add_dependency(linker_file_t file, linker_file_t dep); static caddr_t linker_file_lookup_symbol_internal(linker_file_t file, const char* name, int deps); @@ -764,7 +764,7 @@ linker_ctf_get(linker_file_t file, linker_ctf_t *lc) return (LINKER_CTF_GET(file, lc)); } -static int +static void linker_file_add_dependency(linker_file_t file, linker_file_t dep) { linker_file_t *newdeps; @@ -777,7 +777,6 @@ linker_file_add_dependency(linker_file_t file, linker_file_t dep) KLD_DPF(FILE, ("linker_file_add_dependency:" " adding %s as dependency for %s\n", dep->filename, file->filename)); - return (0); } /* @@ -1706,10 +1705,7 @@ restart: TAILQ_FOREACH_SAFE(lf, &depended_files, loaded, nlf) { if (linker_kernel_file) { linker_kernel_file->refs++; - error = linker_file_add_dependency(lf, - linker_kernel_file); - if (error) - panic("cannot add dependency"); + linker_file_add_dependency(lf, linker_kernel_file); } error = linker_file_lookup_set(lf, MDT_SETNAME, &start, &stop, NULL); @@ -1731,10 +1727,7 @@ restart: if (lf == mod->container) continue; mod->container->refs++; - error = linker_file_add_dependency(lf, - mod->container); - if (error) - panic("cannot add dependency"); + linker_file_add_dependency(lf, mod->container); } } /* @@ -2197,11 +2190,8 @@ linker_load_module(const char *kldname, const char *modname, error = ENOENT; break; } - if (parent) { - error = linker_file_add_dependency(parent, lfdep); - if (error) - break; - } + if (parent) + linker_file_add_dependency(parent, lfdep); if (lfpp) *lfpp = lfdep; } while (0); @@ -2230,9 +2220,7 @@ linker_load_dependencies(linker_file_t lf) sx_assert(&kld_sx, SA_XLOCKED); if (linker_kernel_file) { linker_kernel_file->refs++; - error = linker_file_add_dependency(lf, linker_kernel_file); - if (error) - return (error); + linker_file_add_dependency(lf, linker_kernel_file); } if (linker_file_lookup_set(lf, MDT_SETNAME, &start, &stop, NULL) != 0) @@ -2273,9 +2261,7 @@ linker_load_dependencies(linker_file_t lf) if (mod) { /* woohoo, it's loaded already */ lfdep = mod->container; lfdep->refs++; - error = linker_file_add_dependency(lf, lfdep); - if (error) - break; + linker_file_add_dependency(lf, lfdep); continue; } error = linker_load_module(NULL, modname, lf, verinfo, NULL); From nobody Wed Apr 3 09:59:33 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4V8gFy1z0sz5GSsg; Wed, 3 Apr 2024 09:59:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4V8gFx5d59z45Ys; Wed, 3 Apr 2024 09:59:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712138373; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=grkLCKtSiawLGUkJqqjSukpSR1aLH0CD62ClqUQS6Lg=; b=vOCHZydw6TmP7V2EtHHY0YETfb3W3zMjZ0c2b44IpRQeWv69W90+MVw9UKN/xHU8vMWYEc Bmlzh6BEg6GBJnBSHKEuIaxvxys8mRWivEp2aEpou5gocy7343CQY+q07xA4qXY+G1XC3X oHPHWGJtsN4GBK3IRTmRFNy3mm3bhBeCHM3uP2EZGS/2eOlpt8BfBA3NoSZNZgK2eU6sy7 buLf0K84x12x75nO+1nNJd9fkf8Smf+yNTb1TDUdpkRvJcE2R5YHG5oTmKfK7BX78rHHdp 7dZrttJkoBr7e7PrXRSraAo05lsFMZhu6bjjwUJivJD1WhjmqGmDszI/cQVpAw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712138373; a=rsa-sha256; cv=none; b=hCE4u+s+eKOTG2zJ1nc4soAlMY+jeR+tA4wGg2zDj0qG8jF9wg0bsBEF8c0vIUxwo/zWjQ dvTz/Xy0xu+Z4/RyBwcEtBcQk1IIRpC+2dGSLJR9vgVQwDNczybM44HUypGTuc2jF8+eaD LpJ6b9Da5mCJXXLHAHYO7eBGrwd5qe8n+2zAJWWVgDi1cbiEBaHuKatMugUrQsDhPwUQ9L ehcr5/MrolSGgoXPJwJVpToyH5dMA9n6Aunyfz5UbWBnFSxK1EQzuLxbC4w/wl6+ZvIm1W 45/vZH3ua/a7gG/ySFq4xQJO7+L6Wm9zkXdjUcPKuDcAE2UikRY6SZrskI+A7Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712138373; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=grkLCKtSiawLGUkJqqjSukpSR1aLH0CD62ClqUQS6Lg=; b=Qrn/RrxuhGS2d0uxhWiHvM7kJYl0OZmBfH/CeamNW9OMvLys1nLogyKDT3NEm2MXIw+4Ir KcD+KMUwjVYnTgRxGzV7lrVu9ownd8aYmNkgTubSUPlS9mcw44LZ/EocyPoJL9x6U0UrIX ZYPY9XbYjBf734EBZoLyY25ebiBZJD1YmFAzm4VzamAx3R5V1x8NcHIxGh6CGnp9TzXWpz oBrY3HmtNcve8gRMnqNpUxhhw3l86o0Hh38qyqfnKif9F/HzyfFwha9x4ZpZF2x+LFnJZn 22uTj5V/hjsF+do9sHQxBKPWFPkJQYtBXfBp7DXoOD3VacbyX9G5uldPavSqkg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4V8gFx56xyzS5f; Wed, 3 Apr 2024 09:59:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 4339xXHu052942; Wed, 3 Apr 2024 09:59:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4339xXOw052940; Wed, 3 Apr 2024 09:59:33 GMT (envelope-from git) Date: Wed, 3 Apr 2024 09:59:33 GMT Message-Id: <202404030959.4339xXOw052940@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: b1fd95c9e247 - main - tarfs: Support paths that spill into exthdrs. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b1fd95c9e24791d44593e611406b41e57826a5b8 Auto-Submitted: auto-generated The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=b1fd95c9e24791d44593e611406b41e57826a5b8 commit b1fd95c9e24791d44593e611406b41e57826a5b8 Author: Dag-Erling Smørgrav AuthorDate: 2024-04-03 09:55:01 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2024-04-03 09:55:01 +0000 tarfs: Support paths that spill into exthdrs. MFC after: 3 days Sponsored by: Juniper Networks, Inc. Sponsored by: Klara, Inc. Reviewed by: kevans Differential Revision: https://reviews.freebsd.org/D44599 --- sys/fs/tarfs/tarfs_vfsops.c | 7 +++++- tests/sys/fs/tarfs/tarfs_test.sh | 50 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 56 insertions(+), 1 deletion(-) diff --git a/sys/fs/tarfs/tarfs_vfsops.c b/sys/fs/tarfs/tarfs_vfsops.c index d1af7070e706..df657fb13414 100644 --- a/sys/fs/tarfs/tarfs_vfsops.c +++ b/sys/fs/tarfs/tarfs_vfsops.c @@ -614,7 +614,10 @@ again: value = sep + 1; TARFS_DPF(ALLOC, "%s: exthdr %s=%s\n", __func__, key, value); - if (strcmp(key, "linkpath") == 0) { + if (strcmp(key, "path") == 0) { + name = value; + namelen = eol - value; + } else if (strcmp(key, "linkpath") == 0) { link = value; linklen = eol - value; } else if (strcmp(key, "GNU.sparse.major") == 0) { @@ -905,6 +908,8 @@ tarfs_alloc_mount(struct mount *mp, struct vnode *vp, blknum = 0; do { if ((error = tarfs_alloc_one(tmp, &blknum)) != 0) { + printf("unsupported or corrupt tar file at %zu\n", + TARFS_BLOCKSIZE * blknum); goto bad; } } while (blknum != TAR_EOF); diff --git a/tests/sys/fs/tarfs/tarfs_test.sh b/tests/sys/fs/tarfs/tarfs_test.sh index 2a5dfc434201..5d3fbca2f4ee 100644 --- a/tests/sys/fs/tarfs/tarfs_test.sh +++ b/tests/sys/fs/tarfs/tarfs_test.sh @@ -309,6 +309,54 @@ tarfs_checksum_cleanup() { tarfs_cleanup } +atf_test_case tarfs_long_names cleanup +tarfs_long_names_head() { + atf_set "descr" "Verify that tarfs supports long file names" + atf_set "require.user" "root" +} +tarfs_long_names_body() { + tarfs_setup + local a b c d e + a="aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" + b="bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb" + c="cccccccccccccccccccccccccccccccccccccccc" + d="dddddddddddddddddddddddddddddddddddddddd" + e="eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee" + mkdir -p "${a}" + touch "${a}/${b}_${c}_${d}_${e}_foo" + ln "${a}/${b}_${c}_${d}_${e}_foo" "${a}/${b}_${c}_${d}_${e}_bar" + ln -s "${b}_${c}_${d}_${e}_bar" "${a}/${b}_${c}_${d}_${e}_baz" + tar -cf tarfs_long_names.tar "${a}" + atf_check mount -rt tarfs tarfs_long_names.tar "${mnt}" +} +tarfs_long_names_cleanup() { + tarfs_cleanup +} + +atf_test_case tarfs_long_paths cleanup +tarfs_long_paths_head() { + atf_set "descr" "Verify that tarfs supports long paths" + atf_set "require.user" "root" +} +tarfs_long_paths_body() { + tarfs_setup + local a b c d e + a="aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" + b="bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb" + c="cccccccccccccccccccccccccccccccccccccccc" + d="dddddddddddddddddddddddddddddddddddddddd" + e="eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee" + mkdir -p "${a}/${b}/${c}/${d}/${e}" + touch "${a}/${b}/${c}/${d}/${e}/foo" + ln "${a}/${b}/${c}/${d}/${e}/foo" "${a}/${b}/${c}/${d}/${e}/bar" + ln -s "${b}/${c}/${d}/${e}/bar" "${a}/baz" + tar -cf tarfs_long_paths.tar "${a}" + atf_check mount -rt tarfs tarfs_long_paths.tar "${mnt}" +} +tarfs_long_paths_cleanup() { + tarfs_cleanup +} + atf_init_test_cases() { atf_add_test_case tarfs_basic atf_add_test_case tarfs_basic_gnu @@ -324,4 +372,6 @@ atf_init_test_cases() { atf_add_test_case tarfs_linktodir atf_add_test_case tarfs_linktononexistent atf_add_test_case tarfs_checksum + atf_add_test_case tarfs_long_names + atf_add_test_case tarfs_long_paths } From nobody Wed Apr 3 09:59:34 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4V8gFz16CCz5GT1c; Wed, 3 Apr 2024 09:59:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4V8gFy6CgFz45Yt; Wed, 3 Apr 2024 09:59:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712138374; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cTlvFaABIJq0ArGLJ491jTu+YRSiWk7iLKiaSXlqgYI=; b=Asrr6LdFFhupoCAIsDoacX1TfjYAG8EfhdZFdpuipp/aKi9PJ0aPhPiqIsmfPFFhJYoz+v wGLWP99Ko4MaPVpOY7uvZQuONo0BXvoJgaYspjbYJxjygqhrG+H11w1J5HkPh9Dyu84k/M 06s7ENs1/nlzhukLjPPnyNyGM6WA7hWAo0ApveU/FCXUiLkEBg/phqVF/NXjqvG9pFyVK+ aMY9gxxj2ylYoTJfk4l/vCx8iLjHq+/FINZxRdEXWj30Q5oDJNQ6j9L3H+1eklwCM3WQqR PkoepZTs/vYnsOqTFg0WC9BhujRrWi1xJUpxvjTFLTVqoAamsEc1hD1x8jjFtg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712138374; a=rsa-sha256; cv=none; b=Yu2m1Dlq99vshaUa1PzZHQwGOAy0Pcx8sQzLnOTo2UX/U53hn/5LSjnHIOHx9jg9hxW/TH Zg8WdrLNlF5q9591XMUoKm9Svexn9FxEd+LlRc3MI3ol8JxcForilYA+SQ1mCPXXLPjHrk eaoFFbpLMCqb59qzFPYVSwdJ6W0k2d3s/DiVpJfJ+xcuz+8II+r/V8olRaRsgc3zlKHgZk NftZGQEPCYDw1Ruf+iKQuD5ol0KCFggbW6JQgmJ8hStBzf3dllvp1rChlMOJVxWqSt89G7 Gr703EDV7VXnNPlmZB1fjMxOpQSckd0niDcDQXLpXh5E2xmT8LUHKlM/Wwy77g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712138374; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cTlvFaABIJq0ArGLJ491jTu+YRSiWk7iLKiaSXlqgYI=; b=uFPQOT+u5D1+MXqboVV3STcshM43Ou8DWdJF7i9FcdNCrGVpiWfR0CM1jpMjf+0mOnIdqN xSuXjS5RbVCfSaOAU9vB7PMakRm96RvG1olPtqPbig1WKGhBKdNnHxUAC8zxddqjrYvjpt J+Z0oVjgZ0OolEo88lQm+ps7An8q3OX43768b+iz5323qGP9jHLdeX0vdkdhA4lGNfP1hm pwkG55p0xr5l8n2b4pQkRl8Ueozcmk1XvkITAg5Sz28/4S2gCP1mi+oUskq3RiJs3iyHwl ZJOmsTYkTpwlcqJx6iEnQHi8YVp54I80h5f5R42oprWy8BfUNaXXJ8J86wLYIA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4V8gFy5qhqzSmx; Wed, 3 Apr 2024 09:59:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 4339xYpv052997; Wed, 3 Apr 2024 09:59:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4339xYcM052994; Wed, 3 Apr 2024 09:59:34 GMT (envelope-from git) Date: Wed, 3 Apr 2024 09:59:34 GMT Message-Id: <202404030959.4339xYcM052994@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: 584e1c355ae3 - main - tarfs: Ignore global extended headers. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 584e1c355ae3c994331005b7196cc87a714e5317 Auto-Submitted: auto-generated The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=584e1c355ae3c994331005b7196cc87a714e5317 commit 584e1c355ae3c994331005b7196cc87a714e5317 Author: Dag-Erling Smørgrav AuthorDate: 2024-04-03 09:55:06 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2024-04-03 09:55:06 +0000 tarfs: Ignore global extended headers. Previously, we would error out if we encountered a global extended header, because we don't know what it means. This doesn't really matter though, and traditionally, tar implementations have either ignored them or treated them as plain files, so just ignore them. This allows tarfs to mount tar files created by `git archive`. MFC after: 3 days Sponsored by: Juniper Networks, Inc. Sponsored by: Klara, Inc. Reviewed by: kevans Differential Revision: https://reviews.freebsd.org/D44600 --- sys/fs/tarfs/tarfs_vfsops.c | 13 +++++++------ tests/sys/fs/tarfs/tarfs_test.sh | 24 ++++++++++++++++++++++++ 2 files changed, 31 insertions(+), 6 deletions(-) diff --git a/sys/fs/tarfs/tarfs_vfsops.c b/sys/fs/tarfs/tarfs_vfsops.c index df657fb13414..cbc3d88eaad8 100644 --- a/sys/fs/tarfs/tarfs_vfsops.c +++ b/sys/fs/tarfs/tarfs_vfsops.c @@ -553,13 +553,14 @@ again: TARFS_DPF(ALLOC, "%s: [%c] %zu @%jd %o %d:%d\n", __func__, hdrp->typeflag[0], sz, (intmax_t)mtime, mode, uid, gid); - /* extended header? */ + /* global extended header? */ if (hdrp->typeflag[0] == TAR_TYPE_GLOBAL_EXTHDR) { - printf("%s: unsupported global extended header at %zu\n", - __func__, (size_t)(TARFS_BLOCKSIZE * (blknum - 1))); - error = EFTYPE; - goto bad; + TARFS_DPF(ALLOC, "%s: %zu-byte global extended header at %zu\n", + __func__, sz, TARFS_BLOCKSIZE * (blknum - 1)); + goto skip; } + + /* extended header? */ if (hdrp->typeflag[0] == TAR_TYPE_EXTHDR) { if (exthdr != NULL) { TARFS_DPF(IO, "%s: multiple extended headers at %zu\n", @@ -568,7 +569,7 @@ again: goto bad; } /* read the contents of the exthdr */ - TARFS_DPF(ALLOC, "%s: %zu-byte extended header at %zd\n", + TARFS_DPF(ALLOC, "%s: %zu-byte extended header at %zu\n", __func__, sz, TARFS_BLOCKSIZE * (blknum - 1)); exthdr = malloc(sz, M_TEMP, M_WAITOK); res = tarfs_io_read_buf(tmp, false, exthdr, diff --git a/tests/sys/fs/tarfs/tarfs_test.sh b/tests/sys/fs/tarfs/tarfs_test.sh index 5d3fbca2f4ee..f1322033fbad 100644 --- a/tests/sys/fs/tarfs/tarfs_test.sh +++ b/tests/sys/fs/tarfs/tarfs_test.sh @@ -357,6 +357,29 @@ tarfs_long_paths_cleanup() { tarfs_cleanup } +atf_test_case tarfs_git_archive cleanup +tarfs_git_archive_head() { + atf_set "descr" "Verify that tarfs supports archives created by git" + atf_set "require.user" "root" + atf_set "require.progs" "git" +} +tarfs_git_archive_body() { + tarfs_setup + mkdir foo + echo "Hello, world!" >foo/bar + git -C foo init --initial-branch=tarfs + git -C foo config user.name "File System" + git -C foo config user.email fs@freebsd.org + git -C foo add bar + git -C foo commit -m bar + git -C foo archive --output=../tarfs_git_archive.tar HEAD + atf_check mount -rt tarfs tarfs_git_archive.tar "${mnt}" + atf_check -o file:foo/bar cat "${mnt}"/bar +} +tarfs_git_archive_cleanup() { + tarfs_cleanup +} + atf_init_test_cases() { atf_add_test_case tarfs_basic atf_add_test_case tarfs_basic_gnu @@ -374,4 +397,5 @@ atf_init_test_cases() { atf_add_test_case tarfs_checksum atf_add_test_case tarfs_long_names atf_add_test_case tarfs_long_paths + atf_add_test_case tarfs_git_archive } From nobody Wed Apr 3 13:07:12 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4V8lQS5bKjz5Gmhb; Wed, 3 Apr 2024 13: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 4V8lQS52ysz4RfG; Wed, 3 Apr 2024 13:07:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712149632; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xaF3Dnpnc2/toOQgacquvzKIuMxSKFhqrYd0LVpeu2o=; b=UnuRO4KS61pTGYQeBzPMfehq9otQqhlmzdGfLdeUih43aWu7f6VQ8YI+v+2784BFlFavzT JwH8RIZtre5ziA/Rkgpsyqf7AgGUCJgIa46qDOhrpz0sQy6R2fIUlNwZH7Ae9DBKBrbHn4 XT+5Y8tZeMQTLBIkUJxt6Gq1kSazy8XJBjMs7THHOKETVt00mm8RQaCFQ0oWlKMgAjrtGt oJ/oPMy3ZFla2Ckhj1OOmtwLv1pjeKCVQW77P3WaAVCS2aAoveiXe82Ih+tEcbNuWrYMl/ TY2lDPiFua9Jj2A/BkrargE9Q/DUl/P2ijJiumhl51AJKvUdtX862G2I9xjo7A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712149632; a=rsa-sha256; cv=none; b=jlQzfHPbAaOwsFeb8fvP8x39EEdgABQZc9DwMIdVGzCkj1ppVX3qhxPmzIsi1pLwwoHK/P bh4MnB5zTSFDWWw/145Vh8LzCkNY/oef4zjFET7sjtDQFi2YSst89C3tlKMLVQAN2JKznK IN0HEeDnmZCMzIBUU89OIQOUngqolfX+gLoHf1UpU3zn/nIZt76uF589VozFCwXYCbGd0l 7ghbhec1YJoTaP9FX7zlIZF70pG2ruwBaCNesGy5sx9skL9Q+6ojzLe+plo5Ga5/tsy9PU jGPP4zspB4alg9j0NQuPalOAR2wBDMeA8o5KE4Trwxtl1TWuxTxamXxpMIka7g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712149632; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xaF3Dnpnc2/toOQgacquvzKIuMxSKFhqrYd0LVpeu2o=; b=sLFNiDqU9n/dXzaXKwxV13EaNoSNuJDmJ0w8j3zMWKrZnM75jYz0rsYcXMfKMeoTG0juYm 6FjMb9bZc14OkxrclDCNdg0TWgFrUboHj6UniXQ6IFCEiIVfglaHR1BUEESk0WZ2E/ImUj OB4Hulf/cF7rr9WhIVhercAhH/r2Dv/rmALvKgCsROrelF2mmjqFkofUEv+qyAxfBf+8hZ RF1azzF1rxgdgZO+DxXRZMye3JfXmPuCn0tb2CsugQSHEf7kRcL12SCJEjdejp6z+fW2TP vDre36bCfQ+ekJeGTd3buTABC0BZeFp6iWbTCYXkc1nIMrxnWvjGbYsmBpF2ZA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4V8lQS4ZtyzZYj; Wed, 3 Apr 2024 13: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 433D7C8U074511; Wed, 3 Apr 2024 13: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 433D7CTx074508; Wed, 3 Apr 2024 13:07:12 GMT (envelope-from git) Date: Wed, 3 Apr 2024 13:07:12 GMT Message-Id: <202404031307.433D7CTx074508@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: bade279b8106 - stable/14 - tar: make error reporting more robust and use correct errno List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: bade279b8106e9d4166ef2430b4bdbcf17be9953 Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=bade279b8106e9d4166ef2430b4bdbcf17be9953 commit bade279b8106e9d4166ef2430b4bdbcf17be9953 Author: Ed Maste AuthorDate: 2024-03-31 14:37:38 +0000 Commit: Ed Maste CommitDate: 2024-04-03 13:06:41 +0000 tar: make error reporting more robust and use correct errno Apply upstream pull request 2101. (cherry picked from commit d68c68693e110353f70b5c04f8de416cf5766eca) --- contrib/libarchive/tar/read.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/contrib/libarchive/tar/read.c b/contrib/libarchive/tar/read.c index 2a907518d7cb..94616f279e65 100644 --- a/contrib/libarchive/tar/read.c +++ b/contrib/libarchive/tar/read.c @@ -372,8 +372,9 @@ read_archive(struct bsdtar *bsdtar, char mode, struct archive *writer) if (r != ARCHIVE_OK) { if (!bsdtar->verbose) safe_fprintf(stderr, "%s", archive_entry_pathname(entry)); - fprintf(stderr, ": %s: ", archive_error_string(a)); - fprintf(stderr, "%s", strerror(errno)); + safe_fprintf(stderr, ": %s: %s", + archive_error_string(a), + strerror(archive_errno(a))); if (!bsdtar->verbose) fprintf(stderr, "\n"); bsdtar->return_value = 1; From nobody Wed Apr 3 13:08:00 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4V8lRN6w2qz5Gn2X; Wed, 3 Apr 2024 13:08: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 4V8lRN65Dbz4Rv6; Wed, 3 Apr 2024 13:08:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712149680; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8/ufA8CmswqAaiGftMJ3DkQEZVSl99IPny9RnphIM5Y=; b=s8WZdbws7dvGJ5mhE7BIJFKcwowJkPw28huc2cXZCqNq6lx5H6AdW3E2CXOVqTxbomq0R9 wf43qO9LBsYkVM/9l0rzVLZlhxozY0w7mYbNzLdCQBCLCjOjmLF/SeQAFyoLaxYwSkUQN1 xC5tWjtrdyl9n+OezqW4Eq8ssdnewUlPIRRJppD0FyV94RpBqAL7Qf9MQidpC1CY7AluUk oMKMyBuYHsz8iDJsU7ygA1WPupkOaNc60pkw+lG3Brac9pRmc+Ejln/XqTw6lXp11PzFFq UFz0OqR3RPb3wbrQsFAzltffuSILk/moaf6K3Vl1zEQbO1v0bOTghZlDYo36Yw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712149680; a=rsa-sha256; cv=none; b=uGICrfS9ES1z3XVQd8bSyND/r76WWALlX/7LG+xDy8iMhPSbpCLqug8olvcePZjw/O2Vbc Bm/EynLLAyUXdptNnjyguaVz82nk23U5ukO1LXkj3yUyTMRsJ6oxvO1+5GiebxCd9QHteY OXjX/psYEkqdLe2Wzty6PfrR8yDLxWVOwZJs8q83jIv0oYp7TlyhZMJtuO9XjF+DWQHB6x Jt6pY+gq9smsUK+osNB+OM/dllJIqlG5guxeLAB0+QsrF5icXfQgE8UzmYXJkvwTxy3TkS QdjnLNRG6OVDlh73sehFrx2xkmGNvjyDnXLspymQkIz2qSUHgz6Ndhflig5V0g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712149680; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8/ufA8CmswqAaiGftMJ3DkQEZVSl99IPny9RnphIM5Y=; b=JuZHCUP7oQFfXLPtqX8kyQLauWEr6Peblk4P+/kOFoMKzEDuIMQCXTP/B7K+lLCf6oRlBl DB3nIGsdZdjvfAplPzYFwjMcgVmPG1zb2NqzRHr7ucCfJ+aLHuTsbu4s/d91v3nQSK1AFp 0iI3z3YyW8+DKADSgwIN2/HAPEmPQO4Ebu7SZ+eRwyu76TB6lbIxGmMZIb64K5FHg2jKZ+ x+PgxD2VfiBr5aSm0dyzEIxvFTIheUBHuwicBNrkqCYb8RiIj3ePhQoIrbTajk8MYB0TUb mk6wqZ7PnW72b9l09C9MKZUYHeC8CJC8mGh1uOOFnh7z8tKaVDlp9VLlkylczQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4V8lRN5hS8zYwp; Wed, 3 Apr 2024 13:08: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 433D80Df074739; Wed, 3 Apr 2024 13:08:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 433D807e074736; Wed, 3 Apr 2024 13:08:00 GMT (envelope-from git) Date: Wed, 3 Apr 2024 13:08:00 GMT Message-Id: <202404031308.433D807e074736@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: 26c9cc10b220 - stable/14 - boot0: remove reference to fdisk List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 26c9cc10b2208bc8fcbc4f6c80210250febe6abb Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=26c9cc10b2208bc8fcbc4f6c80210250febe6abb commit 26c9cc10b2208bc8fcbc4f6c80210250febe6abb Author: Ed Maste AuthorDate: 2024-01-24 15:13:08 +0000 Commit: Ed Maste CommitDate: 2024-04-03 13:06:41 +0000 boot0: remove reference to fdisk fdisk is obsolete and there is no need to mention a specific tool used to update the partition table. Just refer to it as the MBR partition table. Sponsored by: The FreeBSD Foundation (cherry picked from commit 3bd637afbd68baaff3ae4b3d41bdbd39b1fbb63c) --- stand/i386/boot0/boot0.S | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stand/i386/boot0/boot0.S b/stand/i386/boot0/boot0.S index d92f8dcb05f1..2b7e56c89167 100644 --- a/stand/i386/boot0/boot0.S +++ b/stand/i386/boot0/boot0.S @@ -672,7 +672,7 @@ ticks: .word TICKS # Delay .org PRT_OFF /* - * Here is the 64 byte partition table that fdisk would fiddle with. + * Here is the 64 byte MBR partition table. */ partbl: .fill 0x40,0x1,0x0 # Partition table .word MAGIC # Magic number From nobody Wed Apr 3 14:24:56 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4V8n884ztwz5GtdF; Wed, 3 Apr 2024 14:24: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 4V8n884Qysz4cBn; Wed, 3 Apr 2024 14:24:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712154296; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nmBAQiN5+xBxBTm9sQ6pw3gzWRIuOU8IMC5zAyttLtA=; b=G9m4zX+KEnvi/HFICRmjV6Zq2j+Nx8vrjdRG1icBmZwfX+vEq2tAKGOdf/n+oQw3EaSKmL mbyYhvioxapJspiX2lZmmsfZOVgKlsyyy1R8KrsAcddRA9gN/nWsy/hSRRdtC6wIaeuQAh bHpMGfKLz0nXhg3d48kIWW+zeR9z5i2YS7bA4H29ZOO5y42DayxYXoZ/J8ZUYHqPXAMt3b fmGPI32BzA7JphpvMOSzSB0AGH7kdvGkTE5NR9bwgc99ZuLnr3kRkNqi8pHVIZHPGcHlRC l61+aG3UqquXXEHX8S7kavLGfCn8/u0RjZuxlLSPL/SVZ3iI+e0MmCwhKPCQ2Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712154296; a=rsa-sha256; cv=none; b=Y1UTsEh/lLyqA18V+A2vtSkV0FUspMnSlD4rBaj9m2Fcn0Rhl7fupB/16r8qye1TlFbH2o tUO+uKIj4WGcQX9JaXO6Cd78uBQDoRSJ1lxqBM5iD79UrksmkGervTGrsQ5LLRmi550q4S 24UA9c/G2iU97x+F0m8gfNvKV9+dHV+vXVj37WeJsgxSpH5EtSn3Keb/frVSb1QqN2qp9x a/1PjozoYyczHr04788aHUxUF+MZFeVkVcA8lNVaqpCr7oKwcSEb+TTuDd1KkfYi7ZL/We vG3+uHaUpSRA6u/4F4femmCi95ENA1RZlzUCteVxC4du/tc4FDQDvMLTTz/mcQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712154296; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nmBAQiN5+xBxBTm9sQ6pw3gzWRIuOU8IMC5zAyttLtA=; b=OvA6gF8/QN04b8x8J0aS0lgK87A9E3tLAxVEc8ESaNkH4jFC68wDSA9PO14buyOH0Ya7zf IvuiH2bTzRS5QVAl9GWqX7NiTFdxQ70uM0qN+qmGeIwq7DJ3i9WMLKVG7mKQLAYJEOGUkF SNuCtykG57zBr3rfTEr7CN2DQsctOSd2YaRItQH/ybjqYgpnHC4NmkQINFqp2bflaS6359 0t8VZzkM1+ZqeDJQMWJZL9ca9HDhYOBrQLPyPhbLbAWOBcE9UIuctdlF8EEtrcsOn8Kz6T r8FrxMcfzm0wYKHY8xaUc70deZQwnjgIzHWRecpYWINwWeaTR1GlHU5fv1euAw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4V8n883xcWzc6M; Wed, 3 Apr 2024 14:24: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 433EOuTE009012; Wed, 3 Apr 2024 14:24:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 433EOurq009009; Wed, 3 Apr 2024 14:24:56 GMT (envelope-from git) Date: Wed, 3 Apr 2024 14:24:56 GMT Message-Id: <202404031424.433EOurq009009@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: 0238d3711d9b - main - tarfs: Fix 32-bit build. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0238d3711d9b888f678fce4274eccc9175168395 Auto-Submitted: auto-generated The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=0238d3711d9b888f678fce4274eccc9175168395 commit 0238d3711d9b888f678fce4274eccc9175168395 Author: Dag-Erling Smørgrav AuthorDate: 2024-04-03 14:24:05 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2024-04-03 14:24:05 +0000 tarfs: Fix 32-bit build. MFC after: 3 days Sponsored by: Juniper Networks, Inc. Sponsored by: Klara, Inc. Reviewed by: bapt Differential Revision: https://reviews.freebsd.org/D44613 --- sys/fs/tarfs/tarfs_vfsops.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/fs/tarfs/tarfs_vfsops.c b/sys/fs/tarfs/tarfs_vfsops.c index cbc3d88eaad8..365234113168 100644 --- a/sys/fs/tarfs/tarfs_vfsops.c +++ b/sys/fs/tarfs/tarfs_vfsops.c @@ -80,7 +80,7 @@ struct ustar_header { CTASSERT(sizeof(struct ustar_header) == TARFS_BLOCKSIZE); -#define TAR_EOF ((off_t)-1) +#define TAR_EOF ((size_t)-1) #define TAR_TYPE_FILE '0' #define TAR_TYPE_HARDLINK '1' @@ -430,13 +430,13 @@ tarfs_free_mount(struct tarfs_mount *tmp) * failure. */ static int -tarfs_alloc_one(struct tarfs_mount *tmp, off_t *blknump) +tarfs_alloc_one(struct tarfs_mount *tmp, size_t *blknump) { char block[TARFS_BLOCKSIZE]; struct ustar_header *hdrp = (struct ustar_header *)block; struct sbuf *namebuf = NULL; char *exthdr = NULL, *name = NULL, *link = NULL; - off_t blknum = *blknump; + size_t blknum = *blknump; int64_t num; int endmarker = 0; char *namep, *sep; @@ -861,7 +861,7 @@ tarfs_alloc_mount(struct mount *mp, struct vnode *vp, struct thread *td = curthread; struct tarfs_mount *tmp; struct tarfs_node *root; - off_t blknum; + size_t blknum; time_t mtime; int error; From nobody Wed Apr 3 15:31:53 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4V8pdP6vj3z5FGGG; Wed, 3 Apr 2024 15:31:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4V8pdP61pcz4kXN; Wed, 3 Apr 2024 15:31:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712158313; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XMWjKYRnFVfktqGhszzsr6gDrNaUg7V7C9dRus+k6zw=; b=LoyqCyuvSE7xJv01ftplyK28UOyHa2EGie8KsbQNCdFDn7mVRok3lvrJUgj4b8HjZLlR6z N3fhbxG5Ru9ZgwM6HsFsg2R6ekdLwFqICy79U6bDTn2JtXAw/wFTduF4O8lon4PpyN6n1D pD1eX485rmR8CGSpF0XbSXDmWa9o4PFIUI8ZfPzz9eNdp2l26fEEPCK2uUIkZkibDn+Z4g aBhD/Yso1wVzwMCiUOz//ShhuUkW1A/6Er4YpGderP085pAhBDGGKKvkuil7naLbomw5JK brhmYUwz0jmW7koZMjiliokdSjpFa0sZ6wTfIDZEmDOoBcTqnK73YN7Sa3LISg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712158313; a=rsa-sha256; cv=none; b=a25/vV8G36n7ZGKYqR/2zOA/6c4rIeS+nezsGfoA6FCTtoZRzHkUpxFMZHFPGOemAYEjkK 5KngZdilLrk2xPxC87Sy02/SLCGg9C1xrsmWatLavISQBum+8GdLmCJLEaf0UAHQlKSopD XF16J9uavNFs3rMcvg9M/sOeKOP8iAh5MVxmGKGbE2v6sL9gvmaPy6Jz5+Zyvt/zh7qI7A 7cs+ytQcGg21khkSy+trRxglCo3vqyUN0uLtRre8ecQjwXBneWxCvnQHFfis+Q3x6/HaA/ LJDLDyJKyvXLvD5PWu4Z9CYRmqN7zscuq23qVaT+mrcQBEUgtEKmnLPyaDTbTQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712158313; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XMWjKYRnFVfktqGhszzsr6gDrNaUg7V7C9dRus+k6zw=; b=atezxzcekFPOtyp83lnq3RuFgLTYM46auMqrDsCdnFKGPXMO4ltd3rlMCiPNPxQQSVtrZ5 0oi79hr8H2UVSO3MonBeKPu4wWbLfx0S9IAjFURRweGTc+yEOSOUPd4Nf9q5wLV5wAEv0m mgo5nyl/xsskQ8APWwKGSLHw3D4UZZnhx1ouDRSvJJv3mY1L8l0ja830PMmYLMeWoourpR Mf7XxymVMjkQML1lerxvNZw7G4apx9v5TYTvT3jVg5Qwy3ad4EHE4Bbz8Clnd0P4M63w7U /l6/DwgsK3LJa/tE19APtZpDRdSeIlKGqXlDov4dpLwr8Eqmo8vEfg56icLzsw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4V8pdP5dDwzdgb; Wed, 3 Apr 2024 15:31:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 433FVreH026128; Wed, 3 Apr 2024 15:31:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 433FVrAB026125; Wed, 3 Apr 2024 15:31:53 GMT (envelope-from git) Date: Wed, 3 Apr 2024 15:31:53 GMT Message-Id: <202404031531.433FVrAB026125@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 87e63f2e7f92 - main - nextboot: Write nextboot.conf safely List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 87e63f2e7f92e192c1e8b01ac7cc45b88c03a478 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=87e63f2e7f92e192c1e8b01ac7cc45b88c03a478 commit 87e63f2e7f92e192c1e8b01ac7cc45b88c03a478 Author: Mark Johnston AuthorDate: 2024-04-03 15:29:25 +0000 Commit: Mark Johnston CommitDate: 2024-04-03 15:31:43 +0000 nextboot: Write nextboot.conf safely As in the old nextboot.sh script: - First write everything to a tempfile instead of /boot/nextboot.conf. - fsync() the tempfile before renaming it to nextboot.conf. Fixes: fd6d47375a78 ("rescue,nextboot: Install nextboot as a link to reboot, rm nextboot.sh") Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D44572 --- sbin/reboot/reboot.c | 38 +++++++++++++++++++++++++++++--------- 1 file changed, 29 insertions(+), 9 deletions(-) diff --git a/sbin/reboot/reboot.c b/sbin/reboot/reboot.c index 3cc77aebe4d4..1b806a90de1d 100644 --- a/sbin/reboot/reboot.c +++ b/sbin/reboot/reboot.c @@ -113,8 +113,10 @@ zfsbootcfg(const char *pool, bool force) static void write_nextboot(const char *fn, const char *env, bool force) { + char tmp[PATH_MAX]; FILE *fp; struct statfs sfs; + int tmpfd; bool supported = false; bool zfs = false; @@ -138,21 +140,39 @@ write_nextboot(const char *fn, const char *env, bool force) zfsbootcfg(sfs.f_mntfromname, force); } - fp = fopen(fn, "w"); + if (strlcpy(tmp, fn, sizeof(tmp)) >= sizeof(tmp)) + E("Path too long %s", fn); + if (strlcat(tmp, ".XXXXXX", sizeof(tmp)) >= sizeof(tmp)) + E("Path too long %s", fn); + tmpfd = mkstemp(tmp); + if (tmpfd == -1) + E("mkstemp %s", tmp); + + fp = fdopen(tmpfd, "w"); if (fp == NULL) - E("Can't create %s", fn); + E("fdopen %s", tmp); - if (fprintf(fp,"%s%s", + if (fprintf(fp, "%s%s", supported ? "nextboot_enable=\"YES\"\n" : "", env != NULL ? env : "") < 0) { int e; e = errno; - fclose(fp); - if (unlink(fn)) - warn("unlink %s", fn); + if (unlink(tmp)) + warn("unlink %s", tmp); + errno = e; + E("Can't write %s", tmp); + } + if (fsync(fileno(fp)) != 0) + E("Can't fsync %s", fn); + if (rename(tmp, fn) != 0) { + int e; + + e = errno; + if (unlink(tmp)) + warn("unlink %s", tmp); errno = e; - E("Can't write %s", fn); + E("Can't rename %s to %s", tmp, fn); } fclose(fp); } @@ -194,8 +214,8 @@ add_env(char **env, const char *key, const char *value) /* * Different options are valid for different programs. */ -#define GETOPT_REBOOT "cDde:k:lNno:pqr" -#define GETOPT_NEXTBOOT "De:k:o:" +#define GETOPT_REBOOT "cDde:fk:lNno:pqr" +#define GETOPT_NEXTBOOT "De:fk:o:" int main(int argc, char *argv[]) From nobody Wed Apr 3 16:18:25 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4V8qg551mxz5FLLN; Wed, 3 Apr 2024 16:18:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4V8qg54Y5Lz4pJM; Wed, 3 Apr 2024 16:18:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712161105; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VAIjn6FVxOOGYhSWnqdfrqbg8YseK8WECNcILedyE1A=; b=YqKgIu5ny9RLxOWTYHs2Auk//GwhhgjoTiXRrmYROazc1pDpbBKFi9N3fB+4vJh8VdrqQm OXQBZ3+qgQXNDHyaIcqyjssDTVU8ErUVfgIpAiIBn6R8EpErZ2S6uY+1FXa8kkVtw0fPuD Pvlr0jSwwG4u7e2VojLTyATQ8jRv9awW7zz16REQZPPbHaV5nw8+SylNFB/21ZeopPRkBx u1KXGlZGRl7EHh3ZKfj2LlQ3qWWYfGSgRGe1qYxwY0fRAc5CneIM3UtOnaT0Z+zfjqEydd V91pbbyl4wgmNfU+wwNP95p8I6F60QBzcBLNghyTkBAmGj2/gbMuyvsnZ1VkuA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712161105; a=rsa-sha256; cv=none; b=mmk/ztTVsdtkrNVwfWB0gyRReFuTZoKuazOwyw/kkxCRphzOHaREGWBgiOO7FSoEaI4UrQ 7MZYr0X9oJMAsQMC38k93k25OrIUp+wjSXBZuNb9rj00crXetk6aTMX4AtgxZa0b1Jj5cO HfUCw49JT8sjlxOKd3TwddXlaxpTQ80VnkvIujQghFDhbDVR4CfoJ5Nd9MZzxyhksHSZuz HCPoMbsiBBraD8/nAPUBU9F/9hnmFNp7xUiotgyuAdld9zs5JEymaHrbr+ES8fXRxK5TED tPf98OO6Dfmm3FICiCjfPNCpsosGtPtDbBfxmmAbMfR6fSFQ33Z3nybtZxgujw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712161105; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VAIjn6FVxOOGYhSWnqdfrqbg8YseK8WECNcILedyE1A=; b=DBQMxt186QahK+Vn0+fNRHm6v4fcBW4zvQ4IPBamKMECc3NnevJTegTe+lTC79Ayq+Hred Sy+qi4aPf9AuCqbDPpONgRXvjVo8LlUsVrRslKDTuBo/SB7lrz6jHhENanjAN1LsDFlk0E hXcRT2lEP8NzWWr1SN2xQKRPtrxabVjzcws0//f/Gf5tivlB3xCmT4ElPcAfahyQc5GnsT 7iO+qdff81p5z1W4mW8aBBx14J+KcyPJ/zTtSuXqe1FDRXgCLkTM41SoQJWYQQtPERjSrC 1CDYFq718E8m4gJtHkMeq7iMGfNsbb4ImyWngNysAjXSUb6IZtfLwV6SlMnWoQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4V8qg542KVzfyr; Wed, 3 Apr 2024 16:18: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 433GIPKo096544; Wed, 3 Apr 2024 16:18:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 433GIPbq096540; Wed, 3 Apr 2024 16:18:25 GMT (envelope-from git) Date: Wed, 3 Apr 2024 16:18:25 GMT Message-Id: <202404031618.433GIPbq096540@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Bojan =?utf-8?Q?Novkovi=C4=87?= Subject: git: aada453dcbaa - main - ddb: Properly pretty-print non-labeled enum values List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bnovkov X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: aada453dcbaab1b8f7d50b66add5a38eb9e06cc3 Auto-Submitted: auto-generated The branch main has been updated by bnovkov: URL: https://cgit.FreeBSD.org/src/commit/?id=aada453dcbaab1b8f7d50b66add5a38eb9e06cc3 commit aada453dcbaab1b8f7d50b66add5a38eb9e06cc3 Author: Bojan Novković AuthorDate: 2024-04-03 15:47:00 +0000 Commit: Bojan Novković CommitDate: 2024-04-03 16:17:11 +0000 ddb: Properly pretty-print non-labeled enum values The ddb pretty-printer currently does not print out enum values that are not labeled (e.g. X | Y). The enum printer was reworked to print non-labeled values. Reported by: jrtc27 Fixes: c21bc6f ("ddb: Add CTF-based pretty printing") Approved by: markj (mentor) --- sys/ddb/db_pprint.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/sys/ddb/db_pprint.c b/sys/ddb/db_pprint.c index 8aa14550f068..b4116372cf65 100644 --- a/sys/ddb/db_pprint.c +++ b/sys/ddb/db_pprint.c @@ -225,13 +225,14 @@ db_pprint_enum(db_addr_t addr, struct ctf_type_v3 *type, u_int depth) for (; ep < endp; ep++) { if (val == ep->cte_value) { valname = db_ctf_stroff_to_str(&sym_data, ep->cte_name); - if (valname != NULL) - db_printf("%s (0x%lx)", valname, (long)val); - else - db_printf("(0x%lx)", (long)val); - break; + if (valname != NULL) { + db_printf("%s (0x%lx)", valname, val); + break; + } } } + if (ep == endp) + db_printf("0x%lx", val); } /* From nobody Wed Apr 3 16:18:26 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4V8qg669b3z5FL7g; Wed, 3 Apr 2024 16:18: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 4V8qg64yMGz4pNf; Wed, 3 Apr 2024 16:18:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712161106; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2IsCQGfQcpEW45f2+ffdT8qi3wdUjkqV3iNKytbdW9c=; b=pTRIAR1egmlvm+2ZcstZsekAkhRSjOkLQ5SfTWxwjrcY3miViX/EOhs5vMmDG2+KeeTx0S YiM/TTKVa3LnQCnpLvGhjUlxAlrvrWBh76jR47Y0Ces0SU7PgYktXnRRuMHv2RP+qzrCsJ T30yuvv2OOc+PKf9XBVzXG2Jxa6iZ+oBlIwRqgj0DfDQV62CVRl1R9Pj7spX/dUeDGAL2U p1b98/WPFEF68AIUpmYU0WwwIyUyCu4PsfxBNN/+izUf96/9OQNMjitM4gFxHCERRJL3SE x5Wqf/tBWtvnKvosQz8oJy08laRxVLZSVZMFLOkageam2Vsyu6/4OjrqKL96vA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712161106; a=rsa-sha256; cv=none; b=WoDWI0dnkWo3YDB589EggKL6+dIb5DD6iGxAm1fJvYibdaCP1xaFGbVna9Ys2HQGIiL0Ft NsXz2uBDzE6xIF7BfOcdAwZhDBwDYZ3Oe0JNQiWi6Cd592wFH/w/mzVDcyVrB2S0ucn0fd bLWUUuw5J+gYR9eThFsnyvb3ZrkCpE7hJo5/CXd4vRCTcCXX2lbi8ZQUmVc4QACd/b/6PM mXNElUrZwycykhITiExDqv6NHo0zAxzAgY+LMoOUiGNxWrLy2/MHPi09wT8wbXRkg3s+OQ 8WQkRAePBPuPpAlKSbLIlVzr9m29NoEvJ2KVP1VtLUqnR7aQLIkwUqHH9+pykw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712161106; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2IsCQGfQcpEW45f2+ffdT8qi3wdUjkqV3iNKytbdW9c=; b=KuDZkKh8vhaf/niZoqL7KTHkgyFydWtkQFmMHbfdU007vOMUqzbVAIabdJKUgPaD1tB+m4 3NKcG560aEFKnegw/fTpOTC+7TdXxPrpKYE0IveYaMzZNCTyNK53EPSVbDEWhJFMEHwRwr l7smDJ8tTnGk/w6S7DX6eRUkaseJ0wI8r776hxox+sOXeWPrwQxRTfX5wMvezDyvwSYW5A Bne1JeK/+xA2WmAAWPKVtOAkghi+B5nKC7dEJQy2Dkcss0tpKvHOFBWjJSfUAlSEJhnPPq kS/Yya2gfPj2/P8ajuC15P2dmKi+ptrIeRsTF14u7/WL9wGKoiE8lIEWPwVrLg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4V8qg64ZLwzg2k; Wed, 3 Apr 2024 16:18: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 433GIQp3096605; Wed, 3 Apr 2024 16:18:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 433GIQUx096602; Wed, 3 Apr 2024 16:18:26 GMT (envelope-from git) Date: Wed, 3 Apr 2024 16:18:26 GMT Message-Id: <202404031618.433GIQUx096602@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Bojan =?utf-8?Q?Novkovi=C4=87?= Subject: git: 872c4402af13 - main - ddb: Don't throw away qualifier when pretty-printing unnamed pointers List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bnovkov X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 872c4402af1325ed156d7f5ee2252dd36b016b5c Auto-Submitted: auto-generated The branch main has been updated by bnovkov: URL: https://cgit.FreeBSD.org/src/commit/?id=872c4402af1325ed156d7f5ee2252dd36b016b5c commit 872c4402af1325ed156d7f5ee2252dd36b016b5c Author: Bojan Novković AuthorDate: 2024-04-03 15:55:13 +0000 Commit: Bojan Novković CommitDate: 2024-04-03 16:17:54 +0000 ddb: Don't throw away qualifier when pretty-printing unnamed pointers Reported by: jrtc27 Fixes: c21bc6f ("ddb: Add CTF-based pretty printing") Approved by: markj (mentor) --- sys/ddb/db_pprint.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/ddb/db_pprint.c b/sys/ddb/db_pprint.c index b4116372cf65..8e6759a03220 100644 --- a/sys/ddb/db_pprint.c +++ b/sys/ddb/db_pprint.c @@ -276,7 +276,7 @@ db_pprint_ptr(db_addr_t addr, struct ctf_type_v3 *type, u_int depth) if (name != NULL) db_printf("(%s%s *) 0x%lx", qual, name, (long)val); else - db_printf("0x%lx", (long)val); + db_printf("(%s *) 0x%lx", qual, (long)val); } } From nobody Wed Apr 3 16:19:50 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4V8qhk3vCMz5FLSY; Wed, 3 Apr 2024 16:19:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4V8qhk3QhDz4pxQ; Wed, 3 Apr 2024 16:19:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712161190; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5cuU7D2+NFko/x+uM29aTR/jhIQ5ad5ZEQHKjNb+EqM=; b=nWCXsms77LV9vlj9ZXk9FPb+5OoJImmxD8thEbj9ZUv4/K5M/SXlvQYfoW2ntSHM+jpCZE ZRQz7jILimC48pK1ebCyMvh9Ix+CbS7L4kwDb0kiqLEIUnwFQ7t/61A5s6SMtkBDzrofJc WVWfGDr02p6qDhtwo70pZJKEYlwyMvnFDSPlVNJc5e+CIblWI6vAZPvPn9Vw7WZYtPAlUR 0EfFYBhfbYoFaEEaj3nR7mhPKhSa4OojlYsbLfWYWHBqZh7Vam7BNTcljWiTd8OLG1HGl8 5+zif6ttU5YHVoIW4DieLckCk/mZ4FY0b64x8Hty8dRPk7F7ST3qu7vKADYAIw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712161190; a=rsa-sha256; cv=none; b=Ud35lQvpzRrt292RP+KROK6GTXPYmTU/N627t/I1YSqzCFxVqVUja2/zGCIx757d0ZpnFL jIwlzF+mZlAFvOAuku7KgPF7DUjQnY5NEvWrQfNW4dUvkrTH2uWi3NnNDgn0b6eBnatqcw 5xzTlQ7gJ1bJQIX446UdGfCwJro6OuKk0xOkdtCNlLY/POq2Axpk4zSPMIgAyScrVpqYUM Tnd/ctHLrn0hqejAMi4cY0rQ+/qykKZb5500sZxNZ+ixdxWoJmG+Y5Wc8ivkI8i55W5ByU tlNnUVy5/DOdl+OTDZeac+I4Lw8s77qMH8fmX75G405H1ZfYtPoF1jD6lcIx0A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712161190; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5cuU7D2+NFko/x+uM29aTR/jhIQ5ad5ZEQHKjNb+EqM=; b=CKTMkux5B/EXMVPQp88a/D0gs4viiiTkwindY6y20ATcPy3pNS2ngMqyBv9QgRAUg1QmgV ucBtYbE9KE6N7wFmnhYToaKYYegUmTVzdrT9GD2SKKdVvYJw0xIVo5FCQLPm/KoSygeBGB ZV16F+pgpL8y0qtvR+vlnDYf99LQKN46re9Ijat1AQ+0wwhJ0JK5LrQSKSmMH5OBq7ZzCW W+FXaQG3595u4QYzuplhcOw06MLHnXm237U4dRRY7FYHLCa8bzx62NnRSxWiIJEhiAIdzO jHirvZv8lhmNsoGXsmEA8W/s0eyqZnynih6KaizweJ7NDwrPayfOkRYg2cXroA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4V8qhk32rZzg7Y; Wed, 3 Apr 2024 16:19:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 433GJog6096929; Wed, 3 Apr 2024 16:19:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 433GJoF9096926; Wed, 3 Apr 2024 16:19:50 GMT (envelope-from git) Date: Wed, 3 Apr 2024 16:19:50 GMT Message-Id: <202404031619.433GJoF9096926@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alan Cox Subject: git: 22c098843127 - main - arm64: correctly handle a failed BTI check in pmap_enter_l2() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: alc X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 22c098843127f6a31e25e94b07b35677f038f6d6 Auto-Submitted: auto-generated The branch main has been updated by alc: URL: https://cgit.FreeBSD.org/src/commit/?id=22c098843127f6a31e25e94b07b35677f038f6d6 commit 22c098843127f6a31e25e94b07b35677f038f6d6 Author: Alan Cox AuthorDate: 2024-04-03 05:21:08 +0000 Commit: Alan Cox CommitDate: 2024-04-03 16:19:30 +0000 arm64: correctly handle a failed BTI check in pmap_enter_l2() If pmap_enter_l2() does not create a mapping because the BTI check fails, then we should release the reference on the page table page acquired from pmap_alloc_l2(). Otherwise, the page table page will never be reclaimed. --- sys/arm64/arm64/pmap.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sys/arm64/arm64/pmap.c b/sys/arm64/arm64/pmap.c index 12e5e1d73b38..258aa141653b 100644 --- a/sys/arm64/arm64/pmap.c +++ b/sys/arm64/arm64/pmap.c @@ -5269,8 +5269,11 @@ pmap_enter_l2(pmap_t pmap, vm_offset_t va, pd_entry_t new_l2, u_int flags, * and let vm_fault() cope. Check after l2 allocation, since * it could sleep. */ - if (!pmap_bti_same(pmap, va, va + L2_SIZE)) + if (!pmap_bti_same(pmap, va, va + L2_SIZE)) { + KASSERT(l2pg != NULL, ("pmap_enter_l2: missing L2 PTP")); + pmap_abort_ptp(pmap, va, l2pg); return (KERN_PROTECTION_FAILURE); + } /* * If there are existing mappings, either abort or remove them. From nobody Wed Apr 3 16:27:32 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4V8qsd05kqz5FM3X; Wed, 3 Apr 2024 16:27:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4V8qsc6kCdz4qwF; Wed, 3 Apr 2024 16:27:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712161652; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uD+TOWjqALxd66/FD5x4ixzR7oAoVxFGZ5G4x3yUKAQ=; b=xXO6ATgA1Qw2uJLNi0n6ePJHTvgUqaq37N08o6lRUb7fZubkZwQHe7gnq8tcxY5mIjKyN1 /yNyprxqz4lVmxEQ4eFIxIazr+1gg662EI9LIeV/5A2AKNg9PcQCOtDBfYj21FGzn+m0ZO s96B8sJIOHibdTJLkVb8NOF14RIEmA+yEJNSHALOPzwklB6YTjaBgrpnf2KJfES+UZJeOY ggc6MT13qg3lsrVi4uuhfroaI2SLLBLmsPH/ZX0MbNQ5lndIY9Vag9QQAh4YTyuRnXY6HF dS3QZwfqy3xdyBlcjcMZVW4uLWTO5mUPtEaGcinV28EukcPHm9IE5aSXFIi96w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712161652; a=rsa-sha256; cv=none; b=ifKA+jn1pC2xSOJt98xZ4aZGQmmAx3wvKyfaqwK0hCP4tqipMA74BlZMinkI6TliCBtawc 98JftKLVs2MbxfCj5CXl7+gGXEum7mkP/mU7RtMEY3X2qvbkkSjXrEWpwtCNhpF6VSu4HU MKuuoxX84x8VPulIdszPyTJMpmsIFQdvk9+IIU2qMUZyIfy+DwnE5LqV6YCsaDltc+7N1C F7hMAAofhrTXszfKNaXJyqaWhuT2sqw/m1Fh3eXMYxjjIXNr2khAe9THWmq7bcU9Leq1Et 9HczqqRhJPDuIVXoR3dl/R+FPhBhjLHJ2aS8s5svZ0J4hwYLs90iV5+KTtai1g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712161652; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uD+TOWjqALxd66/FD5x4ixzR7oAoVxFGZ5G4x3yUKAQ=; b=ihpn/pOm3ojGs33wGAm6kzeiZdZgs4CADBEYtauF6uNdriP0TdZEQMBmzdxolnkYuquc+Z q9dN1Mafpw7nUonrEPWueiQjDyxfBO720m1wFgxtOzHIv+q5+dHpiCy+5mPrL9LiZFPPaU wxpoJnPjG0uFUJyqrmNut0IWHUYuHgAnEkogVV5Im1Dkw7ISN+frfoDm6saN8+i9JjVpTO vNhsYolyaSqZtzA4v8e6jhfQ2CgNukT5tTVpFNLut98MLO4RVHY2g5cUBFjfA1C5925d75 aZcI4idHXkf5V/f3UwxWzAziHGhJorKkprWwNN4YonKKvEM272mBqqUUA20ilA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4V8qsc6KB5zgWY; Wed, 3 Apr 2024 16:27: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 433GRWEx013934; Wed, 3 Apr 2024 16:27:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 433GRWXC013931; Wed, 3 Apr 2024 16:27:32 GMT (envelope-from git) Date: Wed, 3 Apr 2024 16:27:32 GMT Message-Id: <202404031627.433GRWXC013931@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Tuexen Subject: git: 5a268d868890 - main - tcp: fix comment List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5a268d868890dbbfe96361906be20d01cc252b2f Auto-Submitted: auto-generated The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=5a268d868890dbbfe96361906be20d01cc252b2f commit 5a268d868890dbbfe96361906be20d01cc252b2f Author: Michael Tuexen AuthorDate: 2024-04-03 16:21:19 +0000 Commit: Michael Tuexen CommitDate: 2024-04-03 16:26:04 +0000 tcp: fix comment Make the comment consistent with the code. Reviewed by: rscheff MFC after: 1 week Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D44611 --- sys/netinet/tcp_var.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/netinet/tcp_var.h b/sys/netinet/tcp_var.h index e49d682896c0..7542d680daa0 100644 --- a/sys/netinet/tcp_var.h +++ b/sys/netinet/tcp_var.h @@ -902,10 +902,10 @@ struct in_conninfo; * and thus an "ALPHA" of 0.875. rttvar has 2 bits to the right of the * binary point, and is smoothed with an ALPHA of 0.75. */ -#define TCP_RTT_SCALE 32 /* multiplier for srtt; 3 bits frac. */ -#define TCP_RTT_SHIFT 5 /* shift for srtt; 3 bits frac. */ -#define TCP_RTTVAR_SCALE 16 /* multiplier for rttvar; 2 bits */ -#define TCP_RTTVAR_SHIFT 4 /* shift for rttvar; 2 bits */ +#define TCP_RTT_SCALE 32 /* multiplier for srtt; 5 bits frac. */ +#define TCP_RTT_SHIFT 5 /* shift for srtt; 5 bits frac. */ +#define TCP_RTTVAR_SCALE 16 /* multiplier for rttvar; 4 bits */ +#define TCP_RTTVAR_SHIFT 4 /* shift for rttvar; 4 bits */ #define TCP_DELTA_SHIFT 2 /* see tcp_input.c */ /* From nobody Wed Apr 3 16:42:59 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4V8rCS0fgnz5FNhl; Wed, 3 Apr 2024 16:43: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 4V8rCS0C9Yz4sl5; Wed, 3 Apr 2024 16:43:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712162580; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4c87JOffUneX1sx9CQX8GynSfXsCoERXSLyvcV6w4YY=; b=ou7fJCBtOJItiMaJn8DBHx71R+fZ8NZBPA4UQXxmkGlncyT7NTrkOeBsuNRQvekqVef271 vfd3JFRrrfvF6Ke5oL9A936GsDmuz/2H67FTSJp8rZq7JfkD0zzspfISlbwSS6KIkE9bXq AlLXvRvHqhSsRNB6cIyemtUpfMi/eWTqfw5rle7wzm/mggB+uLgFJVvB4TbbSy6VPfTsQi ospN4gLOGJ3UQimXrhK3sVNynS94kpuJQzytXjy121mLCbawv2jjANlTCyUt7O4p1TU3rs 8uNKb5+i+q6ci9AY1K1K0eB/god9V28hRMPu7le9awJDyF6N9TTjdwchbw7nWg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712162580; a=rsa-sha256; cv=none; b=xenNBOL0ooKSmLH2weCHema0nJAzsdpTvL44O64MKyg4YjleZJU18OywCunMOeBMBUhkxn eUZbfQ8dWNzemCC+ZzMtd164miqGVkIHoccCQsL9z4S4sWQLt/ofagFYEsAw5M6Mnt72tq /mmqJwJrSu+mdP1dCvb1nzoljO8zuU+2echNLdGvIxdWRZfIhI+oFrA4olMl9NoH1JSETR /P98BPZv2w1xizAeSDQsSRgTXHu4YWR0fiPs4Dv9crGadxUYCb1kqSYcqKZ6PUG6lDOayI z1lkRHpoqeainTtDUs/+1ohuBK3Iz8d3+VsjAdSEDWeyYuo70zxpGHSOo+3JSA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712162580; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4c87JOffUneX1sx9CQX8GynSfXsCoERXSLyvcV6w4YY=; b=PjM7xwfH6RqwdB5edqbC5lBNFJisFokZxV2KclMUm2KXaW3Ea5KqHhTwIheLJm2QbhXMLp 7U6/tO02/xJ9wofeMSwoE8akNGtimMexyMQw/H/hFiKdKF6r+SCz1dN3RW4RXAzeVXMJfE H2FabnBqUnjCRNe+8rTBGLNbUq5cW42/glZGYDEFFj/uANUUS415CYTOGS57HE+YeuIiUb ZkZ8ZfiQH/Gyb5xIIi2aBObNfwmOgj4fe3UD2QB1DvSzCJt06rsEwknW2EreJw6mCMDgMa zqtKOrhQEiArhxvSbO1mMp+u1dM2d4WiIRwvhRbmt8R4hYsoJ0B1s0AWLS/u+Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4V8rCR6xByzg1V; Wed, 3 Apr 2024 16:42: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 433Ggxg0046840; Wed, 3 Apr 2024 16:42:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 433GgxSw046837; Wed, 3 Apr 2024 16:42:59 GMT (envelope-from git) Date: Wed, 3 Apr 2024 16:42:59 GMT Message-Id: <202404031642.433GgxSw046837@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Tuexen Subject: git: e0bd180130b8 - main - tcp: fix conversion of rttvar List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e0bd180130b8c95f568483d0df6abff00d7d2153 Auto-Submitted: auto-generated The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=e0bd180130b8c95f568483d0df6abff00d7d2153 commit e0bd180130b8c95f568483d0df6abff00d7d2153 Author: Michael Tuexen AuthorDate: 2024-04-03 16:39:31 +0000 Commit: Michael Tuexen CommitDate: 2024-04-03 16:39:31 +0000 tcp: fix conversion of rttvar A wrong variable and wrong scaling factors were used. Reported by: Coverity Scan CID: 1508689 Reviewed by: rscheff MFC after: 1 week Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D44612 --- sys/netinet/tcp_subr.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/netinet/tcp_subr.c b/sys/netinet/tcp_subr.c index db335a890b28..860d65249148 100644 --- a/sys/netinet/tcp_subr.c +++ b/sys/netinet/tcp_subr.c @@ -4240,19 +4240,19 @@ tcp_change_time_units(struct tcpcb *tp, int granularity) uint32_t val, frac; val = USEC_2_TICKS(tp->t_rttvar); - frac = tp->t_srtt % (HPTS_USEC_IN_SEC / hz); + frac = tp->t_rttvar % (HPTS_USEC_IN_SEC / hz); tp->t_rttvar = val << TCP_RTTVAR_SHIFT; /* * frac is the fractional part here is left * over from converting to hz and shifting. - * We need to convert this to the 5 bit + * We need to convert this to the 4 bit * remainder. */ if (frac) { if (hz == 1000) { - frac = (((uint64_t)frac * (uint64_t)TCP_RTT_SCALE) / (uint64_t)HPTS_USEC_IN_MSEC); + frac = (((uint64_t)frac * (uint64_t)TCP_RTTVAR_SCALE) / (uint64_t)HPTS_USEC_IN_MSEC); } else { - frac = (((uint64_t)frac * (uint64_t)(hz) * (uint64_t)TCP_RTT_SCALE) /(uint64_t)HPTS_USEC_IN_SEC); + frac = (((uint64_t)frac * (uint64_t)(hz) * (uint64_t)TCP_RTTVAR_SCALE) /(uint64_t)HPTS_USEC_IN_SEC); } tp->t_rttvar += frac; } From nobody Wed Apr 3 17:04:25 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4V8rhB0mxFz5FQNh; Wed, 3 Apr 2024 17:04: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 4V8rh97132z3xF2; Wed, 3 Apr 2024 17:04:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712163866; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2ZBWGeFvxFtGscl1DUoggcObhj/N9SygIAR6UB3pVkQ=; b=chLbupaCnwNC1pPUb8IGCrY5hPUnVbwp8W0PgOqKsX50lEQCsraVt8W3tfJzZiOOyDUDd3 F1+FQG357iNWtzy6EK4O9ihJTgNAUTWe/Cy0fyle0BKFTpaBPfwFCM4ajdmyGg+RbMJsaZ SgcZGlebSAvZWNOBvB5wYazzBZQd5qkZs5zYDqb8lVlm8YCy+wjBjxk9mE5GWrc2Frna7a CXjTSjoO6xu3cPutCC/iG2zMsIWWl1KJTwYCjXWb94TedmB4b/vmWiD0e3y8ZpZeSRUyjb ZYY0QbVJQY9Rgg9TTn84dV6qA0xETtTGzZ20QeNNOA31V+DeL70bXGSz/eOxWQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712163866; a=rsa-sha256; cv=none; b=OlqMASY8l/pW/nlPkFCJ00Y6IzK73kOSmdUIqX6Y6KyQSKaQdKzlxNq1mpi6A6mjpLtWai 7Sg70fT3wHYEUSbXs8uYgDzybX0Ba/eXQ9O+k8J9sEaRYB3d/zZ5CPYD5YALiyPmtyD1xi NFjbw1CyV3lUsZbZsjgqLgb2+/rVFE5Yx+Y3NlNkejB3V/jhfGEOzxPYXIZB42OfVZ4adw nFdkbgK43uJmoxVhMa0Z+FNWMsKJnpFKeFCsjTPstr+tgsF/vMEw8GyVAXdPA79IlqSENO pCunKCzBfo9w+RUilCP49uuq7I2/d7VvG9HsIBvlLa6p1IZDSiEP94gycMe0Ew== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712163866; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2ZBWGeFvxFtGscl1DUoggcObhj/N9SygIAR6UB3pVkQ=; b=o/KgKWZXG0c8GPfyEMvhy9X048/148jrxQkL2vtcYZogyErYBdCxdbt9G/yBPNJserFK4Q UsfkForb2kprDFZDRTTQEfCRkR9vE+Fl1fK3CrXCv4ssOz1+MKnKzW41mLjUbzUub/dgGo ipIKng7rT+Zm01ibYIbZQItrVtW4oR61TwHebhW1RjLfLW0II8HEroesiUxdBBkbvMD3Ns D6xfDZyhbs8Mx5IOWTEOaaWZrorKyA+s/V5zeaWNOYxVVK81yxRgI4Flpheaw7IXa6PnxM CyQEVeHUvEHm1sNwLycdXgr9g66K6cvN+aBkUvbEHRa4fTTy/WNYmpEpl2tq5w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4V8rh96cplzhJZ; Wed, 3 Apr 2024 17:04:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 433H4Pd9082287; Wed, 3 Apr 2024 17:04:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 433H4P7e082284; Wed, 3 Apr 2024 17:04:25 GMT (envelope-from git) Date: Wed, 3 Apr 2024 17:04:25 GMT Message-Id: <202404031704.433H4P7e082284@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mitchell Horne Subject: git: d3de1bd429bc - main - open.2: remove self-reference List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d3de1bd429bc51fbbcb37fadaf2581461edf848b Auto-Submitted: auto-generated The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=d3de1bd429bc51fbbcb37fadaf2581461edf848b commit d3de1bd429bc51fbbcb37fadaf2581461edf848b Author: Christopher Davidson AuthorDate: 2024-04-03 16:38:41 +0000 Commit: Mitchell Horne CommitDate: 2024-04-03 16:55:24 +0000 open.2: remove self-reference Change .Xr reference to .Fn, which quiets a mandoc warning. Reviewed by: mhorne MFC after: 3 days Pull Request: https://github.com/freebsd/freebsd-src/pull/1135 --- lib/libsys/open.2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/libsys/open.2 b/lib/libsys/open.2 index 383dd58b2a31..aac3ef1318f8 100644 --- a/lib/libsys/open.2 +++ b/lib/libsys/open.2 @@ -323,7 +323,7 @@ by the descriptor at the time of the call. .Pp .Dv O_PATH returns a file descriptor that can be used as a directory file descriptor for -.Xr openat 2 +.Fn openat and other system calls taking a file descriptor argument, like .Xr fstatat 2 and others. From nobody Wed Apr 3 17:04:26 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4V8rhC27cvz5FQRV; Wed, 3 Apr 2024 17:04: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 4V8rhC1Djvz3xN4; Wed, 3 Apr 2024 17:04:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712163867; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FRxR0CwKatD+6R+VTtEGDca7req8Se8d9BXQrLfn5Ak=; b=WP+AFqAu8y4KGtuQmRq04X/YqyeYT1iQhbQiF147FNdTZ40jNnyxk2bOQnCErz5rUWMV1a bdcUoSrLXb2r25IYebhCWFq63558a5VWnawQIvQMtOIXwcVdtGvm7oRSP5Vn210B2PLuI5 9ZiZJ3E38rpQJj3JnoGMQKVXa2sUsBm+rFRM8VoS+tYPvitMXc/wd9LEbiEn81jX07u+9H //tz1gCkVBGd6uE4S+TuhXY28BFoxjXG5S4v10KmjjIgqiJBQqHzrfbrkESlFdcI7HNBLJ E67LX/hCHSDHhvBfQmWsPrlmAwchBV7kwtzSNNOESm0+0zVk536rP60tp1VrDQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712163867; a=rsa-sha256; cv=none; b=YGRcQG5kjUs5ZZjoZvjxHvU2eHSjPzMlliXJwTYQ6z2vfnRhOp8JJvWvhPdmtsWrHD9HVF qqavv+qLS73sNaKlKMN+N+1MLr16qSsXLciOfUQ2dJronyeWh47pTVQ57vecvXTEKLaIfV oJbACVZ6STWufyEHyFx09JoLcLv/JyAIn4Ea3OypTu0yaSN5Vm6Stn0mgawIOiCZ7Lh3GO 17aLnhuu9pzFGC85sic7Qp48H/zKXt+TqN9CJqH1t+9fC5MvbxkVt7m1A6oDdwQOcgRhnl C7eubUiv5wYX131V9Rm4kfi5vTK5hN4M7XofVbKNevJmLgpUhSfSA/31a67y9w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712163867; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FRxR0CwKatD+6R+VTtEGDca7req8Se8d9BXQrLfn5Ak=; b=Oo2RNW+PATyS3NOKWzKmmzWqFnNCVddh2dsrfbMdIQAff4yPCw7Gm1Rlgog+kydQ/AYWmS yA169anyIDbBtHbLuN5ThdgKjXE9vFF+d44Wkh/KS/ofNCtAvjHXhjLf9kLjAjoX4Y3iF9 ijPlEDlAAxcAEKfkE8bQOVMKTf2l37uFP8XljtQn2asqVHtA+Jw6VX8oVLV4/m0ny1CgqG i95Ev4t7SBsboVBAAkQkPGLj93sp0ZTa2Q91KeiDl3Qvz+drLjgcvXL9cFqGxrOhGgWhXl E+H8ifn37nVpSpgphekryAFFKtY8W85I7HqVK0QEa9IEttVV7h7igC6br2qYtw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4V8rhC0f33zh5y; Wed, 3 Apr 2024 17:04: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 433H4Qxd082323; Wed, 3 Apr 2024 17:04:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 433H4QYM082320; Wed, 3 Apr 2024 17:04:26 GMT (envelope-from git) Date: Wed, 3 Apr 2024 17:04:26 GMT Message-Id: <202404031704.433H4QYM082320@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mitchell Horne Subject: git: 2ebc7806a1e4 - main - mount_mfs.8: remove self-reference List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2ebc7806a1e4f4cd82a21a123ee5078ca6c4b113 Auto-Submitted: auto-generated The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=2ebc7806a1e4f4cd82a21a123ee5078ca6c4b113 commit 2ebc7806a1e4f4cd82a21a123ee5078ca6c4b113 Author: Christopher Davidson AuthorDate: 2024-04-03 16:43:51 +0000 Commit: Mitchell Horne CommitDate: 2024-04-03 16:55:55 +0000 mount_mfs.8: remove self-reference Change .Xr instances to .Nm, which quiets several mandoc warnings. Reviewed by: mhorne MFC after: 3 days Pull Request: https://github.com/freebsd/freebsd-src/pull/1135 --- sbin/mdmfs/mdmfs.8 | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/sbin/mdmfs/mdmfs.8 b/sbin/mdmfs/mdmfs.8 index 6824e5ccac03..50819bfee0c6 100644 --- a/sbin/mdmfs/mdmfs.8 +++ b/sbin/mdmfs/mdmfs.8 @@ -61,7 +61,7 @@ filesystem The .Nm utility is designed to be a work-alike and look-alike of the deprecated -.Xr mount_mfs 8 . +.Nm mount_mfs . The end result is essentially the same, but is accomplished in a completely different way. Based on @@ -149,7 +149,7 @@ it uses the default arguments to all the helper programs. The following options are available. Where possible, the option letter matches the one used by -.Xr mount_mfs 8 +.Nm mount_mfs for the same thing. .Bl -tag -width indent .It Fl a Ar maxcontig @@ -404,10 +404,10 @@ Mount a vnode-backed cd9660 file system using automatic device numbering: The .Nm utility, while designed to be compatible with -.Xr mount_mfs 8 , +.Nm mount_mfs , can be useful by itself. Since -.Xr mount_mfs 8 +.Nm mount_mfs had some silly defaults, a .Dq compatibility mode is provided for the case where bug-to-bug compatibility is desired. @@ -421,7 +421,7 @@ or (as returned by .Xr getprogname 3 ) . In this mode, the following behavior, as done by -.Xr mount_mfs 8 , +.Nm mount_mfs , is duplicated: .Bl -bullet -offset indent .It From nobody Wed Apr 3 17:04:28 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4V8rhD4LcDz5FQZH; Wed, 3 Apr 2024 17:04: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 4V8rhD20ncz3xdb; Wed, 3 Apr 2024 17:04:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712163868; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=095RO62pey8qCfvb0BhD/dvtUUu3eKJi8auZttRVR/c=; b=OJqL+ZJRyDogQ53UZLwtGz2o/ijv1/odeMopRuGLwykgiYpoIpGgu9ePO1xRNhDvzuPCw/ ILEVFUh2FIn+Dtz1byba8C0uOjV9/YjmuO28K795fRUUaxfiwgr+paLubNRIMjdhvGjQ9G 1/EZuoVH7jICe86uOTWXIr438KE4w5U9YuNVj+Q5g8GcOr2pedHL+IV4CRpGVKZ2Ilr2y+ Mu2Fd4oxLIjvi899qSvo37f6gjjKmVkdBwY37z4ZegtI1gMcTqFFV+f71UHKTlg4Lx92vo Ag9Bgop5d5m1m0iI3f5kS47e3bssWJQOpsnTOW4/YJ0RvvG+5HPq5h6kvuKMYA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712163868; a=rsa-sha256; cv=none; b=bwI+/nxtdDxc9m5MkLNFxOypaZ94On9UBVEExvWxEtH1W7c7ccTFUnCF9IzHwqfVEpj7kr /+rfrfs1rKvhTzB6XBqb2bSaYKD6AfUMTYIt2mhpGeHnuRNz7dXNmNYVJx9YYJYVNZSAFv Bpjd4LM12Nv46X2jV6BMdqsjZZCxiXL3EEkX16LE9alCUMMODmTsSdEOjCOUkojojRXqtX 3YL5kPGsHCm9tkh9mnQdKAB0P91QDD57bgkMl3rVTksPGlvzOhj7Yl6CcnAKDvUItt9ol/ 6I/Xz+qsECfaagiyUwV3S4cm9CQQUcZNbYTvL+wfVHm57Feqk2wQsE+9H+rPvg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712163868; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=095RO62pey8qCfvb0BhD/dvtUUu3eKJi8auZttRVR/c=; b=BsZLPSFWygSYWpqOlSRTjUQMbcjRuwpN8J6rjmjIx37Tp2L/UTwXOnwj6bxtiK/HcySoO4 CDdJf1SOED2hU1IYz5Z0wkkiersNKWpYNdXZZRIMRHiRKm/sdWXkN18kvrp/qAoqUMVTfv LUuA7k/e1WGfQSaIUVDUK2AUsVIaZnZ8l613ugeXgY8MtGixMCHVIn7OaZJsBVIfqdFklA rxSU5KmrkfBFUUaneTS/VlhqVX+gFkvXy6Y439TBaw6Sr9I9KzEGnkkdZxTwPVTEFc1fDV Cy4ecVvJMPRT5nPSba7BlPixpWu2r30M2A6PmCI5iRZ5+IvkEI0iqMXNkF1x2w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4V8rhD1Zb8zhGn; Wed, 3 Apr 2024 17:04: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 433H4S7x082359; Wed, 3 Apr 2024 17:04:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 433H4Sou082356; Wed, 3 Apr 2024 17:04:28 GMT (envelope-from git) Date: Wed, 3 Apr 2024 17:04:28 GMT Message-Id: <202404031704.433H4Sou082356@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mitchell Horne Subject: git: f8ce29b63181 - main - cfumass.4: remove self-reference List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f8ce29b63181912e01625addb47168e987d9bbed Auto-Submitted: auto-generated The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=f8ce29b63181912e01625addb47168e987d9bbed commit f8ce29b63181912e01625addb47168e987d9bbed Author: Christopher Davidson AuthorDate: 2024-04-03 16:47:14 +0000 Commit: Mitchell Horne CommitDate: 2024-04-03 16:56:03 +0000 cfumass.4: remove self-reference Change .Xr to .Nm, which quiets a mandoc warning. Reviewed by: mhorne MFC after: 3 days Pull Request: https://github.com/freebsd/freebsd-src/pull/1135 --- share/man/man4/cfumass.4 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/man/man4/cfumass.4 b/share/man/man4/cfumass.4 index ff7225b66314..bde9b2d6a598 100644 --- a/share/man/man4/cfumass.4 +++ b/share/man/man4/cfumass.4 @@ -57,7 +57,7 @@ To use .Nm : .Bl -bullet .It -.Xr cfumass 4 +.Nm cfumass must be loaded as a module or compiled into the kernel. .It The USB Mass Storage template must be chosen by setting the From nobody Wed Apr 3 17:04:29 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4V8rhF5Zgnz5FQJP; Wed, 3 Apr 2024 17:04:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4V8rhF33N1z3xdn; Wed, 3 Apr 2024 17:04:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712163869; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=72WYOyh+Oqs0WSOQ7MzI4dZWQYuZtaBMdte9O/v/2f0=; b=dpHIAFMaQs4yeoOMNBIOvaW8edxEpEKqoNVbga2OVSQ5fhxpDeVZ7rtM0zuN135Hpcb5OI Z/bWwGbTjtT/JoMVjyKP8vPuhvg5al/1PPmYlhrlkkp+XIk25CIKCAXoY4DG4jLMIOTGlB IIhlXCOhY4aGwOjIskPLUGQB+52/wjO5Xa5GTXUzXrz2bwOVQ82egy3vKCMYdDCICCad8h QVOB3l79CtKpkSVhyCZo22xJ+TrnsUC90kT8o+/JAj8y+0AR8RAM0RR+z3xla6DHPr/+z3 yBJT8uQg0rRV1zJnmrUf8i76hmfT8xUi1CI+NEx6ZSl/RE/P3n8dcQgN8nmOTA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712163869; a=rsa-sha256; cv=none; b=AQED8sXmywMdGim9OkJLPffTQEORc5JgzUbzKFnU+Z5c2tdKiVRDdCX+8wz7dzBUrPZCp2 lhihmud/jyEUqXyED8SRwfOK5l9QY+PEbrwonqQrbDIybxxV5REVIfaCF56pxOs/Y4BXkQ wjAd2ItYtk5aGy7v5hsXIxZvPcJLWMoKhyJPM1dOtDMF3fX7BqEtuHltw5QKzW+H0UINWa H4oVZVO55oAoOpvfVas+XC89CRPaQi3C+/BY3c7LGZlWO5HfELjfSc+TVjk0Bnp0XztkET gvyfMxRny15i9bgdu/UbKp5EKgu105vV4fs1GdRaUd9XJlyqFqFbaBknSYrPfg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712163869; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=72WYOyh+Oqs0WSOQ7MzI4dZWQYuZtaBMdte9O/v/2f0=; b=IYyq8R6uY6FxGujr2u9KQC5KXLuUo009Trjv1lSTQAWMAz1oTD+Wr0ijFaeEbOtPvXMiBB X8NNIuredlpl1myRAwd0zAYbnDhfYbnGMzZUVRbitSjRdVhbCgF2zEdqjsdhRXI7G/ugg1 m50ITODtwWh/nc6uObzLevsR8dJBPZCPN3QOAev7bSBD+dXB33Sti4OgXhpC4eaM1i3xC/ W02qTs078BESLx6qKPPEkWMOuWeEi8bsu7BcKCPqA/24GHPsGsYuevYS+WnH5Vbon8vLhr r+xXyTg+dk+B4tcYeEXrSCUkRU3hW5K+6hkd/x1v/w+Bs20RgfarU8hBvQsCQg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4V8rhF2ZywzhJb; Wed, 3 Apr 2024 17:04:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 433H4TM1082395; Wed, 3 Apr 2024 17:04:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 433H4Tee082392; Wed, 3 Apr 2024 17:04:29 GMT (envelope-from git) Date: Wed, 3 Apr 2024 17:04:29 GMT Message-Id: <202404031704.433H4Tee082392@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mitchell Horne Subject: git: f9ea7b6e8253 - main - device_add_child.9: remove self-reference List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f9ea7b6e8253273ebb1023c4380a305e6d3cf02b Auto-Submitted: auto-generated The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=f9ea7b6e8253273ebb1023c4380a305e6d3cf02b commit f9ea7b6e8253273ebb1023c4380a305e6d3cf02b Author: Christopher Davidson AuthorDate: 2024-04-03 16:48:40 +0000 Commit: Mitchell Horne CommitDate: 2024-04-03 16:56:07 +0000 device_add_child.9: remove self-reference Change .Xr to .Nm, which quiets a mandoc warning Reviewed by: mhorne MFC after: 3 days Pull Request: https://github.com/freebsd/freebsd-src/pull/1135 --- share/man/man9/device_add_child.9 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/share/man/man9/device_add_child.9 b/share/man/man9/device_add_child.9 index 7e97f7de4963..423869d6ff6b 100644 --- a/share/man/man9/device_add_child.9 +++ b/share/man/man9/device_add_child.9 @@ -111,10 +111,10 @@ When adding a child to another device node, such as in an identify routine, use .Xr BUS_ADD_CHILD 9 instead of -.Xr device_add_child 9 . +.Fn device_add_child . .Xr BUS_ADD_CHILD 9 will call -.Xr device_add_child 9 +.Fn device_add_child and add the proper bus-specific data to the new child. .Fn device_add_child does not call From nobody Wed Apr 3 17:04:30 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4V8rhG5plqz5FQX5; Wed, 3 Apr 2024 17:04:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4V8rhG3wSvz3xmw; Wed, 3 Apr 2024 17:04:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712163870; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OOw6j1U5q8P/UpweEedSgfAA9AzlOD1Y6Fh9cBLzYXI=; b=UsHwCagm0flgSHliLOXC53aqc+7fzTr62SKOdidGCsF9UB5uSCQV/kKaSd8867ehhoW1cB 8ltJIMSdD5SnrHPnqwSFyDMEje02sEFlx/kZGdERl/lv+vwLJipvI6RhDyaw/DYVDVa7l6 iEqQf/K1/vsSfa8ceaMRzKNt+Natd1id487OmN8ZQYkKxgXQuhriHs+uBaG7Wa00Lidqcd X8eAFnVw+n8yk6I/hZVATbOBMiYlV88jNPE5rciTeYIEUWshMjhX2IfTxllEpGk4MsJFIS Q7sEirphyqhenMSc62H6uTpIA+4HbCmhfXp+oaKMksaLvIUsu+khjuv2twolVQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712163870; a=rsa-sha256; cv=none; b=LXHePuLVfs4xTiVimWRwR/Jd8w3YXLMIbSOz+LhofI6SY+thZUvx/vCSQGwY5ELZQlDhH+ T88onJUhJWZ5QsicksR6MYVOjGH9py4ameY71tGqDTy/PJ07qt/MyCn8DNnyS39xKH3RNn cipk3CJ7DbDP5tYlOgFM+ikNd6wY71DukaIGJHilgx7swneNST8f8EjIiyL/W4ry5UD3Vw qK97t5vg3tkH09t00PUIAQWNRfHKS09TUMDcH7uFMg8mDbrMF3+iWtWUfZ47tM5xlgYzmO W+4Hi/QWQGfHWELx/u1x1dR3K8aDRz71hHZ6Glxfb5l5KX9PqnK0vb93yAVv2Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712163870; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OOw6j1U5q8P/UpweEedSgfAA9AzlOD1Y6Fh9cBLzYXI=; b=jqKUFEjZDh7TlIVTTZ/OUc1XMBveAm4lj6eZZNWMGSQhQHyckh5xsrp6LG9bh7zkaQc1gA +OHBMT/oZGvuvphgexHIJ5+/aDXSm76hay7YmNGgxr8Koo3/gw3jzmTppGtwPmln97QWG0 ZI+Kx1l+XSKAmFCVvrcaUbJ6g14UmMxFbx86FJb6vaXSMEsSrRAUazfFnNmtz7qzr7dnUA IiPIkgUGi29eYqOjqBqPVnY0WgcRp2d9t6ntYS6O+DWSoJSeteZUSOBah3sWMspn3qFyEC bX29iuQAlJnkA8UTI/4G9tw+OrbhCiIP1YdrH/IDtOhAoY8rwBQwj9MSxi6tuA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4V8rhG3Xn5zhGp; Wed, 3 Apr 2024 17:04:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 433H4Ui6082432; Wed, 3 Apr 2024 17:04:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 433H4Ujb082429; Wed, 3 Apr 2024 17:04:30 GMT (envelope-from git) Date: Wed, 3 Apr 2024 17:04:30 GMT Message-Id: <202404031704.433H4Ujb082429@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mitchell Horne Subject: git: 81727a3dd382 - main - bhnd_erom.9: remove self-reference List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 81727a3dd38287d437d1e7e416dd89107a706e55 Auto-Submitted: auto-generated The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=81727a3dd38287d437d1e7e416dd89107a706e55 commit 81727a3dd38287d437d1e7e416dd89107a706e55 Author: Christopher Davidson AuthorDate: 2024-04-03 16:51:48 +0000 Commit: Mitchell Horne CommitDate: 2024-04-03 16:56:11 +0000 bhnd_erom.9: remove self-reference Change .Xr to .Fn, which quiets a mandoc warning. Reviewed by: mhorne MFC after: 3 days Pull Request: https://github.com/freebsd/freebsd-src/pull/1135 --- share/man/man9/bhnd_erom.9 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/man/man9/bhnd_erom.9 b/share/man/man9/bhnd_erom.9 index f55472d71bd7..1e8101f011cf 100644 --- a/share/man/man9/bhnd_erom.9 +++ b/share/man/man9/bhnd_erom.9 @@ -204,7 +204,7 @@ hardware core must be provided using the .Fa eio argument. The registers can be mapped using -.Xr bhnd_erom_io_map 9 . +.Fn bhnd_erom_io_map . .Pp On devices that do not provide standard .Xr bhnd_chipc 4 From nobody Wed Apr 3 17:51:47 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4V8sl43m2Sz5FVwm for ; Wed, 3 Apr 2024 17:52:00 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Received: from mail-wm1-f46.google.com (mail-wm1-f46.google.com [209.85.128.46]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4V8sl40Bt3z44RS for ; Wed, 3 Apr 2024 17:52:00 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-wm1-f46.google.com with SMTP id 5b1f17b1804b1-41624ebc521so709745e9.1 for ; Wed, 03 Apr 2024 10:51:59 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712166718; x=1712771518; h=to:references:message-id:content-transfer-encoding:cc:date :in-reply-to:from:subject:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=HmOdo7bXF2SlTTzWHdwu26dyp/IelbW5zybPj5j/vEA=; b=eYf67dJ8J7+v8pFWJQ0Z9hWnTpNBrTbQuQ6mbWfDx6fLOSOgIlSyh4a/bPpf5Cm/dH ZWubic4GoEWid+U+CF8HWmsQwahYONCtEgBhebXJDOXkPu+oZ4D18BG9AMTVPO8qKZIM ZwHfQvkFaq/9J8eg7vd99qYF/H9M7eb4LJ+qWVgQn/pbfnNxtrNZhAf2oiHQp81Mn98B Lh5olp/dhcPskr97derbA+TwkMzUh3rl+3Ym472Y4Ij/OLsIKNO3OpsDLplPE8auM4bd OQws94vxVxqLFVt0XYqHAO7P1jNNKd6kZxslwArCSQEqDT1E8YOk+oeLKEIt6QeZHYDK PvAA== X-Forwarded-Encrypted: i=1; AJvYcCWUFQ3HXJte9Xl+lhRLu+ojkEbljox/xPUd4R29V4IxDC9+CyVEYhKDaoZY0aEibUXEe5FlqfXhhjIIvsILyybdofQJTEzgnSoG1uVG4M/Q X-Gm-Message-State: AOJu0YxY1B8V6kyxFUayZAKnLA0oSBiZD1wdR/hPjBD3AWs5mfdW5g03 AbDBDMDpjOi8RL05Wen6UdfIs/HAQ6i2marxMNT7cdajv2iLWWwH/34Dq+9h7H8= X-Google-Smtp-Source: AGHT+IEzKfc/VWgoKqfpDq8j7+ZCGnCHFbgjpljVd7PR4Vu8QauzL1u/m8yFicjDHaxCKx5KNzIw4Q== X-Received: by 2002:a05:600c:63c2:b0:415:611c:cb1a with SMTP id dx2-20020a05600c63c200b00415611ccb1amr257062wmb.1.1712166718211; Wed, 03 Apr 2024 10:51:58 -0700 (PDT) Received: from smtpclient.apple ([131.111.5.246]) by smtp.gmail.com with ESMTPSA id g17-20020a05600c001100b004155a32841bsm15039579wmc.39.2024.04.03.10.51.57 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 03 Apr 2024 10:51:57 -0700 (PDT) Content-Type: text/plain; charset=utf-8 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3774.200.91.1.1\)) Subject: Re: git: aada453dcbaa - main - ddb: Properly pretty-print non-labeled enum values From: Jessica Clarke In-Reply-To: <202404031618.433GIPbq096540@gitrepo.freebsd.org> Date: Wed, 3 Apr 2024 18:51:47 +0100 Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Content-Transfer-Encoding: quoted-printable Message-Id: <452E6F8D-21DC-47B6-AE4F-F4A2C4790F0B@freebsd.org> References: <202404031618.433GIPbq096540@gitrepo.freebsd.org> To: =?utf-8?Q?Bojan_Novkovi=C4=87?= X-Mailer: Apple Mail (2.3774.200.91.1.1) X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US] X-Rspamd-Queue-Id: 4V8sl40Bt3z44RS On 3 Apr 2024, at 17:18, Bojan Novkovi=C4=87 = wrote: >=20 > The branch main has been updated by bnovkov: >=20 > URL: = https://cgit.FreeBSD.org/src/commit/?id=3Daada453dcbaab1b8f7d50b66add5a38e= b9e06cc3 >=20 > commit aada453dcbaab1b8f7d50b66add5a38eb9e06cc3 > Author: Bojan Novkovi=C4=87 > AuthorDate: 2024-04-03 15:47:00 +0000 > Commit: Bojan Novkovi=C4=87 > CommitDate: 2024-04-03 16:17:11 +0000 >=20 > ddb: Properly pretty-print non-labeled enum values >=20 > The ddb pretty-printer currently does not print out enum values = that > are not labeled (e.g. X | Y). > The enum printer was reworked to print non-labeled values. >=20 > Reported by: jrtc27 > Fixes: c21bc6f ("ddb: Add CTF-based pretty printing") > Approved by: markj (mentor) > --- > sys/ddb/db_pprint.c | 11 ++++++----- > 1 file changed, 6 insertions(+), 5 deletions(-) >=20 > diff --git a/sys/ddb/db_pprint.c b/sys/ddb/db_pprint.c > index 8aa14550f068..b4116372cf65 100644 > --- a/sys/ddb/db_pprint.c > +++ b/sys/ddb/db_pprint.c > @@ -225,13 +225,14 @@ db_pprint_enum(db_addr_t addr, struct = ctf_type_v3 *type, u_int depth) > for (; ep < endp; ep++) { > if (val =3D=3D ep->cte_value) { > valname =3D db_ctf_stroff_to_str(&sym_data, ep->cte_name); > - if (valname !=3D NULL) > - db_printf("%s (0x%lx)", valname, (long)val); > - else > - db_printf("(0x%lx)", (long)val); > - break; > + if (valname !=3D NULL) { > + db_printf("%s (0x%lx)", valname, val); > + break; > + } This ignored the "(well, with 32-bit fixed)" part of my review comment = for that suggestion and rolled back d722901fa3a2 ("ddb: Fix format string errors = in db_pprint.c"). Jess > } > } > + if (ep =3D=3D endp) > + db_printf("0x%lx", val); > } >=20 > /* From nobody Wed Apr 3 17:53:17 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4V8smp2m9Kz5FWTt for ; Wed, 3 Apr 2024 17:53:30 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Received: from mail-wm1-f53.google.com (mail-wm1-f53.google.com [209.85.128.53]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4V8smp0fj3z44wQ for ; Wed, 3 Apr 2024 17:53:30 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-wm1-f53.google.com with SMTP id 5b1f17b1804b1-41569f1896dso594615e9.2 for ; Wed, 03 Apr 2024 10:53:30 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712166808; x=1712771608; h=to:references:message-id:content-transfer-encoding:cc:date :in-reply-to:from:subject:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=82vW2Nv0K9oBl4CIzeODksQT3xkLutQmmNzOD3XALvc=; b=N3tQUDWnFuPGEgl4IC8QeclO/2Xga9po0TXSDeHmVeb/pZr85H6S/ovXLR5UK5V7jz PGZUZx9FbxmJVuUGrSuY/+/z1VuJIcNe2SRr43QLk6+F9SuhG/pfyUGY6q9xC7pHAFX3 /gDLaInjNkLZBANmclcfCF6pyybSUjsd4Rjg9uaeRwsx4LvxSTVklcK43vdCzSSDEsAs 4xpmtxcgupDj63I19OnpI9pPgPB4OygQ4SclPUeUqvXFqZ3zAWcqxZnuH2S9Fk2kBvCc gIJ/XnLAenZwUm8BX+KLIPY1ZLFmMXUYBvrk/GJuru7kaz0IU9uXc81AEUG2qJZdpcx+ pSfg== X-Forwarded-Encrypted: i=1; AJvYcCXm8MbN0KYHbTqPjf5Dnm+6qntW3ISdUxST7YtNtClLC0L+1plze1ZZYlJ5CIAH0BfWRkfIIl6hFa9GjpdJKuMLPqd2U47Vif22gO9bRAx/ X-Gm-Message-State: AOJu0YwkNoWiExxJIc8EjObINxqaHlChdrPYHVJkE4Mgfbu2OUagLsBi ndvixom9DTqtpDzIeOIpPVVRgx/YFno4L+bIPTG+xEs0UI4tEuYFVyplsx3nRcg= X-Google-Smtp-Source: AGHT+IEczbWbjrJiAZGWqXJqoauSPrnPEa2lifIeSkFs2nQBA8+LkKwtvgk+HOWvM9tYLtzMwq4Wng== X-Received: by 2002:a7b:c303:0:b0:416:1e4d:497a with SMTP id k3-20020a7bc303000000b004161e4d497amr200553wmj.25.1712166808372; Wed, 03 Apr 2024 10:53:28 -0700 (PDT) Received: from smtpclient.apple ([131.111.5.246]) by smtp.gmail.com with ESMTPSA id c9-20020a7bc2a9000000b0041552dbc539sm17486000wmk.11.2024.04.03.10.53.27 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 03 Apr 2024 10:53:27 -0700 (PDT) Content-Type: text/plain; charset=utf-8 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3774.200.91.1.1\)) Subject: Re: git: 872c4402af13 - main - ddb: Don't throw away qualifier when pretty-printing unnamed pointers From: Jessica Clarke In-Reply-To: <202404031618.433GIQUx096602@gitrepo.freebsd.org> Date: Wed, 3 Apr 2024 18:53:17 +0100 Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Content-Transfer-Encoding: quoted-printable Message-Id: <7D6B67DF-D648-49F2-A03B-D7F9A509CA79@freebsd.org> References: <202404031618.433GIQUx096602@gitrepo.freebsd.org> To: =?utf-8?Q?Bojan_Novkovi=C4=87?= X-Mailer: Apple Mail (2.3774.200.91.1.1) X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US] X-Rspamd-Queue-Id: 4V8smp0fj3z44wQ On 3 Apr 2024, at 17:18, Bojan Novkovi=C4=87 = wrote: >=20 > The branch main has been updated by bnovkov: >=20 > URL: = https://cgit.FreeBSD.org/src/commit/?id=3D872c4402af1325ed156d7f5ee2252dd3= 6b016b5c >=20 > commit 872c4402af1325ed156d7f5ee2252dd36b016b5c > Author: Bojan Novkovi=C4=87 > AuthorDate: 2024-04-03 15:55:13 +0000 > Commit: Bojan Novkovi=C4=87 > CommitDate: 2024-04-03 16:17:54 +0000 >=20 > ddb: Don't throw away qualifier when pretty-printing unnamed = pointers >=20 > Reported by: jrtc27 > Fixes: c21bc6f ("ddb: Add CTF-based pretty printing") > Approved by: markj (mentor) > --- > sys/ddb/db_pprint.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) >=20 > diff --git a/sys/ddb/db_pprint.c b/sys/ddb/db_pprint.c > index b4116372cf65..8e6759a03220 100644 > --- a/sys/ddb/db_pprint.c > +++ b/sys/ddb/db_pprint.c > @@ -276,7 +276,7 @@ db_pprint_ptr(db_addr_t addr, struct ctf_type_v3 = *type, u_int depth) > if (name !=3D NULL) > db_printf("(%s%s *) 0x%lx", qual, name, (long)val); > else > - db_printf("0x%lx", (long)val); > + db_printf("(%s *) 0x%lx", qual, (long)val); At this point, why not just: db_printf("(%s%s *) 0x%lx", qual, name !=3D NULL ? name : "", = (long)val); Jess From nobody Wed Apr 3 18:14:26 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4V8tDy23xHz5FYHY; Wed, 3 Apr 2024 18:14: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 4V8tDy1X5vz4769; Wed, 3 Apr 2024 18:14:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712168066; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XJ0RssIQFDhPEqYwmDE8YIo1+YEgQpprj+HkZmfkfJE=; b=FfBfZMeHF7oQhHq/aURqa+hIe0Tm/0pDJmLL7LQz//kwFMSt+P2D7ESzeI0wCTW8dcIvw1 Xtht3ydhaxCHaQXPCk9LGdNlBoFuPSX8JnmZR7Z6f4Ww9Y/114oDqGvQ/E+16hYmUTFGgM 8VHEdsKGb9CSkcQABRbb0pKt00+rdpJTyZU4cpcItjhA0LYumY8tvribm0OKfp96eZX/1F 6MW4lZxC/fhWwmvQHutpiogjDwffms0hx8euRwa29NHkv8cPSaL2iZCUF0uW+hz34jo2au zhDNDy3zTXmLHgJNpn1YZtUoHyYzlRriUoCqW8He64W1T4/PuZ8UfnhB7kn86A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712168066; a=rsa-sha256; cv=none; b=yXH3WCE8EhViSv8j1qKqhDIEBJjrDUXAlJL1bW9ursfKEiHVcd1wQN+6mhzzI0GFaMlKKS pj4jvgAv30S3Py/TMLPkpsVvrpiqyYqERxwENnSwJEATyoWe8ktou/aTF1bygKjVXKXRaC vHEDKaCXb5YzrKvFeR0z16/FryOrCdIbX5xZLQNxVXuTHpekX/V9LQa3RANS4p0w5NbaFy 90QsRwqgG+QWj8I3eKriKtKcWsTVZyIDeX8kj7e2XrbOIPI4/pLgpf3/L+rhcQSfQAii02 5S4PY0gAP3JUiCRvAfslkXjkIzLKLJZRA5U1JfZKHjaURuSlIiTZ/vMNRdYn0Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712168066; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XJ0RssIQFDhPEqYwmDE8YIo1+YEgQpprj+HkZmfkfJE=; b=AknJDbSl/JvErgu2KDdxTv9/sBzAfEUDpZ5cdxD1PcXpZY/SjaTNopkGx+lVcy1K0FcVXo PwKSuR4RCNBjwA3JOlmIXDIFR3opBaYP5LmoJez3lhzw8QY2YXeweUJaLlYo5HTIA4ra/d 2Qy7kdKsoBbCFw57dllLbkpVZYa5LcCFGr/snRyxJKdI5dW0MDonTbPEM/HGdDpUDCsl34 VQGMFL6gybI74KgKcG0HB46DOb44ag134Ob8hjwfP93G/Kg7Qa0fciVFAEtywtNlHGMoIW JovKZZi8VxiUoQFWoFFHS67/N21juprj0aR0vciXWHHVmwMNQLnOnattP+UVoQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4V8tDy14KNzjtl; Wed, 3 Apr 2024 18:14: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 433IEQHe000444; Wed, 3 Apr 2024 18:14:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 433IEQhD000441; Wed, 3 Apr 2024 18:14:26 GMT (envelope-from git) Date: Wed, 3 Apr 2024 18:14:26 GMT Message-Id: <202404031814.433IEQhD000441@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: d627293f03c1 - main - ddb: Fix format string errors in db_pprint.c List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d627293f03c1b5908adc440f2008c02662b94cd5 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=d627293f03c1b5908adc440f2008c02662b94cd5 commit d627293f03c1b5908adc440f2008c02662b94cd5 Author: Mark Johnston AuthorDate: 2024-04-03 18:12:45 +0000 Commit: Mark Johnston CommitDate: 2024-04-03 18:14:13 +0000 ddb: Fix format string errors in db_pprint.c Reported by: bapt Fixes: aada453dcbaa ("ddb: Properly pretty-print non-labeled enum values") --- sys/ddb/db_pprint.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/ddb/db_pprint.c b/sys/ddb/db_pprint.c index 8e6759a03220..10334ce650c8 100644 --- a/sys/ddb/db_pprint.c +++ b/sys/ddb/db_pprint.c @@ -226,13 +226,13 @@ db_pprint_enum(db_addr_t addr, struct ctf_type_v3 *type, u_int depth) if (val == ep->cte_value) { valname = db_ctf_stroff_to_str(&sym_data, ep->cte_name); if (valname != NULL) { - db_printf("%s (0x%lx)", valname, val); + db_printf("%s (0x%lx)", valname, (long)val); break; } } } if (ep == endp) - db_printf("0x%lx", val); + db_printf("0x%lx", (long)val); } /* From nobody Wed Apr 3 18:29:44 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4V8tZd0q2Zz5FZZq; Wed, 3 Apr 2024 18:29: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 4V8tZd0Lqpz49QV; Wed, 3 Apr 2024 18:29:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712168985; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=q4MzCsMY/ONUV/cZcLed0hZuIMmwmOs+ISAcN3SFutg=; b=hEAoP9lK2crHj2P6+IMcf15sKF6kNsVpzKNGUZMtA0jP/VNuJ9JhzI9b3mdTjp7Ut2IPEQ 5gVx0uUCPdwZrMouFg845UNppomaExRI08y8sn3DcWxCqFo0XUuRw0pMLxISS4TJlt44Vx Dg7xd0/sGPO2UYEuXhfCGeb5TB7MfLcpCiKRj0qWGc8yU4VrL+HCpsawcZ+R4200NKmDTm SZE1gO4T24dtxGis4Pu62byXODT4SKIpSKyUX1euduSr9/V/kqdw5qlQnYKgCkwi0UJ+cK ThYCIJiXzyssLrFZ1NoWCijpCz5RSsP6R17c6jqsSg8s5pNbIXN5Gvr5sBAZ8A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712168985; a=rsa-sha256; cv=none; b=J+WAkkLVwPV4YrGyQxEo8K/FB4ahhVWTdfQC2iUQcOpGgreU71hRa6yykaMRjVm29Cbj6K uHCCdRbzDrp9xbvJLYjxjdxQ1KyCAE4p/WRE191yQcGbBu8Fs8JuVXfTSOPMqHfZOhDjJ8 XaMrfueh7xhmZz/FJh3/TY6ftq0q95eaPRET+KS0+I1ykuYCeMV7kFyzisyFAiOB+Rh4Wi UyliacaLlgDCdeZ1d6iTc0ePsGdDmg+pmN6xv+DWwEq9vPMihAlA3RYDPhNjvpxfvq48PC RjbpnASroAwKUtwjrjGoR144y+PEWBcnsPuomHAW50Obe/kYGCSKOx0U4+RLKw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712168985; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=q4MzCsMY/ONUV/cZcLed0hZuIMmwmOs+ISAcN3SFutg=; b=rJ7neFZLrPtvlKgXTTBdVvgO6kmoCqOeRsGsdCiH9lHtgsIOawX5o+8cFi5Je5whyPa4VL RGpntCN4rgbJCx+jhvpQOQ8d/LWaVEuXLMYTgextnWu3GGS5ZKXRNDS1LlT8ATbxSCX9Ks 6AA/jWPCludJgjZVWEc80XK1NFnfoPn/0a0CTNZOsO5AJv6vfLrcHEcXHIm0qvaQNx0UZe 4oxw2RKJHrRNYgk2Cf1oEUjSzXbRPK/A7j40InF3AszUx/aPwNE2Yd/lxPriwDowv/ggxW Y2s8A9HjRkjicfszVmBnjLFjgfoZNcq4x2AxVMjKOz1NE4eHDY7Lx3qhOz286A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4V8tZc73qHzkWJ; Wed, 3 Apr 2024 18:29: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 433ITig0017787; Wed, 3 Apr 2024 18:29:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 433ITi8t017784; Wed, 3 Apr 2024 18:29:44 GMT (envelope-from git) Date: Wed, 3 Apr 2024 18:29:44 GMT Message-Id: <202404031829.433ITi8t017784@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Li-Wen Hsu Subject: git: c7bdc25d415a - main - savecore(8): Complete libxo transition List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: lwhsu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c7bdc25d415af40cefbb0442b75318ae7028ea7f Auto-Submitted: auto-generated The branch main has been updated by lwhsu: URL: https://cgit.FreeBSD.org/src/commit/?id=c7bdc25d415af40cefbb0442b75318ae7028ea7f commit c7bdc25d415af40cefbb0442b75318ae7028ea7f Author: Yan-Hao Wang AuthorDate: 2024-04-03 18:28:30 +0000 Commit: Li-Wen Hsu CommitDate: 2024-04-03 18:28:30 +0000 savecore(8): Complete libxo transition Reviewed by: des MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D41392 --- sbin/savecore/savecore.c | 50 +++++++++++++++++++++++++----------------------- 1 file changed, 26 insertions(+), 24 deletions(-) diff --git a/sbin/savecore/savecore.c b/sbin/savecore/savecore.c index fe42eb66eaae..5ba7e62e7d6c 100644 --- a/sbin/savecore/savecore.c +++ b/sbin/savecore/savecore.c @@ -335,7 +335,8 @@ write_header_info(xo_handle_t *xostdout, const struct kerneldumpheader *kdh, printheader(xoinfo, kdh, device, bounds, status); xo_close_container_h(xoinfo, "crashdump"); xo_flush_h(xoinfo); - xo_finish_h(xoinfo); + if (xo_finish_h(xoinfo) < 0) + xo_err(EXIT_FAILURE, "stdout"); fclose(info); return (0); @@ -433,7 +434,7 @@ check_space(const char *savedir, int savedirfd, off_t dumpsize, int bounds) if (fstatfs(savedirfd, &fsbuf) < 0) { logmsg(LOG_ERR, "%s: %m", savedir); - exit(1); + exit(EXIT_FAILURE); } spacefree = ((off_t) fsbuf.f_bavail * fsbuf.f_bsize) / 1024; totfree = ((off_t) fsbuf.f_bfree * fsbuf.f_bsize) / 1024; @@ -1123,7 +1124,7 @@ DoFile(const char *savedir, int savedirfd, const char *device) if (checkfor) { printf("A dump exists on %s\n", device); close(fddev); - exit(0); + exit(EXIT_SUCCESS); } if (kdhl.panicstring[0] != '\0') @@ -1275,7 +1276,8 @@ nuke: "error while clearing the dump header: %m"); } xo_close_container_h(xostdout, "crashdump"); - xo_finish_h(xostdout); + if (xo_finish_h(xostdout) < 0) + xo_err(EXIT_FAILURE, "stdout"); free(dumpkey); free(temp); close(fddev); @@ -1300,7 +1302,7 @@ devify(int argc, char **argv) devs = malloc(argc * sizeof(*argv)); if (devs == NULL) { logmsg(LOG_ERR, "malloc(): %m"); - exit(1); + exit(EXIT_FAILURE); } for (i = 0; i < argc; i++) { if (strncmp(argv[i], _PATH_DEV, sizeof(_PATH_DEV) - 1) == 0) @@ -1311,16 +1313,16 @@ devify(int argc, char **argv) fullpath = malloc(PATH_MAX); if (fullpath == NULL) { logmsg(LOG_ERR, "malloc(): %m"); - exit(1); + exit(EXIT_FAILURE); } l = snprintf(fullpath, PATH_MAX, "%s%s", _PATH_DEV, argv[i]); if (l < 0) { logmsg(LOG_ERR, "snprintf(): %m"); - exit(1); + exit(EXIT_FAILURE); } else if (l >= PATH_MAX) { logmsg(LOG_ERR, "device name too long"); - exit(1); + exit(EXIT_FAILURE); } devs[i] = fullpath; } @@ -1345,7 +1347,7 @@ enum_dumpdevs(int *argcp) argv = malloc(n * sizeof(*argv)); if (argv == NULL) { logmsg(LOG_ERR, "malloc(): %m"); - exit(1); + exit(EXIT_FAILURE); } for (;;) { fsp = getfsent(); @@ -1359,13 +1361,13 @@ enum_dumpdevs(int *argcp) argv = realloc(argv, n * sizeof(*argv)); if (argv == NULL) { logmsg(LOG_ERR, "realloc(): %m"); - exit(1); + exit(EXIT_FAILURE); } } argv[argc] = strdup(fsp->fs_spec); if (argv[argc] == NULL) { logmsg(LOG_ERR, "strdup(): %m"); - exit(1); + exit(EXIT_FAILURE); } argc++; } @@ -1382,7 +1384,7 @@ init_caps(int argc, char **argv) capcas = cap_init(); if (capcas == NULL) { logmsg(LOG_ERR, "cap_init(): %m"); - exit(1); + exit(EXIT_FAILURE); } /* * The fileargs capability does not currently provide a way to limit @@ -1393,18 +1395,18 @@ init_caps(int argc, char **argv) 0, &rights, FA_OPEN); if (capfa == NULL) { logmsg(LOG_ERR, "fileargs_init(): %m"); - exit(1); + exit(EXIT_FAILURE); } caph_cache_catpages(); caph_cache_tzdata(); if (caph_enter_casper() != 0) { logmsg(LOG_ERR, "caph_enter_casper(): %m"); - exit(1); + exit(EXIT_FAILURE); } capsyslog = cap_service_open(capcas, "system.syslog"); if (capsyslog == NULL) { logmsg(LOG_ERR, "cap_service_open(system.syslog): %m"); - exit(1); + exit(EXIT_FAILURE); } cap_close(capcas); } @@ -1417,7 +1419,7 @@ usage(void) " savecore -C [-v] [device ...]", " savecore -L [-fvZz] [-m maxdumps] [directory]", " savecore [-fkuvz] [-m maxdumps] [directory [device ...]]"); - exit(1); + exit(EXIT_FAILURE); } int @@ -1439,7 +1441,7 @@ main(int argc, char **argv) argc = xo_parse_args(argc, argv); if (argc < 0) - exit(1); + exit(EXIT_FAILURE); while ((ch = getopt(argc, argv, "CcfkLm:uvZz")) != -1) switch(ch) { @@ -1462,7 +1464,7 @@ main(int argc, char **argv) maxdumps = atoi(optarg); if (maxdumps <= 0) { logmsg(LOG_ERR, "Invalid maxdump value"); - exit(1); + exit(EXIT_FAILURE); } break; case 'u': @@ -1502,7 +1504,7 @@ main(int argc, char **argv) error = chdir(argv[0]); if (error) { logmsg(LOG_ERR, "chdir(%s): %m", argv[0]); - exit(1); + exit(EXIT_FAILURE); } savedir = argv[0]; argc--; @@ -1524,7 +1526,7 @@ main(int argc, char **argv) savedirfd = open(savedir, O_RDONLY | O_DIRECTORY); if (savedirfd < 0) { logmsg(LOG_ERR, "open(%s): %m", savedir); - exit(1); + exit(EXIT_FAILURE); } (void)cap_rights_init(&rights, CAP_CREATE, CAP_FCNTL, CAP_FSTATAT, CAP_FSTATFS, CAP_PREAD, CAP_SYMLINKAT, CAP_FTRUNCATE, CAP_UNLINKAT, @@ -1534,7 +1536,7 @@ main(int argc, char **argv) CAP_RENAMEAT_TARGET); if (caph_rights_limit(savedirfd, &rights) < 0) { logmsg(LOG_ERR, "cap_rights_limit(): %m"); - exit(1); + exit(EXIT_FAILURE); } /* Enter capability mode. */ @@ -1547,7 +1549,7 @@ main(int argc, char **argv) if (checkfor) { if (verbose) printf("No dump exists\n"); - exit(1); + exit(EXIT_FAILURE); } if (verbose) logmsg(LOG_WARNING, "no dumps found"); @@ -1556,14 +1558,14 @@ main(int argc, char **argv) if (verbose) logmsg(LOG_WARNING, "unsaved dumps found but not saved"); - exit(1); + exit(EXIT_FAILURE); } else if (verbose) logmsg(LOG_WARNING, "no unsaved dumps found"); } else if (verbose) { logmsg(LOG_NOTICE, "%d cores saved in %s\n", nsaved, savedir); } - return (0); + exit(EXIT_SUCCESS); } static void From nobody Wed Apr 3 18:33:09 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4V8tfZ1H1jz5FZsx; Wed, 3 Apr 2024 18:33:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4V8tfY4XzCz4Bqk; Wed, 3 Apr 2024 18:33:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712169189; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nvpNFkH2R4YIOF5tqpSthEpo1qfvctHEY+FpDdOTrdk=; b=FnjkSGgzgBfrSuj93UKRR5L3RuWbisC8bgo+lJaOJ8WvC7iaU8hSkslPo4fCFrdlxNWO7C ORe6W4Rmx3DL+/W5H5TtZJcsGmN0dkzmnw0vdOQ7cbpkxlUn5zKMTUfl/GEF846wqMq9Bq WcoeWIjJVx0ZCnyrcxcavoWX20oQfWiiQwFFV6fQeqCLPY+IYbXLLsSiCQFnv5ghtXeq9v lAR+cyqcwm2+gDM9073Muy003LcS/573qgLjIJRHyxmq6r3mZzuiwfULJFKFZs/zgxKz+9 rUpq6NqVdbqVNE34AiM/IMK9Jh1CMYYx3LXfXmB+rVgepufEdCwblYq/cI+BAA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712169189; a=rsa-sha256; cv=none; b=d/9lCIo6m+WAbCnA0nOta1khvNh0TCYfueg3SjC1bAEUBRSq8X63pDevqENqoZCscG/4ot M4pDzY9XKeJ/MlTVj/b0OY4kP2y2/oD0f1bdyDN86rC50/DNbAHyRB1ZlAQpnPk0qyxh1p pJAD/iY6GceAPeimplu8MXf35CALR/LyRc1jWJG2HqsHRPfkSIYOZuXNbsB919mhSDRIf0 WHCdcpHEguriE+Fy6o4wMn2+muMCvnl7SPTuYU0MA+AN0azA25/u5p+rSAGUcMfPlCQWf3 ixOcZD85wM/wGNOxk0j0ko6+au0Ax+JoAc/QvTRi1vP8+V1B25VhrKf2bTSmrQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712169189; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nvpNFkH2R4YIOF5tqpSthEpo1qfvctHEY+FpDdOTrdk=; b=yDV4JtvdTSgvrWQ9gMDm3GmfhOQ1S7FqBDikXqM9nnzKnYt8fOYIPQ/pGh2PwFrNI7IM3Z 2TsS5nQi/3tXJiVPPCmm2NI4i+tOa29yWoWjUPwL/IJDOSyov2i1K1rYzff/UKhs/8jOgn AS2PihzCO790kES+ASHvueDMqtIWeIAZCNcS24aNQxhq8PvOlTPTPLoBn627DKFN/NGzul YDdbHt8arobBkzNzX4egmuN36qCJZl2UIJy6px+lJlRjLk7Y0x+flmm1MPoX7JQwbVlyDs hicoswh5twvwT0sxCIzuqirZP0RaanZV/XRuaPq2c3oMt2BVBr330KJeEAt9LQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4V8tfY424tzkjs; Wed, 3 Apr 2024 18:33: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 433IX9dE034028; Wed, 3 Apr 2024 18:33:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 433IX9N1034025; Wed, 3 Apr 2024 18:33:09 GMT (envelope-from git) Date: Wed, 3 Apr 2024 18:33:09 GMT Message-Id: <202404031833.433IX9N1034025@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Li-Wen Hsu Subject: git: 1caa5d08613f - main - efitable(8): Complete libxo transition List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: lwhsu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1caa5d08613fbd2b79bbf4b03a0fccc182b4193f Auto-Submitted: auto-generated The branch main has been updated by lwhsu: URL: https://cgit.FreeBSD.org/src/commit/?id=1caa5d08613fbd2b79bbf4b03a0fccc182b4193f commit 1caa5d08613fbd2b79bbf4b03a0fccc182b4193f Author: Yan-Hao Wang AuthorDate: 2024-04-03 18:32:00 +0000 Commit: Li-Wen Hsu CommitDate: 2024-04-03 18:32:00 +0000 efitable(8): Complete libxo transition Reviewed by: des MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D41411 --- usr.sbin/efitable/efitable.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/usr.sbin/efitable/efitable.c b/usr.sbin/efitable/efitable.c index 637188957b8b..81d8bb999c58 100644 --- a/usr.sbin/efitable/efitable.c +++ b/usr.sbin/efitable/efitable.c @@ -28,7 +28,6 @@ #include #include #include -#include #include #include #include @@ -208,7 +207,8 @@ efi_table_print_esrt(const void *data) xo_close_list("entries"); xo_close_container("esrt"); - xo_finish(); + if (xo_finish() < 0) + xo_err(EX_IOERR, "stdout"); } static void @@ -226,7 +226,8 @@ efi_table_print_prop(const void *data) "{:memory_protection_attribute/%#lx}\n", prop->memory_protection_attribute); xo_close_container("prop"); - xo_finish(); + if (xo_finish() < 0) + xo_err(EX_IOERR, "stdout"); } static void usage(void) From nobody Wed Apr 3 19:12:16 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4V8vWh2Z6Rz5FfZX; Wed, 3 Apr 2024 19:12:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4V8vWh25gSz4Hg6; Wed, 3 Apr 2024 19:12:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712171536; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eOQ/du9RuRYKdTF3i3/+r5ZG2NoLYKiNliC3gaC1Kcc=; b=iN1mI5GfaS4xyCdQafpGHW9jwFKFcsTkyDlgLwN6J4mid4u/zpTC1e1zMfHYxBeruXE006 TgKdF19urQszNO+kz3g8rMYQ9IPAmcg+caBhxSxYil6QS/+r6cVNTGldkNZaiRABqK4t6F EUUdZfcSP8LBOBq0uFrGBr33cGhAAW/2W0SaYen+fmtUu0pAgTFOD+IZwfML03q+PhmV8S dSpyQpRVoKX1K6UPbEsk6ggwzh30UjJjm9S1A6aTTjdgqghJhW6dSmwNRHrwZjn1QxK8aK IoTCtBL7Ytc/ZtxsF6mZsNlHrgvWTuLwh0aFtg8ppafKj1tdaOwL+MbFwHHpUQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712171536; a=rsa-sha256; cv=none; b=aUksbEJXdkDemjRL4LxAWqei3JTO8w3I1phrEfrR+Dci2kGKJLQ6R39BEiAZuSkVVa/OWm ZHmqaOxbddPgL4m8CqtaCwqZrmAwzhxhAUi8EpJzTR56iyCkQivfKjxdBeJx7T2u6kmDZS aSZ7Y1R0NsivHGPJ1yEaPgMtJlLw/ySjs5BT3ZwinSvtXvRKA3myodaqWNWxaqm1gHCbi2 QoJ5cNw6jksjIH3OwC87tC1zg5vteTMCeFtzWxO3T8aqgIogp6xs8PKUosZ2yEvbdik8oF qQEq9RCuQlZPUGD05ybaqQkCP40MF0GXy3DubuhDGX85OqGt8ZzRsZRkC2KYyQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712171536; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eOQ/du9RuRYKdTF3i3/+r5ZG2NoLYKiNliC3gaC1Kcc=; b=XItNOsbfbaxTrkQPVvS0YRUxshDzuokZPypG5WBaephyiKbWA+Y1Kokug3Sfem2zgeaBvE tneE6F31Ov9M6wPqD30KBJ9bY7Eym16p4hT55gyI4V+OIoPPAVUemfmJOQaMOHDodFKtdH 4+YUSOJzi5FbJdbSwFAO8IuCK1p3Gr8M+Pep7QUDZ3GeModDvMgCapxdGR2NFY8zb5yg+9 QPa/ldJPBNRNe7NzJyyR+TfCPCkcjks1kJ3smDgXSwm/lQ6QBcntXyEpIzDLJlFGk9NDJv GkHq5XtcnQ941GzVFD10uSAykvJ+gVATEzGRRGOSYIrb2W+mzmanaaMGhXkXjw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4V8vWh1j1NzlWj; Wed, 3 Apr 2024 19:12:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 433JCGWf000697; Wed, 3 Apr 2024 19:12:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 433JCG18000694; Wed, 3 Apr 2024 19:12:16 GMT (envelope-from git) Date: Wed, 3 Apr 2024 19:12:16 GMT Message-Id: <202404031912.433JCG18000694@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: 72c3d91294c4 - stable/14 - libfetch: parse scheme://domain:/ correctly List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: khng X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 72c3d91294c4d9c46c8185f90cba522f539d1051 Auto-Submitted: auto-generated The branch stable/14 has been updated by khng: URL: https://cgit.FreeBSD.org/src/commit/?id=72c3d91294c4d9c46c8185f90cba522f539d1051 commit 72c3d91294c4d9c46c8185f90cba522f539d1051 Author: Ka Ho Ng AuthorDate: 2024-03-25 20:10:42 +0000 Commit: Ka Ho Ng CommitDate: 2024-04-03 19:11:58 +0000 libfetch: parse scheme://domain:/ correctly This improves URL-parsing compability with cURL, and unbreaks parsing of similar kinds of URLs after commit 8d9de5b10a24. Sponsored by: Juniper Networks, Inc. Reviewed by: des MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D44493 (cherry picked from commit fb860ed0c52c2c1e7792ef86718620a439663c7f) --- lib/libfetch/fetch.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/libfetch/fetch.c b/lib/libfetch/fetch.c index 135ee8dad151..8cb3536a46c5 100644 --- a/lib/libfetch/fetch.c +++ b/lib/libfetch/fetch.c @@ -427,7 +427,7 @@ fetchParseURL(const char *URL) goto ouch; } } - if (n < 1 || n > IPPORT_MAX) + if (p != q && (n < 1 || n > IPPORT_MAX)) goto ouch; u->port = n; p = q; From nobody Wed Apr 3 19:12:44 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4V8vXD1qzRz5Ff53; Wed, 3 Apr 2024 19:12:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4V8vXD1Fzhz4J1P; Wed, 3 Apr 2024 19:12:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712171564; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rDf9gUHjNxyQdUcI/NCe1SVVtGGAA4cQIDdClvSOfM0=; b=wtZ1wJdr/Hkx/EVvQ1yfuPwiMtApbfl85Vtfv0N0/PqrnDAAvnEMwkQlNCqiFsi682lyg5 mY3qay7em7tF0enHukq3FRgkXF9EMMO8YqLtN2yLFldu9QmO6BpjiYMIfuQpUnZ8DOW/Dc nBBVSqEDkx7gZZPR9vGBuJxVZG42CesKiFIqfFf1vfVFnfugGx33DlSOi6IuURumiyi8/Y 9emKKaJgl+7sYZAOpEGrJZHm6ixuWFTTt4ffjOASm1qTDwhpuf9A0DOnDXQNFhUGt3nowE K1cwiROvhf1T0PTHQsuefYtJD5CYjmnecC/baXnKrDHO9qjKBSzYM61SCBPbdg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712171564; a=rsa-sha256; cv=none; b=paqed/uq9Erb/qezONza+SSNwid+JDse9xdpAYTMC1gLMJSxr4FJafVIzuh9bEv5RzTRBk sg5nHRqUg9+uPuTnPLCUJYbH7DyI417xqa1lDjdQBIrUIL3MIe7YEBJqIELBMNVxm9aLat t6Sz2cE9H2z1/NOagtIUWrsGX2HJVzRtE6p8vae8rHLo+NFlDilrviD/NevZ2HY+w2RqkI v1D3YcJqzNRMXgK5M58pqVCSo4SDZtB32JNxzyACOXo9+Mf2nNyYENriz3uzFe6BzS96Iu 9Dt4GPHBaUlNWZx+8eoPP3qd8aP+rggkO/yVh2oWf3QzaUDl40sSvliFhW+Pfw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712171564; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rDf9gUHjNxyQdUcI/NCe1SVVtGGAA4cQIDdClvSOfM0=; b=sbJgyQ/QuA7eLzrV9O2Ims+0J7TvMe93rJ+WWrh45bUdxSyfce9U2V6yC2kw0sMezIPTis 7vqEN1DZEw+zIcLxz0TfZIGsPvlOE6eyDo2txwFnprzkRtYfKxFMwP2xBp2UnGq2uXpI4Q wEptRWB6f+CJEqdOaVTBHcLC1IriGasHneGAifKeYVi0M+L8XxFDU16guGXOd8mHKqCIcy Lv1RNgwwYdaaZvLgVrF3IOZOlPxUXzXzdj/MbHwm60n2xa66qWkN8BWGU+h0iIHyZesyqh DXorUjpzgeYhZS6tcpMWRXuHiwiJVkKD6J1F4YICunyjjMLn/GfhJbc/VcUI5Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4V8vXD0sb1zlWm; Wed, 3 Apr 2024 19:12: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 433JCiPw001924; Wed, 3 Apr 2024 19:12:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 433JCiJh001921; Wed, 3 Apr 2024 19:12:44 GMT (envelope-from git) Date: Wed, 3 Apr 2024 19:12:44 GMT Message-Id: <202404031912.433JCiJh001921@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: c89889b9c342 - stable/13 - libfetch: parse scheme://domain:/ correctly List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: khng X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: c89889b9c342e764e39b351d5024a4ba3429fb15 Auto-Submitted: auto-generated The branch stable/13 has been updated by khng: URL: https://cgit.FreeBSD.org/src/commit/?id=c89889b9c342e764e39b351d5024a4ba3429fb15 commit c89889b9c342e764e39b351d5024a4ba3429fb15 Author: Ka Ho Ng AuthorDate: 2024-03-25 20:10:42 +0000 Commit: Ka Ho Ng CommitDate: 2024-04-03 19:12:38 +0000 libfetch: parse scheme://domain:/ correctly This improves URL-parsing compability with cURL, and unbreaks parsing of similar kinds of URLs after commit 8d9de5b10a24. Sponsored by: Juniper Networks, Inc. Reviewed by: des MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D44493 (cherry picked from commit fb860ed0c52c2c1e7792ef86718620a439663c7f) --- lib/libfetch/fetch.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/libfetch/fetch.c b/lib/libfetch/fetch.c index 135ee8dad151..8cb3536a46c5 100644 --- a/lib/libfetch/fetch.c +++ b/lib/libfetch/fetch.c @@ -427,7 +427,7 @@ fetchParseURL(const char *URL) goto ouch; } } - if (n < 1 || n > IPPORT_MAX) + if (p != q && (n < 1 || n > IPPORT_MAX)) goto ouch; u->port = n; p = q; From nobody Wed Apr 3 19:21:48 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4V8vkh6JWgz5FhX6; Wed, 3 Apr 2024 19:21:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4V8vkh3SS9z4JZy; Wed, 3 Apr 2024 19:21:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712172108; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AFoPs5uA1tmSh1yXfr7awKfbyzpFq8kHqVjOd6n5dqc=; b=pRyzlRmxXZz1FGY+osWc7C2eQiELcCQMlkEqorncrPBjRd6WUJIcl4hE0sYdrCwxPN+YbN 3kYOC9QriQw3ryPkG5CCkB7WuADwGxnep0u6am6rmNueqng77to1OUiCkYxRt67dpCbvSG q7vhTy5MMtlIJAQcjSGjaQ0/KxejuZ4TAOJagEOHQZP0aUDbB/ytJ8UkCqaRke1o7VKhCO mk5WGxPEJTepb8e7ADkGC7J5njbJEbxW0QPnaImGyagIxQjBu4RVJbBdwsQH0safTUkG3+ +0TZpwe9p8rQatoFQDFOZODrgbm4vY+MKPaWNPZdRvhW3P0W6wZQB+gTW0XEiw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712172108; a=rsa-sha256; cv=none; b=Fp+jXDLB04saC7PcSL+Oqeht25QCXZIzbIBHUHueBRxGuEkfyQISoY01yanbxbGTsGOnGX qGOyG+jmtbav5rGY0XtpAqgoDQiY2iBdcXHfFAPN2KyL58Wx3w6uAkvzCQuWG8X+rG15Za 7seusy6umZAavwYXMzF+sZPuwyUMmBFndNZSJhBx3w7skZesNpQXuBxtmSFstt9SJmjXwC iWiydhIC/mGKSusa5o/x6+HfpplErB/6kNWswg6NiYP+QsZc6sAlpK9MNmSsCrVftFiID3 1milsn1T7yHADiw7+B8uvE4n6W0l794OFq1G6/dZDJ4IUWIBx5dFrc8w9nIIIA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712172108; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AFoPs5uA1tmSh1yXfr7awKfbyzpFq8kHqVjOd6n5dqc=; b=o4YtqSuP/2M7YmyOoOf51xwRTIYpOb5kkVoB2ei/0/aBBa0jBtK5wao8wIepw4fXFj4uSU EWCVnqvFDQKKlGncuggKwzft8Z5LesR/W94+KJLMtkVb1wGYdlT5n84pxcUfj6wf5pu7tc JzyGxcfBkmZAAHNtra2EHxeEJ46KgzuSpkklyj9jL0++W0Wfd1RzirxYbmrpWfYlgwxnyJ 9NEReAH7sMwYF2c6q7O3ApbfwIIOioYZ7GVl7o28sQqPZoig2TsQ4hSnkDxWKC8QBkG8n8 aPEkH0ZZomFZz3Fg0N9htHmlfuhEp01A23lrdh0J1QKXBXl7/g22JjMJmHGWpA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4V8vkh33dSzlcR; Wed, 3 Apr 2024 19:21:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 433JLmq3016390; Wed, 3 Apr 2024 19:21:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 433JLm3m016387; Wed, 3 Apr 2024 19:21:48 GMT (envelope-from git) Date: Wed, 3 Apr 2024 19:21:48 GMT Message-Id: <202404031921.433JLm3m016387@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 3b795e641db7 - main - sdt: Use designated initializers for various definitions List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3b795e641db7c1759d72aab9a77db8f87c8fbc45 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=3b795e641db7c1759d72aab9a77db8f87c8fbc45 commit 3b795e641db7c1759d72aab9a77db8f87c8fbc45 Author: Mark Johnston AuthorDate: 2024-04-03 18:41:29 +0000 Commit: Mark Johnston CommitDate: 2024-04-03 19:21:38 +0000 sdt: Use designated initializers for various definitions No functional change intended. MFC after: 1 week --- sys/sys/sdt.h | 46 ++++++++++++++++++++++++++++------------------ 1 file changed, 28 insertions(+), 18 deletions(-) diff --git a/sys/sys/sdt.h b/sys/sys/sdt.h index e059921b0e9e..ba3dcfa15762 100644 --- a/sys/sys/sdt.h +++ b/sys/sys/sdt.h @@ -147,22 +147,26 @@ SET_DECLARE(sdt_providers_set, struct sdt_provider); SET_DECLARE(sdt_probes_set, struct sdt_probe); SET_DECLARE(sdt_argtypes_set, struct sdt_argtype); -#define SDT_PROVIDER_DEFINE(prov) \ - struct sdt_provider sdt_provider_##prov[1] = { \ - { #prov, { NULL, NULL }, 0, 0 } \ - }; \ - DATA_SET(sdt_providers_set, sdt_provider_##prov); +#define SDT_PROVIDER_DEFINE(_prov) \ + struct sdt_provider sdt_provider_##_prov[1] = { \ + [0] = { .name = #_prov }, \ + }; \ + DATA_SET(sdt_providers_set, sdt_provider_##_prov); #define SDT_PROVIDER_DECLARE(prov) \ extern struct sdt_provider sdt_provider_##prov[1] -#define SDT_PROBE_DEFINE(prov, mod, func, name) \ - struct sdt_probe sdt_##prov##_##mod##_##func##_##name[1] = { \ - { sizeof(struct sdt_probe), sdt_provider_##prov, \ - { NULL, NULL }, { NULL, NULL }, #mod, #func, #name, 0, 0, \ - NULL } \ - }; \ - DATA_SET(sdt_probes_set, sdt_##prov##_##mod##_##func##_##name); +#define SDT_PROBE_DEFINE(_prov, _mod, _func, _name) \ + struct sdt_probe sdt_##_prov##_##_mod##_##_func##_##_name[1] = {\ + [0] = { \ + .version = sizeof(struct sdt_probe), \ + .prov = sdt_provider_##_prov, \ + .mod = #_mod, \ + .func = #_func, \ + .name = #_name, \ + }, \ + }; \ + DATA_SET(sdt_probes_set, sdt_##_prov##_##_mod##_##_func##_##_name) #define SDT_PROBE_DECLARE(prov, mod, func, name) \ extern struct sdt_probe sdt_##prov##_##mod##_##func##_##name[1] @@ -178,12 +182,18 @@ SET_DECLARE(sdt_argtypes_set, struct sdt_argtype); } \ } while (0) -#define SDT_PROBE_ARGTYPE(prov, mod, func, name, num, type, xtype) \ - static struct sdt_argtype sdta_##prov##_##mod##_##func##_##name##num[1] \ - = { { num, type, xtype, { NULL, NULL }, \ - sdt_##prov##_##mod##_##func##_##name } \ - }; \ - DATA_SET(sdt_argtypes_set, sdta_##prov##_##mod##_##func##_##name##num); +#define SDT_PROBE_ARGTYPE(_prov, _mod, _func, _name, _num, _type, _xtype) \ + static struct sdt_argtype \ + sdta_##_prov##_##_mod##_##_func##_##_name##_num[1] = { \ + [0] = { \ + .ndx = _num, \ + .type = _type, \ + .xtype = _xtype, \ + .probe = sdt_##_prov##_##_mod##_##_func##_##_name, \ + }, \ + }; \ + DATA_SET(sdt_argtypes_set, \ + sdta_##_prov##_##_mod##_##_func##_##_name##_num); #define SDT_PROBE_DEFINE0(prov, mod, func, name) \ SDT_PROBE_DEFINE(prov, mod, func, name) From nobody Wed Apr 3 20:05:49 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4V8wjT5jrtz5Fm9j; Wed, 3 Apr 2024 20:05:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4V8wjT5DL6z4PR5; Wed, 3 Apr 2024 20:05:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712174749; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WsTmAv/uYse8wD4e/S3N0l9v2pndX4MLrO2CEps2VIs=; b=RIyHoAm+96c+pvCTR6zI+M0u3zNj9xo5cuVDjpK+iELbIjHc6K2KFbPiOAIbBW7DwRLRTs Br5+JZY/p5QiHqj7yWpaS1a0UKBbafDNcX+LhkeM3eqYEpv1WO97bbmF5f3vtd/+kkNCOh uIVp7/gYJ5AeMnMvAKQxb0G7+RD9M/EawIGdsjtb5FsCpS5QmrxXlHguNT3wWrk/h9ce3R +Ju9WSFtTQ4cWrMszht94xOyl48BThGIOdI2kR8T8qrtJvj1Aj5OJP1wCHzwy+NFSR7NSC sgboRY2rZ1w4k4Z7kBWjcbpzvv+Hi4GBbe52cBcc8ybZgWzJA93lvuMU9ffSgA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712174749; a=rsa-sha256; cv=none; b=uRzzSIKLqZN/luA5bu686nYPoyX9KwjZgP3IB7IY2RBIiAb2RvPOUOdtY8KX9y5k8k54U+ otq2nV0AtFG+52mSiPMELX2OMIJEA+FdMRfSKxJvTf2BgjeboUk2Fr5+9xzy3qjBnKFDST nBATU1sKy0h/AwYLD0W5n2jL6NyuMsSE5zC1R7Xs3juPQ0AU2vJ3pdppD2SBrWodFdkOic /77x1jiVrQ/W1DfyRWhhuftaDFgvENUxdo/BFjpSpjqPP/MgT4bGyd4qcOY62++onso732 jsDrCI9X1Bnghx3TMZEOS1YXw6T/9NzxLXlCRQdxJTmZCP8/ehwOGli+1j6Hsw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712174749; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WsTmAv/uYse8wD4e/S3N0l9v2pndX4MLrO2CEps2VIs=; b=ZUdjN6nFH5fPaaRDLFogoaUEZfFDk2AwpR2R0ZiEb2mRzLIG+C/FG2fy4y5eZcE4fU+jEd 72Eqwt1ulcDzgJXi6Vcqnq2wt23ebJuCcbApwdkfYRnmNsSkvXTEoFJHaabXWaFVy2K6b9 UTs84ztzywZieRmRchBGZIw9N9CdvMq9CzfhiHzhppDJ+WFX/8B2xzfuidLb7xYvxnDQtU VtXCBxatfScv1zKS2Ps+DEEYxtFti2qG6LPbQvKAufdaWpK+YG0LzX9UFEA7pOgNVJISWu PcPuAQRqTDFCf16F4PJ9uijxkn1tsEImiBck6roRdHS05HfeRgvsBD0me3+AOA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4V8wjT4qsQzmVq; Wed, 3 Apr 2024 20:05:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 433K5n3s087323; Wed, 3 Apr 2024 20:05:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 433K5njg087320; Wed, 3 Apr 2024 20:05:49 GMT (envelope-from git) Date: Wed, 3 Apr 2024 20:05:49 GMT Message-Id: <202404032005.433K5njg087320@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Stephen J. Kiernan" Subject: git: 13ab9fa09be7 - main - kernel: Add options for MAC_DEBUG and MAC_VERIEXEC_DEBUG List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: stevek X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 13ab9fa09be7da5eec95a55ae156f997ec6b37a9 Auto-Submitted: auto-generated The branch main has been updated by stevek: URL: https://cgit.FreeBSD.org/src/commit/?id=13ab9fa09be7da5eec95a55ae156f997ec6b37a9 commit 13ab9fa09be7da5eec95a55ae156f997ec6b37a9 Author: Stephen J. Kiernan AuthorDate: 2024-04-03 20:05:25 +0000 Commit: Stephen J. Kiernan CommitDate: 2024-04-03 20:05:25 +0000 kernel: Add options for MAC_DEBUG and MAC_VERIEXEC_DEBUG --- sys/conf/options | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/conf/options b/sys/conf/options index 555484360a2b..276c6c5067f7 100644 --- a/sys/conf/options +++ b/sys/conf/options @@ -156,6 +156,7 @@ MAC opt_global.h MAC_BIBA opt_dontuse.h MAC_BSDEXTENDED opt_dontuse.h MAC_DDB opt_dontuse.h +MAC_DEBUG opt_mac.h MAC_IFOFF opt_dontuse.h MAC_IPACL opt_dontuse.h MAC_LOMAC opt_dontuse.h @@ -171,6 +172,7 @@ MAC_STUB opt_dontuse.h MAC_TEST opt_dontuse.h MAC_GRANTBYLABEL opt_dontuse.h MAC_VERIEXEC opt_dontuse.h +MAC_VERIEXEC_DEBUG opt_mac.h MAC_VERIEXEC_SHA1 opt_dontuse.h MAC_VERIEXEC_SHA256 opt_dontuse.h MAC_VERIEXEC_SHA384 opt_dontuse.h From nobody Wed Apr 3 22:18:39 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4V8zfl5gZXz5G106; Wed, 3 Apr 2024 22:18:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4V8zfl59n9z4ccX; Wed, 3 Apr 2024 22:18:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712182719; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jZAQX96vFUZ6EVJY73K6DMfXQkrg3XdMyZxXX1zrqB8=; b=Yhf2zxAtqLlr7Wxr3G5JG7Q61aKF/PX0HYB36x3y3XbdrqZRGmnGXjucj7BBIZfC+BD5f5 Wr0HUQPQv0uwmrEpJTuMeac0jR3qopMh/S+4iTAhvjRL80i694A61a83QDh2UNyK5g5vxs gcWGJqkqflTqhUkSb607k7dWW02BcQiwmFaQff0TpBLHW/t+LsqHbdXgpFNwGOZmoYNQmp nqFeLalD+Ir4ialczQCpCIk1hm14o5DK6aE0JF2FgfIuj29Y9CnUbbwNeV7JlubqXEyen9 eFfNeo5G3/OaQMCbcGxYWtkpYiCa451HnsQbJ7aMYzSgtaB1Zg5YliTXKi2YCw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712182719; a=rsa-sha256; cv=none; b=O01zrNH9edUHtmhZoH/h780h5wBeSgh9LFUtBlN1YXqcAMBOxFpUkcClq6JQAGbbYUWjYK I0kPA+VXic0tpn6VKpCM69NRNAYzac0+f3clBr5nd10HnSV9UriQp72e4a1of14U76thKQ FD9NXX4Zd+/esiug/O+/D6PRtMEMPJnaZMB3wE05MA0Wr9p5WQbMNRqJfVPMONTgIclMOY dA2BcK8krp/st1FnZKIdD8gDRd6cEeDUaqwpacFLlmpiO2RSZJLpAHpZFp9xa2TTN94g+9 83KN1lMMGqJDXAEUyqyB9hpemSl8KOTmGcTwGHhTTO6kelYfUnFsC6JcSGhFzA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712182719; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jZAQX96vFUZ6EVJY73K6DMfXQkrg3XdMyZxXX1zrqB8=; b=tYzQu+dzFTinnDCDNktYMsL+xCB1Wh+v7W2vk3Nh3pZ3YjUV3RbwoaZmx5k+f17YDbqK9V +5TfD51KxNWpTy1NG+sJASvWIkSuRjd0btglG9Zx3pZHDcaAkyFPzKucS3jO2RIvCVPoo6 32vfJSv9ZDQvWijkGmBEU8Rfcw6yeQ/UvBKK1+n9BNIYCAVe0SxQuuGOTf68VaUJEZoMHE cpeKYLvIJwHQ6If3E5AB5iOshYfhsn6H7nX1Fkcsw1k7nxgwcObGy/TNnZp7utVl/afbxx ZMIP6qVuZszCWVLBfrS8GDwAuVgZnhGvFOAR9bm9GuZk1YQz7luZENLF6NDZUg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4V8zfl4mqCzrGp; Wed, 3 Apr 2024 22:18:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 433MIdLU006476; Wed, 3 Apr 2024 22:18:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 433MIdPD006473; Wed, 3 Apr 2024 22:18:39 GMT (envelope-from git) Date: Wed, 3 Apr 2024 22:18:39 GMT Message-Id: <202404032218.433MIdPD006473@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Tuexen Subject: git: 6b454da6bbaa - main - tcp: address a warning List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6b454da6bbaa3327cf9b7185d198c96ffc1b88f4 Auto-Submitted: auto-generated The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=6b454da6bbaa3327cf9b7185d198c96ffc1b88f4 commit 6b454da6bbaa3327cf9b7185d198c96ffc1b88f4 Author: Michael Tuexen AuthorDate: 2024-04-03 22:14:59 +0000 Commit: Michael Tuexen CommitDate: 2024-04-03 22:14:59 +0000 tcp: address a warning t_state is an unsigned variable, so no need for testing that it is non-negative. Reported by: Coverity Scan CID: 1390885 Reviewed by: glebius MFC after: 1 week Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D44619 --- sys/netinet/tcp_subr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/netinet/tcp_subr.c b/sys/netinet/tcp_subr.c index 860d65249148..312740ccf599 100644 --- a/sys/netinet/tcp_subr.c +++ b/sys/netinet/tcp_subr.c @@ -1086,7 +1086,7 @@ tcp_default_fb_init(struct tcpcb *tp, void **ptr) /* We don't use the pointer */ *ptr = NULL; - KASSERT(tp->t_state >= 0 && tp->t_state < TCPS_TIME_WAIT, + KASSERT(tp->t_state < TCPS_TIME_WAIT, ("%s: connection %p in unexpected state %d", __func__, tp, tp->t_state)); From nobody Wed Apr 3 23:10:22 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4V90pR1yrFz5G5f6; Wed, 3 Apr 2024 23:10:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4V90pR138vz4gsd; Wed, 3 Apr 2024 23:10:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712185823; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XQ5SFRQXbyM85PmcDAaeUXVW/VvPWzn6xGq9wJpzJOs=; b=w/5x/YWalKwK3ZFgDSXCWBO2gB7bB2uHs/DPf3apsj6SYgpqGC9ltZsIAJ0Wt8tHawZR5z CvONBDpW37nt3n0GLIaQQE3U6HbbJEB02UCyrGvNn81ERsI2Vz8k74XINV6xB0VPnH2YUR e3mFuEsAhJIC902pglPxBLvxhl0hyC7Xi0ED7c54ZeO3Ol/14YMYlIiV9O8KQ6xooy5qso Y3nsBEaZ/nMcWCTw3lNlannmSWXLHgoRVFF9EUgUu+0F4vM0Ubr7LAgn9Q6VFQcZeXL6UL 8DaHKZHQdmhplSTRB7NVoRA/0Qj7Oi2qlsjKRHg/hG1PLx6/rVbmZniSGda5jw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712185823; a=rsa-sha256; cv=none; b=ad+dkr7DAE17/TFnjlnleSfF33jAI4T3B2OoTmHsogWtL3BQn9/9PPqP2jbtcQoGf1PEWr Df9SZbxD5ycWsUBKfCxifqPYVSwuwbEeL0JTz8bdyi5bd7DlPe5xl2PRP4UcIyt52MjMEV VGXrsG1HCfcIj+Ne8hnwYazEAIkuS8ZOocb3+07TqmLiU/ZjGCVSaUPEoMS+fiitjp0D9s ssjsQYQV1BJfcjzi8qPOpk6xz+DTtRtkvqFOEaB9yrkqm3/xodxVZgeOm1NxPuToixum/t bNzDR+djmsZP8r652CjMY5WC4HMBUnLQan7DuOsKu8RfQCI2SblJDognYuDsOA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712185823; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XQ5SFRQXbyM85PmcDAaeUXVW/VvPWzn6xGq9wJpzJOs=; b=JK8OrLQPjFQxNHWlZNbhFFfgsSK4KHy7xIJfzP9OhKZ5LZEL7empza54qsZoHBJt+DTjHB aWM5951EGR3mgkAupV7KXf0w5TjL/2Bv/RpyxCO3loB6mnxOgqtF9KBuvjBznyQw8xBvnO +4A0sHMJyA5CwJdPbIP9dTQ/+1WaWXq+hiWf+Ye1/ghKbOYfXJaaf7v3OE3vbJPQBO9BH6 AeU/JXNT8uH1FoWWxyMzLIwCyMOp09W7qceUkiOhnPB+OY9nJyTqd5pivBN8mbYXVoz261 wSqeSxXis4krBw8N+kQkigQ115LSx/ANo8BIlNEV4+a9LFRIHYj2qv/K4QRriw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4V90pR0fdpzs1F; Wed, 3 Apr 2024 23:10:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 433NAMrt000149; Wed, 3 Apr 2024 23:10:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 433NAMks000146; Wed, 3 Apr 2024 23:10:22 GMT (envelope-from git) Date: Wed, 3 Apr 2024 23:10:22 GMT Message-Id: <202404032310.433NAMks000146@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Stephen J. Kiernan" Subject: git: 112783ebbc31 - main - userboot: allow for overriding the version file location List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: stevek X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 112783ebbc313f0df73bbec8520a94aba4a4f33d Auto-Submitted: auto-generated The branch main has been updated by stevek: URL: https://cgit.FreeBSD.org/src/commit/?id=112783ebbc313f0df73bbec8520a94aba4a4f33d commit 112783ebbc313f0df73bbec8520a94aba4a4f33d Author: Stephen J. Kiernan AuthorDate: 2024-04-03 21:22:01 +0000 Commit: Stephen J. Kiernan CommitDate: 2024-04-03 23:09:43 +0000 userboot: allow for overriding the version file location Use ?= when assigning VERSION_FILE Reviewed by: imp Obtained from: Juniper Networks, Inc. Differential Revision: https://reviews.freebsd.org/D44624 --- stand/userboot/userboot/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stand/userboot/userboot/Makefile b/stand/userboot/userboot/Makefile index 15ac8701e4d4..4674672bbec5 100644 --- a/stand/userboot/userboot/Makefile +++ b/stand/userboot/userboot/Makefile @@ -44,7 +44,7 @@ CFLAGS.main.c+= -I${SYSDIR}/contrib/openzfs/include/os/freebsd/zfs CWARNFLAGS.main.c += -Wno-implicit-function-declaration NEWVERSWHAT= "User boot ${LOADER_INTERP}" ${MACHINE_CPUARCH} -VERSION_FILE= ${.CURDIR}/../userboot/version +VERSION_FILE?= ${.CURDIR}/../userboot/version .if ${LOADER_INTERP} == ${LOADER_DEFAULT_INTERP} LINKS+= ${BINDIR}/${SHLIB_NAME} ${BINDIR}/userboot.so From nobody Thu Apr 4 00:28:04 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4V92X42b2Bz5GDgL; Thu, 4 Apr 2024 00:28: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 4V92X41sP5z4pTg; Thu, 4 Apr 2024 00:28:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712190484; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VydZ9Q2RTlhOuOVMacjncWBzgWtxQFHXDtSjM9BHsdw=; b=PCwZp8vGtSLf5449pEtbfW0ye6GERfTWz2445InA04V5fmtrN6repwYhLiCPiHW1PvArmp 3WShotUlIOoLfPoO2Wi8DkijUoodE2Jl55oNH2utsvCnzJ1Qt/D/b4KOjUn71GiJb4KYwi u8C0IWW3TWCI7u1e9LqYGGqttQ3gDUPXEUGUjk63S/pHn0b2w1U89WZYXHuJ3Q1oHkf40B mPFaI887gz1vkC+oKOK1Kmn/GZf4eNVg1nDrRnSFKWpmthHmRuilLD+SYRuM0ude4yWdqV ycFicifHibTQfcHyA0IFJy0B8hNZ/7ZmINoNngPENzEwX8F42IM8g6bQIB2KIA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712190484; a=rsa-sha256; cv=none; b=mjPSrieUTh6jpfRP2Or3NHXEthHXVIA3SYHv7eG59gMKoZOgyF653OK0lawWk2PzV+TAeJ 3ZR8zoJgZcka9nV/VYHpdIiBczL9t2mNRyAlseZQJ2ahYXn8RXXKFDq3oVf0/dTBnIO3Ao LIFVkHxCLdS/gs8IQN2luA5oOnZiOeAfbuzdu/GsS5IpjKdJ3amrohvqNKSf58+pwp40FN K11PRuuRsbGSAPERDHnbNg9nN8WEEc1gplX0H+o5zyB78gWh8HOzFzeWBKe3UoOui83NNp KXNsV5kyG13iiYIKj7eh4eK82/9WUcfAk+QNZoPkKPOiwiAlTwZOKjLh2RKYfA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712190484; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VydZ9Q2RTlhOuOVMacjncWBzgWtxQFHXDtSjM9BHsdw=; b=lIiObIQeRrRp1h5itmAXVGtY5pltxON9dUP3qJbulIn5/HfdqVy1x8YgLvr6smYQ8z7ORb j2cGLac0UyQ872BDmRXztqeY+g1aW0MkNhOQ1xMli2oor9a2YuiNbgqep0ApH0LG4moZKf /yer8ZZF4V4KxpOu9egsdrEz7X4POxY9CudTpU0iDUMNomBUo49xs63LCSfDFkxjGov6uD 0KoKVUfV7+E6cc71VXsqmWEuN3txcZEG3jrOWH3cBxL5iwXiZta/DkU+Kl0FDqlZPdEV5e rRb8m2KZy4oe7GsncArmaOSYuPWJvXu8tTFLzF9DU7Q/+p3jHpbwVtp3uDfHug== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4V92X41SWcztpL; Thu, 4 Apr 2024 00:28: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 4340S468025276; Thu, 4 Apr 2024 00:28:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4340S4m7025273; Thu, 4 Apr 2024 00:28:04 GMT (envelope-from git) Date: Thu, 4 Apr 2024 00:28:04 GMT Message-Id: <202404040028.4340S4m7025273@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Stephen J. Kiernan" Subject: git: 41956c13f950 - main - include: Ensure security/audit/audit.h gets staged properly. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: stevek X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 41956c13f95004882e2080862e3158e820c8db33 Auto-Submitted: auto-generated The branch main has been updated by stevek: URL: https://cgit.FreeBSD.org/src/commit/?id=41956c13f95004882e2080862e3158e820c8db33 commit 41956c13f95004882e2080862e3158e820c8db33 Author: Stephen J. Kiernan AuthorDate: 2024-04-04 00:22:29 +0000 Commit: Stephen J. Kiernan CommitDate: 2024-04-04 00:26:33 +0000 include: Ensure security/audit/audit.h gets staged properly. There is a conflict between bsm/audit.h and security/audit/audit.h due to the way that staging is being set up using .PATH to point to the full directory and the leaf files being specified in the list. Due to this, the bsm/audit.h was getting staged as both bsm/audit.h and security/audit/audit.h since the sys/bsm directory is listed first in the .PATH list. Use sys/security in the .PATH instead of sys/security/audit and specify the audit header files as audit/.h. This ensures that we get the correct audit.h stanged for security/audit/audit.h. Reviewed by: sjg Obtained from: Juniper Networks, Inc. --- include/Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/include/Makefile b/include/Makefile index d9f0951c94a0..d44c982d950c 100644 --- a/include/Makefile +++ b/include/Makefile @@ -96,10 +96,10 @@ BSM= audit.h \ BSMPACKAGE= libbsm BSMDIR= ${INCLUDEDIR}/bsm -.PATH: ${SRCTOP}/sys/security/audit -SECAUDIT= audit.h \ - audit_ioctl.h \ - audit_private.h +.PATH: ${SRCTOP}/sys/security +SECAUDIT= audit/audit.h \ + audit/audit_ioctl.h \ + audit/audit_private.h SECAUDITPACKAGE= libbsm SECAUDITDIR= ${INCLUDEDIR}/security/audit From nobody Thu Apr 4 02:45:02 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4V95Z65FShz5GSWf; Thu, 4 Apr 2024 02:45:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4V95Z62gN2z449j; Thu, 4 Apr 2024 02:45:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712198702; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jR/FpkZI27xvJVKIzec93pJyudphaJiydS5oNI1AW5o=; b=nmwV9AAHTqEC4O5OTeztMkt7YNCmllJ6h03DElI7Kz74HVPCXsoemhYLaDXMnh2Fc8zYeI 3qMe1TKUg6uYqE6aTd5FKg4GjQcotPoyQ8TZUCU9Ka46ExtYynebV6VDO/Ofw0x5m/5Hao E7y293/fuIAdAz9DV5sSNk6lBrfkzujt6F4v5gy756YlKNCn6qzjvSL9BJ3j4EXy4WuHRt FgoAUm2zd4bgtwUYaAJ97X1rtY2kqpI6kzGy44ziNhd3YK1aDnBjIIlhj4MaVyzMHpDOoE ojhTd+pTRA8vCk6af4xKyXU5Z9ybio1K3AZbmxMJC76aJImHCbTViCKore6y5A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712198702; a=rsa-sha256; cv=none; b=Ble6xjwoSxLltAxCfkvfIZew7s91BGmj5D6jpSEtgFu27sMRg9bMLqzu74tXl0sWPE9Z+S D3aZqoSyhjvBfWqkb6N9YBpB6IFTa6DS/BzQsKMSKyCmNT1IUvTsgBYnBrvRxvFyrTO8OA ZeOvWaOyjFGOroVY9cU+ilPf9joMl1Ri0DRoFDcpm4JvKPCzZxPBVs4YJ20L3amfFtip4Y FHQtBfGN0VHfq443ZKKHNn/r1S8w9PPtuVe4stKa4gQ/SwJ2Tbtb1R/VrJjh+ICuM6qZi2 GwDpVPergwDHH0dJ9b31Y5c6g8YJ+WvQP42D+Sj1IXy4KfXm4AGbFZcqwTkk2A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712198702; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jR/FpkZI27xvJVKIzec93pJyudphaJiydS5oNI1AW5o=; b=I9QyIXTR7tve+BNEylcaJ0UtZPvjJDg3Odug0+s2gLQodpuUVoNJ2NRogp5E7sIexyJYGd qS50NfUIFZMatuNyMXi6i5fBkTr05TQa1q58HZclYpXGIU+cYnK/6cayuukClHTF4bxH13 fHvripChiRYuQBk8buSE/mkphNUpYVxIwwU8u8vLT9ZIZFkIY+K27ai2cyD5CrCoUw3imT AJrrcOCV2uIN06mfTbq1WhPiolG+Y8/tYx7m24bVsFPLzJ+pDVpRZsMtHgrtXzFnxXl1UK +XwXUx2+vifgAvABp9NhRnFGKYvrWLRAApVJC7h6iXsLSe7UPFwYiDJzzrVnxQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4V95Z62GjZzybN; Thu, 4 Apr 2024 02:45: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 4342j2mS060667; Thu, 4 Apr 2024 02:45:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4342j2WY060665; Thu, 4 Apr 2024 02:45:02 GMT (envelope-from git) Date: Thu, 4 Apr 2024 02:45:02 GMT Message-Id: <202404040245.4342j2WY060665@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: df9c60beea7c - stable/14 - thread_single(9): decline external requests for traced or debugger-stopped procs List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: df9c60beea7c5d6d21c3e9e892f4e97a4bb7b4d8 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=df9c60beea7c5d6d21c3e9e892f4e97a4bb7b4d8 commit df9c60beea7c5d6d21c3e9e892f4e97a4bb7b4d8 Author: Konstantin Belousov AuthorDate: 2024-03-27 12:29:25 +0000 Commit: Konstantin Belousov CommitDate: 2024-04-04 02:44:38 +0000 thread_single(9): decline external requests for traced or debugger-stopped procs (cherry picked from commit 9241ebc796c11cf133c550f188f324bd2c12d89a) --- sys/kern/kern_thread.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sys/kern/kern_thread.c b/sys/kern/kern_thread.c index d8ba94925fec..1586d6c664fe 100644 --- a/sys/kern/kern_thread.c +++ b/sys/kern/kern_thread.c @@ -1249,6 +1249,9 @@ thread_single(struct proc *p, int mode) return (1); msleep(&p->p_flag, &p->p_mtx, PCATCH, "thrsgl", 0); } + if ((p->p_flag & (P_STOPPED_SIG | P_TRACED)) != 0 || + (p->p_flag2 & P2_WEXIT) != 0) + return (1); } else if ((p->p_flag & P_HADTHREADS) == 0) return (0); if (p->p_singlethread != NULL && p->p_singlethread != td) From nobody Thu Apr 4 02:45:20 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4V95ZT0twtz5GSFy; Thu, 4 Apr 2024 02:45:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4V95ZT04P7z44bZ; Thu, 4 Apr 2024 02:45:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712198721; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9x9ZgISR81RgerLCLG7ZsR/fXMYZ5KDQZCcTI/odsiU=; b=bdJPjtIIyjqkR78b8LBEXH399U1bk9XlsuoC52HeexC32HQOYMD8R7meLfQXFFT3+CaQKF M/Uf3I8dV0e0lKN4K6UwHWjOfi6z40j43wp6o29L1sUSY9Q/m7x0LWh8zITPxM16reSkJM eCSON0fndBpKP3OdyJ7rJvZsQTSKVcTxeMN0lDE+8ensaqvsfY9tCkGRmthbt08E2APfWd OVaV93yV++pxI8+DiZsj9s3/Ag5ubpcE8YULEUQcYzimNAah4qa60D9TvY3r/lSOQe9EDF nxrkSqH6cJbZZLzRlflJL4PWBNPBh1KHoUsyQgrS9Z+QCfW2UT/WiF8nUdQd1w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712198721; a=rsa-sha256; cv=none; b=XwYMEyMO4CsjW2zfciuA5zYS3XvHs9ZWuLFyOZNI8JgtX5QEDHGrLVszrrN1b+WjC/bNr9 L8sLlcsRAGHEK8puK+gugi6S3OpNRM4zaoRv49h515PlPQxL7udsDBYha2IkW07Edl+kZ1 ZwIix9UJmeBGzf+P/Psn7GA0haM/KGgRULqFpcuZhibpVKiMcaC0WGdMkJ7UgLw+xbi8Ib fcY2SdwiZNkP4e7MrBDE05Vl2kBL+Ko2Bg54fgnMvq9PUxHfSy9sMC3+XnNerzhqT365/3 cdsQcrpaCc4ze7gHfylDmE6hqGDfXTPMp8BJT8MAdPzutVjO/156rwJIt00/GQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712198721; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9x9ZgISR81RgerLCLG7ZsR/fXMYZ5KDQZCcTI/odsiU=; b=YxOfQSh2pARN1Px0t4XDTKEkOkZFqjo087ysqoGO2Mvb6OIG072JM394vAguzwwjUr1k/W tum9+qPTeP3qXiVYsKSjR0rnnK26m+G9fIcNlOLiRQJnxCXqGxtlf3VBSGDkpok44CnHM3 P39usmsd8brooMpnGeY1bcmAWGl7dxc99PGJgxeKBEu/hayLvZOAg3ilyt4dVxGFtq8D/O LG9Mu3anv0W7reR4ebMuLiTK7dXmxsdu5G2DHmfGWHOAvji3QTqQf4CnA0YELr++e88vvd efdBFn051ofzEFUSz+p+N5BQ8fg5rBy8Qj+4GyWD54R44SLNjw76/wgF9z57/A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4V95ZS6n31zybP; Thu, 4 Apr 2024 02:45:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 4342jKeg060843; Thu, 4 Apr 2024 02:45:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4342jKNH060840; Thu, 4 Apr 2024 02:45:20 GMT (envelope-from git) Date: Thu, 4 Apr 2024 02:45:20 GMT Message-Id: <202404040245.4342jKNH060840@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: bfafc6a86ddb - stable/13 - thread_single(9): decline external requests for traced or debugger-stopped procs List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: bfafc6a86ddb4d278ceacab3d83b3e19b0cb33ff Auto-Submitted: auto-generated The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=bfafc6a86ddb4d278ceacab3d83b3e19b0cb33ff commit bfafc6a86ddb4d278ceacab3d83b3e19b0cb33ff Author: Konstantin Belousov AuthorDate: 2024-03-27 12:29:25 +0000 Commit: Konstantin Belousov CommitDate: 2024-04-04 02:43:56 +0000 thread_single(9): decline external requests for traced or debugger-stopped procs (cherry picked from commit 9241ebc796c11cf133c550f188f324bd2c12d89a) --- sys/kern/kern_thread.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sys/kern/kern_thread.c b/sys/kern/kern_thread.c index 14015ef5fdc2..75a10a0810f0 100644 --- a/sys/kern/kern_thread.c +++ b/sys/kern/kern_thread.c @@ -1205,6 +1205,9 @@ thread_single(struct proc *p, int mode) return (1); msleep(&p->p_flag, &p->p_mtx, PCATCH, "thrsgl", 0); } + if ((p->p_flag & (P_STOPPED_SIG | P_TRACED)) != 0 || + (p->p_flag2 & P2_WEXIT) != 0) + return (1); } else if ((p->p_flag & P_HADTHREADS) == 0) return (0); if (p->p_singlethread != NULL && p->p_singlethread != td) From nobody Thu Apr 4 08:07:37 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4V9DkK6hwsz5GWfg; Thu, 4 Apr 2024 08:07:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4V9DkK6D6wz4kR7; Thu, 4 Apr 2024 08:07:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712218057; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NQWFexs+XmzhDM91TIO0v9ZOYX9t6AtZ+lT2pfP5MvE=; b=GAQhs6gOUyuu2oM2zwH9hCZb2mEn4c+8tA04ccn7ZIEbgzQEEs50L504rxI48voKe9D/JQ wMWI7FxJKGVS7UmEw+iTNzp+WMdUwmtGa72V4zKuFwtkJLsGzrCFdoxFFyo1UkKMgCohKB eQCGUZFoVnh2Le+ctE32ZKZapIWDtop1/2krcW8Zdo7wxB3L+UhrN3wiRfz1ezGT6gJXHf M0cO3sGgSRfYG1xR1XYo6c3o8QsCHlJ8ewXARPPlTy4dvw9oKgnVMJOBLmnSvRCZjmx4wt IO0zolmMo2fxVN3cOswT7K/4FltV9TOo/TxHjDz08KAp+bSGPxi0Jvea9nK+EQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712218057; a=rsa-sha256; cv=none; b=Zv1BNlSuoSvzOiFzolAhoqC8d2IKHCyRFn/jTen1Z9JJBnHglPnPKwj/7hnVcYi4Ac5ZFR edXh1y1/cX0lAIrlYk4Eg41li8UBEUL+eU/AQ2SnF8klJJtAQwBtd3bk8+Noo99ZZyghe2 ynLyKv0EwJ8+ppzKZxMmD7jaQsU3LagGZicNbyoSy5UQ+5DWvYS9ZTifgCqq6SYUImgnsL QIuhAmI9r+aHzloiVPfWXIyZbhKaHbHSgNqkxz4yqkhdqYuOc10Z4s0POjrZzIhs0aRboH vdD5+pPkH5ktyvlQAiyZ8ex60ejbFIooSh1fj3CnB7sQRrDAxcmijQAuWJ6eKw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712218057; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NQWFexs+XmzhDM91TIO0v9ZOYX9t6AtZ+lT2pfP5MvE=; b=SHnRzLv5L3fk3R5xySSi3BHlqPhO14BdDNC4enkjYylt7Yo/xN9oCcFdqTsdgGWc7yD5dy 6xTX9asZuarEINN3Y+lZ8mi9TWNPsH+cx5mXgisu2T9qNeve8R4luWmnqrR9SvxjQx3BZx mj5YbMIQnuKGAVwCM36A4KwaXBWuNX7sHX0tpyhyw4RvYJjkI/UwXkUuQZYxSk8/Hk+YoY VAv/7KiyXYvDT2ixThsbTJKliYDsE/R1RXgthgmKGshvXsijRU0ym6ijg9R8jAABwyO3UL 0JsNhT37QOPDWtJ+0XMy9FT1BR7Y5Bm6pIVZlpIYmtNOPpCsYZIRAkuImzuIlw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4V9DkK5r22z173G; Thu, 4 Apr 2024 08:07: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 43487bOn004120; Thu, 4 Apr 2024 08:07:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43487b73004117; Thu, 4 Apr 2024 08:07:37 GMT (envelope-from git) Date: Thu, 4 Apr 2024 08:07:37 GMT Message-Id: <202404040807.43487b73004117@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: 4848eb3af2a9 - main - tcpdump: cope with incorrect packet lengths List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4848eb3af2a91b133c4b70cb9b71dd92ffec7f46 Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=4848eb3af2a91b133c4b70cb9b71dd92ffec7f46 commit 4848eb3af2a91b133c4b70cb9b71dd92ffec7f46 Author: Kristof Provost AuthorDate: 2024-04-01 09:42:14 +0000 Commit: Kristof Provost CommitDate: 2024-04-04 08:07:05 +0000 tcpdump: cope with incorrect packet lengths It's possible for the capture buffer to be smaller than indicated by the header length. However, pfsync_print() only took the header length into account. As a result we could read outside of the buffer. Check that we have at least the expected amount of data before we start parsing. PR: 278034 MFC after: 2 weeks Sponsored by: Rubicon Communications, LLC ("Netgate") Differential Revision: https://reviews.freebsd.org/D44580 --- contrib/tcpdump/print-pfsync.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/tcpdump/print-pfsync.c b/contrib/tcpdump/print-pfsync.c index 5710e36ded6c..6bf9abaf3903 100644 --- a/contrib/tcpdump/print-pfsync.c +++ b/contrib/tcpdump/print-pfsync.c @@ -86,7 +86,7 @@ pfsync_ip_print(netdissect_options *ndo , const u_char *bp, u_int len) { struct pfsync_header *hdr = (struct pfsync_header *)bp; - if (len < PFSYNC_HDRLEN) + if (len < PFSYNC_HDRLEN || !ND_TTEST_LEN(bp, len)) ND_PRINT("[|pfsync]"); else pfsync_print(ndo, hdr, bp + sizeof(struct pfsync_header), From nobody Thu Apr 4 11:38:47 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4V9KPz49lyz5GrPj; Thu, 4 Apr 2024 11:38: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 4V9KPz3MGxz5776; Thu, 4 Apr 2024 11:38:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712230727; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7Bloqm3Uj41KAYjyWY/to5WP7tKkDTV4DhGq1gswuXU=; b=mzQFAgdC/Lx81pcYT2xD2HbJFwus55KVwyiAalcXg1dUQ4ClRhFt0ofJySlJ8crIWv0Ytw r+6YtyffiQkV7sA4UfqVF7yFYAmaCjTW424qTRxwo/O+7MUbJpNPScuD0w/xwlm6kZukv/ 1i/dH2UdpQZnrMRdk9wzcSbbraT8VoxxVWNCl/+mInxmGcxGSMmgCDaZn7nISnrKtBanR5 whPWGho4midCH+lOkADK6FPKtHKSMey7nSzwTm+Ren7lXdDkYoeIRREuIegjrdcWXMrBNb i6eiMw8gEAwyHo99KHbu/ysS2BKz67R420FPbTuKgq6VmgX8/Y+3Ewl/1osC4A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712230727; a=rsa-sha256; cv=none; b=nx/lmY0UVCRj+xZKvUQhJ0nThXAgZgN9oaWKpgROuBhsaL7X+6YQU4lCHzHCYBsskgpC++ E6YickJ8SaPWCXoyT3BXUMuBuXMVXmwSHf+np+JkP6qTEIBA/g/2nrnfNutw/IxsJCmXap FsP38ZDCLWe+AvLT/1+DFCI4oJB04aFaTH+QhTI3SCJHtooenioS55qPVVKHE36m33URj5 kEdzY2soHAM949FRv7jfKpwk5rI9PauKNEH17ChZX4SqESND0NaOtj6i7XJhEkZkZTuthB 22KO5nnUy1hkUdIt/6WRS+UtgSCf66Ojm1jIiogMZsh4t8Ur416qFtnAjJkB+w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712230727; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7Bloqm3Uj41KAYjyWY/to5WP7tKkDTV4DhGq1gswuXU=; b=FBpQhqUNMKGhItOqnLxVC3Lg9Yz/X10iVzbsHMXlG+CN6yddjp+/hpUKLK/cQfCrvJokio S/oEaMR2Y09nH3W2icpLsbKmCkXymjcoXTPVsRaJbP9iw3VWA117ZzaAEH/El3ZzhyX7pa vfQ/cpSOHJQ1gI8rxRLfimod/s7CEEwBxONCIvezC+hFSw3ntwux9Cs/A7CgI9SiGTzb4w kadT8kguN8wtXMe3+Yp3B6E5kLFtmMj0p5P+BPGfW5WC0RhgHpWgX2xKP6xlvueiVBrITu I0pDy4+oW+Ootu8DCb1oq1LKto79pT/ygPY+4IwHwoCXyegn77aXW0Gi+xhw/w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4V9KPz2yG2zFVY; Thu, 4 Apr 2024 11:38: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 434BclEu059652; Thu, 4 Apr 2024 11:38:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 434BclUj059649; Thu, 4 Apr 2024 11:38:47 GMT (envelope-from git) Date: Thu, 4 Apr 2024 11:38:47 GMT Message-Id: <202404041138.434BclUj059649@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: fdde01c5b449 - stable/14 - libc: Improve description of mktime() / timegm(). List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: fdde01c5b44904e34ff3b003f446644de865fa21 Auto-Submitted: auto-generated The branch stable/14 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=fdde01c5b44904e34ff3b003f446644de865fa21 commit fdde01c5b44904e34ff3b003f446644de865fa21 Author: Dag-Erling Smørgrav AuthorDate: 2024-03-27 10:03:37 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2024-04-04 09:41:41 +0000 libc: Improve description of mktime() / timegm(). * Mention that mktime() and timegm() set errno on failure. * Correctly determining whether mktime() / timegm() succeeded with arbitrary input (where -1 can be a valid result) is non-trivial. Document the recommended procedure. PR: 277863 MFC after: 1 week Reviewed by: pauamma_gundo.com, gbe Differential Revision: https://reviews.freebsd.org/D44503 (cherry picked from commit 7534109d13a6cdb22e78d9d4c0a0cd5efd323c45) --- lib/libc/stdtime/ctime.3 | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/lib/libc/stdtime/ctime.3 b/lib/libc/stdtime/ctime.3 index 25a7c6a7656e..7216ada23826 100644 --- a/lib/libc/stdtime/ctime.3 +++ b/lib/libc/stdtime/ctime.3 @@ -29,7 +29,7 @@ .\" .\" From: @(#)ctime.3 8.1 (Berkeley) 6/4/93 .\" -.Dd April 20, 2023 +.Dd March 26, 2024 .Dt CTIME 3 .Os .Sh NAME @@ -243,7 +243,21 @@ The .Fn mktime function returns the specified calendar time; if the calendar time cannot be -represented, it returns \-1; +represented, it returns \-1 and sets +.Xr errno 3 +to an appropriate value. +.Pp +Note that \-1 is a valid result (representing one second before +midnight UTC on the evening of 31 December 1969), so this cannot be +relied upon to indicate success or failure; instead, +.Fa tm_wday +and / or +.Fa tm_yday +should be set to an out-of-bounds value (e.g. \-1) prior to calling +.Fn mktime +or +.Fn timegm +and checked after the call. .Pp The .Fn difftime From nobody Thu Apr 4 11:38:48 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4V9KQ04rjlz5GrPn; Thu, 4 Apr 2024 11:38:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4V9KQ04LBvz56t1; Thu, 4 Apr 2024 11:38:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712230728; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nGTVbb/kseuXy+/4alRsSzpvCuqv/K5Sxiz3oRzETPY=; b=E7HXOdW8in6i6AzLcTy/mDUWiV3QFfjvv6k3F/yM3IDqcBl+5/i1o2zHw3F7a/aHB8Yfzi eGUjvzdNlxT5svPA+9BumQ+Ls2nAjmxqOwQvzYZs1wmjh3kbdgJG4jyDNyR3JHrD5jit29 SYAevbCnwr1lS4c7O5k/cPcEa7LkZGPu6rSoj1AnpwJtzPc2TQqvUCzhGnfwBE5K4wSRvJ RJvxfQRtNry+Jn7GjVFw7UGwq/1AJzyaCqzRXMWz+8uYNgJOWUW3q7SmIN3xCUXQ/zc0zT I3C+EbeCna3wLpba2suuth23yfydXm3M6zr2pYJQ62EBu+wCj6uzKJBNe6ntag== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712230728; a=rsa-sha256; cv=none; b=DAUFZxe2KjSbdwXaTTzmyrB73tZEt4OWKNK5ZgAuaoZMxpIag1BAS43RiE5HOPGqP1DnSr hRhCO28BSO45vSyEweuCZZ69CKnVGiiOSssdbIHN9Qsktbp4kEUxHItObRCxDI+YUsUipc xQaqciGf8wL/REH4JqexfetiqpWUyOekbFNZAqHVdyeKxE9LAYAljek4mh6bH/0nfLk9NE m4oBQZiWKh39ZG9CsWFAomU2Rsz43bZXEi7apiBIUY28yc1Z4fjlLFFHqW6//3/6jjXtp2 7Aqd8MYeFk1DIcXnfxnlnQD2o5o/Rhi3rdeT0nT0wLorpwEuheYeXxyjnCudyw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712230728; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nGTVbb/kseuXy+/4alRsSzpvCuqv/K5Sxiz3oRzETPY=; b=EmoHBHcP+qDXLIakLafMV8lq+S6VilqEuQf9f0amt4/m9SWn3b8wt+ijJ8SR86yp8nrA7F +kxZYhRLAtKXSLGp1XKPDDSAd3ccQz07DxFuoc4RSNrm6A+/rnoluVaP1aqg04STsZxNAj mrQq3kk8Sb1Vrr85lpfCbdaQyTcxBrRggufCcQV+kVoZHA2D3HRIddpwXTG18cxo64JFcg 08TY1/Q9d1oh2PoB6GUlTvJ3ptET+qq8djokwS0d1zA0sXU6gw5dB/WZdyMjCWrilsNXfT 7rfwxz99bsunq7qe8ROVzRoJKDP7l3sfwtrfCZSk9Rc1LYvQWWGwBz7MaoSzzQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4V9KQ03xyDzFLb; Thu, 4 Apr 2024 11:38:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 434BcmTf059703; Thu, 4 Apr 2024 11:38:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 434BcmuD059700; Thu, 4 Apr 2024 11:38:48 GMT (envelope-from git) Date: Thu, 4 Apr 2024 11:38:48 GMT Message-Id: <202404041138.434BcmuD059700@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: ae2888dd0e25 - stable/14 - touch: Allow setting the timestamp to -1. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: ae2888dd0e25e0334c89164454480d9c2ff9bd23 Auto-Submitted: auto-generated The branch stable/14 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=ae2888dd0e25e0334c89164454480d9c2ff9bd23 commit ae2888dd0e25e0334c89164454480d9c2ff9bd23 Author: Dag-Erling Smørgrav AuthorDate: 2024-03-27 10:03:40 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2024-04-04 09:43:12 +0000 touch: Allow setting the timestamp to -1. Note that VFS internally interprets a timestamp of -1 as “do not set”, so this has no effect, but at least touch won't incorrectly reject the given date / time (1969-12-31 23:59:59 UTC) as invalid. While here, fix some style issues. MFC after: 1 week Reviewed by: allanjude Differential Revision: https://reviews.freebsd.org/D44504 (cherry picked from commit aa69e0f212630bd6d4ec1c3c54e117be16653e8a) touch: Add unit tests. MFC after: 1 week Reviewed by: bapt Differential Revision: https://reviews.freebsd.org/D44505 (cherry picked from commit 74a4aa9b1517d92bfa85b0b1cd7d4c1262bb1ef9) --- etc/mtree/BSD.tests.dist | 2 + usr.bin/touch/Makefile | 4 + usr.bin/touch/tests/Makefile | 4 + usr.bin/touch/tests/touch_test.sh | 157 ++++++++++++++++++++++++++++++++++++++ usr.bin/touch/touch.c | 21 +++-- 5 files changed, 181 insertions(+), 7 deletions(-) diff --git a/etc/mtree/BSD.tests.dist b/etc/mtree/BSD.tests.dist index 8a3b097c4162..a3c5cae09567 100644 --- a/etc/mtree/BSD.tests.dist +++ b/etc/mtree/BSD.tests.dist @@ -1133,6 +1133,8 @@ .. tftp .. + touch + .. tr .. truncate diff --git a/usr.bin/touch/Makefile b/usr.bin/touch/Makefile index 5c153b3357a4..f4b74a033c36 100644 --- a/usr.bin/touch/Makefile +++ b/usr.bin/touch/Makefile @@ -1,5 +1,9 @@ # @(#)Makefile 8.1 (Berkeley) 6/6/93 +.include + PROG= touch +HAS_TESTS= +SUBDIR.${MK_TESTS}= tests .include diff --git a/usr.bin/touch/tests/Makefile b/usr.bin/touch/tests/Makefile new file mode 100644 index 000000000000..543b682b96a0 --- /dev/null +++ b/usr.bin/touch/tests/Makefile @@ -0,0 +1,4 @@ +PACKAGE= tests +ATF_TESTS_SH= touch_test + +.include diff --git a/usr.bin/touch/tests/touch_test.sh b/usr.bin/touch/tests/touch_test.sh new file mode 100644 index 000000000000..da39abef622e --- /dev/null +++ b/usr.bin/touch/tests/touch_test.sh @@ -0,0 +1,157 @@ +# +# Copyright (c) 2024 Dag-Erling Smørgrav +# +# SPDX-License-Identifier: BSD-2-Clause +# + +export TZ=UTC + +atf_check_mtime() +{ + local mtime=$1 filename=$2 + atf_check -o inline:"$((mtime))\n" stat -f%m "$filename" +} + +atf_test_case touch_none +touch_none_head() +{ + atf_set descr "No arguments" +} +touch_none_body() +{ + atf_check -s exit:1 -e match:"^usage" touch +} + +atf_test_case touch_one +touch_one_head() +{ + atf_set descr "One argument" +} +touch_one_body() +{ + atf_check touch foo + atf_check test -f foo +} + +atf_test_case touch_multiple +touch_multiple_head() +{ + atf_set descr "Multiple arguments" +} +touch_multiple_body() +{ + atf_check touch foo bar baz + atf_check test -f foo -a -f bar -a -f baz +} + +atf_test_case touch_absolute +touch_absolute_head() +{ + atf_set descr "Absolute date / time" +} +touch_absolute_body() +{ + atf_check touch -t 7001010101 foo + atf_check_mtime 3660 foo + atf_check rm foo + + atf_check touch -t 7001010101.01 foo + atf_check_mtime 3661 foo + atf_check rm foo + + atf_check touch -t 196912312359 foo + atf_check_mtime -60 foo + atf_check rm foo + + atf_check touch -t 196912312359.58 foo + atf_check_mtime -2 foo + atf_check rm foo + + atf_check touch -t 196912312359.59 foo + atf_expect_fail "VFS interprets -1 as “do not set”" + atf_check_mtime -1 foo + atf_check rm foo + + atf_check touch -d1969-12-31T23:59:58 foo + atf_check_mtime -2 foo + atf_check rm foo + + atf_check touch -d1969-12-31\ 23:59:58 foo + atf_check_mtime -2 foo + atf_check rm foo + + atf_check env TZ=CET touch -d1970-01-01T00:59:58 foo + atf_check_mtime -2 foo + atf_check rm foo + + atf_check env TZ=CET touch -d1970-01-01T00:59:58Z foo + atf_check_mtime 3598 foo + atf_check rm foo + + atf_check touch -d1969-12-31T23:59:59Z foo + atf_expect_fail "VFS interprets -1 as “do not set”" + atf_check_mtime -1 foo + atf_check rm foo +} + +atf_test_case touch_relative +touch_relative_head() +{ + atf_set descr "Relative date / time" +} +touch_relative_body() +{ + atf_check touch -t 202403241234.56 foo + atf_check_mtime 1711283696 foo + atf_check touch -A -36 foo + atf_check_mtime 1711283660 foo + atf_check touch -A -0100 foo + atf_check_mtime 1711283600 foo + atf_check touch -A -010000 foo + atf_check_mtime 1711280000 foo + atf_check touch -A 010136 foo + atf_check_mtime 1711283696 foo +} + +atf_test_case touch_copy +touch_copy_head() +{ + atf_set descr "Copy time from another file" +} +touch_copy_body() +{ + atf_check touch -t 202403241234.56 foo + atf_check_mtime 1711283696 foo + atf_check touch -t 7001010000 bar + atf_check_mtime 0 bar + atf_check touch -r foo bar + atf_check_mtime 1711283696 bar +} + +atf_test_case touch_nocreate +touch_nocreate_head() +{ + atf_set descr "Do not create file" +} +touch_nocreate_body() +{ + atf_check touch -t 202403241234.56 foo + atf_check_mtime 1711283696 foo + atf_check touch -c -t 7001010000 foo bar + atf_check_mtime 0 foo + atf_check -s exit:1 test -f bar + atf_check touch -c bar + atf_check -s exit:1 test -f bar +} + +atf_init_test_cases() +{ + atf_add_test_case touch_none + atf_add_test_case touch_one + atf_add_test_case touch_multiple + atf_add_test_case touch_absolute + atf_add_test_case touch_relative + atf_add_test_case touch_copy + atf_add_test_case touch_nocreate + # TODO: add test cases for -a, -h, -m +} diff --git a/usr.bin/touch/touch.c b/usr.bin/touch/touch.c index 91abcfd447ea..ed5b2125ec36 100644 --- a/usr.bin/touch/touch.c +++ b/usr.bin/touch/touch.c @@ -243,7 +243,7 @@ stime_arg1(const char *arg, struct timespec *tvp) } yearset = 0; - switch(strlen(arg)) { + switch (strlen(arg)) { case 12: /* CCYYMMDDhhmm */ t->tm_year = ATOI2(arg); t->tm_year *= 100; @@ -274,15 +274,17 @@ stime_arg1(const char *arg, struct timespec *tvp) } t->tm_isdst = -1; /* Figure out DST. */ + t->tm_yday = -1; tvp[0].tv_sec = tvp[1].tv_sec = mktime(t); - if (tvp[0].tv_sec == -1) + if (t->tm_yday == -1) goto terr; tvp[0].tv_nsec = tvp[1].tv_nsec = 0; return; terr: - errx(1, "out of range or illegal time specification: [[CC]YY]MMDDhhmm[.SS]"); + errx(1, "out of range or illegal time specification: " + "[[CC]YY]MMDDhhmm[.SS]"); } static void @@ -307,10 +309,11 @@ stime_arg2(const char *arg, int year, struct timespec *tvp) } t->tm_isdst = -1; /* Figure out DST. */ + t->tm_yday = -1; tvp[0].tv_sec = tvp[1].tv_sec = mktime(t); - if (tvp[0].tv_sec == -1) - errx(1, - "out of range or illegal time specification: MMDDhhmm[yy]"); + if (t->tm_yday == -1) + errx(1, "out of range or illegal time specification: " + "MMDDhhmm[yy]"); tvp[0].tv_nsec = tvp[1].tv_nsec = 0; } @@ -350,13 +353,17 @@ stime_darg(const char *arg, struct timespec *tvp) if (*p != '\0') goto bad; + t.tm_yday = -1; tvp[0].tv_sec = isutc ? timegm(&t) : mktime(&t); + if (t.tm_yday == -1) + goto bad; tvp[1] = tvp[0]; return; bad: - errx(1, "out of range or illegal time specification: YYYY-MM-DDThh:mm:SS[.frac][tz]"); + errx(1, "out of range or illegal time specification: " + "YYYY-MM-DDThh:mm:SS[.frac][tz]"); } /* Calculate a time offset in seconds, given an arg of the format [-]HHMMSS. */ From nobody Thu Apr 4 11:38:49 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4V9KQ20Rhcz5GrMM; Thu, 4 Apr 2024 11:38:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4V9KQ15N2Fz57NM; Thu, 4 Apr 2024 11:38:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712230729; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0zAKuBGftuhTwjUnGGyn90vMFXO/QHbfWetjfGvcKa8=; b=cBQbfSVncGCZua76lLUljty5HkVHglg7c05OfhgzqKXmoE6SPMRzPeQ6aX6XR650gYi2XU phQB/tNV7rYqwN1UswJAU0stoWhB6D5Wyfyg4Ybv85ut0opxlhu4ZHkWIVdgtn3b61rOIL tEbfjVTk4D16qqEGIwb3n87n1+kO9jypTyodUjzeBArGDNmAS8zRziqAJKPvQ9Ye/UGDCT I30qN8vUBuhu0JAnRKQjz/FhX4ZLusA0d9LvdiiqO5lrWnYsc58u1T31nFj3egV0Veau3S NFHo595UNxG80vSHBDn8TkTWPuw/fcJ9shJDvLQhyscpY4NWm1YpBjK+ErtYMg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712230729; a=rsa-sha256; cv=none; b=mFe7clffAJb9pyoKNk/csciY8aROXJTHHlTUxonzD5/5oHu96gWG8IW60O1fLP5t/bAI7K 1OSbZgRqye/rtFnxvF0KQexBkDDG6H7iIVfhWtajGqXS7BQkxdIc4inHwaZNk2evijMhfI hAxroVyzkCx04q0XeZL6QkpuwZ/HOEH91ch49KSIcp1zBH0fM6S27KxeLpDkCBCQ6qtAsA WObT+CHE9VpVDuQzudVF8y20bTKmx+TXgy03B1VSz1WdDUT35rDKU2p/gjhCCtbN78qBbY Wtr+G8EPHmmKtDcih/UVLNDPa6Nadm7FvPhHAXZCk8K25U2sJrBOMjl1hyhpKA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712230729; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0zAKuBGftuhTwjUnGGyn90vMFXO/QHbfWetjfGvcKa8=; b=NBigf3h2sgZ/fEc30WsItC8kN6XQlaxt/8+klVWOKa5K8lvxvvaMjxoC4YU6xwAWjZc/VW 5WKzQDB9vlBp/d3uu/Swjr4tu7AEZZtq7dX7ajjrYxP04QaVPhfj3k4fWGmBNJijHapVCB h7Pj3lR0soQKJ3FAGv5TjjbgkNC8gVngLxFFFyfUyk1Dd73Ggk5IcyulAf8CLfSvZI/O8h phje11TKC9gzm1PKaQTVbvvWv8KJQOu5tP7j3lHSlml33S3W93D1ij/LOVOKyzScsgqlBd dVQkgWtY4YzGEpOt3QXoO5TkICMQ1QLvHv3T0R2nqerCJuGg3/y2vYWLayBY3Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4V9KQ14z3lzFVZ; Thu, 4 Apr 2024 11:38:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 434BcnCZ059748; Thu, 4 Apr 2024 11:38:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 434BcnVn059745; Thu, 4 Apr 2024 11:38:49 GMT (envelope-from git) Date: Thu, 4 Apr 2024 11:38:49 GMT Message-Id: <202404041138.434BcnVn059745@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: d738ce7cf6a3 - stable/14 - ln: Use stdbool, style nits. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: d738ce7cf6a35faa071d3945ae75a7438a7b28e6 Auto-Submitted: auto-generated The branch stable/14 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=d738ce7cf6a35faa071d3945ae75a7438a7b28e6 commit d738ce7cf6a35faa071d3945ae75a7438a7b28e6 Author: Dag-Erling Smørgrav AuthorDate: 2024-03-27 10:03:49 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2024-04-04 09:43:14 +0000 ln: Use stdbool, style nits. MFC after: 1 week Sponsored by: Klara, Inc. Reviewed by: imp, allanjude Differential Revision: https://reviews.freebsd.org/D44511 (cherry picked from commit 437d53daf71a357aae960881ef037564736f7441) ln: Clean up and simplify tests. MFC after: 1 week Sponsored by: Klara, Inc. Reviewed by: allanjude Differential Revision: https://reviews.freebsd.org/D44512 (cherry picked from commit e0afcbc85690b6464706ead57103baa0493fdfb2) ln: Add a test case for ln -sfF. MFC after: 1 week Sponsored by: Klara, Inc. Reviewed by: allanjude, asomers Differential Revision: https://reviews.freebsd.org/D44513 (cherry picked from commit 2ae8d34666a6dea4c1c77a1905c7b8cebd6a21f9) --- bin/ln/ln.c | 76 ++++++++++++++++++++++--------------------- bin/ln/tests/ln_test.sh | 85 +++++++++++++++++++++---------------------------- 2 files changed, 76 insertions(+), 85 deletions(-) diff --git a/bin/ln/ln.c b/bin/ln/ln.c index 546bfba1c7c3..a0e19d702dea 100644 --- a/bin/ln/ln.c +++ b/bin/ln/ln.c @@ -49,24 +49,25 @@ static char sccsid[] = "@(#)ln.c 8.2 (Berkeley) 3/31/94"; #include #include #include +#include #include #include #include #include -static int fflag; /* Unlink existing files. */ -static int Fflag; /* Remove empty directories also. */ -static int hflag; /* Check new name for symlink first. */ -static int iflag; /* Interactive mode. */ -static int Pflag; /* Create hard links to symlinks. */ -static int sflag; /* Symbolic, not hard, link. */ -static int vflag; /* Verbose output. */ -static int wflag; /* Warn if symlink target does not +static bool fflag; /* Unlink existing files. */ +static bool Fflag; /* Remove empty directories also. */ +static bool hflag; /* Check new name for symlink first. */ +static bool iflag; /* Interactive mode. */ +static bool Pflag; /* Create hard links to symlinks. */ +static bool sflag; /* Symbolic, not hard, link. */ +static bool vflag; /* Verbose output. */ +static bool wflag; /* Warn if symlink target does not * exist, and -f is not enabled. */ static char linkch; -static int linkit(const char *, const char *, int); -static void usage(void); +static int linkit(const char *, const char *, bool); +static void usage(void) __dead2; int main(int argc, char *argv[]) @@ -91,41 +92,41 @@ main(int argc, char *argv[]) argv += optind; if (argc != 2) usage(); - exit(linkit(argv[0], argv[1], 0)); + exit(linkit(argv[0], argv[1], false)); } while ((ch = getopt(argc, argv, "FLPfhinsvw")) != -1) switch (ch) { case 'F': - Fflag = 1; + Fflag = true; break; case 'L': - Pflag = 0; + Pflag = false; break; case 'P': - Pflag = 1; + Pflag = true; break; case 'f': - fflag = 1; - iflag = 0; - wflag = 0; + fflag = true; + iflag = false; + wflag = false; break; case 'h': case 'n': - hflag = 1; + hflag = true; break; case 'i': - iflag = 1; - fflag = 0; + iflag = true; + fflag = false; break; case 's': - sflag = 1; + sflag = true; break; case 'v': - vflag = 1; + vflag = true; break; case 'w': - wflag = 1; + wflag = true; break; case '?': default: @@ -136,21 +137,21 @@ main(int argc, char *argv[]) argc -= optind; linkch = sflag ? '-' : '='; - if (sflag == 0) - Fflag = 0; - if (Fflag == 1 && iflag == 0) { - fflag = 1; - wflag = 0; /* Implied when fflag != 0 */ + if (!sflag) + Fflag = false; + if (Fflag && !iflag) { + fflag = true; + wflag = false; /* Implied when fflag is true */ } - switch(argc) { + switch (argc) { case 0: usage(); /* NOTREACHED */ case 1: /* ln source */ - exit(linkit(argv[0], ".", 1)); + exit(linkit(argv[0], ".", true)); case 2: /* ln source target */ - exit(linkit(argv[0], argv[1], 0)); + exit(linkit(argv[0], argv[1], false)); default: ; } @@ -169,7 +170,7 @@ main(int argc, char *argv[]) if (!S_ISDIR(sb.st_mode)) usage(); for (exitval = 0; *argv != targetdir; ++argv) - exitval |= linkit(*argv, targetdir, 1); + exitval |= linkit(*argv, targetdir, true); exit(exitval); } @@ -220,14 +221,15 @@ samedirent(const char *path1, const char *path2) } static int -linkit(const char *source, const char *target, int isdir) +linkit(const char *source, const char *target, bool isdir) { - struct stat sb; - const char *p; - int ch, exists, first; char path[PATH_MAX]; char wbuf[PATH_MAX]; char bbuf[PATH_MAX]; + struct stat sb; + const char *p; + int ch, first; + bool exists; if (!sflag) { /* If source doesn't exist, quit now. */ @@ -290,7 +292,7 @@ linkit(const char *source, const char *target, int isdir) /* * If the file exists, first check it is not the same directory entry. */ - exists = !lstat(target, &sb); + exists = lstat(target, &sb) == 0; if (exists) { if (!sflag && samedirent(source, target)) { warnx("%s and %s are the same directory entry", diff --git a/bin/ln/tests/ln_test.sh b/bin/ln/tests/ln_test.sh index 75fda4ce2dd7..8e5dcf81e61f 100644 --- a/bin/ln/tests/ln_test.sh +++ b/bin/ln/tests/ln_test.sh @@ -1,4 +1,6 @@ # +# SPDX-License-Identifier: BSD-2-Clause +# # Copyright 2017 Shivansh Rai # All rights reserved. # @@ -23,13 +25,15 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# -set_umask() +atf_check_same_file() { - if ! umask 022; then - atf_fail "setting umask failed" - fi + atf_check_equal "$(stat -f %d,%i "$1")" "$(stat -f %d,%i "$2")" +} + +atf_check_symlink_to() +{ + atf_check -o inline:"$1\n" readlink "$2" } atf_test_case L_flag @@ -39,18 +43,13 @@ L_flag_head() "symbolic link, '-L' option creates a hard" \ "link to the target of the symbolic link" } - L_flag_body() { - set_umask atf_check touch A atf_check ln -s A B atf_check ln -L B C - stat_A=$(stat -f %i A) - stat_C=$(stat -f %i C) - atf_check_equal "$stat_A" "$stat_C" - atf_check -o inline:'Symbolic Link\n' stat -f %SHT B - atf_check -o inline:'A\n' readlink B + atf_check_same_file A C + atf_check_symlink_to A B } atf_test_case P_flag @@ -60,16 +59,12 @@ P_flag_head() "symbolic link, '-P' option creates a hard " \ "link to the symbolic link itself" } - P_flag_body() { - set_umask atf_check touch A atf_check ln -s A B atf_check ln -P B C - stat_B=$(stat -f %i B) - stat_C=$(stat -f %i C) - atf_check_equal "$stat_B" "$stat_C" + atf_check_same_file B C } atf_test_case f_flag @@ -78,15 +73,11 @@ f_flag_head() atf_set "descr" "Verify that if the target file already exists, " \ "'-f' option unlinks it so that link may occur" } - f_flag_body() { - set_umask atf_check touch A B atf_check ln -f A B - stat_A=$(stat -f %i A) - stat_B=$(stat -f %i B) - atf_check_equal "$stat_A" "$stat_B" + atf_check_same_file A B } atf_test_case target_exists_hard @@ -95,10 +86,8 @@ target_exists_hard_head() atf_set "descr" "Verify whether creating a hard link fails if the " \ "target file already exists" } - target_exists_hard_body() { - set_umask atf_check touch A B atf_check -s exit:1 -e inline:'ln: B: File exists\n' \ ln A B @@ -110,10 +99,8 @@ target_exists_symbolic_head() atf_set "descr" "Verify whether creating a symbolic link fails if " \ "the target file already exists" } - target_exists_symbolic_body() { - set_umask atf_check touch A B atf_check -s exit:1 -e inline:'ln: B: File exists\n' \ ln -s A B @@ -124,13 +111,12 @@ shf_flag_dir_head() { atf_set "descr" "Verify that if the target directory is a symbolic " \ "link, '-shf' option prevents following the link" } - shf_flag_dir_body() { atf_check mkdir -m 0777 A B atf_check ln -s A C atf_check ln -shf B C - atf_check -o inline:'Symbolic Link\n' stat -f %SHT C + atf_check test -L C atf_check -o inline:'B\n' readlink C } @@ -139,14 +125,12 @@ snf_flag_dir_head() { atf_set "descr" "Verify that if the target directory is a symbolic " \ "link, '-snf' option prevents following the link" } - snf_flag_dir_body() { atf_check mkdir -m 0777 A B atf_check ln -s A C atf_check ln -snf B C - atf_check -o inline:'Symbolic Link\n' stat -f %SHT C - atf_check -o inline:'B\n' readlink C + atf_check_symlink_to B C } atf_test_case sF_flag @@ -156,13 +140,11 @@ sF_flag_head() "and is a directory, then '-sF' option removes " \ "it so that the link may occur" } - sF_flag_body() { atf_check mkdir A B atf_check ln -sF A B - atf_check -o inline:'Symbolic Link\n' stat -f %SHT B - atf_check -o inline:'A\n' readlink B + atf_check_symlink_to A B } atf_test_case sf_flag @@ -172,14 +154,27 @@ sf_flag_head() "'-sf' option unlinks it and creates a symbolic link " \ "to the source file" } - sf_flag_body() { - set_umask atf_check touch A B atf_check ln -sf A B - atf_check -o inline:'Symbolic Link\n' stat -f %SHT B - atf_check -o inline:'A\n' readlink B + atf_check_symlink_to A B +} + +atf_test_case sfF_flag +sfF_flag_head() +{ + atf_set "descr" "Verify that if the target file already exists " \ + "and is a symlink, then '-sfF' option removes " \ + "it so that the link may occur" +} +sfF_flag_body() +{ + atf_check mkdir A B C + atf_check ln -sF A C + atf_check_symlink_to A C + atf_check ln -sfF B C + atf_check_symlink_to B C } atf_test_case s_flag @@ -187,14 +182,11 @@ s_flag_head() { atf_set "descr" "Verify that '-s' option creates a symbolic link" } - s_flag_body() { - set_umask atf_check touch A atf_check ln -s A B - atf_check -o inline:'Symbolic Link\n' stat -f %SHT B - atf_check -o inline:'A\n' readlink B + atf_check_symlink_to A B } atf_test_case s_flag_broken @@ -203,12 +195,10 @@ s_flag_broken_head() atf_set "descr" "Verify that if the source file does not exists, '-s' " \ "option creates a broken symbolic link to the source file" } - s_flag_broken_body() { atf_check ln -s A B - atf_check -o inline:'Symbolic Link\n' stat -f %SHT B - atf_check -o inline:'A\n' readlink B + atf_check_symlink_to A B } atf_test_case sw_flag @@ -217,13 +207,11 @@ sw_flag_head() atf_set "descr" "Verify that '-sw' option produces a warning if the " \ "source of a symbolic link does not currently exist" } - sw_flag_body() { atf_check -s exit:0 -e inline:'ln: warning: A: No such file or directory\n' \ ln -sw A B - atf_check -o inline:'Symbolic Link\n' stat -f %SHT B - atf_check -o inline:'A\n' readlink B + atf_check_symlink_to A B } atf_init_test_cases() @@ -237,6 +225,7 @@ atf_init_test_cases() atf_add_test_case snf_flag_dir atf_add_test_case sF_flag atf_add_test_case sf_flag + atf_add_test_case sfF_flag atf_add_test_case s_flag atf_add_test_case s_flag_broken atf_add_test_case sw_flag From nobody Thu Apr 4 11:38:50 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4V9KQ30lxXz5GrPp; Thu, 4 Apr 2024 11:38:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4V9KQ26PMrz57Qq; Thu, 4 Apr 2024 11:38:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712230730; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Fet3Kz+vnUYmNqMkapqaGJnDj+T9NYmPT6o13NBbt/M=; b=snwUuHkZn3HbjSTPjj449YyZzwOeUmHflBYFrX7dofDo2GEXHNUD2sUHOxU38if6x31p6B nggQxCQyOWp6A642jC6TMtMUPdOhb8qwDD1GHoMeTnvnsVkcfPEpP32sWvxYiFOBlJBV30 PqZMKaqMzk0fRb/Ita4p+LGeTEvZV+BaI7Aze1tnclWCx29xB5oSSkaiNKBYD29aEdx0uV FbLzzBLWRFggxhvBdAUPS14AyoTvaEPeBb5vBoBb4Rp8DZe/FkstPzrp6jb2VOWx2g2bgO yNTjTsrnm9xpAQfe2JwK7z64Z+DrWDy/mPz+Zgjzn0SjpNf/W2Nk8Lg4WOHJ1g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712230730; a=rsa-sha256; cv=none; b=sAaI8BnOdCyN5SQRUTP4LYGPLKbgREGbOwmnn46R8ygUPX0QGicOUS1CQsy+qJYAjAyi7R ePSudHyngOvfXgZz9jjuzomTilkgAzBoPmjc72MGK+Wr0FuekeHwl+RvPTlKeK7WOImnn2 p3xxM2Gvw6XT+/G0UrvERoA5+tf3LqsGSmMmS7M4jkSQIyC1uk35VQ5uovF5Te6yZEAhLq 41HL82sLY43xdw7jNzNPJinq3BYhMKxqxOyAAjDEwicBVCgVmPAHSljjkYNrcHGgGXu5rJ tzC8YXfNLGllnULkxR6Hyqgm5Kwag/8C7h9eiN3FEuD4pJEmDUZPh4ZUIVO4FQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712230730; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Fet3Kz+vnUYmNqMkapqaGJnDj+T9NYmPT6o13NBbt/M=; b=ok3KKvdXsu6rD+IlwbVfbe62Tk8ch6sJAkngzkcmVWkIKCSFkW5DmKEsB1HVdIQyFkhTHT ZfiYvC2+N56Wu0qxh8jYzC0Pyo1qyAtLacTVoIrPKsgkgSQbqbt/tyjpVhmJdy2xIWSWJp DMBEEiWuAA5R81K53auj+BlvdEhRpEM6uWO8tR5fS5gn5L+eSq0OUERRWVydCNR2ykYrtN I2JqL2JP87JWbr+wVu5cUQZN5/I48YpXqRVS0tGi9b4+EDa0wM/UPsq5d9tA0rZFZWlBb0 Um4fqGekDZGXHM49FXaR0spz4C6q6N2U7egQsNhF5RCQB83AmCEiRmxOrMK+Nw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4V9KQ2604JzFJL; Thu, 4 Apr 2024 11:38:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 434BcoL8059795; Thu, 4 Apr 2024 11:38:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 434BcorS059791; Thu, 4 Apr 2024 11:38:50 GMT (envelope-from git) Date: Thu, 4 Apr 2024 11:38:50 GMT Message-Id: <202404041138.434BcorS059791@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: 80f2602e48eb - stable/14 - install: Prefer strsnvis() to strsvis(). List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 80f2602e48ebafcc5b82909724f970d2103185c4 Auto-Submitted: auto-generated The branch stable/14 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=80f2602e48ebafcc5b82909724f970d2103185c4 commit 80f2602e48ebafcc5b82909724f970d2103185c4 Author: Dag-Erling Smørgrav AuthorDate: 2024-03-27 10:03:59 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2024-04-04 09:43:15 +0000 install: Prefer strsnvis() to strsvis(). MFC after: 1 week Sponsored by: Klara, Inc. Reviewed by: allanjude Differential Revision: https://reviews.freebsd.org/D44514 (cherry picked from commit 2cab4be46b0eeb64b8ade010bc16245151af5ccd) --- usr.bin/xinstall/xinstall.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/usr.bin/xinstall/xinstall.c b/usr.bin/xinstall/xinstall.c index 1ab9cac76f2f..3764c5ef92fa 100644 --- a/usr.bin/xinstall/xinstall.c +++ b/usr.bin/xinstall/xinstall.c @@ -1542,15 +1542,18 @@ metadata_log(const char *path, const char *type, struct timespec *ts, static const char extra[] = { ' ', '\t', '\n', '\\', '#', '\0' }; const char *p; char *buf; - size_t destlen; + size_t buflen, destlen; struct flock metalog_lock; if (!metafp) return; - /* Buffer for strsvis(3). */ - buf = (char *)malloc(4 * strlen(path) + 1); - if (buf == NULL) { - warnx("%s", strerror(ENOMEM)); + /* Buffer for strsnvis(3), used for both path and slink. */ + buflen = strlen(path); + if (slink && strlen(slink) > buflen) + buflen = strlen(slink); + buflen = 4 * buflen + 1; + if ((buf = malloc(buflen)) == NULL) { + warn(NULL); return; } @@ -1575,7 +1578,7 @@ metadata_log(const char *path, const char *type, struct timespec *ts, } while (*p && *p == '/') p++; - strsvis(buf, p, VIS_OCTAL, extra); + strsnvis(buf, buflen, p, VIS_OCTAL, extra); p = buf; /* Print details. */ fprintf(metafp, ".%s%s type=%s", *p ? "/" : "", p, type); @@ -1585,14 +1588,14 @@ metadata_log(const char *path, const char *type, struct timespec *ts, fprintf(metafp, " gname=%s", group); fprintf(metafp, " mode=%#o", mode); if (slink) { - strsvis(buf, slink, VIS_CSTYLE, extra); /* encode link */ + strsnvis(buf, buflen, slink, VIS_CSTYLE, extra); fprintf(metafp, " link=%s", buf); } if (*type == 'f') /* type=file */ fprintf(metafp, " size=%lld", (long long)size); if (ts != NULL && dopreserve) fprintf(metafp, " time=%lld.%09ld", - (long long)ts[1].tv_sec, ts[1].tv_nsec); + (long long)ts[1].tv_sec, ts[1].tv_nsec); if (digestresult && digest) fprintf(metafp, " %s=%s", digest, digestresult); if (fflags) From nobody Thu Apr 4 11:38:51 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4V9KQ40dTLz5Gr8q; Thu, 4 Apr 2024 11:38:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4V9KQ36rSRz578m; Thu, 4 Apr 2024 11:38:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712230732; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sFH5lARvL/uY67KOaBAlwgLluoGrytxBvD6WRPrI8g4=; b=pLv6Z47SBIoa7gIRwSCNSJB8nI5jjTFxd5I/eFtaYyry8xU55WYowtHxcmad9P4x+v3Opl V7jEaY0IFF+SOYgoLvr5BWLhweEXzbTuap3XHoeurqDgrxqG5/GUFKqnJmfaaJ8ZquD/vc ba58QrjTuzqdBoqaGbjpsA4vK6JT2p4FHfRDjP8rXuHEPfnAizQxf5VanpIdHvh1YpNzC6 wI2VO+vkiqpHD9PdW9pLuE6Kh/uKLvEU6j3j57p8uoR6+cBIv3bex2kdZUgnDCmrwWF9o2 hnt4pRAtC707MF+YtrpOrnn19vtxYhkuwaMhMsdo6dJQecgOl+h5EYxpih9VeA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712230732; a=rsa-sha256; cv=none; b=firu4EIU26EPh0loh75q8oLDXyA2e1o1StJ/0TP/TWtRBBWEkqYXv3w8or0OtgnsVFCwmo /jc/TVvjDQpr3yFnIT8niiEgbE27uPFTKaqiZMezDBHoUvjmmmOO2ww/kkkm/Jt1XanXHm oW9N5UfiP0VF4NIa+DhNomqb44CoWOnO8kvOtBP6pR/dpdXWqFMA442cwlJkuT7Dp+7nu+ vR6tij0hUKODv9s9mnutKbmBWdV8n8lPUKNNU7qjwoKcs8lQgJ5sHln0K/rW9EgSEcVUA8 oADcan1vN33uOKMKNN6ub/Ycj4oXkyOTS7qDELkKrHprx13sw3IlhwMx1bVNHg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712230732; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sFH5lARvL/uY67KOaBAlwgLluoGrytxBvD6WRPrI8g4=; b=o972RAUxv3QSNoRXrQKOOU908aKcJmxaWnpQ8OOHZ7TGGYHuXMHs+H18b3mM3opcbrCUcC AGBG6aB2j375+U6divofd13S1H3kXY9U7H+dVA983Ym5UwK8KY6raCvEu+fp47uqdXvatG wdZfr0CKOY3TBOSaWb94Mg3ketInhbXIb5N5u3wEg4AW74c58UCX7wydx5Ij03bq0dLOMF CejjjaxR4QXBXIBXT3sMVOcCyTlfS/LMzbh7tENvAO9vSzLzUa/fJuVVRaqz1+tgknX/y2 J/eUf3gIZji0RKI56ms8BLAD6HuYFgEjayef5QsgDlWQDVrScLIkF5gvXAGdbw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4V9KQ36T2HzFVb; Thu, 4 Apr 2024 11:38:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 434BcpJx059850; Thu, 4 Apr 2024 11:38:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 434BcpBf059847; Thu, 4 Apr 2024 11:38:51 GMT (envelope-from git) Date: Thu, 4 Apr 2024 11:38:51 GMT Message-Id: <202404041138.434BcpBf059847@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: ddee3ee4e071 - stable/14 - usr.bin: Make lorder conditional on MK_TOOLCHAIN. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: ddee3ee4e071d5c9e27dfe53487d7b8a6d1cead2 Auto-Submitted: auto-generated The branch stable/14 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=ddee3ee4e071d5c9e27dfe53487d7b8a6d1cead2 commit ddee3ee4e071d5c9e27dfe53487d7b8a6d1cead2 Author: Dag-Erling Smørgrav AuthorDate: 2024-04-01 13:18:35 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2024-04-04 09:53:25 +0000 usr.bin: Make lorder conditional on MK_TOOLCHAIN. MFC after: 1 week Reviewed by: allanjude, markj Differential Revision: https://reviews.freebsd.org/D44558 (cherry picked from commit 125c4560bc70971b950d035cfcd2255b89984011) --- tools/build/mk/OptionalObsoleteFiles.inc | 6 ++++++ usr.bin/Makefile | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index 3a46b9537f71..506f3877883e 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -8356,6 +8356,12 @@ OLD_FILES+=usr/share/man/man3/elftc_set_timestamps.3.gz OLD_FILES+=usr/share/man/man3/elftc_timestamp.3.gz OLD_FILES+=usr/share/man/man3/elftc_string_table_create.3.gz OLD_FILES+=usr/share/man/man3/elftc_version.3.gz +# usr.bin/lorder +OLD_FILES+=usr/bin/lorder +OLD_FILES+=usr/tests/usr.bin/lorder/Kyuafile +OLD_FILES+=usr/tests/usr.bin/lorder/lorder_test +OLD_DIRS+=usr/tests/usr.bin/lorder +# usr.bin/yacc OLD_FILES+=usr/tests/usr.bin/yacc/Kyuafile OLD_FILES+=usr/tests/usr.bin/yacc/btyacc_calc1.y OLD_FILES+=usr/tests/usr.bin/yacc/btyacc_demo.y diff --git a/usr.bin/Makefile b/usr.bin/Makefile index 4e48c18d5e81..aa62155703a7 100644 --- a/usr.bin/Makefile +++ b/usr.bin/Makefile @@ -84,7 +84,6 @@ SUBDIR= alias \ logins \ logname \ look \ - lorder \ lsvfs \ lzmainfo \ m4 \ @@ -269,6 +268,7 @@ SUBDIR.${MK_TOOLCHAIN}+= file2c SUBDIR.${MK_TOOLCHAIN}+= gprof SUBDIR.${MK_TOOLCHAIN}+= indent SUBDIR.${MK_TOOLCHAIN}+= lex +SUBDIR.${MK_TOOLCHAIN}+= lorder SUBDIR.${MK_TOOLCHAIN}+= mkstr SUBDIR.${MK_TOOLCHAIN}+= rpcgen SUBDIR.${MK_TOOLCHAIN}+= unifdef From nobody Thu Apr 4 11:39:01 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4V9KQF6QfKz5GrS2; Thu, 4 Apr 2024 11:39:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4V9KQF2jyDz57hQ; Thu, 4 Apr 2024 11:39:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712230741; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wwZkWQsmhghCLlTN2+a/cBWCbciE/i/+V0aKCaDr70w=; b=cGotmhW9eORCaxkNI3n6rYr4f+siw1IapxDvDzkK7gqYXrzkEHCFHCAxOCQDagYq3lSu03 uNK5sV70Q4HyRvcRZH+4ArCq2fDMkXryoWPkurgGpDbRlYur56XkNjrvWnU7WgrV02J9Es MXyfbp7WV2+r5ixHkJVAtL5ncOKYmqgr9wJtNiiWyqjJyQrzZq716TG3kEJcZBcH4OQw7W 6t97rY/PRBzPRz5wwOhP5Q/T0aKCJErPNYtJWzI4SwsRo57IYVkwfZ8JjLkS+0jjtmHGB+ fGWBK83pAZAV5qXZBbZdaZzLn0FMyPayomr3dMcUNlbshhtIvldJjVmoDYD5kg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712230741; a=rsa-sha256; cv=none; b=M7NxNd0qATyIzgqK9YQj1pEALh7z1gFboeUZDWhnpLzlCF3b1loqArrHKpmzZToKZbqC77 QX7RJNUaNZWP8gLntdOrIuvXR5VmI9ENUH8vf7/6LEFOVH6ioVKKyQKxUau9O6dnNByeZx 0pMYeA8OCM9febA7HkM0m/0A6EYr+DypYFfKylMp13oNT2UdfnDXBH5cSKjc7DIk+69SS6 q1C7dnBlkkDYRSgCr9Y+DK3OssaDceVL0d4Zsu7+sOlAuHkg0nlYonY7wNXeI/xvzhYxrj q69LASDYXVG7N5FWtrD3vH4SniWpE4cKm5L1roSPiUsV8SzrqnHPbZKReoxaKA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712230741; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wwZkWQsmhghCLlTN2+a/cBWCbciE/i/+V0aKCaDr70w=; b=hEWF6dtt9LDDIwdKzIdjkW3Fo/Ay1GsK7DVVBaGTjhaJmPTZxmw5qn1KkmDWwFqqLoipeC g66daMtcuk9gAZHFry5n6TuA0b/wFseEAJZ97r7k72cpGZ3nM/QISkAQnfFNXZVp3EzRTw BTYafFCru+TI8hKj5bO9dmzE9zaz8aBdsJmA5gKJ2DlUp4Y/DLoOpVvTenU55XBTbm482a Uvz5CV0DdoDcgHi5C5woxjosgq278YtXV+06aCkmy2C6Wyb0JMwczoRgGUvkoZmApjrJce woz8na64JOTHfQGBfdlu9hFM8/ivaJWw08nZSafoD5gtUwfFtNcCkT6P31pyCA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4V9KQF2GyCzFJM; Thu, 4 Apr 2024 11:39:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 434Bd1Hv060048; Thu, 4 Apr 2024 11:39:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 434Bd1nd060045; Thu, 4 Apr 2024 11:39:01 GMT (envelope-from git) Date: Thu, 4 Apr 2024 11:39:01 GMT Message-Id: <202404041139.434Bd1nd060045@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: 16349f296b23 - stable/13 - Update tzcode to 2024a. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 16349f296b239a8eeb2c91cd2b756aba6b25b4b1 Auto-Submitted: auto-generated The branch stable/13 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=16349f296b239a8eeb2c91cd2b756aba6b25b4b1 commit 16349f296b239a8eeb2c91cd2b756aba6b25b4b1 Author: Dag-Erling Smørgrav AuthorDate: 2024-02-13 20:20:44 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2024-04-04 09:47:10 +0000 Update tzcode to 2024a. MFC after: 3 weeks Sponsored by: Klara, Inc. (cherry picked from commit 46c599340f187db577b9212ab18022f3c7380c68) --- contrib/tzcode/Makefile | 261 +++++++---- contrib/tzcode/NEWS | 193 +++++++- contrib/tzcode/README | 19 +- contrib/tzcode/date.1 | 14 +- contrib/tzcode/localtime.c | 128 +++--- contrib/tzcode/newctime.3 | 16 +- contrib/tzcode/newstrftime.3 | 152 ++++++- contrib/tzcode/newtzset.3 | 206 +++++---- contrib/tzcode/private.h | 44 +- contrib/tzcode/strftime.c | 7 +- contrib/tzcode/theory.html | 37 +- contrib/tzcode/tz-art.html | 419 ++++++++---------- contrib/tzcode/tz-link.html | 118 +++-- contrib/tzcode/tzdir.h | 6 + contrib/tzcode/tzfile.5 | 32 +- contrib/tzcode/tzfile.h | 14 +- contrib/tzcode/tzselect.8 | 2 +- contrib/tzcode/tzselect.ksh | 1006 +++++++++++++++++++++++------------------- contrib/tzcode/version | 2 +- contrib/tzcode/zdump.c | 2 +- contrib/tzcode/zic.8 | 35 +- contrib/tzcode/zic.c | 239 +++++----- lib/libc/gen/sysconf.c | 2 +- lib/libc/stdtime/strftime.c | 2 +- 24 files changed, 1767 insertions(+), 1189 deletions(-) diff --git a/contrib/tzcode/Makefile b/contrib/tzcode/Makefile index 0e56af89e2a4..d48354c72df4 100644 --- a/contrib/tzcode/Makefile +++ b/contrib/tzcode/Makefile @@ -1,7 +1,25 @@ # Make and install tzdb code and data. - # This file is in the public domain, so clarified as of # 2009-05-17 by Arthur David Olson. +# Request POSIX conformance; this must be the first non-comment line. +.POSIX: +# On older platforms you may need to scrounge for a POSIX-conforming 'make'. +# For example, on Solaris 10 (2005), use /usr/sfw/bin/gmake or +# /usr/xpg4/bin/make, not /usr/ccs/bin/make. + +# To affect how this Makefile works, you can run a shell script like this: +# +# #!/bin/sh +# make CC='gcc -std=gnu11' "$@" +# +# This example script is appropriate for a pre-2017 GNU/Linux system +# where a non-default setting is needed to support this package's use of C99. +# +# Alternatively, you can simply edit this Makefile to tailor the following +# macro definitions. + +############################################################################### +# Start of macros that one plausibly might want to tailor. # Package name for the code distribution. PACKAGE= tzcode @@ -35,7 +53,7 @@ DATAFORM= main LOCALTIME= Factory -# The POSIXRULES macro controls interpretation of POSIX-like TZ +# The POSIXRULES macro controls interpretation of POSIX-2017.1-like TZ # settings like TZ='EET-2EEST' that lack DST transition rules. # If POSIXRULES is '-', no template is installed; this is the default. # Any other value for POSIXRULES is obsolete and should not be relied on, as: @@ -191,8 +209,9 @@ UTF8_LOCALE= en_US.utf8 # On some hosts, this should have -lintl unless CFLAGS has -DHAVE_GETTEXT=0. LDLIBS= -# Add the following to the end of the "CFLAGS=" line as needed to override -# defaults specified in the source code. "-DFOO" is equivalent to "-DFOO=1". +# Add the following to an uncommented "CFLAGS=" line as needed +# to override defaults specified in the source code or by the system. +# "-DFOO" is equivalent to "-DFOO=1". # -DDEPRECATE_TWO_DIGIT_YEARS for optional runtime warnings about strftime # formats that generate only the last two digits of year numbers # -DEPOCH_LOCAL if the 'time' function returns local time not UT @@ -234,11 +253,16 @@ LDLIBS= # -DHAVE_UNISTD_H=0 if does not work* # -DHAVE_UTMPX_H=0 if does not work* # -Dlocale_t=XXX if your system uses XXX instead of locale_t -# -DPORT_TO_C89 if tzcode should also run on C89 platforms+ +# -DPORT_TO_C89 if tzcode should also run on mostly-C89 platforms+ +# Typically it is better to use a later standard. For example, +# with GCC 4.9.4 (2016), prefer '-std=gnu11' to '-DPORT_TO_C89'. +# Even with -DPORT_TO_C89, the code needs at least one C99 +# feature (integers at least 64 bits wide) and maybe more. # -DRESERVE_STD_EXT_IDS if your platform reserves standard identifiers # with external linkage, e.g., applications cannot define 'localtime'. # -Dssize_t=long on hosts like MS-Windows that lack ssize_t # -DSUPPORT_C89 if the tzcode library should support C89 callers+ +# However, this might trigger latent bugs in C99-or-later callers. # -DSUPPRESS_TZDIR to not prepend TZDIR to file names; this has # security implications and is not recommended for general use # -DTHREAD_SAFE to make localtime.c thread-safe, as POSIX requires; @@ -250,7 +274,7 @@ LDLIBS= # -DTZ_DOMAINDIR=\"/path\" to use "/path" for gettext directory; # the default is system-supplied, typically "/usr/lib/locale" # -DTZDEFRULESTRING=\",date/time,date/time\" to default to the specified -# DST transitions for POSIX-style TZ strings lacking them, +# DST transitions for POSIX.1-2017-style TZ strings lacking them, # in the usual case where POSIXRULES is '-'. If not specified, # TZDEFRULESTRING defaults to US rules for future DST transitions. # This mishandles some past timestamps, as US DST rules have changed. @@ -270,11 +294,15 @@ LDLIBS= # -DZIC_MAX_ABBR_LEN_WO_WARN=3 # (or some other number) to set the maximum time zone abbreviation length # that zic will accept without a warning (the default is 6) +# -g to generate symbolic debugging info +# -Idir to include from directory 'dir' +# -O0 to disable optimization; other -O options to enable more optimization +# -Uname to remove any definition of the macro 'name' # $(GCC_DEBUG_FLAGS) if you are using recent GCC and want lots of checking # # * Options marked "*" can be omitted if your compiler is C23 compatible. # * Options marked "+" are obsolescent and are planned to be removed -# once the code assumes C99 or later. +# once the code assumes C99 or later, say in the year 2029. # # Select instrumentation via "make GCC_INSTRUMENT='whatever'". GCC_INSTRUMENT = \ @@ -312,9 +340,10 @@ GCC_DEBUG_FLAGS = -DGCC_LINT -g3 -O3 -fno-common \ # guess TM_GMTOFF from other macros; define NO_TM_GMTOFF to suppress this. # Similarly, if your system has a "zone abbreviation" field, define # -DTM_ZONE=tm_zone -# and define NO_TM_ZONE to suppress any guessing. Although these two fields -# not required by POSIX, a future version of POSIX is planned to require them -# and they are widely available on GNU/Linux and BSD systems. +# and define NO_TM_ZONE to suppress any guessing. +# Although these two fields are not required by POSIX.1-2017, +# POSIX 202x/D4 requires them and they are widely available +# on GNU/Linux and BSD systems. # # The next batch of options control support for external variables # exported by tzcode. In practice these variables are less useful @@ -324,7 +353,7 @@ GCC_DEBUG_FLAGS = -DGCC_LINT -g3 -O3 -fno-common \ # # -DHAVE_TZNAME=0 # do not support "tzname" # # -DHAVE_TZNAME=1 # support "tzname", which is defined by system library # # -DHAVE_TZNAME=2 # support and define "tzname" -# # to the "CFLAGS=" line. "tzname" is required by POSIX 1988 and later. +# # to the "CFLAGS=" line. "tzname" is required by POSIX.1-1988 and later. # # If not defined, the code attempts to guess HAVE_TZNAME from other macros. # # Warning: unless time_tz is also defined, HAVE_TZNAME=1 can cause # # crashes when combined with some platforms' standard libraries, @@ -334,8 +363,8 @@ GCC_DEBUG_FLAGS = -DGCC_LINT -g3 -O3 -fno-common \ # # -DUSG_COMPAT=0 # do not support # # -DUSG_COMPAT=1 # support, and variables are defined by system library # # -DUSG_COMPAT=2 # support and define variables -# # to the "CFLAGS=" line; "timezone" and "daylight" are inspired by -# # Unix Systems Group code and are required by POSIX 2008 (with XSI) and later. +# # to the "CFLAGS=" line; "timezone" and "daylight" are inspired by Unix +# # Systems Group code and are required by POSIX.1-2008 and later (with XSI). # # If not defined, the code attempts to guess USG_COMPAT from other macros. # # # # To support the external variable "altzone", add @@ -353,10 +382,11 @@ GCC_DEBUG_FLAGS = -DGCC_LINT -g3 -O3 -fno-common \ # functions to be added to the time conversion library. # "offtime" is like "gmtime" except that it accepts a second (long) argument # that gives an offset to add to the time_t when converting it. -# "offtime_r" is to "offtime" what "gmtime_r" is to "gmtime". -# "timelocal" is equivalent to "mktime". +# I.e., "offtime" is like calling "localtime_rz" with a fixed-offset zone. +# "timelocal" is nearly equivalent to "mktime". # "timeoff" is like "timegm" except that it accepts a second (long) argument # that gives an offset to use when converting to a time_t. +# I.e., "timeoff" is like calling "mktime_z" with a fixed-offset zone. # "posix2time" and "time2posix" are described in an included manual page. # X3J11's work does not describe any of these functions. # These functions may well disappear in future releases of the time @@ -379,7 +409,7 @@ GCC_DEBUG_FLAGS = -DGCC_LINT -g3 -O3 -fno-common \ # # NIST-PCTS:151-2, Version 1.4, (1993-12-03) is a test suite put # out by the National Institute of Standards and Technology -# which claims to test C and Posix conformance. If you want to pass PCTS, add +# which claims to test C and POSIX conformance. If you want to pass PCTS, add # -DPCTS # to the end of the "CFLAGS=" line. # @@ -389,19 +419,33 @@ GCC_DEBUG_FLAGS = -DGCC_LINT -g3 -O3 -fno-common \ # 53 as a week number (rather than 52 or 53) for January days before # January's first Monday when a "%V" format is used and January 1 # falls on a Friday, Saturday, or Sunday. +# +# POSIX says CFLAGS defaults to "-O 1". +# Uncomment the following line and edit its contents as needed. -CFLAGS= +#CFLAGS= -O 1 -# Linker flags. Default to $(LFLAGS) for backwards compatibility -# to release 2012h and earlier. -LDFLAGS= $(LFLAGS) +# The name of a POSIX-like library archiver, its flags, C compiler, +# linker flags, and 'make' utility. Ordinarily the defaults suffice. +# The commented-out values are the defaults specified by POSIX.1-202x/D4. +#AR = ar +#ARFLAGS = -rv +#CC = c17 +#LDFLAGS = +#MAKE = make # For leap seconds, this Makefile uses LEAPSECONDS='-L leapseconds' in # submake command lines. The default is no leap seconds. LEAPSECONDS= +# Where to fetch leap-seconds.list from. +leaplist_URI = \ + https://hpiers.obspm.fr/iers/bul/bulc/ntp/leap-seconds.list +# The file is generated by the IERS Earth Orientation Centre, in Paris. +leaplist_TZ = Europe/Paris + # The zic command and its arguments. zic= ./zic @@ -419,22 +463,23 @@ ZFLAGS= ZIC_INSTALL= $(ZIC) -d '$(DESTDIR)$(TZDIR)' $(LEAPSECONDS) -# The name of a Posix-compliant 'awk' on your system. +# The name of a POSIX-compliant 'awk' on your system. # mawk 1.3.3 and Solaris 10 /usr/bin/awk do not work. # Also, it is better (though not essential) if 'awk' supports UTF-8, # and unfortunately mawk and busybox awk do not support UTF-8. # Try AWK=gawk or AWK=nawk if your awk has the abovementioned problems. AWK= awk -# The full path name of a Posix-compliant shell, preferably one that supports +# The full path name of a POSIX-compliant shell, preferably one that supports # the Korn shell's 'select' statement as an extension. # These days, Bash is the most popular. # It should be OK to set this to /bin/sh, on platforms where /bin/sh -# lacks 'select' or doesn't completely conform to Posix, but /bin/bash +# lacks 'select' or doesn't completely conform to POSIX, but /bin/bash # is typically nicer if it works. KSHELL= /bin/bash -# Name of curl , used for HTML validation. +# Name of curl , used for HTML validation +# and to fetch leap-seconds.list from upstream. CURL= curl # Name of GNU Privacy Guard , used to sign distributions. @@ -504,17 +549,16 @@ GZIPFLAGS= -9n DIFF_TZS= diff -u$$(! diff -u -F'^TZ=' - - <>/dev/null >&0 2>&1 \ || echo ' -F^TZ=') -############################################################################### - -#MAKE= make +# ':' on typical hosts; 'ranlib' on the ancient hosts that still need ranlib. +RANLIB= : -cc= cc -CC= $(cc) -DTZDIR='"$(TZDIR)"' +# POSIX prohibits defining or using SHELL. However, csh users on systems +# that use the user shell for Makefile commands may need to define SHELL. +#SHELL= /bin/sh -AR= ar +# End of macros that one plausibly might want to tailor. +############################################################################### -# ':' on typical hosts; 'ranlib' on the ancient hosts that still need ranlib. -RANLIB= : TZCOBJS= zic.o TZDOBJS= zdump.o localtime.o asctime.o strftime.o @@ -544,7 +588,7 @@ YDATA= $(PRIMARY_YDATA) etcetera NDATA= factory TDATA_TO_CHECK= $(YDATA) $(NDATA) backward TDATA= $(YDATA) $(NDATA) $(BACKWARD) -ZONETABLES= zone1970.tab zone.tab +ZONETABLES= zone.tab zone1970.tab zonenow.tab TABDATA= iso3166.tab $(TZDATA_TEXT) $(ZONETABLES) LEAP_DEPS= leapseconds.awk leap-seconds.list TZDATA_ZI_DEPS= ziguard.awk zishrink.awk version $(TDATA) \ @@ -552,7 +596,7 @@ TZDATA_ZI_DEPS= ziguard.awk zishrink.awk version $(TDATA) \ DSTDATA_ZI_DEPS= ziguard.awk $(TDATA) $(PACKRATDATA) $(PACKRATLIST) DATA= $(TDATA_TO_CHECK) backzone iso3166.tab leap-seconds.list \ leapseconds $(ZONETABLES) -AWK_SCRIPTS= checklinks.awk checktab.awk leapseconds.awk \ +AWK_SCRIPTS= checklinks.awk checknow.awk checktab.awk leapseconds.awk \ ziguard.awk zishrink.awk MISC= $(AWK_SCRIPTS) TZS_YEAR= 2050 @@ -573,7 +617,7 @@ VERSION_DEPS= \ calendars CONTRIBUTING LICENSE Makefile NEWS README SECURITY \ africa antarctica asctime.c asia australasia \ backward backzone \ - checklinks.awk checktab.awk \ + checklinks.awk checknow.awk checktab.awk \ date.1 date.c difftime.c \ etcetera europe factory iso3166.tab \ leap-seconds.list leapseconds.awk localtime.c \ @@ -583,12 +627,7 @@ VERSION_DEPS= \ tzfile.5 tzfile.h tzselect.8 tzselect.ksh \ workman.sh zdump.8 zdump.c zic.8 zic.c \ ziguard.awk zishrink.awk \ - zone.tab zone1970.tab - -# And for the benefit of csh users on systems that assume the user -# shell should be used to handle commands in Makefiles. . . - -SHELL= /bin/sh + zone.tab zone1970.tab zonenow.tab all: tzselect zic zdump libtz.a $(TABDATA) \ vanguard.zi main.zi rearguard.zi @@ -658,6 +697,16 @@ tzdata.zi: $(DATAFORM).zi version zishrink.awk $(DATAFORM).zi >$@.out mv $@.out $@ +tzdir.h: + printf '%s\n' >$@.out \ + '#ifndef TZDEFAULT' \ + '# define TZDEFAULT "$(TZDEFAULT)" /* default zone */' \ + '#endif' \ + '#ifndef TZDIR' \ + '# define TZDIR "$(TZDIR)" /* TZif directory */' \ + '#endif' + mv $@.out $@ + version.h: version VERSION=`cat version` && printf '%s\n' \ 'static char const PKGVERSION[]="($(PACKAGE)) ";' \ @@ -677,6 +726,28 @@ leapseconds: $(LEAP_DEPS) -f leapseconds.awk leap-seconds.list >$@.out mv $@.out $@ +# Awk script to extract a Git-style author from leap-seconds.list comments. +EXTRACT_AUTHOR = \ + author_line { sub(/^.[[:space:]]*/, ""); \ + sub(/:[[:space:]]*/, " <"); \ + printf "%s>\n", $$0; \ + success = 1; \ + exit \ + } \ + /Questions or comments to:/ { author_line = 1 } \ + END { exit !success } + +# Fetch leap-seconds.list from upstream. +fetch-leap-seconds.list: + $(CURL) -OR $(leaplist_URI) + +# Fetch leap-seconds.list from upstream and commit it to the local repository. +commit-leap-seconds.list: fetch-leap-seconds.list + author=$$($(AWK) '$(EXTRACT_AUTHOR)' leap-seconds.list) && \ + date=$$(TZ=$(leaplist_TZ) stat -c%y leap-seconds.list) && \ + git commit --author="$$author" --date="$$date" -m'make $@' \ + leap-seconds.list + # Arguments to pass to submakes of install_data. # They can be overridden by later submake arguments. INSTALLARGS = \ @@ -764,7 +835,7 @@ force_tzs: $(TZS_NEW) libtz.a: $(LIBOBJS) rm -f $@ - $(AR) -rc $@ $(LIBOBJS) + $(AR) $(ARFLAGS) $@ $(LIBOBJS) $(RANLIB) $@ date: $(DATEOBJS) @@ -772,26 +843,32 @@ date: $(DATEOBJS) tzselect: tzselect.ksh version VERSION=`cat version` && sed \ - -e 's|#!/bin/bash|#!$(KSHELL)|g' \ - -e 's|AWK=[^}]*|AWK='\''$(AWK)'\''|g' \ - -e 's|\(PKGVERSION\)=.*|\1='\''($(PACKAGE)) '\''|' \ - -e 's|\(REPORT_BUGS_TO\)=.*|\1=$(BUGEMAIL)|' \ - -e 's|TZDIR=[^}]*|TZDIR=$(TZDIR)|' \ - -e 's|\(TZVERSION\)=.*|\1='"$$VERSION"'|' \ - <$@.ksh >$@.out + -e "s'#!/bin/bash'#!"'$(KSHELL)'\' \ + -e s\''\(AWK\)=[^}]*'\''\1=\'\''$(AWK)\'\'\' \ + -e s\''\(PKGVERSION\)=.*'\''\1=\'\''($(PACKAGE)) \'\'\' \ + -e s\''\(REPORT_BUGS_TO\)=.*'\''\1=\'\''$(BUGEMAIL)\'\'\' \ + -e s\''\(TZDIR\)=[^}]*'\''\1=\'\''$(TZDIR)\'\'\' \ + -e s\''\(TZVERSION\)=.*'\''\1=\'"'$$VERSION\\''" \ + <$@.ksh >$@.out chmod +x $@.out mv $@.out $@ check: check_back check_mild check_mild: check_character_set check_white_space check_links \ - check_name_lengths check_slashed_abbrs check_sorted \ + check_name_lengths check_now \ + check_slashed_abbrs check_sorted \ check_tables check_web check_ziguard check_zishrink check_tzs +# True if UTF8_LOCALE does not work; +# otherwise, false but with LC_ALL set to $(UTF8_LOCALE). +UTF8_LOCALE_MISSING = \ + { test ! '$(UTF8_LOCALE)' \ + || ! printf 'A\304\200B\n' \ + | LC_ALL='$(UTF8_LOCALE)' grep -q '^A.B$$' >/dev/null 2>&1 \ + || { LC_ALL='$(UTF8_LOCALE)'; export LC_ALL; false; }; } + check_character_set: $(ENCHILADA) - test ! '$(UTF8_LOCALE)' || \ - ! printf 'A\304\200B\n' | \ - LC_ALL='$(UTF8_LOCALE)' grep -q '^A.B$$' >/dev/null 2>&1 || { \ - LC_ALL='$(UTF8_LOCALE)' && export LC_ALL && \ + $(UTF8_LOCALE_MISSING) || { \ sharp='#' && \ ! grep -Env $(SAFE_LINE) $(MANS) date.1 $(MANTXTS) \ $(MISC) $(SOURCES) $(WEB_PAGES) \ @@ -806,12 +883,12 @@ check_character_set: $(ENCHILADA) touch $@ check_white_space: $(ENCHILADA) + $(UTF8_LOCALE_MISSING) || { \ patfmt=' \t|[\f\r\v]' && pat=`printf "$$patfmt\\n"` && \ - ! grep -En "$$pat" \ - $$(ls $(ENCHILADA) | grep -Fvx leap-seconds.list) - ! grep -n '[$s]$$' \ - $$(ls $(ENCHILADA) | grep -Fvx leap-seconds.list) - touch $@ + ! grep -En "$$pat|[$s]\$$" \ + $$(ls $(ENCHILADA) | grep -Fvx leap-seconds.list); \ + } + touch $@ PRECEDES_FILE_NAME = ^(Zone|Link[$s]+[^$s]+)[$s]+ FILE_NAME_COMPONENT_TOO_LONG = $(PRECEDES_FILE_NAME)[^$s]*[^/$s]{15} @@ -852,7 +929,29 @@ check_links: checklinks.awk tzdata.zi -f checklinks.awk tzdata.zi touch $@ -check_tables: checktab.awk $(YDATA) backward $(ZONETABLES) +# Check timestamps from now through 28 years from now, to make sure +# that zonenow.tab contains all sequences of planned timestamps, +# without any duplicate sequences. In theory this might require +# 2800 years but that would take a long time to check. +CHECK_NOW_TIMESTAMP = `./date +%s` +CHECK_NOW_FUTURE_YEARS = 28 +CHECK_NOW_FUTURE_SECS = $(CHECK_NOW_FUTURE_YEARS) '*' 366 '*' 24 '*' 60 '*' 60 +check_now: checknow.awk date tzdata.zi zdump zic zone1970.tab zonenow.tab + rm -fr $@.dir + mkdir $@.dir + ./zic -d $@.dir tzdata.zi + now=$(CHECK_NOW_TIMESTAMP) && \ + future=`expr $(CHECK_NOW_FUTURE_SECS) + $$now` && \ + ./zdump -i -t $$now,$$future \ + $$(find $$PWD/$@.dir/????*/ -type f) \ + >$@.dir/zdump.tab + $(AWK) \ + -v zdump_table=$@.dir/zdump.tab \ + -f checknow.awk zonenow.tab + rm -fr $@.dir + touch $@ + +check_tables: checktab.awk $(YDATA) backward zone.tab zone1970.tab for tab in $(ZONETABLES); do \ test "$$tab" = zone.tab && links='$(BACKWARD)' || links=''; \ $(AWK) -f checktab.awk -v zone_table=$$tab $(YDATA) $$links \ @@ -912,10 +1011,10 @@ check_zishrink_posix check_zishrink_right: \ touch $@ clean_misc: - rm -fr check_*.dir + rm -fr check_*.dir typecheck_*.dir rm -f *.o *.out $(TIME_T_ALTERNATIVES) \ check_* core typecheck_* \ - date tzselect version.h zdump zic libtz.a + date tzdir.h tzselect version.h zdump zic libtz.a clean: clean_misc rm -fr *.dir tzdb-*/ rm -f *.zi $(TZS_NEW) @@ -953,12 +1052,18 @@ $(MANTXTS): workman.sh # plus N if GNU ls and touch are available. SET_TIMESTAMP_N = sh -c '\ n=$$0 dest=$$1; shift; \ - touch -cmr `ls -t "$$@" | sed 1q` "$$dest" && \ + <"$$dest" && \ if test $$n != 0 && \ - lsout=`ls -n --time-style="+%s" "$$dest" 2>/dev/null`; then \ + lsout=`ls -nt --time-style="+%s" "$$@" 2>/dev/null`; then \ set x $$lsout && \ - touch -cmd @`expr $$7 + $$n` "$$dest"; \ - else :; fi' + timestamp=`expr $$7 + $$n` && \ + echo "+ touch -md @$$timestamp $$dest" && \ + touch -md @$$timestamp "$$dest"; \ + else \ + newest=`ls -t "$$@" | sed 1q` && \ + echo "+ touch -mr $$newest $$dest" && \ + touch -mr "$$newest" "$$dest"; \ + fi' # If DEST depends on A B C ... in this Makefile, callers should use # $(SET_TIMESTAMP_DEP) DEST A B C ..., for the benefit of any # downstream 'make' that considers equal timestamps to be out of date. @@ -983,8 +1088,12 @@ set-timestamps.out: $(EIGHT_YARDS) rm -f test.out && \ for file in $$files; do \ if git diff --quiet $$file; then \ - time=`git log -1 --format='tformat:%ct' $$file` && \ - touch -cmd @$$time $$file; \ + time=`TZ=UTC0 git log -1 \ + --format='tformat:%cd' \ + --date='format:%Y-%m-%dT%H:%M:%SZ' \ + $$file` && \ + echo "+ touch -md $$time $$file" && \ + touch -md $$time $$file; \ else \ echo >&2 "$$file: warning: does not match repository"; \ fi || exit; \ @@ -1009,7 +1118,8 @@ check_public: $(VERSION_DEPS) rm -fr public.dir mkdir public.dir ln $(VERSION_DEPS) public.dir - cd public.dir && $(MAKE) CFLAGS='$(GCC_DEBUG_FLAGS)' ALL + cd public.dir \ + && $(MAKE) CFLAGS='$(GCC_DEBUG_FLAGS)' TZDIR='$(TZDIR)' ALL for i in $(TDATA_TO_CHECK) public.dir/tzdata.zi \ public.dir/vanguard.zi public.dir/main.zi \ public.dir/rearguard.zi; \ @@ -1140,7 +1250,7 @@ tzdata$(VERSION)-rearguard.tar.gz: rearguard.zi set-timestamps.out sed '1s/$$/-rearguard/' $@.dir/version : The dummy pacificnew pacifies TZUpdater 2.3.1 and earlier. $(CREATE_EMPTY) $@.dir/pacificnew - touch -cmr version $@.dir/version + touch -mr version $@.dir/version LC_ALL=C && export LC_ALL && \ (cd $@.dir && \ tar $(TARFLAGS) -cf - \ @@ -1164,7 +1274,7 @@ tzdata$(VERSION)-tailored.tar.gz: set-timestamps.out `test $(DATAFORM) = vanguard || echo pacificnew` (grep '^#' tzdata.zi && echo && cat $(DATAFORM).zi) \ >$@.dir/etcetera - touch -cmr tzdata.zi $@.dir/etcetera + touch -mr tzdata.zi $@.dir/etcetera sed -n \ -e '/^# *version *\(.*\)/h' \ -e '/^# *ddeps */H' \ @@ -1175,7 +1285,7 @@ tzdata$(VERSION)-tailored.tar.gz: set-timestamps.out -e 's/ /-/g' \ -e 'p' \ $@.dir/version - touch -cmr version $@.dir/version + touch -mr version $@.dir/version links= && \ for file in $(TZDATA_DIST); do \ test -f $@.dir/$$file || links="$$links $$file"; \ @@ -1227,15 +1337,16 @@ zonenames: tzdata.zi asctime.o: private.h tzfile.h date.o: private.h difftime.o: private.h -localtime.o: private.h tzfile.h +localtime.o: private.h tzfile.h tzdir.h strftime.o: private.h tzfile.h zdump.o: version.h -zic.o: private.h tzfile.h version.h +zic.o: private.h tzfile.h tzdir.h version.h .PHONY: ALL INSTALL all .PHONY: check check_mild check_time_t_alternatives .PHONY: check_web check_zishrink -.PHONY: clean clean_misc dummy.zd force_tzs +.PHONY: clean clean_misc commit-leap-seconds.list dummy.zd +.PHONY: fetch-leap-seconds.list force_tzs .PHONY: install install_data maintainer-clean names .PHONY: posix_only posix_right public .PHONY: rearguard_signatures rearguard_signatures_version diff --git a/contrib/tzcode/NEWS b/contrib/tzcode/NEWS index b54538aa4a82..d407342a50e6 100644 --- a/contrib/tzcode/NEWS +++ b/contrib/tzcode/NEWS @@ -1,5 +1,177 @@ News for the tz database +Release 2024a - 2024-02-01 09:28:56 -0800 + + Briefly: + Kazakhstan unifies on UTC+5 beginning 2024-03-01. + Palestine springs forward a week later after Ramadan. + zic no longer pretends to support indefinite-past DST. + localtime no longer mishandles Ciudad Juárez in 2422. + + Changes to future timestamps + + Kazakhstan unifies on UTC+5. This affects Asia/Almaty and + Asia/Qostanay which together represent the eastern portion of the + country that will transition from UTC+6 on 2024-03-01 at 00:00 to + join the western portion. (Thanks to Zhanbolat Raimbekov.) + + Palestine springs forward a week later than previously predicted + in 2024 and 2025. (Thanks to Heba Hamad.) Change spring-forward + predictions to the second Saturday after Ramadan, not the first; + this also affects other predictions starting in 2039. + + Changes to past timestamps + + Asia/Ho_Chi_Minh's 1955-07-01 transition occurred at 01:00 + not 00:00. (Thanks to Đoàn Trần Công Danh.) + + From 1947 through 1949, Toronto's transitions occurred at 02:00 + not 00:00. (Thanks to Chris Walton.) + + In 1911 Miquelon adopted standard time on June 15, not May 15. + + Changes to code + + The FROM and TO columns of Rule lines can no longer be "minimum" + or an abbreviation of "minimum", because TZif files do not support + DST rules that extend into the indefinite past - although these + rules were supported when TZif files had only 32-bit data, this + stopped working when 64-bit TZif files were introduced in 1995. + This should not be a problem for realistic data, since DST was + first used in the 20th century. As a transition aid, FROM columns + like "minimum" are now diagnosed and then treated as if they were + the year 1900; this should suffice for TZif files on old systems + with only 32-bit time_t, and it is more compatible with bugs in + 2023c-and-earlier localtime.c. (Problem reported by Yoshito + Umaoka.) + + localtime and related functions no longer mishandle some + timestamps that occur about 400 years after a switch to a time + zone with a DST schedule. In 2023d data this problem was visible + for some timestamps in November 2422, November 2822, etc. in + America/Ciudad_Juarez. (Problem reported by Gilmore Davidson.) + + strftime %s now uses tm_gmtoff if available. (Problem and draft + patch reported by Dag-Erling Smørgrav.) + + Changes to build procedure + + The leap-seconds.list file is now copied from the IERS instead of + from its downstream counterpart at NIST, as the IERS version is + now in the public domain too and tends to be more up-to-date. + (Thanks to Martin Burnicki for liaisoning with the IERS.) + + Changes to documentation + + The strftime man page documents which struct tm members affect + which conversion specs, and that tzset is called. (Problems + reported by Robert Elz and Steve Summit.) + + +Release 2023d - 2023-12-21 20:02:24 -0800 + + Briefly: + Ittoqqortoormiit, Greenland changes time zones on 2024-03-31. + Vostok, Antarctica changed time zones on 2023-12-18. + Casey, Antarctica changed time zones five times since 2020. + Code and data fixes for Palestine timestamps starting in 2072. + A new data file zonenow.tab for timestamps starting now. + + Changes to future timestamps + + Ittoqqortoormiit, Greenland (America/Scoresbysund) joins most of + the rest of Greenland's timekeeping practice on 2024-03-31, by + changing its time zone from -01/+00 to -02/-01 at the same moment + as the spring-forward transition. Its clocks will therefore not + spring forward as previously scheduled. The time zone change + reverts to its common practice before 1981. + + Fix predictions for DST transitions in Palestine in 2072-2075, + correcting a typo introduced in 2023a. + + Changes to past and future timestamps + + Vostok, Antarctica changed to +05 on 2023-12-18. It had been at + +07 (not +06) for years. (Thanks to Zakhary V. Akulov.) + + Change data for Casey, Antarctica to agree with timeanddate.com, + by adding five time zone changes since 2020. Casey is now at +08 + instead of +11. + + Changes to past tm_isdst flags + + Much of Greenland, represented by America/Nuuk, changed its + standard time from -03 to -02 on 2023-03-25, not on 2023-10-28. + This does not affect UTC offsets, only the tm_isdst flag. + (Thanks to Thomas M. Steenholdt.) + + New data file + + A new data file zonenow.tab helps configure applications that use + timestamps dated from now on. This simplifies configuration, + since users choose from a smaller Zone set. The file's format is + experimental and subject to change. + + Changes to code + + localtime.c no longer mishandles TZif files that contain a single + transition into a DST regime. Previously, it incorrectly assumed + DST was in effect before the transition too. (Thanks to Alois + Treindl for debugging help.) + + localtime.c's timeoff no longer collides with OpenBSD 7.4. + + The C code now uses _Generic only if __STDC_VERSION__ says the + compiler is C11 or later. + + tzselect now optionally reads zonenow.tab, to simplify when + configuring only for timestamps dated from now on. + + tzselect no longer creates temporary files. + + tzselect no longer mishandles the following: + + Spaces and most other special characters in BUGEMAIL, PACKAGE, + TZDIR, and VERSION. + + TZ strings when using mawk 1.4.3, which mishandles regular + expressions of the form /X{2,}/. + + ISO 6709 coordinates when using an awk that lacks the GNU + extension of newlines in -v option-arguments. + + Non UTF-8 locales when using an iconv command that lacks the GNU + //TRANSLIT extension. + + zic no longer mishandles data for Palestine after the year 2075. + Previously, it incorrectly omitted post-2075 transitions that are + predicted for just before and just after Ramadan. (Thanks to Ken + Murchison for debugging help.) + + zic now works again on Linux 2.6.16 and 2.6.17 (2006). + (Problem reported by Rune Torgersen.) + + Changes to build procedure + + The Makefile is now more compatible with POSIX: + * It no longer defines AR, CC, CFLAGS, LDFLAGS, and SHELL. + * It no longer uses its own 'cc' in place of CC. + * It now uses ARFLAGS, with default specified by POSIX. + * It does not use LFLAGS incompatibly with POSIX. + * It uses the special .POSIX target. + * It quotes special characters more carefully. + * It no longer mishandles builds in an ISO 8859 locale. + Due to the CC changes, TZDIR is now #defined in a file tzfile.h + built by 'make', not in a $(CC) -D option. Also, TZDEFAULT is + now treated like TZDIR as they have similar roles. + + Changes to commentary + + Limitations and hazards of the optional support for obsolescent + C89 platforms are documented better, along with a tentative + schedule for removing this support. + + Release 2023c - 2023-03-28 12:42:14 -0700 Changes to past and future timestamps @@ -76,11 +248,14 @@ Release 2023a - 2023-03-22 12:39:33 -0700 platform dependent and abbreviations were silently truncated to 16 bytes even when the limit was greater than 16. - The code by default is now designed for C99 or later. To build in - a C89 environment, compile with -DPORT_TO_C89. To support C89 - callers of the tzcode library, compile with -DSUPPORT_C89. The - two new macros are transitional aids planned to be removed in a - future version, when C99 or later will be required. + The code by default is now designed for C99 or later. To build on + a mostly-C89 platform, compile with -DPORT_TO_C89; this should + work on C89 platforms that also support C99 'long long' and + perhaps a few other extensions to C89. To support C89 callers of + tzcode's library, compile with -DSUPPORT_C89; however, this could + trigger latent bugs in C99-or-later callers. The two new macros + are transitional aids planned to be removed in a future version + (say, in 2029), when C99 or later will be required. The code now builds again on pre-C99 platforms, if you compile with -DPORT_TO_C89. This fixes a bug introduced in 2022f. @@ -723,6 +898,8 @@ Release 2021b - 2021-09-24 16:23:00 -0700 them, set the EXPIRES_LINE Makefile variable. If a TZif file uses this new feature it is marked with a new TZif version number 4, a format intended to be documented in a successor to RFC 8536. + The old-format "#expires" comments are now treated solely as + comments and have no effect on the TZif files. zic -L LEAPFILE -r @LO no longer generates an invalid TZif file that omits leap second information for the range LO..B when LO @@ -4302,7 +4479,7 @@ Release 2012j - 2012-11-12 18:34:49 -0800 now uses tz@iana.org rather than the old elsie address. zic -v now complains about abbreviations that are less than 3 - or more than 6 characters, as per Posix. Formerly, it checked + or more than 6 characters, as per POSIX. Formerly, it checked for abbreviations that were more than 3. 'make public' no longer puts its temporary directory under /tmp, @@ -4467,8 +4644,8 @@ Release data2011m - 2011-10-24 21:42:16 +0700 In particular, the typos in comments in the data (2011-11-17 should have been 2011-10-17 as Alan Barrett noted, and spelling of Tiraspol that Tim Parenti noted) have been fixed, and the change for Ukraine has been - made in all 4 Ukrainian zones, rather than just Kiev (again, thanks to - Tim Parenti, and also Denys Gavrysh) + made in all 4 Ukrainian zones, rather than just Europe/Kiev + (again, thanks to Tim Parenti, and also Denys Gavrysh). In addition, I added Europe/Tiraspol to zone.tab. diff --git a/contrib/tzcode/README b/contrib/tzcode/README index 145aacd495b7..edabd2e0690f 100644 --- a/contrib/tzcode/README +++ b/contrib/tzcode/README @@ -11,14 +11,17 @@ changes made by political bodies to time zone boundaries, UTC offsets, and daylight-saving rules. See or the -file tz-link.html for how to acquire the code and data. Once acquired, -read the comments in the file 'Makefile' and make any changes needed -to make things right for your system, especially if you are using some -platform other than GNU/Linux. Then run the following commands, -substituting your desired installation directory for "$HOME/tzdir": - - make TOPDIR=$HOME/tzdir install - $HOME/tzdir/usr/bin/zdump -v America/Los_Angeles +file tz-link.html for how to acquire the code and data. + +Once acquired, read the leading comments in the file "Makefile" +and make any changes needed to make things right for your system, +especially when using a platform other than current GNU/Linux. + +Then run the following commands, substituting your desired +installation directory for "$HOME/tzdir": + + make TOPDIR="$HOME/tzdir" install + "$HOME/tzdir/usr/bin/zdump" -v America/Los_Angeles See the file tz-how-to.html for examples of how to read the data files. diff --git a/contrib/tzcode/date.1 b/contrib/tzcode/date.1 index e8107212364d..01907bc76e2c 100644 --- a/contrib/tzcode/date.1 +++ b/contrib/tzcode/date.1 @@ -154,15 +154,11 @@ hexadecimal (leading 0x), preceded by an optional sign. .br /usr/lib/locale/\f2L\fP/LC_TIME description of time locale \f2L\fP .br -/usr/share/zoneinfo timezone information directory +/usr/share/zoneinfo timezone directory .br -/usr/share/zoneinfo/posixrules default DST rules (obsolete, - and can cause bugs if present) +/usr/share/zoneinfo/posixrules default DST rules (obsolete) .br /usr/share/zoneinfo/GMT for UTC leap seconds -.sp -If -.B /usr/share/zoneinfo/GMT -is absent, -UTC leap seconds are loaded from -.BR /usr/share/zoneinfo/posixrules . +.PP +If /usr/share/zoneinfo/GMT is absent, +UTC leap seconds are loaded from /usr/share/zoneinfo/GMT0 if present. diff --git a/contrib/tzcode/localtime.c b/contrib/tzcode/localtime.c index 8bf4fcb17d2d..25a65385256b 100644 --- a/contrib/tzcode/localtime.c +++ b/contrib/tzcode/localtime.c @@ -7,7 +7,7 @@ /* ** Leap second handling from Bradley White. -** POSIX-style TZ environment variable handling from Guy Harris. +** POSIX.1-1988 style TZ environment variable handling from Guy Harris. */ /*LINTLIBRARY*/ @@ -27,6 +27,7 @@ #include "private.h" #include "un-namespace.h" +#include "tzdir.h" #include "tzfile.h" #include "libc_private.h" @@ -124,12 +125,17 @@ static char const UNSPEC[] = "-00"; for ttunspecified to work without crashing. */ enum { CHARS_EXTRA = max(sizeof UNSPEC, 2) - 1 }; -/* Limit to time zone abbreviation length in POSIX-style TZ strings. +/* Limit to time zone abbreviation length in POSIX.1-2017-style TZ strings. This is distinct from TZ_MAX_CHARS, which limits TZif file contents. */ #ifndef TZNAME_MAXIMUM # define TZNAME_MAXIMUM 255 #endif +/* A representation of the contents of a TZif file. Ideally this + would have no size limits; the following sizes should suffice for + practical use. This struct should not be too large, as instances + are put on the stack and stacks are relatively small on some platforms. + See tzfile.h for more about the sizes. */ struct state { int leapcnt; int timecnt; @@ -172,8 +178,7 @@ static int_fast32_t leapcorr(struct state const *, time_t); static bool normalize_overflow32(int_fast32_t *, int *, int); static struct tm *timesub(time_t const *, int_fast32_t, struct state const *, struct tm *); -static bool typesequiv(struct state const *, int, int); -static bool tzparse(char const *, struct state *, struct state *); +static bool tzparse(char const *, struct state *, struct state const *); #ifdef ALL_STATE static struct state * lclptr; @@ -438,7 +443,8 @@ union input_buffer { /* The first part of the buffer, interpreted as a header. */ struct tzhead tzhead; - /* The entire buffer. */ + /* The entire buffer. Ideally this would have no size limits; + the following should suffice for practical use. */ char buf[2 * sizeof(struct tzhead) + 2 * sizeof(struct state) + 4 * TZ_MAX_TIMES]; }; @@ -457,7 +463,12 @@ union local_storage { struct state st; } u; - /* The file name to be opened. */ + /* The name of the file to be opened. Ideally this would have no + size limits, to support arbitrarily long Zone names. + Limiting Zone names to 1024 bytes should suffice for practical use. + However, there is no need for this to be smaller than struct + file_analysis as that struct is allocated anyway, as the other + union member. */ char fullname[max(sizeof(struct file_analysis), sizeof tzdirslash + 1024)]; }; @@ -737,14 +748,18 @@ tzloadbody(char const *name, struct state *sp, bool doextend, == sp->types[sp->timecnt - 2])) sp->timecnt--; - for (i = 0; - i < ts->timecnt && sp->timecnt < TZ_MAX_TIMES; - i++) { + sp->goahead = ts->goahead; + + for (i = 0; i < ts->timecnt; i++) { time_t t = ts->ats[i]; if (increment_overflow_time(&t, leapcorr(sp, t)) || (0 < sp->timecnt && t <= sp->ats[sp->timecnt - 1])) continue; + if (TZ_MAX_TIMES <= sp->timecnt) { + sp->goahead = false; + break; + } sp->ats[sp->timecnt] = t; sp->types[sp->timecnt] = (sp->typecnt + ts->types[i]); @@ -757,28 +772,6 @@ tzloadbody(char const *name, struct state *sp, bool doextend, } if (sp->typecnt == 0) return EINVAL; - if (sp->timecnt > 1) { - if (sp->ats[0] <= TIME_T_MAX - SECSPERREPEAT) { - time_t repeatat = sp->ats[0] + SECSPERREPEAT; - int repeattype = sp->types[0]; - for (i = 1; i < sp->timecnt; ++i) - if (sp->ats[i] == repeatat - && typesequiv(sp, sp->types[i], repeattype)) { - sp->goback = true; - break; - } - } - if (TIME_T_MIN + SECSPERREPEAT <= sp->ats[sp->timecnt - 1]) { - time_t repeatat = sp->ats[sp->timecnt - 1] - SECSPERREPEAT; - int repeattype = sp->types[sp->timecnt - 1]; - for (i = sp->timecnt - 2; i >= 0; --i) - if (sp->ats[i] == repeatat *** 3862 LINES SKIPPED *** From nobody Thu Apr 4 11:39:02 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4V9KQH0GLkz5GrMV; Thu, 4 Apr 2024 11:39:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4V9KQG5B8lz57nS; Thu, 4 Apr 2024 11:39:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712230742; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WAnWawo4pN539OYekuSWw3dRQdQ1QGukKyv8VzF7jvM=; b=sv9kJtqs05D/KN6PXacduZ1NOWUY+KPMiAHq7pyT4Roz3nHXRrLIJXi/M21EDeB/rifhPh QbyMfhSKraN+4LLeoUrf+8Rwxe6Y17CqinerUApPrlbl+v9ycy162S3CDhuButS68bIiR+ MzctlN7xwWVZgK26ordzlDyHJZc1iAJIEx7toQGVt1k38jzSO2ZMNi/hb1ZCggXjsdU7QI m5x+59LXzRn85Oe+/nmquRI8CSnZPTsPxD5E22u+uKJ/8R8rElJ8bVVkAGZarVqnv0U+cC wplREX3HXzEF94y0cpseH3IIMoPZLxg1aO2OTs1vsDUNZSZ66GNaTCpbd2+ZHg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712230742; a=rsa-sha256; cv=none; b=u1WD2aDXB5re/UCmA5CBYbPwhKIDuTgVaZs1e89YHwLaIM1G/ojQTI36CM+3dgKCAxFu1o CYTOSsCqqk57PSMX4rhBc5cCBuD2heoGk/mEZ7PnV5gJ7UUgknZZ8MTaaqY3rwD4Oa8ftB mARN/DIf/CdKLlYL3ehDytICMmlmGGap0SbIQqPb/F09qA74Ew2yU/PpBosL/8XafyL0Q/ Awj4qXzkAWa0zhZ9VbQQrlbaA6vzp1LFKWx6EQwPImLjVN3qnd8Gldbbl4eehVcVa/g67h td4cWqel57HFuVq4GpiQR1Q/CecOARFYRyIr/xVZJ6ZuUwjOPFHY7U/uC93Zyg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712230742; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WAnWawo4pN539OYekuSWw3dRQdQ1QGukKyv8VzF7jvM=; b=Lr4emeaHGXjVxNwPbYpoBpjg7sTZ0J28ZWJEdn3gMOAXP1GVwnZ8w67uTNidB92GqRFvHG a3llkfpOav3on48S149r3Wqy2bzfnjRtbJVsuluafrlZEmwZX5Nx/5rgZBIoNPwbMRBYav 9hceVBhUUGxphDQPCEo9IE1gMZTi4DPUH8BeneeM0PxTIU1N2yunaFQpPgzmuSJhK9DliO VOWbgvTyS8QSuJOcCg0z8jnveI1AU+0OPCviiCrkuhWo3HcgJCRtsZW7yKtvYxCZu5uSIZ a8Dq7VI/s+4FRMFQQ5bTut0wig1skUpqdhoy+i4gwi+uQZccmqaleEoKJ1V2Hg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4V9KQG3KzqzFk1; Thu, 4 Apr 2024 11:39: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 434Bd2FZ060099; Thu, 4 Apr 2024 11:39:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 434Bd2Gw060096; Thu, 4 Apr 2024 11:39:02 GMT (envelope-from git) Date: Thu, 4 Apr 2024 11:39:02 GMT Message-Id: <202404041139.434Bd2Gw060096@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: 662dc74155ad - stable/13 - tzcode: Clean up the ctime(3) manual page. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 662dc74155ada993513a08190032710cf224e47f Auto-Submitted: auto-generated The branch stable/13 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=662dc74155ada993513a08190032710cf224e47f commit 662dc74155ada993513a08190032710cf224e47f Author: Dag-Erling Smørgrav AuthorDate: 2023-04-26 09:46:41 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2024-04-04 09:51:02 +0000 tzcode: Clean up the ctime(3) manual page. MFC after: 3 weeks Sponsored by: Klara, Inc. Reviewed by: pauamma_gundo.com Differential Revision: https://reviews.freebsd.org/D39714 (cherry picked from commit 6f3c2f41b18b9a7a8feb3c50254a21db2d9908fd) libc: Improve description of mktime() / timegm(). * Mention that mktime() and timegm() set errno on failure. * Correctly determining whether mktime() / timegm() succeeded with arbitrary input (where -1 can be a valid result) is non-trivial. Document the recommended procedure. PR: 277863 MFC after: 1 week Reviewed by: pauamma_gundo.com, gbe Differential Revision: https://reviews.freebsd.org/D44503 (cherry picked from commit 7534109d13a6cdb22e78d9d4c0a0cd5efd323c45) --- lib/libc/stdtime/ctime.3 | 207 ++++++++++++++++++++++++----------------------- 1 file changed, 104 insertions(+), 103 deletions(-) diff --git a/lib/libc/stdtime/ctime.3 b/lib/libc/stdtime/ctime.3 index 0f649e4d99ab..579b14ada552 100644 --- a/lib/libc/stdtime/ctime.3 +++ b/lib/libc/stdtime/ctime.3 @@ -29,7 +29,7 @@ .\" .\" From: @(#)ctime.3 8.1 (Berkeley) 6/4/93 .\" -.Dd September 16, 2022 +.Dd March 26, 2024 .Dt CTIME 3 .Os .Sh NAME @@ -51,81 +51,78 @@ .In time.h .Vt extern char *tzname[2] ; .Ft char * +.Fn asctime "const struct tm *tm" +.Ft char * +.Fn asctime_r "const struct tm *tm" "char *buf" +.Ft char * .Fn ctime "const time_t *clock" +.Ft char * +.Fn ctime_r "const time_t *clock" "char *buf" .Ft double .Fn difftime "time_t time1" "time_t time0" -.Ft char * -.Fn asctime "const struct tm *tm" +.Ft struct tm * +.Fn gmtime "const time_t *clock" +.Ft struct tm * +.Fn gmtime_r "const time_t *clock" "struct tm *result" .Ft struct tm * .Fn localtime "const time_t *clock" .Ft struct tm * -.Fn gmtime "const time_t *clock" +.Fn localtime_r "const time_t *clock" "struct tm *result" .Ft time_t .Fn mktime "struct tm *tm" .Ft time_t .Fn timegm "struct tm *tm" -.Ft char * -.Fn ctime_r "const time_t *clock" "char *buf" -.Ft struct tm * -.Fn localtime_r "const time_t *clock" "struct tm *result" -.Ft struct tm * -.Fn gmtime_r "const time_t *clock" "struct tm *result" -.Ft char * -.Fn asctime_r "const struct tm *tm" "char *buf" .Sh DESCRIPTION -The functions +The .Fn ctime , -.Fn gmtime +.Fn gmtime , and .Fn localtime -all take as an argument a time value representing the time in seconds since -the Epoch (00:00:00 -.Tn UTC , -January 1, 1970; see +functions all take as argument a pointer to a time value representing +the time in seconds since the Epoch (00:00:00 UTC on January 1, 1970; +see .Xr time 3 ) . .Pp -The function +The .Fn localtime -converts the time value pointed at by +function converts the time value pointed to by .Fa clock , and returns a pointer to a -.Dq Fa struct tm +.Vt struct tm (described below) which contains the broken-out time information for the value after adjusting for the current -time zone (and any other factors such as Daylight Saving Time). +time zone (see +.Xr tzset 3 ) . When the specified time translates to a year that will not fit in an -.Dv int , +.Vt int , .Fn localtime -returns NULL. -Time zone adjustments are performed as specified by the -.Ev TZ -environment variable (see -.Xr tzset 3 ) . -The function +returns +.Dv NULL . +The .Fn localtime -uses +function uses .Xr tzset 3 to initialize time conversion information if .Xr tzset 3 has not already been called by the process. .Pp -After filling in the tm structure, +After filling in the +.Vt struct tm , .Fn localtime sets the -.Fa tm_isdst Ns 'th +.Va tm_isdst Ns 'th element of -.Fa tzname -to a pointer to an -.Tn ASCII -string that is the time zone abbreviation to be +.Va tzname +to a pointer to an ASCII string that is the time zone abbreviation to be used with .Fn localtime Ns 's return value. .Pp -The function +The .Fn gmtime -similarly converts the time value, but without any time zone adjustment, -and returns a pointer to a tm structure (described below). +function similarly converts the time value, but without any time zone +adjustment, and returns a pointer to a +.Vt struct tm . .Pp The .Fn ctime @@ -140,65 +137,58 @@ Thu Nov 24 18:22:48 1986\en\e0 All the fields have constant width. .Pp The +.Fn asctime +function converts the broken down time in the +.Vt struct tm +pointed to by +.Fa tm +to the form shown in the example above. +.Pp +The .Fn ctime_r -function -provides the same functionality as +and +.Fn asctime_r +functions +provide the same functionality as .Fn ctime +and +.Fn asctime except the caller must provide the output buffer -.Fa buf -to store the result, which must be at least 26 characters long. +.Fa buf , +which must be at least 26 characters long, to store the result in. The .Fn localtime_r and .Fn gmtime_r -functions -provide the same functionality as +functions provide the same functionality as .Fn localtime and .Fn gmtime respectively, except the caller must provide the output buffer .Fa result . .Pp -The -.Fn asctime -function -converts the broken down time in the structure -.Fa tm -pointed at by -.Fa *tm -to the form -shown in the example above. -.Pp -The -.Fn asctime_r -function -provides the same functionality as -.Fn asctime -except the caller provide the output buffer -.Fa buf -to store the result, which must be at least 26 characters long. -.Pp The functions .Fn mktime and .Fn timegm -convert the broken-down time in the structure -pointed to by tm into a time value with the same encoding as that of the -values returned by the +convert the broken-down time in the +.Vt struct tm +pointed to by +.Fa tm +into a time value with the same encoding as that of the values +returned by the .Xr time 3 -function (that is, seconds from the Epoch, -.Tn UTC ) . +function (that is, seconds from the Epoch, UTC). The .Fn mktime -function -interprets the input structure according to the current timezone setting -(see -.Xr tzset 3 ) . -The +function interprets the input structure according to the current +timezone setting (see +.Xr tzset 3 ) +while the .Fn timegm -function -interprets the input structure as representing Universal Coordinated Time -.Pq Tn UTC . +function interprets the input structure as representing Universal +Coordinated Time +.Pq UTC . .Pp The original values of the .Fa tm_wday @@ -227,7 +217,7 @@ A negative value for .Fa tm_isdst causes the .Fn mktime -function to attempt to divine whether summer time is in effect for the +function to attempt to guess whether summer time is in effect for the specified time. The .Fa tm_isdst @@ -253,21 +243,37 @@ The .Fn mktime function returns the specified calendar time; if the calendar time cannot be -represented, it returns \-1; +represented, it returns \-1 and sets +.Xr errno 3 +to an appropriate value. +.Pp +Note that \-1 is a valid result (representing one second before +midnight UTC on the evening of 31 December 1969), so this cannot be +relied upon to indicate success or failure; instead, +.Fa tm_wday +and / or +.Fa tm_yday +should be set to an out-of-bounds value (e.g. \-1) prior to calling +.Fn mktime +or +.Fn timegm +and checked after the call. .Pp The .Fn difftime -function -returns the difference between two calendar times, -.Pf ( Fa time1 -- -.Fa time0 ) , -expressed in seconds. +function returns the difference in seconds between two time values, +.Fa time1 +\- +.Fa time0 . .Pp -External declarations as well as the tm structure definition are in the +External declarations as well as the definition of +.Vt struct tm +are in the .In time.h -include file. -The tm structure includes at least the following fields: +header. +The +.Vt tm +structure includes at least the following fields: .Bd -literal -offset indent int tm_sec; /* seconds (0 - 60) */ int tm_min; /* minutes (0 - 59) */ @@ -283,16 +289,14 @@ long tm_gmtoff; /* offset from UTC in seconds */ .Ed .Pp The -field .Fa tm_isdst -is non-zero if summer time is in effect. +field is non-zero if summer time is in effect. .Pp -The field +The .Fa tm_gmtoff -is the offset (in seconds) of the time represented from -.Tn UTC , -with positive -values indicating east of the Prime Meridian. +field is the offset in seconds of the time represented from UTC, +with positive values indicating a time zone ahead of UTC (east of the +Prime Meridian). .Sh SEE ALSO .Xr date 1 , .Xr clock_gettime 2 , @@ -358,13 +362,13 @@ and .Fn timelocal in SunOS 4.0. .Pp -The functions +The .Fn asctime_r , .Fn ctime_r , -.Fn gmtime_r , +.Fn gmtime_r and .Fn localtime_r -have been available since +functions have been available since .Fx 8.0 . .Sh BUGS Except for @@ -379,13 +383,10 @@ Subsequent calls to these function will modify the same object. .Pp The C Standard provides no mechanism for a program to modify its current -local timezone setting, and the -.Tn POSIX Ns No \&-standard +local timezone setting, and the POSIX-standard method is not reentrant. (However, thread-safe implementations are provided -in the -.Tn POSIX -threaded environment.) +in the POSIX threaded environment.) .Pp The .Va tm_zone From nobody Thu Apr 4 11:39:03 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4V9KQH5l3rz5GrPv; Thu, 4 Apr 2024 11:39:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4V9KQH4Q5Hz57fQ; Thu, 4 Apr 2024 11:39:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712230743; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=h94R2vbjHe94FGRNpC+k58QmAq1nA6m5BODVgc7FwyE=; b=I0QN2VOCbYiq3wQznmrNCJGf6Hq3qBpKHOB2kbBewwny5ORqvHUDNrPdMimWFvSwys2dq7 Im8cV65/6MxInjn7HPd37SXEHkj4F1M/iKpXY8Oa1lidH+IAxfKsGJjJz936spW86nMdot jSjmDOgeJzZUy5Ao05qw7iWYC7qxyyJOZqsBtKhec7BROkyktJfOls0N84eoTK5q2dI43x /EIZBAKpuomE8MzwtzAoe/OvuDFqftInUpoA3U8PBudVOrtlbkQ855vXPdppyqMwQEq5Q/ AWeyD3GeqiROdB2qHCRZyyHTfo7rGNPwzKkcoGA2iwyoBwau4ggOCCVFE4kDYw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712230743; a=rsa-sha256; cv=none; b=HXCx0gMPGFdOpZ4SxV5ICcz4+k9PpHraDA54+qYRMPCT9WtEGKENVCcaM0VCjQWzVncZ5S w0uM749ilUF/tPTaCuDtkp5XqT57UyY0GyJMPVS7I+cL8ei4dE6skADQAAEiB03xXsMUhh 8XJkrqwykIRYKCZSOmwl6B21MMLt69R09FUNz9UM1xGHqZZFOHnXwTNjf/MTqKK8cmVOyw 6Q6M1h+1LGOkQAi304JXurjTrnVCAN21jDzCFiMdbYMDaSP4k/34C/ckE14luAodWfAxqx SO43wciFSi8TVwEWmGCCgSzFN+nTahEdwmZaWDg/UtI5OusoF9NUWWe8M8yEPg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712230743; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=h94R2vbjHe94FGRNpC+k58QmAq1nA6m5BODVgc7FwyE=; b=QAybFmtDXeYHFHloPLJaexCWeM+ckrQqFAyRrQDGidQk8LzEzOFiKH2m3tujMRyn5/2Fl1 SaG2KRvO4xWrdVHVrj993SZHQF4e9zVrHL8/3kcyTVyoRQ2TMR01On/r5uahy4x7V0VWrc W9Hp0ds+XENoNp17MLKQLAGABqbaTBk+18t1Cg9RmU2qANCw3efKJoFNLfkN3jQA8+zLf1 5M3KqspPF/K9YwYcJMuzwBMwup+a+N0Tj01mCiFwMupCH8X+plWHYb4NUSP+MJxO8IeAUD tONdgy+hm1E0ibXCOPMNUoTkKPVZebeP+sCK9SpLHcGnKvs38r1E8aZZNjSE3Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4V9KQH3fvwzF6D; Thu, 4 Apr 2024 11:39: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 434Bd3Fl060157; Thu, 4 Apr 2024 11:39:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 434Bd3c9060154; Thu, 4 Apr 2024 11:39:03 GMT (envelope-from git) Date: Thu, 4 Apr 2024 11:39:03 GMT Message-Id: <202404041139.434Bd3c9060154@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: fc7287456321 - stable/13 - touch: Allow setting the timestamp to -1. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: fc7287456321b5d27ab8766bf2b2a63502650e2f Auto-Submitted: auto-generated The branch stable/13 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=fc7287456321b5d27ab8766bf2b2a63502650e2f commit fc7287456321b5d27ab8766bf2b2a63502650e2f Author: Dag-Erling Smørgrav AuthorDate: 2024-03-27 10:03:40 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2024-04-04 09:51:04 +0000 touch: Allow setting the timestamp to -1. Note that VFS internally interprets a timestamp of -1 as “do not set”, so this has no effect, but at least touch won't incorrectly reject the given date / time (1969-12-31 23:59:59 UTC) as invalid. While here, fix some style issues. MFC after: 1 week Reviewed by: allanjude Differential Revision: https://reviews.freebsd.org/D44504 (cherry picked from commit aa69e0f212630bd6d4ec1c3c54e117be16653e8a) touch: Add unit tests. MFC after: 1 week Reviewed by: bapt Differential Revision: https://reviews.freebsd.org/D44505 (cherry picked from commit 74a4aa9b1517d92bfa85b0b1cd7d4c1262bb1ef9) --- etc/mtree/BSD.tests.dist | 7 ++ usr.bin/touch/Makefile | 4 + usr.bin/touch/tests/Makefile | 4 + usr.bin/touch/tests/touch_test.sh | 157 ++++++++++++++++++++++++++++++++++++++ usr.bin/touch/touch.c | 21 +++-- 5 files changed, 186 insertions(+), 7 deletions(-) diff --git a/etc/mtree/BSD.tests.dist b/etc/mtree/BSD.tests.dist index 16e19c967773..7c9b2464724c 100644 --- a/etc/mtree/BSD.tests.dist +++ b/etc/mtree/BSD.tests.dist @@ -1103,6 +1103,13 @@ .. tar .. +<<<<<<< HEAD +======= + tftp + .. + touch + .. +>>>>>>> 74a4aa9b1517 (touch: Add unit tests.) tr .. truncate diff --git a/usr.bin/touch/Makefile b/usr.bin/touch/Makefile index 5c153b3357a4..f4b74a033c36 100644 --- a/usr.bin/touch/Makefile +++ b/usr.bin/touch/Makefile @@ -1,5 +1,9 @@ # @(#)Makefile 8.1 (Berkeley) 6/6/93 +.include + PROG= touch +HAS_TESTS= +SUBDIR.${MK_TESTS}= tests .include diff --git a/usr.bin/touch/tests/Makefile b/usr.bin/touch/tests/Makefile new file mode 100644 index 000000000000..543b682b96a0 --- /dev/null +++ b/usr.bin/touch/tests/Makefile @@ -0,0 +1,4 @@ +PACKAGE= tests +ATF_TESTS_SH= touch_test + +.include diff --git a/usr.bin/touch/tests/touch_test.sh b/usr.bin/touch/tests/touch_test.sh new file mode 100644 index 000000000000..da39abef622e --- /dev/null +++ b/usr.bin/touch/tests/touch_test.sh @@ -0,0 +1,157 @@ +# +# Copyright (c) 2024 Dag-Erling Smørgrav +# +# SPDX-License-Identifier: BSD-2-Clause +# + +export TZ=UTC + +atf_check_mtime() +{ + local mtime=$1 filename=$2 + atf_check -o inline:"$((mtime))\n" stat -f%m "$filename" +} + +atf_test_case touch_none +touch_none_head() +{ + atf_set descr "No arguments" +} +touch_none_body() +{ + atf_check -s exit:1 -e match:"^usage" touch +} + +atf_test_case touch_one +touch_one_head() +{ + atf_set descr "One argument" +} +touch_one_body() +{ + atf_check touch foo + atf_check test -f foo +} + +atf_test_case touch_multiple +touch_multiple_head() +{ + atf_set descr "Multiple arguments" +} +touch_multiple_body() +{ + atf_check touch foo bar baz + atf_check test -f foo -a -f bar -a -f baz +} + +atf_test_case touch_absolute +touch_absolute_head() +{ + atf_set descr "Absolute date / time" +} +touch_absolute_body() +{ + atf_check touch -t 7001010101 foo + atf_check_mtime 3660 foo + atf_check rm foo + + atf_check touch -t 7001010101.01 foo + atf_check_mtime 3661 foo + atf_check rm foo + + atf_check touch -t 196912312359 foo + atf_check_mtime -60 foo + atf_check rm foo + + atf_check touch -t 196912312359.58 foo + atf_check_mtime -2 foo + atf_check rm foo + + atf_check touch -t 196912312359.59 foo + atf_expect_fail "VFS interprets -1 as “do not set”" + atf_check_mtime -1 foo + atf_check rm foo + + atf_check touch -d1969-12-31T23:59:58 foo + atf_check_mtime -2 foo + atf_check rm foo + + atf_check touch -d1969-12-31\ 23:59:58 foo + atf_check_mtime -2 foo + atf_check rm foo + + atf_check env TZ=CET touch -d1970-01-01T00:59:58 foo + atf_check_mtime -2 foo + atf_check rm foo + + atf_check env TZ=CET touch -d1970-01-01T00:59:58Z foo + atf_check_mtime 3598 foo + atf_check rm foo + + atf_check touch -d1969-12-31T23:59:59Z foo + atf_expect_fail "VFS interprets -1 as “do not set”" + atf_check_mtime -1 foo + atf_check rm foo +} + +atf_test_case touch_relative +touch_relative_head() +{ + atf_set descr "Relative date / time" +} +touch_relative_body() +{ + atf_check touch -t 202403241234.56 foo + atf_check_mtime 1711283696 foo + atf_check touch -A -36 foo + atf_check_mtime 1711283660 foo + atf_check touch -A -0100 foo + atf_check_mtime 1711283600 foo + atf_check touch -A -010000 foo + atf_check_mtime 1711280000 foo + atf_check touch -A 010136 foo + atf_check_mtime 1711283696 foo +} + +atf_test_case touch_copy +touch_copy_head() +{ + atf_set descr "Copy time from another file" +} +touch_copy_body() +{ + atf_check touch -t 202403241234.56 foo + atf_check_mtime 1711283696 foo + atf_check touch -t 7001010000 bar + atf_check_mtime 0 bar + atf_check touch -r foo bar + atf_check_mtime 1711283696 bar +} + +atf_test_case touch_nocreate +touch_nocreate_head() +{ + atf_set descr "Do not create file" +} +touch_nocreate_body() +{ + atf_check touch -t 202403241234.56 foo + atf_check_mtime 1711283696 foo + atf_check touch -c -t 7001010000 foo bar + atf_check_mtime 0 foo + atf_check -s exit:1 test -f bar + atf_check touch -c bar + atf_check -s exit:1 test -f bar +} + +atf_init_test_cases() +{ + atf_add_test_case touch_none + atf_add_test_case touch_one + atf_add_test_case touch_multiple + atf_add_test_case touch_absolute + atf_add_test_case touch_relative + atf_add_test_case touch_copy + atf_add_test_case touch_nocreate + # TODO: add test cases for -a, -h, -m +} diff --git a/usr.bin/touch/touch.c b/usr.bin/touch/touch.c index 91abcfd447ea..ed5b2125ec36 100644 --- a/usr.bin/touch/touch.c +++ b/usr.bin/touch/touch.c @@ -243,7 +243,7 @@ stime_arg1(const char *arg, struct timespec *tvp) } yearset = 0; - switch(strlen(arg)) { + switch (strlen(arg)) { case 12: /* CCYYMMDDhhmm */ t->tm_year = ATOI2(arg); t->tm_year *= 100; @@ -274,15 +274,17 @@ stime_arg1(const char *arg, struct timespec *tvp) } t->tm_isdst = -1; /* Figure out DST. */ + t->tm_yday = -1; tvp[0].tv_sec = tvp[1].tv_sec = mktime(t); - if (tvp[0].tv_sec == -1) + if (t->tm_yday == -1) goto terr; tvp[0].tv_nsec = tvp[1].tv_nsec = 0; return; terr: - errx(1, "out of range or illegal time specification: [[CC]YY]MMDDhhmm[.SS]"); + errx(1, "out of range or illegal time specification: " + "[[CC]YY]MMDDhhmm[.SS]"); } static void @@ -307,10 +309,11 @@ stime_arg2(const char *arg, int year, struct timespec *tvp) } t->tm_isdst = -1; /* Figure out DST. */ + t->tm_yday = -1; tvp[0].tv_sec = tvp[1].tv_sec = mktime(t); - if (tvp[0].tv_sec == -1) - errx(1, - "out of range or illegal time specification: MMDDhhmm[yy]"); + if (t->tm_yday == -1) + errx(1, "out of range or illegal time specification: " + "MMDDhhmm[yy]"); tvp[0].tv_nsec = tvp[1].tv_nsec = 0; } @@ -350,13 +353,17 @@ stime_darg(const char *arg, struct timespec *tvp) if (*p != '\0') goto bad; + t.tm_yday = -1; tvp[0].tv_sec = isutc ? timegm(&t) : mktime(&t); + if (t.tm_yday == -1) + goto bad; tvp[1] = tvp[0]; return; bad: - errx(1, "out of range or illegal time specification: YYYY-MM-DDThh:mm:SS[.frac][tz]"); + errx(1, "out of range or illegal time specification: " + "YYYY-MM-DDThh:mm:SS[.frac][tz]"); } /* Calculate a time offset in seconds, given an arg of the format [-]HHMMSS. */ From nobody Thu Apr 4 11:39:04 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4V9KQK1rj8z5GrK4; Thu, 4 Apr 2024 11:39: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 4V9KQJ53WWz57tc; Thu, 4 Apr 2024 11:39:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712230744; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GBubm65Nh0Ze5S8Fay33xLDfF6oALWVHV3XXRXnnZ3s=; b=QqZrHbeU1qEukrC6UOslhI6B1zIOsS1DxM0QM33jGxPQRz4t9bEKVN/AKgF/qtXII6eaSo J9wNjetRrM7QA388tgsKkdRmGcc5Q/nFmY7aQR/UEDAGUVnJYUHsp2hdpWL8bQTS3T1qUO Xwl4vf5bbhTqN7yhwdFcUDzW/iUOx7UgR2e6C7THajSFQdFD5l67SESYgWKQ6h6WciAyOD WyuffV7aBt+XtVsrlgo4p/FkAQ1pjSdvo1XM5saW079mgAD4CRR3KDXm9Hl4znb2AL/DNk rmlrX0vtG06a3IKPcxlhFS+sO5VHogbHPV6oXpe6q86MGwixfpcZoHrUMDaIiA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712230744; a=rsa-sha256; cv=none; b=RU/OeIG+2EhoyZVl3eO94dJdXLkkYR2qSKFztGlBXgoQu8KFDNJn5PdNTpuKWNKaqCoq/E 30yM0bFMQ58K1q2eIa2D6yvatbtFlDFoIzk28O8OxgK+7s6IBFpQ8X32QDTs2AFAMJtFi1 TekkjW9somh/zqVoXl/kyQ8YVEjwV9EqaGy/QzYdV9yo+K1Tk7MU2PCtfRgEFh9m+LSfhI 3k32P/6e1oyJxz3ILT/k+i+4iA6iIu4gRdkMrKVSLHxFK3A3bnB8zaPj7cRs5R3FPuhT4q heio9mqJGIedPq676UJwPJF8x4EQBxhTSxpEw+7snjltMzw0so7tPW0uEOn2WA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712230744; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GBubm65Nh0Ze5S8Fay33xLDfF6oALWVHV3XXRXnnZ3s=; b=LSe3Wh2eNIsZxrqXcUrHUjdDN053ZPHZChVoeqii92hwQImeo31OoPFHMg/R/W9e/tYqGQ rk9+d2i6gNp523tTbAYT/oJBvYeo2Yu1Dz7UB9NWm5GYbRmuAVBIKiMgAs/vQRSl0VMpcd mLtgzITdWf7U8DYqRNkcj8xlcOwKEg70zZEbORGciG0p3t2KxJ+ZezI/aJsADgq/ejAjsN US2qhd28iNsSChEInHMt89pY/MXdhomYX+da7yiunjxzdELSPiYzeyhFcPgtmNP7UwZJyR mbHGJaEwPDldiv9Ramrv7DgLLe9z7ruyO/TRrWJ9P+8Ln3didjVsxC3K5xu3gg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4V9KQJ4gFmzDvB; Thu, 4 Apr 2024 11:39: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 434Bd442060202; Thu, 4 Apr 2024 11:39:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 434Bd44O060199; Thu, 4 Apr 2024 11:39:04 GMT (envelope-from git) Date: Thu, 4 Apr 2024 11:39:04 GMT Message-Id: <202404041139.434Bd44O060199@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: f862c31a4159 - stable/13 - ln: Use stdbool, style nits. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: f862c31a41599206b4bda19a10fc5d5b6256e715 Auto-Submitted: auto-generated The branch stable/13 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=f862c31a41599206b4bda19a10fc5d5b6256e715 commit f862c31a41599206b4bda19a10fc5d5b6256e715 Author: Dag-Erling Smørgrav AuthorDate: 2024-03-27 10:03:49 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2024-04-04 09:51:05 +0000 ln: Use stdbool, style nits. MFC after: 1 week Sponsored by: Klara, Inc. Reviewed by: imp, allanjude Differential Revision: https://reviews.freebsd.org/D44511 (cherry picked from commit 437d53daf71a357aae960881ef037564736f7441) ln: Clean up and simplify tests. MFC after: 1 week Sponsored by: Klara, Inc. Reviewed by: allanjude Differential Revision: https://reviews.freebsd.org/D44512 (cherry picked from commit e0afcbc85690b6464706ead57103baa0493fdfb2) ln: Add a test case for ln -sfF. MFC after: 1 week Sponsored by: Klara, Inc. Reviewed by: allanjude, asomers Differential Revision: https://reviews.freebsd.org/D44513 (cherry picked from commit 2ae8d34666a6dea4c1c77a1905c7b8cebd6a21f9) --- bin/ln/ln.c | 76 ++++++++++++++++++++++--------------------- bin/ln/tests/ln_test.sh | 85 +++++++++++++++++++++---------------------------- 2 files changed, 76 insertions(+), 85 deletions(-) diff --git a/bin/ln/ln.c b/bin/ln/ln.c index 546bfba1c7c3..a0e19d702dea 100644 --- a/bin/ln/ln.c +++ b/bin/ln/ln.c @@ -49,24 +49,25 @@ static char sccsid[] = "@(#)ln.c 8.2 (Berkeley) 3/31/94"; #include #include #include +#include #include #include #include #include -static int fflag; /* Unlink existing files. */ -static int Fflag; /* Remove empty directories also. */ -static int hflag; /* Check new name for symlink first. */ -static int iflag; /* Interactive mode. */ -static int Pflag; /* Create hard links to symlinks. */ -static int sflag; /* Symbolic, not hard, link. */ -static int vflag; /* Verbose output. */ -static int wflag; /* Warn if symlink target does not +static bool fflag; /* Unlink existing files. */ +static bool Fflag; /* Remove empty directories also. */ +static bool hflag; /* Check new name for symlink first. */ +static bool iflag; /* Interactive mode. */ +static bool Pflag; /* Create hard links to symlinks. */ +static bool sflag; /* Symbolic, not hard, link. */ +static bool vflag; /* Verbose output. */ +static bool wflag; /* Warn if symlink target does not * exist, and -f is not enabled. */ static char linkch; -static int linkit(const char *, const char *, int); -static void usage(void); +static int linkit(const char *, const char *, bool); +static void usage(void) __dead2; int main(int argc, char *argv[]) @@ -91,41 +92,41 @@ main(int argc, char *argv[]) argv += optind; if (argc != 2) usage(); - exit(linkit(argv[0], argv[1], 0)); + exit(linkit(argv[0], argv[1], false)); } while ((ch = getopt(argc, argv, "FLPfhinsvw")) != -1) switch (ch) { case 'F': - Fflag = 1; + Fflag = true; break; case 'L': - Pflag = 0; + Pflag = false; break; case 'P': - Pflag = 1; + Pflag = true; break; case 'f': - fflag = 1; - iflag = 0; - wflag = 0; + fflag = true; + iflag = false; + wflag = false; break; case 'h': case 'n': - hflag = 1; + hflag = true; break; case 'i': - iflag = 1; - fflag = 0; + iflag = true; + fflag = false; break; case 's': - sflag = 1; + sflag = true; break; case 'v': - vflag = 1; + vflag = true; break; case 'w': - wflag = 1; + wflag = true; break; case '?': default: @@ -136,21 +137,21 @@ main(int argc, char *argv[]) argc -= optind; linkch = sflag ? '-' : '='; - if (sflag == 0) - Fflag = 0; - if (Fflag == 1 && iflag == 0) { - fflag = 1; - wflag = 0; /* Implied when fflag != 0 */ + if (!sflag) + Fflag = false; + if (Fflag && !iflag) { + fflag = true; + wflag = false; /* Implied when fflag is true */ } - switch(argc) { + switch (argc) { case 0: usage(); /* NOTREACHED */ case 1: /* ln source */ - exit(linkit(argv[0], ".", 1)); + exit(linkit(argv[0], ".", true)); case 2: /* ln source target */ - exit(linkit(argv[0], argv[1], 0)); + exit(linkit(argv[0], argv[1], false)); default: ; } @@ -169,7 +170,7 @@ main(int argc, char *argv[]) if (!S_ISDIR(sb.st_mode)) usage(); for (exitval = 0; *argv != targetdir; ++argv) - exitval |= linkit(*argv, targetdir, 1); + exitval |= linkit(*argv, targetdir, true); exit(exitval); } @@ -220,14 +221,15 @@ samedirent(const char *path1, const char *path2) } static int -linkit(const char *source, const char *target, int isdir) +linkit(const char *source, const char *target, bool isdir) { - struct stat sb; - const char *p; - int ch, exists, first; char path[PATH_MAX]; char wbuf[PATH_MAX]; char bbuf[PATH_MAX]; + struct stat sb; + const char *p; + int ch, first; + bool exists; if (!sflag) { /* If source doesn't exist, quit now. */ @@ -290,7 +292,7 @@ linkit(const char *source, const char *target, int isdir) /* * If the file exists, first check it is not the same directory entry. */ - exists = !lstat(target, &sb); + exists = lstat(target, &sb) == 0; if (exists) { if (!sflag && samedirent(source, target)) { warnx("%s and %s are the same directory entry", diff --git a/bin/ln/tests/ln_test.sh b/bin/ln/tests/ln_test.sh index 75fda4ce2dd7..8e5dcf81e61f 100644 --- a/bin/ln/tests/ln_test.sh +++ b/bin/ln/tests/ln_test.sh @@ -1,4 +1,6 @@ # +# SPDX-License-Identifier: BSD-2-Clause +# # Copyright 2017 Shivansh Rai # All rights reserved. # @@ -23,13 +25,15 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# -set_umask() +atf_check_same_file() { - if ! umask 022; then - atf_fail "setting umask failed" - fi + atf_check_equal "$(stat -f %d,%i "$1")" "$(stat -f %d,%i "$2")" +} + +atf_check_symlink_to() +{ + atf_check -o inline:"$1\n" readlink "$2" } atf_test_case L_flag @@ -39,18 +43,13 @@ L_flag_head() "symbolic link, '-L' option creates a hard" \ "link to the target of the symbolic link" } - L_flag_body() { - set_umask atf_check touch A atf_check ln -s A B atf_check ln -L B C - stat_A=$(stat -f %i A) - stat_C=$(stat -f %i C) - atf_check_equal "$stat_A" "$stat_C" - atf_check -o inline:'Symbolic Link\n' stat -f %SHT B - atf_check -o inline:'A\n' readlink B + atf_check_same_file A C + atf_check_symlink_to A B } atf_test_case P_flag @@ -60,16 +59,12 @@ P_flag_head() "symbolic link, '-P' option creates a hard " \ "link to the symbolic link itself" } - P_flag_body() { - set_umask atf_check touch A atf_check ln -s A B atf_check ln -P B C - stat_B=$(stat -f %i B) - stat_C=$(stat -f %i C) - atf_check_equal "$stat_B" "$stat_C" + atf_check_same_file B C } atf_test_case f_flag @@ -78,15 +73,11 @@ f_flag_head() atf_set "descr" "Verify that if the target file already exists, " \ "'-f' option unlinks it so that link may occur" } - f_flag_body() { - set_umask atf_check touch A B atf_check ln -f A B - stat_A=$(stat -f %i A) - stat_B=$(stat -f %i B) - atf_check_equal "$stat_A" "$stat_B" + atf_check_same_file A B } atf_test_case target_exists_hard @@ -95,10 +86,8 @@ target_exists_hard_head() atf_set "descr" "Verify whether creating a hard link fails if the " \ "target file already exists" } - target_exists_hard_body() { - set_umask atf_check touch A B atf_check -s exit:1 -e inline:'ln: B: File exists\n' \ ln A B @@ -110,10 +99,8 @@ target_exists_symbolic_head() atf_set "descr" "Verify whether creating a symbolic link fails if " \ "the target file already exists" } - target_exists_symbolic_body() { - set_umask atf_check touch A B atf_check -s exit:1 -e inline:'ln: B: File exists\n' \ ln -s A B @@ -124,13 +111,12 @@ shf_flag_dir_head() { atf_set "descr" "Verify that if the target directory is a symbolic " \ "link, '-shf' option prevents following the link" } - shf_flag_dir_body() { atf_check mkdir -m 0777 A B atf_check ln -s A C atf_check ln -shf B C - atf_check -o inline:'Symbolic Link\n' stat -f %SHT C + atf_check test -L C atf_check -o inline:'B\n' readlink C } @@ -139,14 +125,12 @@ snf_flag_dir_head() { atf_set "descr" "Verify that if the target directory is a symbolic " \ "link, '-snf' option prevents following the link" } - snf_flag_dir_body() { atf_check mkdir -m 0777 A B atf_check ln -s A C atf_check ln -snf B C - atf_check -o inline:'Symbolic Link\n' stat -f %SHT C - atf_check -o inline:'B\n' readlink C + atf_check_symlink_to B C } atf_test_case sF_flag @@ -156,13 +140,11 @@ sF_flag_head() "and is a directory, then '-sF' option removes " \ "it so that the link may occur" } - sF_flag_body() { atf_check mkdir A B atf_check ln -sF A B - atf_check -o inline:'Symbolic Link\n' stat -f %SHT B - atf_check -o inline:'A\n' readlink B + atf_check_symlink_to A B } atf_test_case sf_flag @@ -172,14 +154,27 @@ sf_flag_head() "'-sf' option unlinks it and creates a symbolic link " \ "to the source file" } - sf_flag_body() { - set_umask atf_check touch A B atf_check ln -sf A B - atf_check -o inline:'Symbolic Link\n' stat -f %SHT B - atf_check -o inline:'A\n' readlink B + atf_check_symlink_to A B +} + +atf_test_case sfF_flag +sfF_flag_head() +{ + atf_set "descr" "Verify that if the target file already exists " \ + "and is a symlink, then '-sfF' option removes " \ + "it so that the link may occur" +} +sfF_flag_body() +{ + atf_check mkdir A B C + atf_check ln -sF A C + atf_check_symlink_to A C + atf_check ln -sfF B C + atf_check_symlink_to B C } atf_test_case s_flag @@ -187,14 +182,11 @@ s_flag_head() { atf_set "descr" "Verify that '-s' option creates a symbolic link" } - s_flag_body() { - set_umask atf_check touch A atf_check ln -s A B - atf_check -o inline:'Symbolic Link\n' stat -f %SHT B - atf_check -o inline:'A\n' readlink B + atf_check_symlink_to A B } atf_test_case s_flag_broken @@ -203,12 +195,10 @@ s_flag_broken_head() atf_set "descr" "Verify that if the source file does not exists, '-s' " \ "option creates a broken symbolic link to the source file" } - s_flag_broken_body() { atf_check ln -s A B - atf_check -o inline:'Symbolic Link\n' stat -f %SHT B - atf_check -o inline:'A\n' readlink B + atf_check_symlink_to A B } atf_test_case sw_flag @@ -217,13 +207,11 @@ sw_flag_head() atf_set "descr" "Verify that '-sw' option produces a warning if the " \ "source of a symbolic link does not currently exist" } - sw_flag_body() { atf_check -s exit:0 -e inline:'ln: warning: A: No such file or directory\n' \ ln -sw A B - atf_check -o inline:'Symbolic Link\n' stat -f %SHT B - atf_check -o inline:'A\n' readlink B + atf_check_symlink_to A B } atf_init_test_cases() @@ -237,6 +225,7 @@ atf_init_test_cases() atf_add_test_case snf_flag_dir atf_add_test_case sF_flag atf_add_test_case sf_flag + atf_add_test_case sfF_flag atf_add_test_case s_flag atf_add_test_case s_flag_broken atf_add_test_case sw_flag From nobody Thu Apr 4 11:39:05 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4V9KQL0jSlz5GrMZ; Thu, 4 Apr 2024 11:39:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4V9KQK6dHjz57lj; Thu, 4 Apr 2024 11:39:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712230745; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=18+mQ2llkB9U3sbXDOmMFyUyTatKEvGiAidOgz4eLe4=; b=oJz+S54ViWEx4pUX85MS2pktMbd5MgkIoZxUznkFlwI2XnIOAa4N3Xdn8WTsqFWkSmVNbC e0rdxj7KkDAooApn4AGaRrneV0Azpe/WDk1ag/lLYI9sG77t1OmP411a/ZL9U8+SlvZjMs 28NKkRumhwjChdAp5uIpz0KigxXMRI7tuzldHoidmr6x/8bVBJ9iFLVI4y+e9IZcw/Rd4f 0cq+85k7sKT+QUQIXyoDCcwDwfq8HMuo4vLTT9C7wiVqr2CwaZV0vUAdt+KVv1kljBWdf1 yJ9a8ynyBwjoY/VrRpzWfc+CQloZoag1Dg8QY0D23WOg7Wili/TnMKsuT3/a/w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712230745; a=rsa-sha256; cv=none; b=vSMgdMB7de6NMq1BMKcVzZmbUeTOFXeYE2wDC2lePSN+Swo3YcdhAyz58/YxYbSmweL0oy ODcnZfvp6CuD8K27l6qMo0e0DXR2EErE71KcapIV825WBEHCuLbICGAEgGPeh3pYHWRhZU EwP1gdtCqejXOzh5R45sH0TVOJc+1YcmYvnLuZZudTnsomemB+Gk+FlJTbxQBLIs9daY1h bHn+WFnzldAoxROqFpNNgcJ6jhW77pF6N3JmkVe8jE7MxJGv+3Tf1miWnLg7lQrEyJKI/1 rK9UOKf80Ean6wpDMrsmraJV1aydqnO1yEhtaBYWUw+7c8ygvJ0KOQyN/49U/Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712230745; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=18+mQ2llkB9U3sbXDOmMFyUyTatKEvGiAidOgz4eLe4=; b=V/RuffGqZTxLU7XrXofzZmAF8kHQGwL18t6IukaYgkTdL9EKH4ZMeS30OlZ7trUBfKVZ9D 3BBQMsG06oXvjOrmFDM0bW1wiQjed/6yqRiEPfkckiDxQ1x08Uid7G3o3dLnetha80Jg5E unX2kZGInNRZSST5r6sJGOYZ3ls8gdb5QLeu3ckgpw15WOC4r0BgxAmPn/RnS2yYHByLwZ eYIJKmHKDJ1OOK0u00jwzNkUj03uRu9C/NnmKFqFMKn/761F53R1oxjhPPLDSpzy/7UpTq pILd+oqGF/xwukcMgL8nEYpcJIbJVI45xtA4mG6l5LqwwitrIpu9jmiC5JFnqw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4V9KQK5z9jzFgC; Thu, 4 Apr 2024 11:39: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 434Bd5NM060247; Thu, 4 Apr 2024 11:39:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 434Bd5ew060244; Thu, 4 Apr 2024 11:39:05 GMT (envelope-from git) Date: Thu, 4 Apr 2024 11:39:05 GMT Message-Id: <202404041139.434Bd5ew060244@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: 8934e4a17e94 - stable/13 - install: Prefer strsnvis() to strsvis(). List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 8934e4a17e945fbd37b4e97fc42f83d000b74d9a Auto-Submitted: auto-generated The branch stable/13 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=8934e4a17e945fbd37b4e97fc42f83d000b74d9a commit 8934e4a17e945fbd37b4e97fc42f83d000b74d9a Author: Dag-Erling Smørgrav AuthorDate: 2024-03-27 10:03:59 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2024-04-04 09:51:06 +0000 install: Prefer strsnvis() to strsvis(). MFC after: 1 week Sponsored by: Klara, Inc. Reviewed by: allanjude Differential Revision: https://reviews.freebsd.org/D44514 (cherry picked from commit 2cab4be46b0eeb64b8ade010bc16245151af5ccd) --- usr.bin/xinstall/xinstall.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/usr.bin/xinstall/xinstall.c b/usr.bin/xinstall/xinstall.c index 3bcc44d08b81..f1fe1a969377 100644 --- a/usr.bin/xinstall/xinstall.c +++ b/usr.bin/xinstall/xinstall.c @@ -1507,15 +1507,18 @@ metadata_log(const char *path, const char *type, struct timespec *ts, static const char extra[] = { ' ', '\t', '\n', '\\', '#', '\0' }; const char *p; char *buf; - size_t destlen; + size_t buflen, destlen; struct flock metalog_lock; if (!metafp) return; - /* Buffer for strsvis(3). */ - buf = (char *)malloc(4 * strlen(path) + 1); - if (buf == NULL) { - warnx("%s", strerror(ENOMEM)); + /* Buffer for strsnvis(3), used for both path and slink. */ + buflen = strlen(path); + if (slink && strlen(slink) > buflen) + buflen = strlen(slink); + buflen = 4 * buflen + 1; + if ((buf = malloc(buflen)) == NULL) { + warn(NULL); return; } @@ -1540,7 +1543,7 @@ metadata_log(const char *path, const char *type, struct timespec *ts, } while (*p && *p == '/') p++; - strsvis(buf, p, VIS_OCTAL, extra); + strsnvis(buf, buflen, p, VIS_OCTAL, extra); p = buf; /* Print details. */ fprintf(metafp, ".%s%s type=%s", *p ? "/" : "", p, type); @@ -1550,14 +1553,14 @@ metadata_log(const char *path, const char *type, struct timespec *ts, fprintf(metafp, " gname=%s", group); fprintf(metafp, " mode=%#o", mode); if (slink) { - strsvis(buf, slink, VIS_CSTYLE, extra); /* encode link */ + strsnvis(buf, buflen, slink, VIS_CSTYLE, extra); fprintf(metafp, " link=%s", buf); } if (*type == 'f') /* type=file */ fprintf(metafp, " size=%lld", (long long)size); if (ts != NULL && dopreserve) fprintf(metafp, " time=%lld.%09ld", - (long long)ts[1].tv_sec, ts[1].tv_nsec); + (long long)ts[1].tv_sec, ts[1].tv_nsec); if (digestresult && digest) fprintf(metafp, " %s=%s", digest, digestresult); if (fflags) From nobody Thu Apr 4 11:39:06 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4V9KQM2pHgz5GrS7; Thu, 4 Apr 2024 11:39:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4V9KQM0gyzz57rx; Thu, 4 Apr 2024 11:39:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712230747; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/TR6izutHBXhgHTDXsSl6WCAQIp/kWeRNyq3No5haSI=; b=ERHjwZJTlUq8kkUtqfCjapRe30reQGbRQWvnwN5vD9EGBLOkkxw6cTo1sBWzcOTvb7U/X6 mdYxLbbUgTW0xJLwHAk4/K6n/9ri2P2XmyY29y9L3ClXzdbx1jgaW9lFDkwQf6+zswgsCX FIpgNrySfHY08owe1zF6hifhK1ozisjMcT5y/pS8pN0JtWGesMd37q8bfZtheE/cjq4WZz Vrm9snuTaDy9zjW/JgKV1VtbiM+C2jfKJHk9RbeyaU0kK2g6rdI7dvtylbtnh0JXbxBlvg 09JqL6z3odDpxX9IfhM6wC7XDIcYPAFoNM7Nt9X+i5Lb+WdMAm2qrktKlR5DTQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712230747; a=rsa-sha256; cv=none; b=OPuTyNve5346e0pjnkTanMdPZpS/EZjG7baY3tAfBdtzVgvI/xRr+o6yvzPZjvbrOYlsjk tm5lJWIr54DyjJRp2Itnp9FAe4Ez9uLqGDaDtT0GUhHaqWETnlJf+8U1MjbQJSmAV+dOMF 0iPjWH2DP0thOyVKrmunwF41jRHdzlMbJATSF7RoLSrwh1XJ6TNZ9poBy+8mp9Wu+1CHu9 NqTuP12DuX5RnVbz3Gq5GEE3sPJltJ60hoVoiyncF0n6LabIh8r8hc1KBozW/Jr7DooiCC zdeMtE/fz5sGY2rPTnTXOUsImlpHX+FE+GPR4anwF72sSl/LNMBbtbSNXfClFA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712230747; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/TR6izutHBXhgHTDXsSl6WCAQIp/kWeRNyq3No5haSI=; b=Hevo1yD8DzKXWfWjmyZNilhquqwo5rTCCcclkNzrGS5lPgiDm7jZO5+mPUizAPEtmXBqT2 Q8vcPtjAKDUeZPTp8Pqpx/zcnggNcvOG5xBjtnDmhw0vsxekmW8WayPOl5QRuJeLt/DRui x65kmjkfUyFtdDtQFjqv6l41+l9xfizUPb8cmWuz8oqPYwfn0/S6KR1wnclGaTDPGHseyt 93MEr9ttuvgndw5VYtmwtNsjUu5B8LOkBNoDhZZCH61zcGT3LfTJDZ19ZoRiwsG5nb3CYz 5Ub4AAg94wLItBZfUhMFqQJQ8/hMHkAb0frCLsxslF7QEOXe+hfUTx1BbeFg0w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4V9KQM02cpzFJN; Thu, 4 Apr 2024 11:39: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 434Bd6If060295; Thu, 4 Apr 2024 11:39:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 434Bd6jp060292; Thu, 4 Apr 2024 11:39:06 GMT (envelope-from git) Date: Thu, 4 Apr 2024 11:39:06 GMT Message-Id: <202404041139.434Bd6jp060292@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: 6895133fe293 - stable/13 - lorder: Clean up and improve robustness. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 6895133fe293902f19a060c0cf229ea9b23bb555 Auto-Submitted: auto-generated The branch stable/13 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=6895133fe293902f19a060c0cf229ea9b23bb555 commit 6895133fe293902f19a060c0cf229ea9b23bb555 Author: Dag-Erling Smørgrav AuthorDate: 2024-02-28 15:37:36 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2024-04-04 09:55:25 +0000 lorder: Clean up and improve robustness. * Properly parse (no) command-line options. * Ensure that errors go to stderr and result in a non-zero exit. * Drop the special-case code for a single argument, as it will produce the wrong outcome if the file does not exist or is corrupted. * Don't print anything until after we've collected all the data. * Always create all temporary files before setting the trap. This ensures that the trap can safely fire at any moment, regardless of any previous definition of `T`. * Use a temporary file rather than a pipe between `nm` and `sed` to ensure proper termination if `nm` fails due to a missing or invalid input. * The check for self-referential entries was conditional on testing our argument list against a regex looking for archives. This was a needless and unreliable optimization; make the check unconditional. * Document that lorder will not work properly if any of its inputs have spaces in their name. MFC after: 1 week Sponsored by: Klara, Inc. Reviewed by: allanjude Differential Revision: https://reviews.freebsd.org/D44133 (cherry picked from commit 5c7b986c21ed47545203e8f630fe2281b83112d2) lorder: Add unit tests. MFC after: 1 week Sponsored by: Klara, Inc. Reviewed by: allanjude Differential Revision: https://reviews.freebsd.org/D44134 (cherry picked from commit 96da41b6dbf383436018f11ad8a672faab2d3789) lorder: Undeprecate. While lorder is not required by our current toolchain (or any toolchain we've used in the past decade or two), it still occasionally shows up in build systems of third party software, including The Open Group's UNIX conformance test suite, and the maintenance cost is negligible. MFC after: 1 week Sponsored by: Klara, Inc. Reviewed by: imp, allanjude, emaste Differential Revision: https://reviews.freebsd.org/D44135 (cherry picked from commit cf4d9bf8b38819da12c6d686d5cf6dbd6353cd61) lorder: Don't rely on legacy syntax. MFC after: 1 week Sponsored by: Klara, Inc. Reviewed by: allanjude Differential Revision: https://reviews.freebsd.org/D44155 (cherry picked from commit aedb37dc49319a7cd1faf34f312a8a9fc01e611d) lorder: Tweak invalid file test. Different implementations of `nm` have different ways of telling you that your file is not a valid object or library, but they all seem to have “not recognized” as a common substring. MFC after: 1 week Sponsored by: Klara, Inc. Reviewed by: allanjude Differential Revision: https://reviews.freebsd.org/D44154 (cherry picked from commit aa80cfadff0bb715ca090cbd1b3561a1619251d5) usr.bin: Make lorder conditional on MK_TOOLCHAIN. MFC after: 1 week Reviewed by: allanjude, markj Differential Revision: https://reviews.freebsd.org/D44558 (cherry picked from commit 125c4560bc70971b950d035cfcd2255b89984011) --- etc/mtree/BSD.tests.dist | 2 + tools/build/mk/OptionalObsoleteFiles.inc | 6 ++ usr.bin/Makefile | 2 +- usr.bin/lorder/Makefile | 5 ++ usr.bin/lorder/lorder.1 | 37 +++++------ usr.bin/lorder/lorder.sh | 94 ++++++++++++++++---------- usr.bin/lorder/tests/Makefile | 4 ++ usr.bin/lorder/tests/lorder_test.sh | 111 +++++++++++++++++++++++++++++++ 8 files changed, 203 insertions(+), 58 deletions(-) diff --git a/etc/mtree/BSD.tests.dist b/etc/mtree/BSD.tests.dist index 7c9b2464724c..82c77c6d43c7 100644 --- a/etc/mtree/BSD.tests.dist +++ b/etc/mtree/BSD.tests.dist @@ -1061,6 +1061,8 @@ .. lockf .. + lorder + .. m4 .. mkimg diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index 4b78c655f73c..e068ad8b5f91 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -8982,6 +8982,12 @@ OLD_FILES+=usr/share/man/man3/elftc_set_timestamps.3.gz OLD_FILES+=usr/share/man/man3/elftc_timestamp.3.gz OLD_FILES+=usr/share/man/man3/elftc_string_table_create.3.gz OLD_FILES+=usr/share/man/man3/elftc_version.3.gz +# usr.bin/lorder +OLD_FILES+=usr/bin/lorder +OLD_FILES+=usr/tests/usr.bin/lorder/Kyuafile +OLD_FILES+=usr/tests/usr.bin/lorder/lorder_test +OLD_DIRS+=usr/tests/usr.bin/lorder +# usr.bin/yacc OLD_FILES+=usr/tests/usr.bin/yacc/Kyuafile OLD_FILES+=usr/tests/usr.bin/yacc/btyacc_calc1.y OLD_FILES+=usr/tests/usr.bin/yacc/btyacc_demo.y diff --git a/usr.bin/Makefile b/usr.bin/Makefile index 54b45dca0e24..f3150691003c 100644 --- a/usr.bin/Makefile +++ b/usr.bin/Makefile @@ -82,7 +82,6 @@ SUBDIR= alias \ logins \ logname \ look \ - lorder \ lsvfs \ lzmainfo \ m4 \ @@ -275,6 +274,7 @@ SUBDIR.${MK_TOOLCHAIN}+= file2c SUBDIR.${MK_TOOLCHAIN}+= gprof SUBDIR.${MK_TOOLCHAIN}+= indent SUBDIR.${MK_TOOLCHAIN}+= lex +SUBDIR.${MK_TOOLCHAIN}+= lorder SUBDIR.${MK_TOOLCHAIN}+= mkstr SUBDIR.${MK_TOOLCHAIN}+= rpcgen SUBDIR.${MK_TOOLCHAIN}+= unifdef diff --git a/usr.bin/lorder/Makefile b/usr.bin/lorder/Makefile index a94860b51c6a..112dd5df2a1e 100644 --- a/usr.bin/lorder/Makefile +++ b/usr.bin/lorder/Makefile @@ -1,6 +1,11 @@ # @(#)Makefile 8.1 (Berkeley) 6/6/93 +.include + SCRIPTS=lorder.sh MAN= lorder.1 +HAS_TESTS= +SUBDIR.${MK_TESTS}= tests + .include diff --git a/usr.bin/lorder/lorder.1 b/usr.bin/lorder/lorder.1 index e268f81d7254..478b7f493e03 100644 --- a/usr.bin/lorder/lorder.1 +++ b/usr.bin/lorder/lorder.1 @@ -27,17 +27,12 @@ .\" .\" @(#)lorder.1 8.2 (Berkeley) 4/28/95 .\" -.Dd March 21, 2023 +.Dd February 27, 2024 .Dt LORDER 1 .Os .Sh NAME .Nm lorder .Nd list dependencies for object files -.Sh DEPRECATION NOTICE -.Nm -is obsolete and may not be present in -.Fx 14 -and later. .Sh SYNOPSIS .Nm .Ar @@ -46,13 +41,10 @@ The .Nm utility uses .Xr nm 1 -to determine interdependencies in the list of object files -and library archives -specified on the command line. -The -.Nm -utility outputs a list of file names where the first file contains a symbol -which is defined by the second file. +to determine interdependencies between object files and library +archives listed on its command line. +It then outputs a list of pairs of file names such that the first file +in each pair references at least one symbol defined by the second. .Pp The output is normally used with .Xr tsort 1 @@ -60,18 +52,16 @@ when a library is created to determine the optimum ordering of the object modules so that all references may be resolved in a single pass of the loader. .Pp -When linking static binaries, +Similarly, when linking static binaries, .Nm and .Xr tsort 1 -can be used to properly order library archives automatically. +can be used to sort libraries in order of dependency. .Pp -The use of -.Nm -is not required by contemporary linkers, and -.Nm -may be removed from a future version of -.Fx . +While contemporary linkers no longer require the use of +.Nm , +it is provided for the benefit of legacy code bases and build +systems which still insist on it. .Sh ENVIRONMENT .Bl -tag -width indent .It Ev NM @@ -99,3 +89,8 @@ A .Nm utility appeared in .At v7 . +.Sh CAVEATS +The +.Nm +utility will not work properly if given file names with spaces or +newlines in them. diff --git a/usr.bin/lorder/lorder.sh b/usr.bin/lorder/lorder.sh index 640e128b0cb9..c0a7dbbd43e6 100644 --- a/usr.bin/lorder/lorder.sh +++ b/usr.bin/lorder/lorder.sh @@ -33,35 +33,50 @@ # # -# only one argument is a special case, just output the name twice -case $# in - 0) - echo "usage: lorder file ..."; - exit ;; - 1) - echo $1 $1; - exit ;; -esac +export LC_CTYPE=C +export LC_COLLATE=C +set -e -# temporary files +usage() { + echo "usage: lorder file ..." >&2 + exit 1 +} + +while getopts "" opt ; do + case $opt in + *) + usage + ;; + esac +done +shift $(($OPTIND - 1)) +if [ $# -eq 0 ] ; then + usage +fi + +# +# Create temporary files. +# +N=$(mktemp -t _nm_) R=$(mktemp -t _reference_) S=$(mktemp -t _symbol_) +T=$(mktemp -t _temp_) NM=${NM:-nm} -# remove temporary files on HUP, INT, QUIT, PIPE, TERM -trap "rm -f $R $S $T; exit 1" 1 2 3 13 15 - -# make sure all the files get into the output -for i in $*; do - echo $i $i -done +# +# Remove temporary files on termination. +# +trap "rm -f $N $R $S $T" EXIT 1 2 3 13 15 -# if the line has " [RTDW] " it's a globally defined symbol, put it -# into the symbol file. # -# if the line has " U " it's a globally undefined symbol, put it into -# the reference file. -${NM} ${NMFLAGS} -go $* | sed " +# A line matching " [RTDW] " indicates that the input defines a symbol +# with external linkage; put it in the symbol file. +# +# A line matching " U " indicates that the input references an +# undefined symbol; put it in the reference file. +# +${NM} ${NMFLAGS} -go "$@" >$N +sed -e " / [RTDW] / { s/:.* [RTDW] / / w $S @@ -72,21 +87,28 @@ ${NM} ${NMFLAGS} -go $* | sed " w $R } d -" +" <$N -export LC_ALL=C -# eliminate references that can be resolved by the same library. -if [ $(expr "$*" : '.*\.a[[:>:]]') -ne 0 ]; then - sort -u -o $S $S - sort -u -o $R $R - T=$(mktemp -t _temp_) - comm -23 $R $S >$T - mv $T $R -fi +# +# Elide entries representing a reference to a symbol from within the +# library that defines it. +# +sort -u -o $S $S +sort -u -o $R $R +comm -23 $R $S >$T +mv $T $R + +# +# Make sure that all inputs get into the output. +# +for i ; do + echo "$i" "$i" +done -# sort references and symbols on the second field (the symbol), -# join on that field, and print out the file names. +# +# Sort references and symbols on the second field (the symbol), join +# on that field, and print out the file names. +# sort -k 2 -o $R $R sort -k 2 -o $S $S -join -j 2 -o 1.1 2.1 $R $S -rm -f $R $S +join -j 2 -o 1.1 -o 2.1 $R $S diff --git a/usr.bin/lorder/tests/Makefile b/usr.bin/lorder/tests/Makefile new file mode 100644 index 000000000000..21207f413a8d --- /dev/null +++ b/usr.bin/lorder/tests/Makefile @@ -0,0 +1,4 @@ +PACKAGE= tests +ATF_TESTS_SH= lorder_test + +.include diff --git a/usr.bin/lorder/tests/lorder_test.sh b/usr.bin/lorder/tests/lorder_test.sh new file mode 100644 index 000000000000..a4276b2dcfe6 --- /dev/null +++ b/usr.bin/lorder/tests/lorder_test.sh @@ -0,0 +1,111 @@ +# +# Copyright (c) 2024 Klara, Inc. +# +# SPDX-License-Identifier: BSD-2-Clause +# + +atf_test_case noargs +noargs_head() { + atf_set descr "No arguments" +} +noargs_body() { + atf_check -s exit:1 -e match:"^usage:" \ + lorder +} + +atf_test_case onearg +onearg_head() { + atf_set descr "One argument" +} +onearg_body() { + echo "void a(void) { }" >a.c + cc -o a.o -c a.c + echo "a.o a.o" >output + atf_check -o file:output \ + lorder *.o +} + +atf_test_case dashdash +dashdash_head() { + atf_set descr "One argument" +} +dashdash_body() { + echo "void a(void) { }" >a.c + cc -o a.o -c a.c + echo "a.o a.o" >output + atf_check -o file:output \ + lorder -- *.o +} + +atf_test_case nonexistent +nonexistent_head() { + atf_set descr "Nonexistent file" +} +nonexistent_body() { + atf_check -s not-exit:0 -e match:"No such file" -o empty \ + lorder nonexistent.o +} + +atf_test_case invalid +invalid_head() { + atf_set descr "Invalid file" +} +invalid_body() { + echo "not an object file" >invalid.o + atf_check -s not-exit:0 -e match:"not recognized" -o empty \ + lorder invalid.o +} + +atf_test_case objects +objects_head() { + atf_set descr "Order objects" +} +objects_body() { + echo "void a(void) { }" >a.c + echo "void a(void); void b(void) { a(); }" >b.c + echo "void b(void); void c(void) { b(); }" >c.c + for n in a b c ; do + cc -o $n.o -c $n.c + echo "$n.o $n.o" + done >output + echo "b.o a.o" >>output + echo "c.o b.o" >>output + atf_check -o file:output \ + lorder *.o +} + +atf_test_case archives +archives_head() { + atf_set descr "Order archives" +} +archives_body() { + echo "void a(void) { }" >a.c + echo "void a(void); void b(void) { a(); }" >b.c + echo "void b(void); void c(void) { b(); }" >c.c + echo "void e(void); void d(void) { e(); }" >d.c + echo "void d(void); void e(void) { d(); }" >e.c + for n in a b c d e ; do + cc -o $n.o -c $n.c + done + for n in a b c ; do + ar -crs $n.a $n.o + echo "$n.a $n.a" + done >output + ar -crs z.a d.o e.o + echo "z.a z.a" >>output + echo "b.a a.a" >>output + echo "c.a b.a" >>output + atf_check -o file:output \ + lorder *.a +} + +atf_init_test_cases() +{ + atf_add_test_case noargs + atf_add_test_case onearg + atf_add_test_case dashdash + atf_add_test_case nonexistent + atf_add_test_case invalid + atf_add_test_case objects + atf_add_test_case archives +} From nobody Thu Apr 4 12:07:30 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4V9L363sbTz5GtMH; Thu, 4 Apr 2024 12:07:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4V9L362xqxz42BT; Thu, 4 Apr 2024 12:07:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712232450; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hHc5suySQvs/JQ7uTen5WQVxpOHaV9kl9nfqzRMAYB0=; b=LzBFBkleaUSJv34784So8w1CuK9NUhDyeAaBdrxUnsc6zRZf2DDU8LlqJCnxZg2dWG4oMC dzj+zOp6oln4bSsmVE5PaclI0n88WTGbqmcfdVnTI57ecRNz2cFotu4uMOgjN8A9k59a+o zPIdEmii1XJL/MAxGA0r34MhrKICrkXZkh1n7EKIbuDs9tQDTwpynRAfFn1vgONqTgswXP rpP3AVdxHRC2gsm7TYMBle8kHdj7qWbXgYPLUtEjetI+WlKsqG3MCInbHIj0b1trQ9uQpX eAAC/PMj6JUYNWzqg5GewKxhjdxwPi2NcuM5CDJLtLCuHrQYgm+P7VV2H4DZVw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712232450; a=rsa-sha256; cv=none; b=W2d0Ib2bAp6jVsWzHNx88nDRCPfYK7sSgaNlCSajmM6eM0LxdgiidPPPax7yc4ELeiqnck yFR0SA+cbm1iui1JrmLaN1LwcbRVHGhfnpdc5QgM5OHuavvSrveJQPdi4Oy2Ozz4deXWcx ElIld3x+DECg1A6opJrb2GqqkX0iypUatoUNEqBNO9En4m2EsIaqXWXYzugJvgnNog9PsT zPiO/TWTnvPqX9T1JCs41VdFVcQDKPk6vhQ/KvWAryx9eC/VonZfXwXtfgFCg+gZR8sczv xCC0P6CHU6d4l3kHFsP9gPsrKvNfe+HKUVXnvpSpSoGQNge3wlSqv3T9NWbsJw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712232450; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hHc5suySQvs/JQ7uTen5WQVxpOHaV9kl9nfqzRMAYB0=; b=CeW41dsU8MQQ7Jn1Otu/gEUm+45cB6WOoRtgjA94qgIX1UVi1VOK3A8BbrwUuGl8xsxzxc R2u9uNi7DlM9dn9ZeQYtZS47Eswf/+BS3qh8SWugF/gXWHI66O4g7bNp8sgUXvtT5jySk3 97AYAzdlIhzUTW9K3YonOhCcoc3UjDQd6iMz/sEUApebzfOuaivbkS/u2WHxWByBBhXNxf vcFAFzwwCGsw8vLxBlMpIxyeQphFYb4U4e1ocnMTQ9Nineyq1M3PNv4N7GYco+BiKTsnvf LozbVmH5oDdyMWG4RR3dfaoGXQrey23FQvh1crTWzwXhj5bw5rtI/l61UQ44fg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4V9L362R2szFwT; Thu, 4 Apr 2024 12:07:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 434C7UU7011426; Thu, 4 Apr 2024 12:07:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 434C7UIb011423; Thu, 4 Apr 2024 12:07:30 GMT (envelope-from git) Date: Thu, 4 Apr 2024 12:07:30 GMT Message-Id: <202404041207.434C7UIb011423@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: b9e32d8c8f51 - stable/13 - Clean up botched merge. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: b9e32d8c8f51f053988e45b61d90f3bc9cb77fb0 Auto-Submitted: auto-generated The branch stable/13 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=b9e32d8c8f51f053988e45b61d90f3bc9cb77fb0 commit b9e32d8c8f51f053988e45b61d90f3bc9cb77fb0 Author: Dag-Erling Smørgrav AuthorDate: 2024-04-04 12:07:00 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2024-04-04 12:07:00 +0000 Clean up botched merge. Fixes: 6895133fe293902f19a060c0cf229ea9b23bb555 --- etc/mtree/BSD.tests.dist | 5 ----- 1 file changed, 5 deletions(-) diff --git a/etc/mtree/BSD.tests.dist b/etc/mtree/BSD.tests.dist index 82c77c6d43c7..98450e1cafbd 100644 --- a/etc/mtree/BSD.tests.dist +++ b/etc/mtree/BSD.tests.dist @@ -1105,13 +1105,8 @@ .. tar .. -<<<<<<< HEAD -======= - tftp - .. touch .. ->>>>>>> 74a4aa9b1517 (touch: Add unit tests.) tr .. truncate From nobody Thu Apr 4 13:41:15 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4V9N7H60pzz5H2cM; Thu, 4 Apr 2024 13:41:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4V9N7H5BvQz4CM4; Thu, 4 Apr 2024 13:41:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712238075; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KIkQF8KPcdOrew22xJ5DCqDEhgIuevHLIWxIUtedsfo=; b=g9QaLdC7RFzO6+xaXRUjThR7wgiXr0a7MxVoUuKSvYOCisLPLFEeZYbSb9Hlq9Bby5T0ij rHS7KT1cShvcjo7PZRssp7Mas9SJGljomBqvFfwz5VkT6XVGur82pa0ZcbGjfbKTMg/GE8 s0l3TpHZhEkyHr/9dsQ/7E0fZHCf9asZ2u7IsC1AHIi0Qmi//Py0wc2W/aVWzIHiQGxSwT GIHIaljj6vpwy14Tt3wqdOCCBA4qVzbHo2aWHRY/hRHUsVTgdI7hIcXZk13I/GyKl5dCBD W1M80Wyj1l6TPiWp9X6Ypi5HO0kCH6cOaJXWF5CXZqwcDTdEzU8lrN5C8EW+cw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712238075; a=rsa-sha256; cv=none; b=YCa+V/y/EPOcwQ8kP1s4cyvqMA7ED0P8JZhGYlPW1vZv6hutmrdcPaRlospTcfiQmEkaG3 R2v3W3BKVQwI5iSMoIr11yDBSlroESEntM+vmoGPkbUCV0k4IhmyzBqEV7iGzZRDrJYp3P Y/EsF7lYtaqapevxLZWEB9e+q2b6KmXOe4QteqpYkYR/pqY9UaROewfnY3Nsj56f6y+kw5 9BpUAsiVeBpXSCehuoPKpgp+2g/WJrBVugVnLGpF8dwAbeOdY9Y3p3xeoQkwelv3W2bh2D YQHVvh72ONjfIeKPE1rLkuNW0WcZ9sopLLCmNNl2FEeNfCFzlvY9txwSJeeTfA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712238075; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KIkQF8KPcdOrew22xJ5DCqDEhgIuevHLIWxIUtedsfo=; b=sMSRXaHmJOrkfCQhKoFa3bFYGkQL9KKUvQ754ZjPvjlOOmnzxqU0/LypD1JHbyB7NYjhbC XHp+2ViRpXgqrVwpv1Ym24pkvc9vBp/thOxoLqYIH/o7k6SulFjE/Lh6LgNHAVO9wokLNZ W4K+tihCBY1Eo/mRQKPfdb6dcXjkrrIBYaTqx+5a/gjwe933w2nGo/rX6aE7oXvgeAqGZn 2Z1bREpJ9OEhFBEY5RplDX2lHc5ZuxgPsMq1dCiBHcXAEFFQlW6Wl8iXEupW+3nbIwQGp9 /Szh9bx40VTJUSJEsWMymyILXacdciMyrVebTjAVuTekkbAvHmApCadyoTW67g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4V9N7H4q5tzJTh; Thu, 4 Apr 2024 13:41:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 434DfFPP077585; Thu, 4 Apr 2024 13:41:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 434DfFZs077582; Thu, 4 Apr 2024 13:41:15 GMT (envelope-from git) Date: Thu, 4 Apr 2024 13:41:15 GMT Message-Id: <202404041341.434DfFZs077582@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: 8311bc5f17de - main - tmpfs: Improve file time tests. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8311bc5f17dec348749f763b82dfe2737bc53cd7 Auto-Submitted: auto-generated The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=8311bc5f17dec348749f763b82dfe2737bc53cd7 commit 8311bc5f17dec348749f763b82dfe2737bc53cd7 Author: Dag-Erling Smørgrav AuthorDate: 2024-04-04 13:40:47 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2024-04-04 13:40:54 +0000 tmpfs: Improve file time tests. * The empty test case no longer fails because 89f1dcb3eb46 causes empty files to bypass the bug. * The bug still exists, so add a test case which exercises it. * While here, tighten up some of the checks. A similar patch has been submitted upstream. PR: 274615 X-MFC-With: 89f1dcb3eb46 Sponsored by: Juniper Networks, Inc. Sponsored by: Klara, Inc. Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D44609 --- contrib/netbsd-tests/fs/tmpfs/t_times.sh | 38 +++++++++++++++++++++++++++----- 1 file changed, 32 insertions(+), 6 deletions(-) diff --git a/contrib/netbsd-tests/fs/tmpfs/t_times.sh b/contrib/netbsd-tests/fs/tmpfs/t_times.sh index f7676814fa71..2d8eb6f67aa0 100755 --- a/contrib/netbsd-tests/fs/tmpfs/t_times.sh +++ b/contrib/netbsd-tests/fs/tmpfs/t_times.sh @@ -36,10 +36,6 @@ empty_head() { atf_set "require.user" "root" } empty_body() { - # Begin FreeBSD - atf_expect_fail "Incorrect atime on FreeBSD: PR274615" - # End FreeBSD - test_mount atf_check -s eq:0 -o empty -e empty touch a @@ -49,13 +45,14 @@ empty_body() { [ ${ost_birthtime} -eq ${ost_mtime} ] || atf_fail "Incorrect mtime" sleep 1 - atf_check -s eq:0 -o ignore -e empty cat a + atf_check -s eq:0 -o empty -e empty cat a eval $(stat -s a) || atf_fail "stat failed" [ ${st_atime} -gt ${ost_atime} ] || atf_fail "Incorrect atime" [ ${st_ctime} -eq ${ost_ctime} ] || atf_fail "Incorrect ctime" [ ${st_mtime} -eq ${ost_mtime} ] || atf_fail "Incorrect mtime" sleep 1 + ost_atime=${st_atime} echo foo >a || atf_fail "Write failed" eval $(stat -s a) || atf_fail "stat failed" [ ${st_atime} -gt ${ost_atime} ] || atf_fail "Incorrect atime" @@ -65,6 +62,34 @@ empty_body() { test_unmount } +atf_test_case holey +holey_head() { + atf_set "descr" "Tests that creating a file consisting entirely" \ + "of a hole and later" \ + "manipulating it updates times correctly" + atf_set "require.user" "root" +} +holey_body() { + atf_expect_fail "https://bugs.freebsd.org/274615" + + test_mount + + atf_check -s eq:0 -o empty -e empty truncate -s 8k a + eval $(stat -s a | sed -e 's|st_|ost_|g') || atf_fail "stat failed" + [ ${ost_birthtime} -eq ${ost_atime} ] || atf_fail "Incorrect atime" + [ ${ost_birthtime} -eq ${ost_ctime} ] || atf_fail "Incorrect ctime" + [ ${ost_birthtime} -eq ${ost_mtime} ] || atf_fail "Incorrect mtime" + + sleep 1 + atf_check -s eq:0 -o ignore -e empty cat a + eval $(stat -s a) || atf_fail "stat failed" + [ ${st_atime} -gt ${ost_atime} ] || atf_fail "Incorrect atime" + [ ${st_ctime} -eq ${ost_ctime} ] || atf_fail "Incorrect ctime" + [ ${st_mtime} -eq ${ost_mtime} ] || atf_fail "Incorrect mtime" + + test_unmount +} + atf_test_case non_empty non_empty_head() { atf_set "descr" "Tests that creating a non-empty file and later" \ @@ -78,7 +103,7 @@ non_empty_body() { eval $(stat -s b | sed -e 's|st_|ost_|g') || atf_fail "stat failed" sleep 1 - atf_check -s eq:0 -o ignore -e empty cat b + atf_check -s eq:0 -o inline:"foo\n" -e empty cat b eval $(stat -s b) || atf_fail "stat failed" [ ${st_atime} -gt ${ost_atime} ] || atf_fail "Incorrect atime" [ ${st_ctime} -eq ${ost_ctime} ] || atf_fail "Incorrect ctime" @@ -139,6 +164,7 @@ atf_init_test_cases() { . $(atf_get_srcdir)/h_funcs.subr atf_add_test_case empty + atf_add_test_case holey atf_add_test_case non_empty atf_add_test_case link atf_add_test_case rename From nobody Thu Apr 4 14:15:09 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4V9NtP4slJz5H4wv; Thu, 4 Apr 2024 14:15: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 4V9NtP49scz4H2Y; Thu, 4 Apr 2024 14:15:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712240109; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=f4ZFC3z0Imb8Yn1BXoAjNi6v7tBE/CPhDv5tvvjLaqU=; b=XY1ATCp62mUaX1NV+a7O4X9lewsffwUx7e5QrRyfLtPoe8wk4yYTGtc6MJTt/gerHDpUxE pE/KFqN0KTjny6wIaxM6UAWa5pkjYADAIW+M8b56VmZhclwEbOIHXr2zX3B7RWoUXvfnKu qe3NrIHOeDdzOytugBkJq6DqQpl3NUYdi7fmLCAQ5ATUpXqthsALluV7gpeMccXaGKlJw1 UdSMahVWPjQJxNWDs5kETadagEZyxSr4lGyKTabXaychoC1gdqrmwG2sve8ZXLRczHtzEX dytzyNccK4pGeN6ouY4o0BSmvrTL/X6PpZSu01JidD8tcUpT0klI9Zml2HHwLQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712240109; a=rsa-sha256; cv=none; b=imRUu95ZTd9IxiZvlQIfDVpApF6Pu3LqRdi7X+KnOfpvdQjeq5KWCE2eYQKkG2EQu6odDo fYgeUTfC9XomN2vB5kZAcBKzjguuvTfoS5/0QDg8JoE5ItcQuNTpqsxFk2KM877+b/vftA wHKwJsd7KgM31tEGcAIZUhCesj66KCdUWhlrEyNEH6wX4xrNvraH0/h+JxRtUePj4ynDUO +mrmqd/M8FaF8NBvmYJGGjz122R0EC/eglxO/n4Q6f667ptvSi/ElHQzVAXFLJZigj3fns ITX996kj+Kkv4fCvV+rN1DqmNEiLlFdDwD7xpOG33jSEmPzot3AjOcTYK3a0Hw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712240109; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=f4ZFC3z0Imb8Yn1BXoAjNi6v7tBE/CPhDv5tvvjLaqU=; b=X4ckeZCUhCJ5CotCbQIuMZR1HO7Ew7F6ug7nS+ilJTFaIbJqQnIDonT3OC5Rd2vmLuzx17 M5LH4rjujv7AKBDgOVYSO35o+L3Iw8SrZDRT1YuLrFatumU+vRsxVg5bMYfBC9b6bG+s+G EZYjJl10QE3fbI0vVTfP6wot8Z4BJAUENQ7vzn04UyG3+F+kWdh4YXfYlo4/KlRzu+J5HJ IUuQUFiS3ER9KUPRY1wFyS8qPA9fhdMwyp/WwkaJIohy0TPM/wuIdSnoUa5GCcZ28N3/gI /ELV4ThzW0L/2UQqZagFtHiS3VzviwPXs/hBzsMjHWCARucS6uhfAKY7LvN4ww== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4V9NtP3n8FzK3n; Thu, 4 Apr 2024 14:15: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 434EF9q1031295; Thu, 4 Apr 2024 14:15:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 434EF9KR031292; Thu, 4 Apr 2024 14:15:09 GMT (envelope-from git) Date: Thu, 4 Apr 2024 14:15:09 GMT Message-Id: <202404041415.434EF9KR031292@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: bee7cf9e97f6 - main - ln: Improve link(1) variant of ln(1). List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bee7cf9e97f6d7bdc918421a93270fa88659808b Auto-Submitted: auto-generated The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=bee7cf9e97f6d7bdc918421a93270fa88659808b commit bee7cf9e97f6d7bdc918421a93270fa88659808b Author: Dag-Erling Smørgrav AuthorDate: 2024-04-04 14:14:50 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2024-04-04 14:14:50 +0000 ln: Improve link(1) variant of ln(1). * Give link(1) its own usage message. * Use getprogname(3) instead of rolling our own. * Verify that the target file does not already exist. * Add tests specific to link(1). MFC after: 3 days Sponsored by: Klara, Inc. Reviewed by: allanjude Differential Revision: https://reviews.freebsd.org/D44635 --- bin/ln/ln.c | 32 +++++++++++++++--------- bin/ln/tests/ln_test.sh | 65 ++++++++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 83 insertions(+), 14 deletions(-) diff --git a/bin/ln/ln.c b/bin/ln/ln.c index 31fe3b35e25e..6300658effa1 100644 --- a/bin/ln/ln.c +++ b/bin/ln/ln.c @@ -55,13 +55,14 @@ static bool wflag; /* Warn if symlink target does not static char linkch; static int linkit(const char *, const char *, bool); +static void link_usage(void) __dead2; static void usage(void) __dead2; int main(int argc, char *argv[]) { struct stat sb; - char *p, *targetdir; + char *targetdir; int ch, exitval; /* @@ -69,17 +70,20 @@ main(int argc, char *argv[]) * "link", for which the functionality provided is greatly * simplified. */ - if ((p = strrchr(argv[0], '/')) == NULL) - p = argv[0]; - else - ++p; - if (strcmp(p, "link") == 0) { + if (strcmp(getprogname(), "link") == 0) { while (getopt(argc, argv, "") != -1) - usage(); + link_usage(); argc -= optind; argv += optind; if (argc != 2) - usage(); + link_usage(); + if (lstat(argv[1], &sb) == 0) + errc(1, EEXIST, "%s", argv[1]); + /* + * We could simply call link(2) here, but linkit() + * performs additional checks and gives better + * diagnostics. + */ exit(linkit(argv[0], argv[1], false)); } @@ -337,12 +341,18 @@ linkit(const char *source, const char *target, bool isdir) return (0); } +static void +link_usage(void) +{ + (void)fprintf(stderr, "usage: link source_file target_file\n"); + exit(1); +} + static void usage(void) { - (void)fprintf(stderr, "%s\n%s\n%s\n", + (void)fprintf(stderr, "%s\n%s\n", "usage: ln [-s [-F] | -L | -P] [-f | -i] [-hnv] source_file [target_file]", - " ln [-s [-F] | -L | -P] [-f | -i] [-hnv] source_file ... target_dir", - " link source_file target_file"); + " ln [-s [-F] | -L | -P] [-f | -i] [-hnv] source_file ... target_dir"); exit(1); } diff --git a/bin/ln/tests/ln_test.sh b/bin/ln/tests/ln_test.sh index 8e5dcf81e61f..82bc556842d8 100644 --- a/bin/ln/tests/ln_test.sh +++ b/bin/ln/tests/ln_test.sh @@ -90,7 +90,7 @@ target_exists_hard_body() { atf_check touch A B atf_check -s exit:1 -e inline:'ln: B: File exists\n' \ - ln A B + ln A B } atf_test_case target_exists_symbolic @@ -103,7 +103,7 @@ target_exists_symbolic_body() { atf_check touch A B atf_check -s exit:1 -e inline:'ln: B: File exists\n' \ - ln -s A B + ln -s A B } atf_test_case shf_flag_dir @@ -210,10 +210,65 @@ sw_flag_head() sw_flag_body() { atf_check -s exit:0 -e inline:'ln: warning: A: No such file or directory\n' \ - ln -sw A B + ln -sw A B atf_check_symlink_to A B } +atf_test_case link_argc +link_argc_head() { + atf_set "descr" "Verify that link(1) requires exactly two arguments" +} +link_argc_body() { + atf_check -s exit:1 -e match:"usage: link" \ + link foo + atf_check -s exit:1 -e match:"No such file" \ + link foo bar + atf_check -s exit:1 -e match:"No such file" \ + link -- foo bar + atf_check -s exit:1 -e match:"usage: link" \ + link foo bar baz +} + +atf_test_case link_basic +link_basic_head() { + atf_set "descr" "Verify that link(1) creates a link" +} +link_basic_body() { + touch foo + atf_check link foo bar + atf_check_same_file foo bar + rm bar + ln -s foo bar + atf_check link bar baz + atf_check_same_file foo baz +} + +atf_test_case link_eexist +link_eexist_head() { + atf_set "descr" "Verify that link(1) fails if the target exists" +} +link_eexist_body() { + touch foo bar + atf_check -s exit:1 -e match:"bar.*exists" \ + link foo bar + ln -s non-existent baz + atf_check -s exit:1 -e match:"baz.*exists" \ + link foo baz +} + +atf_test_case link_eisdir +link_eisdir_head() { + atf_set "descr" "Verify that link(1) fails if the source is a directory" +} +link_eisdir_body() { + mkdir foo + atf_check -s exit:1 -e match:"foo.*directory" \ + link foo bar + ln -s foo bar + atf_check -s exit:1 -e match:"bar.*directory" \ + link bar baz +} + atf_init_test_cases() { atf_add_test_case L_flag @@ -229,4 +284,8 @@ atf_init_test_cases() atf_add_test_case s_flag atf_add_test_case s_flag_broken atf_add_test_case sw_flag + atf_add_test_case link_argc + atf_add_test_case link_basic + atf_add_test_case link_eexist + atf_add_test_case link_eisdir } From nobody Thu Apr 4 14:58:53 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4V9Prs41QNz5H8QF; Thu, 4 Apr 2024 14:58:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4V9Prs3VJXz4LxM; Thu, 4 Apr 2024 14:58:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712242733; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/MQGjVcPvHNLaC8BuZ/GKqn5EoALt3G7cMDKEwMv0wc=; b=ZabNohb1Ov7Qpl94i2LkES1qCgvVL+TuRQa8Ggm8p1CxpmvMtt2krVwMkcY50smlKnikst EDHJzshSKw5EZwH9dxmP63m+fecA2lUG8uJYr48s5FuuExPXESKQ0hn/jn6BgB4+ru6x/w 74wBehmlxp83cpfMt1GDcvy36b+zbbz1cqDX4cMabOMVp7XEPrV/sXm4uFOz2g2DY6Qz8i 8rTUIWJb5E1WNkRw6Zw1upKUdzIxDMp9lyWdRyiPUaFphxWhsT/r4XHQ7SmQNcCIyYtHMN J7qyG0jTyxiI7Ywx6WeojHboWS70McGprz6XX3HGDXTSN91S1S7mZ5v1j6UJKg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712242733; a=rsa-sha256; cv=none; b=j3Pizi3H7260+FttOM4q53qH86jrngKL8L72kjet8+RhjBvG6h8b9CvgBFGcYYfnCyMh5Z uiAXZmW89llhj3NiT71pYwUMGmT32Jj7bcvxxpfqlwqYntXQIpBOBgzZ0DmWX3mfBynz2Z 0cg1mGpf7NPiySAg4Xo31LmXzELsSRZ5NqygKVntj/Felpr3HNdGhQVFLp+meH9NYVb+A0 +e6WU+9uvkNyQO8JQ5kNmVBfSODZP8SVYbkkNw4RY06GZAhx5mJoF6jUYaVd6s3CKiL0qP h2oI+P2mPicirs1DmoeDltOattyCK4MAZtbin6PD3QVrogBt7zPJlepvIt7GRg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712242733; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/MQGjVcPvHNLaC8BuZ/GKqn5EoALt3G7cMDKEwMv0wc=; b=koaIOnBBxSt2LlsVIdcKvRYWMLY71uxsYHJta3r5gtOW/bzORgtdJ/VnnBvCEu0PiFRgLG lLi3VSEoWnE6vLTwClu2PVQJwFMhESEvhoMbfgegdVzTuTISu+nHcvE+fbJgXnhhMZgkgA ldSg008MW9TTPN1NLQmK/Wp7kb5Al5qPW/MsNM72FwCozb3rc0OZMk8LxaDVzG6TSZMdxR CCXSdD0R0YUh5cC/8jITn9vyhZwQO3JYm1p6QrYJXnnS7AilgO/PVSp4ytsTvgYEHou3YD uNIMKwCQlbOuf52/2hgu43wQKkJm72rtfJ6lUojCuYmYS6rVamxFAUL4F1Qz+w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4V9Prs34PJzLCd; Thu, 4 Apr 2024 14:58:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 434EwrQv098756; Thu, 4 Apr 2024 14:58:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 434EwrLx098753; Thu, 4 Apr 2024 14:58:53 GMT (envelope-from git) Date: Thu, 4 Apr 2024 14:58:53 GMT Message-Id: <202404041458.434EwrLx098753@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 91eca1855155 - main - tarfs: Inherit mnt_iosize_max from the lower vnode List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 91eca18551554b7aca80fcfd3c648f524b321252 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=91eca18551554b7aca80fcfd3c648f524b321252 commit 91eca18551554b7aca80fcfd3c648f524b321252 Author: Mark Johnston AuthorDate: 2024-04-04 14:54:06 +0000 Commit: Mark Johnston CommitDate: 2024-04-04 14:54:06 +0000 tarfs: Inherit mnt_iosize_max from the lower vnode There is no obvious reason to use a value smaller than that. Reviewed by: des, kib MFC after: 1 week Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D44627 --- sys/fs/tarfs/tarfs_vfsops.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/fs/tarfs/tarfs_vfsops.c b/sys/fs/tarfs/tarfs_vfsops.c index 365234113168..a534b18ebf34 100644 --- a/sys/fs/tarfs/tarfs_vfsops.c +++ b/sys/fs/tarfs/tarfs_vfsops.c @@ -881,6 +881,8 @@ tarfs_alloc_mount(struct mount *mp, struct vnode *vp, VOP_UNLOCK(vp); mtime = va.va_mtime.tv_sec; + mp->mnt_iosize_max = vp->v_mount->mnt_iosize_max; + /* Allocate and initialize tarfs mount structure */ tmp = malloc(sizeof(*tmp), M_TARFSMNT, M_WAITOK | M_ZERO); TARFS_DPF(ALLOC, "%s: Allocated mount structure\n", __func__); From nobody Thu Apr 4 14:58:54 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4V9Prt5xFMz5H7xn; Thu, 4 Apr 2024 14:58:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4V9Prt4xrJz4M3N; Thu, 4 Apr 2024 14:58:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712242734; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sVo7d5w0L+AueeJZdscVR6uGii0KqjV5r5V/JwRTOps=; b=oInbttIUnh4bTRX76SsrCjm36rs1b5TKq1p20Wbe8FU2dNzKpT3hOyrryiH2+aGzZDLet7 cMxd7AJi/H4vYbUnyiUnlu/Jl/qTMidFsl3IEG/8WsuIgzJ/TekkC983pS2jIbEWrTY/qF eQyNszJEfbxURl3Kd8MkA8fgrac/q5HoZN1wLXyqeH/FUwVJE90RJrhX1k8HcAxL7Cl7y2 76eDUnRYAxAD3VEbIfdVaTpOPHuIdDPdAtVOfgL52/XqE96pzIjAHftjkQH54DVbLR8ZAx aTtTegxmVZL1Z39UB7uPchNoufJsCgCMs3OR9/7AeQCGwLpJOAskmWKeH9QhUQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712242734; a=rsa-sha256; cv=none; b=KVhC/GdbJ4tMvjQWVqfPs1FyHD7zia/d5GryDgT+VlLPgKT973nPgwpMTedvrYGtOnIoOX LvrugUZJRM0yqeenGO0t8axoSnbGsiChgvSyAKE1qas2W3DUHIYNPeSmThDir87LNKrmtP KeGukvHOQ0YMV131ANIQKrqzZ7Txw7XkTxuwpMEj3U1lDh7PlgcpOUsdUuWP/X41PdjaAR OcFmlqP0hlWOpP61DRGypcdLrtVdAx2FDCqk/arfz1l52TCvxxl1i/N0+OKOiKyFbr00oH pP1XDAbLPtH2EU7NDIk5T5yQ6Lm2V7IVgkHdqwkCQLOroXbpgVZqXtMlGZdydw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712242734; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sVo7d5w0L+AueeJZdscVR6uGii0KqjV5r5V/JwRTOps=; b=mDvjfPHv4MxQWqNd0PjRhPLIOSRMX6cUzVaz9YGYnVzneDMT5qot/amwPCsPgJcdpm9kc/ YPdtreveYCCyWZ49LvgnvJ7ghif7LfYbN+Dg1/cB5yjVj02YVGGwOZppHR+m4j0I4fECqj yN0u3nywJHLKLK6zPYz6tqfhAOJA49go1MnDHQXsKZbZpe/6D4/NoqZLmqwETCNwrPEufa n1iq7753y1yUb50npLzYeYuCfm6MN/MJv19zvWyfJw5ieW2gkgrWObIuNB9KyFaiOYkK9w sr9vRV3KOkGKMco4BoHSrm4ifuYa0FtbqUGiZlfWAE9g1mR/Wut/uNh+TmCQbA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4V9Prt4NQ7zLh7; Thu, 4 Apr 2024 14:58:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 434EwsXD098806; Thu, 4 Apr 2024 14:58:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 434Ews9U098803; Thu, 4 Apr 2024 14:58:54 GMT (envelope-from git) Date: Thu, 4 Apr 2024 14:58:54 GMT Message-Id: <202404041458.434Ews9U098803@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: d1801babad49 - main - tarfs.5: Document the importance of zstd framing List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d1801babad495be2a3eb1d974e1daf9714c5b0fd Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=d1801babad495be2a3eb1d974e1daf9714c5b0fd commit d1801babad495be2a3eb1d974e1daf9714c5b0fd Author: Mark Johnston AuthorDate: 2024-04-04 14:54:25 +0000 Commit: Mark Johnston CommitDate: 2024-04-04 14:54:25 +0000 tarfs.5: Document the importance of zstd framing Reviewed by: des, kib MFC after: 1 week Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D44628 --- share/man/man5/tarfs.5 | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/share/man/man5/tarfs.5 b/share/man/man5/tarfs.5 index 29999b8066f7..5378491b9c9f 100644 --- a/share/man/man5/tarfs.5 +++ b/share/man/man5/tarfs.5 @@ -61,6 +61,19 @@ sysctl setting and tunable. Setting it to 0 will reset it to its default value. Note that changes to this setting only apply to filesystems mounted after the change. +.Pp +When the backing tar file is compressed with +.Xr zstd 1 , +I/O performance can be improved by ensuring that compressed data is +broken up into multiple frames. +This helps minimize unnecessary decompression work. +When using +.Xr bsdtar 1 +to create the tar file, this can be achieved using the +.Cm zstd:max-frame-size +and +.Cm ztsd:frame-per-file +options. .Sh DIAGNOSTICS If enabled by the .Dv TARFS_DEBUG From nobody Thu Apr 4 20:19:57 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4V9XzK41gbz5FxMg; Thu, 4 Apr 2024 20:19:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4V9XzK3Vk8z45NY; Thu, 4 Apr 2024 20:19:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712261997; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kjghGCxdL/vPwMmi7ciVWhZLV1lws7JjdAsO/a8wvmE=; b=cFqUaeqPWhV/9qy20XSRgxdJBsgF6VKSl3Llgp/VWSiSfQ1z2psyRVgfz00QDy47GetZEk uC9dbliNYgvodbj7HB/ao/dXRRudY3Srv9E1pfivtPacE62u6XrUoU9gm2OPDStYI0NXgk UC43aw6xC9mAzGEiUkTkSOPcCBEgA1clqtF2bu2q8jA1PTsD/sY8OaSzz8Vzl2+x9Gj8vm elpHx5/WuCV+vuJaGZYK7Q1v2pHSKjzoi0VHgf2y5pBCQ8rf8M7kcJfoWuGIM5y49sX76N R4D+7bWD5/zXjng11EnfrZK2aXcauiKffotpNEgY3+TieJrJsIsyeLcaf9R9Wg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712261997; a=rsa-sha256; cv=none; b=p31WtVkopGPskE83xruuZ0A9j+hR5RU1XZU4o36fX1sLSSRknGACCn25EUSGdAWsN2xaSm q/FfiComErXpqo1tpaBaPLkkvM7+6hj7WSF6zeIR1MWxfmwYoOdGCEX38gqT18SBrCf/2o A0V62Ax+85sUkhumDVR0SpKKvX4gMXBi44dev09e1EHReCT3EFL597W7WlnqOINCPkKH8+ A9jBqKAmFQ3YEgr/PHS9icaBKsUHKw6UDeYqCaOqMu7KlO5Jys183V/OyzV+PlI0vpTTRR lv+QPEvQoilgfM3Ezz00zbF1ttn95f+qePfIIx43ruzZYHInZTLDMHcIH/O8PQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712261997; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kjghGCxdL/vPwMmi7ciVWhZLV1lws7JjdAsO/a8wvmE=; b=u8uWetdSO/oSdv6z95irwPLfn3yfEmIQK9FaF6DiP5/tShWkDPBGQPWYryx8ny7g4HSPKZ nLcr995a2+NXj94UB2ibg/rF+5IOalSf4nfKe6FwpQkva0lICv8TOlwf/qk09dKEU+4QNN FsO4oh1l6Ch5x2Ug3nYPp89GCwL1NngOcxD/QMeJACpZdYGGs2xPJ6dBybBTzVNrQV9nhp xmdjVCBzXHy/J/cSwFYpfHQRuKLB8Fov09p0WGqUwtYdR0PiQcE1zxD9kttMFQPmUAIXTP LVmqzwqbWRMxTqMQUt3afzlDj3ejTjxJiKOVrL2L07ng/HAQr8vqlTFDrChbbw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4V9XzK35LZzWTG; Thu, 4 Apr 2024 20:19: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 434KJvGA044147; Thu, 4 Apr 2024 20:19:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 434KJve8044144; Thu, 4 Apr 2024 20:19:57 GMT (envelope-from git) Date: Thu, 4 Apr 2024 20:19:57 GMT Message-Id: <202404042019.434KJve8044144@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alan Somers Subject: git: c1326c01df81 - main - fusefs: correct a comment List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: asomers X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c1326c01df81dd06739ddf1946e1968ddaba0c8e Auto-Submitted: auto-generated The branch main has been updated by asomers: URL: https://cgit.FreeBSD.org/src/commit/?id=c1326c01df81dd06739ddf1946e1968ddaba0c8e commit c1326c01df81dd06739ddf1946e1968ddaba0c8e Author: Alan Somers AuthorDate: 2024-04-04 20:18:56 +0000 Commit: Alan Somers CommitDate: 2024-04-04 20:18:56 +0000 fusefs: correct a comment [skip ci] MFC after: 1 week Sponsored by: Axcient --- sys/fs/fuse/fuse_node.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/sys/fs/fuse/fuse_node.c b/sys/fs/fuse/fuse_node.c index 13c2b59c7c97..777519450954 100644 --- a/sys/fs/fuse/fuse_node.c +++ b/sys/fs/fuse/fuse_node.c @@ -112,14 +112,15 @@ SYSCTL_COUNTER_U64(_vfs_fusefs_stats, OID_AUTO, node_count, CTLFLAG_RD, int fuse_data_cache_mode = FUSE_CACHE_WT; /* - * DEPRECATED - * This sysctl is no longer needed as of fuse protocol 7.23. Individual + * OBSOLETE + * This sysctl is no longer needed as of fuse protocol 7.23. Now, individual * servers can select the cache behavior they need for each mountpoint: * - writethrough: the default * - writeback: set FUSE_WRITEBACK_CACHE in fuse_init_out.flags * - uncached: set FOPEN_DIRECT_IO for every file - * The sysctl is retained primarily for use by jails supporting older FUSE - * protocols. It may be removed entirely once FreeBSD 11.3 and 12.0 are EOL. + * The sysctl is retained primarily due to the enduring popularity of libfuse2, + * which is frozen at protocol version 7.19. As of 4-April-2024, 90% of + * FreeBSD ports that use libfuse still bind to libfuse2. */ SYSCTL_PROC(_vfs_fusefs, OID_AUTO, data_cache_mode, CTLTYPE_INT | CTLFLAG_MPSAFE | CTLFLAG_RW, From nobody Thu Apr 4 21:16:47 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4V9ZDw0GSjz5G3gr; Thu, 4 Apr 2024 21:16:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4V9ZDv6VTvz4Jwl; Thu, 4 Apr 2024 21:16:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712265407; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=A9oPEgOoSfLxsqKmuuiEyJnJ539pHj2htX4nmk1JjVo=; b=fF2U1Gao7cuqCKT4lZzGRxNL2xWL5I4oT6DJbaS0D9jbjluatgoODrgT6nfCaJX8QDxb3j es6f7Rr1TLxs1AnUdyGtX8cCgUKsNJ+PQChcYLQ67nE0ljDhHIg/m9gfBnFFMFAec+380a yOI7xycyp+i5VSFBYu/hvzaWnR6DV4xzRNZJMBW6w9JxbmsJ+a4hYpKfd2ODqH5bNObnwp W3yCgTgMZfHgDX/uTT4fU4u8V/wlNl1thLjBkWy4tGNCpm6lP1ZnNjPstF+d94vs56pJvr aCSgiYC9ymZFAwPbcJ63PwMU4pVdrF01m12HB6PCj+flOeBlvpIoTX4ieP7bVw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712265407; a=rsa-sha256; cv=none; b=gqLet0gkKPii21FXyLOIbKfcsznfSpKmluz3h/uaCYMLeIWeT0lWZfE9+nYMyQFOJ+OmWn 8barhLh6jB1j9Jeo+d38FBkjSn5pwm+I8pR4s/hgEbS6al8t9rMMFEb/oHTq45O6jGC4oE VYtuWkFDmdVi0KCGsU7D+EIMYGaTPg4EdpqJLKhNWAwsUwAm6+2yrP1lV+Q19PvtSvx3AT 7EOWzISzQpoGnnxZsh58Py0NYyKhM9f7K1xCpc/Gde0uDN87R6OKZ9kVX04AmAMDh2UIdm 3tRWUy4CGAmdG5VXIbBJ3Ae4Ma2C41WQTXVOAiw1QXEIjg4FQJov9vFiQXvoQw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712265407; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=A9oPEgOoSfLxsqKmuuiEyJnJ539pHj2htX4nmk1JjVo=; b=uxIHm6ilrY9VDyO6W35xQExWAb4tKSjeIKzhuJwfYBXgmWhjURCnHeNwChgTkHQwMWVmDf HB9plFEaYAtyXkDMDPm2eDaxEsgXPTaH75cg8b00qeffzRhBiixJFq6T4JMI+9z3RPjQrS JfcptK/kqX/sqvcGoMge9YXk1blmy4ut7Acd3vLhrjKCT519pcuas/9x/xqQ50IBTqFxQk kp36zBgpu0BteaNPj7eKmRWhE8VNgnLhEfnkn4RWvP0m/Rru7quta6jqUFqE6KFx/To8gr VGYNc8KH91asnEjatwLVwY6JbwO5J7xYsX56Ae9QX/DIW4Igc95gMIIUaEJfRQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4V9ZDv5npnzY67; Thu, 4 Apr 2024 21:16: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 434LGl8B045558; Thu, 4 Apr 2024 21:16:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 434LGltV045555; Thu, 4 Apr 2024 21:16:47 GMT (envelope-from git) Date: Thu, 4 Apr 2024 21:16:47 GMT Message-Id: <202404042116.434LGltV045555@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 08f3d5b60cdf - main - copy_file_range: Call vn_rdwr() at least once List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 08f3d5b60cdfff434e391d96cdffc5a90c550b07 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=08f3d5b60cdfff434e391d96cdffc5a90c550b07 commit 08f3d5b60cdfff434e391d96cdffc5a90c550b07 Author: Mark Johnston AuthorDate: 2024-04-04 15:18:03 +0000 Commit: Mark Johnston CommitDate: 2024-04-04 21:03:07 +0000 copy_file_range: Call vn_rdwr() at least once This ensures that we invoke VOP_READ on the input file even if it's empty, which in turn helps ensure that filesystems update the atime of the file. PR: 274615 Reviewed by: olce, rmacklem, kib MFC after: 1 month Differential Revision: https://reviews.freebsd.org/D43524 --- sys/kern/vfs_vnops.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/sys/kern/vfs_vnops.c b/sys/kern/vfs_vnops.c index d79707555ac1..0e864f959e36 100644 --- a/sys/kern/vfs_vnops.c +++ b/sys/kern/vfs_vnops.c @@ -3339,7 +3339,7 @@ vn_generic_copy_file_range(struct vnode *invp, off_t *inoffp, off_t startoff, endoff, xfer, xfer2; u_long blksize; int error, interrupted; - bool cantseek, readzeros, eof, lastblock, holetoeof, sparse; + bool cantseek, readzeros, eof, first, lastblock, holetoeof, sparse; ssize_t aresid, r = 0; size_t copylen, len, savlen; off_t outsize; @@ -3480,6 +3480,7 @@ vn_generic_copy_file_range(struct vnode *invp, off_t *inoffp, endts.tv_sec++; } else timespecclear(&endts); + first = true; holetoeof = eof = false; while (len > 0 && error == 0 && !eof && interrupted == 0) { endoff = 0; /* To shut up compilers. */ @@ -3581,10 +3582,17 @@ vn_generic_copy_file_range(struct vnode *invp, off_t *inoffp, */ xfer -= (*inoffp % blksize); } - /* Loop copying the data block. */ - while (copylen > 0 && error == 0 && !eof && interrupted == 0) { + + /* + * Loop copying the data block. If this was our first attempt + * to copy anything, allow a zero-length block so that the VOPs + * get a chance to update metadata, specifically the atime. + */ + while (error == 0 && ((copylen > 0 && !eof) || first) && + interrupted == 0) { if (copylen < xfer) xfer = copylen; + first = false; error = vn_lock(invp, LK_SHARED); if (error != 0) goto out; @@ -3594,7 +3602,7 @@ vn_generic_copy_file_range(struct vnode *invp, off_t *inoffp, curthread); VOP_UNLOCK(invp); lastblock = false; - if (error == 0 && aresid > 0) { + if (error == 0 && (xfer == 0 || aresid > 0)) { /* Stop the copy at EOF on the input file. */ xfer -= aresid; eof = true; From nobody Thu Apr 4 21:16:48 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4V9ZDx1wtXz5G3gv; Thu, 4 Apr 2024 21:16:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4V9ZDx04FTz4K0L; Thu, 4 Apr 2024 21:16:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712265409; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TE0Z/7l7z+wkk6+eTTwtOYhvwUkPu0FGnHQ3K0dh60Y=; b=ZpFmJRWo/nfwhoM2MKQKBmX3sE56zLyprluZqHk8Nt1gLReQQqe2K0PG72aqWGUGei4qbn d4sNMdxApzZRLZlFSRpBEmoWByFFZ3CF0jV3jIzpVTQgTHImy6GcXEMHzJUsP5VOJdFYCW db+HKnxh6JqTQYgH36L2sR4+gNCv+jOdFajxFnhTl3qiSOk5mOasL8xXBjnyVsndV94Eun abYhhM8/b+h28Tedqf6KzXkw+M3kY3gTrHocOnKMXnPFkj+UZ3OrFwHzo594/AptbWGRUE SfeIZDEuj28STU2yWQy7eXWWbiMfsltZlts7ApIXt/emqtrKcnYywCJj724xrQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712265409; a=rsa-sha256; cv=none; b=yboEShOCcbqeJ6ebwp8xZ3ugu3KZ1pbl7pTSQc18P5ueFP4ocXdUv9UziAPwtXj2nLfGzs Yb7Q4H5esLCVZUMpCdZprVpBMkwhvHeSnL9OzEWaPYRpWAw+X4v7RPAyWRHaSSYFEhpUXU JVxA423daHgAsxqzaPbpvZ9RCrSfGUl5LTIPMO9coyBpQ89Qhs7G4LwyijCB9Cumynz6zY 1RoOPBjcKuNThpNayElEL/UleBw56B3XB7MTuesh6zXmAyPb5t3xOUrBc1N94mVEUAinu9 bo8AW9/5MdmS9apYirumSA//dnKGg/a6l5ngNOonugCV+XzT4v5VnKP5hAXziA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712265409; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TE0Z/7l7z+wkk6+eTTwtOYhvwUkPu0FGnHQ3K0dh60Y=; b=pbLPvnrhOCoHUzPzEz51fk0hVmAB2NUX8ITB7KuPcLyCNSQW5DzjKXJA5GMRluNxFmmfMp p0Yh9R6WDD7dZM2LtM5wx+kn3+wuGQC0UltMtYwc9aBOoC9x1Auj756Z+CPmaNOU6G4Jmw 31e74jXmALzLlt4TSzL5+OfQLwjC8S4DfZWlbs14Vo8zInzQads/0CusNdX+gEJe5mPyH+ wWKwN/lzXgUjFJeaUyXUgB2iS4yVcROOge4jtjENEdmWmb4W43pJmG5bwjjsLpTpNePSnj rr4T3blInhgXIZlA4+3GyAvycWxeJ7LUWQBjLh7pYU6XwEO5/JKgqlbZ2+sc0w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4V9ZDw6pMzzY68; Thu, 4 Apr 2024 21:16:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 434LGmNa045604; Thu, 4 Apr 2024 21:16:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 434LGm76045601; Thu, 4 Apr 2024 21:16:48 GMT (envelope-from git) Date: Thu, 4 Apr 2024 21:16:48 GMT Message-Id: <202404042116.434LGm76045601@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 8eb21b4ff008 - main - tmpfs tests: Remove an xfail annotation List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8eb21b4ff0082a707517f805cf14616f91d9218e Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=8eb21b4ff0082a707517f805cf14616f91d9218e commit 8eb21b4ff0082a707517f805cf14616f91d9218e Author: Mark Johnston AuthorDate: 2024-04-04 21:04:30 +0000 Commit: Mark Johnston CommitDate: 2024-04-04 21:04:30 +0000 tmpfs tests: Remove an xfail annotation This test passes after commit 08f3d5b60cdf ("copy_file_range: Call vn_rdwr() at least once"). PR: 274615 MFC after: 1 month --- contrib/netbsd-tests/fs/tmpfs/t_times.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/contrib/netbsd-tests/fs/tmpfs/t_times.sh b/contrib/netbsd-tests/fs/tmpfs/t_times.sh index 2d8eb6f67aa0..7b3be8d98d03 100755 --- a/contrib/netbsd-tests/fs/tmpfs/t_times.sh +++ b/contrib/netbsd-tests/fs/tmpfs/t_times.sh @@ -70,8 +70,6 @@ holey_head() { atf_set "require.user" "root" } holey_body() { - atf_expect_fail "https://bugs.freebsd.org/274615" - test_mount atf_check -s eq:0 -o empty -e empty truncate -s 8k a From nobody Thu Apr 4 23:06:25 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4V9cgQ24PYz5GFGH; Thu, 4 Apr 2024 23:06: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 4V9cgQ1VD0z4XVN; Thu, 4 Apr 2024 23:06:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712271986; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=81PhBpsYYw2QgfP/6QhBXTgiXJIfldE0QmsoIxsBNjA=; b=G2lM8vL82cL6J18KfY0tfQaLjIiGi7JnDORUfNpKBc1dPTfBefetisagzFc0iM6YK0ofPb sCwp2oc2pdjsWJvOf6N54f2NSv9Z/BUPvX8PXIzBtwh3T264TOdwo8/49LZs6ophjC7a54 YUSXSb+Mgakzq2+v1cwQfBBwjESI1tWCD7SppLyeEpM6zaLx3oczz7AIKSMsAYW2zt9sYl zJKbhklF8Fm8mNxqtY2kbXL38uAPTES51eHBYm/nGf7/oDDfAlcm3kYCbhFy8qY+6e6AaR 9+56ilPDrKCADzZn1kOx7/fXB4xJoCfRvMdAaEL7o6Q1pfWMi/sD0Sfh4nY/UA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712271986; a=rsa-sha256; cv=none; b=YR0fYE02zmHDO4vtcjUksRCNwKTO8fzclPR1j9nzTfeMC4BfRKIJgIiICkHuniFC3COINA PT/YcD+XlpjoytI6mQEO6ZlOstVhHRYUyPb5NDCyUFo5WLTTneyqpehVc7q9Jy1zcr/b5a 84IKoENFzd863qq1bjApfRtkHM8YZ9AzXHPTZ/6ni7s65dzEDZr3LXHRKUbY+1tIUyJHz7 Y2ENNdZOQsuAhMrFfZiHZa0W0hO36g2AATj5VxUB1HorKOBdEWgYmj5yQ5fe3olz/S3wHQ GTiDCn6ru5AY5clgJCGJcEn4bdNCD6/2c2RIr8Far5g0MsIi8r8vFCyX/An4Vw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712271986; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=81PhBpsYYw2QgfP/6QhBXTgiXJIfldE0QmsoIxsBNjA=; b=BPtx3RNO559XOQ3ZD0FpjqwdkjBEn5yU3dad54F3BOQ7gpMpljW2XWqxMdyMApXo2D1rx7 6lBF0db96vWwYOFA3ZTEXWez8O8yyt2PSnVQXO6tmSa9f54TVVaaZCq2iMfiCQIJJFURDr gCdpGWLykn1DTCkxo/wCLAKDa3Amtegx9kq383vj/4Nz0L3mMXvA5t8vdKp7nsBPCY08Ot T9JiKGLRzQcXU0iOtgurxMnoKBj4iM8ahdHN9aIKUunJhtLMNqhETC9Mayy8VL1S1YM7pJ Ah2++p+Mc3cXdzbLcLOLH9ONvjwZUksfD+lQigi8TEIMxcwkFXy3LVY+bXI8kA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4V9cgQ0wVPzc05; Thu, 4 Apr 2024 23:06: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 434N6PZ1031877; Thu, 4 Apr 2024 23:06:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 434N6PMh031874; Thu, 4 Apr 2024 23:06:25 GMT (envelope-from git) Date: Thu, 4 Apr 2024 23:06:25 GMT Message-Id: <202404042306.434N6PMh031874@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Justin Hibbits Subject: git: fcace5ab088e - main - powerpc/booke: Reserve KVA for minidump working area List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhibbits X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fcace5ab088edfc5b74e0cd9e731639bf07a9437 Auto-Submitted: auto-generated The branch main has been updated by jhibbits: URL: https://cgit.FreeBSD.org/src/commit/?id=fcace5ab088edfc5b74e0cd9e731639bf07a9437 commit fcace5ab088edfc5b74e0cd9e731639bf07a9437 Author: Justin Hibbits AuthorDate: 2024-04-04 22:23:39 +0000 Commit: Justin Hibbits CommitDate: 2024-04-04 23:03:27 +0000 powerpc/booke: Reserve KVA for minidump working area This was already handled for the AIM64 pmaps, so add the same to Book-E64 pmap. --- sys/powerpc/booke/pmap.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/sys/powerpc/booke/pmap.c b/sys/powerpc/booke/pmap.c index 7982876b5594..69edb58ae235 100644 --- a/sys/powerpc/booke/pmap.c +++ b/sys/powerpc/booke/pmap.c @@ -749,6 +749,11 @@ mmu_booke_bootstrap(vm_offset_t start, vm_offset_t kernelend) debugf("ptbl_buf_pool_vabase = 0x%"PRI0ptrX" end = 0x%"PRI0ptrX"\n", ptbl_buf_pool_vabase, virtual_avail); #endif +#ifdef __powerpc64__ + /* Allocate KVA space for crashdumpmap. */ + crashdumpmap = (caddr_t)virtual_avail; + virtual_avail += MAXDUMPPGS * PAGE_SIZE; +#endif /* Calculate corresponding physical addresses for the kernel region. */ phys_kernelend = kernload + kernsize; From nobody Fri Apr 5 06:40:24 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4V9plF1KLyz5FmW5; Fri, 5 Apr 2024 06:40:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4V9plD6B6mz4MQ2; Fri, 5 Apr 2024 06:40:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712299224; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/fvJN86k5pK51+f6vQiDzo/5lilEkcZh3QIUSbX/Fxc=; b=A3gSSs9g4IcWuQU7BQh5FZT0vhaN9I/ymA+mRmlqF57KWGhL8oSyrxO0ZrccyDZgRkQbBT o7KBmGDquRp9zq0CV0tD2LPL1EBzx1sNJMfS3CyFmMxAiEzUhCJl24lWCVNMbzeHkZTlnN SA75q1UTqSlfPoGbRff8zDQDndAublIjklgynQ6GtoppO40HIE2yVAR24xEuez9EU7eKLN P4nmSqeiUkMM08te3ITKxpWhE/qQycEjm5HuuTrntCYZWRxFSVDU+wNbE4lG46uirlH8ph M6hdpickrWsogjsBRgx0XbHJAb6kjMgwfGlikeEcLKabRaPgTXmtAaS0MWgwAw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712299224; a=rsa-sha256; cv=none; b=SXDfj0wUV76rFzo42bOc4ye32LvmLmPUacyFr4yUDX81UMAx25tg246f9mt5R85u9IGpat Hpzt293oY4Wag2b9U2IAjYf67eE1NCtj5fUap02TPde45w/mJav3B9yfRqrChjRqhiFWoW eCn1ZS7YxsttrJh3lSNur4F8t/cYXV4zqeECg5yxOI+M2hC8Y2gImuys15Lchwrh8XGpP0 ZEe36PlxlOO2mrvogktKiaCzOP3YgMO6kjKsbZIPWd/lse+Ou66mAPjlOA+qvmhZd3KdMi W2aKjrFUEaAAxpUNI5sqVghL3W/2+NXiMtm8KpmL5pN3fLRCc7NkypTFdwUvdg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712299224; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/fvJN86k5pK51+f6vQiDzo/5lilEkcZh3QIUSbX/Fxc=; b=O2tH2/9fQDOYnVPKrdJwz2LjbVCYZxaAYfvrTR9fTrOKmCAeoLFtY1G6I29ya5UGvYx80p Gm+FjblZwXDgYVhSJOhlC4c58GWyfAyd6H8SR6kHV369gMB07eoyNZB83wDs/x82kqsf72 8y1vnFVrVRa4+CER49QdPUaAhfN1D0vwxgzCvNCqGcNISyODmJ++/s4nNo2ydR/sUGIPaT +mhergZ+So67vn5TDJVsTl0ggSkAzvt2joLVJng9CubTtByjrpaiCjqxyYP9LKm3qb+l1F 86H/68R+HrF16gl5eXFMbCNTkj6xlW4j0xtefkfNRmXCKQpKKEEyhS6AQeE9ug== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4V9plD5fqkzq6g; Fri, 5 Apr 2024 06:40: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 4356eO2e006111; Fri, 5 Apr 2024 06:40:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4356eOR1006108; Fri, 5 Apr 2024 06:40:24 GMT (envelope-from git) Date: Fri, 5 Apr 2024 06:40:24 GMT Message-Id: <202404050640.4356eOR1006108@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Xin LI Subject: git: 2f9cd13d6c18 - main - Revert "MFV: xz 5.6.0" List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: delphij X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2f9cd13d6c1824633251fb4267c9752d3b044a45 Auto-Submitted: auto-generated The branch main has been updated by delphij: URL: https://cgit.FreeBSD.org/src/commit/?id=2f9cd13d6c1824633251fb4267c9752d3b044a45 commit 2f9cd13d6c1824633251fb4267c9752d3b044a45 Author: Xin LI AuthorDate: 2024-04-05 06:39:23 +0000 Commit: Xin LI CommitDate: 2024-04-05 06:39:23 +0000 Revert "MFV: xz 5.6.0" This commit reverts 8db56defa766eacdbaf89a37f25b11a57fd9787a, rolling back the vendor import of xz 5.6.0 and restoring the package to version 5.4.5. The revert was not directly due to the attack (CVE-2024-3094): our import process have removed the test cases and build scripts that would have enabled the attack. However, reverting would help to reduce potential confusion and false positives from security scanners that assess risk based solely on version numbers. Another commit will follow to restore binary compatibility with the liblzma 5.6.0 library by making the previously private symbol (lzma_mt_block_size) public. PR: 278127 MFC after: 3 days --- contrib/xz/AUTHORS | 40 +- contrib/xz/COPYING | 116 +- contrib/xz/COPYING.0BSD | 11 - contrib/xz/COPYING.CC-BY-SA-4.0 | 427 - contrib/xz/ChangeLog | 16270 +++++++++++-------- contrib/xz/README | 43 +- contrib/xz/THANKS | 7 - contrib/xz/TODO | 4 + contrib/xz/doxygen/Doxyfile | 6 +- contrib/xz/doxygen/footer.html | 13 - contrib/xz/doxygen/update-doxygen | 6 +- contrib/xz/src/common/mythread.h | 28 +- contrib/xz/src/common/sysdefs.h | 18 +- contrib/xz/src/common/tuklib_common.h | 27 +- contrib/xz/src/common/tuklib_config.h | 2 - contrib/xz/src/common/tuklib_cpucores.c | 5 +- contrib/xz/src/common/tuklib_cpucores.h | 5 +- contrib/xz/src/common/tuklib_exit.c | 5 +- contrib/xz/src/common/tuklib_exit.h | 9 +- contrib/xz/src/common/tuklib_gettext.h | 5 +- contrib/xz/src/common/tuklib_integer.h | 7 +- contrib/xz/src/common/tuklib_mbstr.h | 5 +- contrib/xz/src/common/tuklib_mbstr_fw.c | 5 +- contrib/xz/src/common/tuklib_mbstr_width.c | 5 +- contrib/xz/src/common/tuklib_open_stdxxx.c | 5 +- contrib/xz/src/common/tuklib_open_stdxxx.h | 5 +- contrib/xz/src/common/tuklib_physmem.c | 25 +- contrib/xz/src/common/tuklib_physmem.h | 5 +- contrib/xz/src/common/tuklib_progname.c | 5 +- contrib/xz/src/common/tuklib_progname.h | 5 +- contrib/xz/src/liblzma/api/lzma.h | 31 +- contrib/xz/src/liblzma/api/lzma/base.h | 23 +- contrib/xz/src/liblzma/api/lzma/bcj.h | 10 +- contrib/xz/src/liblzma/api/lzma/block.h | 5 +- contrib/xz/src/liblzma/api/lzma/check.h | 5 +- contrib/xz/src/liblzma/api/lzma/container.h | 43 +- contrib/xz/src/liblzma/api/lzma/delta.h | 5 +- contrib/xz/src/liblzma/api/lzma/filter.h | 11 +- contrib/xz/src/liblzma/api/lzma/hardware.h | 5 +- contrib/xz/src/liblzma/api/lzma/index.h | 36 +- contrib/xz/src/liblzma/api/lzma/index_hash.h | 5 +- contrib/xz/src/liblzma/api/lzma/lzma12.h | 7 +- contrib/xz/src/liblzma/api/lzma/stream_flags.h | 5 +- contrib/xz/src/liblzma/api/lzma/version.h | 9 +- contrib/xz/src/liblzma/api/lzma/vli.h | 5 +- contrib/xz/src/liblzma/check/check.c | 5 +- contrib/xz/src/liblzma/check/check.h | 5 +- contrib/xz/src/liblzma/check/crc32_arm64.h | 119 - contrib/xz/src/liblzma/check/crc32_fast.c | 187 +- contrib/xz/src/liblzma/check/crc32_small.c | 5 +- contrib/xz/src/liblzma/check/crc32_table.c | 36 +- contrib/xz/src/liblzma/check/crc32_table_be.h | 4 +- contrib/xz/src/liblzma/check/crc32_table_le.h | 4 +- contrib/xz/src/liblzma/check/crc32_tablegen.c | 21 +- contrib/xz/src/liblzma/check/crc32_x86.S | 5 +- contrib/xz/src/liblzma/check/crc64_fast.c | 450 +- contrib/xz/src/liblzma/check/crc64_small.c | 5 +- contrib/xz/src/liblzma/check/crc64_table.c | 16 +- contrib/xz/src/liblzma/check/crc64_table_be.h | 4 +- contrib/xz/src/liblzma/check/crc64_table_le.h | 4 +- contrib/xz/src/liblzma/check/crc64_tablegen.c | 13 +- contrib/xz/src/liblzma/check/crc64_x86.S | 5 +- contrib/xz/src/liblzma/check/crc_common.h | 143 - contrib/xz/src/liblzma/check/crc_macros.h | 30 + contrib/xz/src/liblzma/check/crc_x86_clmul.h | 435 - contrib/xz/src/liblzma/common/alone_decoder.c | 5 +- contrib/xz/src/liblzma/common/alone_decoder.h | 5 +- contrib/xz/src/liblzma/common/alone_encoder.c | 5 +- contrib/xz/src/liblzma/common/auto_decoder.c | 5 +- .../xz/src/liblzma/common/block_buffer_decoder.c | 5 +- .../xz/src/liblzma/common/block_buffer_encoder.c | 5 +- .../xz/src/liblzma/common/block_buffer_encoder.h | 5 +- contrib/xz/src/liblzma/common/block_decoder.c | 5 +- contrib/xz/src/liblzma/common/block_decoder.h | 5 +- contrib/xz/src/liblzma/common/block_encoder.c | 5 +- contrib/xz/src/liblzma/common/block_encoder.h | 5 +- .../xz/src/liblzma/common/block_header_decoder.c | 5 +- .../xz/src/liblzma/common/block_header_encoder.c | 5 +- contrib/xz/src/liblzma/common/block_util.c | 5 +- contrib/xz/src/liblzma/common/common.c | 5 +- contrib/xz/src/liblzma/common/common.h | 5 +- .../xz/src/liblzma/common/easy_buffer_encoder.c | 5 +- .../xz/src/liblzma/common/easy_decoder_memusage.c | 5 +- contrib/xz/src/liblzma/common/easy_encoder.c | 5 +- .../xz/src/liblzma/common/easy_encoder_memusage.c | 5 +- contrib/xz/src/liblzma/common/easy_preset.c | 5 +- contrib/xz/src/liblzma/common/easy_preset.h | 5 +- contrib/xz/src/liblzma/common/file_info.c | 5 +- .../xz/src/liblzma/common/filter_buffer_decoder.c | 5 +- .../xz/src/liblzma/common/filter_buffer_encoder.c | 5 +- contrib/xz/src/liblzma/common/filter_common.c | 14 +- contrib/xz/src/liblzma/common/filter_common.h | 5 +- contrib/xz/src/liblzma/common/filter_decoder.c | 13 +- contrib/xz/src/liblzma/common/filter_decoder.h | 5 +- contrib/xz/src/liblzma/common/filter_encoder.c | 39 +- contrib/xz/src/liblzma/common/filter_encoder.h | 11 +- .../xz/src/liblzma/common/filter_flags_decoder.c | 5 +- .../xz/src/liblzma/common/filter_flags_encoder.c | 5 +- .../xz/src/liblzma/common/hardware_cputhreads.c | 5 +- contrib/xz/src/liblzma/common/hardware_physmem.c | 5 +- contrib/xz/src/liblzma/common/index.c | 5 +- contrib/xz/src/liblzma/common/index.h | 5 +- contrib/xz/src/liblzma/common/index_decoder.c | 5 +- contrib/xz/src/liblzma/common/index_decoder.h | 5 +- contrib/xz/src/liblzma/common/index_encoder.c | 5 +- contrib/xz/src/liblzma/common/index_encoder.h | 5 +- contrib/xz/src/liblzma/common/index_hash.c | 5 +- contrib/xz/src/liblzma/common/lzip_decoder.c | 5 +- contrib/xz/src/liblzma/common/lzip_decoder.h | 5 +- contrib/xz/src/liblzma/common/memcmplen.h | 24 +- contrib/xz/src/liblzma/common/microlzma_decoder.c | 5 +- contrib/xz/src/liblzma/common/microlzma_encoder.c | 5 +- contrib/xz/src/liblzma/common/outqueue.c | 5 +- contrib/xz/src/liblzma/common/outqueue.h | 5 +- .../xz/src/liblzma/common/stream_buffer_decoder.c | 5 +- .../xz/src/liblzma/common/stream_buffer_encoder.c | 5 +- contrib/xz/src/liblzma/common/stream_decoder.c | 5 +- contrib/xz/src/liblzma/common/stream_decoder.h | 5 +- contrib/xz/src/liblzma/common/stream_decoder_mt.c | 5 +- contrib/xz/src/liblzma/common/stream_encoder.c | 5 +- contrib/xz/src/liblzma/common/stream_encoder_mt.c | 25 +- .../xz/src/liblzma/common/stream_flags_common.c | 5 +- .../xz/src/liblzma/common/stream_flags_common.h | 5 +- .../xz/src/liblzma/common/stream_flags_decoder.c | 5 +- .../xz/src/liblzma/common/stream_flags_encoder.c | 5 +- contrib/xz/src/liblzma/common/string_conversion.c | 14 +- contrib/xz/src/liblzma/common/vli_decoder.c | 5 +- contrib/xz/src/liblzma/common/vli_encoder.c | 5 +- contrib/xz/src/liblzma/common/vli_size.c | 5 +- contrib/xz/src/liblzma/delta/delta_common.c | 5 +- contrib/xz/src/liblzma/delta/delta_common.h | 5 +- contrib/xz/src/liblzma/delta/delta_decoder.c | 5 +- contrib/xz/src/liblzma/delta/delta_decoder.h | 5 +- contrib/xz/src/liblzma/delta/delta_encoder.c | 5 +- contrib/xz/src/liblzma/delta/delta_encoder.h | 5 +- contrib/xz/src/liblzma/delta/delta_private.h | 5 +- contrib/xz/src/liblzma/liblzma.pc.in | 6 +- contrib/xz/src/liblzma/liblzma_generic.map | 7 - contrib/xz/src/liblzma/liblzma_linux.map | 7 - contrib/xz/src/liblzma/lz/lz_decoder.c | 48 +- contrib/xz/src/liblzma/lz/lz_decoder.h | 116 +- contrib/xz/src/liblzma/lz/lz_encoder.c | 13 +- contrib/xz/src/liblzma/lz/lz_encoder.h | 21 +- contrib/xz/src/liblzma/lz/lz_encoder_hash.h | 5 +- contrib/xz/src/liblzma/lz/lz_encoder_hash_table.h | 4 +- contrib/xz/src/liblzma/lz/lz_encoder_mf.c | 5 +- contrib/xz/src/liblzma/lzma/fastpos.h | 5 +- contrib/xz/src/liblzma/lzma/fastpos_table.c | 4 +- contrib/xz/src/liblzma/lzma/fastpos_tablegen.c | 17 +- contrib/xz/src/liblzma/lzma/lzma2_decoder.c | 5 +- contrib/xz/src/liblzma/lzma/lzma2_decoder.h | 5 +- contrib/xz/src/liblzma/lzma/lzma2_encoder.c | 8 +- contrib/xz/src/liblzma/lzma/lzma2_encoder.h | 5 +- contrib/xz/src/liblzma/lzma/lzma_common.h | 41 +- contrib/xz/src/liblzma/lzma/lzma_decoder.c | 760 +- contrib/xz/src/liblzma/lzma/lzma_decoder.h | 5 +- contrib/xz/src/liblzma/lzma/lzma_encoder.c | 18 +- contrib/xz/src/liblzma/lzma/lzma_encoder.h | 5 +- .../src/liblzma/lzma/lzma_encoder_optimum_fast.c | 5 +- .../src/liblzma/lzma/lzma_encoder_optimum_normal.c | 7 +- contrib/xz/src/liblzma/lzma/lzma_encoder_presets.c | 5 +- contrib/xz/src/liblzma/lzma/lzma_encoder_private.h | 9 +- contrib/xz/src/liblzma/rangecoder/price.h | 5 +- contrib/xz/src/liblzma/rangecoder/price_table.c | 4 +- contrib/xz/src/liblzma/rangecoder/price_tablegen.c | 22 +- contrib/xz/src/liblzma/rangecoder/range_common.h | 14 +- contrib/xz/src/liblzma/rangecoder/range_decoder.h | 838 +- contrib/xz/src/liblzma/rangecoder/range_encoder.h | 5 +- contrib/xz/src/liblzma/simple/arm.c | 5 +- contrib/xz/src/liblzma/simple/arm64.c | 5 +- contrib/xz/src/liblzma/simple/armthumb.c | 5 +- contrib/xz/src/liblzma/simple/ia64.c | 5 +- contrib/xz/src/liblzma/simple/powerpc.c | 5 +- contrib/xz/src/liblzma/simple/riscv.c | 755 - contrib/xz/src/liblzma/simple/simple_coder.c | 5 +- contrib/xz/src/liblzma/simple/simple_coder.h | 14 +- contrib/xz/src/liblzma/simple/simple_decoder.c | 5 +- contrib/xz/src/liblzma/simple/simple_decoder.h | 5 +- contrib/xz/src/liblzma/simple/simple_encoder.c | 5 +- contrib/xz/src/liblzma/simple/simple_encoder.h | 5 +- contrib/xz/src/liblzma/simple/simple_private.h | 5 +- contrib/xz/src/liblzma/simple/sparc.c | 5 +- contrib/xz/src/liblzma/simple/x86.c | 5 +- contrib/xz/src/liblzma/validate_map.sh | 6 +- contrib/xz/src/lzmainfo/lzmainfo.1 | 4 +- contrib/xz/src/lzmainfo/lzmainfo.c | 5 +- contrib/xz/src/xz/args.c | 159 +- contrib/xz/src/xz/args.h | 8 +- contrib/xz/src/xz/coder.c | 648 +- contrib/xz/src/xz/coder.h | 31 +- contrib/xz/src/xz/file_io.c | 144 +- contrib/xz/src/xz/file_io.h | 21 +- contrib/xz/src/xz/hardware.c | 11 +- contrib/xz/src/xz/hardware.h | 5 +- contrib/xz/src/xz/list.c | 31 +- contrib/xz/src/xz/list.h | 5 +- contrib/xz/src/xz/main.c | 91 +- contrib/xz/src/xz/main.h | 5 +- contrib/xz/src/xz/message.c | 94 +- contrib/xz/src/xz/message.h | 15 +- contrib/xz/src/xz/mytime.c | 105 +- contrib/xz/src/xz/mytime.h | 11 +- contrib/xz/src/xz/options.c | 7 +- contrib/xz/src/xz/options.h | 5 +- contrib/xz/src/xz/private.h | 26 +- contrib/xz/src/xz/sandbox.c | 355 - contrib/xz/src/xz/sandbox.h | 43 - contrib/xz/src/xz/signals.c | 22 +- contrib/xz/src/xz/signals.h | 5 +- contrib/xz/src/xz/suffix.c | 17 +- contrib/xz/src/xz/suffix.h | 5 +- contrib/xz/src/xz/util.c | 36 +- contrib/xz/src/xz/util.h | 19 +- contrib/xz/src/xz/xz.1 | 439 +- contrib/xz/src/xzdec/xzdec.1 | 8 +- contrib/xz/src/xzdec/xzdec.c | 160 +- lib/liblzma/Makefile | 1 - lib/liblzma/Symbol.map | 5 +- lib/liblzma/Versions.def | 5 +- lib/liblzma/config.h | 120 +- usr.bin/xz/Makefile | 1 - 221 files changed, 11311 insertions(+), 13505 deletions(-) diff --git a/contrib/xz/AUTHORS b/contrib/xz/AUTHORS index 5012d0e01e83..69bbfc3ef609 100644 --- a/contrib/xz/AUTHORS +++ b/contrib/xz/AUTHORS @@ -9,13 +9,15 @@ Authors of XZ Utils specifically the LZMA SDK . Without this code, XZ Utils wouldn't exist. - The SHA-256 implementation in liblzma is based on code written by - Wei Dai in Crypto++ Library . + The SHA-256 implementation in liblzma is based on the code found from + 7-Zip , which has a modified version of the SHA-256 + code found from Crypto++ . The SHA-256 code + in Crypto++ was written by Kevin Springle and Wei Dai. - A few scripts have been adapted from GNU gzip. The original - versions were written by Jean-loup Gailly, Charles Levert, and - Paul Eggert. Andrew Dudman helped adapting the scripts and their - man pages for XZ Utils. + Some scripts have been adapted from gzip. The original versions + were written by Jean-loup Gailly, Charles Levert, and Paul Eggert. + Andrew Dudman helped adapting the scripts and their man pages for + XZ Utils. The initial version of the threaded .xz decompressor was written by Sebastian Andrzej Siewior. @@ -23,31 +25,15 @@ Authors of XZ Utils The initial version of the .lz (lzip) decoder was written by Michał Górny. - Architecture-specific CRC optimizations were contributed by - Ilya Kurdyukov, Hans Jansen, and Chenxi Mao. + CLMUL-accelerated CRC code was contributed by Ilya Kurdyukov. Other authors: - Jonathan Nieder - Joachim Henke - Many people have contributed improvements or reported bugs. - Most of these people are mentioned in the file THANKS. + The GNU Autotools-based build system contains files from many authors, + which I'm not trying to list here. - The translations of the command line tools and man pages have been - contributed by many people via the Translation Project: - - - https://translationproject.org/domain/xz.html - - https://translationproject.org/domain/xz-man.html - - The authors of the translated man pages are in the header comments - of the man page files. In the source package, the authors of the - translations are in po/*.po and po4a/*.po files. - - Third-party code whose authors aren't listed here: - - - GNU getopt_long() in the 'lib' directory is included for - platforms that don't have a usable getopt_long(). - - - The build system files from GNU Autoconf, GNU Automake, - GNU Libtool, GNU Gettext, Autoconf Archive, and related files. + Several people have contributed fixes or reported bugs. Most of them + are mentioned in the file THANKS. diff --git a/contrib/xz/COPYING b/contrib/xz/COPYING index a31477d62d31..e54eeacfbf3f 100644 --- a/contrib/xz/COPYING +++ b/contrib/xz/COPYING @@ -6,95 +6,71 @@ XZ Utils Licensing is a rough summary of which licenses apply to which parts of this package (but check the individual files to be sure!): - - liblzma is under the BSD Zero Clause License (0BSD). + - liblzma is in the public domain. - - The command line tools xz, xzdec, lzmadec, and lzmainfo are - under 0BSD except that, on systems that don't have a usable - getopt_long, GNU getopt_long is compiled and linked in from the - 'lib' directory. The getopt_long code is under GNU LGPLv2.1+. + - xz, xzdec, and lzmadec command line tools are in the public + domain unless GNU getopt_long had to be compiled and linked + in from the lib directory. The getopt_long code is under + GNU LGPLv2.1+. - The scripts to grep, diff, and view compressed files have been - adapted from GNU gzip. These scripts (xzgrep, xzdiff, xzless, - and xzmore) are under GNU GPLv2+. The man pages of the scripts - are under 0BSD; they aren't based on the man pages of GNU gzip. - - - Most of the XZ Utils specific documentation that is in - plain text files (like README, INSTALL, PACKAGERS, NEWS, - and ChangeLog) are under 0BSD unless stated otherwise in - the file itself. The files xz-file-format.txt and - lzma-file-format.xt are in the public domain but may - be distributed under the terms of 0BSD too. - - - Doxygen-generated HTML version of the liblzma API documentation: - While Doxygen is under the GNU GPLv2, the license information - in Doxygen includes the following exception: - - Documents produced by doxygen are derivative works - derived from the input used in their production; - they are not affected by this license. + adapted from gzip. These scripts and their documentation are + under GNU GPLv2+. + + - All the documentation in the doc directory and most of the + XZ Utils specific documentation files in other directories + are in the public domain. Note: The JavaScript files (under the MIT license) have - been removed from the Doxygen output. + been removed from the Doxygen-generated HTML version of the + liblzma API documentation. Doxygen itself is under the GNU GPL + but the remaining files generated by Doxygen are not affected + by the licenses used in Doxygen because Doxygen licensing has + the following exception: - - The XZ logo (xz-logo.png) included in the Doxygen-generated - documentation is under the Creative Commons BY-SA 4.0 license. + "Documents produced by doxygen are derivative works + derived from the input used in their production; + they are not affected by this license." - - Translated messages and man pages are under 0BSD except that - some old translations are in the public domain. + - Translated messages are in the public domain. - - Test files and test code in the 'tests' directory, and - debugging utilities in the 'debug' directory are under - the BSD Zero Clause License (0BSD). + - The build system contains public domain files, and files that + are under GNU GPLv2+ or GNU GPLv3+. None of these files end up + in the binaries being built. - - The GNU Autotools based build system contains files that are - under GNU GPLv2+, GNU GPLv3+, and a few permissive licenses. - These files don't affect the licensing of the binaries being - built. + - Test files and test code in the tests directory, and debugging + utilities in the debug directory are in the public domain. - - The extra directory contain files that are under various - free software licenses. + - The extra directory may contain public domain files, and files + that are under various free software licenses. - For the files under the BSD Zero Clause License (0BSD), if - a copyright notice is needed, the following is sufficient: + You can do whatever you want with the files that have been put into + the public domain. If you find public domain legally problematic, + take the previous sentence as a license grant. If you still find + the lack of copyright legally problematic, you have too many + lawyers. - Copyright (C) The XZ Utils authors and contributors + As usual, this software is provided "as is", without any warranty. - If you copy significant amounts of 0BSD-licensed code from XZ Utils + If you copy significant amounts of public domain code from XZ Utils into your project, acknowledging this somewhere in your software is polite (especially if it is proprietary, non-free software), but - it is not legally required by the license terms. Here is an example - of a good notice to put into "about box" or into documentation: + naturally it is not legally required. Here is an example of a good + notice to put into "about box" or into documentation: - This software includes code from XZ Utils - . + This software includes code from XZ Utils . The following license texts are included in the following files: - - COPYING.0BSD: BSD Zero Clause License - COPYING.LGPLv2.1: GNU Lesser General Public License version 2.1 - COPYING.GPLv2: GNU General Public License version 2 - COPYING.GPLv3: GNU General Public License version 3 - - COPYING.CC-BY-SA-4.0: Creative Commons Attribution-ShareAlike 4.0 - International Public License - - A note about old XZ Utils releases: - - XZ Utils releases 5.4.6 and older and 5.5.1alpha have a - significant amount of code put into the public domain and - that obviously remains so. The switch from public domain to - 0BSD for newer releases was made in Febrary 2024 because - public domain has (real or perceived) legal ambiguities in - some jurisdictions. - - There is very little *practical* difference between public - domain and 0BSD. The main difference likely is that one - shouldn't claim that 0BSD-licensed code is in the public - domain; 0BSD-licensed code is copyrighted but available under - an extremely permissive license. Neither 0BSD nor public domain - require retaining or reproducing author, copyright holder, or - license notices when distributing the software. (Compare to, - for example, BSD 2-Clause "Simplified" License which does have - such requirements.) - - If you have questions, don't hesitate to ask for more information. - The contact information is in the README file. + + Note that the toolchain (compiler, linker etc.) may add some code + pieces that are copyrighted. Thus, it is possible that e.g. liblzma + binary wouldn't actually be in the public domain in its entirety + even though it contains no copyrighted code from the XZ Utils source + package. + + If you have questions, don't hesitate to ask the author(s) for more + information. diff --git a/contrib/xz/COPYING.0BSD b/contrib/xz/COPYING.0BSD deleted file mode 100644 index 4322122aecf1..000000000000 --- a/contrib/xz/COPYING.0BSD +++ /dev/null @@ -1,11 +0,0 @@ -Permission to use, copy, modify, and/or distribute this -software for any purpose with or without fee is hereby granted. - -THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL -WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED -WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL -THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR -CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM -LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, -NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN -CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. diff --git a/contrib/xz/COPYING.CC-BY-SA-4.0 b/contrib/xz/COPYING.CC-BY-SA-4.0 deleted file mode 100644 index 7d4f96c54aa1..000000000000 --- a/contrib/xz/COPYING.CC-BY-SA-4.0 +++ /dev/null @@ -1,427 +0,0 @@ -Attribution-ShareAlike 4.0 International - -======================================================================= - -Creative Commons Corporation ("Creative Commons") is not a law firm and -does not provide legal services or legal advice. Distribution of -Creative Commons public licenses does not create a lawyer-client or -other relationship. Creative Commons makes its licenses and related -information available on an "as-is" basis. Creative Commons gives no -warranties regarding its licenses, any material licensed under their -terms and conditions, or any related information. Creative Commons -disclaims all liability for damages resulting from their use to the -fullest extent possible. - -Using Creative Commons Public Licenses - -Creative Commons public licenses provide a standard set of terms and -conditions that creators and other rights holders may use to share -original works of authorship and other material subject to copyright -and certain other rights specified in the public license below. The -following considerations are for informational purposes only, are not -exhaustive, and do not form part of our licenses. - - Considerations for licensors: Our public licenses are - intended for use by those authorized to give the public - permission to use material in ways otherwise restricted by - copyright and certain other rights. Our licenses are - irrevocable. Licensors should read and understand the terms - and conditions of the license they choose before applying it. - Licensors should also secure all rights necessary before - applying our licenses so that the public can reuse the - material as expected. Licensors should clearly mark any - material not subject to the license. This includes other CC- - licensed material, or material used under an exception or - limitation to copyright. More considerations for licensors: - wiki.creativecommons.org/Considerations_for_licensors - - Considerations for the public: By using one of our public - licenses, a licensor grants the public permission to use the - licensed material under specified terms and conditions. If - the licensor's permission is not necessary for any reason--for - example, because of any applicable exception or limitation to - copyright--then that use is not regulated by the license. Our - licenses grant only permissions under copyright and certain - other rights that a licensor has authority to grant. Use of - the licensed material may still be restricted for other - reasons, including because others have copyright or other - rights in the material. A licensor may make special requests, - such as asking that all changes be marked or described. - Although not required by our licenses, you are encouraged to - respect those requests where reasonable. More considerations - for the public: - wiki.creativecommons.org/Considerations_for_licensees - -======================================================================= - -Creative Commons Attribution-ShareAlike 4.0 International Public -License - -By exercising the Licensed Rights (defined below), You accept and agree -to be bound by the terms and conditions of this Creative Commons -Attribution-ShareAlike 4.0 International Public License ("Public -License"). To the extent this Public License may be interpreted as a -contract, You are granted the Licensed Rights in consideration of Your -acceptance of these terms and conditions, and the Licensor grants You -such rights in consideration of benefits the Licensor receives from -making the Licensed Material available under these terms and -conditions. - - -Section 1 -- Definitions. - - a. Adapted Material means material subject to Copyright and Similar - Rights that is derived from or based upon the Licensed Material - and in which the Licensed Material is translated, altered, - arranged, transformed, or otherwise modified in a manner requiring - permission under the Copyright and Similar Rights held by the - Licensor. For purposes of this Public License, where the Licensed - Material is a musical work, performance, or sound recording, - Adapted Material is always produced where the Licensed Material is - synched in timed relation with a moving image. - - b. Adapter's License means the license You apply to Your Copyright - and Similar Rights in Your contributions to Adapted Material in - accordance with the terms and conditions of this Public License. - - c. BY-SA Compatible License means a license listed at - creativecommons.org/compatiblelicenses, approved by Creative - Commons as essentially the equivalent of this Public License. - - d. Copyright and Similar Rights means copyright and/or similar rights - closely related to copyright including, without limitation, - performance, broadcast, sound recording, and Sui Generis Database - Rights, without regard to how the rights are labeled or - categorized. For purposes of this Public License, the rights - specified in Section 2(b)(1)-(2) are not Copyright and Similar - Rights. - - e. Effective Technological Measures means those measures that, in the - absence of proper authority, may not be circumvented under laws - fulfilling obligations under Article 11 of the WIPO Copyright - Treaty adopted on December 20, 1996, and/or similar international - agreements. - - f. Exceptions and Limitations means fair use, fair dealing, and/or - any other exception or limitation to Copyright and Similar Rights - that applies to Your use of the Licensed Material. - - g. License Elements means the license attributes listed in the name - of a Creative Commons Public License. The License Elements of this - Public License are Attribution and ShareAlike. - - h. Licensed Material means the artistic or literary work, database, - or other material to which the Licensor applied this Public - License. - - i. Licensed Rights means the rights granted to You subject to the - terms and conditions of this Public License, which are limited to - all Copyright and Similar Rights that apply to Your use of the - Licensed Material and that the Licensor has authority to license. - - j. Licensor means the individual(s) or entity(ies) granting rights - under this Public License. - - k. Share means to provide material to the public by any means or - process that requires permission under the Licensed Rights, such - as reproduction, public display, public performance, distribution, - dissemination, communication, or importation, and to make material - available to the public including in ways that members of the - public may access the material from a place and at a time - individually chosen by them. - - l. Sui Generis Database Rights means rights other than copyright - resulting from Directive 96/9/EC of the European Parliament and of - the Council of 11 March 1996 on the legal protection of databases, - as amended and/or succeeded, as well as other essentially - equivalent rights anywhere in the world. - - m. You means the individual or entity exercising the Licensed Rights - under this Public License. Your has a corresponding meaning. - - -Section 2 -- Scope. - - a. License grant. - - 1. Subject to the terms and conditions of this Public License, - the Licensor hereby grants You a worldwide, royalty-free, - non-sublicensable, non-exclusive, irrevocable license to - exercise the Licensed Rights in the Licensed Material to: - - a. reproduce and Share the Licensed Material, in whole or - in part; and - - b. produce, reproduce, and Share Adapted Material. - - 2. Exceptions and Limitations. For the avoidance of doubt, where - Exceptions and Limitations apply to Your use, this Public - License does not apply, and You do not need to comply with - its terms and conditions. - - 3. Term. The term of this Public License is specified in Section - 6(a). - - 4. Media and formats; technical modifications allowed. The - Licensor authorizes You to exercise the Licensed Rights in - all media and formats whether now known or hereafter created, - and to make technical modifications necessary to do so. The - Licensor waives and/or agrees not to assert any right or - authority to forbid You from making technical modifications - necessary to exercise the Licensed Rights, including - technical modifications necessary to circumvent Effective - Technological Measures. For purposes of this Public License, - simply making modifications authorized by this Section 2(a) - (4) never produces Adapted Material. - - 5. Downstream recipients. - - a. Offer from the Licensor -- Licensed Material. Every - recipient of the Licensed Material automatically - receives an offer from the Licensor to exercise the - Licensed Rights under the terms and conditions of this - Public License. - - b. Additional offer from the Licensor -- Adapted Material. - Every recipient of Adapted Material from You - automatically receives an offer from the Licensor to - exercise the Licensed Rights in the Adapted Material - under the conditions of the Adapter's License You apply. - - c. No downstream restrictions. You may not offer or impose - any additional or different terms or conditions on, or - apply any Effective Technological Measures to, the - Licensed Material if doing so restricts exercise of the - Licensed Rights by any recipient of the Licensed - Material. - - 6. No endorsement. Nothing in this Public License constitutes or - may be construed as permission to assert or imply that You - are, or that Your use of the Licensed Material is, connected - with, or sponsored, endorsed, or granted official status by, - the Licensor or others designated to receive attribution as - provided in Section 3(a)(1)(A)(i). - - b. Other rights. - - 1. Moral rights, such as the right of integrity, are not - licensed under this Public License, nor are publicity, - privacy, and/or other similar personality rights; however, to - the extent possible, the Licensor waives and/or agrees not to - assert any such rights held by the Licensor to the limited - extent necessary to allow You to exercise the Licensed - Rights, but not otherwise. - - 2. Patent and trademark rights are not licensed under this - Public License. - - 3. To the extent possible, the Licensor waives any right to - collect royalties from You for the exercise of the Licensed - Rights, whether directly or through a collecting society - under any voluntary or waivable statutory or compulsory - licensing scheme. In all other cases the Licensor expressly - reserves any right to collect such royalties. - - -Section 3 -- License Conditions. - -Your exercise of the Licensed Rights is expressly made subject to the -following conditions. - - a. Attribution. - - 1. If You Share the Licensed Material (including in modified - form), You must: - - a. retain the following if it is supplied by the Licensor - with the Licensed Material: - - i. identification of the creator(s) of the Licensed - Material and any others designated to receive - attribution, in any reasonable manner requested by - the Licensor (including by pseudonym if - designated); - - ii. a copyright notice; - - iii. a notice that refers to this Public License; - - iv. a notice that refers to the disclaimer of - warranties; - - v. a URI or hyperlink to the Licensed Material to the - extent reasonably practicable; - - b. indicate if You modified the Licensed Material and - retain an indication of any previous modifications; and - - c. indicate the Licensed Material is licensed under this - Public License, and include the text of, or the URI or - hyperlink to, this Public License. - - 2. You may satisfy the conditions in Section 3(a)(1) in any - reasonable manner based on the medium, means, and context in - which You Share the Licensed Material. For example, it may be - reasonable to satisfy the conditions by providing a URI or - hyperlink to a resource that includes the required - information. - - 3. If requested by the Licensor, You must remove any of the - information required by Section 3(a)(1)(A) to the extent - reasonably practicable. - - b. ShareAlike. - - In addition to the conditions in Section 3(a), if You Share - Adapted Material You produce, the following conditions also apply. - - 1. The Adapter's License You apply must be a Creative Commons - license with the same License Elements, this version or - later, or a BY-SA Compatible License. - - 2. You must include the text of, or the URI or hyperlink to, the - Adapter's License You apply. You may satisfy this condition - in any reasonable manner based on the medium, means, and - context in which You Share Adapted Material. - - 3. You may not offer or impose any additional or different terms - or conditions on, or apply any Effective Technological - Measures to, Adapted Material that restrict exercise of the - rights granted under the Adapter's License You apply. - - -Section 4 -- Sui Generis Database Rights. - -Where the Licensed Rights include Sui Generis Database Rights that -apply to Your use of the Licensed Material: - - a. for the avoidance of doubt, Section 2(a)(1) grants You the right - to extract, reuse, reproduce, and Share all or a substantial - portion of the contents of the database; - - b. if You include all or a substantial portion of the database - contents in a database in which You have Sui Generis Database - Rights, then the database in which You have Sui Generis Database - Rights (but not its individual contents) is Adapted Material, - including for purposes of Section 3(b); and - - c. You must comply with the conditions in Section 3(a) if You Share - all or a substantial portion of the contents of the database. - -For the avoidance of doubt, this Section 4 supplements and does not -replace Your obligations under this Public License where the Licensed -Rights include other Copyright and Similar Rights. - - -Section 5 -- Disclaimer of Warranties and Limitation of Liability. - - a. UNLESS OTHERWISE SEPARATELY UNDERTAKEN BY THE LICENSOR, TO THE - EXTENT POSSIBLE, THE LICENSOR OFFERS THE LICENSED MATERIAL AS-IS - AND AS-AVAILABLE, AND MAKES NO REPRESENTATIONS OR WARRANTIES OF - ANY KIND CONCERNING THE LICENSED MATERIAL, WHETHER EXPRESS, - IMPLIED, STATUTORY, OR OTHER. THIS INCLUDES, WITHOUT LIMITATION, - WARRANTIES OF TITLE, MERCHANTABILITY, FITNESS FOR A PARTICULAR - PURPOSE, NON-INFRINGEMENT, ABSENCE OF LATENT OR OTHER DEFECTS, - ACCURACY, OR THE PRESENCE OR ABSENCE OF ERRORS, WHETHER OR NOT - KNOWN OR DISCOVERABLE. WHERE DISCLAIMERS OF WARRANTIES ARE NOT - ALLOWED IN FULL OR IN PART, THIS DISCLAIMER MAY NOT APPLY TO YOU. - - b. TO THE EXTENT POSSIBLE, IN NO EVENT WILL THE LICENSOR BE LIABLE - TO YOU ON ANY LEGAL THEORY (INCLUDING, WITHOUT LIMITATION, - NEGLIGENCE) OR OTHERWISE FOR ANY DIRECT, SPECIAL, INDIRECT, - INCIDENTAL, CONSEQUENTIAL, PUNITIVE, EXEMPLARY, OR OTHER LOSSES, - COSTS, EXPENSES, OR DAMAGES ARISING OUT OF THIS PUBLIC LICENSE OR - USE OF THE LICENSED MATERIAL, EVEN IF THE LICENSOR HAS BEEN - ADVISED OF THE POSSIBILITY OF SUCH LOSSES, COSTS, EXPENSES, OR - DAMAGES. WHERE A LIMITATION OF LIABILITY IS NOT ALLOWED IN FULL OR - IN PART, THIS LIMITATION MAY NOT APPLY TO YOU. - - c. The disclaimer of warranties and limitation of liability provided - above shall be interpreted in a manner that, to the extent - possible, most closely approximates an absolute disclaimer and - waiver of all liability. - - -Section 6 -- Term and Termination. - - a. This Public License applies for the term of the Copyright and - Similar Rights licensed here. However, if You fail to comply with - this Public License, then Your rights under this Public License - terminate automatically. - - b. Where Your right to use the Licensed Material has terminated under - Section 6(a), it reinstates: - - 1. automatically as of the date the violation is cured, provided - it is cured within 30 days of Your discovery of the - violation; or - - 2. upon express reinstatement by the Licensor. - - For the avoidance of doubt, this Section 6(b) does not affect any - right the Licensor may have to seek remedies for Your violations - of this Public License. - - c. For the avoidance of doubt, the Licensor may also offer the - Licensed Material under separate terms or conditions or stop - distributing the Licensed Material at any time; however, doing so - will not terminate this Public License. - - d. Sections 1, 5, 6, 7, and 8 survive termination of this Public - License. - - -Section 7 -- Other Terms and Conditions. - - a. The Licensor shall not be bound by any additional or different - terms or conditions communicated by You unless expressly agreed. - - b. Any arrangements, understandings, or agreements regarding the - Licensed Material not stated herein are separate from and - independent of the terms and conditions of this Public License. - - -Section 8 -- Interpretation. - - a. For the avoidance of doubt, this Public License does not, and - shall not be interpreted to, reduce, limit, restrict, or impose - conditions on any use of the Licensed Material that could lawfully - be made without permission under this Public License. - - b. To the extent possible, if any provision of this Public License is - deemed unenforceable, it shall be automatically reformed to the - minimum extent necessary to make it enforceable. If the provision - cannot be reformed, it shall be severed from this Public License - without affecting the enforceability of the remaining terms and - conditions. - - c. No term or condition of this Public License will be waived and no - failure to comply consented to unless expressly agreed to by the - Licensor. - - d. Nothing in this Public License constitutes or may be interpreted - as a limitation upon, or waiver of, any privileges and immunities - that apply to the Licensor or You, including from the legal - processes of any jurisdiction or authority. - - -======================================================================= - -Creative Commons is not a party to its public -licenses. Notwithstanding, Creative Commons may elect to apply one of -its public licenses to material it publishes and in those instances -will be considered the “Licensor.” The text of the Creative Commons -public licenses is dedicated to the public domain under the CC0 Public -Domain Dedication. Except for the limited purpose of indicating that -material is shared under a Creative Commons public license or as -otherwise permitted by the Creative Commons policies published at -creativecommons.org/policies, Creative Commons does not authorize the -use of the trademark "Creative Commons" or any other trademark or logo -of Creative Commons without its prior written consent including, -without limitation, in connection with any unauthorized modifications -to any of its public licenses or any other arrangements, -understandings, or agreements concerning use of licensed material. For -the avoidance of doubt, this paragraph does not form part of the -public licenses. - -Creative Commons may be contacted at creativecommons.org. diff --git a/contrib/xz/ChangeLog b/contrib/xz/ChangeLog index 54b68744af86..4dd0978ef313 100644 --- a/contrib/xz/ChangeLog +++ b/contrib/xz/ChangeLog @@ -1,9764 +1,11756 @@ -commit 2d7d862e3ffa8cec4fd3fdffcd84e984a17aa429 +commit 49053c0a649f4c8bd2b8d97ce915f401fbc0f3d9 Author: Jia Tan -Date: 2024-02-24 15:55:08 +0800 +Date: 2023-10-31 22:30:29 +0800 - Bump version and soname for 5.6.0. + Bump version and soname for 5.4.5. - src/liblzma/Makefile.am | 2 +- - src/liblzma/api/lzma/version.h | 6 +++--- - src/liblzma/liblzma_generic.map | 2 +- - src/liblzma/liblzma_linux.map | 2 +- - 4 files changed, 6 insertions(+), 6 deletions(-) + src/liblzma/Makefile.am | 2 +- + src/liblzma/api/lzma/version.h | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) -commit a18fb1edef0d0aac12a09eed05e9c448c777af7b +commit 84c0cfc556287628df871703672879e530d0391f Author: Jia Tan -Date: 2024-02-24 15:50:36 +0800 +Date: 2023-11-01 20:18:30 +0800 - Add NEWS for 5.6.0. + Add NEWS for 5.4.5. - NEWS | 143 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 143 insertions(+) + NEWS | 74 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 74 insertions(+) -commit 24355c5280bc95e3d594432d60bb8432aa6af173 -Author: Jia Tan -Date: 2024-02-22 22:27:01 +0800 +commit d90ed84db9770712e2421e170076b43bda9b64a7 +Author: Lasse Collin +Date: 2023-10-31 21:41:09 +0200 - Translations: Remove obsolete and fuzzy matches from some translations. + liblzma: Fix compilation of fastpos_tablegen.c. - The French and Brazilian Portuguese man page translations have not been - updated since the switch from public domain to 0BSD. The old GPLv2 - strings have now been removed from these files. - - po4a/fr.po | 4702 +++++++++++++++++++++++++++++++++++++---------------- - po4a/pt_BR.po | 4987 ++++++++++++++++++++++++++++++++++++++++----------------- - 2 files changed, 6832 insertions(+), 2857 deletions(-) - -commit 02ca4a7d7b703e2ec63e00b70feec825e919dbc1 -Author: Jia Tan -Date: 2024-02-21 00:31:54 +0800 - - Translations: Patch man pages to avoid fuzzy matches. + The macro lzma_attr_visibility_hidden has to be defined to make + fastpos.h usable. The visibility attribute is irrelevant to + fastpos_tablegen.c so simply #define the macro to an empty value. - This will be fixed in the next round of translations, but this avoids - having a fuzzy match or not fixing the English version. - - po4a/de.po | 2 +- - po4a/ko.po | 2 +- - po4a/ro.po | 2 +- - po4a/uk.po | 2 +- - 4 files changed, 4 insertions(+), 4 deletions(-) - -commit 898aad9fc711e03452d24d9e2c5b7f77a6f9ce64 -Author: Jia Tan *** 32181 LINES SKIPPED *** From nobody Fri Apr 5 10:38:25 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4V9w1s4zsKz5G9t5; Fri, 5 Apr 2024 10:38:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4V9w1s3msZz4j5G; Fri, 5 Apr 2024 10:38:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712313505; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ST0Lj5nT/vulx9C6VLUzwYR5h7KecNas7MlDGmEvM0U=; b=MkMIO58XSmpmk/MVDtW9A+bb8/cClCYbz4nS37p2LQwjDKN3uwKZpxu8ItMbbcsFoqvA3t aCF2BZJBIQzo7YL6oD5DPPUHjKh77X5CioILC8FaNMwIAIBUPgY8AbEtinhCe/h+hUHR64 eJBPWMzmdOyyvWSEOeKBgR8Dre6NB1JW4g6G/2Rkr4q7eTizd39lUvK9T3s+a/3gG7frq+ igcQhRoPWDvUZVdMDotQSd8Z9b+uETbuHt1/+Z1/o+ZBjwcZXFer9j/3+iyxt2TdRnN+3R G/W+shhPxJmh/DJBR61Jw/sk1/kZ7VDuslaLbEyVzq+UiAFmhkpGROPnCfewgA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712313505; a=rsa-sha256; cv=none; b=mul7+q1ZjdJmL4+smB9bJ28+IOhjPHVzHhY1qkusMD4nV5q/phSSSrn9862H+jRjhbG4BS tHIpkmC/QHqhTrQ6TSG7h8FE6YF/y8v2lqOlGhAbQvnKUPtAYur3Bl+rO8L6z3WgkzCXMF pwt6ecsGrwgor85YUUkTLwvJ7OEI6dh2AMt2dyJNZIJWNSf+khB2ZZNSy+O5kvgLQr87La D5wXSOP78pgYrDgFacgyQEXwWUT3IMAKMBXG1SOdZZKY9Mu6mZvnqLSjxWrXrPfVvYcLDU I7svzglSidkGJi2QD+aOKoMGL/glOvN2z0tAU7RFFt9bi5YYn/FxOSavIGYrcw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712313505; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ST0Lj5nT/vulx9C6VLUzwYR5h7KecNas7MlDGmEvM0U=; b=TdI0Bg/DgT+wV01x+crom7P//dF31cMoEJwSAQ5wI2/xBKOXq13BD5SHvaqyiThXbHXqZY I5VQ+0QjNka70sCQgf8gUJoFnZND0jx2RGxkMLGXHixV/WN42/cEEeCIiW8MTiz87gWBU6 MPUJ82n3Ozm+PLq1WeM8wZ4rxsqED9Es3f6PKg+JLOkP9T4DuKVL+0jGscSt+4v8e2vkEa vn4Qx2PANKLXFkjpwSHvG8i1OtHnWXvZ/HHqUfI6iBF6YlRIS4cT70HqACVSJsaTc03R0c nWFTomGbPQ7mx7ntgS/96j41n+qwE6cCc1ZrIOVYLWn1SRnMOFJOHD925nuUQw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4V9w1s3PBtzwyY; Fri, 5 Apr 2024 10:38: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 435AcPkW003034; Fri, 5 Apr 2024 10:38:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 435AcPjY003031; Fri, 5 Apr 2024 10:38:25 GMT (envelope-from git) Date: Fri, 5 Apr 2024 10:38:25 GMT Message-Id: <202404051038.435AcPjY003031@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Christos Margiolis Subject: git: 365067e98e4e - main - Revert "sound: Implement asynchronous device detach" List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 365067e98e4e9deba18070f5ebd4e9eee7149b6d Auto-Submitted: auto-generated The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=365067e98e4e9deba18070f5ebd4e9eee7149b6d commit 365067e98e4e9deba18070f5ebd4e9eee7149b6d Author: Christos Margiolis AuthorDate: 2024-04-05 10:27:47 +0000 Commit: Christos Margiolis CommitDate: 2024-04-05 10:33:23 +0000 Revert "sound: Implement asynchronous device detach" This reverts commit 9eff58c6d52b66eb8abe7f724dabcd804a566df4. We are reverting dc831e93bad6 ("sound: Get rid of snd_clone and use DEVFS_CDEVPRIV(9)"), so revert this commit as well since it depends dc831e93bad6. --- share/man/man4/snd_uaudio.4 | 11 ++++++++++- sys/dev/sound/pcm/dsp.c | 2 +- sys/dev/sound/pcm/mixer.c | 11 +++++++++++ sys/dev/sound/pcm/sound.c | 24 ++++++++++++++---------- sys/dev/sound/usb/uaudio.c | 13 ++++++++++--- 5 files changed, 46 insertions(+), 15 deletions(-) diff --git a/share/man/man4/snd_uaudio.4 b/share/man/man4/snd_uaudio.4 index 6e2509b8f2ac..b6a6c06a2312 100644 --- a/share/man/man4/snd_uaudio.4 +++ b/share/man/man4/snd_uaudio.4 @@ -27,7 +27,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.Dd March 26, 2024 +.Dd January 29, 2024 .Dt SND_UAUDIO 4 .Os .Sh NAME @@ -156,6 +156,15 @@ and modified for by .An Hiten Pandya Aq Mt hmp@FreeBSD.org . .Sh BUGS +The PCM framework in +.Fx +only supports synchronous device detach. +That means all mixer and DSP character devices belonging to a given +USB audio device must be closed when receiving an error on a DSP read, +a DSP write or a DSP IOCTL request. +Else the USB audio driver will wait for this to happen, preventing +enumeration of new devices on the parenting USB controller. +.Pp Some USB audio devices might refuse to work properly unless the sample rate is configured the same for both recording and playback, even if only simplex is used. diff --git a/sys/dev/sound/pcm/dsp.c b/sys/dev/sound/pcm/dsp.c index 754f09c7199e..b9693908da43 100644 --- a/sys/dev/sound/pcm/dsp.c +++ b/sys/dev/sound/pcm/dsp.c @@ -295,7 +295,7 @@ dsp_close(void *data) d = priv->sc; /* At this point pcm_unregister() will destroy all channels anyway. */ - if (PCM_DETACHING(d)) + if (!PCM_REGISTERED(d)) goto skip; PCM_GIANT_ENTER(d); diff --git a/sys/dev/sound/pcm/mixer.c b/sys/dev/sound/pcm/mixer.c index cc8cf5b1ceea..ee1ed11a8ed0 100644 --- a/sys/dev/sound/pcm/mixer.c +++ b/sys/dev/sound/pcm/mixer.c @@ -817,6 +817,17 @@ mixer_uninit(device_t dev) KASSERT(m->type == MIXER_TYPE_PRIMARY, ("%s(): illegal mixer type=%d", __func__, m->type)); + snd_mtxlock(m->lock); + + if (m->busy) { + snd_mtxunlock(m->lock); + return EBUSY; + } + + /* destroy dev can sleep --hps */ + + snd_mtxunlock(m->lock); + pdev->si_drv1 = NULL; destroy_dev(pdev); diff --git a/sys/dev/sound/pcm/sound.c b/sys/dev/sound/pcm/sound.c index 1517126210c4..53cde49c4905 100644 --- a/sys/dev/sound/pcm/sound.c +++ b/sys/dev/sound/pcm/sound.c @@ -1001,22 +1001,26 @@ pcm_unregister(device_t dev) CHN_FOREACH(ch, d, channels.pcm) { CHN_LOCK(ch); - if (ch->flags & CHN_F_SLEEPING) { - /* - * We are detaching, so do not wait for the timeout in - * chn_read()/chn_write(). Wake up the thread and kill - * the channel immediately. - */ - CHN_BROADCAST(&ch->intr_cv); - ch->flags |= CHN_F_DEAD; + if (ch->refcount > 0) { + device_printf(dev, + "unregister: channel %s busy (pid %d)\n", + ch->name, ch->pid); + CHN_UNLOCK(ch); + PCM_RELEASE_QUICK(d); + return (EBUSY); } - chn_abort(ch); CHN_UNLOCK(ch); } dsp_destroy_dev(dev); - (void)mixer_uninit(dev); + if (mixer_uninit(dev) == EBUSY) { + device_printf(dev, "unregister: mixer busy\n"); + PCM_LOCK(d); + PCM_RELEASE(d); + PCM_UNLOCK(d); + return (EBUSY); + } /* remove /dev/sndstat entry first */ sndstat_unregister(dev); diff --git a/sys/dev/sound/usb/uaudio.c b/sys/dev/sound/usb/uaudio.c index 2351c2522021..5d7396c527e0 100644 --- a/sys/dev/sound/usb/uaudio.c +++ b/sys/dev/sound/usb/uaudio.c @@ -1255,13 +1255,20 @@ uaudio_detach_sub(device_t dev) unsigned i = uaudio_get_child_index_by_dev(sc, dev); int error = 0; +repeat: if (sc->sc_child[i].pcm_registered) { error = pcm_unregister(dev); - } else if (sc->sc_child[i].mixer_init) { - error = mixer_uninit(dev); + } else { + if (sc->sc_child[i].mixer_init) + error = mixer_uninit(dev); } - return (error); + if (error) { + device_printf(dev, "Waiting for sound application to exit!\n"); + usb_pause_mtx(NULL, 2 * hz); + goto repeat; /* try again */ + } + return (0); /* success */ } static int From nobody Fri Apr 5 10:38:26 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4V9w1t5lg3z5GBPn; Fri, 5 Apr 2024 10:38:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4V9w1t4Ph4z4hlX; Fri, 5 Apr 2024 10:38:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712313506; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=m8IolwX+CXG3brN6xXnn7KoAyKIX3+f1eWu4CuO2LTk=; b=hWOBkLAanl03Ot12FCYSCB4hw1ugYlZkSRctRzA+750RybORc74ZBywy49pQwS14qs8koF Sb16DKDi9umXyQPS2RAMuyWSCbVYFJjDBI4Dkz07eRmsWByzoM/1gDJ6Olit0YIMAA9x85 3B9QiPPPEJ2/sTbjkEqgKpQYdso2NOrlIxA06fObXCzkR1WhKFwXVQ+cbCAlv4X6kHW6jC 6mXEcbpcE8Qoy2l/Q5HiMYSAsoQyyxEKCf1YO5BpyOPUdAui43hjo8HZJeECBJMb05oPXL /SwQZ9juYFnA33vZlFT+vF7gJPShLi7nnJ+zj8tKXLxW1wFmPll8vVLBTLuCMA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712313506; a=rsa-sha256; cv=none; b=qkHN8J//FO+sE8sApbTfqxyE4eYS0XLa0/LqbQ+G18yV8yCzlR2zwLEz9DZFzemNOG2m0c kNvroTAqrxLHc3PjT9F1F22R+H3IVU69cBY/BeeS3C+cUmchM4grQthXSE9PsLFDhvdPmp 3jUAuSeiEKOMPzYbZrCsznLQYBUrv/TdsFgdSiNxIcjDbouDtwqUAwUjjfBTcGcYWhTV2j B3dD2wIRpDnZkdWhO6dqHYqfi2iAnKK3BzFF7+f0iHsMXRVzIHtP+P90nwsYzr+vCFbbqK ZNDqROm5H8dEC2NvBm7M9xEYkcvP61i4pYbYSlm0m381YQXymbUTbjZ0GUzmdw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712313506; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=m8IolwX+CXG3brN6xXnn7KoAyKIX3+f1eWu4CuO2LTk=; b=QInCaXWx3Nl2SqMQuWI2zXJpsvvn7QFgAvqnxP2VtXpA48E1wRZevqem58FQLzwO2bm6qL wz41IdGd4x98OnpWArEgpr6W9435nlDJIy7D6EFRxYppqsW8RtcbFVQyntHXlrAyrijhWL RWr2O/XF+vjEvSkiLNkndiGgkEnClmxUQ6M7E5AAgBZa1Upk7dlCg3d6yWBB9t/JJMX8Ka Ewl66EXuVmsEU3dsD3hMaMU9lVEDWG6j2a3f8aP2O/JJXYHgNFpxIw/MrbFMYaxXZLyype bxvaGlhhm5OnlQZH/OBQocjA0Nk6KYukC2ya6OsIOJdMynLPkSU6rTIPzJqadQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4V9w1t40syzwyZ; Fri, 5 Apr 2024 10:38: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 435AcQL7003088; Fri, 5 Apr 2024 10:38:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 435AcQlQ003085; Fri, 5 Apr 2024 10:38:26 GMT (envelope-from git) Date: Fri, 5 Apr 2024 10:38:26 GMT Message-Id: <202404051038.435AcQlQ003085@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Christos Margiolis Subject: git: c0d8f5862997 - main - Revert "sound: Get rid of snd_clone and use DEVFS_CDEVPRIV(9)" List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c0d8f586299713f999b3b4757617a805774b03fa Auto-Submitted: auto-generated The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=c0d8f586299713f999b3b4757617a805774b03fa commit c0d8f586299713f999b3b4757617a805774b03fa Author: Christos Margiolis AuthorDate: 2024-04-05 10:32:32 +0000 Commit: Christos Margiolis CommitDate: 2024-04-05 10:33:41 +0000 Revert "sound: Get rid of snd_clone and use DEVFS_CDEVPRIV(9)" This reverts commit dc831e93bad63f9faea09f1806a7733a40bff316. After several reports in the mailing lists, this commit breaks pulseaudio. Revert until the issue is resolved. --- share/man/man4/pcm.4 | 53 +- sys/conf/files | 1 + sys/dev/sound/clone.c | 705 ++++++++++++++++++++++++++ sys/dev/sound/clone.h | 127 +++++ sys/dev/sound/pcm/dsp.c | 1027 ++++++++++++++++++++++++++------------ sys/dev/sound/pcm/dsp.h | 7 +- sys/dev/sound/pcm/sound.c | 194 ++++++- sys/dev/sound/pcm/sound.h | 6 +- sys/modules/sound/sound/Makefile | 2 +- 9 files changed, 1793 insertions(+), 329 deletions(-) diff --git a/share/man/man4/pcm.4 b/share/man/man4/pcm.4 index e406bd2c8343..17ac499e6bb3 100644 --- a/share/man/man4/pcm.4 +++ b/share/man/man4/pcm.4 @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd March 24, 2024 +.Dd January 10, 2024 .Dt SOUND 4 .Os .Sh NAME @@ -513,6 +513,14 @@ device state on each tick using a mechanism. Disabled by default and currently only available for a few device drivers. .El +.Ss Recording Channels +On devices that have more than one recording source (ie: mic and line), +there is a corresponding +.Pa /dev/dsp%d.r%d +device. +The +.Xr mixer 8 +utility can be used to start and stop recording from an specific device. .Ss Statistics Channel statistics are only kept while the device is open. So with situations involving overruns and underruns, consider the output @@ -534,24 +542,36 @@ functions. .Sh FILES The .Nm -drivers may create the following device nodes: +drivers may create the following +device nodes: .Pp -.Bl -tag -width ".Pa /dev/sndstat" -compact -.It Pa /dev/dsp%d -Audio device. -The number represents the unit number of the device. -.It Pa /dev/dsp -Alias of -.Pa /dev/dsp${hw.snd.default_unit} . -Available only if -.Pa hw.snd.basename_clone -is set. +.Bl -tag -width ".Pa /dev/audio%d.%d" -compact +.It Pa /dev/audio%d.%d +Sparc-compatible audio device. +.It Pa /dev/dsp%d.%d +Digitized voice device. +.It Pa /dev/dspW%d.%d +Like +.Pa /dev/dsp , +but 16 bits per sample. +.It Pa /dev/dsp%d.p%d +Playback channel. +.It Pa /dev/dsp%d.r%d +Record channel. +.It Pa /dev/dsp%d.vp%d +Virtual playback channel. +.It Pa /dev/dsp%d.vr%d +Virtual recording channel. .It Pa /dev/sndstat Current .Nm status, including all channels and drivers. .El .Pp +The first number in the device node +represents the unit number of the +.Nm +device. All .Nm devices are listed @@ -561,6 +581,15 @@ Additional messages are sometimes recorded when the device is probed and attached, these messages can be viewed with the .Xr dmesg 8 utility. +.Pp +The above device nodes are only created on demand through the dynamic +.Xr devfs 5 +clone handler. +Users are strongly discouraged to access them directly. +For specific sound card access, please instead use +.Pa /dev/dsp +or +.Pa /dev/dsp%d . .Sh EXAMPLES Use the sound metadriver to load all .Nm diff --git a/sys/conf/files b/sys/conf/files index 0fbb7fea70c9..549a3590f76b 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -3064,6 +3064,7 @@ dev/smc/if_smc.c optional smc dev/smc/if_smc_acpi.c optional smc acpi dev/smc/if_smc_fdt.c optional smc fdt dev/snp/snp.c optional snp +dev/sound/clone.c optional sound dev/sound/unit.c optional sound dev/sound/pci/als4000.c optional snd_als4000 pci dev/sound/pci/atiixp.c optional snd_atiixp pci diff --git a/sys/dev/sound/clone.c b/sys/dev/sound/clone.c new file mode 100644 index 000000000000..4cac5f050ee2 --- /dev/null +++ b/sys/dev/sound/clone.c @@ -0,0 +1,705 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2007 Ariff Abdullah + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#include +#include +#include +#include +#include +#include + +#ifdef HAVE_KERNEL_OPTION_HEADERS +#include "opt_snd.h" +#endif + +#if defined(SND_DIAGNOSTIC) || defined(SND_DEBUG) +#include +#endif + +#include + +/* + * So here we go again, another clonedevs manager. Unlike default clonedevs, + * this clone manager is designed to withstand various abusive behavior + * (such as 'while : ; do ls /dev/whatever ; done', etc.), reusable object + * after reaching certain expiration threshold, aggressive garbage collector, + * transparent device allocator and concurrency handling across multiple + * thread/proc. Due to limited information given by dev_clone EVENTHANDLER, + * we don't have much clues whether the caller wants a real open() or simply + * making fun of us with things like stat(), mtime() etc. Assuming that: + * 1) Time window between dev_clone EH <-> real open() should be small + * enough and 2) mtime()/stat() etc. always looks like a half way / stalled + * operation, we can decide whether a new cdev must be created, old + * (expired) cdev can be reused or an existing cdev can be shared. + * + * Most of the operations and logics are generic enough and can be applied + * on other places (such as if_tap, snp, etc). Perhaps this can be + * rearranged to complement clone_*(). However, due to this still being + * specific to the sound driver (and as a proof of concept on how it can be + * done), si_drv2 is used to keep the pointer of the clone list entry to + * avoid expensive lookup. + */ + +/* clone entry */ +struct snd_clone_entry { + TAILQ_ENTRY(snd_clone_entry) link; + struct snd_clone *parent; + struct cdev *devt; + struct timespec tsp; + uint32_t flags; + pid_t pid; + int unit; +}; + +/* clone manager */ +struct snd_clone { + TAILQ_HEAD(link_head, snd_clone_entry) head; + struct timespec tsp; + int refcount; + int size; + int typemask; + int maxunit; + int deadline; + uint32_t flags; +}; + +#ifdef SND_DIAGNOSTIC +#define SND_CLONE_ASSERT(x, y) do { \ + if (!(x)) \ + panic y; \ +} while (0) +#else +#define SND_CLONE_ASSERT(...) KASSERT(__VA_ARGS__) +#endif + +/* + * snd_clone_create() : Return opaque allocated clone manager. + */ +struct snd_clone * +snd_clone_create(int typemask, int maxunit, int deadline, uint32_t flags) +{ + struct snd_clone *c; + + SND_CLONE_ASSERT(!(typemask & ~SND_CLONE_MAXUNIT), + ("invalid typemask: 0x%08x", typemask)); + SND_CLONE_ASSERT(maxunit == -1 || + !(maxunit & ~(~typemask & SND_CLONE_MAXUNIT)), + ("maxunit overflow: typemask=0x%08x maxunit=%d", + typemask, maxunit)); + SND_CLONE_ASSERT(!(flags & ~SND_CLONE_MASK), + ("invalid clone flags=0x%08x", flags)); + + c = malloc(sizeof(*c), M_DEVBUF, M_WAITOK | M_ZERO); + c->refcount = 0; + c->size = 0; + c->typemask = typemask; + c->maxunit = (maxunit == -1) ? (~typemask & SND_CLONE_MAXUNIT) : + maxunit; + c->deadline = deadline; + c->flags = flags; + getnanouptime(&c->tsp); + TAILQ_INIT(&c->head); + + return (c); +} + +int +snd_clone_busy(struct snd_clone *c) +{ + struct snd_clone_entry *ce; + + SND_CLONE_ASSERT(c != NULL, ("NULL snd_clone")); + + if (c->size == 0) + return (0); + + TAILQ_FOREACH(ce, &c->head, link) { + if ((ce->flags & SND_CLONE_BUSY) || + (ce->devt != NULL && ce->devt->si_threadcount != 0)) + return (EBUSY); + } + + return (0); +} + +/* + * snd_clone_enable()/disable() : Suspend/resume clone allocation through + * snd_clone_alloc(). Everything else will not be affected by this. + */ +int +snd_clone_enable(struct snd_clone *c) +{ + SND_CLONE_ASSERT(c != NULL, ("NULL snd_clone")); + + if (c->flags & SND_CLONE_ENABLE) + return (EINVAL); + + c->flags |= SND_CLONE_ENABLE; + + return (0); +} + +int +snd_clone_disable(struct snd_clone *c) +{ + SND_CLONE_ASSERT(c != NULL, ("NULL snd_clone")); + + if (!(c->flags & SND_CLONE_ENABLE)) + return (EINVAL); + + c->flags &= ~SND_CLONE_ENABLE; + + return (0); +} + +/* + * Getters / Setters. Not worth explaining :) + */ +int +snd_clone_getsize(struct snd_clone *c) +{ + SND_CLONE_ASSERT(c != NULL, ("NULL snd_clone")); + + return (c->size); +} + +int +snd_clone_getmaxunit(struct snd_clone *c) +{ + SND_CLONE_ASSERT(c != NULL, ("NULL snd_clone")); + + return (c->maxunit); +} + +int +snd_clone_setmaxunit(struct snd_clone *c, int maxunit) +{ + SND_CLONE_ASSERT(c != NULL, ("NULL snd_clone")); + SND_CLONE_ASSERT(maxunit == -1 || + !(maxunit & ~(~c->typemask & SND_CLONE_MAXUNIT)), + ("maxunit overflow: typemask=0x%08x maxunit=%d", + c->typemask, maxunit)); + + c->maxunit = (maxunit == -1) ? (~c->typemask & SND_CLONE_MAXUNIT) : + maxunit; + + return (c->maxunit); +} + +int +snd_clone_getdeadline(struct snd_clone *c) +{ + SND_CLONE_ASSERT(c != NULL, ("NULL snd_clone")); + + return (c->deadline); +} + +int +snd_clone_setdeadline(struct snd_clone *c, int deadline) +{ + SND_CLONE_ASSERT(c != NULL, ("NULL snd_clone")); + + c->deadline = deadline; + + return (c->deadline); +} + +uint32_t +snd_clone_getflags(struct snd_clone *c) +{ + SND_CLONE_ASSERT(c != NULL, ("NULL snd_clone")); + + return (c->flags); +} + +uint32_t +snd_clone_setflags(struct snd_clone *c, uint32_t flags) +{ + SND_CLONE_ASSERT(c != NULL, ("NULL snd_clone")); + SND_CLONE_ASSERT(!(flags & ~SND_CLONE_MASK), + ("invalid clone flags=0x%08x", flags)); + + c->flags = flags; + + return (c->flags); +} + +uint32_t +snd_clone_getdevflags(struct cdev *dev) +{ + struct snd_clone_entry *ce; + + SND_CLONE_ASSERT(dev != NULL, ("NULL dev")); + + ce = dev->si_drv2; + if (ce == NULL) + return (0xffffffff); + + SND_CLONE_ASSERT(ce->parent != NULL, ("NULL parent")); + + return (ce->flags); +} + +uint32_t +snd_clone_setdevflags(struct cdev *dev, uint32_t flags) +{ + struct snd_clone_entry *ce; + + SND_CLONE_ASSERT(dev != NULL, ("NULL dev")); + SND_CLONE_ASSERT(!(flags & ~SND_CLONE_DEVMASK), + ("invalid clone dev flags=0x%08x", flags)); + + ce = dev->si_drv2; + if (ce == NULL) + return (0xffffffff); + + SND_CLONE_ASSERT(ce->parent != NULL, ("NULL parent")); + + ce->flags = flags; + + return (ce->flags); +} + +/* Elapsed time conversion to ms */ +#define SND_CLONE_ELAPSED(x, y) \ + ((((x)->tv_sec - (y)->tv_sec) * 1000) + \ + (((y)->tv_nsec > (x)->tv_nsec) ? \ + (((1000000000L + (x)->tv_nsec - \ + (y)->tv_nsec) / 1000000) - 1000) : \ + (((x)->tv_nsec - (y)->tv_nsec) / 1000000))) + +#define SND_CLONE_EXPIRED(x, y, z) \ + ((x)->deadline < 1 || \ + ((y)->tv_sec - (z)->tv_sec) > ((x)->deadline / 1000) || \ + SND_CLONE_ELAPSED(y, z) > (x)->deadline) + +/* + * snd_clone_gc() : Garbage collector for stalled, expired objects. Refer to + * clone.h for explanations on GC settings. + */ +int +snd_clone_gc(struct snd_clone *c) +{ + struct snd_clone_entry *ce, *tce; + struct timespec now; + int pruned; + + SND_CLONE_ASSERT(c != NULL, ("NULL snd_clone")); + + if (!(c->flags & SND_CLONE_GC_ENABLE) || c->size == 0) + return (0); + + getnanouptime(&now); + + /* + * Bail out if the last clone handler was invoked below the deadline + * threshold. + */ + if ((c->flags & SND_CLONE_GC_EXPIRED) && + !SND_CLONE_EXPIRED(c, &now, &c->tsp)) + return (0); + + pruned = 0; + + /* + * Visit each object in reverse order. If the object is still being + * referenced by a valid open(), skip it. Look for expired objects + * and either revoke its clone invocation status or mercilessly + * throw it away. + */ + TAILQ_FOREACH_REVERSE_SAFE(ce, &c->head, link_head, link, tce) { + if (!(ce->flags & SND_CLONE_BUSY) && + (!(ce->flags & SND_CLONE_INVOKE) || + SND_CLONE_EXPIRED(c, &now, &ce->tsp))) { + if ((c->flags & SND_CLONE_GC_REVOKE) || + ce->devt->si_threadcount != 0) { + ce->flags &= ~SND_CLONE_INVOKE; + ce->pid = -1; + } else { + TAILQ_REMOVE(&c->head, ce, link); + destroy_dev(ce->devt); + free(ce, M_DEVBUF); + c->size--; + } + pruned++; + } + } + + /* return total pruned objects */ + return (pruned); +} + +void +snd_clone_destroy(struct snd_clone *c) +{ + struct snd_clone_entry *ce, *tmp; + + SND_CLONE_ASSERT(c != NULL, ("NULL snd_clone")); + + ce = TAILQ_FIRST(&c->head); + while (ce != NULL) { + tmp = TAILQ_NEXT(ce, link); + if (ce->devt != NULL) + destroy_dev(ce->devt); + free(ce, M_DEVBUF); + ce = tmp; + } + + free(c, M_DEVBUF); +} + +/* + * snd_clone_acquire() : The vital part of concurrency management. Must be + * called somewhere at the beginning of open() handler. ENODEV is not really + * fatal since it just tell the caller that this is not cloned stuff. + * EBUSY is *real*, don't forget that! + */ +int +snd_clone_acquire(struct cdev *dev) +{ + struct snd_clone_entry *ce; + + SND_CLONE_ASSERT(dev != NULL, ("NULL dev")); + + ce = dev->si_drv2; + if (ce == NULL) + return (ENODEV); + + SND_CLONE_ASSERT(ce->parent != NULL, ("NULL parent")); + + ce->flags &= ~SND_CLONE_INVOKE; + + if (ce->flags & SND_CLONE_BUSY) + return (EBUSY); + + ce->flags |= SND_CLONE_BUSY; + + return (0); +} + +/* + * snd_clone_release() : Release busy status. Must be called somewhere at + * the end of close() handler, or somewhere after fail open(). + */ +int +snd_clone_release(struct cdev *dev) +{ + struct snd_clone_entry *ce; + + SND_CLONE_ASSERT(dev != NULL, ("NULL dev")); + + ce = dev->si_drv2; + if (ce == NULL) + return (ENODEV); + + SND_CLONE_ASSERT(ce->parent != NULL, ("NULL parent")); + + ce->flags &= ~SND_CLONE_INVOKE; + + if (!(ce->flags & SND_CLONE_BUSY)) + return (EBADF); + + ce->flags &= ~SND_CLONE_BUSY; + ce->pid = -1; + + return (0); +} + +/* + * snd_clone_ref/unref() : Garbage collector reference counter. To make + * garbage collector run automatically, the sequence must be something like + * this (both in open() and close() handlers): + * + * open() - 1) snd_clone_acquire() + * 2) .... check check ... if failed, snd_clone_release() + * 3) Success. Call snd_clone_ref() + * + * close() - 1) .... check check check .... + * 2) Success. snd_clone_release() + * 3) snd_clone_unref() . Garbage collector will run at this point + * if this is the last referenced object. + */ +int +snd_clone_ref(struct cdev *dev) +{ + struct snd_clone_entry *ce; + struct snd_clone *c; + + SND_CLONE_ASSERT(dev != NULL, ("NULL dev")); + + ce = dev->si_drv2; + if (ce == NULL) + return (0); + + c = ce->parent; + SND_CLONE_ASSERT(c != NULL, ("NULL parent")); + SND_CLONE_ASSERT(c->refcount >= 0, ("refcount < 0")); + + return (++c->refcount); +} + +int +snd_clone_unref(struct cdev *dev) +{ + struct snd_clone_entry *ce; + struct snd_clone *c; + + SND_CLONE_ASSERT(dev != NULL, ("NULL dev")); + + ce = dev->si_drv2; + if (ce == NULL) + return (0); + + c = ce->parent; + SND_CLONE_ASSERT(c != NULL, ("NULL parent")); + SND_CLONE_ASSERT(c->refcount > 0, ("refcount <= 0")); + + c->refcount--; + + /* + * Run automatic garbage collector, if needed. + */ + if ((c->flags & SND_CLONE_GC_UNREF) && + (!(c->flags & SND_CLONE_GC_LASTREF) || + (c->refcount == 0 && (c->flags & SND_CLONE_GC_LASTREF)))) + (void)snd_clone_gc(c); + + return (c->refcount); +} + +void +snd_clone_register(struct snd_clone_entry *ce, struct cdev *dev) +{ + SND_CLONE_ASSERT(ce != NULL, ("NULL snd_clone_entry")); + SND_CLONE_ASSERT(dev != NULL, ("NULL dev")); + SND_CLONE_ASSERT(dev->si_drv2 == NULL, ("dev->si_drv2 not NULL")); + SND_CLONE_ASSERT((ce->flags & SND_CLONE_ALLOC) == SND_CLONE_ALLOC, + ("invalid clone alloc flags=0x%08x", ce->flags)); + SND_CLONE_ASSERT(ce->devt == NULL, ("ce->devt not NULL")); + SND_CLONE_ASSERT(ce->unit == dev2unit(dev), + ("invalid unit ce->unit=0x%08x dev2unit=0x%08x", + ce->unit, dev2unit(dev))); + + SND_CLONE_ASSERT(ce->parent != NULL, ("NULL parent")); + + dev->si_drv2 = ce; + ce->devt = dev; + ce->flags &= ~SND_CLONE_ALLOC; + ce->flags |= SND_CLONE_INVOKE; +} + +struct snd_clone_entry * +snd_clone_alloc(struct snd_clone *c, struct cdev **dev, int *unit, int tmask) +{ + struct snd_clone_entry *ce, *after, *bce, *cce, *nce, *tce; + struct timespec now; + int cunit, allocunit; + pid_t curpid; + + SND_CLONE_ASSERT(c != NULL, ("NULL snd_clone")); + SND_CLONE_ASSERT(dev != NULL, ("NULL dev pointer")); + SND_CLONE_ASSERT((c->typemask & tmask) == tmask, + ("invalid tmask: typemask=0x%08x tmask=0x%08x", + c->typemask, tmask)); + SND_CLONE_ASSERT(unit != NULL, ("NULL unit pointer")); + SND_CLONE_ASSERT(*unit == -1 || !(*unit & (c->typemask | tmask)), + ("typemask collision: typemask=0x%08x tmask=0x%08x *unit=%d", + c->typemask, tmask, *unit)); + + if (!(c->flags & SND_CLONE_ENABLE) || + (*unit != -1 && *unit > c->maxunit)) + return (NULL); + + ce = NULL; + after = NULL; + bce = NULL; /* "b"usy candidate */ + cce = NULL; /* "c"urthread/proc candidate */ + nce = NULL; /* "n"ull, totally unbusy candidate */ + tce = NULL; /* Last "t"ry candidate */ + cunit = 0; + allocunit = (*unit == -1) ? 0 : *unit; + curpid = curthread->td_proc->p_pid; + + getnanouptime(&now); + + TAILQ_FOREACH(ce, &c->head, link) { + /* + * Sort incrementally according to device type. + */ + if (tmask > (ce->unit & c->typemask)) { + if (cunit == 0) + after = ce; + continue; + } else if (tmask < (ce->unit & c->typemask)) + break; + + /* + * Shoot.. this is where the grumpiness begin. Just + * return immediately. + */ + if (*unit != -1 && *unit == (ce->unit & ~tmask)) + goto snd_clone_alloc_out; + + cunit++; + /* + * Simmilar device type. Sort incrementally according + * to allocation unit. While here, look for free slot + * and possible collision for new / future allocation. + */ + if (*unit == -1 && (ce->unit & ~tmask) == allocunit) + allocunit++; + if ((ce->unit & ~tmask) < allocunit) + after = ce; + /* + * Clone logic: + * 1. Look for non busy, but keep track of the best + * possible busy cdev. + * 2. Look for the best (oldest referenced) entry that is + * in a same process / thread. + * 3. Look for the best (oldest referenced), absolute free + * entry. + * 4. Lastly, look for the best (oldest referenced) + * any entries that doesn't fit with anything above. + */ + if (ce->flags & SND_CLONE_BUSY) { + if (ce->devt != NULL && (bce == NULL || + timespeccmp(&ce->tsp, &bce->tsp, <))) + bce = ce; + continue; + } + if (ce->pid == curpid && + (cce == NULL || timespeccmp(&ce->tsp, &cce->tsp, <))) + cce = ce; + else if (!(ce->flags & SND_CLONE_INVOKE) && + (nce == NULL || timespeccmp(&ce->tsp, &nce->tsp, <))) + nce = ce; + else if (tce == NULL || timespeccmp(&ce->tsp, &tce->tsp, <)) + tce = ce; + } + if (*unit != -1) + goto snd_clone_alloc_new; + else if (cce != NULL) { + /* Same proc entry found, go for it */ + ce = cce; + goto snd_clone_alloc_out; + } else if (nce != NULL) { + /* + * Next, try absolute free entry. If the calculated + * allocunit is smaller, create new entry instead. + */ + if (allocunit < (nce->unit & ~tmask)) + goto snd_clone_alloc_new; + ce = nce; + goto snd_clone_alloc_out; + } else if (allocunit > c->maxunit) { + /* + * Maximum allowable unit reached. Try returning any + * available cdev and hope for the best. If the lookup is + * done for things like stat(), mtime() etc. , things should + * be ok. Otherwise, open() handler should do further checks + * and decide whether to return correct error code or not. + */ + if (tce != NULL) { + ce = tce; + goto snd_clone_alloc_out; + } else if (bce != NULL) { + ce = bce; + goto snd_clone_alloc_out; + } + return (NULL); + } + +snd_clone_alloc_new: + /* + * No free entries found, and we still haven't reached maximum + * allowable units. Allocate, setup a minimal unique entry with busy + * status so nobody will monkey on this new entry. Unit magic is set + * right here to avoid collision with other contesting handler. + * The caller must be carefull here to maintain its own + * synchronization, as long as it will not conflict with malloc(9) + * operations. + * + * That said, go figure. + */ + ce = malloc(sizeof(*ce), M_DEVBUF, + ((c->flags & SND_CLONE_WAITOK) ? M_WAITOK : M_NOWAIT) | M_ZERO); + if (ce == NULL) { + if (*unit != -1) + return (NULL); + /* + * We're being dense, ignorance is bliss, + * Super Regulatory Measure (TM).. TRY AGAIN! + */ + if (nce != NULL) { + ce = nce; + goto snd_clone_alloc_out; + } else if (tce != NULL) { + ce = tce; + goto snd_clone_alloc_out; + } else if (bce != NULL) { + ce = bce; + goto snd_clone_alloc_out; + } + return (NULL); + } + /* Setup new entry */ + ce->parent = c; + ce->unit = tmask | allocunit; + ce->pid = curpid; + ce->tsp = now; + ce->flags |= SND_CLONE_ALLOC; + if (after != NULL) { + TAILQ_INSERT_AFTER(&c->head, after, ce, link); + } else { + TAILQ_INSERT_HEAD(&c->head, ce, link); + } + c->size++; + c->tsp = now; + /* + * Save new allocation unit for caller which will be used + * by make_dev(). + */ + *unit = allocunit; + + return (ce); + +snd_clone_alloc_out: + /* + * Set, mark, timestamp the entry if this is a truly free entry. + * Leave busy entry alone. + */ + if (!(ce->flags & SND_CLONE_BUSY)) { + ce->pid = curpid; + ce->tsp = now; + ce->flags |= SND_CLONE_INVOKE; + } + c->tsp = now; + *dev = ce->devt; + + return (NULL); +} diff --git a/sys/dev/sound/clone.h b/sys/dev/sound/clone.h new file mode 100644 index 000000000000..38b57b85b3e4 --- /dev/null +++ b/sys/dev/sound/clone.h @@ -0,0 +1,127 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2007 Ariff Abdullah + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#ifndef _SND_CLONE_H_ +#define _SND_CLONE_H_ + +struct snd_clone_entry; +struct snd_clone; + +/* + * 750 milisecond default deadline. Short enough to not cause excessive + * garbage collection, long enough to indicate stalled VFS. + */ +#define SND_CLONE_DEADLINE_DEFAULT 750 + +/* + * Fit within 24bit MAXMINOR. + */ +#define SND_CLONE_MAXUNIT 0xffffff + +/* + * Creation flags, mostly related to the behaviour of garbage collector. + * + * SND_CLONE_ENABLE - Enable clone allocation. + * SND_CLONE_GC_ENABLE - Enable garbage collector operation, automatically + * or if explicitly called upon. + * SND_CLONE_GC_UNREF - Garbage collect during unref operation. + * SND_CLONE_GC_LASTREF - Garbage collect during last reference + * (refcount = 0) + * SND_CLONE_GC_EXPIRED - Don't garbage collect unless the global clone + * handler has been expired. + * SND_CLONE_GC_REVOKE - Revoke clone invocation status which has been + * expired instead of removing and freeing it. + * SND_CLONE_WAITOK - malloc() is allowed to sleep while allocating + * clone entry. + */ +#define SND_CLONE_ENABLE 0x00000001 +#define SND_CLONE_GC_ENABLE 0x00000002 +#define SND_CLONE_GC_UNREF 0x00000004 +#define SND_CLONE_GC_LASTREF 0x00000008 +#define SND_CLONE_GC_EXPIRED 0x00000010 +#define SND_CLONE_GC_REVOKE 0x00000020 +#define SND_CLONE_WAITOK 0x80000000 + +#define SND_CLONE_GC_MASK (SND_CLONE_GC_ENABLE | \ + SND_CLONE_GC_UNREF | \ + SND_CLONE_GC_LASTREF | \ + SND_CLONE_GC_EXPIRED | \ + SND_CLONE_GC_REVOKE) + +#define SND_CLONE_MASK (SND_CLONE_ENABLE | SND_CLONE_GC_MASK | \ + SND_CLONE_WAITOK) + +/* + * Runtime clone device flags + * + * These are mostly private to the clone manager operation: + * + * SND_CLONE_NEW - New clone allocation in progress. + * SND_CLONE_INVOKE - Cloning being invoked, waiting for next VFS operation. + * SND_CLONE_BUSY - In progress, being referenced by living thread/proc. + */ +#define SND_CLONE_NEW 0x00000001 +#define SND_CLONE_INVOKE 0x00000002 +#define SND_CLONE_BUSY 0x00000004 + +/* + * Nothing important, just for convenience. + */ +#define SND_CLONE_ALLOC (SND_CLONE_NEW | SND_CLONE_INVOKE | \ + SND_CLONE_BUSY) + +#define SND_CLONE_DEVMASK SND_CLONE_ALLOC + +struct snd_clone *snd_clone_create(int, int, int, uint32_t); +int snd_clone_busy(struct snd_clone *); +int snd_clone_enable(struct snd_clone *); +int snd_clone_disable(struct snd_clone *); +int snd_clone_getsize(struct snd_clone *); +int snd_clone_getmaxunit(struct snd_clone *); +int snd_clone_setmaxunit(struct snd_clone *, int); +int snd_clone_getdeadline(struct snd_clone *); +int snd_clone_setdeadline(struct snd_clone *, int); +uint32_t snd_clone_getflags(struct snd_clone *); +uint32_t snd_clone_setflags(struct snd_clone *, uint32_t); +uint32_t snd_clone_getdevflags(struct cdev *); +uint32_t snd_clone_setdevflags(struct cdev *, uint32_t); +int snd_clone_gc(struct snd_clone *); +void snd_clone_destroy(struct snd_clone *); +int snd_clone_acquire(struct cdev *); +int snd_clone_release(struct cdev *); +int snd_clone_ref(struct cdev *); +int snd_clone_unref(struct cdev *); +void snd_clone_register(struct snd_clone_entry *, struct cdev *); +struct snd_clone_entry *snd_clone_alloc(struct snd_clone *, struct cdev **, + int *, int); + +#define snd_clone_enabled(x) ((x) != NULL && \ + (snd_clone_getflags(x) & SND_CLONE_ENABLE)) +#define snd_clone_disabled(x) (!snd_clone_enabled(x)) + +#endif /* !_SND_CLONE_H */ diff --git a/sys/dev/sound/pcm/dsp.c b/sys/dev/sound/pcm/dsp.c index b9693908da43..9040c77893d4 100644 --- a/sys/dev/sound/pcm/dsp.c +++ b/sys/dev/sound/pcm/dsp.c @@ -43,14 +43,6 @@ #include #include -struct dsp_cdevpriv { - struct snddev_info *sc; *** 1855 LINES SKIPPED *** From nobody Fri Apr 5 10:43:31 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4V9w7l6vNqz5GBLL; Fri, 5 Apr 2024 10:43:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4V9w7l6Gfdz4k6p; Fri, 5 Apr 2024 10:43:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712313811; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ntG+0yTRmtEaBPwyFaPDesfyGpvNiKvH5ydPCMpJL9c=; b=ur+9wHnCO86JsDFDK1wWxdonYALH3/n9Cj5vfuv9If70zQjMnvwGeUnNGLyWgrF4pgPf68 3S78pN834Fg0CZwDkQZcJtbP2HrrxbJpF1BnNLAEqdV606oTkHTrBKNF+yeDn97EjX7AnC SroodWKFDb3bK7pZIuxryaeB/1wCZLsTcOPGBhl5Xx4f4Io4yVrltARQKpgckDVFpaSBvu v26y6uv8tZFnmTiP7kw/T301EpSdLwo2oVxkecxoU52UTh4WBCTUX3bz3+gWERaBSwj7aD q4yr08s8Vy7CS6Lv/G7kOLaKpcBD8npJRrPiar7v7bSTfPDOdaw17mjLlDH2Ug== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712313811; a=rsa-sha256; cv=none; b=qb5b4AASkJyoARjRSyyOdAnFpLF/PF7VArCAtSSUV14TaYeG0XbPxpYoXed0BcV4JHOQe8 Tm017++ypMhNdV55sWX6Eak4vo5pVizzMDzqaZPG7ny8YO/T41F2ycGduo43oxk9rT2Zms rEIbLjgakLqExyVCkSyCqUrExKt/umnacyV+t1+aT/Og/kZSka+fo7a7C+9jKVsS79RDwx 8OAYnlrDx2Jysed32Csh3073OpcKZM+HJtbSA2Ucz/cjN5vLcnJ47QCxbaIJlQMWSHZeDP 5zm6BBsyomJjZ5CPsaIPVyzvTbbrYYhdlAWjwvgjoQEWwzm4OfvOL9FghdvmTQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712313811; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ntG+0yTRmtEaBPwyFaPDesfyGpvNiKvH5ydPCMpJL9c=; b=qsl649xfxgqjZVkmdbu+Rcj8+RlqTNso7QzIg6HTiFHAjVcZ3UF089x+WX0VftiNfYWrcZ LpnkPvrkOlesXv3/PtrGRxXOp3guon1WScIiN1Nq+n9m3D26pXNbX6X9bVAE6lGQ6GUb7g Ij1NlhMYzlmfRr0xInATbAnTOPxpLjOox8vqGYegTEFwlbki4KMWhFreMEY+9NFeV8B47n qeI7Nv+CuF0cn59ajZVSM+Ud7bH3/8V73avmWyr1gIer0hh9726dPAFYe15ltMnEv3lLVO ToXifsNhwdv85I/6XFUcDVUbZien/9jb24tOWNo08nRhOMePsH5mvgeDaArf/A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4V9w7l5syszx1w; Fri, 5 Apr 2024 10:43:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 435AhVVJ019636; Fri, 5 Apr 2024 10:43:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 435AhVSu019633; Fri, 5 Apr 2024 10:43:31 GMT (envelope-from git) Date: Fri, 5 Apr 2024 10:43:31 GMT Message-Id: <202404051043.435AhVSu019633@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: 13952fbca7cd - stable/14 - pcm.4: Showcase default device change using mixer(8) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 13952fbca7cd3ce3ea3925465edeac298614f0d4 Auto-Submitted: auto-generated The branch stable/14 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=13952fbca7cd3ce3ea3925465edeac298614f0d4 commit 13952fbca7cd3ce3ea3925465edeac298614f0d4 Author: Christos Margiolis AuthorDate: 2024-03-29 15:59:55 +0000 Commit: Christos Margiolis CommitDate: 2024-04-05 10:43:24 +0000 pcm.4: Showcase default device change using mixer(8) Sponsored by: The FreeBSD Foundation MFC after: 1 week Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D44556 (cherry picked from commit d46a6a77e8e14177d07e3a53f68b428e5d1cb416) --- share/man/man4/pcm.4 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/man/man4/pcm.4 b/share/man/man4/pcm.4 index cd0d29519f0c..17ac499e6bb3 100644 --- a/share/man/man4/pcm.4 +++ b/share/man/man4/pcm.4 @@ -614,7 +614,7 @@ This is handy if there are multiple .Nm devices available: .Pp -.Dl sysctl hw.snd.default_unit=1 +.Dl mixer -d pcm1 .Sh DIAGNOSTICS .Bl -diag .It pcm%d:play:%d:dsp%d.p%d: play interrupt timeout, channel dead From nobody Fri Apr 5 13:38:41 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VB01t0kmGz5GTmp; Fri, 5 Apr 2024 13:38:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VB01s6rsxz42KX; Fri, 5 Apr 2024 13:38:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712324322; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JxlGM2MmmCJZ9IpDjBOypMMqADRoIdoUuCtBwkdLCpc=; b=flXEz7TAJrDRkpyJz/5pUSFloe7TRLaK7izVQmsqLmmhPwLfEyoL1WwhtnIkTWOcng5AcU 6MjBdGDhdsFm/OIscc9jUJLqgGuS9OBrPGI0b3F7YFC326tmCNHkpgboYGWxFzMFKOflrn Xc+fI6n7LcMD3NhwLm31X83iAyHQ24I5Ok9Y9P5ydkifpC7HP5zeDSSTxcqOFgv5apnhjB RfDYaKgmbwwFcl13fsahnA5GmvZAFkHAQeRYc8PannZv4GxvPPEZ1mreNzKEfOTKtfbEl7 EZ1vhq0u4HqaHlsg54S5loAxsF5MGNWuG5IeLtgIFfEhCZECVgouiItIW2P1Eg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712324322; a=rsa-sha256; cv=none; b=D8YvKDKbppkEd3b8R+VnjbHl2/J1/4j/IfqJjDTKdq75gZ7w0xzA6hqE+TVB66gMzOws8P SrmGbRt2q7EadOZwAr4rhQW/cXyZ1YWQfdtQ44O3/Q3UGExQ37g5cu/bbCyExI45TzKNLQ NPCf+Vhbc4DIVkHOq02Et52m2CunnSDQAq66TRZdQNkwJxTKm/YKXCx2Xrgn2GnBo/+1Dw w5ZL8JZGGr2jAfTpRkLc18QMgNDVuxYly8s2nDJfDbeYu/NSnO0S3s/KdPTDiWIzbBm2An eTEOy4TdFw8xDLA6W43SyD/GRM4Vw/71NKoNHH2tkqhZSJmakS5qX/CiCUYRjA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712324322; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JxlGM2MmmCJZ9IpDjBOypMMqADRoIdoUuCtBwkdLCpc=; b=Mk0gH9BwAusZ2E1IV8ffiS69EIwBgrSXhH4X0T86FIy/yS/yR6g35MZvAUy4K3tXkl7uOR TLa4EIKgr/n/B80kFXB9IaIqHHMeQIx3tj0roRH5KXBEvJICtLwDA7dhyp3SIlUTGXiViw uR2cQE03wYMCfjJ3LUP5bmTrJCWnGq9sqWx+KqssXAr1V40hvFEfmob84IhIO11RewN+uU 7Ojo/L8r2p34yXVHxWKNuCuBlItojMBKzH9sdixk9PUeIiSusugwMoFC1yPanejX5n/+1w iW4WMMLpz3XOWACN55SGp1+cIXRfDl2erwmAOD92kSdA0IYAUtxXoWkwXc/d8Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VB01s6Kjgz12Fd; Fri, 5 Apr 2024 13:38:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 435Dcfdb008175; Fri, 5 Apr 2024 13:38:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 435Dcf46008172; Fri, 5 Apr 2024 13:38:41 GMT (envelope-from git) Date: Fri, 5 Apr 2024 13:38:41 GMT Message-Id: <202404051338.435Dcf46008172@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Juraj Lutter Subject: git: bb4e55242ecb - main - Add OpenBSD 7.5 to bsd-family-tree List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: otis X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bb4e55242ecb03b3f6876114b0708b0efa85044a Auto-Submitted: auto-generated The branch main has been updated by otis: URL: https://cgit.FreeBSD.org/src/commit/?id=bb4e55242ecb03b3f6876114b0708b0efa85044a commit bb4e55242ecb03b3f6876114b0708b0efa85044a Author: Juraj Lutter AuthorDate: 2024-04-05 06:27:12 +0000 Commit: Juraj Lutter CommitDate: 2024-04-05 13:33:48 +0000 Add OpenBSD 7.5 to bsd-family-tree Summary: Add OpenBSD 7.5 to bsd-family-tree Subscribers: imp Differential Revision: https://reviews.freebsd.org/D44643 --- share/misc/bsd-family-tree | 3 +++ 1 file changed, 3 insertions(+) diff --git a/share/misc/bsd-family-tree b/share/misc/bsd-family-tree index e2aa0ceecc20..0b9cfce6f826 100644 --- a/share/misc/bsd-family-tree +++ b/share/misc/bsd-family-tree @@ -459,6 +459,8 @@ FreeBSD 5.2 | | | | | | *--NetBSD | | | | | 10.0 | | | | | | | + | | | OpenBSD 7.5 | + | | | | | FreeBSD 15 -current | NetBSD -current OpenBSD -current DragonFly -current | | | | | v v v v v @@ -889,6 +891,7 @@ OpenBSD 7.4 2023-10-16 [OBD] FreeBSD 14.0 2023-11-20 [FBD] FreeBSD 13.3 2024-03-05 [FBD] NetBSD 10.0 2024-03-28 [NBD] +OpenBSD 7.5 2024-04-05 [OBD] Bibliography ------------------------ From nobody Fri Apr 5 14:52:58 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VB1gZ6CbNz5Gbvv; Fri, 5 Apr 2024 14:52: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 4VB1gZ5Swfz4Gcn; Fri, 5 Apr 2024 14:52:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712328778; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aEQHxdp/TwrgIsY2qO+Fg7GhoADxqnZDQGuq7VGb1f0=; b=Rd4B8W3lfOx4LiXliaiRHaP0n4qxCpJ5fmjzka8rpCfWuH02eEZzxeNKbKgIzqcnW5u2i4 sqtQn0zXVHTxwqNci3nEXSw4zufHwOiljp1V9kclErsNd3TpjLJcyNGHbmo6mrjCr5GYs8 NwzxA/uk8gOROf4OSwbr4gyOBeCkzP0KsbyatmDeTPkbaOEJfNLjj4cXUQW31ywt2RwtNM /2Y39PgCeW4K9cPCy9lCTUTfz/lj8Iegss8CwKgNVev2X+1kC5/WlnToQVRWlbSWJJtZxQ Rc+lsjjWf+FUiXXgWrFd8/0jY06YoznBnE0zTXbEFVxmA4DiL5D7n9xulGUFPA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712328778; a=rsa-sha256; cv=none; b=DMOXD0DUgayfx9YbwnYs9dbK4cSjcrXFvGbk8sQ6hYF3tXnHpm2dRr09Lh6f0Vbpsf9AM8 w3izjcvcO8Fd9k4XY2b6p17BfsXup7V2RbDe4hcnb3Bfx528pzdIjEv5HxK+8NxaWtkWKa wF1Aup0SuehLQ30ZsdGirVablLaSKOiKx64gWqnIQiRhZT4pG6rtOuGpV+bl7MWSsCNpSv lOCstUp83X5hL/q89TXXK9Fe/VRmDo1uwNc5S9lAE+zi+ehMBjBWY7T5igBCjkwjAdRv38 w7Mx2KR5+jvWPHfYSQST9CyyvYL+uGb0BnwULBwRYQPXBfNNQtkCqKlGqt20cQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712328778; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aEQHxdp/TwrgIsY2qO+Fg7GhoADxqnZDQGuq7VGb1f0=; b=AA+6q5nWp6P6juOhooO/3e30l7gD6DDyx+xlT9/C5lV67FWtQK+5Dc2Nh4E8sd6Gf5PmND gkbrJ+KFEADpqo2ycMPlY8Pg7mHfgQeZrA5FtiMpUMgkBINs4MbG8v7pobYJ6xNxxrPKAp cXJQOx/931CpE4xmaBmuDgjL95YpyEvoirdpIkGAAbOCMYK36t2hBvRGEXZLR8Ec73J0aE zYElO4rhie3AlBnW3O7ogH6OjrxhUoVX7K5mPoCMqSpBdsSdtre4MFFFn+6jjAF11vI0f1 EgwW55vaP/3qSAJeqpqF/BjW5b8hiYAwrDMRQn2sDYQ3lU0flEMLiHIIp1W+tw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VB1gZ510Yz14Mg; Fri, 5 Apr 2024 14:52:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 435EqwiI042337; Fri, 5 Apr 2024 14:52:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 435Eqwhs042334; Fri, 5 Apr 2024 14:52:58 GMT (envelope-from git) Date: Fri, 5 Apr 2024 14:52:58 GMT Message-Id: <202404051452.435Eqwhs042334@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 235436d6311e - main - stop_all_proc(): skip traced or signal-stoped processes List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 235436d6311ea5ad00edcc1e553012f0736ea86d Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=235436d6311ea5ad00edcc1e553012f0736ea86d commit 235436d6311ea5ad00edcc1e553012f0736ea86d Author: Konstantin Belousov AuthorDate: 2024-04-04 19:24:32 +0000 Commit: Konstantin Belousov CommitDate: 2024-04-05 14:52:39 +0000 stop_all_proc(): skip traced or signal-stoped processes Since thread_single(SINGLE_ALLPROC) ignores them since 9241ebc796c, and there is not much we can do for the debugger-controlled process. Noted by: olce Reviewed by: markj, olce Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D44638 --- sys/kern/kern_proc.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/sys/kern/kern_proc.c b/sys/kern/kern_proc.c index 8a396e208ff6..2ecc82026b3f 100644 --- a/sys/kern/kern_proc.c +++ b/sys/kern/kern_proc.c @@ -3477,7 +3477,8 @@ allproc_loop: LIST_REMOVE(cp, p_list); LIST_INSERT_AFTER(p, cp, p_list); PROC_LOCK(p); - if ((p->p_flag & (P_KPROC | P_SYSTEM | P_TOTAL_STOP)) != 0) { + if ((p->p_flag & (P_KPROC | P_SYSTEM | P_TOTAL_STOP | + P_STOPPED_SIG)) != 0) { PROC_UNLOCK(p); continue; } @@ -3498,6 +3499,16 @@ allproc_loop: PROC_UNLOCK(p); continue; } + if ((p->p_flag & P_TRACED) != 0) { + /* + * thread_single() below cannot stop traced p, + * so skip it. OTOH, we cannot require + * restart because debugger might be either + * already stopped or traced as well. + */ + PROC_UNLOCK(p); + continue; + } sx_xunlock(&allproc_lock); _PHOLD(p); r = thread_single(p, SINGLE_ALLPROC); From nobody Fri Apr 5 15:16:19 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VB2BX1PT1z5Gdwh; Fri, 5 Apr 2024 15:16:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VB2BX0tPzz4KYm; Fri, 5 Apr 2024 15:16:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712330180; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=htiyXZblWuRBCv2r5t4WledZpeMfSFoa65aaTPjy6uY=; b=YkAMA+mlpZAcKJoHLN5OaBSVtwkAMUQd0AjiEH7PbqNw7VGUdjI5SE71hXhfjgU+sknyxx XZ5q/c12mdSDePw7PrxJHGJOZH97CDIIDZFm9D3lIx+vbf28EkgT3HfYWVFUcTjqX1ylmk CRjKYjeq7fDhDarxjooGQcssp/9Eq3FqVy11nHHUhA87u0hjmoYPFalVSgQJewMN9GrYsT O6Wo9QeggcEZv7il6j7EgylXObhFkrFGIKiMJNLDp4rmjFotbAeQ0L7CzQPkHGPXefNZam iR+FHYEvlqw4iQSvQHZMW5VcB+5L2nn4TgO0HNNYax1K24XzSqV1pQX22nqs8Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712330180; a=rsa-sha256; cv=none; b=Fozn8GdSv4Z2HSi3ZW+HQ4OPuFzOrzPdDM8/eQGxTKjsa9FllH2Rb6P2OECf4fdxdYeOyY i/QRz8eBEy7J4a+UlLLYA00Om0uDKRqTlCUShro958YVRpJKSjZ/H7RYa1Qd/w0UoVZntx 2RaFfORIj10asF+Lf1x3tN4qMurCxa/0C+s05To0TXRhDBmv+Bco317ZcO71ZAMpOeT07R BwEOaZ2Zcc6ZvJv1wjTQP6QQnrWx7z5bQkfX0uvYHcYZS9gVf5W2tpDPbqHHYp30AKV7Jw 6lQdsQeSDlD5GJrRVEdIfarVkmxKKBCu8DORzyiAjaPm7ZIE3vzPBGqDR6iCJw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712330180; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=htiyXZblWuRBCv2r5t4WledZpeMfSFoa65aaTPjy6uY=; b=PFsIR+ahFEllZeWC/tJHNLb67l98Fbj3vRwHJAvPvP+RJSPgYqTMXVjYLcj9p/eAQemvtT ADK4KOpFS9ME3/5Qe65HO/7wqPoef5Vu8W9eW0g16hJDHd/RHJ3o/wawqxARs6+XzRLcjM 2GEFkUp5WVGTEsMRJ9ww+tePVIbkmg70tVZuRD13sORRaeTt/3PP9s+eAy/hO8seTK0dx7 9PmNwPpxLJLCh5kF4K1F20c3k80N+CQx4e90YayQrHa8Ajz4juQCfYOT1hPaS2P5ziH19E pT+vHXvFBhDb7pQ2jTAELFJ9wM88HxN7MPK3jZ2x3iAiqZI2lUlrGLVhxi54sA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VB2BX0Mj1z14x2; Fri, 5 Apr 2024 15:16:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 435FGJoZ077741; Fri, 5 Apr 2024 15:16:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 435FGJ3E077738; Fri, 5 Apr 2024 15:16:19 GMT (envelope-from git) Date: Fri, 5 Apr 2024 15:16:19 GMT Message-Id: <202404051516.435FGJ3E077738@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 663a704a5845 - main - VOP_BMAP.9: Typo List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 663a704a58455087f83b4ab51ad7a572e6f03d5f Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=663a704a58455087f83b4ab51ad7a572e6f03d5f commit 663a704a58455087f83b4ab51ad7a572e6f03d5f Author: Mark Johnston AuthorDate: 2024-04-05 15:14:28 +0000 Commit: Mark Johnston CommitDate: 2024-04-05 15:14:28 +0000 VOP_BMAP.9: Typo MFC after: 1 week Sponsored by: Klara, Inc. --- share/man/man9/VOP_BMAP.9 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/man/man9/VOP_BMAP.9 b/share/man/man9/VOP_BMAP.9 index 8db1d724e810..82dda716fd70 100644 --- a/share/man/man9/VOP_BMAP.9 +++ b/share/man/man9/VOP_BMAP.9 @@ -58,7 +58,7 @@ Return storage for the number of succeeding logical blocks that may be efficiently read at the same time as the requested block. This will usually be the number of logical blocks whose physical blocks are contiguously allocated. -However a file system is free to define "efficient" as it see fit. +However a file system is free to define "efficient" as it sees fit. .It Fa runb Like .Fa runp From nobody Fri Apr 5 15:16:21 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VB2BY396Hz5Gf00; Fri, 5 Apr 2024 15:16:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VB2BY1RNTz4Kg4; Fri, 5 Apr 2024 15:16:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712330181; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gCJ/utW2tc4iXH+oVojh2qRmANlZ3NR7u8oKMHnZcJA=; b=QXnlKHP20p9UVXkHgJlE287o39NjOuH3tMvBthpg+6f6LLGVnJ36zCTCxtpzjZTwalgR8B D7Buex/4JqkwXC66MaEIN5Jagxzi7QG0L9z6BFqhfTiz0+Ptr4v588Yva4kB6RsYX0ReKR DuzSVfzBwNboXRnXUq1fUIgaBvQ6eiohIpP9KXyRqSOic4QAorczB4hnXggpsSPsNpkKZo NpzhB7QY5M1yyZ93rr30L3DS5zsmPiBq0i7IzJtMcvAl7+D3qzTBbGd2fadGzKFJjaXV36 NRCtamn0puD2XkOpoXddRltTwz+EEEA7zrs1Rj1zT6YMn0Z9Mrc2OohrLqo+nA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712330181; a=rsa-sha256; cv=none; b=koT9iPjEuAjrkMUaW8422qOwGaimOyzLWgC++n6Dnfpv2Ld3PGth6FlY03bUP9lUndgUej shRRkYsS3vsBe1FRxpUhmhg8g1WJyhqjOslFDHUE670FBHmj1n6WS4UghhlGRit/p4/Rkx B4o4KUC+To8InKXuCPjJPeRhsX3cb+iXE0GPn46OVAcKuq7dRKJ+Q6OqV2dOHbFLumkB2x dqYYaT8NHaLRRmR68LtPGLAzoY19YZ8hAhZ+7h+EINQiA2JzjktVhgLH0c4QkTkybTrlBS ZHrz685pPNJUqPE38Bkvk+G4XO5vlIFwbtEB7uMqF7mm9pZiex7hUQNAt4iI3g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712330181; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gCJ/utW2tc4iXH+oVojh2qRmANlZ3NR7u8oKMHnZcJA=; b=woKe7ErpqAB2fWVf3/rQHcQW0wphF47D71E+fvGaHPNPjFWKQX5Tvguy9Pi1pMrgSVtf87 UtZJxyrxNzbjp4B+ijsj9NedRbPHfhVohoHp079smN2y1JtQxQ26U6eeXb4HBGTEUMpXKo lcG7roskEKFx3JOZd6pDfzmy96xXOcnpP1kbBd4PPC2oEgwVjFhtscZOhg3uE5xHaYJ7Dh rmYYVdqootnz7NlvNUnK/U4La8Ni2P6/A6JnsGH7gMaUD2W1KEeJXoJbS7B1ZlXGI6i+58 HEUytGnVv2DBi87OrqcCbXPgObzAqNW6v2wvSoKgnH1Zovmn2rYOgP1doI71ZQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VB2BY13rWz14rH; Fri, 5 Apr 2024 15:16:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 435FGLXS077777; Fri, 5 Apr 2024 15:16:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 435FGLSe077775; Fri, 5 Apr 2024 15:16:21 GMT (envelope-from git) Date: Fri, 5 Apr 2024 15:16:21 GMT Message-Id: <202404051516.435FGLSe077775@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: a0895e394d3f - main - tarfs: Implement VOP_BMAP List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a0895e394d3fec374e61a207bdfa0245dae86f53 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=a0895e394d3fec374e61a207bdfa0245dae86f53 commit a0895e394d3fec374e61a207bdfa0245dae86f53 Author: Mark Johnston AuthorDate: 2024-04-05 15:14:36 +0000 Commit: Mark Johnston CommitDate: 2024-04-05 15:14:36 +0000 tarfs: Implement VOP_BMAP This lets tarfs provide readahead/behind hints to the VFS, which helps memory-mapped I/O performance, important when running faulting in executables out of a tarfs mount as one might if tarfs is used to back the root filesystem, for example. The improvement is particularly noticeable when the backing tarball is zstd-compressed. The implementation simply returns the extent of the virtual block containing the target offset, clamped by the maximum I/O size. This is perhaps simplistic; it effectively just chooses values that would correspond to a single VOP_READ call in tarfs_read_file(). Reviewed by: des, kib MFC after: 1 month Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D44626 --- sys/fs/tarfs/tarfs_vnops.c | 55 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) diff --git a/sys/fs/tarfs/tarfs_vnops.c b/sys/fs/tarfs/tarfs_vnops.c index 7a04f891350e..f2828c60f8a7 100644 --- a/sys/fs/tarfs/tarfs_vnops.c +++ b/sys/fs/tarfs/tarfs_vnops.c @@ -125,6 +125,60 @@ tarfs_access(struct vop_access_args *ap) return (error); } +static int +tarfs_bmap(struct vop_bmap_args *ap) +{ + struct tarfs_node *tnp; + struct vnode *vp; + off_t off; + uint64_t iosize; + int ra, rb, rmax; + + vp = ap->a_vp; + iosize = vp->v_mount->mnt_stat.f_iosize; + + if (ap->a_bop != NULL) + *ap->a_bop = &vp->v_bufobj; + if (ap->a_bnp != NULL) + *ap->a_bnp = ap->a_bn * btodb(iosize); + if (ap->a_runp == NULL) + return (0); + + tnp = VP_TO_TARFS_NODE(vp); + off = ap->a_bn * iosize; + + ra = rb = 0; + for (u_int i = 0; i < tnp->nblk; i++) { + off_t bs, be; + + bs = tnp->blk[i].o; + be = tnp->blk[i].o + tnp->blk[i].l; + if (off > be) + continue; + else if (off < bs) { + /* We're in a hole. */ + ra = bs - off < iosize ? + 0 : howmany(bs - (off + iosize), iosize); + rb = howmany(off - (i == 0 ? + 0 : tnp->blk[i - 1].o + tnp->blk[i - 1].l), + iosize); + break; + } else { + /* We'll be reading from the backing file. */ + ra = be - off < iosize ? + 0 : howmany(be - (off + iosize), iosize); + rb = howmany(off - bs, iosize); + break; + } + } + + rmax = vp->v_mount->mnt_iosize_max / iosize - 1; + *ap->a_runp = imin(ra, rmax); + if (ap->a_runb != NULL) + *ap->a_runb = imin(rb, rmax); + return (0); +} + static int tarfs_getattr(struct vop_getattr_args *ap) { @@ -629,6 +683,7 @@ struct vop_vector tarfs_vnodeops = { .vop_default = &default_vnodeops, .vop_access = tarfs_access, + .vop_bmap = tarfs_bmap, .vop_cachedlookup = tarfs_lookup, .vop_close = tarfs_close, .vop_getattr = tarfs_getattr, From nobody Fri Apr 5 15:18:01 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VB2DV0xD2z5Gf7V; Fri, 5 Apr 2024 15:18:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VB2DV0Qr8z4LJ2; Fri, 5 Apr 2024 15:18:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712330282; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qcfSwMX5t2bw2BQZ0gnQdjsyBswp5fu/GrYe440k9zk=; b=rLCbyK56dw5P69qle4D3UbKVMghbmJ6Icbd/yLPHq/USaTkcwhtCQVKgMu5TT2Sxeecutf 5di6jpkKY6Yb8AAQU6Y9rOqrzdddl1s7DZX2LLErBl5oOW8a4JfDLWJZ++8rPEu0OPDdTM n7VpVwOcGWwai/ymscyuA7yBEgTX2j2MlJE3/N7zLrOHhmJwCFmJsNeeq+aAeCYbNH/+FH 3mTVg/MnglUyNyzwPks9jVl8ZtZekVBLrTYXgH9zTIsOVC0D2y9IwgvzxJFMaPe1fva+2k 2AgLdrJbmHnUf8uAb+wswky45HbxRjAPBbuQC7ZyHoxbKaSF/qRbIsDew8WQRg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712330282; a=rsa-sha256; cv=none; b=jGzmD5bY7hjMF4jGdzNUshkJnCz49DbVcvwL2j88mMfwa8kBud2N7uI/TTEAjFNt9rIACv uKG649LyRVfXzv8emSYipAa7h7EPnL6ELjQ/x+QNrtA1yHp09kVDD2AMMo5du1uEy+kle8 uSxhqBdbLpe1BD4xXqdEYm6ldYWzEc+KNMgRUoG3p76GvetX3y6w6FEHe8kGkpfK4wg6YQ yFQYCnHVJtES3DP2+PlQxLBeUSqeirUOhhZVAHnevPV7DG0FcFG5XFlhNC1FzaqJ41ekD+ 9gYWDN8So3DU2ehhkv/TNuvki9cbmui0EywsC2tkIVMODuB/fWQchY/Hu/52yQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712330282; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qcfSwMX5t2bw2BQZ0gnQdjsyBswp5fu/GrYe440k9zk=; b=WYTkbQS5hlvIbHfkCqzq7LI8Yedlj9xRd0MYftejiZNF5jsjIP/ZuqP+52OF/wzwCn8trA 5lI9QpqPe5dH/TNI4u5We2oW5x2rIpUCNb9adASrTK+HWDGRQEKjyTetbKOIYTI7xEdmdb /jHIqLC/l59a2fAXgA4D+HWCazAlJZF3J7u8inHUMHH1xnnvv7MqrpJfu1C0KfU3st6yiK kXGLwQfulktSMTfHW52b5H7J562E/zQuCWLeCl6vVQmlqvt2GTuROmkELlelveIqLHSYpc eq+FnR7s9NeEmAmgLug7NXPhk0ny+EsNjpGbVmSXqcMizWumIAzP9JXBLD2ReA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VB2DT71J9z14x3; Fri, 5 Apr 2024 15:18:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 435FI1Kv078239; Fri, 5 Apr 2024 15:18:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 435FI1nj078236; Fri, 5 Apr 2024 15:18:01 GMT (envelope-from git) Date: Fri, 5 Apr 2024 15:18:01 GMT Message-Id: <202404051518.435FI1nj078236@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: de937ecb75ed - main - acpidump: silent the warning about unaligned uuid List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: de937ecb75ed4d61fc06dd380f9bf6be998502e9 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=de937ecb75ed4d61fc06dd380f9bf6be998502e9 commit de937ecb75ed4d61fc06dd380f9bf6be998502e9 Author: Konstantin Belousov AuthorDate: 2024-04-03 02:58:28 +0000 Commit: Konstantin Belousov CommitDate: 2024-04-05 15:17:55 +0000 acpidump: silent the warning about unaligned uuid The field comes from the ACPI NFIT table and must be already properly aligned by BIOS (at least so is written in the spec). Reviewed by: markj Sponsored by: Advanced Micro Devices (AMD) Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D44634 --- usr.sbin/acpi/acpidump/acpi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/acpi/acpidump/acpi.c b/usr.sbin/acpi/acpidump/acpi.c index 8b749f100eac..cc2ac6f19cb4 100644 --- a/usr.sbin/acpi/acpidump/acpi.c +++ b/usr.sbin/acpi/acpidump/acpi.c @@ -1596,7 +1596,7 @@ acpi_print_nfit(ACPI_NFIT_HEADER *nfit) printf("\tRangeIndex=%u\n", (u_int)sysaddr->RangeIndex); printf("\tProximityDomain=%u\n", (u_int)sysaddr->ProximityDomain); - uuid_to_string((uuid_t *)(sysaddr->RangeGuid), + uuid_to_string((uuid_t *)(uintptr_t)(sysaddr->RangeGuid), &uuidstr, &status); if (status != uuid_s_ok) errx(1, "uuid_to_string: status=%u", status); From nobody Fri Apr 5 15:18:02 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VB2DW1vgpz5Gdwq; Fri, 5 Apr 2024 15:18:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VB2DW12QFz4LR8; Fri, 5 Apr 2024 15:18:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712330283; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=POQrk98BjLybieVEy0eO5ZowNm84v51c169GB/f9VIM=; b=fvRmv12RX3vXZHbpVLt7oN8v5rYMj21aIRhBRTTBexq/kxYWlNvZxbpBJe99tDCoL5om4k qg8Bp2x67AMx9aVZn/5gngeJoAraZCokA+gzdXZr8ZNAhcE4C8rkphQNv7Ycr84+PZhULY LNA8TZNqyvwaw5Yb06tQivGFZQA/qpG/IOdk9Ht3XQZ4rGnsWa1VDhsS0RUU0Ozi9JAn/6 UdhjClLgmGw1nXioIpAKGp0QhyHmgtqH272yDpRwhSwEGBiLrfQoUczO2wyFkyt5BXCGLU iD1IW9S22zH6PmmFDx53ryOT1V4LEkqbqTuIkdJSWi2OVTtOwDRWtu0wdYUlEg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712330283; a=rsa-sha256; cv=none; b=b4wtABtfvLgjT3GajVAm9t8d4gliFfvrgOAbzWswkaRmrrQxrsgqkMuSZgbUWWQ3mGGB4y Q+kSF7hw547v3ybrNqy2sD/xWg+73HIxIgSLO8dy4NekGw+OOpjUEwQodnQtB3+p6xDkvg ctsc74cPt/WljTNwFOuC3DaOb5pemd82iHVU4ifZ9zjFhbkXjTgSXyxSQljjuuNYkhdAS8 LHl5Ml2zh0ZFAlpR2oLxnIN3vPhJABWdY6IlKJ6aDhCyrzUXFQp8E0uHmG1c8EAs+om3+W Bq0eDzC1mvR3Fte3+x4y4ShnaUXS6DOfyMKRllqE9lxJnPqZtwibKl50WroZpg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712330283; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=POQrk98BjLybieVEy0eO5ZowNm84v51c169GB/f9VIM=; b=ucPhzkCrGbNoUPqcibJhdNeu8tFzlSRc/h7JHTVm+8nfyIkKzDTen26i4e466LmAti9p8h wjegpGazuasdD94wcoo/DYh9LU/C4RqyEmO0Hv/d7MqMOTjowujN1I0pmhl8stBr1pBx88 Q9ZIz8jsySaY1GpKFEiibtd48PKbn24MTt76m2HeKeznIc6CPRjQoTTgEJF6nryLEKR0Is JAE05V6QgT9BrEy5/uCKsAKZXNhoZINgOY7pYef26v0Tu2KFhW/6nE7UleRAB3whj208OO RT42llVbEQntAwhsK8VnVmeJY8gc73NWmNY3lGBuB2VEvVhocbCGUGyvAWdPtQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VB2DW0g4jz14x4; Fri, 5 Apr 2024 15:18: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 435FI2I0078288; Fri, 5 Apr 2024 15:18:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 435FI2C0078285; Fri, 5 Apr 2024 15:18:02 GMT (envelope-from git) Date: Fri, 5 Apr 2024 15:18:02 GMT Message-Id: <202404051518.435FI2C0078285@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 4262ad56a074 - main - acpidump: the acpi_get_fadt_revision() argument is unused List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4262ad56a074b973f18fee09bb03d52153bd35c2 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=4262ad56a074b973f18fee09bb03d52153bd35c2 commit 4262ad56a074b973f18fee09bb03d52153bd35c2 Author: Konstantin Belousov AuthorDate: 2024-04-04 15:42:36 +0000 Commit: Konstantin Belousov CommitDate: 2024-04-05 15:17:55 +0000 acpidump: the acpi_get_fadt_revision() argument is unused everywhere except i386. Reviewed by: markj Sponsored by: Advanced Micro Devices (AMD) Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D44634 --- usr.sbin/acpi/acpidump/acpi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/acpi/acpidump/acpi.c b/usr.sbin/acpi/acpidump/acpi.c index cc2ac6f19cb4..e3190fa98ad4 100644 --- a/usr.sbin/acpi/acpidump/acpi.c +++ b/usr.sbin/acpi/acpidump/acpi.c @@ -209,7 +209,7 @@ acpi_print_gas(ACPI_GENERIC_ADDRESS *gas) /* The FADT revision indicates whether we use the DSDT or X_DSDT addresses. */ static int -acpi_get_fadt_revision(ACPI_TABLE_FADT *fadt) +acpi_get_fadt_revision(ACPI_TABLE_FADT *fadt __unused) { int fadt_revision; From nobody Fri Apr 5 15:18:04 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VB2DX3jtRz5Gf2M; Fri, 5 Apr 2024 15:18: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 4VB2DX247Bz4LLj; Fri, 5 Apr 2024 15:18:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712330284; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QI2DYSNUZGRhph7JxmVaLs1y21hZQdxDGU347TXtgPQ=; b=RLj1h0LPzqs0Lnq+uTlTs8OMtzIWcQa+zVzrU49pF/kXRCbQoiGxpUblLMwtl8yZxs+53i WXSjVKORtxv4PYkZ1zGsn5HylkA2qZV9J0g9KtaarmPcNrNuYovqKofv9g8QCLJC7Wnp2F 8M3MntwFePcnkZhEOxgsRGs1IqqsAJGOGXttUexNva0UgiLjGdWRdCJAITG5zAJCsH+hiE 1fY6SbFoOyw7JrLpAUJZEhNQjbQbx5/LBQgfgLBAkmyuXfuMWx75ePIkzmjAHOk+oyah7J Bv/dl4hPSbJH4cq/9JuTbXvNxyNafc9d2NbOuBN7RK/1rBCIZB8qRVLRmwt7ng== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712330284; a=rsa-sha256; cv=none; b=X2D8oFUqzO+d+h+i3nZYjiyJ/7AR3tt/X8cyrz7z9j3AaOYNlshy6mNkWSMrK81wNww70Q 2rxg16K19NbIk7qfhm5q9GDGtthX+e+0yIEzsWiwcULd7A4/WRnlTmYPq+UhYiURPrdJMc +IRbE7WizmJuVMC2wnXiAEi4Idg+9OSWhn7HdDPN/0IR7vmh1XPLoOBiuAgPijidrsTeS9 FJh7CMhYrLq+FIP87IX1ZFLa7BuUUOxDBIJpiVm0A+YVQ3SQUv+s/UUXiSe3LHlGxGzoZ5 gbsgb/mlEH2dIYJA4sCbbtc+cQX5oy3LmOR+5RjRJSHFF1u0rF1iDxKq5KN7pw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712330284; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QI2DYSNUZGRhph7JxmVaLs1y21hZQdxDGU347TXtgPQ=; b=kuLVBfO5+/EgIE+2PrflkCRqgwXpcVIDR7MmEML/EjbRy2LClhGpEmiTIxQ4USNrH1Zl0G eVH0pP6gx4J6wDCvF6DdNK3wLz0pO1MvcXX0EzN3JgmHl/FIl6oONnFAMbGIbyj7RSpkfY GyVhAE0Kmr0/C5HcbyLlrWpkD7wBIsKyjy/c7SBpPWGw7C6TO4TChJWAJcLhti9OwfXIJU vd5iD+NTuEYQfB5gW4jxMq+BAz7qPTkazURsOtmbOc0I5/qmnhcyxALdW35SBz4UR4kuG6 6JMdDtksRNV4akB0TTwWrVUWU66D49Mh4JP6GM/MT3ySAadGZ0Mt1Yyr/xUpQg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VB2DX1hHkz14x5; Fri, 5 Apr 2024 15:18: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 435FI4w9078330; Fri, 5 Apr 2024 15:18:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 435FI4WK078327; Fri, 5 Apr 2024 15:18:04 GMT (envelope-from git) Date: Fri, 5 Apr 2024 15:18:04 GMT Message-Id: <202404051518.435FI4WK078327@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 29a6b72775ee - main - acpidump: bump WARNS to 6 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 29a6b72775eeed08a5ecb8f6c1b0c364196d73df Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=29a6b72775eeed08a5ecb8f6c1b0c364196d73df commit 29a6b72775eeed08a5ecb8f6c1b0c364196d73df Author: Konstantin Belousov AuthorDate: 2024-04-03 03:00:25 +0000 Commit: Konstantin Belousov CommitDate: 2024-04-05 15:17:55 +0000 acpidump: bump WARNS to 6 and disable warnings about unused function args coming from the vendor acpi headers. Reviewed by: markj Sponsored by: Advanced Micro Devices (AMD) Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D44634 --- usr.sbin/acpi/acpidump/Makefile | 1 - usr.sbin/acpi/acpidump/acpidump.h | 3 +++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/usr.sbin/acpi/acpidump/Makefile b/usr.sbin/acpi/acpidump/Makefile index 9bd54a80f779..d0bb14284c1a 100644 --- a/usr.sbin/acpi/acpidump/Makefile +++ b/usr.sbin/acpi/acpidump/Makefile @@ -2,6 +2,5 @@ PROG= acpidump MAN= acpidump.8 SRCS= acpi.c acpi_user.c acpidump.c -WARNS?= 3 .include diff --git a/usr.sbin/acpi/acpidump/acpidump.h b/usr.sbin/acpi/acpidump/acpidump.h index 857d230bb871..80f86a748d76 100644 --- a/usr.sbin/acpi/acpidump/acpidump.h +++ b/usr.sbin/acpi/acpidump/acpidump.h @@ -30,9 +30,12 @@ #ifndef _ACPIDUMP_H_ #define _ACPIDUMP_H_ +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wunused-parameter" #include #include #include +#pragma GCC diagnostic pop /* GAS address space ID constants. */ #define ACPI_GAS_MEMORY 0 From nobody Fri Apr 5 15:18:05 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VB2DY5bFpz5Gdwt; Fri, 5 Apr 2024 15:18: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 4VB2DY34TTz4LZC; Fri, 5 Apr 2024 15:18:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712330285; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=02BQRER3mK4QfJoK8dYfroOaIDam1nCy15Be/oLGiHU=; b=EciU5nfGTuN+xgO9wmxV1unNZBbHysL6r6JeaNZ+qz6ES6UZrDq3wv0AM8wDITKBjmUsVO Y+0ExyUIDZ6qZBe4hg9XTMk4HCOOMSzOgFIs1SnSZtIXwDYD/lUhJ7u/rySrYz9DDR17TA MahQyTeLCJaVBMRNm6l3y3KHuulDmhRdPiRfuXOe4uobwsWUjc5BY2QCQ8L3CTP/0KABxD FExpkS30ztLowqtkNYogTrWIZhmpknkBnuWddwqOno/PY0YU6JwHpFBlgRuzGFmxMV/ghg v39SWl6KpxOy8epvZBUtmu4nSwmVuRkD6C4OAu9585dONG7C8hi2ZsQjf5BbMg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712330285; a=rsa-sha256; cv=none; b=MB/twNH/J+qagg/na5WL3HBkxwME76Y1XaiEdBC/z5PvVO2dr8vIPA6LTvWH8mfl3vAAwd ImY2fkhD2Ipoir2m07oOp1lcxU9/2rmqa+ELIx/v+bInkefqbsZ8Z81yWvKGRYNUT/kW27 dolCiqZ2IZxuTRER/DGtdnaYw+V2YgS26YF243glrE5fc7ZjOKCQRlh7Z+V8t4YkzkPOfP IjyygaGi2tdtfik3Dz/Pdub+A7EkDvUoGANkaCE29CGYV0e9NwPj6rqMKfQezHa66/QtCU KS2JQFzzZJWEOq+ATyVGIaILB/OzcCQcUgGAiutbd0MlOfpIqVC+Q7cTPNz9wQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712330285; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=02BQRER3mK4QfJoK8dYfroOaIDam1nCy15Be/oLGiHU=; b=qxROR86mxOx2/7SWbnrqftvpnH/kkhjwoSKqojazYYX9yxv03mu4td4wfiSwbhZiIiSOnZ JKBJhmQyoH5g4L5qAuMRnW4H17TkcKS0NM5IQfdtaGOHpAiyWrC1JvD6ItxJhmwht9rKJK 3xHYwTMqKS2HMDAJrJNA85O0av34Oimr+O8vg5LoLEi7tGH58yHX4GsEUmQwkfd9q4HcQk IxhleOv+rzk4mi1YUBehK1Qfn7/dnhsi1V9B1ttKv0TxAbtVjtbsGXwE5GftGLkQ0Sfc3O jbP928eKDkf9V6pWTf7SUUXTgToA4doXnpnn3EvaxNogx9KQGDR+n5TuWgT/eA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VB2DY2hgwz14nf; Fri, 5 Apr 2024 15:18: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 435FI5lI078369; Fri, 5 Apr 2024 15:18:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 435FI5ID078366; Fri, 5 Apr 2024 15:18:05 GMT (envelope-from git) Date: Fri, 5 Apr 2024 15:18:05 GMT Message-Id: <202404051518.435FI5ID078366@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 969a4b8be5a7 - main - acpidump: add printfield() helper List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 969a4b8be5a7d8edf55bd8945a5a071f57386b0e Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=969a4b8be5a7d8edf55bd8945a5a071f57386b0e commit 969a4b8be5a7d8edf55bd8945a5a071f57386b0e Author: Konstantin Belousov AuthorDate: 2024-04-04 04:49:21 +0000 Commit: Konstantin Belousov CommitDate: 2024-04-05 15:17:55 +0000 acpidump: add printfield() helper Reviewed by: markj Sponsored by: Advanced Micro Devices (AMD) Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D44634 --- usr.sbin/acpi/acpidump/acpi.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/usr.sbin/acpi/acpidump/acpi.c b/usr.sbin/acpi/acpidump/acpi.c index e3190fa98ad4..322fcaed2dc0 100644 --- a/usr.sbin/acpi/acpidump/acpi.c +++ b/usr.sbin/acpi/acpidump/acpi.c @@ -156,6 +156,18 @@ printflag(uint64_t var, uint64_t mask, const char *name) } } +static void +printfield(uint64_t var, int lbit, int hbit, const char *name) +{ + uint64_t mask; + int len; + + len = hbit - lbit + 1; + mask = ((1 << (len + 1)) - 1) << lbit; + printf("%c%s=%#jx", pf_sep, name, (uintmax_t)((var & mask) >> lbit)); + pf_sep = ','; +} + static void acpi_print_string(char *s, size_t length) { From nobody Fri Apr 5 15:18:06 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VB2DZ6XqJz5Gdrj; Fri, 5 Apr 2024 15:18: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 4VB2DZ4MWRz4LJZ; Fri, 5 Apr 2024 15:18:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712330286; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HyNcSnu68oLC7oPbMcS6aL4ikclBGmK1XS6CgEvXUKU=; b=SYm7pfg57VJBRVEmF7+hbvGefmQpabflA+OYVJxA6KC87ZMhNvCzBRbW0wTw38fFJHe5a7 ubB7TNoCsvGN0zZJtfzDwMmfUGYnMf6ADk97bfAKH1sWh5QntEUaCUykYph99UJDjUjHUd u1fmEBdwhTAhJW2AJSLV6MWJLrnEZXPlv28tO4F7f+3k2sBUetilDnB0TFKYXa9J08FKSx VlVKW0pGqqXU/90kSxhY8eG/6QljBw17hWe1pvsxXNqjnmSXvQNm71jrXkVIOvInEhi7PL LvqYxfe7twny02ammPqAWltcocdE/iV7BQ0VjCPC+hMQUxAp4uflrbBJ71caWw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712330286; a=rsa-sha256; cv=none; b=GXZfnKnU7aSIofxfGLlsgAqDLLIcsoKWeLt/ETGUscZYvqsTkdkc0zQHK/QvDch2ZNWByn tn06+R0lZEyFKsQDJLbZ78byD586Kc9/WPQV0vDL0fh9SMGVp2nogHnrefzAdYeEf/XRkC pnKSz72+VLD2s4ow1NnmRkfYx9ryX8c5WdtI7Vn4oRlSVEfi5jrEQeB8FMVkCaYa0wyq+F YsuXp2jYgmwjjZ05khXHGAZY7t+Y8j5emwGrCojjy414mtcMIYREr5LIU4uhklEvMdcjNX UUxNAdPiFtTWCf2jFbaaqOr+2N3Ezic1kwbgQ4GMo2F5QEOb2TNuAGJ8irwvWA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712330286; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HyNcSnu68oLC7oPbMcS6aL4ikclBGmK1XS6CgEvXUKU=; b=M/H7a7Ib5aNC2Akxr+uINAJKcidIquft0lc+hl+rDbLLSIWXONKNfyyuXhDhSEbniZanKh o5QGl/6d3gd755IXO3Y0mlghaqzc9+bLPVHYW9LPZ4kLX/LfMgWM371ZClPOLj1k3TfVZc /BT/GS0Qn1wbpsvvPVGuZtSto236+jZN/K/I+sbDi/EVFLlBUT2UCJdmzelbwPVTGGbWVi 4qGLIKY+W9xh6dxkqABMbZacLtbz3HympR8D+RlT0dtSQOFjAnBTsfaZnu+/wXeAaoe8SB refh5IF7ocyLU5Z0FBN+1vOoMdHs8n677nvQkD9xOHAMR/y/sysQNlKWc+315Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VB2DZ3hhKz14x6; Fri, 5 Apr 2024 15:18: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 435FI6j0078420; Fri, 5 Apr 2024 15:18:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 435FI6b7078417; Fri, 5 Apr 2024 15:18:06 GMT (envelope-from git) Date: Fri, 5 Apr 2024 15:18:06 GMT Message-Id: <202404051518.435FI6b7078417@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 6d789b6126af - main - acpidump: dump AMD IVRS table describing IOMMU layout List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6d789b6126afe1c23b65eef2c5cf4c6bd258c26f Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=6d789b6126afe1c23b65eef2c5cf4c6bd258c26f commit 6d789b6126afe1c23b65eef2c5cf4c6bd258c26f Author: Konstantin Belousov AuthorDate: 2024-03-31 23:30:37 +0000 Commit: Konstantin Belousov CommitDate: 2024-04-05 15:17:55 +0000 acpidump: dump AMD IVRS table describing IOMMU layout Reviewed by: markj Sponsored by: Advanced Micro Devices (AMD) Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D44634 --- usr.sbin/acpi/acpidump/acpi.c | 372 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 372 insertions(+) diff --git a/usr.sbin/acpi/acpidump/acpi.c b/usr.sbin/acpi/acpidump/acpi.c index 322fcaed2dc0..e3e426758025 100644 --- a/usr.sbin/acpi/acpidump/acpi.c +++ b/usr.sbin/acpi/acpidump/acpi.c @@ -36,6 +36,7 @@ #include #include #include +#include #include #include #include @@ -1496,6 +1497,375 @@ acpi_handle_dmar(ACPI_TABLE_HEADER *sdp) printf(END_COMMENT); } +static void +acpi_handle_ivrs_ivhd_header(ACPI_IVRS_HEADER *addr) +{ + printf("\n\tIVHD Type=%#x IOMMUId=%x\n\tFlags=", + addr->Type, addr->DeviceId); +#define PRINTFLAG(flag, name) printflag(addr->Flags, flag, #name) + PRINTFLAG(ACPI_IVHD_TT_ENABLE, HtTunEn); + PRINTFLAG(ACPI_IVHD_ISOC, PassPW); + PRINTFLAG(ACPI_IVHD_RES_PASS_PW, ResPassPW); + PRINTFLAG(ACPI_IVHD_ISOC, Isoc); + PRINTFLAG(ACPI_IVHD_TT_ENABLE, IotlbSup); + PRINTFLAG((1 << 5), Coherent); + PRINTFLAG((1 << 6), PreFSup); + PRINTFLAG((1 << 7), PPRSup); +#undef PRINTFLAG + PRINTFLAG_END(); +} + +static void +acpi_handle_ivrs_ivhd_dte(UINT8 dte) +{ + if (dte == 0) { + printf("\n"); + return; + } + printf(" DTE="); +#define PRINTFLAG(flag, name) printflag(dte, flag, #name) + PRINTFLAG(ACPI_IVHD_INIT_PASS, INITPass); + PRINTFLAG(ACPI_IVHD_EINT_PASS, EIntPass); + PRINTFLAG(ACPI_IVHD_NMI_PASS, NMIPass); + PRINTFLAG(ACPI_IVHD_SYSTEM_MGMT, SysMgtPass); + PRINTFLAG(ACPI_IVHD_LINT0_PASS, Lint0Pass); + PRINTFLAG(ACPI_IVHD_LINT1_PASS, Lint1Pass); +#undef PRINTFLAG + PRINTFLAG_END(); +} + +static void +acpi_handle_ivrs_ivhd_edte(UINT32 edte) +{ + if (edte == 0) + return; + printf("\t\t ExtDTE="); +#define PRINTFLAG(flag, name) printflag(edte, flag, #name) + PRINTFLAG(ACPI_IVHD_ATS_DISABLED, AtsDisabled); +#undef PRINTFLAG + PRINTFLAG_END(); +} + +static const char * +acpi_handle_ivrs_ivhd_variety(UINT8 v) +{ + switch (v) { + case ACPI_IVHD_IOAPIC: + return ("IOAPIC"); + case ACPI_IVHD_HPET: + return ("HPET"); + default: + return ("UNKNOWN"); + } +} + +static void +acpi_handle_ivrs_ivhd_devs(ACPI_IVRS_DE_HEADER *d, char *de) +{ + char *db; + ACPI_IVRS_DEVICE4 *d4; + ACPI_IVRS_DEVICE8A *d8a; + ACPI_IVRS_DEVICE8B *d8b; + ACPI_IVRS_DEVICE8C *d8c; + ACPI_IVRS_DEVICE_HID *dh; + size_t len; + UINT32 x32; + + for (; (char *)d < de; d = (ACPI_IVRS_DE_HEADER *)(db + len)) { + db = (char *)d; + if (d->Type == ACPI_IVRS_TYPE_PAD4) { + len = sizeof(*d4); + } else if (d->Type == ACPI_IVRS_TYPE_ALL) { + d4 = (ACPI_IVRS_DEVICE4 *)db; + len = sizeof(*d4); + printf("\t\tDev Type=%#x Id=ALL", d4->Header.Type); + acpi_handle_ivrs_ivhd_dte(d4->Header.DataSetting); + } else if (d->Type == ACPI_IVRS_TYPE_SELECT) { + d4 = (ACPI_IVRS_DEVICE4 *)db; + len = sizeof(*d4); + printf("\t\tDev Type=%#x Id=%#06x", d4->Header.Type, + d4->Header.Id); + acpi_handle_ivrs_ivhd_dte(d4->Header.DataSetting); + } else if (d->Type == ACPI_IVRS_TYPE_START) { + d4 = (ACPI_IVRS_DEVICE4 *)db; + len = 2 * sizeof(*d4); + printf("\t\tDev Type=%#x Id=%#06x-%#06x", + d4->Header.Type, + d4->Header.Id, (d4 + 1)->Header.Id); + acpi_handle_ivrs_ivhd_dte(d4->Header.DataSetting); + } else if (d->Type == ACPI_IVRS_TYPE_END) { + d4 = (ACPI_IVRS_DEVICE4 *)db; + len = 2 * sizeof(*d4); + printf("\t\tDev Type=%#x Id=%#06x BIOS BUG\n", + d4->Header.Type, d4->Header.Id); + } else if (d->Type == ACPI_IVRS_TYPE_PAD8) { + len = sizeof(*d8a); + } else if (d->Type == ACPI_IVRS_TYPE_ALIAS_SELECT) { + d8a = (ACPI_IVRS_DEVICE8A *)db; + len = sizeof(*d8a); + printf("\t\tDev Type=%#x Id=%#06x AliasId=%#06x", + d8a->Header.Type, d8a->Header.Id, d8a->UsedId); + acpi_handle_ivrs_ivhd_dte(d8a->Header.DataSetting); + } else if (d->Type == ACPI_IVRS_TYPE_ALIAS_START) { + d8a = (ACPI_IVRS_DEVICE8A *)db; + d4 = (ACPI_IVRS_DEVICE4 *)(db + sizeof(*d8a)); + len = sizeof(*d8a) + sizeof(*d4); + printf("\t\tDev Type=%#x Id=%#06x-%#06x AliasId=%#06x", + d8a->Header.Type, d8a->Header.Id, d4->Header.Id, + d8a->UsedId); + acpi_handle_ivrs_ivhd_dte(d8a->Header.DataSetting); + } else if (d->Type == ACPI_IVRS_TYPE_EXT_SELECT) { + d8b = (ACPI_IVRS_DEVICE8B *)db; + len = sizeof(*d8b); + printf("\t\tDev Type=%#x Id=%#06x", + d8a->Header.Type, d8a->Header.Id); + acpi_handle_ivrs_ivhd_dte(d8b->Header.DataSetting); + printf("\t\t"); + acpi_handle_ivrs_ivhd_edte(d8b->ExtendedData); + } else if (d->Type == ACPI_IVRS_TYPE_EXT_START) { + d8b = (ACPI_IVRS_DEVICE8B *)db; + len = sizeof(*d8b); + d4 = (ACPI_IVRS_DEVICE4 *)(db + sizeof(*d8a)); + len = sizeof(*d8a) + sizeof(*d4); + printf("\t\tDev Type=%#x Id=%#06x-%#06x", + d8a->Header.Type, d8a->Header.Id, d4->Header.Id); + acpi_handle_ivrs_ivhd_dte(d8b->Header.DataSetting); + acpi_handle_ivrs_ivhd_edte(d8b->ExtendedData); + } else if (d->Type == ACPI_IVRS_TYPE_SPECIAL) { + d8c = (ACPI_IVRS_DEVICE8C *)db; + len = sizeof(*d8c); + printf("\t\tDev Type=%#x Id=%#06x Handle=%#x " + "Variety=%d(%s)", + d8c->Header.Type, d8c->UsedId, d8c->Handle, + d8c->Variety, + acpi_handle_ivrs_ivhd_variety(d8c->Variety)); + acpi_handle_ivrs_ivhd_dte(d8c->Header.DataSetting); + } else if (d->Type == ACPI_IVRS_TYPE_HID) { + dh = (ACPI_IVRS_DEVICE_HID *)db; + len = sizeof(*dh) + dh->UidLength; + printf("\t\tDev Type=%#x Id=%#06x HID=", + dh->Header.Type, dh->Header.Id); + acpi_print_string((char *)&dh->AcpiHid, + sizeof(dh->AcpiHid)); + printf(" CID="); + acpi_print_string((char *)&dh->AcpiCid, + sizeof(dh->AcpiCid)); + printf(" UID="); + switch (dh->UidType) { + case ACPI_IVRS_UID_NOT_PRESENT: + default: + printf("none"); + break; + case ACPI_IVRS_UID_IS_INTEGER: + memcpy(&x32, dh + 1, sizeof(x32)); + printf("%#x", x32); + break; + case ACPI_IVRS_UID_IS_STRING: + acpi_print_string((char *)(dh + 1), + dh->UidLength); + break; + } + acpi_handle_ivrs_ivhd_dte(dh->Header.DataSetting); + } else { + printf("\t\tDev Type=%#x Unknown\n", d->Type); + if (d->Type <= 63) + len = sizeof(*d4); + else if (d->Type <= 127) + len = sizeof(*d8a); + else { + printf("Abort, cannot advance iterator.\n"); + return; + } + } + } +} + +static void +acpi_handle_ivrs_ivhd_10(ACPI_IVRS_HARDWARE1 *addr, bool efrsup) +{ + acpi_handle_ivrs_ivhd_header(&addr->Header); + printf("\tCapOffset=%#x Base=%#jx PCISeg=%#x Unit=%#x MSIlog=%d\n", + addr->CapabilityOffset, (uintmax_t)addr->BaseAddress, + addr->PciSegmentGroup, (addr->Info & ACPI_IVHD_UNIT_ID_MASK) >> 8, + addr->Info & ACPI_IVHD_MSI_NUMBER_MASK); + if (efrsup) { +#define PRINTFLAG(flag, name) printflag(addr->FeatureReporting, flag, #name) +#define PRINTFIELD(lbit, hbit, name) \ + printfield(addr->FeatureReporting, lbit, hbit, #name) + PRINTFIELD(30, 31, HATS); + PRINTFIELD(28, 29, GATS); + PRINTFIELD(23, 27, MsiNumPPR); + PRINTFIELD(17, 22, PNBanks); + PRINTFIELD(13, 16, PNCounters); + PRINTFIELD(8, 12, PASmax); + PRINTFLAG(1 << 7, HESup); + PRINTFLAG(1 << 6, GASup); + PRINTFLAG(1 << 5, UASup); + PRINTFIELD(3, 2, GLXSup); + PRINTFLAG(1 << 1, NXSup); + PRINTFLAG(1 << 0, XTSup); +#undef PRINTFLAG +#undef PRINTFIELD + PRINTFLAG_END(); + } + acpi_handle_ivrs_ivhd_devs((ACPI_IVRS_DE_HEADER *)(addr + 1), + (char *)addr + addr->Header.Length); +} + +static void +acpi_handle_ivrs_ivhd_info_11(ACPI_IVRS_HARDWARE2 *addr) +{ + acpi_handle_ivrs_ivhd_header(&addr->Header); + printf("\tCapOffset=%#x Base=%#jx PCISeg=%#x Unit=%#x MSIlog=%d\n", + addr->CapabilityOffset, (uintmax_t)addr->BaseAddress, + addr->PciSegmentGroup, (addr->Info >> 8) & 0x1f, + addr->Info & 0x5); + printf("\tAttr="); +#define PRINTFIELD(lbit, hbit, name) \ + printfield(addr->Attributes, lbit, hbit, #name) + PRINTFIELD(23, 27, MsiNumPPR); + PRINTFIELD(17, 22, PNBanks); + PRINTFIELD(13, 16, PNCounters); +#undef PRINTFIELD + PRINTFLAG_END(); +} + +static void +acpi_handle_ivrs_ivhd_11(ACPI_IVRS_HARDWARE2 *addr) +{ + acpi_handle_ivrs_ivhd_info_11(addr); + printf("\tEFRreg=%#018jx\n", (uintmax_t)addr->EfrRegisterImage); + acpi_handle_ivrs_ivhd_devs((ACPI_IVRS_DE_HEADER *)(addr + 1), + (char *)addr + addr->Header.Length); +} + +static void +acpi_handle_ivrs_ivhd_40(ACPI_IVRS_HARDWARE2 *addr) +{ + acpi_handle_ivrs_ivhd_info_11(addr); + printf("\tEFRreg=%#018jx EFR2reg=%#018jx\n", + (uintmax_t)addr->EfrRegisterImage, (uintmax_t)addr->Reserved); + acpi_handle_ivrs_ivhd_devs((ACPI_IVRS_DE_HEADER *)(addr + 1), + (char *)addr + addr->Header.Length); +} + +static const char * +acpi_handle_ivrs_ivmd_type(ACPI_IVRS_MEMORY *addr) +{ + switch (addr->Header.Type) { + case ACPI_IVRS_TYPE_MEMORY1: + return ("ALL"); + case ACPI_IVRS_TYPE_MEMORY2: + return ("specified"); + case ACPI_IVRS_TYPE_MEMORY3: + return ("range"); + default: + return ("unknown"); + } +} + +static void +acpi_handle_ivrs_ivmd(ACPI_IVRS_MEMORY *addr) +{ + printf("\tMem Type=%#x(%s) ", + addr->Header.Type, acpi_handle_ivrs_ivmd_type(addr)); + switch (addr->Header.Type) { + case ACPI_IVRS_TYPE_MEMORY2: + printf("Id=%#06x PCISeg=%#x ", addr->Header.DeviceId, + *(UINT16 *)&addr->Reserved); + break; + case ACPI_IVRS_TYPE_MEMORY3: + printf("Id=%#06x-%#06x PCISeg=%#x", addr->Header.DeviceId, + addr->AuxData, *(UINT16 *)&addr->Reserved); + break; + } + printf("Start=%#18jx Length=%#jx Flags=", + (uintmax_t)addr->StartAddress, (uintmax_t)addr->MemoryLength); +#define PRINTFLAG(flag, name) printflag(addr->Header.Flags, flag, #name) + PRINTFLAG(ACPI_IVMD_EXCLUSION_RANGE, ExclusionRange); + PRINTFLAG(ACPI_IVMD_WRITE, IW); + PRINTFLAG(ACPI_IVMD_READ, IR); + PRINTFLAG(ACPI_IVMD_UNITY, Unity); +#undef PRINTFLAG + PRINTFLAG_END(); +} + +static int +acpi_handle_ivrs_blocks(void *addr, int remaining, bool efrsup) +{ + ACPI_IVRS_HEADER *hdr = addr; + + if (remaining < (int)sizeof(ACPI_IVRS_HEADER)) + return (-1); + + if (remaining < hdr->Length) + return (-1); + + switch (hdr->Type) { + case ACPI_IVRS_TYPE_HARDWARE1: + acpi_handle_ivrs_ivhd_10(addr, efrsup); + break; + case ACPI_IVRS_TYPE_HARDWARE2: + if (!efrsup) + printf("\t!! Found IVHD block 0x11 but !EFRsup\n"); + acpi_handle_ivrs_ivhd_11(addr); + break; + case ACPI_IVRS_TYPE_HARDWARE3: + if (!efrsup) + printf("\t!! Found IVHD block 0x40 but !EFRsup\n"); + acpi_handle_ivrs_ivhd_40(addr); + break; + case ACPI_IVRS_TYPE_MEMORY1: + case ACPI_IVRS_TYPE_MEMORY2: + case ACPI_IVRS_TYPE_MEMORY3: + acpi_handle_ivrs_ivmd(addr); + break; + default: + printf("\n"); + printf("\tType=%d\n", hdr->Type); + printf("\tLength=%d\n", hdr->Length); + break; + } + return (hdr->Length); +} + +#define ACPI_IVRS_DMAREMAP 0x00000002 +#define ACPI_IVRS_EFRSUP 0x00000001 +#define ACPI_IVRS_GVA_SIZE 0x000000e0 + +static void +acpi_handle_ivrs(ACPI_TABLE_HEADER *sdp) +{ + ACPI_TABLE_IVRS *ivrs; + char *cp; + int remaining, consumed; + bool efrsup; + + printf(BEGIN_COMMENT); + acpi_print_sdt(sdp); + ivrs = (ACPI_TABLE_IVRS *)sdp; + efrsup = (ivrs->Info & ACPI_IVRS_EFRSUP) != 0; + printf("\tVAsize=%d PAsize=%d GVAsize=%d\n", + (ivrs->Info & ACPI_IVRS_VIRTUAL_SIZE) >> 15, + (ivrs->Info & ACPI_IVRS_PHYSICAL_SIZE) >> 8, + (ivrs->Info & ACPI_IVRS_GVA_SIZE) >> 5); + printf("\tATS_resp_res=%d DMA_preboot_remap=%d EFRsup=%d\n", + (ivrs->Info & ACPI_IVRS_ATS_RESERVED) != 0, + (ivrs->Info & ACPI_IVRS_DMAREMAP) != 0, efrsup); + + remaining = sdp->Length - sizeof(ACPI_TABLE_IVRS); + while (remaining > 0) { + cp = (char *)sdp + sdp->Length - remaining; + consumed = acpi_handle_ivrs_blocks(cp, remaining, efrsup); + if (consumed <= 0) + break; + else + remaining -= consumed; + } + + printf(END_COMMENT); +} + static void acpi_print_srat_memory(ACPI_SRAT_MEM_AFFINITY *mp) { @@ -2084,6 +2454,8 @@ acpi_handle_rsdt(ACPI_TABLE_HEADER *rsdp) acpi_handle_tcpa(sdp); else if (!memcmp(sdp->Signature, ACPI_SIG_DMAR, 4)) acpi_handle_dmar(sdp); + else if (!memcmp(sdp->Signature, ACPI_SIG_IVRS, 4)) + acpi_handle_ivrs(sdp); else if (!memcmp(sdp->Signature, ACPI_SIG_NFIT, 4)) acpi_handle_nfit(sdp); else if (!memcmp(sdp->Signature, ACPI_SIG_WDDT, 4)) From nobody Fri Apr 5 15:18:07 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VB2Dc0Z7sz5Gdtv; Fri, 5 Apr 2024 15:18:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VB2Db536wz4LZf; Fri, 5 Apr 2024 15:18:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712330287; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GqnHMDi/8b315raBILlFcfWyIKwVse/THZYb7gNdOh0=; b=WWvywwArQyxvJlSWhL1T1i5hfLVkWLiJseDQdwz098taRU5hIZY3sVciK4VT1PY3S0lGQb tG+ZeX3+k0Gz3LLYItuFcwWdvFTLl+IIb6JcDbrTzPLIimfh6VIto6WiTa1ClNqG1D5PnW NS+OLX2SQ2Dq+51tZOy6oRGpNUxv/IHv3uB6kHlDc3WTV135DTfnrQDm4lr8VaPC1UwocB 2zXCoPcivs2ndrAq3bUFRSVwJabutQRiMXkIeaKR4xN8v4+jQTpgjUopfNuLYYhfcu2k7N SW6Y1JgQ0igdFPG4VBcNqiDrB1U6X7k8qmazR+rX3+qOFHRcUo0+5uY1SZUdMg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712330287; a=rsa-sha256; cv=none; b=IkPqyLIeGw5fh0e4uuhzLDFFh+d0lYbZJ9ISobtTVj5Nxs6YQOTd16TcCX4exCBVnCeabH oMl9e36qUoFZiawwJIj8rTS7Nh68+WKcBTiTm22KIHJVL5CRy7UOKGnzPBIhtlQWJ9Ccsr Zro8GpajdBOQRreLjFPwt5Ai6OA8W0m41fuLe133AhXvyprsKMqSW0Vti5l/Xm1tODsJkj 4XZuFQ0qF5zQcRJ0IkHlS+pFxdPy/pCADwpYhJomoyCVDLSToFaz5TZXeEkGThAkIbw8m9 SHQHLiFxuUiAeWjL0y0vNZksEc+QKavAiF9CQBp1TefsgAt0rVT4nflSxPwVSQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712330287; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GqnHMDi/8b315raBILlFcfWyIKwVse/THZYb7gNdOh0=; b=yPPQQRekQ06Vj7gwCW6e7dGB4MvPNI6jfYY9V55BZEETLkaCHWdAu5a6Hhz2OZG4yGdov4 7vcW90qMG/KKDQlfnUmPTJ21VhADGOqBMENc+3aevA2ioMOnlRWDc0TICHTec9+rsFyWQF WUVRtDQlBw9stRM+X2Z3oYDqsak1Rmvvf07R1jrgxMreoTWaEtnniCUMVSckD0ysZjtkQ8 k3OF1OXGp0NDO60fOPnmtY4b4jlcsk7a0JFeUjF4chXDXskQDssMsBLVa0BEwWM1eH+IMV 8C47xGJg9i8iQ6iVRgdldydBLR5R/HJIc46I7tCnewbiIP7d/dJ4OMRoObBqZg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VB2Db4g1wz14rJ; Fri, 5 Apr 2024 15:18: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 435FI7ZG078460; Fri, 5 Apr 2024 15:18:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 435FI7tD078457; Fri, 5 Apr 2024 15:18:07 GMT (envelope-from git) Date: Fri, 5 Apr 2024 15:18:07 GMT Message-Id: <202404051518.435FI7tD078457@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: f1519a8229d7 - main - acpidump: add Foundation copyright List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f1519a8229d71fc1093c8bd27362c5a9f703dd4b Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=f1519a8229d71fc1093c8bd27362c5a9f703dd4b commit f1519a8229d71fc1093c8bd27362c5a9f703dd4b Author: Konstantin Belousov AuthorDate: 2024-04-05 14:57:19 +0000 Commit: Konstantin Belousov CommitDate: 2024-04-05 15:17:55 +0000 acpidump: add Foundation copyright Sponsored by: The FreeBSD Foundation MFC after: 1 week --- usr.sbin/acpi/acpidump/acpi.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/usr.sbin/acpi/acpidump/acpi.c b/usr.sbin/acpi/acpidump/acpi.c index e3e426758025..0cc3f76ac018 100644 --- a/usr.sbin/acpi/acpidump/acpi.c +++ b/usr.sbin/acpi/acpidump/acpi.c @@ -4,8 +4,12 @@ * Copyright (c) 1998 Doug Rabson * Copyright (c) 2000 Mitsuru IWASAKI * Copyright (c) 2020 Alexander Motin + * Copyright (c) 2024 The FreeBSD Foundation * All rights reserved. * + * Portions of this software were developed by Konstantin Belousov + * under sponsorship from the FreeBSD Foundation. + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: From nobody Fri Apr 5 15:34:20 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VB2bJ6GrVz5GgT8; Fri, 5 Apr 2024 15:34:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VB2bJ4nWNz4PHJ; Fri, 5 Apr 2024 15:34:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712331260; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Z+WRPIeDUS4BhSVvTRriVq0p8mh3dUC+2die1jJzfLQ=; b=e1iLxtnbsZYv1KZWyT0oua+v4YXIusn180kHkjqVjMXh9L0zbpgltwyvC5Rp3MEAqZOlGg re7BCLwgBwN75Nenxubh+WddS+5Pb+TnStvkZOfRZ8C6Gf6yuWOapsb1xBLYRSmviQNCCa rQZHKzRYRXb4F5AYz7yPhmwFk7rp+wjC/VwV4Wm6KzVaBa0E4QWAmNJiuBmWJpayaoSxe/ jn9+Ex/3CBtfekrV32xnWclX4fQWU83gg9KRQrneS0omcqwgCEYE88HiI5LJ052ymBSnZp KVeKhnRx6V7scLgnAKQQaMVonu/crWXLr4K9UHzvAdy9OCwwoKpYFcS1//IMjQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712331260; a=rsa-sha256; cv=none; b=KFsf+nrpCXyq9BFeh112ovYlvDkGUEvAuAVqkKHYIbj+EnkMaing9mEXVANq6InZmn/Zks tHKPZVWKPOjCXuc1um4Xus6J0CUW9rMmaRRDyZOW9rGTLCbpIWSCaZcRhEsa2TFgTvl2dj hgMaQMO8HVXpilnTPGgVi4jJOyRdyGp4EeB3p/NQMw4e1uAI5yjQkpO/QVLE8HWblSU223 Q462apIqLInRbJ57spM64bs/Spa9OP44oG+OWyYSzOAY8nRse7klzNCKIfaIbBoDbtRDKX 625CnmZDWb+uJd6NOjBIzXLkGcfE0ERvqG3XPKlSh1v4N28KMNAW4Otbwpt9mg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712331260; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Z+WRPIeDUS4BhSVvTRriVq0p8mh3dUC+2die1jJzfLQ=; b=BTjEhpBhhAko9dm0wX2wLfq5oJiOTdS2dOQtCwg3+SHYIPRoOfOa+ZncvsfopIOAClY2yd mdsr0yeMWeOXQ2BBU6c7MkMZgMby/B0swqItR16sNqLBita/Bs0Lp0+4VwLVc+OFOWjg6n 5QrkTI15XaN9dtT8lhqcSzAQO/xni0Ci5IQJesYcREIgP2KCawPVbIBGEcYWi9eRGYl7tY q3fGo0eb+FCbOOIozEI5jkJZA01ld1DBxhgI0+19LvqKfLJTpaoeep20h+WdzyGI7YVVze rDmnaAvehJ3Ft7qLJqW3ArXwExBNWy0mjRi3zXquDaJKBxrSHkR63PtToLQgAQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VB2bJ4P86z15Hr; Fri, 5 Apr 2024 15:34:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 435FYKWZ011472; Fri, 5 Apr 2024 15:34:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 435FYKF3011469; Fri, 5 Apr 2024 15:34:20 GMT (envelope-from git) Date: Fri, 5 Apr 2024 15:34:20 GMT Message-Id: <202404051534.435FYKF3011469@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Tuexen Subject: git: aaaa01c0c858 - main - tcp hpts: initialize variable List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: aaaa01c0c858fd703194c6cbd515dd514574381f Auto-Submitted: auto-generated The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=aaaa01c0c858fd703194c6cbd515dd514574381f commit aaaa01c0c858fd703194c6cbd515dd514574381f Author: Michael Tuexen AuthorDate: 2024-04-05 15:30:31 +0000 Commit: Michael Tuexen CommitDate: 2024-04-05 15:30:31 +0000 tcp hpts: initialize variable Ensure that tv.tv_sec is zero in all code paths. Reported by: Coverity Scan CID: 1527724 Reviewed by: rscheff MFC after: 3 days Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D44584 --- sys/netinet/tcp_hpts.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/netinet/tcp_hpts.c b/sys/netinet/tcp_hpts.c index 1e6578429acd..85341cab0750 100644 --- a/sys/netinet/tcp_hpts.c +++ b/sys/netinet/tcp_hpts.c @@ -1651,6 +1651,7 @@ tcp_hpts_thread(void *ctx) * enough activity in the system that we don't need to * run as often (if we were not directly woken). */ + tv.tv_sec = 0; if (hpts->p_direct_wake == 0) { counter_u64_add(hpts_back_tosleep, 1); if (hpts->p_on_queue_cnt >= conn_cnt_thresh) { @@ -1675,7 +1676,6 @@ tcp_hpts_thread(void *ctx) * Directly woken most likely to reset the * callout time. */ - tv.tv_sec = 0; tv.tv_usec = hpts->p_mysleep.tv_usec; } goto back_to_sleep; From nobody Fri Apr 5 15:41:00 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VB2l04vfWz5Ggch; Fri, 5 Apr 2024 15:41: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 4VB2l04NjZz4PdZ; Fri, 5 Apr 2024 15:41:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712331660; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6noPlW6Stu5OYDjZ7BU5moNiTWcLMkqpL96pgFLxThQ=; b=jldsnSjoVdv5Fwlt8KaKuDq9CaM5ukZhzeXDNCrlc5X3GMFjQ6d6E4k+mTliXthVg159Df +DVSNSMH45FwWIynTLEkqJOVNZZpKWNNgD9lc0AHdGjIFgFygLYstTJk4rrA3YES1QHvPR +UTXDghsFSmIcRq1MUk1J57xA685exkJSlgLb+8UJ8wDwLL8j1hmBxK5ZGaxogClmn0cmm dXbovvWKmIkMw2sViTAcUr+skxNhFF5oOddoEDqg/BDETLUsPt4t9sDZm5FbmLF/su9GJC Fo56QcivWTBowf+dkV/RrlIWtUnl1JhGIZavo5sYlKWyE3Le/yfh7+djg1t4VQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712331660; a=rsa-sha256; cv=none; b=ph656tdCD4Hsm8v2aTLLIOMwhb3rsRhV31OwVL493v5CydJU4a1oW0g9D1KDC36ztavbsn Fv3LoTRq2lJdmSbvILtvBHwlAjfRmXZwLRc4k2n6wixnugdz7v3ywRIvE8S/wkhvoZipJQ wjlBsPnOYXXYfO8msacI3RsvJLDnOYWnpRSIm+t1gWKOfFl68tIibiXxnvUZPE63mVTwbb w/F+5t+JGnAdEauQyjwoj1pS9MQ5U/oXs5vTjhpyOhNDfLKC6CC/ekIZvsmaNdWKf1P5E+ hq8MNdRAc1TcvdwgD9gHQ4+FCW+xpWaYQBu6vBOgHnktHB50xdAF93aNqzwPKA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712331660; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6noPlW6Stu5OYDjZ7BU5moNiTWcLMkqpL96pgFLxThQ=; b=AqKtLf+LMbi5Qc5H/z8EEnq9rSsuuwO3lnfY3B9JeHsNOD3UxWoFt5aM1vNUsFeGrxVDKn 7fQsLsdYxg7poKGf8zFSiGyVd0vZsHgCF4JzNcw8NF1ZhHsjcCeMSmzdbhKR8T6fcke+uo g/FzIF6mXXno+kXgSdgncdP9/Izn+03+Pa+fmoiHmHe9o3UsPr6QrdNttWs4pusHEmwKx1 t4TA1vukOrytJryTiklbRi/BgjMxMOGKA2HDZwjQsjmdhxNQnpHCy0jvlMCM7re+97zRDx 7aaAD34AyK/CMtyPIzq3nJ11Yh5UfZl406qb/DcgAXYAZYc/4VdQJOGRgUrR0g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VB2l0403Rz1503; Fri, 5 Apr 2024 15:41: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 435Ff0xa021912; Fri, 5 Apr 2024 15:41:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 435Ff0xH021909; Fri, 5 Apr 2024 15:41:00 GMT (envelope-from git) Date: Fri, 5 Apr 2024 15:41:00 GMT Message-Id: <202404051541.435Ff0xH021909@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Tuexen Subject: git: 60bc195745b8 - main - tcp bblog: cleanup List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 60bc195745b8c1e1896c535a491906cdf11fe057 Auto-Submitted: auto-generated The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=60bc195745b8c1e1896c535a491906cdf11fe057 commit 60bc195745b8c1e1896c535a491906cdf11fe057 Author: Michael Tuexen AuthorDate: 2024-04-05 15:36:40 +0000 Commit: Michael Tuexen CommitDate: 2024-04-05 15:36:40 +0000 tcp bblog: cleanup Remove redundant checks and improve error checking. Reported by: Coverity Scan CID: 1523780 Reviewed by: rscheff MFC after: 3 days Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D44616 --- sys/netinet/tcp_log_buf.h | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/sys/netinet/tcp_log_buf.h b/sys/netinet/tcp_log_buf.h index 2e91d9cbdf3c..38f66e69b093 100644 --- a/sys/netinet/tcp_log_buf.h +++ b/sys/netinet/tcp_log_buf.h @@ -421,7 +421,7 @@ static inline void tcp_set_bblog_state(struct tcpcb *tp, uint8_t ls, uint8_t bbpoint) { if ((ls == TCP_LOG_VIA_BBPOINTS) && - (tp->_t_logstate <= TCP_LOG_STATE_OFF)){ + (tp->_t_logstate == TCP_LOG_STATE_OFF)){ /* * We don't allow a BBPOINTS set to override * other types of BB logging set by other means such @@ -431,11 +431,9 @@ tcp_set_bblog_state(struct tcpcb *tp, uint8_t ls, uint8_t bbpoint) */ tp->_t_logpoint = bbpoint; tp->_t_logstate = ls; - } else if (ls != TCP_LOG_VIA_BBPOINTS) { - tp->_t_logpoint = 0; - if ((ls >= TCP_LOG_STATE_OFF) && - (ls < TCP_LOG_VIA_BBPOINTS)) - tp->_t_logstate = ls; + } else if (ls < TCP_LOG_VIA_BBPOINTS) { + tp->_t_logpoint = TCP_BBPOINT_NONE; + tp->_t_logstate = ls; } } From nobody Fri Apr 5 15:44:04 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VB2pX6JFjz5GgmV; Fri, 5 Apr 2024 15:44: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 4VB2pX5TpKz4QHG; Fri, 5 Apr 2024 15:44:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712331844; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Qt8VGc8mySGBubtjuX9MATcvGLkPN9ciocePO8Yqhw8=; b=COwoklhCtFSsqbM961mfuXOfkjnSpfajnVLOIIf4WkdBe+cvpL23ZwYOnOh6v2rBrobGAN wZwsd6sT/DEnX+qMNJyHnEo/QIoUKZaSOfRTGs8lt8U+J1e3hV8+BlsNldTgLiOho4z6rf y2tk8OuDyqzPqq7BxgvicwK805qZotiQfcHTE2NAjZ3QWtzinQq7e8ex7t/a/Y6QPbm4bD GR4Cqt1IIP/HXAH9YtkBSXjQgsIGgoSG/w1xymvcWH4NQjNbgnwuEz6TJyZDyZJjBjZ6PS n84Zu67eUH7uF9tFcs06QfM+yHEDyPsq6fHWHM7bN1F8JE7Vqxz4+ywHyLyF+w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712331844; a=rsa-sha256; cv=none; b=Kwx96F3raLtFNnlMxAwOtN50jg3GFf+gIlKVXHjHXMWIo2Rp6wT8/orpJzuIBHyKpFGmz2 bbIYMoanQSTf7ldQim1gHBMfPKEpe2tROrnYWHJZ3IOFi8D/HQ2tkyyn6bwc3MP/+/qojB h4+mGeL+zh3swWb57YCQWEhvgyv+AFftJrRFkMi0h4NiFzS0dUpFTEVS54q2q64BtrsHB8 YnSmFHZaFpKu8zcvLclJC1oV/oAnLEga+PzmGZUjOQm3oAY8FnjkhaXR+xUPU02hdvYI1F 8GQtbC+ioOIR/i8Eiv1cSoxuALA70rby0Ia8En4IspaaxK1SH7yNbL+doeng9A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712331844; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Qt8VGc8mySGBubtjuX9MATcvGLkPN9ciocePO8Yqhw8=; b=JsnkwwBOBr9j9lAlFWFLcrOswvZtlfZQk1pAxuj1GAR/uYQIIWQVoig2/n4ZVqp00b1ek8 mX+ad4Su1wls640LhEcnaMAmRV19ztrQtucNiWuqeDhu2+0QIY1P+O0gWTAErRWpLxKU6A 8E7DGA31zgRbE2Eo0kigGv4ECZ3AKNaQF4XUwJ9CHa7I3KnjlCnNw8B91/xo0U+QQ1DuW0 zaEcXC9QDbR3+wOkS0YYHQ+PL27z1peXU4Dh5KT3/qTXD+xl+hI7h7cjwPUb+eJtBD5GAU K6b0CI2Uxw9TYqikK+qRwfejjxkS1pJuD7MlRKQ+RCeWTSuybXI/tL7nnRnh2w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VB2pX554bz15mr; Fri, 5 Apr 2024 15:44:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 435Fi4Yj027856; Fri, 5 Apr 2024 15:44:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 435Fi44E027853; Fri, 5 Apr 2024 15:44:04 GMT (envelope-from git) Date: Fri, 5 Apr 2024 15:44:04 GMT Message-Id: <202404051544.435Fi44E027853@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: fd56d2472586 - main - tarfs.5: Provide some guidance on zstd frame sizes List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fd56d24725860a3c1f12180cf8503d38d8d0c70d Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=fd56d24725860a3c1f12180cf8503d38d8d0c70d commit fd56d24725860a3c1f12180cf8503d38d8d0c70d Author: Mark Johnston AuthorDate: 2024-04-05 15:28:55 +0000 Commit: Mark Johnston CommitDate: 2024-04-05 15:43:58 +0000 tarfs.5: Provide some guidance on zstd frame sizes Reviewed by: des, emaste MFC after: 2 weeks Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D44636 --- share/man/man5/tarfs.5 | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/share/man/man5/tarfs.5 b/share/man/man5/tarfs.5 index 5378491b9c9f..56c56ac43287 100644 --- a/share/man/man5/tarfs.5 +++ b/share/man/man5/tarfs.5 @@ -74,6 +74,15 @@ to create the tar file, this can be achieved using the and .Cm ztsd:frame-per-file options. +Sensible frame sizes are powers of 2 between the system's base page size +(see +.Xr arch 7 ) +and the value of the +.Sy kern.maxphys +sysctl. +Smaller frames will generally yield a worse compression ratio and require extra +kernel memory to maintain an index, and larger frames will on average require +more CPU time to access data when performing random I/O. .Sh DIAGNOSTICS If enabled by the .Dv TARFS_DEBUG From nobody Fri Apr 5 15:45:15 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VB2qv463kz5GhNK; Fri, 5 Apr 2024 15:45:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VB2qv3cmzz4Qnn; Fri, 5 Apr 2024 15:45:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712331915; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vPq0dgtVWZ/es/3W/zRbWtjmMWOCTzNidW1Fn0pnNnc=; b=Um7i+pwgjX2fsK2UTvvIuXIJBpwB42yBSX+i8atIYeP4Ylaz4ldINBxbwmkHua3v4z/Le9 GGH7eA/c0KZ+lkvA5ZQDEpWquApeAys7wIqYdZuarz8XY0GZAMwQKU18Ego54Rl3VVYfyL y/ZCgIQNJmzRZA4S4dxYZibSKo+HprQCujagDSI3G0C/O+4Inm+MgvB90GHP6xaIkk9lOU yJvv47IEXySHkJK4JjOHR8u4vT1+VCYhVTgEvfPBK24KiZY8jU00t4G2e1B+Sp0W/6rhhS 5ievrvuKMvdMvq/iHKL+Dgq3t8AcVvVKwt63Yn8qtlWSMIvwDa1noUIu/tXnNw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712331915; a=rsa-sha256; cv=none; b=nBWtoYELlEPiiAHiIWtSdlhxTw4kT6iVdJdTctotc7oPMfqUp4R2m27qoj5pHcZIn7xHUf U9Kbccb6GlJJyE/JaDn+/0VqzPsrnPgaHImlS+wZJ5w+CH7ClMTAxtUGmpv7CMZP97kAbT 2IsZAxK4VI8oTQMy+8JJ5HX8VuWkzQkLzUoeaes52FaStOwCEU1811X8E9mPQe8SwEkYJP MkY3OlfflMuX60Sh2Z1nUFsWx7Hkkw7JAcGZZDyvOQkjmCXFHjwzrIHANC5cxSHYMSEgqu DoNaY3gNjK7Qhs+nR7xxKXK6/Kqt6+dD2m2o1cB5EYHjR8+C8s6vdyMO7FVUHA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712331915; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vPq0dgtVWZ/es/3W/zRbWtjmMWOCTzNidW1Fn0pnNnc=; b=EYeUma3O82a3IFvm2KztqsRs9edt+ApN4wXGtm18ykn/dYkf07QrOWhK0+Id4kX2NruWzD 6BGemF/3KHlh/PGTKsJ24zvguumWVfd0Q6+ptIGgi6h1yLGwuwmk8e6kTWTh48sfIiZ3kY uYGf6tFtTzk0mtvaK7m1o6nSyHlJ0jpi7YuW6bzFhLS3SJOmJ0NUN3Lbzfz5Vp6X1+ADUg x7HMr/oL6zLsuAOeAYevQH85yT27+qi8a98CkB8Ji5Y3qnsx4yP116yNOLjMneiUZtKHqB BlxDwXmUI+E5+rqBSTIDX4m3x5oQzbnRptOFDnczgBC+Fe+jhymmgn9ptjM8Xw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VB2qv3DGRz14kL; Fri, 5 Apr 2024 15:45:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 435FjFvY028159; Fri, 5 Apr 2024 15:45:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 435FjFVJ028156; Fri, 5 Apr 2024 15:45:15 GMT (envelope-from git) Date: Fri, 5 Apr 2024 15:45:15 GMT Message-Id: <202404051545.435FjFVJ028156@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dimitry Andric Subject: git: aaabed1dea7c - main - Merge commit eb8f379567e8 from llvm-project (by Florian Hahn): List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: aaabed1dea7c1d16cdc5457bf6dee74164104e26 Auto-Submitted: auto-generated The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=aaabed1dea7c1d16cdc5457bf6dee74164104e26 commit aaabed1dea7c1d16cdc5457bf6dee74164104e26 Author: Dimitry Andric AuthorDate: 2024-04-05 13:00:12 +0000 Commit: Dimitry Andric CommitDate: 2024-04-05 15:44:49 +0000 Merge commit eb8f379567e8 from llvm-project (by Florian Hahn): [DSE] Remove malloc from EarliestEscapeInfo before removing. (#84157) Not removing the malloc from earliest escape info leaves stale entries in the cache. Fixes https://github.com/llvm/llvm-project/issues/84051. PR: https://github.com/llvm/llvm-project/pull/84157 This fixes a crash in clang (usually a bus error, but can also be another memory error) when compiling the science/siconos port. PR: 278174 Reported by: yuri MFC after: 3 days --- .../llvm-project/llvm/lib/Transforms/Scalar/DeadStoreElimination.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/contrib/llvm-project/llvm/lib/Transforms/Scalar/DeadStoreElimination.cpp b/contrib/llvm-project/llvm/lib/Transforms/Scalar/DeadStoreElimination.cpp index d3fbe49439a8..62a9b6a41c5b 100644 --- a/contrib/llvm-project/llvm/lib/Transforms/Scalar/DeadStoreElimination.cpp +++ b/contrib/llvm-project/llvm/lib/Transforms/Scalar/DeadStoreElimination.cpp @@ -1893,6 +1893,7 @@ struct DSEState { Malloc->getArgOperand(0), IRB, TLI); if (!Calloc) return false; + MemorySSAUpdater Updater(&MSSA); auto *LastDef = cast(Updater.getMemorySSA()->getMemoryAccess(Malloc)); @@ -1901,9 +1902,8 @@ struct DSEState { LastDef); auto *NewAccessMD = cast(NewAccess); Updater.insertDef(NewAccessMD, /*RenameUses=*/true); - Updater.removeMemoryAccess(Malloc); Malloc->replaceAllUsesWith(Calloc); - Malloc->eraseFromParent(); + deleteDeadInstruction(Malloc); return true; } From nobody Fri Apr 5 15:50:45 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VB2yF73FHz5Ghmw; Fri, 5 Apr 2024 15:50: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 4VB2yF3Krjz4R7x; Fri, 5 Apr 2024 15:50:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712332245; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1uEq9r0AgPuUp8qeRu2iMSRwlzf0rQSz2+VLye/63ew=; b=qU/B2z0T2KH8IX9Zpqq8DhHw3NRrUg+xnz27RgslOv2rmF0vmdTIyiCBJTyx0b4+nsCvNF fRau4IIQzYx+BBHJSHBxmS0EOBzoUqJoeUq/t30mRsEjJjSQptDw0hXR8M5v/hFDGgd28T 0KDu8d4d58EEPRk8p0+9WuLanlZ26kZh1p0zgP5z5kRlbU6u384iNZeucReTPR81XORyoc KD+mywc6L57i7sDvtzDw7Xes7Vr0JteY9W4N4u1J86u+z5e5Ffk3HVP19pdGIg+8oQte5W ZCgBKmWAT9e8ELSxX5/+QBW+K9OMtmuxRqNujqXUE+hweS21AMrM6p5EgQntNw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712332245; a=rsa-sha256; cv=none; b=WCRJ0iDcpFEdjm1K+Sny700EmK+GLyuAHCc3x6YIxcx/LjvX7UoHqofLQo8ezFTzvfnVFc /RBsY87rhnBpMA91/QCTmHgUTidYvufGv4P+nX3GwJrKEWfFkiZ861I/S5ESM7WlFDgZpZ xvcqneRR5lJIZnV0BEV9HmScenjHsDm7hqemNc8JSxPVWUzHVNPD6IFG7W1H2fL3K4431w aZFO3EqWYayBdrBkGsvu/YqUvAqnRAzEzNdxQX9KhCvTcsSbRvkuyaf1XQO5lzQnbVooU5 E7yMN1icIuV7Tng8mNTGNohzXW9zwK4nLbO46KaKmX7nUXmqXw/8RVN7XlAcOw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712332245; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1uEq9r0AgPuUp8qeRu2iMSRwlzf0rQSz2+VLye/63ew=; b=PpgJuH+oRYHuMBc6WNIJlBQjHe8DRurkacIJYvL1UGBWYF1dMaSUNWra8gzeI7Gs07qt2i pJYPXRWXxqgCnpIp0UsSaNb5kqKHI8dCf8C6GVGDUIi7o+YAiyFJuiKbRf21N7wPxI1pAw qGmEq38dgm4yY7iGU2IV4RIzboPlUfcmUqajU54B2VucAT25qYKMd8NOPXaY/7wS9RnoWE YjKHGhoe779R/mnlGTZzYIK/y3sp5HGGhYXt2Usy0lYhOT2l4ffgUGODt9UGYjUnacibJn IfArkctlcuSWM0xe0VpJHmTV7WT6ZROaV+3csI9z4EYJMMH/SfVYibzE3a2/2Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VB2yF2y9zz15q5; Fri, 5 Apr 2024 15:50:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 435Fojph038483; Fri, 5 Apr 2024 15:50:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 435FojYl038480; Fri, 5 Apr 2024 15:50:45 GMT (envelope-from git) Date: Fri, 5 Apr 2024 15:50:45 GMT Message-Id: <202404051550.435FojYl038480@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Tuexen Subject: git: 7df0ef5f48e1 - main - tcp rack: fix sending List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7df0ef5f48e1c67b3f1df7c7964bfa59bc56f4e4 Auto-Submitted: auto-generated The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=7df0ef5f48e1c67b3f1df7c7964bfa59bc56f4e4 commit 7df0ef5f48e1c67b3f1df7c7964bfa59bc56f4e4 Author: Michael Tuexen AuthorDate: 2024-04-05 15:47:03 +0000 Commit: Michael Tuexen CommitDate: 2024-04-05 15:47:03 +0000 tcp rack: fix sending In rack_output(), idle is used as a boolean variable. So don't use it as an int and don't clear it afterwards. This avoids setting idle to false, when it is not intended. Reported by: olivier Reviewed by: rrs, rscheff MFC after: 3 days Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D44610 --- sys/netinet/tcp_stacks/rack.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/netinet/tcp_stacks/rack.c b/sys/netinet/tcp_stacks/rack.c index f89fd46f2a85..ea52eb0a92cd 100644 --- a/sys/netinet/tcp_stacks/rack.c +++ b/sys/netinet/tcp_stacks/rack.c @@ -21283,7 +21283,8 @@ rack_output(struct tcpcb *tp) unsigned ipsec_optlen = 0; #endif - int32_t idle, sendalot, tot_idle; + int32_t idle, sendalot; + uint32_t tot_idle; int32_t sub_from_prr = 0; volatile int32_t sack_rxmit; struct rack_sendmap *rsm = NULL; @@ -21525,8 +21526,8 @@ rack_output(struct tcpcb *tp) if ((tp->snd_una == tp->snd_max) && rack->r_ctl.rc_went_idle_time && (cts > rack->r_ctl.rc_went_idle_time)) { - tot_idle = idle = (cts - rack->r_ctl.rc_went_idle_time); - if (idle > (uint64_t)rack_min_probertt_hold) { + tot_idle = (cts - rack->r_ctl.rc_went_idle_time); + if (tot_idle > rack_min_probertt_hold) { /* Count as a probe rtt */ if (rack->in_probe_rtt == 0) { rack->r_ctl.rc_lower_rtt_us_cts = cts; @@ -21537,7 +21538,6 @@ rack_output(struct tcpcb *tp) rack_exit_probertt(rack, cts); } } - idle = 0; } if(rack->policer_detect_on) { /* From nobody Fri Apr 5 16:22:46 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VB3gB2RGMz5Gm4Y; Fri, 5 Apr 2024 16:22: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 4VB3gB1xSLz4VTj; Fri, 5 Apr 2024 16:22:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712334166; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2hdGLAnP+e1eB8eJrbecH06MTmWiN6VSsN0B9MujehI=; b=nKCrB4lUXDTH0y1MFULFZ099z0TNPoDi/I+OoIJUPr7V3C02L4yTnOtZbBFfXWrIJEcYQd PoPXmXLQfxq1ydFzblWrcIt4Taz8IGmBT0qYyiW9a518LyVYcXdX5MDDTb11I9fRSyZyWM CVI0/XzLZTfFz1sPNIFZoXX2uHjuS2UZqmixvQD6XJ0gwbQxYPYaNB0W0C544+pHZnGCzi i04lLP/XNeUsGnCq5vZvajAnDKsALBQTsz+eMtTi1x0GOXC9eO/d/pABEgXCUL+pr2nDxz G5SmzlGX7org0PMpLLtM+HKxRrLn+dwtRWeuAFYynSOHPN+uQop0dG+g40ev7w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712334166; a=rsa-sha256; cv=none; b=BvUZqzcxRLrZ9OsMQcc9P5s3PnW0Xdb2FdOQDBPMraj0E74MLMtf9MNfDg8MvA6vuKY4jj ekLZ9NvS6UoFWyT/Ur2Lbe3U/9fMcPSM0N7wuzbuohiRFo4KvYy3qn+8U5vF1kuf9wLAqf IyQz2i5ShblQ+c8YjWg2n7olJG0KTmq1meahlpr/Eu5JDmrgL+OBn0E5cy2FAo9k73/y4G kgNL9+GzUxRIX9i3nQINcUVXjy1x9KnHYJ/9d4keInj0ee1+VMvQ9MOFaAlU94Dle3a1LS xIVUSdJJ3AgNhh+HfyXLZLsBryujjNwzjGW6G8Cql1Nn14mok5Fve08zZW+chw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712334166; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2hdGLAnP+e1eB8eJrbecH06MTmWiN6VSsN0B9MujehI=; b=Tn0EOrk5a3AS5UPSW0+SvZbbPsuidYKOMgu0Ns8TnAYncGwhL2aHMQ/mOmbVVl7sTs3eFk iY7pIsMchkDXgKzuHCcj1+m5vXeI1FHv6MqXQATXBzvWZUclREukxI58mBF12h5uvggmDt r6Q8uYBp6QnRzbFirb/jyCLeEkiyH5GcQHi0UyGIjMl5DHtE0xdCBKDTZF8lgzMeCzkGDQ ewbYUEPpebLtXHQ8ameYctY4f2GjaeCXWxm7YSb/qqsBosLagk0tbASWinqIDynKq4XEUW oiPupARsp6373oPVvNu0OlKWRP4cS1fOmOGDShuIf2QGzNeIWcu8u0TqsU/pnw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VB3gB1XYVz16kh; Fri, 5 Apr 2024 16:22: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 435GMk5Z096464; Fri, 5 Apr 2024 16:22:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 435GMkEe096461; Fri, 5 Apr 2024 16:22:46 GMT (envelope-from git) Date: Fri, 5 Apr 2024 16:22:46 GMT Message-Id: <202404051622.435GMkEe096461@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Tuexen Subject: git: 681711b77cde - main - uipc_socket: handle socket buffer locks in sopeeloff List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 681711b77cde2cf3d64dc1e4951ec8287bc4f3e8 Auto-Submitted: auto-generated The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=681711b77cde2cf3d64dc1e4951ec8287bc4f3e8 commit 681711b77cde2cf3d64dc1e4951ec8287bc4f3e8 Author: Michael Tuexen AuthorDate: 2024-04-05 16:14:54 +0000 Commit: Michael Tuexen CommitDate: 2024-04-05 16:20:19 +0000 uipc_socket: handle socket buffer locks in sopeeloff PR: 278171 Reviewed by: markj Fixes: a4fc41423f7d ("sockets: enable protocol specific socket buffers") MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D44640 --- sys/kern/uipc_socket.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sys/kern/uipc_socket.c b/sys/kern/uipc_socket.c index 196461f645ce..82fbcd4a922d 100644 --- a/sys/kern/uipc_socket.c +++ b/sys/kern/uipc_socket.c @@ -922,6 +922,10 @@ sopeeloff(struct socket *head) so->so_snd.sb_timeo = head->so_snd.sb_timeo; so->so_rcv.sb_flags |= head->so_rcv.sb_flags & SB_AUTOSIZE; so->so_snd.sb_flags |= head->so_snd.sb_flags & SB_AUTOSIZE; + if ((so->so_proto->pr_flags & PR_SOCKBUF) == 0) { + so->so_snd.sb_mtx = &so->so_snd_mtx; + so->so_rcv.sb_mtx = &so->so_rcv_mtx; + } soref(so); From nobody Fri Apr 5 16:26:53 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VB3lx6bYnz5GmH8; Fri, 5 Apr 2024 16:26:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VB3lx61Mtz4W0p; Fri, 5 Apr 2024 16:26:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712334413; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rM8jdcwJagz6yWKwDQIVX6NRNmx5hj8pg831/eDjRMY=; b=sePVjwcHTKaShN76MsDJFAHXcQYZTnf8G7dR37EspiTDbsRwalZpqN+3MJVRQC6u7mKvNO Uy5A293nof0efAlb6oGtSwsyrb5x1LjlyKXx+Lm25QUmNi3suLyjFAgUtfH5lILDlC/LuH nqSgLVB4aAAN++XC+SCKft8NCVPnfPlFA0txhOjVtPYiCq16xTnmBTDFlUkbr9NWVLDNbI qpdz/CQFJA4cvnQnfvLOl6mjjLH0pHwg3V2LYjzG6tSdtKg15uTytbKj6ux11DoSjyu1tg awyswENLSV5UEgdhQ7giLE5X/BhWHnCVZaeZGcrV2Ase1YRAxnMLNifIe8PDcw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712334413; a=rsa-sha256; cv=none; b=DkEUeuq0HchPxjbRCKcR3zgxCSjHEYWMr6AYb7oGtBne64QytG7ddzdRaUsOMxSYXhlhco 5BBYAvc1fPxlMeeeSRxaQ9CKHQ0VNUTxha0d/sIuQ/K55UbEa6HuI21pnjgNLnKikbQMR7 JIS32/St//UmtDezvsIRzL0Z4LjVvggiRX0P2SpuES4M6+Sds3mAe9vDGodNeGfyOn2Yor cVG1vblozvM2yglGY1snOqr+V+Otv0kB6MjCCOeJt4+kFG5XM4wjnGD2FIml6eNdhIzeK+ etCAcxVA/3KgwVKwOHK6n/sVMA3ZVvbnr2zY06fDo/8vaOu3DS7ITJreMKh5hg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712334413; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rM8jdcwJagz6yWKwDQIVX6NRNmx5hj8pg831/eDjRMY=; b=GegqtRnARBUZocgQy6fM2xj6fmC053biMwQxAQm68EKxCipSDZwaBJwPy6LTCYXxdyyQWW t1JCsZbt513F66JtdTr9XF3hB+d4W3u5Sw5XPQkOHpHFvN1a+57vTE0wdE+uIbBWyk3M2j N/cuhuWinA2zBMz5Y3pxvFBxFcM9bnWrB3SPY6OLb7jvAI59CYvoTcl6ewuNlXuPkSLtQR F7kLZ82aqc6Kp94bgQMKXEr605QySfbaqJSSD/iNCIaTcBL96jUEYe90Dh4bPLIqXNd2Rd 2+Sko6WYy8bkeo8nYldhFx/l7u3UG1gf6ebEAVBlSKkTLri7aYZe9gIF8tRFRA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VB3lx5Wp1z16Fk; Fri, 5 Apr 2024 16:26:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 435GQrru097146; Fri, 5 Apr 2024 16:26:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 435GQrgS097143; Fri, 5 Apr 2024 16:26:53 GMT (envelope-from git) Date: Fri, 5 Apr 2024 16:26:53 GMT Message-Id: <202404051626.435GQrgS097143@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Zhenlei Huang Subject: git: 317cc829ee22 - main - LinuxKPI: Remove the temporary variable fileid from the macro request_module List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 317cc829ee227cfdffe7b25125c070112ce0c2f1 Auto-Submitted: auto-generated The branch main has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=317cc829ee227cfdffe7b25125c070112ce0c2f1 commit 317cc829ee227cfdffe7b25125c070112ce0c2f1 Author: Zhenlei Huang AuthorDate: 2024-04-05 16:26:09 +0000 Commit: Zhenlei Huang CommitDate: 2024-04-05 16:26:09 +0000 LinuxKPI: Remove the temporary variable fileid from the macro request_module The variable fileid stores the result from kern_kldload() but never gets used. Since the third parameter `*fileid` of kern_kldload() can be NULL, this unused variable can be safely removed. No functional change intended. Reviewed by: emaste, bz, #linuxkpi MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D44583 --- sys/compat/linuxkpi/common/include/linux/kmod.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/linux/kmod.h b/sys/compat/linuxkpi/common/include/linux/kmod.h index 278d64db9df3..b3cbe2ed2e02 100644 --- a/sys/compat/linuxkpi/common/include/linux/kmod.h +++ b/sys/compat/linuxkpi/common/include/linux/kmod.h @@ -39,9 +39,8 @@ #define request_module(...) \ ({\ char modname[128]; \ - int fileid; \ snprintf(modname, sizeof(modname), __VA_ARGS__); \ - kern_kldload(curthread, modname, &fileid); \ + kern_kldload(curthread, modname, NULL); \ }) #define request_module_nowait request_module From nobody Fri Apr 5 18:20:18 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VB6Gq1jFcz5GwZM; Fri, 5 Apr 2024 18:20: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 4VB6Gq14Wcz4gBV; Fri, 5 Apr 2024 18:20:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712341219; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yo18G6roqdOQI0w0pIgHuAK/9cs/PGaiavtB7PPJGNQ=; b=pZZEFvi76+o4NNzYWS/RWuIIln2FhkFzJ7xzJOx4rfg2Cpa/aubO7EzXhhoPnJzJPDCF93 xAhnIlb+GPqe6YNXHEmR8uGn9ov6BYznbHjs5BpBfrbCgFNIktbRAfXRdOgjxtsZBFDiTa Ch/FgZ/OOdDQSkGZ3EZEyXpZosXoNYbbEzSYXKIPHOr0YslATKR3BvfSbvNcLmvCO/sLw6 eYJjoSg3XXC7e1Tsp/V9l9Jnv3nKTjBVg6a+Jgh9KMKmmtzj6DeySBdDWMp5NImB1tEB28 scLSraPkb+4tWIS/dhnPRyVvwHNelsBtjREtu9i2cujC06pOPCWl2bR2xk63Ug== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712341219; a=rsa-sha256; cv=none; b=NZmo2tJVzqgschan7V85Ff2Snoi1t/UgLUDoi73/rCh2oKsfyk03vbFe9DOCU0GN1lNuZb bU+hq0fZwNeCSPo9sghB03LQZcPIc96hJEcNeVJcnGvgXH+gp9aOehpFKhj/oH4Bcdd3fm XT8UwBz9+JETCY2IBB6J3C5xNntJYnI51T/PYrlpCfxrH/rmV6ROdEtJsDUb9HhTy6Kohc 7JvSNTJ2uU+McfKB7EO0je1OE410acmRTvJ1EmBUKMCqBrw9nHrkM6bDprU2yE5spNVLuq qBEhY9+x7l1KOfc1+emHBawnRjqZvzyAhrV2uzQddpT5rVttP6gzpAEuzuOTAw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712341219; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yo18G6roqdOQI0w0pIgHuAK/9cs/PGaiavtB7PPJGNQ=; b=ag2sK87qF7AzOxxTgZpkrj3pjRShvUvTgXyLHCWZomA9Ctlz3IIXgEPDDywQA1jdRbort4 dPS1TNEaGNT6Y6MKMRhSox9jAb//3SZb9KMt4PmtrjkX7pX38RoJz5xEwd3+3jG+wvWzM0 +Lup89nDKGCwbT30DuBLjUhcn/olCHjkBlGQzl0vTDo/9T/aagzu6BB3CH6hG0D7wRY1a+ EGOmXcvjjui4zSc3V45c/+s4FLYkrJMnXSTdNqNQWxP7jlry8Qt24ENSmjosPdz/kRH88u 5DPpB93iUFUkDelAzDGdxa9QVJBKjzvjRY6ndWo1dxqwEIh40vOSiXffkTvSkA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VB6Gq0Ffyz19PR; Fri, 5 Apr 2024 18:20:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 435IKI19093961; Fri, 5 Apr 2024 18:20:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 435IKIOb093958; Fri, 5 Apr 2024 18:20:18 GMT (envelope-from git) Date: Fri, 5 Apr 2024 18:20:18 GMT Message-Id: <202404051820.435IKIOb093958@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: da2b732288c7 - main - arm64: add CPU part identifiers for Apple M1 and M2 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: da2b732288c72b347b128e1fa9a169c7bba3beb8 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=da2b732288c72b347b128e1fa9a169c7bba3beb8 commit da2b732288c72b347b128e1fa9a169c7bba3beb8 Author: Lexi Winter AuthorDate: 2024-03-23 16:18:24 +0000 Commit: Mark Johnston CommitDate: 2024-04-05 18:18:32 +0000 arm64: add CPU part identifiers for Apple M1 and M2 Part numbers are sourced from Linux (arch/arm64/include/asm/cputype.h). MFC after: 2 weeks Pull Request: https://github.com/freebsd/freebsd-src/pull/1144 --- sys/arm64/arm64/identcpu.c | 19 ++++++++++++++++++- sys/arm64/include/cpu.h | 14 ++++++++++++++ 2 files changed, 32 insertions(+), 1 deletion(-) diff --git a/sys/arm64/arm64/identcpu.c b/sys/arm64/arm64/identcpu.c index c93b1292aca1..01b434fd4f47 100644 --- a/sys/arm64/arm64/identcpu.c +++ b/sys/arm64/arm64/identcpu.c @@ -250,6 +250,23 @@ static const struct cpu_parts cpu_parts_qcom[] = { CPU_PART_NONE, }; +/* Apple */ +static const struct cpu_parts cpu_parts_apple[] = { + { CPU_PART_M1_ICESTORM, "M1 Icestorm" }, + { CPU_PART_M1_FIRESTORM, "M1 Firestorm" }, + { CPU_PART_M1_ICESTORM_PRO, "M1 Pro Icestorm" }, + { CPU_PART_M1_FIRESTORM_PRO, "M1 Pro Firestorm" }, + { CPU_PART_M1_ICESTORM_MAX, "M1 Max Icestorm" }, + { CPU_PART_M1_FIRESTORM_MAX, "M1 Max Firestorm" }, + { CPU_PART_M2_BLIZZARD, "M2 Blizzard" }, + { CPU_PART_M2_AVALANCHE, "M2 Avalanche" }, + { CPU_PART_M2_BLIZZARD_PRO, "M2 Pro Blizzard" }, + { CPU_PART_M2_AVALANCHE_PRO, "M2 Pro Avalanche" }, + { CPU_PART_M2_BLIZZARD_MAX, "M2 Max Blizzard" }, + { CPU_PART_M2_AVALANCHE_MAX, "M2 Max Avalanche" }, + CPU_PART_NONE, +}; + /* Unknown */ static const struct cpu_parts cpu_parts_none[] = { CPU_PART_NONE, @@ -260,7 +277,7 @@ static const struct cpu_parts cpu_parts_none[] = { */ const struct cpu_implementers cpu_implementers[] = { { CPU_IMPL_AMPERE, "Ampere", cpu_parts_none }, - { CPU_IMPL_APPLE, "Apple", cpu_parts_none }, + { CPU_IMPL_APPLE, "Apple", cpu_parts_apple }, { CPU_IMPL_APM, "APM", cpu_parts_apm }, { CPU_IMPL_ARM, "ARM", cpu_parts_arm }, { CPU_IMPL_BROADCOM, "Broadcom", cpu_parts_none }, diff --git a/sys/arm64/include/cpu.h b/sys/arm64/include/cpu.h index 3057d97a8f69..995be1c96d77 100644 --- a/sys/arm64/include/cpu.h +++ b/sys/arm64/include/cpu.h @@ -132,6 +132,20 @@ #define CPU_PART_KRYO400_GOLD 0x804 #define CPU_PART_KRYO400_SILVER 0x805 +/* Apple part numbers */ +#define CPU_PART_M1_ICESTORM 0x022 +#define CPU_PART_M1_FIRESTORM 0x023 +#define CPU_PART_M1_ICESTORM_PRO 0x024 +#define CPU_PART_M1_FIRESTORM_PRO 0x025 +#define CPU_PART_M1_ICESTORM_MAX 0x028 +#define CPU_PART_M1_FIRESTORM_MAX 0x029 +#define CPU_PART_M2_BLIZZARD 0x032 +#define CPU_PART_M2_AVALANCHE 0x033 +#define CPU_PART_M2_BLIZZARD_PRO 0x034 +#define CPU_PART_M2_AVALANCHE_PRO 0x035 +#define CPU_PART_M2_BLIZZARD_MAX 0x038 +#define CPU_PART_M2_AVALANCHE_MAX 0x039 + #define CPU_IMPL(midr) (((midr) >> 24) & 0xff) #define CPU_PART(midr) (((midr) >> 4) & 0xfff) #define CPU_VAR(midr) (((midr) >> 20) & 0xf) From nobody Fri Apr 5 18:31:26 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VB6Wf3JSbz5GxtP; Fri, 5 Apr 2024 18:31:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VB6Wf2sx7z4hcS; Fri, 5 Apr 2024 18:31:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712341886; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IIXJWPH/4AFmBVfCPMDXQVnYowF24/3EEzeCM681/gA=; b=vQ3lpij/ydh6q46h3IRdfctT/YGeRIqgd2W4kXMeOQKxYDpqfPrlGI0pOMQteOahKu/2Uc 9+sCPk/obqOxcKQyhSmAFPfKdKj6aC9xlPQu0vs5uFOndA1Z+uZN9jEVEo7oSpmPzGinEj 5h6aZB8dPtpGFFNBfB4IwSaXucI2hCY+BOEzp8CzPAR/r6u2yF/1quk3kc4XQ5CI7n7A9Z O5NEBz+qumVM6bm3qAVSlBv1L6tnYRQ0gIILGWk9Sfmt3XAb3TM/3UOBFudBdRqITwipxR WZXF9Cmkqg3lDsaiSxfSuflx1De4ZaKeIXCC1Jnr1hReViEqK5QYj9cTLEsztQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712341886; a=rsa-sha256; cv=none; b=ePLtoXOQhsSpGYIkg9n4EwbHw8KeRbq/aAhvOz8LYQsCBOSpUKz7tzQTfOayJboztzJmTH AQ/CmXQIySMZCS2uXd/JDXZj8nGsA/yBN90b+BN0agiMOtZCdz9y8BSqFhmd9CDQ54EYQ3 JjmkE0umcgp5yXoZAgoGptaJQXCBuAFjtvP3uwwwdAsvFdDRP0epSO89iysPJx5TGYySH5 mzQ4xqa+PLoLy1NrMJCHXlERIMd5YuJYTEjIvcMH6fvaF0UMcI1Yvpy1ckj6VoHjyV3x1g kLQCLpf7QD8/Fxh7nnTe+SZLjhHic7DLCSgPCLxQLWENhU0q6h618HAB4d5XcA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712341886; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IIXJWPH/4AFmBVfCPMDXQVnYowF24/3EEzeCM681/gA=; b=wIrXtfLi8Gz7nVohr6PFN6xFNAgEZMWkAXud3NzBJ4J9ddOgu3eSIjovUtJ5nArhBAYFIS AfvEMJmSgjOtJLPFC6zCbvkslMwGzHWbLiLmLmkzSeHRtRAPDv2inktopimRUf8fFXbsoA 0RgSglgWIx+CQ9jjP7QEgdnYTGwlU8JdDMvemzD3B3c7MZEwm/RG/duJ/6VB5Vx0Vw2y24 pK+LNhY+cUiBAm4IHHmfwNotHVQot/dvxHl/mY5zg6Uqvo9hpX7c9UpPobmJ3+lw+Xj14S zn9JDnfoylDRe48nUemLbyzC/gCM0PKQlyFfiweIS2tX5eoXv4eImc8b5yp78w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VB6Wf2TfRz19jD; Fri, 5 Apr 2024 18:31:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 435IVQ83017150; Fri, 5 Apr 2024 18:31:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 435IVQwR017147; Fri, 5 Apr 2024 18:31:26 GMT (envelope-from git) Date: Fri, 5 Apr 2024 18:31:26 GMT Message-Id: <202404051831.435IVQwR017147@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 8268a31bcceb - main - which: Use size_t instead of ssize_t for pathlen List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8268a31bcceb9ebe32d380cab792c89c5d897d15 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=8268a31bcceb9ebe32d380cab792c89c5d897d15 commit 8268a31bcceb9ebe32d380cab792c89c5d897d15 Author: Collin Funk AuthorDate: 2024-02-11 04:26:38 +0000 Commit: Mark Johnston CommitDate: 2024-04-05 18:30:31 +0000 which: Use size_t instead of ssize_t for pathlen The "pathlen" variable is the return value of strlen(3) and is then passed as an argument to malloc(3) and memcpy(3). The size_t type matches the prototype for these functions. The size_t type is unsigned so it can fit larger $PATH values than ssize_t. However, in practice ssize_t should be larger enough so this change is just for clarity. Signed-off-by: Collin Funk MFC after: 1 week Pull Request: https://github.com/freebsd/freebsd-src/pull/1113 --- usr.bin/which/which.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.bin/which/which.c b/usr.bin/which/which.c index f6ee25f60cce..dc22efb815d8 100644 --- a/usr.bin/which/which.c +++ b/usr.bin/which/which.c @@ -45,7 +45,7 @@ int main(int argc, char **argv) { char *p, *path; - ssize_t pathlen; + size_t pathlen; int opt, status; status = EXIT_SUCCESS; From nobody Fri Apr 5 19:22:49 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VB7fx2wv1z5H3HX; Fri, 5 Apr 2024 19:22:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VB7fx21Knz4mj4; Fri, 5 Apr 2024 19:22:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712344969; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=S1S6PfMI0qpbYoy1mtxik2j4NX0Rtd/OSB5upWUJ1/U=; b=Un5fMFJFyXUpq7ZUETHmyiIH1qlv9WstNI1HcgPJl7EpCohWPrfjIjogMt2aZ8pzzjaXLu JqyDvq+fuv/rM5UsVIniDpif+oWZzWy2miqC6KSh2Mm1SqgB819MrFm5XQDeGN87kOND9J t5+Y/3RD9Wy/2XATsvKVtEhZr6H1NN4LVQd3bPaGr3X+zPZyPFA73H6y5Tm+JEJ5JKkgUe lCgOhn1B68JzNNQAmvd890lJjBjFJEyPiY1MckaQRRO2QOtYojhmUrNsa6z/Gmk6zB0vSQ T0VSA3vfa48oPFihoW9cuL/g5opzHOh/zbVrLyjzniwt8P8PYtsZ0q4bjEv/8A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712344969; a=rsa-sha256; cv=none; b=oe+6GJtFCbjAhW3vJWMa1ez2WwctiSIOputNN2q0WmNMuPiXUjKilHlBLknIGV2n7A4WDa hRNIQF1hQBqK7DmrrLgP4G4x5tBH2RsNGeGfj+IEWCDZloiefscNnDOIvmRPJZfV/H49QB CD2p66K1vxPgniRNg3T9Nhf+/Gx0EEwRTd2jY41gcbABronLP+Ry/WQESDeRmRrLO2AIT2 M4utvsAps1z7Gnec2/HDbmabpjlCaGKkm74HP3YGSh1KzNW+sGkwWYAqrkLjyH9ydX7VJr xfwDkzNcNewPFtTHAgQS1Lm14EI4dY+lQRGmflPKJd43Z1HC/wFs8oOeyGmTug== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712344969; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=S1S6PfMI0qpbYoy1mtxik2j4NX0Rtd/OSB5upWUJ1/U=; b=hzPyCwICi3TNb7Zz075wcxYz98ZxKYvMD63GXv9lZ//rMb3nx+fs+sJZyZGaalXq8G0irG mjDdMFwPy0Rf5Sv5Z28sDnRsVS+T8WI1fuT5N+QMD3RrOHteCmNLbKVELFQHUTBPCrYIkN WN4upkaxlne+jE86zc59e9GdIN7uYkgtVehkniPcJ08XZV4swI4po4O7XAXSV+wVqWtJ+7 aOm9NnfbG7/O/5qVKUL30V4yg4JrB8Z35YupTunSSUO4s0CUjEn5zJiohpO73XpzurTudh G41ZxlDcZJWr76/UMGD/PBu+/SOyqUtANJUGtSIlWvEKv/btJcnoDRz3GsygKA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VB7fx1cg0z1CBN; Fri, 5 Apr 2024 19:22:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 435JMnK5003059; Fri, 5 Apr 2024 19:22:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 435JMn0N003056; Fri, 5 Apr 2024 19:22:49 GMT (envelope-from git) Date: Fri, 5 Apr 2024 19:22:49 GMT Message-Id: <202404051922.435JMn0N003056@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Stephen J. Kiernan" Subject: git: 1b60bbfe653f - main - arm64: Separate serror handler to EL1H and EL0 versions. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: stevek X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1b60bbfe653fb567478ffa8e9fb7478bb8fa3cc6 Auto-Submitted: auto-generated The branch main has been updated by stevek: URL: https://cgit.FreeBSD.org/src/commit/?id=1b60bbfe653fb567478ffa8e9fb7478bb8fa3cc6 commit 1b60bbfe653fb567478ffa8e9fb7478bb8fa3cc6 Author: Stephen J. Kiernan AuthorDate: 2024-04-03 23:38:56 +0000 Commit: Stephen J. Kiernan CommitDate: 2024-04-05 19:22:11 +0000 arm64: Separate serror handler to EL1H and EL0 versions. In order to ensure the registers are saved and restored properly for the exception level, we need separate handlers serror at each of EL1H and EL0. Reviewed by: andrew Differential Revision: https://reviews.freebsd.org/D44630 --- sys/arm64/arm64/exception.S | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/sys/arm64/arm64/exception.S b/sys/arm64/arm64/exception.S index bab71fed4453..41d7e7f7ae1f 100644 --- a/sys/arm64/arm64/exception.S +++ b/sys/arm64/arm64/exception.S @@ -236,6 +236,15 @@ ENTRY(handle_el1h_irq) ERET END(handle_el1h_irq) +ENTRY(handle_el1h_serror) + save_registers 1 + KMSAN_ENTER + mov x0, sp +1: bl do_serror + b 1b + KMSAN_LEAVE +END(handle_el1h_serror) + ENTRY(handle_el0_sync) save_registers 0 KMSAN_ENTER @@ -260,14 +269,14 @@ ENTRY(handle_el0_irq) ERET END(handle_el0_irq) -ENTRY(handle_serror) +ENTRY(handle_el0_serror) save_registers 0 KMSAN_ENTER mov x0, sp 1: bl do_serror b 1b KMSAN_LEAVE -END(handle_serror) +END(handle_el0_serror) ENTRY(handle_empty_exception) save_registers 0 @@ -303,15 +312,15 @@ exception_vectors: vector el1h_sync 1 /* Synchronous EL1h */ vector el1h_irq 1 /* IRQ EL1h */ vempty 1 /* FIQ EL1h */ - vector serror 1 /* Error EL1h */ + vector el1h_serror 1 /* Error EL1h */ vector el0_sync 0 /* Synchronous 64-bit EL0 */ vector el0_irq 0 /* IRQ 64-bit EL0 */ vempty 0 /* FIQ 64-bit EL0 */ - vector serror 0 /* Error 64-bit EL0 */ + vector el0_serror 0 /* Error 64-bit EL0 */ vector el0_sync 0 /* Synchronous 32-bit EL0 */ vector el0_irq 0 /* IRQ 32-bit EL0 */ vempty 0 /* FIQ 32-bit EL0 */ - vector serror 0 /* Error 32-bit EL0 */ + vector el0_serror 0 /* Error 32-bit EL0 */ From nobody Fri Apr 5 20:36:06 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VB9HV6X1Mz5H8yj for ; Fri, 5 Apr 2024 20:36: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 4VB9HV62kYz4yMZ; Fri, 5 Apr 2024 20:36:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712349366; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BLnsgThxWSOfkp/qhuNjfIIUuD6If90XA3LbAwxAYNA=; b=qI7h0Uu2Xv3LS3qZ0fDEDDvZ5a5Wlew97p/jtCdaVyA9dvexOCu0ZUQB2J9A9/nZZ6Dmtw e6mcHDlGfXUEa8/2T1j9QhC67xG3ZouMV2IM3I4IkOxa1avPu8Mz4iubMLqgLt06SNAQS1 /htHYgPAPgvTuR8jrvZiafkMKON8+5kBZcqmcNHP9ll5d9YxAFN4MFdbMqLHq+aw+huU7j ZkBBjBHhv4Cwi4bVIzIlSqCRkM2iWIzEJFxXd3KdbaRHqE+YvdHP1+aezsnX+eCtM+hF2I FpI5UsE1iF9w684msBdtEJlW2CkbicWF3UygvJrxO+C77x3w8MIiVppqNmfN/A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712349366; a=rsa-sha256; cv=none; b=KF1d25YLlP46e38h1YmaYn8TcujtSQEno19EO2EcqgSNBvq4cU4wJr+5YvnOTJpJdZco8p 8wkr4Ir0kz8exi2TokNdPX1ACMSpKcaOdACIMvxtgPotXm03c9pce0uhtUBI3VVGR1iAFh b4+4k2HAQfITNNBoNa/7eGtpu+ok7stc+cpGSeuDbGyPBgGXrkV+ix6A1DFln0gnqO6wbi NxDISsgu7eDv3gRF3R/ySlwjb+xp7B6P+J1g6jWONpiTaDChFodVxnt0rh4/VAOWndYLHB ZsOojxkujYQuOkOC2YdUqWdtztFcnxsWRwCzIEYBpegc95GCkLltJbwQ1vY8aA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712349366; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BLnsgThxWSOfkp/qhuNjfIIUuD6If90XA3LbAwxAYNA=; b=jImApKVf20V7naATvYI5pIJMayZ3c0cvMXYydbiVkt2ueiscao/aKuOPdBZ+D9pRp7KEjS 6MuKz4jp6I7vkfaPfMPSgUvVccVGKYviDrvKsJb/Pxd2jW3OWZGxxXIhoi9HdUXuGnXTS0 Tl4eHsDe4agZE48D17XsY/CHZJ47Ihv2ESPMBlN/Cxsl/H6ge3kwnus87MA0wMdQ0VfNnH bKsDIgVgEAcGxAadtc1hgbMU+vEEnolJq1BOHbypml8snX8aDrL2csSjTs1WlorkxDL+kr kDhnF6AGPSz61fZ4lZy3rBHLcUK74mnaK0dz7o6amG2fdx/hdxY9lWwJ7PN9aw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VB9HV5MG5zFKd; Fri, 5 Apr 2024 20:36: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 435Ka6po022169; Fri, 5 Apr 2024 20:36:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 435Ka6G9022168; Fri, 5 Apr 2024 20:36:06 GMT (envelope-from git) Date: Fri, 5 Apr 2024 20:36:06 GMT Message-Id: <202404052036.435Ka6G9022168@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: Dimitry Andric Subject: git: 8b885620ff1b..05834cae71b9 - vendor/llvm-project/release-18.x - vendor branch updated List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/vendor/llvm-project/release-18.x X-Git-Reftype: branch X-Git-Commit: 05834cae71b93c867532aee91cb7cab176920c01 X-Git-Oldrev: 8b885620ff1b22914b6fac738d7b2874d94e7543 X-Git-Newrev: 05834cae71b93c867532aee91cb7cab176920c01 Auto-Submitted: auto-generated The branch vendor/llvm-project/release-18.x has been updated by dim: URL: https://cgit.FreeBSD.org/src/log/?id=8b885620ff1b..05834cae71b9 05834cae71b9 Vendor import of llvm-project branch release/18.x llvmorg-18.1.3-0-gc13b7485b879. From nobody Fri Apr 5 20:36:06 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VB9HW1gPrz5H8yk for ; Fri, 5 Apr 2024 20:36: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 4VB9HV6VBgz4xlS; Fri, 5 Apr 2024 20:36:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712349366; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YkfNxb3Z9ClopDu7G2nCQ7J6ZyJI4soZqK0aH7btP7U=; b=YET0T4ZOUPWTZbDsIVCcEj+QEqtFbjBS4yvJ3s3MTATpN50A7GgGkF3RMyUVYQu5UAnNiw 1pa5AVB5mukUK1xKorj3kDwYKwt4vex2HcpErmgulv8RvMVHwwzqE93ylCyoQgv2eh9Eto lYtdv9mRlE2JXUUIsZGa3oaWOFPaizcW+6uxcPxuGaxYQZk642ynotSI6k+ndM/V17NnRL AXIpgs9MytMgCxaxpa+vNmYobsD5Xmu3Wv4Wuw6s4QNUVP2qZX2fxwKz7YawvNm3aziiKU a+DonsOdzcmTTvnmvNJY4ntwE4Lnb++DykhIcG0AxUasVrsxtcQk1uIMvivrnQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712349366; a=rsa-sha256; cv=none; b=TrkPRZnm1vhjDrn8uCgVwsQJSzzaT7g0wSKTMJGYm7/Ep4+a8U68lO9HRaM8dtajUko0eH kOBBz66JZ5xVhODZVWzF3HNl/4qYByFYX3ilhMCxI7C79wNLj0WYNEXCTHG+v1jPXqwLO9 WZntKeD0FL3UCoRJSnRlZ5PzLEskV4ZLtIX9EGr1VVasQJiqFyVgk6sjI1/hZTffaHqjJb U+IPVS6YiXdj2Qrr+aKNJlv3S6LGnw9cvMnosxFD72hB0WgmfriIOc5mWOTPchq2RzbRXv EPmL7tT/wfs0ZMWPrgIDcd1TsV+boJaQRobS25QJIxZzrOrSNTIZP3MFZ9jEZw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712349366; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YkfNxb3Z9ClopDu7G2nCQ7J6ZyJI4soZqK0aH7btP7U=; b=sSu11fRb44rrPMqsYYsBv0L95AiYb7kqrTfmJq72INKWwYyMnQdHe0xnAFchMUt2fSS5vs hb65TapHVriMnDxAE06xT0C9TxX3xzQYLu8AtgF/4afCmeWJLYTeTb0t3j8QowleIhcrlk dc6U971pGV3No6yzrovlEwLGzuY4l4jFZHZbPiKkfrAaMuH3V3wjZI+wMVrSd34+A+b+RM iBU7xa6N1uWQ2kJdxC/wdqVBe+PD7Od905gmfn3XEnjsdT1qcTBrlfAVCCsGt+XJH8E8CZ QWGxB8LMCuI/SgfZ7WgcOArXHsSES9jtJ6LlhxZB94ruAPMMS3fM3pPUAmFqNA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VB9HV5zvRz1Cvd; Fri, 5 Apr 2024 20:36: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 435Ka6L2022188; Fri, 5 Apr 2024 20:36:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 435Ka6EQ022187; Fri, 5 Apr 2024 20:36:06 GMT (envelope-from git) Date: Fri, 5 Apr 2024 20:36:06 GMT Message-Id: <202404052036.435Ka6EQ022187@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: Dimitry Andric Subject: git: 640485c03950 - Create tag vendor/llvm-project/llvmorg-18.1.3-0-gc13b7485b879 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/tags/vendor/llvm-project/llvmorg-18.1.3-0-gc13b7485b879 X-Git-Reftype: annotated tag X-Git-Commit: 640485c039505bf6c02a2119b37bcafa65d258b3 Auto-Submitted: auto-generated The annotated tag vendor/llvm-project/llvmorg-18.1.3-0-gc13b7485b879 has been created by dim: URL: https://cgit.FreeBSD.org/src/tag/?h=vendor/llvm-project/llvmorg-18.1.3-0-gc13b7485b879 tag vendor/llvm-project/llvmorg-18.1.3-0-gc13b7485b879 Tagger: Dimitry Andric TaggerDate: 2024-04-05 20:30:19 +0000 Tag llvm-project branch release/18.x llvmorg-18.1.3-0-gc13b7485b879. commit 05834cae71b93c867532aee91cb7cab176920c01 Author: Dimitry Andric AuthorDate: 2024-04-05 20:29:32 +0000 Commit: Dimitry Andric CommitDate: 2024-04-05 20:29:32 +0000 Vendor import of llvm-project branch release/18.x llvmorg-18.1.3-0-gc13b7485b879. From nobody Fri Apr 5 21:37:30 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VBBfL41xbz5HFMR; Fri, 5 Apr 2024 21:37:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VBBfL3HSGz54gj; Fri, 5 Apr 2024 21:37:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712353050; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nK22jheWYjzExo3hZHGDquzH/3WtwphiWwzJVjYkVBI=; b=Ql/8iQDyho/ZUGbnpu6XrauxXCcstEB3OujqFABdIUGm0QL5exdGH7nOc/RaO9qvQ26v9c WX3vacjEM0uzIKytg72Qr641yEZeviPHfuBKW3IF1tAfbjAhDrmFxXD2DUsBCN+LVkcW9s 1Uu7fLiqe9mmt/UkA54TjFz6C2WByEOhgLa7qOUpu2CjnwBuPJopJrLhevmYkNk9jD6eJ2 52N6i6Nw7/m/MaxuQfnA4kR/zCrljEC6fI0IeRDO2N7oiBJSyAm8b1YTRanHTYjQSyGRyB WyM4FsXrgwlBEFAmwcsOJOnvh5WKPodjfrCECMs3vIp9HqhPkxEbwL0r4IheBA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712353050; a=rsa-sha256; cv=none; b=udzoX/OiFTHkwjjYVbSDgGxvYIB0bsTjF8p8Ou+bmg/YvJRP2fJoIQb/xXc0wGgB+FwN6J DrC1Q3UpujoIu/FtdoEpoofKb5FIJWA4aK96dLhPyVOkEy5RHDsPKL5I9c3OLcd8yX+81G BmCjAT7ZnHub1/xkxpFuDki9BdBRFeIJASArBwJF3++YLEmgy8+H5lm1gu0KjYKeTzYc57 7bH1CsCzFx9Yk4kNOcfAcB8bbc1Iw40t0tRkByyCpQmY/XWvWKJgnS442vemj9TmKdWZOP stsnSl4MCCZ+msDD1DrIONFkUiR3JNsrpPfQo9yTDB2cm7HiS7C8NSc4LhnWqg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712353050; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nK22jheWYjzExo3hZHGDquzH/3WtwphiWwzJVjYkVBI=; b=f2mWXrTDrSq+UNs+g7vYfmORK9+9tsMPSiqTwWKyOK2nqaKn76WsyDNWaylgiwJi/M+Kk+ qqe/4+HU03Fe/vz1UlTu18vdNi9yAKzE3TLl8BcR/kif/nGgUYUD4TKMRXcftpuLiMoFTt uk+IvjBFWDUi5X/0AT8vOF2poQLi5QG1fnuqpah3WawdgCAy2GMb+xzLndGjwNpZugInHO Y3JH/S/+WhIK42qlVHRtfKP4z0QBB7z9tL7nI/CeFKYWy/gQMMFOzUwhmS7CuUjlsCAdqr AZ8AS0lUtuWT8jkqs1cyFVmDeSFZEJ7bXtihLERpEPx8yXa1+hfjJuaeUF4LYw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VBBfL2tjHzGgs; Fri, 5 Apr 2024 21:37:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 435LbUcm024056; Fri, 5 Apr 2024 21:37:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 435LbUPn024053; Fri, 5 Apr 2024 21:37:30 GMT (envelope-from git) Date: Fri, 5 Apr 2024 21:37:30 GMT Message-Id: <202404052137.435LbUPn024053@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Stephen J. Kiernan" Subject: git: 3bbe8ed1a7dc - main - arm64: Add a CPU reset hook instead of expecting PSCI List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: stevek X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3bbe8ed1a7dce6943ce0fbf4946d2b1d435de0ec Auto-Submitted: auto-generated The branch main has been updated by stevek: URL: https://cgit.FreeBSD.org/src/commit/?id=3bbe8ed1a7dce6943ce0fbf4946d2b1d435de0ec commit 3bbe8ed1a7dce6943ce0fbf4946d2b1d435de0ec Author: Stephen J. Kiernan AuthorDate: 2024-04-05 21:37:15 +0000 Commit: Stephen J. Kiernan CommitDate: 2024-04-05 21:37:15 +0000 arm64: Add a CPU reset hook instead of expecting PSCI Some SoCs do not include a PSCI for power management and defer it to something else instead. Add a CPU reset hook to account for this, and use it in the psci driver. Reviewed by: andrew Obtained from: Juniper Networks, Inc. Differential Revision: https://reviews.freebsd.org/D44535 --- sys/arm64/arm64/vm_machdep.c | 9 ++++++++- sys/arm64/include/cpu.h | 3 +++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/sys/arm64/arm64/vm_machdep.c b/sys/arm64/arm64/vm_machdep.c index 385bec00ada5..457157e34a6f 100644 --- a/sys/arm64/arm64/vm_machdep.c +++ b/sys/arm64/arm64/vm_machdep.c @@ -54,6 +54,13 @@ #include +/* + * psci.c is "default" in ARM64 kernel config files + * psci_reset will do nothing until/unless the psci device probes/attaches. + * Therefore, it is safe to default the cpu_reset_hook to psci_reset. + */ +cpu_reset_hook_t cpu_reset_hook = psci_reset; + /* * Finish a fork operation, with process p2 nearly set up. * Copy and update the pcb, set up the stack so that the child @@ -123,7 +130,7 @@ void cpu_reset(void) { - psci_reset(); + cpu_reset_hook(); printf("cpu_reset failed"); while(1) diff --git a/sys/arm64/include/cpu.h b/sys/arm64/include/cpu.h index 995be1c96d77..8f5a9e3dbd3c 100644 --- a/sys/arm64/include/cpu.h +++ b/sys/arm64/include/cpu.h @@ -206,6 +206,9 @@ extern uint64_t __cpu_affinity[]; struct arm64_addr_mask; extern struct arm64_addr_mask elf64_addr_mask; +typedef void (*cpu_reset_hook_t)(void); +extern cpu_reset_hook_t cpu_reset_hook; + void cpu_halt(void) __dead2; void cpu_reset(void) __dead2; void fork_trampoline(void); From nobody Fri Apr 5 22:57:48 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VBDR113l5z5HMNP; Fri, 5 Apr 2024 22:57:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VBDR064Y3z59CL; Fri, 5 Apr 2024 22:57:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712357868; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dYUq1J2DnatsbnKiEE05pghs5K2v1MGZEdPTJRhBuLA=; b=Ivlps6qYBPCBKhiHzL2frFnddPkYIAbzxZ6+zjTae5gJyZ41Cy0tLS7Dmeq2xG0TyHIpRt 9LJr+J0WwKT0EW+69vq+NN0nRIsia+1vLTB5VZpVWe75CbPEpeCyY6RbRUENexu+xHOTvY TK7VRcf/BWp0/5gq1J65V0+p6Xfs6MKj3YXANhPWJIrV/TVxqDME2soFtOKtBuhmms58+f fKOoB6RMP0aRO1XbWj7jU3iNjydYF7ZGS4BwErbUjqzVOs2/B16N+T6Q3VZVTYP6NMqghA 5ClzJjQp6EZgd6cw738Qdoi1oPmUYrxkrjW0AfkR2S2d05xKozBFac3GdUMVww== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712357868; a=rsa-sha256; cv=none; b=n9S4uq6M0DC/df2T/A4PEPiANpIFaQs26KBfF4xLcbC2EKfGhgY4f+2tsuEZ671sUcs7j/ Dl+Fgz276FOhixVZhtIskIZL/+5+BIokJIX+3KB6p0Df/L56D7AgKvOZuoZdoV/HR2yD4N /X2Ff2kWVDa+xp+OUXpeTj5omVR8hV2hdXTLqEqN7vxKcEwk4dVgS1FHY1qUadI+8K9RUi yTxXDVFp/MqN3b5lBVOgq5D/WN1MKoa09qYsv1PRaOXJen/byCkC7pa6EjkbDimXg6iqfT ALFxU3N9jdEeOcy9AnqoTeMZCPH2Ee68ONxM5hUYSf670u9Hg8EkfWeRXNbeaA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712357868; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dYUq1J2DnatsbnKiEE05pghs5K2v1MGZEdPTJRhBuLA=; b=UHMDcCQ3lGP9hDi6ysNarN4DYgzpBdllqy9F4gauTdXb5eSK0KcnOT58+VX5edZp32WtFG jqPA9z+hhNAVZ7doZjXIygHOCEGsuXrW9VqoUNj/xjnfDNUo+aXukNZwteBtfIO96R3ind Sw5YYdqO1s3NIlRJ/bb6U1ok0z7gKCyytxM/Bw/Vh0rQqC3slAwZzQGXJFPg89eGed9T25 b1KAIUvMVTXL+QiJYJxbUhzcGL62qtvunqj+RBbx4Wn3hGNZwkDWZ91hc9mNtSoolygmo3 4bCzdRnK7gGaNsEiPXs8eiNSLX0cY2jBDTL5JuP1stLiomG9rRtHKGLbXjncLg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VBDR05Z60zJct; Fri, 5 Apr 2024 22:57:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 435Mvml9058677; Fri, 5 Apr 2024 22:57:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 435Mvm8q058675; Fri, 5 Apr 2024 22:57:48 GMT (envelope-from git) Date: Fri, 5 Apr 2024 22:57:48 GMT Message-Id: <202404052257.435Mvm8q058675@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 0b8f21e8d1f7 - main - nvme: Add LPA bits List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0b8f21e8d1f749bd03532f90656e2a5cf01800c0 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=0b8f21e8d1f749bd03532f90656e2a5cf01800c0 commit 0b8f21e8d1f749bd03532f90656e2a5cf01800c0 Author: Warner Losh AuthorDate: 2024-04-03 17:26:17 +0000 Commit: Warner Losh CommitDate: 2024-04-05 22:53:47 +0000 nvme: Add LPA bits Add all the bits from the NVMe 2.0 base specification: CMD_EFFECTS to indicate the commands and effects log page is supported, TELEMETRY to indicate that the telemetry log pages and protocols are supported, PERSISTENT_EVENTS to indicate the persistent event log is supported, LOG_PAGES_PAGE to indicate that various log pages related to log page and command support are supported: L0, L5, L12, and L13. and DA4_TELEMETRY to indicate that the DA4 area is supported for telemetry data. Sponsored by: Netflix --- sys/dev/nvme/nvme.h | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/sys/dev/nvme/nvme.h b/sys/dev/nvme/nvme.h index 46956d5f54cf..706b77507b61 100644 --- a/sys/dev/nvme/nvme.h +++ b/sys/dev/nvme/nvme.h @@ -390,9 +390,24 @@ enum nvme_psdt { /* per namespace smart/health log page */ #define NVME_CTRLR_DATA_LPA_NS_SMART_SHIFT (0) #define NVME_CTRLR_DATA_LPA_NS_SMART_MASK (0x1) +/* Commands Supported and Effects log page */ +#define NVME_CTRLR_DATA_LPA_CMD_EFFECTS_SHIFT (1) +#define NVME_CTRLR_DATA_LPA_CMD_EFFECTS_MASK (0x1) /* extended data for Get Log Page command */ #define NVME_CTRLR_DATA_LPA_EXT_DATA_SHIFT (2) #define NVME_CTRLR_DATA_LPA_EXT_DATA_MASK (0x1) +/* telemetry */ +#define NVME_CTRLR_DATA_LPA_TELEMETRY_SHIFT (3) +#define NVME_CTRLR_DATA_LPA_TELEMETRY_MASK (0x1) +/* persistent event */ +#define NVME_CTRLR_DATA_LPA_PERSISTENT_EVENT_SHIFT (4) +#define NVME_CTRLR_DATA_LPA_PERSISTENT_EVENT_MASK (0x1) +/* Supported log pages, etc */ +#define NVME_CTRLR_DATA_LPA_LOG_PAGES_PAGE_SHIFT (5) +#define NVME_CTRLR_DATA_LPA_LOG_PAGES_PAGE_MASK (0x1) +/* Data Area 4 for Telemetry */ +#define NVME_CTRLR_DATA_LPA_DA4_TELEMETRY_SHIFT (6) +#define NVME_CTRLR_DATA_LPA_DA4_TELEMETRY_MASK (0x1) /** AVSCC - admin vendor specific command configuration */ /* admin vendor specific commands use spec format */ From nobody Fri Apr 5 22:57:49 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VBDR20gLlz5HMNQ; Fri, 5 Apr 2024 22:57:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VBDR16Fzmz590x; Fri, 5 Apr 2024 22:57:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712357869; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Rei44Z6splYB+88KTGpl1HeFpne/pNhLc2BEg67mciQ=; b=mp9Q9H5SgGpdyzoqjQx8vqLkixqJVBeMD7vRDVxX6LMwSMj8tdu5JdtVw04QOsOC/mpiYt Z3mlp2eijWYthDl8xa67KNYBCQVQ3nrIQvItR7NXb1DjK87Smw8x7SlthlcmX0w3QlJk6k vxdP1kYMLaqd3Cp5VNoFOf7eLDV3aY6XD9ymqs3ZIwS9QCWenSM2r4l6F3rNILmTeea0pD W5UY1F8dkA96Jugf1BqiaB8Bdc6y3VB9S6MwnSv5jjm/DQM/A1UdQ3xAvSit0H/HC944Bf w1/zhGepAVkbcpksVhXCZ2L2gljQcJUQ6M5DYt91Y43eaO86/MS6iEJkw5vq/Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712357869; a=rsa-sha256; cv=none; b=jCHbQxOqOEUoUw/qP376nF+QaFSIn5oxihq8YKekIF20wGwewusWY3l570XhqzHq9hSF6e IDaeco8pcxmgX4QcSpY4PfF5oeMNaWXO44p81ONcwJLR8vZd7G9L2kYgtrhkznFvKby/OF XyystUhzjyoInwk+D7Xxg5f0qiafLlsrz9GSFFYEWKwhfuT7nykPxynchVFt8dD5R8xev6 HfceGAVo8FswZcBgYxFRwsq3BIWdO66fnsNeKj6sUX4YVpV2VvvsL0c/vQRbGAGAzJd6Tp I4HdZj+f/UkmaB0dyRMiOu8yf+4PYAiWlfWw8azJ20tQcWCn3rF8WH0zLosF/w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712357869; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Rei44Z6splYB+88KTGpl1HeFpne/pNhLc2BEg67mciQ=; b=ZM4dHYiRBgGt9ix8jq8AeTIl6Af3ein7O6C2LAA7B7goMPUC12RY7/GGvDA+LRTLts9Xem Maa+4rhHD18QpcW7uKXNXPTRfGR7X3YNbgILW3CtZZy4+Sjz05wgk+2yEf17BOY4X1Lj+d ZmsO4Z1Z3hb+oJ7ar/+5CwRYkhPnJ+gUrTQOVgdoRyqjqpw8p44M6iI7aIwCJV9l3ewxZz FhEpxPvg+FHFBjkwhb8jFSESx+2dBiL5RQX5rGHL7+r7rrJTjH9q0VWG4J2FJPCCD8u5OW Cd79hB2eiEywii0W6LGeYqZL4ybC24qsoxWz5tuktIneUylBpmxUM6SQYdEwHA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VBDR15rv7zJQC; Fri, 5 Apr 2024 22:57:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 435Mvnrw058722; Fri, 5 Apr 2024 22:57:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 435MvnCb058719; Fri, 5 Apr 2024 22:57:49 GMT (envelope-from git) Date: Fri, 5 Apr 2024 22:57:49 GMT Message-Id: <202404052257.435MvnCb058719@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: fe83abacd4d0 - main - nvme: Add my copyright to logpage.c List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fe83abacd4d097342cabef94b3128cd12c5fdccb Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=fe83abacd4d097342cabef94b3128cd12c5fdccb commit fe83abacd4d097342cabef94b3128cd12c5fdccb Author: Warner Losh AuthorDate: 2024-04-03 18:10:08 +0000 Commit: Warner Losh CommitDate: 2024-04-05 22:53:47 +0000 nvme: Add my copyright to logpage.c Reflect the command line refactoring I did, and other changes. git blame says I'm to blame for ~1/4 of this file. Sponsored by: Netflix --- sbin/nvmecontrol/logpage.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sbin/nvmecontrol/logpage.c b/sbin/nvmecontrol/logpage.c index a4004d3fe2ea..0df342fa51e8 100644 --- a/sbin/nvmecontrol/logpage.c +++ b/sbin/nvmecontrol/logpage.c @@ -6,6 +6,7 @@ * * Copyright (C) 2012-2013 Intel Corporation * All rights reserved. + * Copyright (C) 2016-2023 Warner Losh * Copyright (C) 2018-2019 Alexander Motin * * Redistribution and use in source and binary forms, with or without From nobody Fri Apr 5 22:57:50 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VBDR34gfRz5HMNS; Fri, 5 Apr 2024 22:57:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VBDR26wxpz598x; Fri, 5 Apr 2024 22:57:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712357871; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=x5dx9uNPdDkxYecDLJ+AOd4tTZjavmZ15b/fho/+Na4=; b=DhURtaujoUx2Pj0DKYF4iLcVTgYkjQRmOfld0dtSaZaHqQrwCCTslH3whjGPRx3lJCvwhf Xy1ZqcN49KgHJXm1LQgojGA+hxNW5s3QJZiRqZ+9pTLqxFMLZdXR+1TDe2ZnQA6Z28X/V9 P1S8m/ST/05xo6vRnacJ1eVs5ey3K6VpfAZ7k63H0yVd7TFMNfiUaquGqF8CPnqIWhGXBS Ux6+kPbX03FlZgpsaBxGsY+BIOvz4t3aEn7Yhvxi2WVG+az7ESAxSSOIfO7I6IdLQFNWzm Mr+13PhQhluDjPpq0xTuroY4LzkCKe3qmUrZusoMlakPkocRF/chB9PFfnoP+g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712357871; a=rsa-sha256; cv=none; b=ilD6pTlZSnn7u1sA15I8KwN3da41WvOGGUujbzGeU5lm6WaCVLBoYeUbZ9GSBmdII42Yda HqY82NwCY7IdD8pC2xabd8fUXcN7y2CUBwuh4z+YdwgGFxbS500ajZ5EmKRTCQYadmpmuh RHbQQFb+Fw19J4trjLIfHsRWSdeYDfUgbMAlwepfKwthuoLW0CxOO7r2kC83mV+cMnNZIq We+mTH68GWXS2FjBXsWqZy9URX4u59XrFTPT8mzBZqsOrEFoNbURZybjpNaxVamLNNgu4W l4Jf1bNEOmDmTZQ5brdhwOgU5VdYjnCJQTTLz7/lqizmnaVzGDsR621nf7Mpkg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712357871; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=x5dx9uNPdDkxYecDLJ+AOd4tTZjavmZ15b/fho/+Na4=; b=rPho90oeZPJVRlbXtbGuCYPtk4BB9iGX8IdjCnhUoYWGfypz2EppKXn75WD/8njAuHUK5M aYFyfInYFYRUo3+9Rs7IxgD0LwRp9aWx2aK86bWsKb1IQe4OlAYGcH53UDAEzYwwXo7SsR 0rVJcYWE0tCQkQpeHOXb4qwa5xIEjZgOiKuUrqlONFMJFwu0FDjRvD6q/iHVgHhcUTytpU yRc55qGklw3qRMIDie0LMx78csEopbaJdfjZOs08Dy33XiJytrrE66SNDFeTQXqfyyeMXc nXLtsCX8k9NhchxJfRBbZXVv2rFQSIOHQf42xCDDZeBSTzWxQp0LgFdBkAZDHg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VBDR26WHlzJs3; Fri, 5 Apr 2024 22:57:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 435Mvogt058758; Fri, 5 Apr 2024 22:57:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 435Mvonb058755; Fri, 5 Apr 2024 22:57:50 GMT (envelope-from git) Date: Fri, 5 Apr 2024 22:57:50 GMT Message-Id: <202404052257.435Mvonb058755@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: cfcf475a6697 - main - stand: Install gptboot.efi(8) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: cfcf475a669738382ac75ea50eb03a20280f7662 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=cfcf475a669738382ac75ea50eb03a20280f7662 commit cfcf475a669738382ac75ea50eb03a20280f7662 Author: Warner Losh AuthorDate: 2024-04-04 15:42:06 +0000 Commit: Warner Losh CommitDate: 2024-04-05 22:53:47 +0000 stand: Install gptboot.efi(8) We need to include bsd.init.mk first when we have man pages in the boot loader. Sponsored by: Netflix --- stand/efi/gptboot/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/stand/efi/gptboot/Makefile b/stand/efi/gptboot/Makefile index 82d4b3b8c464..7d4c225bc5d4 100644 --- a/stand/efi/gptboot/Makefile +++ b/stand/efi/gptboot/Makefile @@ -1,3 +1,4 @@ +.include # ZFS is not supported, we want debugging until this is vetted and # we don't want the gptboot.efifat thing created. From nobody Fri Apr 5 22:57:51 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VBDR41zQQz5HMgP; Fri, 5 Apr 2024 22:57: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 4VBDR40z00z59JH; Fri, 5 Apr 2024 22:57:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712357872; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VEcSgx5Kn1M+QIfuvbn/jG9RZiflb30GupnrSTGUNxU=; b=LJrKJerUZ5Wbf0tDv6H0nPoB2e5indhQll74Jqh6E3CQ0MbMK31TnRlCZpX7VH8aacvtiM eLeJ+GVTIzGRyQ9OX0rof9BS9h4/6pwZFDkRHbKoAg4X3te7zEBRdnfPMQy+QRyFVkmxAD g1uvEmjF1YAsH2D9+QwmZXL23hGZPV/H4uN17r18eCPr9trvdD85AzeV9w1BfIN6ryfEP2 hDN7pHONVAeLzABY8M1eyxmOIlTtk99taejp+8DEMjZUEJeaMCi/EXM6BMmF2pnSfo1TVN nwD3oIRsunDluae23RW8PSqCptPAW84dzDt8L0z4IpSoRMRO4goNvDsPzSjvCA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712357872; a=rsa-sha256; cv=none; b=U4H2QM0I5vg6dxsvrhZMxs0V3gCIDcYVKVzBI/UIIhVxbSp8lktHWrlTY4K6dz2WGOGNvE FpX2PTgu78ztrjyKGIzHu5T+lDBRUVhW/Fm/4kvb33Xdiq2WqsRYF0Uw5D+mTnOMks+Q3i rqXxwsp0pxNbgE7i8FBjuuEo7seeBasdfNRHOfgJ72mJn8qCvelUk0OTRGaA4mOe2hkxRt c/Qd/6vDFlB4T3bv1U+JmC4j4q9efYbtO2IKKROGqE9BgA15hibS0u56YDmHp6skjWg8oO Lk2c27yRFgUnwVdb0z8ZVdecT+BHFCKELTWpg23mmnH2CVk5nWUyrgyrOsauOg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712357872; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VEcSgx5Kn1M+QIfuvbn/jG9RZiflb30GupnrSTGUNxU=; b=HZquYeCnpgqAfTB2KvOZKsw0BHPl3BbE76Ec/R7I9g10Qr2n1lxEhUG/rUnFfaS06T2lVo aiBx4iyjetJwygtKFjKRii56q0Ef1PfXM4EGfAIInSZBTUNx4TFjkuPYv4oMJ9q+jldSBr MbIYa+bZDfHHbZztJEay1sTzHwUgJpq/B2Hl7nLzM7yVIrHg7JlD6+600KZOlMdH1F/Xp3 Kuld+lPNpNkUeOdXOv2ppdEedfbIvS+8HbbN5n56dPYtl9239pDu62cGMkfcCIGrmnFVmm jaRuatnOe5e0rrh1YoK/Wi466uzpGb5X9cCI2j6sHj/qJcBVpvDTqqJUPU9ImA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VBDR40b40zJFx; Fri, 5 Apr 2024 22:57: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 435MvpuM058811; Fri, 5 Apr 2024 22:57:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 435MvpT4058808; Fri, 5 Apr 2024 22:57:51 GMT (envelope-from git) Date: Fri, 5 Apr 2024 22:57:51 GMT Message-Id: <202404052257.435MvpT4058808@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 03cfd91998ac - main - devmatch: Make -a work for all devices List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 03cfd91998ac017acd3102a184e194d42e50f843 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=03cfd91998ac017acd3102a184e194d42e50f843 commit 03cfd91998ac017acd3102a184e194d42e50f843 Author: Warner Losh AuthorDate: 2024-04-05 22:31:55 +0000 Commit: Warner Losh CommitDate: 2024-04-05 22:53:47 +0000 devmatch: Make -a work for all devices devmatch -a should produce output for all attached devices, but doesn't. Noticed by: cperciva Sponsored by: Netflix --- sbin/devmatch/devmatch.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sbin/devmatch/devmatch.c b/sbin/devmatch/devmatch.c index d93a35e5633d..6124794d113a 100644 --- a/sbin/devmatch/devmatch.c +++ b/sbin/devmatch/devmatch.c @@ -406,7 +406,7 @@ search_hints(const char *bus, const char *dev, const char *pnpinfo) else if (!notme) { if (!unbound_flag) { if (all_flag) - printf("%s: %s", *dev ? dev : "unattached", lastmod); + printf("%s: %s\n", *dev ? dev : "unattached", lastmod); else printf("%s\n", lastmod); if (verbose_flag) @@ -445,7 +445,7 @@ find_unmatched(struct devinfo_dev *dev, void *arg) break; if (!(dev->dd_flags & DF_ENABLED)) break; - if (dev->dd_flags & DF_ATTACHED_ONCE) + if (!all_flag && dev->dd_flags & DF_ATTACHED_ONCE) break; parent = devinfo_handle_to_device(dev->dd_parent); bus = strdup(parent->dd_name); From nobody Fri Apr 5 22:57:53 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VBDR543tXz5HMNV; Fri, 5 Apr 2024 22:57:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VBDR52Bw5z59JW; Fri, 5 Apr 2024 22:57:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712357873; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jAspqJJ/T5MJsbo7QxWleZnis5r9GDK+IGOnxTJ1JDY=; b=RTk5T1Xc2xnnNAeOJxgQdxZXIhkNtRsMNe3kqVGF7DhUWJxoiPUd+ALjWpeaZHCGCL11AF RAiiEw58FYmPrNGLeoM4QNE8o/lN0k6HEOeLA2rbcfKvt7840/RMBCMjfy4U+VWUywQUO+ u72AY3SOGFlKm6hHpnOVKLZHNNjhctY1h1dIhuCmCk1VOnOzCokue1jz6Cj68fdd198STg IFyQAyZvd44+lG8eRa1XPOq7g4eTt1+pxeHde4n1xbkgJSODqvg34IxqyPjfuKeaQgHCBn mtXaN0xqvueZGqIBpNqxmbDsdtR5VeKeXo7kWn+/k038xa4V9gMgRiMwrY8c6A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712357873; a=rsa-sha256; cv=none; b=LXoEHBKLt0RcCiErtswbm/FR2SoY+lfhqSSe10gGuii3q8dcJjWQnaTuvG1Nznv+GZCzFE gIY0KEur8wALSMh7ghbVz2ssHrjy4wlvm5u+g1RYA+mJ8AHhyv0s0Vih8+jxm8jssgvGSp NAHYZeB3Hm1bOogg8spfLVrerEM/93HmGp9+6A6VVWFQypPfSW8iD5C0Yanrp6kRKJlyyn 4US3G/K3LF58Be2AZecG8N4XqFqK+J1Yo0Zxjiqx4Ol2joXtp9/uAeQnwwWvRoloL3rysV r11W3M2iDxbIaiHOR68bdYiJsx/FtBtRRMV715wue+J5+Q5ZTa9iPwGKgOSQcw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712357873; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jAspqJJ/T5MJsbo7QxWleZnis5r9GDK+IGOnxTJ1JDY=; b=YFIRU7v3LoJXSIgQN2NXuJlPWDZSNgDJc/yn99r9QdQIeI3f23a8WbHi7nYovIxRVwmgx+ FgpziwQlCYadfy8Mr9Z7MhBPt3rsL6w4wpc8y3BONZEHbGTE2lQXxvwEv9om2/tUQ6IGFb KRtGlMYF+2IggrbCOV4dOK1Gu5q9Cfqp0vUGHhQ5CXv/+1r7A5IfM3DdXuo0n+4cuMh66S oILzQg3ZTsdkueHpke2mteqCyCNu3zug7kOs6pRzMRz6H0bZzAOd/fIAc/rs7p03M2IVAj Pot89xnQ3iIa9e8cr5NxUp+tmXOEZRYf0gvQ9pMrCcsFQjOlYwE2yoqWzvqpAQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VBDR51dS3zHvb; Fri, 5 Apr 2024 22:57:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 435Mvrml058863; Fri, 5 Apr 2024 22:57:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 435MvrHT058861; Fri, 5 Apr 2024 22:57:53 GMT (envelope-from git) Date: Fri, 5 Apr 2024 22:57:53 GMT Message-Id: <202404052257.435MvrHT058861@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: ea002c1017f8 - main - devmatch: Convert command line flags to bools List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ea002c1017f86fd5d1b778f9600b06f3561ab868 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=ea002c1017f86fd5d1b778f9600b06f3561ab868 commit ea002c1017f86fd5d1b778f9600b06f3561ab868 Author: Warner Losh AuthorDate: 2024-04-05 22:34:03 +0000 Commit: Warner Losh CommitDate: 2024-04-05 22:53:47 +0000 devmatch: Convert command line flags to bools These are bools, and should have been bools from the start. Make them bools. Sponsored by: Netflix --- sbin/devmatch/devmatch.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/sbin/devmatch/devmatch.c b/sbin/devmatch/devmatch.c index 6124794d113a..49f9be00a2e7 100644 --- a/sbin/devmatch/devmatch.c +++ b/sbin/devmatch/devmatch.c @@ -30,6 +30,7 @@ #include #include #include +#include #include #include #include @@ -54,13 +55,13 @@ static struct option longopts[] = { #define DEVMATCH_MAX_HITS 256 -static int all_flag; -static int dump_flag; +static bool all_flag; +static bool dump_flag; static char *linker_hints; static char *nomatch_str; -static int quiet_flag; -static int unbound_flag; -static int verbose_flag; +static bool quiet_flag; +static bool unbound_flag; +static bool verbose_flag; static void *hints; static void *hints_end; @@ -573,10 +574,10 @@ main(int argc, char **argv) longopts, NULL)) != -1) { switch (ch) { case 'a': - all_flag++; + all_flag = true; break; case 'd': - dump_flag++; + dump_flag = true; break; case 'h': linker_hints = optarg; @@ -585,13 +586,13 @@ main(int argc, char **argv) nomatch_str = optarg; break; case 'q': - quiet_flag++; + quiet_flag = true; break; case 'u': - unbound_flag++; + unbound_flag = true; break; case 'v': - verbose_flag++; + verbose_flag = true; break; default: usage(); From nobody Sat Apr 6 08:00:21 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VBST252RTz5G543; Sat, 6 Apr 2024 08:00:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VBST14hB9z46DS; Sat, 6 Apr 2024 08:00:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712390421; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EHxsbyGPn4nIKrtfLz6AQraPVisDe/XA+zSG8us29KU=; b=KkC3+Z3AXOK63rz2XfW9aOODIHnIN0adeckZErsGIYvYvyGngI5vaeAtN4XhxWj9lDDQHf TP11ImaDRY/6zxBqM10oK+7w0ya0eq+ODfXEquY61bv5QjuLwS6QMj4w9v2pqi00XT89RC 1O2MYt8Sw+wR8eTDHkYbz652yU8Vr+HcE3bZV39eKlofxrlRbhKPtB1NoQi/b4LdxGd4Rr S4G1/MGO/gs3+tUjwnjbibS44m9E4IfQvTCHQIWIbINPrmuhd5qdI535aLULBgaxACbygk HjtIkD5DUevZHt5VILUhu8yMpvNO1H+h4FW6sXESrntPqIcK6RsjdFYrrsPS0Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712390421; a=rsa-sha256; cv=none; b=WwkuE7fE4meD7M7gsccOQoA77uqNaZ7mlkJlyjbtXRhOVPBkGGNJ3xCDPVMKRJu88FhHkF nKQIBxPcTKa/JTqJbQBj7/awjeoPiJ9/ynz6NTlG3WKEmOJwbzFe97pYxQjREQ3eA1QePR iFQKus7ieWTEckOshdWF+OK87ZdOF3LL2g0UifG5GK7EnkItMuWK4xdm+hdLyBlTaBZFYj MCospO2CJdV+pd8yYKBRCxjwYQ/fXTCGCsKLjb7NS4MCacB7XOTGcRAVJmIg5Q2ZY4JsQY sZ96LC277vye8cOWxyNc9qcMAvCoz1Q99Mp1WGRvCthJU1e3KC4MikZQkk7JIw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712390421; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EHxsbyGPn4nIKrtfLz6AQraPVisDe/XA+zSG8us29KU=; b=bkRt/dVfCJxQnzZHTExHibsPxaNskimlZbjoxGgRDZQS8OcZpw7QWpisT9BpbUHk9VPmSZ JDTTMBLopIVwT5dmAqCjqofBUadIkcyphzUwTQF599fwLG9z+D95V6jQF9VHyn+bfH5ZnS 10A7/wTEz8HZq6bGQIMBZL44fXnmXucSaRcLUuwPQIddN1z4y+cQsM9KBBf2ZkKmAmpgRy DCcvN2+Sjo4IgDPA8cfFuYIcFnvIiN2jtlLVBo52IziEAGnkDd+LqV4QgRElrHcgNriTpT d/Z35WgboZagzM6R7122KGQDc8M4NLjjbjfw3eP9ARtcpB/D7TxwzpHeXSkEHQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VBST14HCPzbyP; Sat, 6 Apr 2024 08:00:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 43680LUZ087137; Sat, 6 Apr 2024 08:00:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43680LmO087134; Sat, 6 Apr 2024 08:00:21 GMT (envelope-from git) Date: Sat, 6 Apr 2024 08:00:21 GMT Message-Id: <202404060800.43680LmO087134@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Tuexen Subject: git: d902c8f55b8d - main - tcp rack: fix memory corruption List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d902c8f55b8da6902ab45e67ed756cc99f5a9d5a Auto-Submitted: auto-generated The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=d902c8f55b8da6902ab45e67ed756cc99f5a9d5a commit d902c8f55b8da6902ab45e67ed756cc99f5a9d5a Author: Michael Tuexen AuthorDate: 2024-04-06 07:55:46 +0000 Commit: Michael Tuexen CommitDate: 2024-04-06 07:55:46 +0000 tcp rack: fix memory corruption When in rack_output() jumping to the label out, don't write errno into the log buffer, since the pointer is not initialized. Reported by: Coverity Scan CID: 1523773 Reviewed by: rscheff MFC after: 3 days Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D44647 --- sys/netinet/tcp_stacks/rack.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/netinet/tcp_stacks/rack.c b/sys/netinet/tcp_stacks/rack.c index ea52eb0a92cd..5b76480ee55d 100644 --- a/sys/netinet/tcp_stacks/rack.c +++ b/sys/netinet/tcp_stacks/rack.c @@ -23718,12 +23718,12 @@ send: mtu = inp->inp_route.ro_nh->nh_mtu; } #endif /* INET */ - -out: if (lgb) { lgb->tlb_errno = error; lgb = NULL; } + +out: /* * In transmit state, time the transmission and arrange for the * retransmit. In persist state, just set snd_max. From nobody Sat Apr 6 08:05:40 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VBSb82xF1z5G5hN; Sat, 6 Apr 2024 08:05:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VBSb826gmz4713; Sat, 6 Apr 2024 08:05:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712390740; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=K8ykdTyDH1WTNRu5NHKFKFMGdz+ocNwy9McfoDUviz0=; b=nl2BxFB0gXK2fE1LK0LwrJ8b32FxfeiMzfRpVBWIy2lIMCZIxjVtIfUpk32u0pBzjmMJrU Ye67AkbryFUGfgJ8Hl9C6/doiZtXd7oBchuyEQe9B91PAo5QfQ5T3JB8obokcxaJbnzEZJ /3PJ743WIHdA7javZs+jUiS2DQSxar88t3F4pnuLCWFeVjWuOwxOTcrqypyS3UgkdTD9ZZ qM7AWtNUVUtoe85lxZAKiX2FpA4gLpoROwS4PiV43dfqWxjlDB5IrSg/AB3zSyQy8r0sI3 H2iNJ2DLZNepSCBGETCXZta1HLu5H0u7Lx5LQDU1nYh6TydumkMf3Z9moWwIDg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712390740; a=rsa-sha256; cv=none; b=yz1rHXp2VLIlegtJSQ7g9MId6i6mO/MoDv4Lls2M+saRnWB2TlenNhGu3ZBd2ZYfmANUdv SlbglwIyjXNUKe8ZDvvapwAdRqzVwBakbp0o8PA1LIT3zzRpZyxjmpBF2cwUhXSGSRaQHG ml7yA429Lna8TIm7oibBOUNSHIJjpPU5DzwdjUWA7PXkaEoms7iSLWW27HGzCIVViEi7Df O/hZ8/9AcemScIJDqpa2FWI/7+M9sZWko/OtU2+1HaN+hIOYCKuZPiul7qPbsxqSaaFU3E 4JFf6Jr5vW/2rsXJZINYarPZyUdolqeLJNZcKDnqqK+Sjc00K1H6k6a/oAoSdQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712390740; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=K8ykdTyDH1WTNRu5NHKFKFMGdz+ocNwy9McfoDUviz0=; b=yL+xOsLpXLVAh0VUc1WK0j0lqi6CxxK34rAWODlBykD9vaA6Sw+k0h4bF67/zjVnF6Y7ML 7kIVC1sEtaRCJfX6tjmnpPsfuCdYbMHLOqyrVkpLI9hcMKT3tdOvw/GYlJri5xjvbSSG34 rXe/Zl8CXw2rk2LyklvhEVfTPcvPPV2uqaVZa3CJCBGvZ5eEbE5EZsdYxxs6+cmqkxDR37 o1oArWkIFL2jSo25ihlOFrjNZagy9p78c10Ru5WcsNY8CVeNWKgFkvlnQU4gtDLViepa1s xmXprXairRZMY2esjrB2Gpqy6iaiddkL2FKoRQZHJ9Afk7KwcvsQWQkt5cO5eQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VBSb81bznzc9Q; Sat, 6 Apr 2024 08:05: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 43685eCV094891; Sat, 6 Apr 2024 08:05:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43685e0u094888; Sat, 6 Apr 2024 08:05:40 GMT (envelope-from git) Date: Sat, 6 Apr 2024 08:05:40 GMT Message-Id: <202404060805.43685e0u094888@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Tuexen Subject: git: 3e1c8a35f741 - main - tcp: improve consistency List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3e1c8a35f741a5d114d0ba670b15191355711fe9 Auto-Submitted: auto-generated The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=3e1c8a35f741a5d114d0ba670b15191355711fe9 commit 3e1c8a35f741a5d114d0ba670b15191355711fe9 Author: Michael Tuexen AuthorDate: 2024-04-06 08:02:06 +0000 Commit: Michael Tuexen CommitDate: 2024-04-06 08:02:06 +0000 tcp: improve consistency No functional change intended. Reported by: Coverity Scan CID: 1523781 Reviewed by: rscheff MFC after: 3 days Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D44645 --- sys/netinet/tcp_input.c | 2 +- sys/netinet/tcp_timewait.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/netinet/tcp_input.c b/sys/netinet/tcp_input.c index 8410cb490915..d27a79d1c3b1 100644 --- a/sys/netinet/tcp_input.c +++ b/sys/netinet/tcp_input.c @@ -1955,7 +1955,7 @@ tcp_do_segment(struct tcpcb *tp, struct mbuf *m, struct tcphdr *th, tp->t_flags |= TF_DELACK; } else { tp->t_flags |= TF_ACKNOW; - tcp_output(tp); + (void) tcp_output(tp); } goto check_delack; } diff --git a/sys/netinet/tcp_timewait.c b/sys/netinet/tcp_timewait.c index 266556274e18..8d77db275310 100644 --- a/sys/netinet/tcp_timewait.c +++ b/sys/netinet/tcp_timewait.c @@ -123,7 +123,7 @@ tcp_twstart(struct tcpcb *tp) soisdisconnected(inp->inp_socket); if (tp->t_flags & TF_ACKNOW) - tcp_output(tp); + (void) tcp_output(tp); if (V_nolocaltimewait && ( #ifdef INET6 From nobody Sat Apr 6 16:39:12 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VBgzj21qdz5Gwxw; Sat, 6 Apr 2024 16:39:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VBgzj1WKbz3ynQ; Sat, 6 Apr 2024 16:39:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712421553; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=67lHTLGc8fjL/jSt1ZdUXOD59kRPBLLld1PSZG8GmRc=; b=YP1WBmTIWE+kjoxgT2H804nK/RPrT5YfjygcZD0bQTS6ECIWgZiWLqVFGzPvr8DAJULsa7 ViQowm4om5STEb5xNqlE96mPfLVFsocIoLFRKXc2kK5ntSscFMRzH3P6dJB46zMUyqihfM uXi25OXz9joXGkd95AQhGbOYTg8NedIZ/ROz073fTrpQ3ExAvujOc0XJDM+GdvCZx1K6qA GgZHs2+qaAomhAYLkcpukf7eWWGB8yN/o5Hr8dw/XFt8WuRy6gwEJrv6DJwsm4f3z2Vpk+ FAgEG24fp9aqcSXxJ/1X+h4cb3s7Q/fzG+UIvHTZN2Z7v6ULxasiG9KjE9rEhQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712421553; a=rsa-sha256; cv=none; b=l0I2KeCOfh+SfklmRuLHuF0vdNaa0xYfjRD51JtDXF8MCYrMW0yaH0lJnfKw9HLhKYhSJ0 J3rZa96+VZsxnHRcQfJVzwCkf7uBXPoLRS5fRNkN9SgP8BNH4HiBJe4/QfkoorkpxJ7Cvt 7pdPCD1ixyk3+Ymy5O+RqbBdbCbJa/J4Kzle/ZwJUYHFP8hSnMZmQBxttnQSNwtJSawuKg SzNuqHzVoef5BZHd2jD5ySvDYoIBhklbmbnXex4LXy/x/kJ9Cpn2zuev/eoT3TjM4FU/s4 g19AZ5b9ah7jxb8YCLa9l8c7upr8lwTuQdLdhj1qUmj5Fv0xDx9AsZQ3HiTqZw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712421553; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=67lHTLGc8fjL/jSt1ZdUXOD59kRPBLLld1PSZG8GmRc=; b=E0m2IsYTBpnu2zRO1p13gMR84zyDykEFzo0X9o1JfYTq52sP9a02QZk/w+2wTeu62bsJRf yUFycoMsJhd1jiLCCGgZO7rmrnld+ob3qceFD6uvhSpswiTcAE6hFhXpfLrgydwHYomeoJ B0bntYDIc3Hb5PYxp5C3WsDl5Ban0pki0oMJmGisik5Wo/ANU3H7Qec3uAEUc4iGFlON5s iB0nwW8aInnxsXpRiidzfpFzchL8ofrqta0evWrj0+SWRuJhC1sZgPBDkkCcQe9Hao6hcu YnVH2glCNRjQEyYz0yheEgoLfhhbLpabFv6J5gFT8c5mtIJuzeK2pMC3NR3AYg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VBgzj10mCzrDB; Sat, 6 Apr 2024 16:39:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 436GdDcd057712; Sat, 6 Apr 2024 16:39:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 436GdCXc057709; Sat, 6 Apr 2024 16:39:12 GMT (envelope-from git) Date: Sat, 6 Apr 2024 16:39:12 GMT Message-Id: <202404061639.436GdCXc057709@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: 18ec7a900324 - stable/14 - OptionalObsoleteFiles: add missed cuda wrappers include files List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 18ec7a900324939ffd8056ff871e55296b0a9745 Auto-Submitted: auto-generated The branch stable/14 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=18ec7a900324939ffd8056ff871e55296b0a9745 commit 18ec7a900324939ffd8056ff871e55296b0a9745 Author: Olivier Cochard AuthorDate: 2024-04-02 20:43:05 +0000 Commit: Dimitry Andric CommitDate: 2024-04-06 16:36:36 +0000 OptionalObsoleteFiles: add missed cuda wrappers include files Files introduced since clang 17.0.2. Approved by: dim Sponsored by: Netflix Differential Revision: https://reviews.freebsd.org/D44597 (cherry picked from commit a9275714690942e973ae69a3c179e3a435cf50dd) --- tools/build/mk/OptionalObsoleteFiles.inc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index 506f3877883e..86b068a09b82 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -990,6 +990,8 @@ OLD_FILES+=usr/lib/clang/17/include/cmpccxaddintrin.h OLD_FILES+=usr/lib/clang/17/include/cpuid.h OLD_FILES+=usr/lib/clang/17/include/crc32intrin.h OLD_FILES+=usr/lib/clang/17/include/cuda_wrappers/algorithm +OLD_FILES+=usr/lib/clang/17/include/cuda_wrappers/bits/basic_string.h +OLD_FILES+=usr/lib/clang/17/include/cuda_wrappers/bits/basic_string.tcc OLD_FILES+=usr/lib/clang/17/include/cuda_wrappers/bits/shared_ptr_base.h OLD_DIRS+=usr/lib/clang/17/include/cuda_wrappers/bits OLD_FILES+=usr/lib/clang/17/include/cuda_wrappers/cmath From nobody Sat Apr 6 16:39:50 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VBh0R46DLz5GxJ0; Sat, 6 Apr 2024 16:39:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VBh0R23Vyz40ND; Sat, 6 Apr 2024 16:39:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712421591; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ChmJFPmPmFVLpb44Ss0zN5y1sH2lTPuPlMw5aasKRTs=; b=IhK5L9tbUq58WN0pMqpNfHnD3hESyBrB4yQ/1H00rx/3GPlZdZ6R/Fd7hvFVlAasHterXQ jTvmE1rUbquEPtkEzpN6CKHCbwJSm89z9kikpokW7OHNK+WRz1ywkjgQqmplF0oCzvOT7W z1k8xH9PikkBjHvt6XszrA8AZXjaumZkfAiwCToOmQuAxelpNlr9nSvfzelv+/SQ4qhFAl py+5yizn7qLAQjKFF/o4/HryMWQw+OA0rL/gQ3Iof+RYWmJATNcp9khajP8KSY1+8UA8mL HoyTXQmjmVXHfDLee8Yc5b9juDir1hfmkmnWlmy7ALQvS2xvAGRlhbK7KoPmtg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712421591; a=rsa-sha256; cv=none; b=x20/RTxrFLJ1+VAIzZn6dhJFK9k26IcR9NOJyuySdxoWXdDyOm6v92Uyv37LQ+S2jGvgNG DI4VezGGe1igaQH7LMhMUN1nKEK1vVzOLqqzZkNooGzWMRtn+c3lu3wzixFHZEVMoOKlxU O/6N5UD+nKSXHYOQnSYeQSHR54iUwvtozqj7dhUtWr0RQRb2LF9E2QWjoBkahfHfqCmrx7 Wd27O1T+2jXCExIkwbsKrXbVayRZ7x/9KqNOfz1X29LE3qhtddI1ErIJfVoEsp7Odf6XcU MdLNqJS8XItfu7C6VG4b3x/VycRnJPNYFbfsJPdJRVuBiCJSonA18+sf0P+lRw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712421591; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ChmJFPmPmFVLpb44Ss0zN5y1sH2lTPuPlMw5aasKRTs=; b=DUll5ySdbkWm+kGFNEKDcbA7i5BGPhdkSsYVOEvBLy5XQBOruXPBjFGXnGV5bDsxbbmzO3 sbinu0iaPNcJraTxU/43lxveYHBTgjJPkQG2L+7S84GVEtdqFQGfSRf9qt/0B/3Ms0wH37 eU1ji4aY3guIi81WjUUR8DYX9zt6OO8443uI8fSURvTa/2lbK7nv3k5KIMHukWl6ZND8fC cNKCaoDVCjuR3PB8Ecl8hWL1BHJFFTeQHmZVrsizjtYHgleKD1bQKO2aqQm+BV+Ge1kWsj xnw2r+x7iy4RX5CW3zoDKi2WNitRehLXI4lPBrzhIDkIBgQQ/8ybMJDKn94eZQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VBh0R0dwTzr9P; Sat, 6 Apr 2024 16:39:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 436GdoAf057921; Sat, 6 Apr 2024 16:39:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 436GdouM057918; Sat, 6 Apr 2024 16:39:50 GMT (envelope-from git) Date: Sat, 6 Apr 2024 16:39:50 GMT Message-Id: <202404061639.436GdouM057918@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: 1fd6ef0cb29e - stable/13 - OptionalObsoleteFiles: add missed cuda wrappers include files List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 1fd6ef0cb29e5938f57a540b00df85ffd592785f Auto-Submitted: auto-generated The branch stable/13 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=1fd6ef0cb29e5938f57a540b00df85ffd592785f commit 1fd6ef0cb29e5938f57a540b00df85ffd592785f Author: Olivier Cochard AuthorDate: 2024-04-02 20:43:05 +0000 Commit: Dimitry Andric CommitDate: 2024-04-06 16:38:08 +0000 OptionalObsoleteFiles: add missed cuda wrappers include files Files introduced since clang 17.0.2. Approved by: dim Sponsored by: Netflix Differential Revision: https://reviews.freebsd.org/D44597 (cherry picked from commit a9275714690942e973ae69a3c179e3a435cf50dd) --- tools/build/mk/OptionalObsoleteFiles.inc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index e068ad8b5f91..d7a9aa46ae57 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -1275,6 +1275,8 @@ OLD_FILES+=usr/lib/clang/17/include/cmpccxaddintrin.h OLD_FILES+=usr/lib/clang/17/include/cpuid.h OLD_FILES+=usr/lib/clang/17/include/crc32intrin.h OLD_FILES+=usr/lib/clang/17/include/cuda_wrappers/algorithm +OLD_FILES+=usr/lib/clang/17/include/cuda_wrappers/bits/basic_string.h +OLD_FILES+=usr/lib/clang/17/include/cuda_wrappers/bits/basic_string.tcc OLD_FILES+=usr/lib/clang/17/include/cuda_wrappers/bits/shared_ptr_base.h OLD_DIRS+=usr/lib/clang/17/include/cuda_wrappers/bits OLD_FILES+=usr/lib/clang/17/include/cuda_wrappers/cmath From nobody Sat Apr 6 20:17:14 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VBmqS1F6fz5HGJ7; Sat, 6 Apr 2024 20:17: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 4VBmqS0bN7z4Jgj; Sat, 6 Apr 2024 20:17:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712434644; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mG9L8d71RZnpXpnMBbST9IYoq/TeqC7/h1t8XX7deWo=; b=wU9wrnHR/0SFpQYgDG+5csuvVViE2aQOxJzFIPYD8X17E5Kt9W1/MtmalpHfYQanJz4TFM TFtInRtEz+C6x0aRgcIJZ5vRZUt7cVfvzhfYHqSH0AIS9noDPsuYd9N1cSdFIquXbig1ZG J2yl4yI9qppUURnOh2PHyT2JLcLVjxAPitxGhQsIwW4J5JQh2XhExgwaQwqp/fb5O7mO6O wtekHwtN3GRB9AE6jRasDVbD1i61t9sx0cGfa85IeujXosFJyeDC9ZCxS1BtJwaSLnwZ0I MAECl86JC3IhA890aLGmPi9JhV5C+lYy8IsLAeAp8Hpp0+qK4HoIxqzsGWcj5g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712434644; a=rsa-sha256; cv=none; b=G/pt1H8gJtG310Nqezkqw5RCq6fP+JQKFCIK+JSkAFsz8D+uq+TnjlgvLmDPjPjafeblW/ RLJUgsYjZ/ZdX64L09gtlJEV/Ik7fT5ntsEYiP3/+SogHCONXqwLgCTphXYixgvRX/c2H4 /Va4ZGYazy80uRxx1rNWAMfcimryhXNUtbYRI0xIrqU+gXd1h6Hvx+HgRcU2D1p9u51yMG tB3F9k3UiF0sshHor9P3X/0eWrHPecIpCuMo0Lt6x+7ZBW4bBe20Gbq6qr0nFrwSDWx+N0 ctMdNnkEgQp6lmHly43yDu2/Gc8eH/L1JRLcKFz3MpbAqx1G4c6CTGZPhf3Zqg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712434644; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mG9L8d71RZnpXpnMBbST9IYoq/TeqC7/h1t8XX7deWo=; b=hCb9AXxZ6wREhLeRiZlhHmn/ABuDpBf55hPTnivoM1mDLNs1G554zuWRi1WGMVDhQyaClw VGbSIeJ16NSTeeSkqZmyhm+CIKif0sxkMQZNrYCUOxPEJB00TXoYnQIc8L0zhaZgdwhbQO 3zy5eo2BXAhGgGvxuuFuFxFTS4yJgH+uNERcFQQGZHc+ov88cMfIjUWu5p6iQ06ief9NBb X9+TRV1NVVQoE7WCKaqd1bPxZmlgOX/xiTaTaZaIg/6ow6T9voQlB4OhK3oducnJPxtfA6 hzHIoYSYyCBBOEaIj6Nugok0e0Fc9LVRzyWHyIScAI+YPSDKG4E5+lRD8sekAg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VBmqS03n7zxtV; Sat, 6 Apr 2024 20:17: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 436KHNtF029249; Sat, 6 Apr 2024 20:17:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 436KHEW6029246; Sat, 6 Apr 2024 20:17:14 GMT (envelope-from git) Date: Sat, 6 Apr 2024 20:17:14 GMT Message-Id: <202404062017.436KHEW6029246@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dimitry Andric Subject: git: 5f757f3ff914 - main - Merge llvm-project main llvmorg-18-init-15088-gd14ee76181fb List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5f757f3ff9144b609b3c433dfd370cc6bdc191ad Auto-Submitted: auto-generated The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=5f757f3ff9144b609b3c433dfd370cc6bdc191ad commit 5f757f3ff9144b609b3c433dfd370cc6bdc191ad Merge: 3e1c8a35f741 312c0ed19cc5 Author: Dimitry Andric AuthorDate: 2023-12-18 20:30:12 +0000 Commit: Dimitry Andric CommitDate: 2024-04-06 20:11:55 +0000 Merge llvm-project main llvmorg-18-init-15088-gd14ee76181fb This updates llvm, clang, compiler-rt, libc++, libunwind, lld, lldb and openmp to llvm-project main llvmorg-18-init-15088-gd14ee76181fb. PR: 276104 MFC after: 1 month ObsoleteFiles.inc | 441 + contrib/llvm-project/FREEBSD-Xlist | 32 +- .../clang/include/clang-c/BuildSystem.h | 6 +- contrib/llvm-project/clang/include/clang-c/Index.h | 7 +- .../clang/include/clang/APINotes/APINotesManager.h | 175 + .../clang/include/clang/APINotes/APINotesOptions.h | 34 + .../clang/include/clang/APINotes/APINotesReader.h | 200 + .../clang/include/clang/APINotes/APINotesWriter.h | 110 + .../include/clang/APINotes/APINotesYAMLCompiler.h | 11 + .../clang/include/clang/APINotes/Types.h | 59 +- .../clang/include/clang/ARCMigrate/ARCMT.h | 2 +- .../clang/include/clang/ARCMigrate/FileRemapper.h | 16 +- .../llvm-project/clang/include/clang/AST/APValue.h | 8 + .../clang/include/clang/AST/ASTConcept.h | 116 +- .../clang/include/clang/AST/ASTContext.h | 69 +- .../llvm-project/clang/include/clang/AST/ASTFwd.h | 1 + .../clang/include/clang/AST/ASTLambda.h | 15 + .../clang/include/clang/AST/ASTNodeTraverser.h | 20 +- .../include/clang/AST/ASTStructuralEquivalence.h | 12 +- .../clang/include/clang/AST/ASTTypeTraits.h | 6 + .../llvm-project/clang/include/clang/AST/Attr.h | 11 +- .../clang/include/clang/AST/CXXInheritance.h | 2 +- .../llvm-project/clang/include/clang/AST/Comment.h | 286 +- .../clang/include/clang/AST/CommentSema.h | 3 +- .../clang/include/clang/AST/CommentVisitor.h | 5 +- .../llvm-project/clang/include/clang/AST/Decl.h | 218 +- .../clang/include/clang/AST/DeclBase.h | 188 +- .../llvm-project/clang/include/clang/AST/DeclCXX.h | 76 +- .../clang/include/clang/AST/DeclFriend.h | 1 + .../clang/include/clang/AST/DeclObjC.h | 49 +- .../clang/include/clang/AST/DeclOpenMP.h | 22 +- .../clang/include/clang/AST/DeclTemplate.h | 166 +- .../clang/include/clang/AST/DeclarationName.h | 3 +- .../clang/include/clang/AST/DependentDiagnostic.h | 2 + .../llvm-project/clang/include/clang/AST/Expr.h | 261 +- .../llvm-project/clang/include/clang/AST/ExprCXX.h | 111 +- .../clang/include/clang/AST/ExprConcepts.h | 91 +- .../clang/include/clang/AST/ExprObjC.h | 41 +- .../clang/include/clang/AST/JSONNodeDumper.h | 9 + .../llvm-project/clang/include/clang/AST/Mangle.h | 4 +- .../clang/include/clang/AST/OpenMPClause.h | 181 +- .../clang/include/clang/AST/OperationKinds.def | 1 + .../clang/include/clang/AST/PrettyPrinter.h | 40 +- .../clang/include/clang/AST/PropertiesBase.td | 4 +- .../clang/include/clang/AST/RawCommentList.h | 1 + .../clang/include/clang/AST/RecursiveASTVisitor.h | 90 +- .../llvm-project/clang/include/clang/AST/Stmt.h | 195 +- .../clang/include/clang/AST/StmtOpenMP.h | 77 +- .../clang/include/clang/AST/TemplateBase.h | 11 + .../clang/include/clang/AST/TemplateName.h | 2 +- .../clang/include/clang/AST/TextNodeDumper.h | 7 + .../llvm-project/clang/include/clang/AST/Type.h | 409 +- .../llvm-project/clang/include/clang/AST/TypeLoc.h | 111 +- .../clang/include/clang/AST/TypeProperties.td | 4 + .../clang/include/clang/AST/VTableBuilder.h | 2 +- .../clang/include/clang/ASTMatchers/ASTMatchers.h | 37 +- .../include/clang/Analysis/Analyses/Dominators.h | 2 +- .../clang/Analysis/Analyses/IntervalPartition.h | 109 +- .../include/clang/Analysis/Analyses/ThreadSafety.h | 8 +- .../clang/Analysis/Analyses/ThreadSafetyCommon.h | 2 +- .../clang/Analysis/Analyses/UnsafeBufferUsage.h | 65 +- .../Analysis/Analyses/UnsafeBufferUsageGadgets.def | 1 + .../clang/include/clang/Analysis/CFG.h | 39 +- .../clang/include/clang/Analysis/CFGStmtMap.h | 2 + .../include/clang/Analysis/FlowSensitive/Arena.h | 23 +- .../Analysis/FlowSensitive/ControlFlowContext.h | 14 +- .../Analysis/FlowSensitive/DataflowAnalysis.h | 84 +- .../FlowSensitive/DataflowAnalysisContext.h | 122 +- .../Analysis/FlowSensitive/DataflowEnvironment.h | 201 +- .../Analysis/FlowSensitive/DataflowWorklist.h | 26 +- .../include/clang/Analysis/FlowSensitive/Formula.h | 17 +- .../include/clang/Analysis/FlowSensitive/Logger.h | 4 +- .../clang/Analysis/FlowSensitive/MatchSwitch.h | 4 + .../Models/UncheckedOptionalAccessModel.h | 24 +- .../clang/Analysis/FlowSensitive/NoopAnalysis.h | 12 +- .../clang/Analysis/FlowSensitive/RecordOps.h | 38 +- .../Analysis/FlowSensitive/SimplifyConstraints.h | 49 + .../clang/Analysis/FlowSensitive/StorageLocation.h | 52 +- .../FlowSensitive/TypeErasedDataflowAnalysis.h | 19 - .../include/clang/Analysis/FlowSensitive/Value.h | 64 +- .../include/clang/Basic/AArch64SVEACLETypes.def | 2 +- .../llvm-project/clang/include/clang/Basic/Attr.td | 298 +- .../clang/include/clang/Basic/AttrDocs.td | 769 +- .../include/clang/Basic/AttrSubjectMatchRules.h | 4 +- .../include/clang/Basic/AttributeCommonInfo.h | 30 +- .../clang/include/clang/Basic/Attributes.h | 4 +- .../clang/include/clang/Basic/Builtins.def | 52 +- .../clang/include/clang/Basic/BuiltinsAArch64.def | 17 +- .../clang/include/clang/Basic/BuiltinsAMDGPU.def | 40 +- .../include/clang/Basic/BuiltinsLoongArch.def | 45 +- .../include/clang/Basic/BuiltinsLoongArchBase.def | 53 + .../include/clang/Basic/BuiltinsLoongArchLASX.def | 982 + .../include/clang/Basic/BuiltinsLoongArchLSX.def | 953 + .../clang/include/clang/Basic/BuiltinsNVPTX.def | 25 +- .../clang/include/clang/Basic/BuiltinsPPC.def | 3 + .../clang/include/clang/Basic/BuiltinsRISCV.def | 4 +- .../clang/include/clang/Basic/BuiltinsSystemZ.def | 46 +- .../clang/include/clang/Basic/BuiltinsX86.def | 852 +- .../clang/include/clang/Basic/BuiltinsX86_64.def | 3 + .../clang/include/clang/Basic/CodeGenOptions.def | 94 +- .../clang/include/clang/Basic/CodeGenOptions.h | 27 +- .../llvm-project/clang/include/clang/Basic/Cuda.h | 11 +- .../clang/include/clang/Basic/DebugOptions.def | 146 + .../clang/include/clang/Basic/DeclNodes.td | 1 - .../clang/include/clang/Basic/Diagnostic.h | 12 +- .../include/clang/Basic/DiagnosticASTKinds.td | 25 +- .../include/clang/Basic/DiagnosticCommonKinds.td | 57 +- .../include/clang/Basic/DiagnosticDriverKinds.td | 53 +- .../include/clang/Basic/DiagnosticFrontendKinds.td | 8 + .../clang/include/clang/Basic/DiagnosticGroups.td | 91 +- .../clang/include/clang/Basic/DiagnosticIDs.h | 8 +- .../include/clang/Basic/DiagnosticLexKinds.td | 50 +- .../clang/include/clang/Basic/DiagnosticOptions.h | 5 + .../include/clang/Basic/DiagnosticParseKinds.td | 78 +- .../include/clang/Basic/DiagnosticSemaKinds.td | 342 +- .../clang/Basic/DiagnosticSerializationKinds.td | 7 +- .../clang/include/clang/Basic/DirectoryEntry.h | 74 - .../clang/include/clang/Basic/FPOptions.def | 4 +- .../clang/include/clang/Basic/Features.def | 7 +- .../clang/include/clang/Basic/FileEntry.h | 94 +- .../clang/include/clang/Basic/FileManager.h | 17 +- .../clang/include/clang/Basic/IdentifierTable.h | 306 +- .../clang/include/clang/Basic/JsonSupport.h | 2 +- .../clang/include/clang/Basic/LangOptions.def | 26 +- .../clang/include/clang/Basic/LangOptions.h | 32 +- .../clang/include/clang/Basic/LangStandard.h | 7 +- .../clang/include/clang/Basic/LangStandards.def | 18 +- .../clang/include/clang/Basic/Linkage.h | 54 +- .../clang/include/clang/Basic/Module.h | 61 +- .../clang/include/clang/Basic/ObjCRuntime.h | 4 +- .../clang/include/clang/Basic/OpenACCKinds.h | 74 + .../clang/include/clang/Basic/OpenMPKinds.def | 10 + .../clang/include/clang/Basic/OpenMPKinds.h | 12 + .../clang/include/clang/Basic/ParsedAttrInfo.h | 16 + .../clang/include/clang/Basic/PragmaKinds.h | 8 + .../clang/include/clang/Basic/RISCVVTypes.def | 91 +- .../clang/include/clang/Basic/Sanitizers.h | 6 +- .../clang/include/clang/Basic/SourceLocation.h | 5 +- .../clang/include/clang/Basic/SourceManager.h | 88 +- .../clang/include/clang/Basic/SourceMgrAdapter.h | 85 + .../clang/include/clang/Basic/Specifiers.h | 20 +- .../clang/include/clang/Basic/StmtNodes.td | 1 + .../clang/include/clang/Basic/SyncScope.h | 69 +- .../clang/include/clang/Basic/TargetBuiltins.h | 2 +- .../clang/include/clang/Basic/TargetInfo.h | 27 +- .../clang/include/clang/Basic/TargetOSMacros.def | 55 + .../clang/include/clang/Basic/TargetOptions.h | 16 +- .../clang/include/clang/Basic/TokenKinds.def | 55 +- .../clang/include/clang/Basic/Visibility.h | 28 +- .../clang/include/clang/Basic/arm_neon.td | 5 + .../clang/include/clang/Basic/arm_sme.td | 174 +- .../clang/include/clang/Basic/arm_sve.td | 442 +- .../clang/include/clang/Basic/arm_sve_sme_incl.td | 13 +- .../include/clang/Basic/riscv_sifive_vector.td | 154 +- .../clang/include/clang/Basic/riscv_vector.td | 908 +- .../include/clang/Basic/riscv_vector_common.td | 467 + .../clang/include/clang/CodeGen/BackendUtil.h | 4 +- .../clang/include/clang/CodeGen/CGFunctionInfo.h | 5 + .../include/clang/CodeGen/ConstantInitBuilder.h | 7 +- .../clang/include/clang/Driver/ClangOptionDocs.td | 6 +- .../clang/include/clang/Driver/Distro.h | 3 +- .../clang/include/clang/Driver/Driver.h | 5 +- .../clang/include/clang/Driver/Multilib.h | 18 +- .../clang/include/clang/Driver/OffloadBundler.h | 39 +- .../clang/include/clang/Driver/Options.h | 40 +- .../clang/include/clang/Driver/Options.td | 3551 +- .../clang/include/clang/Driver/SanitizerArgs.h | 1 + .../clang/include/clang/Driver/ToolChain.h | 17 +- .../clang/include/clang/Driver/Types.def | 4 +- .../clang/include/clang/Driver/Types.h | 2 +- .../clang/include/clang/ExtractAPI/API.h | 811 +- .../clang/ExtractAPI/DeclarationFragments.h | 149 +- .../include/clang/ExtractAPI/ExtractAPIVisitor.h | 754 +- .../ExtractAPI/Serialization/SerializerBase.h | 190 + .../Serialization/SymbolGraphSerializer.h | 58 + .../clang/include/clang/Format/Format.h | 254 +- .../clang/include/clang/Frontend/ASTUnit.h | 31 +- .../include/clang/Frontend/CompilerInstance.h | 103 +- .../include/clang/Frontend/CompilerInvocation.h | 325 +- .../clang/Frontend/DependencyOutputOptions.h | 6 + .../clang/include/clang/Frontend/FrontendActions.h | 3 + .../clang/include/clang/Frontend/FrontendOptions.h | 50 +- .../clang/include/clang/Frontend/MigratorOptions.h | 4 + .../clang/Frontend/PreprocessorOutputOptions.h | 16 + .../include/clang/Frontend/TextDiagnosticPrinter.h | 1 + .../clang/Frontend/VerifyDiagnosticConsumer.h | 163 +- .../SerializablePathCollection.h | 2 +- .../include/clang/Interpreter/CodeCompletion.h | 30 + .../clang/include/clang/Lex/DirectoryLookup.h | 4 + .../clang/include/clang/Lex/HeaderMap.h | 3 +- .../clang/include/clang/Lex/HeaderSearch.h | 62 +- .../clang/include/clang/Lex/HeaderSearchOptions.h | 54 +- .../llvm-project/clang/include/clang/Lex/Lexer.h | 38 +- .../clang/include/clang/Lex/LiteralSupport.h | 11 +- .../clang/include/clang/Lex/MacroInfo.h | 3 + .../clang/include/clang/Lex/ModuleMap.h | 58 +- .../clang/include/clang/Lex/PPCallbacks.h | 10 +- .../clang/include/clang/Lex/PreprocessingRecord.h | 3 + .../clang/include/clang/Lex/Preprocessor.h | 84 +- .../clang/include/clang/Lex/PreprocessorLexer.h | 2 +- .../clang/include/clang/Lex/PreprocessorOptions.h | 3 + .../clang/include/clang/Lex/VariadicMacroSupport.h | 5 + .../clang/include/clang/Parse/LoopHint.h | 6 +- .../clang/include/clang/Parse/Parser.h | 84 +- .../include/clang/Parse/RAIIObjectsForParser.h | 19 + .../include/clang/Sema/CodeCompleteConsumer.h | 7 +- .../clang/include/clang/Sema/DeclSpec.h | 13 +- .../include/clang/Sema/HLSLExternalSemaSource.h | 4 +- .../clang/include/clang/Sema/IdentifierResolver.h | 3 + .../llvm-project/clang/include/clang/Sema/Lookup.h | 67 +- .../clang/include/clang/Sema/Overload.h | 8 +- .../clang/include/clang/Sema/Ownership.h | 276 +- .../clang/include/clang/Sema/ParsedAttr.h | 15 + .../clang/include/clang/Sema/ScopeInfo.h | 14 +- .../llvm-project/clang/include/clang/Sema/Sema.h | 562 +- .../clang/include/clang/Sema/Template.h | 6 +- .../clang/include/clang/Sema/TypoCorrection.h | 12 +- .../include/clang/Serialization/ASTBitCodes.h | 19 +- .../clang/include/clang/Serialization/ASTReader.h | 95 +- .../include/clang/Serialization/ASTRecordReader.h | 9 +- .../include/clang/Serialization/ASTRecordWriter.h | 3 + .../clang/include/clang/Serialization/ASTWriter.h | 82 +- .../clang/Serialization/GlobalModuleIndex.h | 8 +- .../clang/include/clang/Serialization/ModuleFile.h | 20 +- .../clang/Serialization/ModuleFileExtension.h | 3 +- .../clang/StaticAnalyzer/Checkers/Checkers.td | 139 +- .../clang/StaticAnalyzer/Checkers/SValExplainer.h | 10 +- .../clang/StaticAnalyzer/Core/AnalyzerOptions.h | 4 +- .../StaticAnalyzer/Core/BugReporter/BugReporter.h | 5 +- .../Core/BugReporter/BugSuppression.h | 53 + .../StaticAnalyzer/Core/BugReporter/BugType.h | 33 +- .../include/clang/StaticAnalyzer/Core/Checker.h | 4 +- .../StaticAnalyzer/Core/PathSensitive/CallEvent.h | 99 +- .../Core/PathSensitive/ConstraintManager.h | 16 + .../Core/PathSensitive/DynamicExtent.h | 5 + .../Core/PathSensitive/DynamicType.h | 1 - .../Core/PathSensitive/SValBuilder.h | 17 + .../Core/PathSensitive/SValVisitor.h | 55 +- .../StaticAnalyzer/Core/PathSensitive/SVals.def | 38 +- .../StaticAnalyzer/Core/PathSensitive/SVals.h | 226 +- .../include/clang/Support/RISCVVIntrinsicUtils.h | 53 +- .../DependencyScanningFilesystem.h | 2 +- .../DependencyScanning/DependencyScanningService.h | 26 +- .../DependencyScanning/DependencyScanningTool.h | 37 +- .../DependencyScanning/DependencyScanningWorker.h | 4 +- .../DependencyScanning/ModuleDepCollector.h | 59 +- .../clang/Tooling/Inclusions/HeaderAnalysis.h | 4 +- .../clang/include/clang/Tooling/Tooling.h | 3 + .../include/clang/Tooling/Transformer/SourceCode.h | 6 + .../llvm-project/clang/include/module.modulemap | 4 + .../clang/lib/APINotes/APINotesFormat.h | 92 +- .../clang/lib/APINotes/APINotesManager.cpp | 458 + .../clang/lib/APINotes/APINotesReader.cpp | 2049 + .../clang/lib/APINotes/APINotesWriter.cpp | 1384 + .../clang/lib/APINotes/APINotesYAMLCompiler.cpp | 521 +- .../llvm-project/clang/lib/ARCMigrate/ARCMT.cpp | 27 +- .../clang/lib/ARCMigrate/FileRemapper.cpp | 107 +- .../llvm-project/clang/lib/ARCMigrate/ObjCMT.cpp | 22 +- .../clang/lib/ARCMigrate/PlistReporter.cpp | 2 +- .../clang/lib/ARCMigrate/TransAutoreleasePool.cpp | 4 +- .../clang/lib/ARCMigrate/TransUnbridgedCasts.cpp | 2 +- .../clang/lib/ARCMigrate/TransformActions.cpp | 2 +- .../clang/lib/ARCMigrate/Transforms.cpp | 2 +- contrib/llvm-project/clang/lib/AST/APValue.cpp | 18 +- contrib/llvm-project/clang/lib/AST/ASTConcept.cpp | 29 +- contrib/llvm-project/clang/lib/AST/ASTContext.cpp | 706 +- .../llvm-project/clang/lib/AST/ASTDiagnostic.cpp | 1 + contrib/llvm-project/clang/lib/AST/ASTDumper.cpp | 15 + contrib/llvm-project/clang/lib/AST/ASTImporter.cpp | 468 +- .../clang/lib/AST/ASTStructuralEquivalence.cpp | 49 +- .../llvm-project/clang/lib/AST/ASTTypeTraits.cpp | 8 + contrib/llvm-project/clang/lib/AST/Comment.cpp | 30 +- contrib/llvm-project/clang/lib/AST/CommentSema.cpp | 52 +- .../clang/lib/AST/ComputeDependence.cpp | 9 + contrib/llvm-project/clang/lib/AST/Decl.cpp | 252 +- contrib/llvm-project/clang/lib/AST/DeclBase.cpp | 89 +- contrib/llvm-project/clang/lib/AST/DeclCXX.cpp | 100 +- contrib/llvm-project/clang/lib/AST/DeclObjC.cpp | 14 +- contrib/llvm-project/clang/lib/AST/DeclOpenMP.cpp | 2 +- contrib/llvm-project/clang/lib/AST/DeclPrinter.cpp | 196 +- .../llvm-project/clang/lib/AST/DeclTemplate.cpp | 38 +- contrib/llvm-project/clang/lib/AST/Expr.cpp | 355 +- contrib/llvm-project/clang/lib/AST/ExprCXX.cpp | 65 +- .../clang/lib/AST/ExprClassification.cpp | 18 +- .../llvm-project/clang/lib/AST/ExprConcepts.cpp | 83 +- .../llvm-project/clang/lib/AST/ExprConstShared.h | 59 + .../llvm-project/clang/lib/AST/ExprConstant.cpp | 747 +- .../llvm-project/clang/lib/AST/FormatString.cpp | 32 +- .../llvm-project/clang/lib/AST/Interp/Boolean.h | 12 +- .../clang/lib/AST/Interp/ByteCodeEmitter.cpp | 104 +- .../clang/lib/AST/Interp/ByteCodeEmitter.h | 13 +- .../clang/lib/AST/Interp/ByteCodeExprGen.cpp | 2144 +- .../clang/lib/AST/Interp/ByteCodeExprGen.h | 102 +- .../clang/lib/AST/Interp/ByteCodeStmtGen.cpp | 110 +- .../clang/lib/AST/Interp/ByteCodeStmtGen.h | 9 +- .../llvm-project/clang/lib/AST/Interp/Context.cpp | 69 +- .../llvm-project/clang/lib/AST/Interp/Context.h | 15 +- .../clang/lib/AST/Interp/Descriptor.cpp | 128 +- .../llvm-project/clang/lib/AST/Interp/Descriptor.h | 56 +- .../llvm-project/clang/lib/AST/Interp/Disasm.cpp | 6 + .../clang/lib/AST/Interp/EvalEmitter.cpp | 49 +- .../clang/lib/AST/Interp/EvalEmitter.h | 17 +- .../llvm-project/clang/lib/AST/Interp/Floating.h | 62 +- contrib/llvm-project/clang/lib/AST/Interp/Frame.h | 2 +- .../llvm-project/clang/lib/AST/Interp/Function.cpp | 10 +- .../llvm-project/clang/lib/AST/Interp/Function.h | 39 +- .../llvm-project/clang/lib/AST/Interp/Integral.h | 22 +- .../llvm-project/clang/lib/AST/Interp/IntegralAP.h | 291 + .../llvm-project/clang/lib/AST/Interp/Interp.cpp | 144 +- contrib/llvm-project/clang/lib/AST/Interp/Interp.h | 429 +- .../clang/lib/AST/Interp/InterpBlock.h | 37 +- .../clang/lib/AST/Interp/InterpBuiltin.cpp | 861 +- .../clang/lib/AST/Interp/InterpFrame.cpp | 27 +- .../clang/lib/AST/Interp/InterpFrame.h | 5 +- .../clang/lib/AST/Interp/InterpStack.cpp | 20 +- .../clang/lib/AST/Interp/InterpStack.h | 5 + .../clang/lib/AST/Interp/InterpState.cpp | 14 +- .../clang/lib/AST/Interp/InterpState.h | 3 + .../llvm-project/clang/lib/AST/Interp/Opcodes.td | 96 +- .../llvm-project/clang/lib/AST/Interp/Pointer.cpp | 83 +- .../llvm-project/clang/lib/AST/Interp/Pointer.h | 140 +- .../llvm-project/clang/lib/AST/Interp/PrimType.cpp | 1 + .../llvm-project/clang/lib/AST/Interp/PrimType.h | 47 +- .../llvm-project/clang/lib/AST/Interp/Program.cpp | 31 +- .../llvm-project/clang/lib/AST/Interp/Program.h | 8 +- contrib/llvm-project/clang/lib/AST/Interp/Record.h | 6 +- .../llvm-project/clang/lib/AST/Interp/Source.cpp | 14 + contrib/llvm-project/clang/lib/AST/Interp/Source.h | 11 +- .../llvm-project/clang/lib/AST/Interp/State.cpp | 10 +- contrib/llvm-project/clang/lib/AST/Interp/State.h | 4 +- .../llvm-project/clang/lib/AST/ItaniumMangle.cpp | 782 +- .../llvm-project/clang/lib/AST/JSONNodeDumper.cpp | 122 +- contrib/llvm-project/clang/lib/AST/Mangle.cpp | 12 +- .../llvm-project/clang/lib/AST/MicrosoftCXXABI.cpp | 10 +- .../llvm-project/clang/lib/AST/MicrosoftMangle.cpp | 149 +- .../llvm-project/clang/lib/AST/ODRDiagsEmitter.cpp | 6 +- contrib/llvm-project/clang/lib/AST/ODRHash.cpp | 75 +- .../llvm-project/clang/lib/AST/OpenMPClause.cpp | 57 +- .../clang/lib/AST/PrintfFormatString.cpp | 2 +- .../llvm-project/clang/lib/AST/QualTypeNames.cpp | 4 +- .../llvm-project/clang/lib/AST/RawCommentList.cpp | 4 +- .../clang/lib/AST/RecordLayoutBuilder.cpp | 91 +- .../clang/lib/AST/ScanfFormatString.cpp | 2 +- contrib/llvm-project/clang/lib/AST/Stmt.cpp | 7 +- contrib/llvm-project/clang/lib/AST/StmtOpenMP.cpp | 34 +- contrib/llvm-project/clang/lib/AST/StmtPrinter.cpp | 24 +- contrib/llvm-project/clang/lib/AST/StmtProfile.cpp | 27 +- .../llvm-project/clang/lib/AST/TemplateBase.cpp | 15 +- .../llvm-project/clang/lib/AST/TextNodeDumper.cpp | 245 +- contrib/llvm-project/clang/lib/AST/Type.cpp | 268 +- contrib/llvm-project/clang/lib/AST/TypeLoc.cpp | 45 +- contrib/llvm-project/clang/lib/AST/TypePrinter.cpp | 86 +- .../llvm-project/clang/lib/AST/VTableBuilder.cpp | 37 +- .../clang/lib/ASTMatchers/ASTMatchFinder.cpp | 28 +- .../clang/lib/ASTMatchers/ASTMatchersInternal.cpp | 18 +- .../clang/lib/ASTMatchers/Dynamic/Parser.cpp | 6 +- .../clang/lib/ASTMatchers/Dynamic/Registry.cpp | 3 + .../clang/lib/ASTMatchers/GtestMatchers.cpp | 1 - .../llvm-project/clang/lib/Analysis/BodyFarm.cpp | 6 +- contrib/llvm-project/clang/lib/Analysis/CFG.cpp | 78 +- .../llvm-project/clang/lib/Analysis/CallGraph.cpp | 2 +- .../clang/lib/Analysis/CalledOnceCheck.cpp | 2 +- .../clang/lib/Analysis/CocoaConventions.cpp | 11 +- .../llvm-project/clang/lib/Analysis/Consumed.cpp | 4 +- .../clang/lib/Analysis/ExprMutationAnalyzer.cpp | 28 +- .../clang/lib/Analysis/FlowSensitive/Arena.cpp | 195 +- .../Analysis/FlowSensitive/ControlFlowContext.cpp | 20 +- .../FlowSensitive/DataflowAnalysisContext.cpp | 180 +- .../Analysis/FlowSensitive/DataflowEnvironment.cpp | 668 +- .../lib/Analysis/FlowSensitive/DebugSupport.cpp | 6 +- .../clang/lib/Analysis/FlowSensitive/Formula.cpp | 18 +- .../lib/Analysis/FlowSensitive/HTMLLogger.cpp | 131 +- .../lib/Analysis/FlowSensitive/HTMLLogger.css | 27 +- .../lib/Analysis/FlowSensitive/HTMLLogger.html | 23 +- .../clang/lib/Analysis/FlowSensitive/Logger.cpp | 19 +- .../FlowSensitive/Models/ChromiumCheckModel.cpp | 4 +- .../Models/UncheckedOptionalAccessModel.cpp | 481 +- .../clang/lib/Analysis/FlowSensitive/RecordOps.cpp | 72 +- .../Analysis/FlowSensitive/SimplifyConstraints.cpp | 180 + .../clang/lib/Analysis/FlowSensitive/Transfer.cpp | 303 +- .../FlowSensitive/TypeErasedDataflowAnalysis.cpp | 129 +- .../clang/lib/Analysis/FlowSensitive/Value.cpp | 28 +- .../FlowSensitive/WatchedLiteralsSolver.cpp | 216 +- .../clang/lib/Analysis/IntervalPartition.cpp | 215 +- .../clang/lib/Analysis/PathDiagnostic.cpp | 8 +- .../clang/lib/Analysis/RetainSummaryManager.cpp | 69 +- .../clang/lib/Analysis/ThreadSafety.cpp | 259 +- .../clang/lib/Analysis/ThreadSafetyCommon.cpp | 23 +- .../clang/lib/Analysis/UninitializedValues.cpp | 2 +- .../clang/lib/Analysis/UnsafeBufferUsage.cpp | 1038 +- .../llvm-project/clang/lib/Basic/Attributes.cpp | 28 +- .../clang/lib/Basic/CodeGenOptions.cpp | 35 + contrib/llvm-project/clang/lib/Basic/Cuda.cpp | 7 + .../llvm-project/clang/lib/Basic/Diagnostic.cpp | 11 +- .../llvm-project/clang/lib/Basic/DiagnosticIDs.cpp | 2 +- .../llvm-project/clang/lib/Basic/FileManager.cpp | 87 +- .../clang/lib/Basic/IdentifierTable.cpp | 82 +- .../llvm-project/clang/lib/Basic/LangOptions.cpp | 6 +- .../llvm-project/clang/lib/Basic/LangStandards.cpp | 33 + contrib/llvm-project/clang/lib/Basic/Module.cpp | 51 +- .../llvm-project/clang/lib/Basic/OpenMPKinds.cpp | 25 + .../llvm-project/clang/lib/Basic/ProfileList.cpp | 4 +- .../clang/lib/Basic/SanitizerSpecialCaseList.cpp | 3 +- contrib/llvm-project/clang/lib/Basic/Sarif.cpp | 17 +- .../clang/lib/Basic/SourceLocation.cpp | 5 + .../llvm-project/clang/lib/Basic/SourceManager.cpp | 317 +- .../clang/lib/Basic/SourceMgrAdapter.cpp | 136 + .../llvm-project/clang/lib/Basic/TargetInfo.cpp | 10 +- contrib/llvm-project/clang/lib/Basic/Targets.cpp | 48 +- .../clang/lib/Basic/Targets/AArch64.cpp | 72 +- .../llvm-project/clang/lib/Basic/Targets/AArch64.h | 3 + .../clang/lib/Basic/Targets/AMDGPU.cpp | 91 +- .../llvm-project/clang/lib/Basic/Targets/AMDGPU.h | 19 +- .../llvm-project/clang/lib/Basic/Targets/ARM.cpp | 4 +- .../llvm-project/clang/lib/Basic/Targets/BPF.cpp | 33 +- contrib/llvm-project/clang/lib/Basic/Targets/BPF.h | 2 +- .../clang/lib/Basic/Targets/LoongArch.cpp | 12 +- .../clang/lib/Basic/Targets/LoongArch.h | 5 + .../llvm-project/clang/lib/Basic/Targets/M68k.cpp | 34 +- .../llvm-project/clang/lib/Basic/Targets/M68k.h | 1 + .../llvm-project/clang/lib/Basic/Targets/Mips.cpp | 6 +- .../llvm-project/clang/lib/Basic/Targets/Mips.h | 13 + .../llvm-project/clang/lib/Basic/Targets/NVPTX.cpp | 7 +- .../llvm-project/clang/lib/Basic/Targets/NVPTX.h | 2 + .../clang/lib/Basic/Targets/OSTargets.cpp | 3 + .../clang/lib/Basic/Targets/OSTargets.h | 57 +- .../llvm-project/clang/lib/Basic/Targets/PPC.cpp | 31 +- contrib/llvm-project/clang/lib/Basic/Targets/PPC.h | 3 + .../llvm-project/clang/lib/Basic/Targets/RISCV.cpp | 164 +- .../llvm-project/clang/lib/Basic/Targets/RISCV.h | 10 + .../llvm-project/clang/lib/Basic/Targets/SPIR.cpp | 11 +- .../llvm-project/clang/lib/Basic/Targets/SPIR.h | 54 +- .../llvm-project/clang/lib/Basic/Targets/Sparc.cpp | 76 +- .../llvm-project/clang/lib/Basic/Targets/SystemZ.h | 2 +- .../clang/lib/Basic/Targets/WebAssembly.cpp | 12 + .../clang/lib/Basic/Targets/WebAssembly.h | 1 + .../llvm-project/clang/lib/Basic/Targets/X86.cpp | 140 +- contrib/llvm-project/clang/lib/Basic/Targets/X86.h | 53 +- contrib/llvm-project/clang/lib/Basic/Warnings.cpp | 8 +- .../clang/lib/CodeGen/BackendConsumer.h | 166 + .../llvm-project/clang/lib/CodeGen/BackendUtil.cpp | 227 +- .../llvm-project/clang/lib/CodeGen/CGAtomic.cpp | 308 +- .../llvm-project/clang/lib/CodeGen/CGBlocks.cpp | 100 +- contrib/llvm-project/clang/lib/CodeGen/CGBuilder.h | 17 +- .../llvm-project/clang/lib/CodeGen/CGBuiltin.cpp | 1850 +- .../llvm-project/clang/lib/CodeGen/CGCUDANV.cpp | 173 +- .../llvm-project/clang/lib/CodeGen/CGCUDARuntime.h | 14 +- .../llvm-project/clang/lib/CodeGen/CGCXXABI.cpp | 8 +- contrib/llvm-project/clang/lib/CodeGen/CGCall.cpp | 168 +- contrib/llvm-project/clang/lib/CodeGen/CGCall.h | 36 +- contrib/llvm-project/clang/lib/CodeGen/CGClass.cpp | 55 +- .../llvm-project/clang/lib/CodeGen/CGCleanup.cpp | 14 +- .../llvm-project/clang/lib/CodeGen/CGCoroutine.cpp | 95 +- .../llvm-project/clang/lib/CodeGen/CGDebugInfo.cpp | 154 +- .../llvm-project/clang/lib/CodeGen/CGDebugInfo.h | 14 +- contrib/llvm-project/clang/lib/CodeGen/CGDecl.cpp | 62 +- .../llvm-project/clang/lib/CodeGen/CGDeclCXX.cpp | 53 +- .../llvm-project/clang/lib/CodeGen/CGException.cpp | 75 +- contrib/llvm-project/clang/lib/CodeGen/CGExpr.cpp | 385 +- .../llvm-project/clang/lib/CodeGen/CGExprCXX.cpp | 43 +- .../clang/lib/CodeGen/CGExprComplex.cpp | 170 +- .../clang/lib/CodeGen/CGExprConstant.cpp | 73 +- .../clang/lib/CodeGen/CGExprScalar.cpp | 80 +- .../clang/lib/CodeGen/CGGPUBuiltin.cpp | 15 +- .../clang/lib/CodeGen/CGHLSLRuntime.cpp | 66 +- .../llvm-project/clang/lib/CodeGen/CGHLSLRuntime.h | 2 +- .../llvm-project/clang/lib/CodeGen/CGLoopInfo.cpp | 24 +- .../llvm-project/clang/lib/CodeGen/CGLoopInfo.h | 6 + .../clang/lib/CodeGen/CGNonTrivialStruct.cpp | 4 +- contrib/llvm-project/clang/lib/CodeGen/CGObjC.cpp | 37 +- .../llvm-project/clang/lib/CodeGen/CGObjCGNU.cpp | 186 +- .../llvm-project/clang/lib/CodeGen/CGObjCMac.cpp | 149 +- .../clang/lib/CodeGen/CGObjCRuntime.cpp | 4 +- .../clang/lib/CodeGen/CGOpenCLRuntime.cpp | 50 +- .../clang/lib/CodeGen/CGOpenCLRuntime.h | 3 +- .../clang/lib/CodeGen/CGOpenMPRuntime.cpp | 1169 +- .../clang/lib/CodeGen/CGOpenMPRuntime.h | 77 +- .../clang/lib/CodeGen/CGOpenMPRuntimeGPU.cpp | 517 +- .../clang/lib/CodeGen/CGOpenMPRuntimeGPU.h | 40 +- .../clang/lib/CodeGen/CGRecordLayoutBuilder.cpp | 13 +- contrib/llvm-project/clang/lib/CodeGen/CGStmt.cpp | 46 +- .../clang/lib/CodeGen/CGStmtOpenMP.cpp | 44 +- contrib/llvm-project/clang/lib/CodeGen/CGVTT.cpp | 5 + .../llvm-project/clang/lib/CodeGen/CGVTables.cpp | 82 +- .../clang/lib/CodeGen/CodeGenAction.cpp | 671 +- .../clang/lib/CodeGen/CodeGenFunction.cpp | 89 +- .../clang/lib/CodeGen/CodeGenFunction.h | 52 +- .../clang/lib/CodeGen/CodeGenModule.cpp | 460 +- .../llvm-project/clang/lib/CodeGen/CodeGenModule.h | 100 +- .../llvm-project/clang/lib/CodeGen/CodeGenPGO.cpp | 21 +- .../llvm-project/clang/lib/CodeGen/CodeGenTBAA.cpp | 33 +- .../clang/lib/CodeGen/CodeGenTypeCache.h | 7 +- .../clang/lib/CodeGen/CodeGenTypes.cpp | 7 +- .../llvm-project/clang/lib/CodeGen/CodeGenTypes.h | 4 + .../clang/lib/CodeGen/CoverageMappingGen.cpp | 32 +- .../clang/lib/CodeGen/CoverageMappingGen.h | 4 +- .../llvm-project/clang/lib/CodeGen/EHScopeStack.h | 4 +- .../clang/lib/CodeGen/ItaniumCXXABI.cpp | 120 +- .../clang/lib/CodeGen/LinkInModulesPass.cpp | 29 + .../clang/lib/CodeGen/LinkInModulesPass.h | 42 + .../clang/lib/CodeGen/MicrosoftCXXABI.cpp | 100 +- .../CodeGen/ObjectFilePCHContainerOperations.cpp | 3 + .../clang/lib/CodeGen/SwiftCallingConv.cpp | 7 +- .../llvm-project/clang/lib/CodeGen/TargetInfo.cpp | 2 +- .../llvm-project/clang/lib/CodeGen/TargetInfo.h | 3 + .../clang/lib/CodeGen/Targets/AArch64.cpp | 19 +- .../clang/lib/CodeGen/Targets/AMDGPU.cpp | 159 +- .../clang/lib/CodeGen/Targets/LoongArch.cpp | 24 +- .../clang/lib/CodeGen/Targets/NVPTX.cpp | 71 +- .../llvm-project/clang/lib/CodeGen/Targets/PPC.cpp | 23 +- .../clang/lib/CodeGen/Targets/RISCV.cpp | 4 +- .../clang/lib/CodeGen/Targets/SPIR.cpp | 6 +- .../clang/lib/CodeGen/Targets/Sparc.cpp | 2 +- .../llvm-project/clang/lib/CodeGen/Targets/X86.cpp | 58 +- .../clang/lib/CodeGen/Targets/XCore.cpp | 2 +- .../clang/lib/CrossTU/CrossTranslationUnit.cpp | 10 +- .../linux/DirectoryWatcher-linux.cpp | 2 +- contrib/llvm-project/clang/lib/Driver/Distro.cpp | 15 +- contrib/llvm-project/clang/lib/Driver/Driver.cpp | 316 +- .../clang/lib/Driver/DriverOptions.cpp | 5 +- contrib/llvm-project/clang/lib/Driver/Job.cpp | 8 +- contrib/llvm-project/clang/lib/Driver/Multilib.cpp | 116 +- .../clang/lib/Driver/OffloadBundler.cpp | 591 +- .../clang/lib/Driver/SanitizerArgs.cpp | 2 + .../llvm-project/clang/lib/Driver/ToolChain.cpp | 112 +- .../clang/lib/Driver/ToolChains/AIX.cpp | 31 +- .../llvm-project/clang/lib/Driver/ToolChains/AIX.h | 6 +- .../clang/lib/Driver/ToolChains/AMDGPU.cpp | 82 +- .../clang/lib/Driver/ToolChains/AMDGPU.h | 2 +- .../clang/lib/Driver/ToolChains/AVR.cpp | 61 +- .../llvm-project/clang/lib/Driver/ToolChains/AVR.h | 2 +- .../clang/lib/Driver/ToolChains/Ananas.cpp | 148 - .../clang/lib/Driver/ToolChains/Ananas.h | 65 - .../clang/lib/Driver/ToolChains/Arch/AArch64.cpp | 17 +- .../clang/lib/Driver/ToolChains/Arch/ARM.cpp | 35 +- .../clang/lib/Driver/ToolChains/Arch/LoongArch.cpp | 32 + .../clang/lib/Driver/ToolChains/Arch/RISCV.cpp | 11 +- .../clang/lib/Driver/ToolChains/Arch/Sparc.cpp | 4 - .../clang/lib/Driver/ToolChains/Arch/VE.cpp | 7 +- .../clang/lib/Driver/ToolChains/Arch/X86.cpp | 42 +- .../clang/lib/Driver/ToolChains/BareMetal.cpp | 31 +- .../clang/lib/Driver/ToolChains/BareMetal.h | 3 +- .../clang/lib/Driver/ToolChains/CSKYToolChain.cpp | 5 +- .../clang/lib/Driver/ToolChains/CSKYToolChain.h | 2 +- .../clang/lib/Driver/ToolChains/Clang.cpp | 845 +- .../clang/lib/Driver/ToolChains/Clang.h | 4 +- .../clang/lib/Driver/ToolChains/CloudABI.cpp | 151 - .../clang/lib/Driver/ToolChains/CloudABI.h | 70 - .../clang/lib/Driver/ToolChains/CommonArgs.cpp | 400 +- .../clang/lib/Driver/ToolChains/CommonArgs.h | 34 +- .../clang/lib/Driver/ToolChains/Contiki.cpp | 27 - .../clang/lib/Driver/ToolChains/Contiki.h | 39 - .../clang/lib/Driver/ToolChains/CrossWindows.h | 4 +- .../clang/lib/Driver/ToolChains/Cuda.cpp | 21 +- .../clang/lib/Driver/ToolChains/Cuda.h | 6 +- .../clang/lib/Driver/ToolChains/Darwin.cpp | 133 +- .../clang/lib/Driver/ToolChains/DragonFly.cpp | 152 +- .../clang/lib/Driver/ToolChains/DragonFly.h | 14 +- .../clang/lib/Driver/ToolChains/Flang.cpp | 263 +- .../clang/lib/Driver/ToolChains/Flang.h | 14 + .../clang/lib/Driver/ToolChains/FreeBSD.cpp | 104 +- .../clang/lib/Driver/ToolChains/FreeBSD.h | 12 +- .../clang/lib/Driver/ToolChains/Fuchsia.cpp | 23 +- .../clang/lib/Driver/ToolChains/Fuchsia.h | 2 +- .../clang/lib/Driver/ToolChains/Gnu.cpp | 269 +- .../llvm-project/clang/lib/Driver/ToolChains/Gnu.h | 3 +- .../clang/lib/Driver/ToolChains/HIPAMD.cpp | 16 +- .../clang/lib/Driver/ToolChains/HIPAMD.h | 2 +- .../clang/lib/Driver/ToolChains/HIPSPV.cpp | 4 - .../clang/lib/Driver/ToolChains/HIPSPV.h | 2 +- .../clang/lib/Driver/ToolChains/HIPUtility.cpp | 8 + .../clang/lib/Driver/ToolChains/HLSL.cpp | 8 - .../clang/lib/Driver/ToolChains/Haiku.cpp | 257 +- .../clang/lib/Driver/ToolChains/Haiku.h | 40 +- .../clang/lib/Driver/ToolChains/Hexagon.cpp | 24 +- .../clang/lib/Driver/ToolChains/Hexagon.h | 4 +- .../clang/lib/Driver/ToolChains/Hurd.cpp | 4 +- .../clang/lib/Driver/ToolChains/Linux.cpp | 2 +- .../clang/lib/Driver/ToolChains/MSP430.cpp | 4 +- .../clang/lib/Driver/ToolChains/MSP430.h | 2 +- .../clang/lib/Driver/ToolChains/MSVC.cpp | 10 +- .../clang/lib/Driver/ToolChains/MSVC.h | 2 +- .../clang/lib/Driver/ToolChains/MinGW.cpp | 19 +- .../clang/lib/Driver/ToolChains/MinGW.h | 4 +- .../clang/lib/Driver/ToolChains/Minix.cpp | 116 - .../clang/lib/Driver/ToolChains/Minix.h | 64 - .../clang/lib/Driver/ToolChains/Myriad.cpp | 293 - .../clang/lib/Driver/ToolChains/Myriad.h | 103 - .../clang/lib/Driver/ToolChains/NaCl.cpp | 9 +- .../clang/lib/Driver/ToolChains/NaCl.h | 2 +- .../clang/lib/Driver/ToolChains/NetBSD.cpp | 150 +- .../clang/lib/Driver/ToolChains/NetBSD.h | 6 +- .../clang/lib/Driver/ToolChains/OpenBSD.cpp | 77 +- .../clang/lib/Driver/ToolChains/OpenBSD.h | 6 +- .../clang/lib/Driver/ToolChains/PPCLinux.cpp | 4 +- .../clang/lib/Driver/ToolChains/PS4CPU.cpp | 15 +- .../clang/lib/Driver/ToolChains/PS4CPU.h | 4 +- .../clang/lib/Driver/ToolChains/RISCVToolchain.cpp | 9 +- .../clang/lib/Driver/ToolChains/RISCVToolchain.h | 2 +- .../clang/lib/Driver/ToolChains/ROCm.h | 13 + .../clang/lib/Driver/ToolChains/SPIRV.h | 2 +- .../clang/lib/Driver/ToolChains/Solaris.cpp | 212 +- .../clang/lib/Driver/ToolChains/Solaris.h | 18 +- .../clang/lib/Driver/ToolChains/VEToolchain.cpp | 14 +- .../clang/lib/Driver/ToolChains/WebAssembly.cpp | 37 +- .../clang/lib/Driver/ToolChains/WebAssembly.h | 2 +- .../clang/lib/Driver/ToolChains/XCore.cpp | 3 +- .../clang/lib/Driver/ToolChains/XCore.h | 4 +- .../clang/lib/Driver/ToolChains/ZOS.cpp | 16 +- .../llvm-project/clang/lib/Driver/ToolChains/ZOS.h | 6 +- contrib/llvm-project/clang/lib/Driver/Types.cpp | 4 +- contrib/llvm-project/clang/lib/Edit/Commit.cpp | 2 +- .../clang/lib/Edit/RewriteObjCFoundationAPI.cpp | 8 +- contrib/llvm-project/clang/lib/ExtractAPI/API.cpp | 275 +- .../clang/lib/ExtractAPI/DeclarationFragments.cpp | 772 +- .../clang/lib/ExtractAPI/ExtractAPIConsumer.cpp | 27 +- .../Serialization/SymbolGraphSerializer.cpp | 470 +- .../clang/lib/Format/BreakableToken.cpp | 158 +- .../llvm-project/clang/lib/Format/BreakableToken.h | 44 + .../clang/lib/Format/ContinuationIndenter.cpp | 291 +- .../clang/lib/Format/ContinuationIndenter.h | 3 + .../clang/lib/Format/DefinitionBlockSeparator.cpp | 8 +- contrib/llvm-project/clang/lib/Format/Format.cpp | 206 +- .../llvm-project/clang/lib/Format/FormatToken.cpp | 3 +- .../llvm-project/clang/lib/Format/FormatToken.h | 75 +- .../clang/lib/Format/FormatTokenLexer.cpp | 41 +- .../clang/lib/Format/FormatTokenSource.h | 2 +- .../clang/lib/Format/MacroCallReconstructor.cpp | 49 +- .../clang/lib/Format/MacroExpander.cpp | 4 +- .../clang/lib/Format/NamespaceEndCommentsFixer.cpp | 14 +- .../lib/Format/ObjCPropertyAttributeOrderFixer.cpp | 220 + .../lib/Format/ObjCPropertyAttributeOrderFixer.h | 51 + .../clang/lib/Format/QualifierAlignmentFixer.cpp | 30 +- .../clang/lib/Format/QualifierAlignmentFixer.h | 9 +- .../clang/lib/Format/SortJavaScriptImports.cpp | 18 +- .../clang/lib/Format/TokenAnnotator.cpp | 693 +- .../llvm-project/clang/lib/Format/TokenAnnotator.h | 17 + .../clang/lib/Format/UnwrappedLineFormatter.cpp | 88 +- .../clang/lib/Format/UnwrappedLineParser.cpp | 335 +- .../clang/lib/Format/UnwrappedLineParser.h | 36 +- .../clang/lib/Format/WhitespaceManager.cpp | 334 +- .../clang/lib/Format/WhitespaceManager.h | 2 +- .../llvm-project/clang/lib/Frontend/ASTMerge.cpp | 2 +- .../llvm-project/clang/lib/Frontend/ASTUnit.cpp | 54 +- .../clang/lib/Frontend/CompilerInstance.cpp | 57 +- .../clang/lib/Frontend/CompilerInvocation.cpp | 1089 +- .../clang/lib/Frontend/DependencyFile.cpp | 2 +- .../clang/lib/Frontend/DependencyGraph.cpp | 2 +- .../clang/lib/Frontend/FrontendAction.cpp | 42 +- .../clang/lib/Frontend/FrontendActions.cpp | 33 +- .../clang/lib/Frontend/HeaderIncludeGen.cpp | 2 +- .../clang/lib/Frontend/InitPreprocessor.cpp | 47 +- .../clang/lib/Frontend/LogDiagnosticPrinter.cpp | 4 +- .../clang/lib/Frontend/PrecompiledPreamble.cpp | 18 +- .../clang/lib/Frontend/PrintPreprocessedOutput.cpp | 232 +- .../clang/lib/Frontend/Rewrite/FixItRewriter.cpp | 3 +- .../clang/lib/Frontend/Rewrite/HTMLPrint.cpp | 2 +- .../lib/Frontend/Rewrite/InclusionRewriter.cpp | 47 +- .../lib/Frontend/Rewrite/RewriteModernObjC.cpp | 45 +- .../clang/lib/Frontend/Rewrite/RewriteObjC.cpp | 36 +- .../clang/lib/Frontend/SARIFDiagnostic.cpp | 7 +- .../clang/lib/Frontend/TextDiagnostic.cpp | 9 +- .../lib/Frontend/VerifyDiagnosticConsumer.cpp | 47 +- .../lib/FrontendTool/ExecuteCompilerInvocation.cpp | 6 +- .../lib/Headers/__clang_cuda_device_functions.h | 4 +- .../lib/Headers/__clang_cuda_libdevice_declares.h | 4 +- .../clang/lib/Headers/__clang_cuda_math.h | 4 +- .../lib/Headers/__clang_cuda_runtime_wrapper.h | 4 +- .../clang/lib/Headers/__clang_hip_math.h | 363 +- .../lib/Headers/__clang_hip_runtime_wrapper.h | 60 +- .../clang/lib/Headers/__stdarg___gnuc_va_list.h | 13 + .../clang/lib/Headers/__stdarg___va_copy.h | 12 + .../clang/lib/Headers/__stdarg_va_arg.h | 22 + .../clang/lib/Headers/__stdarg_va_copy.h | 12 + .../clang/lib/Headers/__stdarg_va_list.h | 13 + .../clang/lib/Headers/__stddef_max_align_t.h | 2 +- .../llvm-project/clang/lib/Headers/__stddef_null.h | 29 + .../clang/lib/Headers/__stddef_nullptr_t.h | 24 + .../clang/lib/Headers/__stddef_offsetof.h | 12 + .../clang/lib/Headers/__stddef_ptrdiff_t.h | 15 + .../clang/lib/Headers/__stddef_rsize_t.h | 15 + .../clang/lib/Headers/__stddef_size_t.h | 15 + .../clang/lib/Headers/__stddef_unreachable.h | 12 + .../clang/lib/Headers/__stddef_wchar_t.h | 23 + .../clang/lib/Headers/__stddef_wint_t.h | 15 + contrib/llvm-project/clang/lib/Headers/altivec.h | 43 +- contrib/llvm-project/clang/lib/Headers/ammintrin.h | 8 +- contrib/llvm-project/clang/lib/Headers/arm_acle.h | 15 + .../llvm-project/clang/lib/Headers/avx2intrin.h | 27 +- .../clang/lib/Headers/avx512bf16intrin.h | 5 +- .../clang/lib/Headers/avx512bitalgintrin.h | 5 +- .../clang/lib/Headers/avx512bwintrin.h | 66 +- .../clang/lib/Headers/avx512cdintrin.h | 4 +- .../clang/lib/Headers/avx512dqintrin.h | 6 +- .../llvm-project/clang/lib/Headers/avx512fintrin.h | 10 +- .../clang/lib/Headers/avx512fp16intrin.h | 10 +- .../clang/lib/Headers/avx512ifmaintrin.h | 4 +- .../clang/lib/Headers/avx512ifmavlintrin.h | 10 +- .../clang/lib/Headers/avx512pfintrin.h | 5 - .../clang/lib/Headers/avx512vbmi2intrin.h | 2 +- .../clang/lib/Headers/avx512vbmiintrin.h | 5 +- .../clang/lib/Headers/avx512vbmivlintrin.h | 11 +- .../clang/lib/Headers/avx512vlbf16intrin.h | 14 +- .../clang/lib/Headers/avx512vlbitalgintrin.h | 10 +- .../clang/lib/Headers/avx512vlbwintrin.h | 10 +- .../clang/lib/Headers/avx512vlcdintrin.h | 11 +- .../clang/lib/Headers/avx512vldqintrin.h | 10 +- .../clang/lib/Headers/avx512vlfp16intrin.h | 4 +- .../clang/lib/Headers/avx512vlintrin.h | 10 +- .../clang/lib/Headers/avx512vlvbmi2intrin.h | 10 +- .../clang/lib/Headers/avx512vlvnniintrin.h | 10 +- .../clang/lib/Headers/avx512vlvp2intersectintrin.h | 10 +- .../clang/lib/Headers/avx512vnniintrin.h | 5 +- .../clang/lib/Headers/avx512vp2intersectintrin.h | 5 +- .../clang/lib/Headers/avx512vpopcntdqintrin.h | 4 +- .../clang/lib/Headers/avx512vpopcntdqvlintrin.h | 8 +- contrib/llvm-project/clang/lib/Headers/avxintrin.h | 14 +- contrib/llvm-project/clang/lib/Headers/bmiintrin.h | 22 +- contrib/llvm-project/clang/lib/Headers/emmintrin.h | 20 +- .../llvm-project/clang/lib/Headers/gfniintrin.h | 29 +- .../clang/lib/Headers/hlsl/hlsl_intrinsics.h | 722 +- contrib/llvm-project/clang/lib/Headers/immintrin.h | 4 +- contrib/llvm-project/clang/lib/Headers/intrin.h | 16 + .../llvm-project/clang/lib/Headers/lasxintrin.h | 3860 ++ contrib/llvm-project/clang/lib/Headers/limits.h | 6 +- .../clang/lib/Headers/llvm_libc_wrappers/assert.h | 34 + .../clang/lib/Headers/llvm_libc_wrappers/ctype.h | 17 + .../clang/lib/Headers/llvm_libc_wrappers/stdio.h | 18 + .../clang/lib/Headers/llvm_libc_wrappers/stdlib.h | 5 +- .../clang/lib/Headers/llvm_libc_wrappers/string.h | 65 +- .../clang/lib/Headers/llvm_libc_wrappers/time.h | 34 + contrib/llvm-project/clang/lib/Headers/lsxintrin.h | 3726 ++ contrib/llvm-project/clang/lib/Headers/mmintrin.h | 12 +- .../clang/lib/Headers/module.modulemap | 159 +- .../llvm-project/clang/lib/Headers/opencl-c-base.h | 5 + .../clang/lib/Headers/openmp_wrappers/cmath | 2 +- contrib/llvm-project/clang/lib/Headers/pmmintrin.h | 5 +- .../clang/lib/Headers/ppc_wrappers/smmintrin.h | 50 +- .../clang/lib/Headers/riscv_bitmanip.h | 179 + .../llvm-project/clang/lib/Headers/riscv_crypto.h | 170 + .../llvm-project/clang/lib/Headers/riscv_ntlh.h | 8 +- contrib/llvm-project/clang/lib/Headers/smmintrin.h | 6 +- contrib/llvm-project/clang/lib/Headers/stdalign.h | 4 +- contrib/llvm-project/clang/lib/Headers/stdarg.h | 90 +- contrib/llvm-project/clang/lib/Headers/stdatomic.h | 8 +- contrib/llvm-project/clang/lib/Headers/stdckdint.h | 42 + contrib/llvm-project/clang/lib/Headers/stddef.h | 166 +- contrib/llvm-project/clang/lib/Headers/stdint.h | 67 +- .../llvm-project/clang/lib/Headers/stdnoreturn.h | 4 +- contrib/llvm-project/clang/lib/Headers/tmmintrin.h | 9 +- .../llvm-project/clang/lib/Headers/usermsrintrin.h | 30 + .../llvm-project/clang/lib/Headers/vaesintrin.h | 6 +- contrib/llvm-project/clang/lib/Headers/vecintrin.h | 416 +- .../llvm-project/clang/lib/Headers/x86gprintrin.h | 5 + contrib/llvm-project/clang/lib/Headers/xmmintrin.h | 14 +- .../llvm-project/clang/lib/Index/CommentToXML.cpp | 54 +- contrib/llvm-project/clang/lib/Index/IndexBody.cpp | 29 +- .../llvm-project/clang/lib/Index/IndexSymbol.cpp | 33 +- .../clang/lib/Index/IndexingContext.cpp | 5 +- .../llvm-project/clang/lib/Index/IndexingContext.h | 2 +- .../llvm-project/clang/lib/Index/USRGeneration.cpp | 63 +- .../SerializablePathCollection.cpp | 10 +- .../clang/lib/Interpreter/CodeCompletion.cpp | 211 + .../clang/lib/Interpreter/DeviceOffload.cpp | 2 +- .../clang/lib/Interpreter/IncrementalExecutor.cpp | 10 +- .../clang/lib/Interpreter/IncrementalParser.cpp | 9 +- .../clang/lib/Interpreter/IncrementalParser.h | 4 +- .../clang/lib/Interpreter/Interpreter.cpp | 7 +- .../llvm-project/clang/lib/Interpreter/Value.cpp | 17 +- .../clang/lib/Lex/DependencyDirectivesScanner.cpp | 5 +- contrib/llvm-project/clang/lib/Lex/HeaderMap.cpp | 15 +- .../llvm-project/clang/lib/Lex/HeaderSearch.cpp | 170 +- .../clang/lib/Lex/InitHeaderSearch.cpp | 116 +- contrib/llvm-project/clang/lib/Lex/Lexer.cpp | 212 +- .../llvm-project/clang/lib/Lex/LiteralSupport.cpp | 33 +- contrib/llvm-project/clang/lib/Lex/ModuleMap.cpp | 162 +- contrib/llvm-project/clang/lib/Lex/PPCaching.cpp | 6 +- .../llvm-project/clang/lib/Lex/PPDirectives.cpp | 134 +- .../llvm-project/clang/lib/Lex/PPExpressions.cpp | 10 +- .../llvm-project/clang/lib/Lex/PPLexerChange.cpp | 24 +- .../clang/lib/Lex/PPMacroExpansion.cpp | 24 +- contrib/llvm-project/clang/lib/Lex/Pragma.cpp | 8 +- .../llvm-project/clang/lib/Lex/Preprocessor.cpp | 129 +- .../clang/lib/Lex/PreprocessorLexer.cpp | 3 +- .../clang/lib/Parse/ParseCXXInlineMethods.cpp | 5 +- contrib/llvm-project/clang/lib/Parse/ParseDecl.cpp | 307 +- .../llvm-project/clang/lib/Parse/ParseDeclCXX.cpp | 79 +- contrib/llvm-project/clang/lib/Parse/ParseExpr.cpp | 116 +- .../llvm-project/clang/lib/Parse/ParseExprCXX.cpp | 227 +- contrib/llvm-project/clang/lib/Parse/ParseInit.cpp | 8 +- contrib/llvm-project/clang/lib/Parse/ParseObjc.cpp | 64 +- .../llvm-project/clang/lib/Parse/ParseOpenACC.cpp | 527 + .../llvm-project/clang/lib/Parse/ParseOpenMP.cpp | 205 +- .../llvm-project/clang/lib/Parse/ParsePragma.cpp | 183 +- contrib/llvm-project/clang/lib/Parse/ParseStmt.cpp | 83 +- .../llvm-project/clang/lib/Parse/ParseTemplate.cpp | 15 +- .../clang/lib/Parse/ParseTentative.cpp | 31 + contrib/llvm-project/clang/lib/Parse/Parser.cpp | 70 +- .../llvm-project/clang/lib/Rewrite/Rewriter.cpp | 17 +- .../clang/lib/Sema/AnalysisBasedWarnings.cpp | 133 +- .../clang/lib/Sema/CodeCompleteConsumer.cpp | 14 +- contrib/llvm-project/clang/lib/Sema/DeclSpec.cpp | 17 +- .../clang/lib/Sema/HLSLExternalSemaSource.cpp | 95 +- .../clang/lib/Sema/IdentifierResolver.cpp | 7 +- contrib/llvm-project/clang/lib/Sema/ParsedAttr.cpp | 13 +- contrib/llvm-project/clang/lib/Sema/ScopeInfo.cpp | 8 + contrib/llvm-project/clang/lib/Sema/Sema.cpp | 66 +- contrib/llvm-project/clang/lib/Sema/SemaAttr.cpp | 26 +- .../clang/lib/Sema/SemaAvailability.cpp | 23 + contrib/llvm-project/clang/lib/Sema/SemaCUDA.cpp | 95 +- .../clang/lib/Sema/SemaCXXScopeSpec.cpp | 2 +- contrib/llvm-project/clang/lib/Sema/SemaCast.cpp | 17 +- .../llvm-project/clang/lib/Sema/SemaChecking.cpp | 1239 +- .../clang/lib/Sema/SemaCodeComplete.cpp | 215 +- .../llvm-project/clang/lib/Sema/SemaConcept.cpp | 62 +- .../llvm-project/clang/lib/Sema/SemaCoroutine.cpp | 116 +- contrib/llvm-project/clang/lib/Sema/SemaDecl.cpp | 943 +- .../llvm-project/clang/lib/Sema/SemaDeclAttr.cpp | 471 +- .../llvm-project/clang/lib/Sema/SemaDeclCXX.cpp | 846 +- .../llvm-project/clang/lib/Sema/SemaDeclObjC.cpp | 76 +- .../clang/lib/Sema/SemaExceptionSpec.cpp | 65 +- contrib/llvm-project/clang/lib/Sema/SemaExpr.cpp | 908 +- .../llvm-project/clang/lib/Sema/SemaExprCXX.cpp | 385 +- .../llvm-project/clang/lib/Sema/SemaExprMember.cpp | 94 +- .../llvm-project/clang/lib/Sema/SemaExprObjC.cpp | 56 +- contrib/llvm-project/clang/lib/Sema/SemaInit.cpp | 366 +- contrib/llvm-project/clang/lib/Sema/SemaLambda.cpp | 156 +- contrib/llvm-project/clang/lib/Sema/SemaLookup.cpp | 142 +- contrib/llvm-project/clang/lib/Sema/SemaModule.cpp | 74 +- .../clang/lib/Sema/SemaObjCProperty.cpp | 32 +- contrib/llvm-project/clang/lib/Sema/SemaOpenMP.cpp | 342 +- .../llvm-project/clang/lib/Sema/SemaOverload.cpp | 1399 +- .../clang/lib/Sema/SemaPseudoObject.cpp | 7 +- .../clang/lib/Sema/SemaRISCVVectorLookup.cpp | 71 +- contrib/llvm-project/clang/lib/Sema/SemaStmt.cpp | 33 +- .../llvm-project/clang/lib/Sema/SemaStmtAsm.cpp | 3 +- .../llvm-project/clang/lib/Sema/SemaStmtAttr.cpp | 103 +- .../llvm-project/clang/lib/Sema/SemaTemplate.cpp | 492 +- .../clang/lib/Sema/SemaTemplateDeduction.cpp | 222 +- .../clang/lib/Sema/SemaTemplateInstantiate.cpp | 108 +- .../clang/lib/Sema/SemaTemplateInstantiateDecl.cpp | 253 +- .../clang/lib/Sema/SemaTemplateVariadic.cpp | 7 + contrib/llvm-project/clang/lib/Sema/SemaType.cpp | 434 +- .../llvm-project/clang/lib/Sema/TreeTransform.h | 289 +- .../llvm-project/clang/lib/Sema/TypeLocBuilder.h | 3 + .../clang/lib/Serialization/ASTCommon.cpp | 1 - .../clang/lib/Serialization/ASTReader.cpp | 725 +- .../clang/lib/Serialization/ASTReaderDecl.cpp | 352 +- .../clang/lib/Serialization/ASTReaderInternals.h | 4 +- .../clang/lib/Serialization/ASTReaderStmt.cpp | 149 +- .../clang/lib/Serialization/ASTWriter.cpp | 446 +- .../clang/lib/Serialization/ASTWriterDecl.cpp | 606 +- .../clang/lib/Serialization/ASTWriterStmt.cpp | 84 +- .../clang/lib/Serialization/GeneratePCH.cpp | 12 +- .../clang/lib/Serialization/GlobalModuleIndex.cpp | 66 +- .../clang/lib/Serialization/ModuleManager.cpp | 64 +- .../clang/lib/Serialization/MultiOnDiskHashTable.h | 8 +- .../StaticAnalyzer/Checkers/ArrayBoundChecker.cpp | 10 +- .../Checkers/ArrayBoundCheckerV2.cpp | 464 +- .../Checkers/BasicObjCFoundationChecks.cpp | 12 +- .../Checkers/BitwiseShiftChecker.cpp | 370 + .../Checkers/BoolAssignmentChecker.cpp | 4 +- .../Checkers/BuiltinFunctionChecker.cpp | 28 +- .../lib/StaticAnalyzer/Checkers/CStringChecker.cpp | 97 +- .../StaticAnalyzer/Checkers/CXXDeleteChecker.cpp | 248 + .../Checkers/CallAndMessageChecker.cpp | 30 +- .../StaticAnalyzer/Checkers/CastSizeChecker.cpp | 12 +- .../StaticAnalyzer/Checkers/CheckObjCDealloc.cpp | 4 +- .../Checkers/CheckSecuritySyntaxOnly.cpp | 115 +- .../lib/StaticAnalyzer/Checkers/ChrootChecker.cpp | 12 +- .../StaticAnalyzer/Checkers/ConversionChecker.cpp | 5 +- .../StaticAnalyzer/Checkers/DeadStoresChecker.cpp | 2 +- .../lib/StaticAnalyzer/Checkers/DebugCheckers.cpp | 2 +- .../Checkers/DeleteWithNonVirtualDtorChecker.cpp | 155 - .../Checkers/DynamicTypePropagation.cpp | 20 +- .../Checkers/EnumCastOutOfRangeChecker.cpp | 62 +- .../lib/StaticAnalyzer/Checkers/ErrnoModeling.cpp | 12 - .../lib/StaticAnalyzer/Checkers/ErrnoModeling.h | 16 +- .../Checkers/ExprInspectionChecker.cpp | 18 +- .../Checkers/FixedAddressChecker.cpp | 15 +- .../Checkers/FuchsiaHandleChecker.cpp | 15 +- .../Checkers/GCDAntipatternChecker.cpp | 2 +- .../lib/StaticAnalyzer/Checkers/GTestChecker.cpp | 8 +- .../Checkers/GenericTaintChecker.cpp | 27 +- .../Checkers/IteratorRangeChecker.cpp | 2 +- .../Checkers/IvarInvalidationChecker.cpp | 4 +- .../Checkers/LocalizationChecker.cpp | 6 +- .../lib/StaticAnalyzer/Checkers/MallocChecker.cpp | 51 +- .../Checkers/MmapWriteExecChecker.cpp | 6 +- .../lib/StaticAnalyzer/Checkers/NSErrorChecker.cpp | 4 +- .../Checkers/NonNullParamChecker.cpp | 2 +- .../StaticAnalyzer/Checkers/NullabilityChecker.cpp | 14 +- .../StaticAnalyzer/Checkers/ObjCAtSyncChecker.cpp | 14 +- .../Checkers/ObjCMissingSuperCallChecker.cpp | 4 +- .../Checkers/ObjCPropertyChecker.cpp | 2 +- .../Checkers/PointerArithChecker.cpp | 29 +- .../StaticAnalyzer/Checkers/PointerSubChecker.cpp | 14 +- .../RetainCountChecker/RetainCountChecker.h | 1 - .../RetainCountChecker/RetainCountDiagnostics.cpp | 3 - .../Checkers/ReturnPointerRangeChecker.cpp | 13 +- .../StaticAnalyzer/Checkers/ReturnUndefChecker.cpp | 22 +- .../Checkers/SimpleStreamChecker.cpp | 2 +- .../StaticAnalyzer/Checkers/SmartPtrModeling.cpp | 3 +- .../Checkers/StackAddrEscapeChecker.cpp | 37 +- .../Checkers/StdLibraryFunctionsChecker.cpp | 149 +- .../StaticAnalyzer/Checkers/StdVariantChecker.cpp | 298 + .../lib/StaticAnalyzer/Checkers/StreamChecker.cpp | 238 +- .../StaticAnalyzer/Checkers/TaggedUnionModeling.h | 99 + .../Checkers/TestAfterDivZeroChecker.cpp | 4 +- .../StaticAnalyzer/Checkers/UndefBranchChecker.cpp | 6 +- .../Checkers/UndefCapturedBlockVarChecker.cpp | 2 +- .../StaticAnalyzer/Checkers/UndefResultChecker.cpp | 74 +- .../Checkers/UndefinedArraySubscriptChecker.cpp | 2 +- .../Checkers/UndefinedAssignmentChecker.cpp | 3 +- .../UninitializedObjectChecker.cpp | 4 +- .../lib/StaticAnalyzer/Checkers/VLASizeChecker.cpp | 3 +- .../lib/StaticAnalyzer/Checkers/VforkChecker.cpp | 9 +- .../Checkers/WebKit/NoUncountedMembersChecker.cpp | 3 +- .../Checkers/WebKit/PtrTypesSemantics.cpp | 65 +- .../Checkers/WebKit/PtrTypesSemantics.h | 8 +- .../WebKit/RefCntblBaseVirtualDtorChecker.cpp | 49 +- .../Checkers/WebKit/UncountedCallArgsChecker.cpp | 3 +- .../Checkers/WebKit/UncountedLocalVarsChecker.cpp | 1 - .../clang/lib/StaticAnalyzer/Checkers/Yaml.h | 2 +- .../Checkers/cert/InvalidPtrChecker.cpp | 145 +- .../lib/StaticAnalyzer/Core/BasicValueFactory.cpp | 12 +- .../clang/lib/StaticAnalyzer/Core/BugReporter.cpp | 35 +- .../StaticAnalyzer/Core/BugReporterVisitors.cpp | 61 +- .../lib/StaticAnalyzer/Core/BugSuppression.cpp | 169 + .../clang/lib/StaticAnalyzer/Core/CallEvent.cpp | 41 +- .../lib/StaticAnalyzer/Core/CheckerContext.cpp | 5 +- .../StaticAnalyzer/Core/CheckerRegistryData.cpp | 6 +- .../lib/StaticAnalyzer/Core/ConstraintManager.cpp | 2 +- .../clang/lib/StaticAnalyzer/Core/CoreEngine.cpp | 4 +- .../lib/StaticAnalyzer/Core/DynamicExtent.cpp | 72 +- .../clang/lib/StaticAnalyzer/Core/ExprEngine.cpp | 18 +- .../clang/lib/StaticAnalyzer/Core/ExprEngineC.cpp | 3 +- .../lib/StaticAnalyzer/Core/ExprEngineCXX.cpp | 18 +- .../Core/ExprEngineCallAndReturn.cpp | 2 +- .../lib/StaticAnalyzer/Core/ExprEngineObjC.cpp | 35 +- .../lib/StaticAnalyzer/Core/HTMLDiagnostics.cpp | 29 +- .../clang/lib/StaticAnalyzer/Core/LoopWidening.cpp | 6 +- .../lib/StaticAnalyzer/Core/PlistDiagnostics.cpp | 2 +- .../StaticAnalyzer/Core/RangeConstraintManager.cpp | 22 + .../clang/lib/StaticAnalyzer/Core/SValBuilder.cpp | 51 +- .../clang/lib/StaticAnalyzer/Core/SVals.cpp | 87 +- .../Core/SimpleConstraintManager.cpp | 4 +- .../lib/StaticAnalyzer/Core/SimpleSValBuilder.cpp | 144 +- .../clang/lib/StaticAnalyzer/Core/Store.cpp | 2 +- .../StaticAnalyzer/Frontend/AnalysisConsumer.cpp | 62 +- .../StaticAnalyzer/Frontend/AnalyzerHelpFlags.cpp | 10 +- .../StaticAnalyzer/Frontend/CheckerRegistry.cpp | 4 +- .../lib/StaticAnalyzer/Frontend/ModelInjector.cpp | 3 +- .../clang/lib/Support/RISCVVIntrinsicUtils.cpp | 105 +- .../clang/lib/Tooling/ASTDiff/ASTDiff.cpp | 2 +- .../clang/lib/Tooling/ArgumentsAdjusters.cpp | 14 +- .../clang/lib/Tooling/CompilationDatabase.cpp | 2 +- .../clang/lib/Tooling/Core/Replacement.cpp | 5 +- .../DependencyScanningFilesystem.cpp | 4 +- .../DependencyScanningService.cpp | 4 +- .../DependencyScanning/DependencyScanningTool.cpp | 23 +- .../DependencyScanningWorker.cpp | 98 +- .../DependencyScanning/ModuleDepCollector.cpp | 233 +- .../clang/lib/Tooling/DumpTool/ClangSrcLocDump.cpp | 6 +- .../lib/Tooling/Inclusions/HeaderAnalysis.cpp | 11 +- .../lib/Tooling/Inclusions/HeaderIncludes.cpp | 18 +- .../Tooling/Inclusions/Stdlib/StandardLibrary.cpp | 49 +- *** 130716 LINES SKIPPED *** From nobody Sat Apr 6 20:17:24 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VBmqT1f92z5HGJ8; Sat, 6 Apr 2024 20:17:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VBmqT17T3z4JjK; Sat, 6 Apr 2024 20:17:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712434645; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aIO9Je28XwEdjiD9TIQBbWDCLOtK/S0gnXVFueToSdQ=; b=qxeSFgI9osF9oHJPycMQOelFZ75mBroxTk8cUD0ridFE1pGHh/eaVBmR1rZPwvm8H8kPyk z63xjbyDh0BHCegukwDT4yOv0dNtOtqix68cmTR2rRZ2s8dg7jXWbFxJI3GIwufLqXOSzE ksOkgBXeWfWArloiru+qZHqhAzsfxOfYCeNBT/Q5Jzot/1DbsG3Zc2L5Qlb809hmduAZsp C4COaSM6n5PjG4kwPqldKrJRU6keU+KuSSybJDcTf7rBthxUX2Ld/CgWVQLoKr1o5RIhk4 PskZQ6aZXipPQurSKlRkxiC+0Otbr9zQi4vAVjI4RlUVFoLIyOQpRi8pgnKeYg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712434645; a=rsa-sha256; cv=none; b=eratj12C45C/lKaG/hwOvfJK+8AfWhUxaDUnyt1ZtsWtzv1Jmlu/RSB1clUjZ5FE3Jt7Cb I2k99m7T8FsHCabjtkVlmNo7Unk/66aYJx9vX3nPlRBB/02/kvpLA4p8U5Z8T8JkpnHQbj Rb+PLbNo5hT8tWXUOsHNYSuy4PHHLu5xLhawDC53cvUIeotCRWkTR+Nv/wQjN6b9tbsuZ6 s6nSRIWAs7jQ+09M3mJyL3zf8mm53DhVXT5mZKn9RIdnrpkZOSjPg58R9BKnJk1LnSZqmM IcrFaLP7/XdmiUJllPG7uUDJqXbr8MhH4pDySuJqmkUcMVIGuaM0gtPkv0NMTA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712434645; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aIO9Je28XwEdjiD9TIQBbWDCLOtK/S0gnXVFueToSdQ=; b=OpjNKvkIG5ZkuM/UE7mETy2yOxMb0QyoJCXSYIP97Jz/8frLJr6k3VH8S3M2+mJMMk9XG9 /jrUVJuZqs93Tk/4LRmLclnSBSZPPWSUxdViNMVebR+S184FWbgQGh9Vq+HRc3LGTHXIBK VYFto+klL/STlqExreKQzH9EIJiltdmuUYxwL3IC2NDQus7KkroOxtyBps3+HOxw9kvjRV FgMRvr5bi8Mq/+s1Zjw0cT7dbmP2NbbqDcLzDR0mw3T2k9mzMYA9yaMPTEDEGG9umzVyr6 6kLUlwVfpb/0Hqd5Go8HMt+cjBnrfuHRcIqI3XAz7i4WXZZU4S5lV/tQV5XvLw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VBmqT0kJ4zy7s; Sat, 6 Apr 2024 20:17: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 436KHPQR029296; Sat, 6 Apr 2024 20:17:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 436KHOmF029293; Sat, 6 Apr 2024 20:17:24 GMT (envelope-from git) Date: Sat, 6 Apr 2024 20:17:24 GMT Message-Id: <202404062017.436KHOmF029293@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dimitry Andric Subject: git: 3d68ee6cbdb2 - main - Tentatively apply https://github.com/llvm/llvm-project/pull/76175 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3d68ee6cbdb244de9fab1df8a2525d2fa592571e Auto-Submitted: auto-generated The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=3d68ee6cbdb244de9fab1df8a2525d2fa592571e commit 3d68ee6cbdb244de9fab1df8a2525d2fa592571e Author: Dimitry Andric AuthorDate: 2023-12-21 22:30:02 +0000 Commit: Dimitry Andric CommitDate: 2024-04-06 20:12:49 +0000 Tentatively apply https://github.com/llvm/llvm-project/pull/76175 This fixes libsa including compiler-rt builtins. PR: 276104 MFC after: 1 month --- contrib/llvm-project/compiler-rt/lib/builtins/int_types.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/contrib/llvm-project/compiler-rt/lib/builtins/int_types.h b/contrib/llvm-project/compiler-rt/lib/builtins/int_types.h index 18bf0a7f3bf9..0d4ed224fa72 100644 --- a/contrib/llvm-project/compiler-rt/lib/builtins/int_types.h +++ b/contrib/llvm-project/compiler-rt/lib/builtins/int_types.h @@ -139,7 +139,6 @@ typedef union { udwords u; double f; } double_bits; -#endif typedef struct { #if _YUGA_LITTLE_ENDIAN @@ -220,7 +219,6 @@ typedef union { #define CRT_HAS_TF_MODE #endif -#if CRT_HAS_FLOATING_POINT #if __STDC_VERSION__ >= 199901L typedef float _Complex Fcomplex; typedef double _Complex Dcomplex; From nobody Sat Apr 6 20:17:31 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VBmqh3MV2z5HGvV; Sat, 6 Apr 2024 20:17:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VBmqh1bPPz4JqG; Sat, 6 Apr 2024 20:17:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712434656; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YtwHMUf09eSCMfAhI7GhBpay5jFIA4dli1xz7u9EcQk=; b=yUrRetAtnKRMclocUTm/QM/juFAcJQeR/sZ8avvCJWup5W8DHgtD8eTGRjrpSRwUyw6SRe ckz2blI5iTwjXVbyTF6WLVXWLAHC6DVyLO7laZCGO9/frYosQjTZFYb4YROwX3ujrakBc5 g6htNbJVZNY1GG3iEu0/UkUVKAJx9FacMFASL0mJ0o41D4NDlPX7PZAqXqb4gOjHRGlPH7 Cc/Q/DFGAvzurvWmUzB8pCRqaT9IL6qSF0EOiqkCMVs5pMtt3wf/iYhHbEWWIbmcZeFOvi p61BgvYvXJSXg7QqvJsFgv+KGWvbdX4aUhIHGK4FzJTWIffXl1Zy+KJWae53vw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712434656; a=rsa-sha256; cv=none; b=NL/UggApFJ9f5O5a3cuESTAM34Qt3Vj1YaQXkydGoqcIXriJvP6RTite67RXxyU+CD3+fr laupelJDelKclLgVahStjBWUNqRKc/K9qvIzU3zP57fT9REarwEjK2RvFQoBp71uZpTJ9K w2t8uMb6HYb57ro9ELa3/9nyikF2SBQWzW3MN12OJ4/1xgKJ9N188cHSuFKxnxVF4vgHUV //lVsM4YDXYkku7rrTp3Eh8Mayz0Sa/Yj3VCBdN3eQ48MYPC5hCeGCNjwwAQcaMnNbnhn6 5w/qbInbAe1clY3/yWqzgqUpEbcmLiaPx/wkwAuSvu+nMnaII3Qg5wuKmJ440Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712434656; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YtwHMUf09eSCMfAhI7GhBpay5jFIA4dli1xz7u9EcQk=; b=pOSLt/m95GcOFXiRmWBgeM5oLN0RDFqg0sR1aXmMZAP92GUE6uqpGRpTDGrNil6c5iQMuD Dea80/pr2mOcaZpQnONJ9cA9DlL0UOTjRqMy9mckKGbkaQ1tJPDklb3pXkI6tQHYnLIqpm wz7n9FSfhuvHg6gZkaqm+1Mef9p1geqsmYgm+/GRrRc6wblpYeUDjT7CAKXN5GkP/Dlq8e SsXxTvel1whu+Bc43eAAiys1DfRW2Ep7h7IwAMX5Zm/wFwinfc50hMr09Mz2HZ62M35BXI ENsj5uKzZlGj/HvYhDROpX8KlrdGdmm/zvkYvVPN8DZ7AjDAX3dvdjZFY2x9Lg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VBmqh0qr6zxcp; Sat, 6 Apr 2024 20:17:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 436KHa1K029369; Sat, 6 Apr 2024 20:17:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 436KHVEQ029355; Sat, 6 Apr 2024 20:17:31 GMT (envelope-from git) Date: Sat, 6 Apr 2024 20:17:31 GMT Message-Id: <202404062017.436KHVEQ029355@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dimitry Andric Subject: git: cb14a3fe5122 - main - Merge llvm-project main llvmorg-18-init-15692-g007ed0dccd6a List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: cb14a3fe5122c879eae1fb480ed7ce82a699ddb6 Auto-Submitted: auto-generated The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=cb14a3fe5122c879eae1fb480ed7ce82a699ddb6 commit cb14a3fe5122c879eae1fb480ed7ce82a699ddb6 Merge: 3d68ee6cbdb2 99aabd70801b Author: Dimitry Andric AuthorDate: 2023-12-25 17:35:41 +0000 Commit: Dimitry Andric CommitDate: 2024-04-06 20:13:06 +0000 Merge llvm-project main llvmorg-18-init-15692-g007ed0dccd6a This updates llvm, clang, compiler-rt, libc++, libunwind, lld, lldb and openmp to llvm-project main llvmorg-18-init-15692-g007ed0dccd6a. PR: 276104 MFC after: 1 month .../llvm-project/clang/include/clang/AST/Decl.h | 27 +- .../clang/include/clang/AST/DeclBase.h | 10 - .../clang/include/clang/AST/RecursiveASTVisitor.h | 7 +- .../Analysis/FlowSensitive/DataflowEnvironment.h | 80 +- .../clang/Analysis/FlowSensitive/RecordOps.h | 12 +- .../include/clang/Analysis/FlowSensitive/Value.h | 40 +- .../llvm-project/clang/include/clang/Basic/Attr.td | 18 - .../clang/include/clang/Basic/AttrDocs.td | 66 - .../clang/include/clang/Basic/DiagnosticGroups.td | 6 +- .../include/clang/Basic/DiagnosticParseKinds.td | 4 +- .../include/clang/Basic/DiagnosticSemaKinds.td | 28 +- .../clang/include/clang/Basic/LangOptions.def | 1 + .../clang/include/clang/Basic/OpenACCKinds.h | 24 + .../clang/include/clang/Basic/PlistSupport.h | 3 +- .../clang/include/clang/Basic/TargetInfo.h | 1 + .../clang/include/clang/Basic/Version.h | 3 + .../clang/include/clang/Basic/arm_sme.td | 317 + .../clang/include/clang/Basic/arm_sve.td | 1399 +-- .../clang/include/clang/Basic/riscv_vector.td | 18 +- .../clang/include/clang/Driver/Options.td | 5 +- .../include/clang/Interpreter/CodeCompletion.h | 25 +- .../clang/include/clang/Interpreter/Interpreter.h | 1 + .../llvm-project/clang/include/clang/Sema/Sema.h | 7 +- .../clang/include/clang/Sema/TypoCorrection.h | 12 +- .../clang/include/clang/Serialization/ASTReader.h | 2 + .../clang/include/clang/Serialization/ASTWriter.h | 88 +- .../include/clang/Support/RISCVVIntrinsicUtils.h | 7 +- .../clang/lib/APINotes/APINotesManager.cpp | 2 +- contrib/llvm-project/clang/lib/AST/ASTImporter.cpp | 48 +- .../clang/lib/AST/ASTStructuralEquivalence.cpp | 12 + contrib/llvm-project/clang/lib/AST/Decl.cpp | 41 +- contrib/llvm-project/clang/lib/AST/DeclBase.cpp | 74 +- contrib/llvm-project/clang/lib/AST/Expr.cpp | 83 +- .../Analysis/FlowSensitive/DataflowEnvironment.cpp | 90 +- .../Models/UncheckedOptionalAccessModel.cpp | 31 +- .../clang/lib/Analysis/FlowSensitive/RecordOps.cpp | 33 +- .../clang/lib/Analysis/FlowSensitive/Transfer.cpp | 25 +- .../FlowSensitive/TypeErasedDataflowAnalysis.cpp | 2 +- .../clang/lib/Basic/Targets/AArch64.cpp | 1 + .../llvm-project/clang/lib/Basic/Targets/ARM.cpp | 1 + .../llvm-project/clang/lib/Basic/Targets/RISCV.cpp | 4 + .../llvm-project/clang/lib/Basic/Targets/RISCV.h | 1 + contrib/llvm-project/clang/lib/Basic/Version.cpp | 18 +- contrib/llvm-project/clang/lib/Basic/Warnings.cpp | 3 +- .../llvm-project/clang/lib/CodeGen/BackendUtil.cpp | 7 +- .../llvm-project/clang/lib/CodeGen/CGBuiltin.cpp | 209 +- contrib/llvm-project/clang/lib/CodeGen/CGExpr.cpp | 129 +- .../clang/lib/CodeGen/CGExprScalar.cpp | 26 +- .../clang/lib/CodeGen/CGHLSLRuntime.cpp | 63 +- .../llvm-project/clang/lib/CodeGen/CGHLSLRuntime.h | 2 +- .../clang/lib/CodeGen/CGOpenMPRuntime.cpp | 148 +- .../clang/lib/CodeGen/CodeGenFunction.h | 16 - .../clang/lib/CodeGen/CodeGenModule.cpp | 10 +- .../clang/lib/CodeGen/Targets/AArch64.cpp | 2 + .../clang/lib/Driver/ToolChains/AIX.cpp | 6 + .../clang/lib/Driver/ToolChains/Arch/RISCV.cpp | 4 + .../clang/lib/Driver/ToolChains/Clang.cpp | 15 +- .../clang/lib/Driver/ToolChains/CommonArgs.cpp | 59 +- .../clang/lib/Driver/ToolChains/Gnu.cpp | 127 +- .../clang/lib/Format/ContinuationIndenter.cpp | 20 +- contrib/llvm-project/clang/lib/Format/Format.cpp | 8 +- .../clang/lib/Format/MatchFilePath.cpp | 122 + .../llvm-project/clang/lib/Format/MatchFilePath.h | 22 + .../clang/lib/Format/TokenAnnotator.cpp | 3 +- .../clang/lib/Format/UnwrappedLineParser.cpp | 6 +- contrib/llvm-project/clang/lib/Headers/adcintrin.h | 160 + contrib/llvm-project/clang/lib/Headers/adxintrin.h | 143 +- contrib/llvm-project/clang/lib/Headers/immintrin.h | 8 +- .../clang/lib/Headers/riscv_bitmanip.h | 24 +- .../clang/lib/Interpreter/CodeCompletion.cpp | 223 +- .../clang/lib/Interpreter/Interpreter.cpp | 4 + .../llvm-project/clang/lib/Lex/PPDirectives.cpp | 22 +- .../llvm-project/clang/lib/Parse/ParseOpenACC.cpp | 92 +- .../llvm-project/clang/lib/Sema/SemaChecking.cpp | 77 +- contrib/llvm-project/clang/lib/Sema/SemaDecl.cpp | 45 +- .../llvm-project/clang/lib/Sema/SemaDeclAttr.cpp | 90 - contrib/llvm-project/clang/lib/Sema/SemaExpr.cpp | 16 +- .../llvm-project/clang/lib/Sema/SemaExprCXX.cpp | 28 +- .../llvm-project/clang/lib/Sema/SemaExprMember.cpp | 4 +- contrib/llvm-project/clang/lib/Sema/SemaInit.cpp | 214 +- contrib/llvm-project/clang/lib/Sema/SemaOpenMP.cpp | 13 + .../clang/lib/Sema/SemaRISCVVectorLookup.cpp | 19 +- contrib/llvm-project/clang/lib/Sema/SemaStmt.cpp | 7 +- .../llvm-project/clang/lib/Sema/SemaTemplate.cpp | 28 +- .../clang/lib/Serialization/ASTReaderDecl.cpp | 52 +- .../clang/lib/Serialization/ASTReaderStmt.cpp | 405 +- .../clang/lib/Serialization/ASTWriter.cpp | 15 +- .../clang/lib/Serialization/ASTWriterDecl.cpp | 574 +- .../clang/lib/Serialization/ASTWriterStmt.cpp | 241 +- .../lib/StaticAnalyzer/Checkers/StreamChecker.cpp | 86 + .../clang/lib/Support/RISCVVIntrinsicUtils.cpp | 2 +- .../clang/tools/clang-repl/ClangRepl.cpp | 24 +- .../clang/utils/TableGen/NeonEmitter.cpp | 28 + .../clang/utils/TableGen/RISCVVEmitter.cpp | 40 +- .../clang/utils/TableGen/SveEmitter.cpp | 87 + .../llvm-project/clang/utils/TableGen/TableGen.cpp | 18 + .../clang/utils/TableGen/TableGenBackends.h | 3 + .../compiler-rt/lib/asan/asan_posix.cpp | 51 +- .../compiler-rt/lib/asan/asan_rtl_x86_64.S | 10 + .../compiler-rt/lib/builtins/cpu_model/aarch64.c | 151 + .../lib/builtins/cpu_model/aarch64/fmv/android.inc | 36 + .../lib/builtins/cpu_model/aarch64/fmv/apple.inc | 69 + .../lib/builtins/cpu_model/aarch64/fmv/freebsd.inc | 27 + .../lib/builtins/cpu_model/aarch64/fmv/fuchsia.inc | 51 + .../lib/builtins/cpu_model/aarch64/fmv/mrs.inc | 196 + .../lib/builtins/cpu_model/aarch64/fmv/sysauxv.inc | 21 + .../cpu_model/aarch64/fmv/unimplemented.inc | 8 + .../lib/builtins/cpu_model/aarch64/hwcap.inc | 180 + .../cpu_model/aarch64/lse_atomics/android.inc | 28 + .../cpu_model/aarch64/lse_atomics/freebsd.inc | 5 + .../cpu_model/aarch64/lse_atomics/fuchsia.inc | 12 + .../cpu_model/aarch64/lse_atomics/sysauxv.inc | 6 + .../compiler-rt/lib/builtins/cpu_model/cpu_model.h | 41 + .../lib/builtins/{cpu_model.c => cpu_model/x86.c} | 692 +- .../lib/dfsan/dfsan_chained_origin_depot.cpp | 6 + .../lib/dfsan/dfsan_chained_origin_depot.h | 3 + .../compiler-rt/lib/dfsan/dfsan_custom.cpp | 12 +- .../compiler-rt/lib/hwasan/hwasan_linux.cpp | 46 +- .../compiler-rt/lib/hwasan/hwasan_report.cpp | 68 +- .../compiler-rt/lib/lsan/lsan_posix.cpp | 33 +- .../lib/msan/msan_chained_origin_depot.cpp | 8 +- .../lib/msan/msan_chained_origin_depot.h | 4 +- .../compiler-rt/lib/msan/msan_linux.cpp | 32 +- .../compiler-rt/lib/orc/macho_platform.cpp | 4 + .../lib/profile/InstrProfilingPlatformWindows.c | 10 + .../sanitizer_chained_origin_depot.cpp | 6 +- .../sanitizer_chained_origin_depot.h | 4 +- .../lib/sanitizer_common/sanitizer_stack_store.cpp | 9 +- .../lib/sanitizer_common/sanitizer_stackdepot.cpp | 8 +- .../lib/sanitizer_common/sanitizer_stackdepot.h | 4 +- .../sanitizer_common/sanitizer_stackdepotbase.h | 9 +- .../sanitizer_common/sanitizer_suppressions.cpp | 5 +- .../sanitizer_symbolizer_posix_libcdep.cpp | 27 +- .../symbolizer/sanitizer_symbolize.cpp | 6 +- .../compiler-rt/lib/scudo/standalone/combined.h | 13 - .../lib/tsan/rtl/tsan_interceptors_posix.cpp | 19 + .../libcxx/include/__algorithm/binary_search.h | 20 +- .../libcxx/include/__algorithm/comp_ref_type.h | 66 +- .../libcxx/include/__algorithm/copy_backward.h | 16 +- .../libcxx/include/__algorithm/copy_if.h | 23 +- .../libcxx/include/__algorithm/copy_move_common.h | 25 +- .../libcxx/include/__algorithm/copy_n.h | 59 +- .../libcxx/include/__algorithm/equal.h | 29 +- .../libcxx/include/__algorithm/equal_range.h | 11 +- .../llvm-project/libcxx/include/__algorithm/fill.h | 26 +- .../libcxx/include/__algorithm/fill_n.h | 20 +- .../llvm-project/libcxx/include/__algorithm/find.h | 19 + .../libcxx/include/__algorithm/find_end.h | 92 +- .../libcxx/include/__algorithm/find_first_of.h | 21 +- .../llvm-project/libcxx/include/__algorithm/fold.h | 125 + .../libcxx/include/__algorithm/for_each_n.h | 5 +- .../libcxx/include/__algorithm/generate.h | 10 +- .../libcxx/include/__algorithm/generate_n.h | 16 +- .../libcxx/include/__algorithm/half_positive.h | 14 +- .../libcxx/include/__algorithm/in_found_result.h | 2 +- .../libcxx/include/__algorithm/in_fun_result.h | 2 +- .../libcxx/include/__algorithm/in_in_out_result.h | 14 +- .../libcxx/include/__algorithm/in_in_result.h | 6 +- .../libcxx/include/__algorithm/in_out_out_result.h | 14 +- .../libcxx/include/__algorithm/in_out_result.h | 8 +- .../libcxx/include/__algorithm/includes.h | 31 +- .../libcxx/include/__algorithm/inplace_merge.h | 304 +- .../libcxx/include/__algorithm/is_heap.h | 20 +- .../libcxx/include/__algorithm/is_heap_until.h | 56 +- .../libcxx/include/__algorithm/is_partitioned.h | 21 +- .../libcxx/include/__algorithm/is_permutation.h | 177 +- .../libcxx/include/__algorithm/is_sorted.h | 20 +- .../libcxx/include/__algorithm/is_sorted_until.h | 33 +- .../libcxx/include/__algorithm/iter_swap.h | 3 +- .../include/__algorithm/iterator_operations.h | 67 +- .../include/__algorithm/lexicographical_compare.h | 49 +- .../libcxx/include/__algorithm/lower_bound.h | 15 +- .../libcxx/include/__algorithm/make_heap.h | 16 +- .../libcxx/include/__algorithm/make_projected.h | 47 +- .../llvm-project/libcxx/include/__algorithm/max.h | 39 +- .../libcxx/include/__algorithm/max_element.h | 33 +- .../libcxx/include/__algorithm/merge.h | 65 +- .../llvm-project/libcxx/include/__algorithm/min.h | 39 +- .../libcxx/include/__algorithm/min_element.h | 23 +- .../libcxx/include/__algorithm/min_max_result.h | 2 +- .../libcxx/include/__algorithm/minmax.h | 48 +- .../libcxx/include/__algorithm/minmax_element.h | 31 +- .../libcxx/include/__algorithm/mismatch.h | 25 +- .../llvm-project/libcxx/include/__algorithm/move.h | 3 +- .../libcxx/include/__algorithm/move_backward.h | 6 +- .../libcxx/include/__algorithm/next_permutation.h | 61 +- .../libcxx/include/__algorithm/nth_element.h | 386 +- .../libcxx/include/__algorithm/partial_sort.h | 39 +- .../libcxx/include/__algorithm/partial_sort_copy.h | 94 +- .../libcxx/include/__algorithm/partition.h | 84 +- .../libcxx/include/__algorithm/partition_copy.h | 36 +- .../libcxx/include/__algorithm/partition_point.h | 34 +- .../libcxx/include/__algorithm/pop_heap.h | 18 +- .../libcxx/include/__algorithm/prev_permutation.h | 64 +- .../libcxx/include/__algorithm/push_heap.h | 24 +- .../libcxx/include/__algorithm/ranges_contains.h | 61 + .../libcxx/include/__algorithm/ranges_max.h | 5 +- .../libcxx/include/__algorithm/ranges_min.h | 5 +- .../libcxx/include/__algorithm/ranges_minmax.h | 5 +- .../libcxx/include/__algorithm/remove.h | 26 +- .../libcxx/include/__algorithm/remove_copy.h | 20 +- .../libcxx/include/__algorithm/remove_copy_if.h | 20 +- .../libcxx/include/__algorithm/remove_if.h | 26 +- .../libcxx/include/__algorithm/replace.h | 12 +- .../libcxx/include/__algorithm/replace_copy.h | 23 +- .../libcxx/include/__algorithm/replace_copy_if.h | 23 +- .../libcxx/include/__algorithm/replace_if.h | 12 +- .../libcxx/include/__algorithm/reverse.h | 40 +- .../libcxx/include/__algorithm/reverse_copy.h | 12 +- .../libcxx/include/__algorithm/rotate.h | 264 +- .../libcxx/include/__algorithm/rotate_copy.h | 8 +- .../libcxx/include/__algorithm/sample.h | 83 +- .../libcxx/include/__algorithm/search.h | 123 +- .../libcxx/include/__algorithm/search_n.h | 96 +- .../libcxx/include/__algorithm/set_difference.h | 2 +- .../libcxx/include/__algorithm/shift_left.h | 43 +- .../libcxx/include/__algorithm/shift_right.h | 123 +- .../libcxx/include/__algorithm/shuffle.h | 127 +- .../libcxx/include/__algorithm/sift_down.h | 141 +- .../llvm-project/libcxx/include/__algorithm/sort.h | 245 +- .../libcxx/include/__algorithm/sort_heap.h | 16 +- .../libcxx/include/__algorithm/stable_partition.h | 487 +- .../libcxx/include/__algorithm/stable_sort.h | 332 +- .../libcxx/include/__algorithm/swap_ranges.h | 9 +- .../libcxx/include/__algorithm/transform.h | 29 +- .../uniform_random_bit_generator_adaptor.h | 14 +- .../libcxx/include/__algorithm/unwrap_iter.h | 10 +- .../llvm-project/libcxx/include/__atomic/atomic.h | 812 +- .../libcxx/include/__atomic/atomic_base.h | 321 +- .../libcxx/include/__atomic/atomic_flag.h | 246 +- .../libcxx/include/__atomic/atomic_lock_free.h | 52 +- .../libcxx/include/__atomic/atomic_sync.h | 90 +- .../libcxx/include/__atomic/check_memory_order.h | 22 +- .../libcxx/include/__atomic/contention_t.h | 4 +- .../libcxx/include/__atomic/cxx_atomic_impl.h | 560 +- .../llvm-project/libcxx/include/__atomic/fence.h | 16 +- .../libcxx/include/__atomic/kill_dependency.h | 6 +- .../libcxx/include/__atomic/memory_order.h | 11 +- contrib/llvm-project/libcxx/include/__availability | 82 +- .../llvm-project/libcxx/include/__bit/bit_cast.h | 3 +- .../llvm-project/libcxx/include/__bit/bit_ceil.h | 2 +- .../llvm-project/libcxx/include/__bit/byteswap.h | 11 +- contrib/llvm-project/libcxx/include/__bit/countl.h | 84 +- contrib/llvm-project/libcxx/include/__bit/countr.h | 17 +- contrib/llvm-project/libcxx/include/__bit/endian.h | 2 +- .../llvm-project/libcxx/include/__bit/popcount.h | 15 +- .../libcxx/include/__chrono/calendar.h | 12 +- .../libcxx/include/__chrono/convert_to_timespec.h | 15 +- contrib/llvm-project/libcxx/include/__chrono/day.h | 91 +- .../libcxx/include/__chrono/duration.h | 693 +- .../libcxx/include/__chrono/file_clock.h | 24 +- .../libcxx/include/__chrono/formatter.h | 63 +- .../libcxx/include/__chrono/hh_mm_ss.h | 117 +- .../include/__chrono/high_resolution_clock.h | 3 +- .../libcxx/include/__chrono/literals.h | 24 +- .../llvm-project/libcxx/include/__chrono/month.h | 94 +- .../libcxx/include/__chrono/month_weekday.h | 104 +- .../libcxx/include/__chrono/monthday.h | 134 +- .../libcxx/include/__chrono/steady_clock.h | 18 +- .../libcxx/include/__chrono/system_clock.h | 24 +- .../libcxx/include/__chrono/time_point.h | 186 +- .../llvm-project/libcxx/include/__chrono/weekday.h | 201 +- .../llvm-project/libcxx/include/__chrono/year.h | 104 +- .../libcxx/include/__chrono/year_month.h | 102 +- .../libcxx/include/__chrono/year_month_day.h | 460 +- .../libcxx/include/__chrono/year_month_weekday.h | 369 +- .../include/__compare/common_comparison_category.h | 27 +- .../__compare/compare_partial_order_fallback.h | 68 +- .../__compare/compare_strong_order_fallback.h | 62 +- .../libcxx/include/__compare/compare_three_way.h | 19 +- .../include/__compare/compare_three_way_result.h | 23 +- .../__compare/compare_weak_order_fallback.h | 62 +- .../libcxx/include/__compare/ordering.h | 164 +- .../libcxx/include/__compare/partial_order.h | 63 +- .../libcxx/include/__compare/strong_order.h | 173 +- .../include/__compare/three_way_comparable.h | 36 +- .../libcxx/include/__compare/weak_order.h | 115 +- contrib/llvm-project/libcxx/include/__config | 4 +- .../libcxx/include/__coroutine/coroutine_handle.h | 257 +- .../libcxx/include/__coroutine/coroutine_traits.h | 9 +- .../include/__coroutine/noop_coroutine_handle.h | 103 +- .../include/__coroutine/trivial_awaitables.h | 18 +- .../libcxx/include/__debug_utils/randomize_range.h | 3 +- .../libcxx/include/__expected/expected.h | 205 +- .../libcxx/include/__filesystem/copy_options.h | 50 +- .../libcxx/include/__filesystem/directory_entry.h | 251 +- .../include/__filesystem/directory_iterator.h | 73 +- .../include/__filesystem/directory_options.h | 44 +- .../libcxx/include/__filesystem/file_status.h | 28 +- .../libcxx/include/__filesystem/file_type.h | 14 +- .../libcxx/include/__filesystem/operations.h | 224 +- .../libcxx/include/__filesystem/path.h | 652 +- .../libcxx/include/__filesystem/path_iterator.h | 50 +- .../libcxx/include/__filesystem/perm_options.h | 39 +- .../libcxx/include/__filesystem/perms.h | 56 +- .../__filesystem/recursive_directory_iterator.h | 85 +- .../libcxx/include/__filesystem/u8path.h | 48 +- .../llvm-project/libcxx/include/__format/buffer.h | 52 +- .../libcxx/include/__format/concepts.h | 2 +- .../libcxx/include/__format/format_arg.h | 32 +- .../libcxx/include/__format/format_arg_store.h | 10 +- .../libcxx/include/__format/format_args.h | 5 +- .../libcxx/include/__format/format_context.h | 72 +- .../libcxx/include/__format/format_error.h | 17 +- .../libcxx/include/__format/format_functions.h | 184 +- .../libcxx/include/__format/format_parse_context.h | 30 +- .../libcxx/include/__format/format_string.h | 20 +- .../libcxx/include/__format/formatter.h | 4 +- .../include/__format/formatter_floating_point.h | 92 +- .../libcxx/include/__format/formatter_integer.h | 37 +- .../libcxx/include/__format/formatter_integral.h | 77 +- .../libcxx/include/__format/formatter_output.h | 58 +- .../libcxx/include/__format/formatter_pointer.h | 9 +- .../libcxx/include/__format/formatter_string.h | 18 +- .../include/__format/parser_std_format_spec.h | 79 +- .../llvm-project/libcxx/include/__format/unicode.h | 10 +- .../libcxx/include/__format/write_escaped.h | 19 +- .../libcxx/include/__functional/binary_function.h | 16 +- .../libcxx/include/__functional/binary_negate.h | 25 +- .../libcxx/include/__functional/bind.h | 385 +- .../libcxx/include/__functional/bind_back.h | 34 +- .../libcxx/include/__functional/bind_front.h | 21 +- .../libcxx/include/__functional/binder1st.h | 35 +- .../libcxx/include/__functional/binder2nd.h | 35 +- .../include/__functional/boyer_moore_searcher.h | 128 +- .../libcxx/include/__functional/compose.h | 25 +- .../libcxx/include/__functional/default_searcher.h | 31 +- .../libcxx/include/__functional/function.h | 1645 ++-- .../libcxx/include/__functional/hash.h | 682 +- .../libcxx/include/__functional/identity.h | 20 +- .../libcxx/include/__functional/invoke.h | 30 +- .../libcxx/include/__functional/is_transparent.h | 3 +- .../libcxx/include/__functional/mem_fn.h | 36 +- .../libcxx/include/__functional/mem_fun_ref.h | 183 +- .../libcxx/include/__functional/not_fn.h | 25 +- .../libcxx/include/__functional/operations.h | 540 +- .../libcxx/include/__functional/perfect_forward.h | 48 +- .../__functional/pointer_to_binary_function.h | 20 +- .../__functional/pointer_to_unary_function.h | 20 +- .../include/__functional/ranges_operations.h | 24 +- .../include/__functional/reference_wrapper.h | 97 +- .../libcxx/include/__functional/unary_function.h | 12 +- .../libcxx/include/__functional/unary_negate.h | 25 +- .../libcxx/include/__functional/weak_result_type.h | 225 +- contrib/llvm-project/libcxx/include/__fwd/get.h | 48 +- contrib/llvm-project/libcxx/include/__fwd/span.h | 3 +- .../libcxx/include/__fwd/string_view.h | 8 +- .../llvm-project/libcxx/include/__fwd/subrange.h | 2 +- contrib/llvm-project/libcxx/include/__hash_table | 3216 +++---- contrib/llvm-project/libcxx/include/__ios/fpos.h | 9 +- .../libcxx/include/__iterator/access.h | 67 +- .../libcxx/include/__iterator/advance.h | 57 +- .../include/__iterator/back_insert_iterator.h | 53 +- .../libcxx/include/__iterator/common_iterator.h | 211 +- .../libcxx/include/__iterator/concepts.h | 338 +- .../libcxx/include/__iterator/counted_iterator.h | 200 +- .../llvm-project/libcxx/include/__iterator/data.h | 32 +- .../libcxx/include/__iterator/default_sentinel.h | 2 +- .../libcxx/include/__iterator/distance.h | 49 +- .../llvm-project/libcxx/include/__iterator/empty.h | 19 +- .../libcxx/include/__iterator/erase_if_container.h | 4 +- .../include/__iterator/front_insert_iterator.h | 51 +- .../include/__iterator/incrementable_traits.h | 33 +- .../include/__iterator/indirectly_comparable.h | 3 +- .../libcxx/include/__iterator/insert_iterator.h | 57 +- .../libcxx/include/__iterator/istream_iterator.h | 95 +- .../include/__iterator/istreambuf_iterator.h | 131 +- .../libcxx/include/__iterator/iter_move.h | 68 +- .../libcxx/include/__iterator/iter_swap.h | 100 +- .../libcxx/include/__iterator/iterator.h | 16 +- .../libcxx/include/__iterator/iterator_traits.h | 397 +- .../libcxx/include/__iterator/mergeable.h | 15 +- .../libcxx/include/__iterator/move_iterator.h | 419 +- .../libcxx/include/__iterator/move_sentinel.h | 21 +- .../llvm-project/libcxx/include/__iterator/next.h | 13 +- .../libcxx/include/__iterator/ostream_iterator.h | 55 +- .../include/__iterator/ostreambuf_iterator.h | 61 +- .../libcxx/include/__iterator/permutable.h | 3 +- .../llvm-project/libcxx/include/__iterator/prev.h | 13 +- .../libcxx/include/__iterator/readable_traits.h | 46 +- .../libcxx/include/__iterator/reverse_access.h | 60 +- .../libcxx/include/__iterator/reverse_iterator.h | 366 +- .../llvm-project/libcxx/include/__iterator/size.h | 32 +- .../libcxx/include/__iterator/sortable.h | 4 +- .../include/__iterator/unreachable_sentinel.h | 5 +- .../libcxx/include/__iterator/wrap_iter.h | 258 +- contrib/llvm-project/libcxx/include/__locale | 2434 +++-- .../locale_base_api/bsd_locale_defaults.h | 28 +- .../locale_base_api/bsd_locale_fallbacks.h | 144 +- .../__locale_dir/locale_base_api/locale_guard.h | 67 +- contrib/llvm-project/libcxx/include/__mbstate_t.h | 16 +- .../libcxx/include/__memory/addressof.h | 35 +- .../libcxx/include/__memory/aligned_alloc.h | 42 +- .../libcxx/include/__memory/allocate_at_least.h | 10 +- .../libcxx/include/__memory/allocation_guard.h | 98 +- .../libcxx/include/__memory/allocator.h | 331 +- .../libcxx/include/__memory/allocator_arg_t.h | 45 +- .../libcxx/include/__memory/allocator_destructor.h | 24 +- .../libcxx/include/__memory/allocator_traits.h | 379 +- .../libcxx/include/__memory/assume_aligned.h | 3 +- .../libcxx/include/__memory/auto_ptr.h | 94 +- .../include/__memory/builtin_new_allocator.h | 23 +- .../libcxx/include/__memory/compressed_pair.h | 81 +- .../libcxx/include/__memory/concepts.h | 15 +- .../libcxx/include/__memory/construct_at.h | 65 +- .../libcxx/include/__memory/destruct_n.h | 61 +- .../libcxx/include/__memory/pointer_traits.h | 174 +- .../libcxx/include/__memory/ranges_construct_at.h | 28 +- .../__memory/ranges_uninitialized_algorithms.h | 89 +- .../libcxx/include/__memory/raw_storage_iterator.h | 66 +- .../libcxx/include/__memory/shared_ptr.h | 2495 ++--- .../libcxx/include/__memory/temp_value.h | 32 +- .../libcxx/include/__memory/temporary_buffer.h | 78 +- .../include/__memory/uninitialized_algorithms.h | 461 +- .../libcxx/include/__memory/unique_ptr.h | 373 +- .../libcxx/include/__memory/uses_allocator.h | 27 +- contrib/llvm-project/libcxx/include/__node_handle | 224 +- .../libcxx/include/__numeric/accumulate.h | 28 +- .../libcxx/include/__numeric/adjacent_difference.h | 57 +- .../libcxx/include/__numeric/exclusive_scan.h | 2 +- .../libcxx/include/__numeric/gcd_lcm.h | 82 +- .../libcxx/include/__numeric/inclusive_scan.h | 9 +- .../libcxx/include/__numeric/inner_product.h | 34 +- .../llvm-project/libcxx/include/__numeric/iota.h | 10 +- .../libcxx/include/__numeric/midpoint.h | 61 +- .../libcxx/include/__numeric/partial_sum.h | 53 +- .../llvm-project/libcxx/include/__numeric/reduce.h | 8 +- .../include/__numeric/transform_exclusive_scan.h | 33 +- .../include/__numeric/transform_inclusive_scan.h | 42 +- .../libcxx/include/__numeric/transform_reduce.h | 24 +- .../include/__random/bernoulli_distribution.h | 160 +- .../include/__random/binomial_distribution.h | 291 +- .../libcxx/include/__random/cauchy_distribution.h | 194 +- .../include/__random/chi_squared_distribution.h | 161 +- .../libcxx/include/__random/clamp_to_integral.h | 22 +- .../libcxx/include/__random/discard_block_engine.h | 256 +- .../include/__random/discrete_distribution.h | 340 +- .../include/__random/exponential_distribution.h | 171 +- .../include/__random/extreme_value_distribution.h | 196 +- .../include/__random/fisher_f_distribution.h | 194 +- .../libcxx/include/__random/gamma_distribution.h | 280 +- .../libcxx/include/__random/generate_canonical.h | 28 +- .../include/__random/geometric_distribution.h | 157 +- .../include/__random/independent_bits_engine.h | 331 +- .../libcxx/include/__random/is_seed_sequence.h | 8 +- .../libcxx/include/__random/is_valid.h | 53 +- .../include/__random/linear_congruential_engine.h | 491 +- .../llvm-project/libcxx/include/__random/log2.h | 39 +- .../include/__random/lognormal_distribution.h | 189 +- .../include/__random/mersenne_twister_engine.h | 1224 ++- .../__random/negative_binomial_distribution.h | 232 +- .../libcxx/include/__random/normal_distribution.h | 278 +- .../__random/piecewise_constant_distribution.h | 508 +- .../__random/piecewise_linear_distribution.h | 537 +- .../libcxx/include/__random/poisson_distribution.h | 392 +- .../libcxx/include/__random/random_device.h | 87 +- .../llvm-project/libcxx/include/__random/ranlux.h | 2 +- .../libcxx/include/__random/seed_seq.h | 231 +- .../libcxx/include/__random/shuffle_order_engine.h | 355 +- .../include/__random/student_t_distribution.h | 169 +- .../include/__random/subtract_with_carry_engine.h | 468 +- .../include/__random/uniform_int_distribution.h | 403 +- .../__random/uniform_random_bit_generator.h | 14 +- .../include/__random/uniform_real_distribution.h | 194 +- .../libcxx/include/__random/weibull_distribution.h | 185 +- .../llvm-project/libcxx/include/__ranges/access.h | 237 +- contrib/llvm-project/libcxx/include/__ranges/all.h | 55 +- .../libcxx/include/__ranges/common_view.h | 83 +- .../libcxx/include/__ranges/concepts.h | 126 +- .../llvm-project/libcxx/include/__ranges/counted.h | 62 +- .../llvm-project/libcxx/include/__ranges/data.h | 91 +- .../libcxx/include/__ranges/drop_view.h | 303 +- .../llvm-project/libcxx/include/__ranges/empty.h | 71 +- .../libcxx/include/__ranges/empty_view.h | 40 +- .../libcxx/include/__ranges/enable_view.h | 11 +- .../libcxx/include/__ranges/filter_view.h | 381 +- .../libcxx/include/__ranges/iota_view.h | 569 +- .../libcxx/include/__ranges/istream_view.h | 3 +- .../libcxx/include/__ranges/join_view.h | 647 +- .../libcxx/include/__ranges/lazy_split_view.h | 245 +- .../include/__ranges/non_propagating_cache.h | 129 +- .../libcxx/include/__ranges/owning_view.h | 106 +- .../libcxx/include/__ranges/range_adaptor.h | 32 +- .../llvm-project/libcxx/include/__ranges/rbegin.h | 67 +- .../libcxx/include/__ranges/ref_view.h | 80 +- .../llvm-project/libcxx/include/__ranges/rend.h | 71 +- .../libcxx/include/__ranges/reverse_view.h | 297 +- .../libcxx/include/__ranges/single_view.h | 16 +- .../llvm-project/libcxx/include/__ranges/size.h | 52 +- .../libcxx/include/__ranges/subrange.h | 356 +- .../libcxx/include/__ranges/take_view.h | 194 +- .../libcxx/include/__ranges/transform_view.h | 300 +- .../libcxx/include/__ranges/view_interface.h | 94 +- .../llvm-project/libcxx/include/__ranges/views.h | 2 +- .../libcxx/include/__ranges/zip_view.h | 235 +- contrib/llvm-project/libcxx/include/__split_buffer | 604 +- .../libcxx/include/__string/char_traits.h | 1093 ++- .../libcxx/include/__system_error/errc.h | 172 +- .../libcxx/include/__thread/formatter.h | 62 +- .../libcxx/include/__thread/poll_with_backoff.h | 37 +- .../libcxx/include/__thread/this_thread.h | 63 +- .../llvm-project/libcxx/include/__thread/thread.h | 324 +- .../libcxx/include/__thread/timed_backoff_policy.h | 28 +- .../libcxx/include/__threading_support | 410 +- contrib/llvm-project/libcxx/include/__tree | 3613 ++++---- .../libcxx/include/__tuple/make_tuple_types.h | 24 +- .../libcxx/include/__tuple/sfinae_helpers.h | 136 +- .../libcxx/include/__tuple/tuple_element.h | 64 +- .../libcxx/include/__tuple/tuple_indices.h | 10 +- .../libcxx/include/__tuple/tuple_like_ext.h | 24 +- .../libcxx/include/__tuple/tuple_size.h | 47 +- .../libcxx/include/__tuple/tuple_types.h | 3 +- .../libcxx/include/__type_traits/datasizeof.h | 11 +- .../libcxx/include/__utility/as_const.h | 4 +- .../llvm-project/libcxx/include/__utility/cmp.h | 73 +- .../libcxx/include/__utility/convert_to_integral.h | 50 +- .../libcxx/include/__utility/exchange.h | 14 +- .../libcxx/include/__utility/in_place.h | 12 +- .../libcxx/include/__utility/integer_sequence.h | 104 +- .../libcxx/include/__utility/is_pointer_in_range.h | 2 +- .../llvm-project/libcxx/include/__utility/pair.h | 1162 +-- .../libcxx/include/__utility/piecewise_construct.h | 4 +- .../libcxx/include/__utility/priority_tag.h | 6 +- .../libcxx/include/__utility/rel_ops.h | 41 +- .../libcxx/include/__utility/to_underlying.h | 6 +- .../libcxx/include/__utility/unreachable.h | 4 +- .../libcxx/include/__variant/monostate.h | 2 +- .../llvm-project/libcxx/include/__verbose_abort | 4 +- contrib/llvm-project/libcxx/include/algorithm | 30 + contrib/llvm-project/libcxx/include/any | 788 +- contrib/llvm-project/libcxx/include/array | 535 +- contrib/llvm-project/libcxx/include/barrier | 356 +- contrib/llvm-project/libcxx/include/bitset | 1290 ++- contrib/llvm-project/libcxx/include/cctype | 29 +- contrib/llvm-project/libcxx/include/cmath | 173 +- contrib/llvm-project/libcxx/include/codecvt | 776 +- contrib/llvm-project/libcxx/include/complex | 1921 ++-- .../llvm-project/libcxx/include/condition_variable | 223 +- contrib/llvm-project/libcxx/include/cstddef | 52 +- contrib/llvm-project/libcxx/include/ctype.h | 28 +- contrib/llvm-project/libcxx/include/cuchar | 2 +- contrib/llvm-project/libcxx/include/deque | 3722 ++++---- contrib/llvm-project/libcxx/include/errno.h | 522 +- contrib/llvm-project/libcxx/include/expected | 1 - .../libcxx/include/experimental/__config | 22 +- .../libcxx/include/experimental/__memory | 90 +- .../libcxx/include/experimental/__simd/abi_tag.h | 55 - .../include/experimental/__simd/aligned_tag.h | 13 +- .../include/experimental/__simd/declaration.h | 52 +- .../experimental/__simd/internal_declaration.h | 41 - .../libcxx/include/experimental/__simd/scalar.h | 2 +- .../libcxx/include/experimental/__simd/simd.h | 2 - .../libcxx/include/experimental/__simd/simd_mask.h | 2 - .../libcxx/include/experimental/__simd/traits.h | 15 +- .../libcxx/include/experimental/__simd/vec_ext.h | 6 +- .../libcxx/include/experimental/iterator | 69 +- .../libcxx/include/experimental/propagate_const | 305 +- .../llvm-project/libcxx/include/experimental/simd | 1 - .../libcxx/include/experimental/type_traits | 69 +- .../libcxx/include/experimental/utility | 2 +- contrib/llvm-project/libcxx/include/ext/__hash | 130 +- contrib/llvm-project/libcxx/include/ext/hash_map | 1132 +-- contrib/llvm-project/libcxx/include/ext/hash_set | 634 +- contrib/llvm-project/libcxx/include/fenv.h | 70 +- contrib/llvm-project/libcxx/include/float.h | 12 +- contrib/llvm-project/libcxx/include/forward_list | 2031 ++-- contrib/llvm-project/libcxx/include/fstream | 2095 ++--- contrib/llvm-project/libcxx/include/future | 2551 +++-- .../llvm-project/libcxx/include/initializer_list | 71 +- contrib/llvm-project/libcxx/include/inttypes.h | 10 +- contrib/llvm-project/libcxx/include/iomanip | 754 +- contrib/llvm-project/libcxx/include/ios | 953 +- contrib/llvm-project/libcxx/include/iosfwd | 65 +- contrib/llvm-project/libcxx/include/istream | 2051 ++-- contrib/llvm-project/libcxx/include/latch | 98 +- contrib/llvm-project/libcxx/include/limits | 1078 ++- contrib/llvm-project/libcxx/include/list | 2390 ++--- contrib/llvm-project/libcxx/include/locale | 6071 ++++++------ contrib/llvm-project/libcxx/include/locale.h | 2 +- contrib/llvm-project/libcxx/include/map | 2618 +++--- contrib/llvm-project/libcxx/include/math.h | 81 +- .../libcxx/include/module.modulemap.in | 4 +- contrib/llvm-project/libcxx/include/mutex | 467 +- contrib/llvm-project/libcxx/include/new | 220 +- contrib/llvm-project/libcxx/include/numbers | 93 +- contrib/llvm-project/libcxx/include/optional | 1759 ++-- contrib/llvm-project/libcxx/include/ostream | 1349 ++- contrib/llvm-project/libcxx/include/print | 14 +- contrib/llvm-project/libcxx/include/queue | 1008 +- contrib/llvm-project/libcxx/include/ranges | 2 +- contrib/llvm-project/libcxx/include/ratio | 396 +- contrib/llvm-project/libcxx/include/regex | 8356 +++++++---------- .../llvm-project/libcxx/include/scoped_allocator | 821 +- contrib/llvm-project/libcxx/include/semaphore | 193 +- contrib/llvm-project/libcxx/include/set | 1577 ++-- contrib/llvm-project/libcxx/include/span | 701 +- contrib/llvm-project/libcxx/include/sstream | 1274 ++- contrib/llvm-project/libcxx/include/stack | 349 +- contrib/llvm-project/libcxx/include/stdatomic.h | 18 +- contrib/llvm-project/libcxx/include/stdbool.h | 10 +- contrib/llvm-project/libcxx/include/stddef.h | 28 +- contrib/llvm-project/libcxx/include/stdexcept | 232 +- contrib/llvm-project/libcxx/include/stdint.h | 6 +- contrib/llvm-project/libcxx/include/stdio.h | 36 +- contrib/llvm-project/libcxx/include/stdlib.h | 86 +- contrib/llvm-project/libcxx/include/streambuf | 530 +- contrib/llvm-project/libcxx/include/string | 4686 +++++----- contrib/llvm-project/libcxx/include/string.h | 2 +- contrib/llvm-project/libcxx/include/string_view | 1135 +-- contrib/llvm-project/libcxx/include/strstream | 334 +- contrib/llvm-project/libcxx/include/thread | 2 +- contrib/llvm-project/libcxx/include/tuple | 2126 ++--- contrib/llvm-project/libcxx/include/typeindex | 65 +- contrib/llvm-project/libcxx/include/typeinfo | 242 +- contrib/llvm-project/libcxx/include/uchar.h | 12 +- contrib/llvm-project/libcxx/include/unordered_map | 3111 +++---- contrib/llvm-project/libcxx/include/unordered_set | 1953 ++-- contrib/llvm-project/libcxx/include/valarray | 4682 ++++------ contrib/llvm-project/libcxx/include/variant | 1235 +-- contrib/llvm-project/libcxx/include/vector | 3840 ++++---- contrib/llvm-project/libcxx/include/version | 6 +- contrib/llvm-project/libcxx/include/wchar.h | 157 +- contrib/llvm-project/libcxx/include/wctype.h | 43 +- .../llvm-project/libcxx/modules/std/algorithm.inc | 16 +- .../llvm-project/libcxx/modules/std/ostream.inc | 5 +- contrib/llvm-project/libcxx/src/any.cpp | 16 +- contrib/llvm-project/libcxx/src/atomic.cpp | 216 +- contrib/llvm-project/libcxx/src/barrier.cpp | 106 +- contrib/llvm-project/libcxx/src/bind.cpp | 23 +- contrib/llvm-project/libcxx/src/call_once.cpp | 62 +- contrib/llvm-project/libcxx/src/charconv.cpp | 33 +- contrib/llvm-project/libcxx/src/chrono.cpp | 118 +- .../llvm-project/libcxx/src/condition_variable.cpp | 95 +- .../libcxx/src/condition_variable_destructor.cpp | 20 +- contrib/llvm-project/libcxx/src/exception.cpp | 28 +- .../libcxx/src/filesystem/directory_entry.cpp | 9 +- .../libcxx/src/filesystem/directory_iterator.cpp | 84 +- contrib/llvm-project/libcxx/src/filesystem/error.h | 24 +- .../libcxx/src/filesystem/file_descriptor.h | 53 +- .../libcxx/src/filesystem/filesystem_clock.cpp | 20 +- .../libcxx/src/filesystem/filesystem_error.cpp | 12 +- .../libcxx/src/filesystem/int128_builtins.cpp | 14 +- .../libcxx/src/filesystem/operations.cpp | 323 +- .../llvm-project/libcxx/src/filesystem/path.cpp | 79 +- .../libcxx/src/filesystem/path_parser.h | 58 +- .../libcxx/src/filesystem/posix_compat.h | 231 +- .../libcxx/src/filesystem/time_utils.h | 164 +- contrib/llvm-project/libcxx/src/functional.cpp | 10 +- contrib/llvm-project/libcxx/src/future.cpp | 319 +- contrib/llvm-project/libcxx/src/hash.cpp | 899 +- .../libcxx/src/include/apple_availability.h | 34 +- .../libcxx/src/include/atomic_support.h | 156 +- .../llvm-project/libcxx/src/include/config_elast.h | 18 +- .../llvm-project/libcxx/src/include/refstring.h | 137 +- contrib/llvm-project/libcxx/src/include/ryu/ryu.h | 1 - .../libcxx/src/include/sso_allocator.h | 81 +- contrib/llvm-project/libcxx/src/ios.cpp | 569 +- contrib/llvm-project/libcxx/src/iostream.cpp | 165 +- contrib/llvm-project/libcxx/src/locale.cpp | 9786 +++++++++----------- contrib/llvm-project/libcxx/src/memory.cpp | 229 +- contrib/llvm-project/libcxx/src/mutex.cpp | 207 +- .../llvm-project/libcxx/src/mutex_destructor.cpp | 20 +- contrib/llvm-project/libcxx/src/optional.cpp | 14 +- contrib/llvm-project/libcxx/src/ostream.cpp | 42 + contrib/llvm-project/libcxx/src/random.cpp | 181 +- contrib/llvm-project/libcxx/src/random_shuffle.cpp | 35 +- contrib/llvm-project/libcxx/src/regex.cpp | 293 +- contrib/llvm-project/libcxx/src/std_stream.h | 572 +- contrib/llvm-project/libcxx/src/string.cpp | 368 +- .../libcxx/src/support/ibm/mbsnrtowcs.cpp | 30 +- .../libcxx/src/support/ibm/wcsnrtombs.cpp | 27 +- .../libcxx/src/support/ibm/xlocale_zos.cpp | 44 +- .../src/support/runtime/exception_fallback.ipp | 139 +- .../src/support/runtime/exception_glibcxx.ipp | 18 +- .../src/support/runtime/exception_libcxxabi.ipp | 15 +- .../src/support/runtime/exception_libcxxrt.ipp | 11 +- .../libcxx/src/support/runtime/exception_msvc.ipp | 145 +- .../support/runtime/exception_pointer_cxxabi.ipp | 73 +- .../support/runtime/exception_pointer_glibcxx.ipp | 61 +- .../src/support/runtime/exception_pointer_msvc.ipp | 22 +- .../runtime/exception_pointer_unimplemented.ipp | 43 +- .../src/support/runtime/stdexcept_default.ipp | 8 +- .../src/support/runtime/stdexcept_vcruntime.ipp | 2 +- contrib/llvm-project/libcxx/src/system_error.cpp | 225 +- contrib/llvm-project/libcxx/src/thread.cpp | 222 +- contrib/llvm-project/libcxx/src/typeinfo.cpp | 30 +- contrib/llvm-project/libcxx/src/valarray.cpp | 56 +- contrib/llvm-project/libcxx/src/variant.cpp | 6 +- contrib/llvm-project/libcxx/src/vector.cpp | 8 +- contrib/llvm-project/libcxx/src/verbose_abort.cpp | 6 +- contrib/llvm-project/lld/ELF/Arch/LoongArch.cpp | 20 + contrib/llvm-project/lld/ELF/InputSection.cpp | 22 +- contrib/llvm-project/lld/MachO/InputFiles.h | 2 +- contrib/llvm-project/lld/MachO/Options.td | 2 +- .../lldb/bindings/python/python-typemaps.swig | 2 +- .../lldb/include/lldb/Core/ValueObject.h | 8 - .../lldb/include/lldb/Host/HostGetOpt.h | 4 - .../lldb/include/lldb/Utility/FileSpec.h | 19 - contrib/llvm-project/lldb/source/API/SBValue.cpp | 11 +- .../llvm-project/lldb/source/Core/ValueObject.cpp | 40 - .../lldb/source/Host/common/FileSystem.cpp | 1 - .../lldb/source/Interpreter/CommandInterpreter.cpp | 6 +- .../SymbolFile/DWARF/DWARFASTParserClang.cpp | 2 +- .../lldb/source/Target/JITLoaderList.cpp | 2 +- .../llvm-project/llvm/include/llvm/ADT/StringRef.h | 8 +- contrib/llvm-project/llvm/include/llvm/ADT/Twine.h | 2 +- .../llvm/include/llvm/Analysis/LazyValueInfo.h | 9 +- .../llvm/include/llvm/Analysis/TargetLibraryInfo.h | 10 + .../include/llvm/Analysis/TargetTransformInfo.h | 4 + .../llvm/include/llvm/Analysis/ValueLattice.h | 5 +- .../llvm/include/llvm/Analysis/ValueTracking.h | 5 + .../llvm/include/llvm/Analysis/VecFuncs.def | 2 + .../llvm/include/llvm/Analysis/VectorUtils.h | 10 + .../llvm/include/llvm/CodeGen/AccelTable.h | 8 +- .../llvm/include/llvm/CodeGen/CodeGenPassBuilder.h | 9 +- .../llvm/include/llvm/CodeGen/LowerEmuTLS.h | 29 + .../include/llvm/CodeGen/MachinePassRegistry.def | 7 +- .../llvm/include/llvm/CodeGen/MacroFusion.h | 12 +- .../llvm/include/llvm/CodeGen/SelectionDAGISel.h | 2 + .../llvm/include/llvm/CodeGen/TargetLowering.h | 6 + .../llvm/CodeGen/TargetLoweringObjectFileImpl.h | 2 + .../llvm/include/llvm/Frontend/HLSL/HLSLResource.h | 27 +- .../llvm-project/llvm/include/llvm/IR/Constants.h | 7 +- .../llvm/include/llvm/IR/DiagnosticHandler.h | 1 + .../llvm/IR/GenericConvergenceVerifierImpl.h | 13 +- .../llvm/include/llvm/IR/GlobalValue.h | 4 + .../llvm/include/llvm/IR/IntrinsicInst.h | 24 + .../llvm/include/llvm/IR/IntrinsicsAMDGPU.td | 28 +- .../llvm/include/llvm/IR/IntrinsicsRISCV.td | 2 +- .../llvm/include/llvm/IR/PatternMatch.h | 26 + .../llvm-project/llvm/include/llvm/MC/MCAsmInfo.h | 3 +- .../llvm/include/llvm/MC/MCTargetOptions.h | 2 + .../llvm/include/llvm/Object/ELFObjectFile.h | 1 + .../llvm-project/llvm/include/llvm/Object/Wasm.h | 1 - .../llvm/ProfileData/Coverage/CoverageMapping.h | 2 +- .../llvm/include/llvm/ProfileData/InstrProf.h | 26 +- .../include/llvm/ProfileData/RawMemProfReader.h | 11 +- .../llvm/include/llvm/ProfileData/SampleProf.h | 4 +- .../llvm/include/llvm/Support/CommandLine.h | 27 +- .../llvm/include/llvm/Support/YAMLTraits.h | 17 +- .../llvm/include/llvm/Support/raw_ostream.h | 49 - .../llvm/include/llvm/Support/raw_socket_stream.h | 66 + .../llvm/TargetParser/AArch64TargetParser.h | 9 +- .../llvm/TargetParser/ARMTargetParserCommon.h | 1 + .../llvm/include/llvm/TextAPI/DylibReader.h | 48 + .../llvm/include/llvm/TextAPI/Record.h | 13 +- .../llvm/include/llvm/TextAPI/RecordVisitor.h | 54 + .../llvm/include/llvm/TextAPI/RecordsSlice.h | 14 +- .../llvm/include/llvm/TextAPI/TextAPIError.h | 3 +- .../llvm-project/llvm/include/llvm/TextAPI/Utils.h | 34 + .../llvm/include/llvm/Transforms/IPO/Attributor.h | 10 + .../llvm/Transforms/IPO/ProfiledCallGraph.h | 5 +- .../llvm/lib/Analysis/InstructionSimplify.cpp | 2 +- .../llvm/lib/Analysis/LazyValueInfo.cpp | 18 +- .../llvm/lib/Analysis/LoopAccessAnalysis.cpp | 2 +- .../llvm/lib/Analysis/MemoryDependenceAnalysis.cpp | 18 +- .../llvm/lib/Analysis/ScalarEvolution.cpp | 7 +- .../llvm/lib/Analysis/TargetLibraryInfo.cpp | 10 + .../llvm/lib/Analysis/VFABIDemangling.cpp | 4 +- .../llvm/lib/Analysis/ValueTracking.cpp | 126 +- .../llvm-project/llvm/lib/Analysis/VectorUtils.cpp | 28 + .../llvm/lib/CodeGen/AsmPrinter/AccelTable.cpp | 4 +- .../llvm/lib/CodeGen/AsmPrinter/AsmPrinter.cpp | 1 + .../CodeGen/LiveDebugValues/InstrRefBasedImpl.cpp | 62 +- .../CodeGen/LiveDebugValues/InstrRefBasedImpl.h | 45 +- .../llvm/lib/CodeGen/LiveRangeEdit.cpp | 3 +- .../llvm-project/llvm/lib/CodeGen/LowerEmuTLS.cpp | 53 +- .../llvm/lib/CodeGen/MachineInstrBundle.cpp | 6 +- .../llvm-project/llvm/lib/CodeGen/MacroFusion.cpp | 12 +- .../llvm-project/llvm/lib/CodeGen/RegAllocFast.cpp | 139 +- .../llvm/lib/CodeGen/RegisterClassInfo.cpp | 3 +- .../llvm/lib/CodeGen/RegisterCoalescer.cpp | 57 +- .../llvm/lib/CodeGen/ReplaceWithVeclib.cpp | 211 +- .../llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp | 19 +- .../llvm/lib/CodeGen/SelectionDAG/FastISel.cpp | 3 +- .../CodeGen/SelectionDAG/FunctionLoweringInfo.cpp | 3 +- .../llvm/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp | 18 +- .../CodeGen/SelectionDAG/LegalizeFloatTypes.cpp | 23 + .../CodeGen/SelectionDAG/LegalizeIntegerTypes.cpp | 17 + .../llvm/lib/CodeGen/SelectionDAG/LegalizeTypes.h | 2 + .../lib/CodeGen/SelectionDAG/ScheduleDAGFast.cpp | 12 +- .../llvm/lib/CodeGen/SelectionDAG/SelectionDAG.cpp | 6 +- .../CodeGen/SelectionDAG/SelectionDAGBuilder.cpp | 3 +- .../lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp | 24 +- .../llvm/lib/CodeGen/ShadowStackGCLowering.cpp | 7 +- .../lib/CodeGen/TargetLoweringObjectFileImpl.cpp | 7 + .../llvm/lib/CodeGen/TargetPassConfig.cpp | 1 + .../llvm/lib/CodeGen/TwoAddressInstructionPass.cpp | 3 +- .../lib/ExecutionEngine/JITLink/MachO_arm64.cpp | 32 +- .../lib/ExecutionEngine/JITLink/MachO_x86_64.cpp | 32 +- .../llvm/lib/Frontend/HLSL/HLSLResource.cpp | 17 +- contrib/llvm-project/llvm/lib/IR/ConstantFold.cpp | 2 +- contrib/llvm-project/llvm/lib/IR/Globals.cpp | 12 +- contrib/llvm-project/llvm/lib/IR/LLVMContext.cpp | 11 +- contrib/llvm-project/llvm/lib/IR/Metadata.cpp | 2 +- contrib/llvm-project/llvm/lib/IR/Type.cpp | 2 + contrib/llvm-project/llvm/lib/IR/Verifier.cpp | 11 +- contrib/llvm-project/llvm/lib/MC/MCAsmStreamer.cpp | 5 +- contrib/llvm-project/llvm/lib/MC/MCContext.cpp | 14 +- contrib/llvm-project/llvm/lib/MC/MCExpr.cpp | 24 +- .../llvm/lib/ObjCopy/ELF/ELFObject.cpp | 2 +- .../llvm-project/llvm/lib/Object/ELFObjectFile.cpp | 69 + .../llvm/lib/Object/ModuleSymbolTable.cpp | 16 +- .../llvm/lib/Object/WasmObjectFile.cpp | 52 +- .../llvm-project/llvm/lib/Passes/PassBuilder.cpp | 1 + .../llvm-project/llvm/lib/Passes/PassRegistry.def | 1 + .../llvm/lib/ProfileData/InstrProf.cpp | 36 +- .../llvm/lib/ProfileData/InstrProfReader.cpp | 9 +- .../llvm/lib/ProfileData/RawMemProfReader.cpp | 25 +- .../llvm-project/llvm/lib/Support/CommandLine.cpp | 78 +- .../llvm-project/llvm/lib/Support/RISCVISAInfo.cpp | 83 +- contrib/llvm-project/llvm/lib/Support/Signals.cpp | 2 +- .../llvm-project/llvm/lib/Support/raw_ostream.cpp | 163 +- .../llvm/lib/Support/raw_socket_stream.cpp | 179 + .../llvm/lib/Target/AArch64/AArch64.td | 19 +- .../llvm/lib/Target/AArch64/AArch64Combine.td | 11 +- .../Target/AArch64/AArch64ExpandPseudoInsts.cpp | 18 +- .../lib/Target/AArch64/AArch64ISelLowering.cpp | 11 +- .../llvm/lib/Target/AArch64/AArch64InstrFormats.td | 126 + .../llvm/lib/Target/AArch64/AArch64InstrInfo.cpp | 36 + .../llvm/lib/Target/AArch64/AArch64InstrInfo.h | 3 + .../llvm/lib/Target/AArch64/AArch64InstrInfo.td | 75 +- .../Target/AArch64/AArch64LoadStoreOptimizer.cpp | 229 + .../Target/AArch64/AArch64MachineFunctionInfo.cpp | 28 +- .../Target/AArch64/AArch64MachineFunctionInfo.h | 18 + .../llvm/lib/Target/AArch64/AArch64PointerAuth.cpp | 86 +- .../llvm/lib/Target/AArch64/AArch64SVEInstrInfo.td | 61 +- .../llvm/lib/Target/AArch64/AArch64SchedA64FX.td | 9 +- .../lib/Target/AArch64/AArch64SchedNeoverseN2.td | 2 +- .../lib/Target/AArch64/AArch64SchedNeoverseV1.td | 2 +- .../lib/Target/AArch64/AArch64SchedNeoverseV2.td | 2 +- .../lib/Target/AArch64/AArch64SystemOperands.td | 27 + .../Target/AArch64/AsmParser/AArch64AsmParser.cpp | 47 + .../AArch64/Disassembler/AArch64Disassembler.cpp | 18 + .../AArch64/GISel/AArch64InstructionSelector.cpp | 62 - .../AArch64/GISel/AArch64PostLegalizerLowering.cpp | 21 + .../AArch64/MCTargetDesc/AArch64AsmBackend.cpp | 14 + .../MCTargetDesc/AArch64ELFObjectWriter.cpp | 4 + .../AArch64/MCTargetDesc/AArch64FixupKinds.h | 5 + .../AArch64/MCTargetDesc/AArch64MCCodeEmitter.cpp | 29 + .../llvm/lib/Target/AArch64/SMEInstrFormats.td | 26 +- .../llvm/lib/Target/AArch64/SVEInstrFormats.td | 31 + .../llvm-project/llvm/lib/Target/AMDGPU/AMDGPU.td | 4 +- .../llvm/lib/Target/AMDGPU/AMDGPUIGroupLP.cpp | 29 +- .../llvm/lib/Target/AMDGPU/AMDGPUISelLowering.cpp | 37 +- .../Target/AMDGPU/AMDGPUInstCombineIntrinsic.cpp | 8 +- .../llvm/lib/Target/AMDGPU/AMDGPULibCalls.cpp | 3 +- .../llvm/lib/Target/AMDGPU/AMDGPUPromoteAlloca.cpp | 18 + .../llvm/lib/Target/AMDGPU/AMDGPUTargetMachine.cpp | 7 + .../Target/AMDGPU/AMDGPUTargetTransformInfo.cpp | 8 + .../lib/Target/AMDGPU/AMDGPUTargetTransformInfo.h | 10 + .../llvm/lib/Target/AMDGPU/DSInstructions.td | 12 +- .../AMDGPU/Disassembler/AMDGPUDisassembler.cpp | 5 + .../llvm/lib/Target/AMDGPU/SIISelLowering.cpp | 21 +- .../llvm/lib/Target/AMDGPU/SIInsertWaitcnts.cpp | 20 +- .../llvm/lib/Target/AMDGPU/SIInstrInfo.cpp | 79 + .../llvm/lib/Target/AMDGPU/SIInstrInfo.h | 3 + .../llvm/lib/Target/ARM/ARMFrameLowering.cpp | 33 +- .../llvm/lib/Target/ARM/ARMFrameLowering.h | 3 + .../llvm/lib/Target/ARM/ARMISelLowering.cpp | 58 + .../llvm/lib/Target/ARM/ARMISelLowering.h | 10 + .../llvm/lib/Target/ARM/ARMInstrVFP.td | 1 + .../llvm/lib/Target/ARM/ARMLoadStoreOptimizer.cpp | 6 +- .../llvm/lib/Target/DirectX/DXILResource.cpp | 92 +- .../llvm/lib/Target/DirectX/DXILResource.h | 37 +- .../DirectX/DXILWriter/DXILBitcodeWriter.cpp | 3 +- .../lib/Target/Hexagon/HexagonConstPropagation.cpp | 3 +- .../lib/Target/Hexagon/HexagonISelDAGToDAGHVX.cpp | 6 +- .../Target/Hexagon/HexagonLoopIdiomRecognition.cpp | 6 +- .../Hexagon/MCTargetDesc/HexagonMCTargetDesc.cpp | 2 +- .../LoongArch/MCTargetDesc/LoongArchAsmBackend.cpp | 78 + .../LoongArch/MCTargetDesc/LoongArchAsmBackend.h | 9 +- .../LoongArch/MCTargetDesc/LoongArchFixupKinds.h | 4 +- .../llvm/lib/Target/PowerPC/PPCISelLowering.cpp | 9 +- .../llvm/lib/Target/PowerPC/PPCInstrInfo.cpp | 8 +- .../llvm/lib/Target/PowerPC/PPCInstrInfo.td | 3 + .../lib/Target/RISCV/GISel/RISCVLegalizerInfo.cpp | 7 +- .../lib/Target/RISCV/MCTargetDesc/RISCVBaseInfo.h | 9 + .../llvm/lib/Target/RISCV/RISCVFeatures.td | 86 +- .../llvm/lib/Target/RISCV/RISCVISelDAGToDAG.cpp | 3 +- .../llvm/lib/Target/RISCV/RISCVISelLowering.cpp | 182 +- .../llvm/lib/Target/RISCV/RISCVISelLowering.h | 7 +- .../llvm/lib/Target/RISCV/RISCVInstrFormats.td | 9 + .../lib/Target/RISCV/RISCVInstrInfoVPseudos.td | 8 - .../lib/Target/RISCV/RISCVInstrInfoVVLPatterns.td | 125 +- .../llvm/lib/Target/RISCV/RISCVInstrInfoXSf.td | 12 +- .../llvm/lib/Target/RISCV/RISCVInstrInfoZvk.td | 2 +- .../llvm/lib/Target/RISCV/RISCVMacroFusion.cpp | 82 +- .../llvm/lib/Target/RISCV/RISCVProcessors.td | 27 +- .../llvm/lib/Target/RISCV/RISCVSchedSiFive7.td | 1 + .../llvm/lib/Target/RISCV/RISCVSubtarget.h | 18 +- .../lib/Target/RISCV/RISCVTargetTransformInfo.h | 2 +- .../llvm/lib/Target/SPIRV/SPIRVBuiltins.cpp | 4 +- .../llvm/lib/Target/SPIRV/SPIRVEmitIntrinsics.cpp | 6 +- .../llvm/lib/Target/SPIRV/SPIRVGlobalRegistry.cpp | 6 +- .../llvm/lib/Target/SPIRV/SPIRVModuleAnalysis.cpp | 2 +- .../llvm/lib/Target/SPIRV/SPIRVModuleAnalysis.h | 2 +- .../llvm/lib/Target/SPIRV/SPIRVPreLegalizer.cpp | 2 +- .../SystemZ/MCTargetDesc/SystemZMCAsmInfo.cpp | 1 + .../llvm/lib/Target/SystemZ/SystemZAsmPrinter.cpp | 35 +- .../lib/Target/SystemZ/SystemZFrameLowering.cpp | 6 + .../lib/Target/SystemZ/SystemZISelDAGToDAG.cpp | 3 +- .../lib/Target/SystemZ/SystemZISelLowering.cpp | 10 + .../llvm/lib/Target/SystemZ/SystemZISelLowering.h | 8 +- .../llvm-project/llvm/lib/Target/TargetMachine.cpp | 4 +- .../llvm/lib/Target/X86/AsmParser/X86AsmParser.cpp | 36 +- .../Target/X86/MCTargetDesc/X86MCCodeEmitter.cpp | 2 +- .../llvm/lib/Target/X86/X86FastISel.cpp | 7 +- .../llvm/lib/Target/X86/X86FloatingPoint.cpp | 3 +- .../llvm/lib/Target/X86/X86ISelDAGToDAG.cpp | 31 +- .../llvm/lib/Target/X86/X86ISelLowering.cpp | 36 +- .../llvm/lib/Target/X86/X86InsertPrefetch.cpp | 6 +- .../llvm/lib/Target/X86/X86InstrAMX.td | 30 +- .../llvm/lib/Target/X86/X86InstrAVX512.td | 1082 +-- .../llvm/lib/Target/X86/X86InstrArithmetic.td | 1457 ++- .../llvm/lib/Target/X86/X86InstrAsmAlias.td | 13 + .../llvm/lib/Target/X86/X86InstrCompiler.td | 17 + .../llvm/lib/Target/X86/X86InstrFPStack.td | 8 +- .../llvm/lib/Target/X86/X86InstrFormats.td | 7 +- .../llvm/lib/Target/X86/X86InstrInfo.cpp | 8 +- .../llvm-project/llvm/lib/Target/X86/X86InstrKL.td | 22 +- .../llvm/lib/Target/X86/X86InstrMMX.td | 24 +- .../llvm/lib/Target/X86/X86InstrMisc.td | 211 +- .../llvm/lib/Target/X86/X86InstrRAOINT.td | 8 +- .../llvm/lib/Target/X86/X86InstrSGX.td | 6 +- .../llvm/lib/Target/X86/X86InstrSNP.td | 12 +- .../llvm/lib/Target/X86/X86InstrSSE.td | 952 +- .../llvm/lib/Target/X86/X86InstrShiftRotate.td | 28 +- .../llvm/lib/Target/X86/X86InstrSystem.td | 141 +- .../llvm/lib/Target/X86/X86InstrTBM.td | 4 +- .../llvm/lib/Target/X86/X86InstrTDX.td | 14 +- .../llvm/lib/Target/X86/X86InstrTSX.td | 4 +- .../llvm/lib/Target/X86/X86InstrUtils.td | 284 +- .../llvm/lib/Target/X86/X86InstrVMX.td | 38 +- .../llvm/lib/Target/X86/X86InstrXOP.td | 28 +- .../llvm/lib/Target/X86/X86MacroFusion.cpp | 3 +- .../llvm/lib/Target/X86/X86Subtarget.cpp | 9 +- .../lib/TargetParser/ARMTargetParserCommon.cpp | 6 +- .../llvm-project/llvm/lib/TargetParser/Host.cpp | 52 +- .../llvm-project/llvm/lib/TargetParser/Triple.cpp | 15 +- .../llvm/lib/TextAPI/BinaryReader/DylibReader.cpp | 429 + .../llvm/lib/TextAPI/RecordVisitor.cpp | 65 + .../llvm-project/llvm/lib/TextAPI/RecordsSlice.cpp | 120 +- contrib/llvm-project/llvm/lib/TextAPI/Utils.cpp | 40 + .../lib/ToolDrivers/llvm-dlltool/DlltoolDriver.cpp | 2 +- .../lib/Transforms/IPO/AttributorAttributes.cpp | 53 +- .../llvm/lib/Transforms/IPO/OpenMPOpt.cpp | 18 +- .../llvm/lib/Transforms/IPO/SampleProfile.cpp | 13 +- .../Transforms/InstCombine/InstCombineAndOrXor.cpp | 49 +- .../Transforms/InstCombine/InstCombineCalls.cpp | 59 +- .../Transforms/InstCombine/InstCombineInternal.h | 17 +- .../InstCombine/InstCombineMulDivRem.cpp | 7 + .../Transforms/InstCombine/InstCombineSelect.cpp | 4 +- .../InstCombine/InstCombineSimplifyDemanded.cpp | 134 +- .../InstCombine/InstCombineVectorOps.cpp | 44 +- .../InstCombine/InstructionCombining.cpp | 106 +- .../Instrumentation/AddressSanitizer.cpp | 2 +- .../lib/Transforms/Instrumentation/MemProfiler.cpp | 2 +- .../Instrumentation/SanitizerCoverage.cpp | 2 +- .../lib/Transforms/Scalar/ConstantHoisting.cpp | 5 +- .../Transforms/Scalar/ConstraintElimination.cpp | 75 +- .../Scalar/CorrelatedValuePropagation.cpp | 6 +- .../lib/Transforms/Scalar/DFAJumpThreading.cpp | 2 +- .../llvm/lib/Transforms/Scalar/GVN.cpp | 2 +- .../llvm/lib/Transforms/Scalar/LoopFlatten.cpp | 5 +- .../lib/Transforms/Scalar/LoopStrengthReduce.cpp | 2 +- .../llvm/lib/Transforms/Scalar/LoopUnrollPass.cpp | 9 +- *** 16066 LINES SKIPPED *** From nobody Sat Apr 6 20:17:37 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VBmqj6Fx6z5HGK4; Sat, 6 Apr 2024 20:17: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 4VBmqj2JfPz4JwQ; Sat, 6 Apr 2024 20:17:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712434657; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rQ3a7Uybpgap/DROkftRRb8iVlniGaojbWKgyF7aObI=; b=lnnvHvNd6zyvbONsfNnIQfVeScbRIi17XVgRve1/X7+sEA5AAsTSAf/poTL9vw+BJ9KmvI 9XulX8/eQweFJG3uf4OHgo4AMXkED/NDt1QNNFFo9+ry+5l/OKlZNawDyu72qkuWM41mxP 1waq+bLJ+vEMYBBEUfY85T6/s3Jr3cWD2syzjwYDtrlCegARS+goHSO0sXCIgyS/6kqkZJ 5aKG/nFkYxoWXvQYemaKVxBzU8iy8dMMLU1zbKGR/hyLSp12Btkr61HAU73wCQrXraft9U YChVTo1+R/PM2AYcYckerypr5uJxExR5oIx3ifF/8nNbRKraOL1hHb8/uIZTaA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712434657; a=rsa-sha256; cv=none; b=GYdJa+FGRYyAIcrFCR4pbS5yfXxKm1dp85Jzl2SfMGEL8jwlAEU7+zPMxsCsW6maOSL1wa VqJRi24zuk/cmsHKz2vZk+OX5Hv0LETMWDhGeky0FJVip+9KiILxP2ZdwB4pVWK/6RWq5c d6vFOSkc6jXzs7CalcpM7TdU+6m2GEE2GsOPJZpbUEURq+NPXAVnM3qpbGnpflzmoPmK4C DAMXvoL3GAzVEawOAipXqf2NmysCCboBOSmbTkOGp3USrn3YO1klk1ZRbOOznvo+2UcD+Z dZ7uy3FSIsG9Cg/k3ARvi79Xfjn/RO3aNH0C177sltxxZHYqoxtMY1lG5rBOzQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712434657; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rQ3a7Uybpgap/DROkftRRb8iVlniGaojbWKgyF7aObI=; b=sfL2HenuoxJke/IFznLHQogSZJg9lKxaCfZW5auEZjJ7bf5Hlr8gni7i3XPDS7gZOZhmmI WpYH8rHLcJMyLzyuNHWtrXxNCfdI/qEVwtzbJVmAGmCYO5UBQqPTS+kKyuU+kqaxBUFX5w rAkaCz7auSEg30oNQ4GZKiaM+XqoPoQUCW6+RNS3AQJgrvbj4wBw27V2cvb+S7o7HV9cQp mEjwyBL/Uxh6Xho0loRolPBuezeSsiqgbTdAle8YlAgKzWyIi8VjgVzRu/+mLSDGICLG7L /zmbJPF0DpbeLlMQG0oiCwmc+qKtgmOZNRGS9KF+YMHdZWD7JaLB2eGq4sGPrw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VBmqj1sF2zxg8; Sat, 6 Apr 2024 20:17: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 436KHbfc029420; Sat, 6 Apr 2024 20:17:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 436KHbPn029418; Sat, 6 Apr 2024 20:17:37 GMT (envelope-from git) Date: Sat, 6 Apr 2024 20:17:37 GMT Message-Id: <202404062017.436KHbPn029418@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dimitry Andric Subject: git: edc2dc17b1f2 - main - Revert commit 0e46b49de433 from llvm-project (by Matt Arsenault): List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: edc2dc17b1f2dfe45dc85e6cc0ff54bca1ac8214 Auto-Submitted: auto-generated The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=edc2dc17b1f2dfe45dc85e6cc0ff54bca1ac8214 commit edc2dc17b1f2dfe45dc85e6cc0ff54bca1ac8214 Author: Dimitry Andric AuthorDate: 2024-01-02 16:07:31 +0000 Commit: Dimitry Andric CommitDate: 2024-04-06 20:13:11 +0000 Revert commit 0e46b49de433 from llvm-project (by Matt Arsenault): Reapply "RegisterCoalescer: Add implicit-def of super register when coalescing SUBREG_TO_REG" This reverts commit c398fa009a47eb24f88383d5e911e59e70f8db86. PPC backend was fixed in 2f82662ce901c6666fceb9c6c5e0de216a1c9667 Since it causes an assertion failure building /sys/dev/fb/vga.c: https://github.com/llvm/llvm-project/issues/76416 PR: 276104 MFC after: 1 month --- .../llvm/lib/CodeGen/RegisterCoalescer.cpp | 51 ++++------------------ 1 file changed, 9 insertions(+), 42 deletions(-) diff --git a/contrib/llvm-project/llvm/lib/CodeGen/RegisterCoalescer.cpp b/contrib/llvm-project/llvm/lib/CodeGen/RegisterCoalescer.cpp index 3fbb93795075..cbb1a74049fb 100644 --- a/contrib/llvm-project/llvm/lib/CodeGen/RegisterCoalescer.cpp +++ b/contrib/llvm-project/llvm/lib/CodeGen/RegisterCoalescer.cpp @@ -305,11 +305,7 @@ namespace { /// number if it is not zero. If DstReg is a physical register and the /// existing subregister number of the def / use being updated is not zero, /// make sure to set it to the correct physical subregister. - /// - /// If \p IsSubregToReg, we are coalescing a DstReg = SUBREG_TO_REG - /// SrcReg. This introduces an implicit-def of DstReg on coalesced users. - void updateRegDefsUses(Register SrcReg, Register DstReg, unsigned SubIdx, - bool IsSubregToReg); + void updateRegDefsUses(Register SrcReg, Register DstReg, unsigned SubIdx); /// If the given machine operand reads only undefined lanes add an undef /// flag. @@ -1347,7 +1343,8 @@ bool RegisterCoalescer::reMaterializeTrivialDef(const CoalescerPair &CP, if (DstReg.isPhysical()) { Register NewDstReg = DstReg; - unsigned NewDstIdx = TRI->composeSubRegIndices(CP.getSrcIdx(), DefSubIdx); + unsigned NewDstIdx = TRI->composeSubRegIndices(CP.getSrcIdx(), + DefMI->getOperand(0).getSubReg()); if (NewDstIdx) NewDstReg = TRI->getSubReg(DstReg, NewDstIdx); @@ -1496,7 +1493,7 @@ bool RegisterCoalescer::reMaterializeTrivialDef(const CoalescerPair &CP, MRI->setRegClass(DstReg, NewRC); // Update machine operands and add flags. - updateRegDefsUses(DstReg, DstReg, DstIdx, false); + updateRegDefsUses(DstReg, DstReg, DstIdx); NewMI.getOperand(0).setSubReg(NewIdx); // updateRegDefUses can add an "undef" flag to the definition, since // it will replace DstReg with DstReg.DstIdx. If NewIdx is 0, make @@ -1816,7 +1813,7 @@ void RegisterCoalescer::addUndefFlag(const LiveInterval &Int, SlotIndex UseIdx, } void RegisterCoalescer::updateRegDefsUses(Register SrcReg, Register DstReg, - unsigned SubIdx, bool IsSubregToReg) { + unsigned SubIdx) { bool DstIsPhys = DstReg.isPhysical(); LiveInterval *DstInt = DstIsPhys ? nullptr : &LIS->getInterval(DstReg); @@ -1856,8 +1853,6 @@ void RegisterCoalescer::updateRegDefsUses(Register SrcReg, Register DstReg, if (DstInt && !Reads && SubIdx && !UseMI->isDebugInstr()) Reads = DstInt->liveAt(LIS->getInstructionIndex(*UseMI)); - bool FullDef = true; - // Replace SrcReg with DstReg in all UseMI operands. for (unsigned i = 0, e = Ops.size(); i != e; ++i) { MachineOperand &MO = UseMI->getOperand(Ops[i]); @@ -1865,13 +1860,9 @@ void RegisterCoalescer::updateRegDefsUses(Register SrcReg, Register DstReg, // Adjust flags in case of sub-register joins. We don't want to // turn a full def into a read-modify-write sub-register def and vice // versa. - if (SubIdx && MO.isDef()) { + if (SubIdx && MO.isDef()) MO.setIsUndef(!Reads); - if (!Reads) - FullDef = false; - } - // A subreg use of a partially undef (super) register may be a complete // undef use now and then has to be marked that way. if (MO.isUse() && !DstIsPhys) { @@ -1903,25 +1894,6 @@ void RegisterCoalescer::updateRegDefsUses(Register SrcReg, Register DstReg, MO.substVirtReg(DstReg, SubIdx, *TRI); } - if (IsSubregToReg && !FullDef) { - // If the coalesed instruction doesn't fully define the register, we need - // to preserve the original super register liveness for SUBREG_TO_REG. - // - // We pretended SUBREG_TO_REG was a regular copy for coalescing purposes, - // but it introduces liveness for other subregisters. Downstream users may - // have been relying on those bits, so we need to ensure their liveness is - // captured with a def of other lanes. - - // FIXME: Need to add new subrange if tracking subranges. We could also - // skip adding this if we knew the other lanes are dead, and only for - // other lanes. - - assert(!MRI->shouldTrackSubRegLiveness(DstReg) && - "this should update subranges"); - MachineInstrBuilder MIB(*MF, UseMI); - MIB.addReg(DstReg, RegState::ImplicitDefine); - } - LLVM_DEBUG({ dbgs() << "\t\tupdated: "; if (!UseMI->isDebugInstr()) @@ -2121,8 +2093,6 @@ bool RegisterCoalescer::joinCopy(MachineInstr *CopyMI, bool &Again) { }); } - const bool IsSubregToReg = CopyMI->isSubregToReg(); - ShrinkMask = LaneBitmask::getNone(); ShrinkMainRange = false; @@ -2190,12 +2160,9 @@ bool RegisterCoalescer::joinCopy(MachineInstr *CopyMI, bool &Again) { // Rewrite all SrcReg operands to DstReg. // Also update DstReg operands to include DstIdx if it is set. - if (CP.getDstIdx()) { - assert(!IsSubregToReg && "can this happen?"); - updateRegDefsUses(CP.getDstReg(), CP.getDstReg(), CP.getDstIdx(), false); - } - updateRegDefsUses(CP.getSrcReg(), CP.getDstReg(), CP.getSrcIdx(), - IsSubregToReg); + if (CP.getDstIdx()) + updateRegDefsUses(CP.getDstReg(), CP.getDstReg(), CP.getDstIdx()); + updateRegDefsUses(CP.getSrcReg(), CP.getDstReg(), CP.getSrcIdx()); // Shrink subregister ranges if necessary. if (ShrinkMask.any()) { From nobody Sat Apr 6 20:17:44 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VBmqw3mTzz5HGhS; Sat, 6 Apr 2024 20:17:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VBmqw04z9z4KJG; Sat, 6 Apr 2024 20:17:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712434668; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5uV140dJSos0HLLSK1XWc2M0Pf7xTzRYi45o4T7s5dA=; b=VGVU1O/P2D56YKBm3TtcFu9L2Vkc5kyBZKEre4YSOVyb/rbJ5lhdx9aalhCa2knHbprzum ZBYr7K6KSs7ajMnDy5lqr1MNGJTLAKj2GHHtdGpQGZ0MK1U8RAQ8/6NN2BAV6RwqhtALPK 7mKzjlALoXUyjQYhyhYPCb9AMEMqYa10bAUmIXCXVo7YCmY72IfS7woEO2QnQAxhC+HHuJ RRAPGSYBUVJb4QmlQqXf1MKRD4F14fen06TSPBTrhISg0flXWuPfLdjGjwnrAS7Xir5td5 j4WljAZInwqDOV2TxnI+vi0R1pBJKZzytFH6bqHIcLHpeb75sEwgIao5uZtwPw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712434668; a=rsa-sha256; cv=none; b=nr0uG3gF9ZyOoBLfWbSfzLW4nYAeDhjSduVMU1cFJKibdQyHpQBOpOgTKB7GYz2bP9ZDlc ztMXVlQsNY9uvPg1c7/0WoN0qs/ny9NYAFoUdxCdKLHtb/nlG8JC3LWqYtYFsDzkpMPlPT xHLLsN46JXuq9YPmA/VjQmTtWjPjn4p3WdmQu8nqTapG0+A+QXWHlVu6poSTU2BYgAuXVQ 2tEy5N0Jv28oTlqRmxlgqhO/3p47hod9OHz6WKKPMn3pXIRuVjai9c1zLqU62AdaAdEF3o nRv1iijcf5OaknrUDU6ohKUWqsGFlbwGX+6YZ47Ex0NhwDHsb9lBgdf42WWREg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712434668; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5uV140dJSos0HLLSK1XWc2M0Pf7xTzRYi45o4T7s5dA=; b=N/JOcY34PkOa3o73TyUtXAsCQwTrkj1dj11WNilNjqnzTeDlsmpPQFwhYkht8XT4215spz nHNVR6KunhzA3bUmfm2Kks5FrUmH0aWV5bLX3RFy6ckGIqjTXZFeZ2fiWaS+Z/qPTZThcf aKCh/axFh/vKc9E9yBqh0+tzCYqhsLVdTn8t4t6HDFdO8pEVNtN/EJMb7Usqemm3tQOqrd n4wDJ8J4FlCG6q4pViyT4fU+XmGtglmTvpzbh3BqsHZTiHRHjW+VgHM7AR1S5ZqtxDqcW2 Ml45TGYAbnbMHUHNxM/y+jXoQZAJRjRz/M9HxtmQgnc8istqOmIKeotpbUPTFw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VBmqv6jhSzxgB; Sat, 6 Apr 2024 20:17:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 436KHl8f029493; Sat, 6 Apr 2024 20:17:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 436KHiVk029475; Sat, 6 Apr 2024 20:17:44 GMT (envelope-from git) Date: Sat, 6 Apr 2024 20:17:44 GMT Message-Id: <202404062017.436KHiVk029475@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dimitry Andric Subject: git: 647cbc5de815 - main - Merge llvm-project main llvmorg-18-init-16003-gfc5f51cf5af4 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 647cbc5de815c5651677bf8582797f716ec7b48d Auto-Submitted: auto-generated The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=647cbc5de815c5651677bf8582797f716ec7b48d commit 647cbc5de815c5651677bf8582797f716ec7b48d Merge: edc2dc17b1f2 77dbea07356e Author: Dimitry Andric AuthorDate: 2024-01-03 18:04:11 +0000 Commit: Dimitry Andric CommitDate: 2024-04-06 20:13:16 +0000 Merge llvm-project main llvmorg-18-init-16003-gfc5f51cf5af4 This updates llvm, clang, compiler-rt, libc++, libunwind, lld, lldb and openmp to llvm-project main llvmorg-18-init-16003-gfc5f51cf5af4. PR: 276104 MFC after: 1 month ObsoleteFiles.inc | 105 +- .../llvm-project/clang/include/clang/AST/Type.h | 26 - .../clang/include/clang/Basic/BuiltinsAArch64.def | 3 + .../include/clang/Basic/riscv_sifive_vector.td | 28 +- .../clang/include/clang/Basic/riscv_vector.td | 8 +- .../include/clang/Basic/riscv_vector_common.td | 2 +- .../Core/BugReporter/CommonBugCategories.h | 1 + .../include/clang/StaticAnalyzer/Core/Checker.h | 14 +- .../clang/StaticAnalyzer/Core/CheckerManager.h | 11 +- contrib/llvm-project/clang/lib/AST/Interp/Interp.h | 1 - .../clang/lib/ASTMatchers/Dynamic/Parser.cpp | 6 +- .../clang/lib/Basic/IdentifierTable.cpp | 3 +- .../clang/lib/Basic/Targets/AArch64.cpp | 3 +- .../llvm-project/clang/lib/Basic/Targets/ARM.cpp | 3 +- .../llvm-project/clang/lib/Basic/Targets/RISCV.cpp | 3 +- .../llvm-project/clang/lib/Basic/Targets/X86.cpp | 3 +- contrib/llvm-project/clang/lib/Basic/Warnings.cpp | 6 +- .../llvm-project/clang/lib/CodeGen/CGBuiltin.cpp | 20 + .../clang/lib/CodeGen/CGStmtOpenMP.cpp | 61 +- .../clang/lib/CodeGen/CodeGenAction.cpp | 3 +- .../clang/lib/CodeGen/Targets/LoongArch.cpp | 7 - contrib/llvm-project/clang/lib/Driver/Driver.cpp | 14 +- .../clang/lib/Driver/ToolChains/Arch/RISCV.cpp | 13 +- .../clang/lib/Driver/ToolChains/Arch/X86.cpp | 4 +- .../clang/lib/Driver/ToolChains/Clang.cpp | 7 +- .../clang/lib/Driver/ToolChains/CommonArgs.cpp | 23 +- .../clang/lib/Driver/ToolChains/Gnu.cpp | 12 +- .../clang/lib/Driver/ToolChains/Solaris.cpp | 3 +- .../clang/lib/Format/ContinuationIndenter.cpp | 2 +- .../clang/lib/Format/MatchFilePath.cpp | 4 +- .../clang/lib/Frontend/DependencyGraph.cpp | 3 +- .../clang/lib/Frontend/LayoutOverrideSource.cpp | 9 +- .../lib/Frontend/VerifyDiagnosticConsumer.cpp | 3 +- .../llvm-project/clang/lib/Headers/usermsrintrin.h | 21 + .../llvm-project/clang/lib/Sema/SemaChecking.cpp | 47 +- .../llvm-project/clang/lib/Sema/SemaDeclAttr.cpp | 3 +- contrib/llvm-project/clang/lib/Sema/SemaInit.cpp | 8 + contrib/llvm-project/clang/lib/Sema/SemaModule.cpp | 3 +- contrib/llvm-project/clang/lib/Sema/SemaOpenMP.cpp | 2 +- .../clang/lib/Serialization/ASTReaderDecl.cpp | 2 +- .../clang/lib/Serialization/ASTWriterDecl.cpp | 11 +- .../StaticAnalyzer/Checkers/ArrayBoundChecker.cpp | 7 +- .../Checkers/BasicObjCFoundationChecks.cpp | 2 +- .../Checkers/BlockInCriticalSectionChecker.cpp | 57 +- .../Checkers/BoolAssignmentChecker.cpp | 7 +- .../lib/StaticAnalyzer/Checkers/CStringChecker.cpp | 382 +++--- .../StaticAnalyzer/Checkers/CXXDeleteChecker.cpp | 24 +- .../Checkers/CallAndMessageChecker.cpp | 9 +- .../StaticAnalyzer/Checkers/CastSizeChecker.cpp | 6 +- .../StaticAnalyzer/Checkers/CheckObjCDealloc.cpp | 48 +- .../Checkers/CheckSecuritySyntaxOnly.cpp | 6 +- .../lib/StaticAnalyzer/Checkers/ChrootChecker.cpp | 6 +- .../lib/StaticAnalyzer/Checkers/CloneChecker.cpp | 15 +- .../StaticAnalyzer/Checkers/ConversionChecker.cpp | 7 +- .../Checkers/DebugContainerModeling.cpp | 15 +- .../Checkers/DebugIteratorModeling.cpp | 15 +- .../lib/StaticAnalyzer/Checkers/DivZeroChecker.cpp | 16 +- .../StaticAnalyzer/Checkers/DynamicTypeChecker.cpp | 10 +- .../Checkers/EnumCastOutOfRangeChecker.cpp | 8 +- .../Checkers/ExprInspectionChecker.cpp | 8 +- .../Checkers/FixedAddressChecker.cpp | 6 +- .../Checkers/InvalidatedIteratorChecker.cpp | 28 +- .../clang/lib/StaticAnalyzer/Checkers/Iterator.cpp | 14 +- .../clang/lib/StaticAnalyzer/Checkers/Iterator.h | 15 +- .../StaticAnalyzer/Checkers/IteratorModeling.cpp | 49 +- .../Checkers/IteratorRangeChecker.cpp | 20 +- .../Checkers/LocalizationChecker.cpp | 12 +- .../Checkers/MPI-Checker/MPIBugReporter.cpp | 6 +- .../Checkers/MPI-Checker/MPIBugReporter.h | 21 +- .../Checkers/MacOSKeychainAPIChecker.cpp | 22 +- .../StaticAnalyzer/Checkers/MacOSXAPIChecker.cpp | 10 +- .../Checkers/MismatchedIteratorChecker.cpp | 49 +- .../Checkers/MmapWriteExecChecker.cpp | 16 +- .../Checkers/NSAutoreleasePoolChecker.cpp | 9 +- .../Checkers/NonNullParamChecker.cpp | 21 +- .../StaticAnalyzer/Checkers/ObjCAtSyncChecker.cpp | 17 +- .../Checkers/ObjCContainersChecker.cpp | 11 +- .../Checkers/ObjCSelfInitChecker.cpp | 9 +- .../Checkers/ObjCSuperDeallocChecker.cpp | 19 +- .../lib/StaticAnalyzer/Checkers/PaddingChecker.cpp | 9 +- .../Checkers/PointerArithChecker.cpp | 12 +- .../StaticAnalyzer/Checkers/PointerSubChecker.cpp | 6 +- .../Checkers/ReturnPointerRangeChecker.cpp | 10 +- .../StaticAnalyzer/Checkers/ReturnUndefChecker.cpp | 15 +- .../Checkers/SimpleStreamChecker.cpp | 27 +- .../Checkers/StdLibraryFunctionsChecker.cpp | 16 +- .../StaticAnalyzer/Checkers/TaggedUnionModeling.h | 2 +- .../StaticAnalyzer/Checkers/TaintTesterChecker.cpp | 5 +- .../Checkers/TestAfterDivZeroChecker.cpp | 10 +- .../StaticAnalyzer/Checkers/UndefBranchChecker.cpp | 89 +- .../Checkers/UndefCapturedBlockVarChecker.cpp | 8 +- .../StaticAnalyzer/Checkers/UndefResultChecker.cpp | 8 +- .../Checkers/UndefinedArraySubscriptChecker.cpp | 7 +- .../Checkers/UndefinedAssignmentChecker.cpp | 11 +- .../UninitializedObject/UninitializedObject.h | 2 +- .../UninitializedObjectChecker.cpp | 11 +- .../lib/StaticAnalyzer/Checkers/UnixAPIChecker.cpp | 32 +- .../lib/StaticAnalyzer/Checkers/VLASizeChecker.cpp | 20 +- .../lib/StaticAnalyzer/Checkers/VforkChecker.cpp | 7 +- .../StaticAnalyzer/Core/CommonBugCategories.cpp | 1 + .../clang/lib/StaticAnalyzer/Core/Environment.cpp | 2 +- .../clang/lib/StaticAnalyzer/Core/RegionStore.cpp | 6 +- .../clang/lib/Support/RISCVVIntrinsicUtils.cpp | 2 +- .../clang/lib/Tooling/Refactoring/Lookup.cpp | 4 +- contrib/llvm-project/clang/lib/Tooling/Tooling.cpp | 4 +- .../clang/tools/clang-format/ClangFormat.cpp | 69 +- .../clang/utils/TableGen/RISCVVEmitter.cpp | 2 +- .../clang/utils/TableGen/SveEmitter.cpp | 19 + .../compiler-rt/lib/asan/asan_linux.cpp | 13 +- .../compiler-rt/lib/asan/asan_new_delete.cpp | 9 - .../compiler-rt/lib/builtins/cpu_model/x86.c | 2 +- .../llvm-project/compiler-rt/lib/builtins/fp_lib.h | 12 - .../compiler-rt/lib/builtins/int_types.h | 2 +- .../compiler-rt/lib/hwasan/hwasan_report.cpp | 11 +- .../compiler-rt/lib/memprof/memprof_linux.cpp | 1 - .../sanitizer_common_interceptors.inc | 4 +- .../lib/sanitizer_common/sanitizer_flat_map.h | 4 + .../lib/sanitizer_common/sanitizer_freebsd.h | 137 -- .../lib/sanitizer_common/sanitizer_linux.cpp | 9 +- .../sanitizer_common/sanitizer_linux_libcdep.cpp | 8 +- .../sanitizer_platform_interceptors.h | 5 +- .../sanitizer_platform_limits_freebsd.h | 2 + .../sanitizer_platform_limits_posix.h | 1 + .../sanitizer_common/sanitizer_procmaps_bsd.cpp | 11 - .../sanitizer_common/sanitizer_stackdepotbase.h | 22 +- .../compiler-rt/lib/tsan/rtl/tsan_platform.h | 32 + .../lib/tsan/rtl/tsan_platform_linux.cpp | 8 +- contrib/llvm-project/libcxx/include/__config | 10 + .../libcxx/include/__memory/shared_ptr.h | 4 +- .../libcxx/include/__memory/unique_ptr.h | 4 - .../libcxx/include/__ranges/chunk_by_view.h | 3 +- .../libcxx/include/__ranges/drop_view.h | 7 +- .../libcxx/include/__ranges/drop_while_view.h | 3 +- .../libcxx/include/__ranges/filter_view.h | 2 +- .../libcxx/include/__ranges/movable_box.h | 62 +- .../libcxx/include/__ranges/repeat_view.h | 4 +- .../libcxx/include/__ranges/single_view.h | 4 +- .../libcxx/include/__ranges/take_while_view.h | 3 +- .../libcxx/include/__ranges/transform_view.h | 3 +- contrib/llvm-project/libcxx/include/memory | 2 +- contrib/llvm-project/lld/COFF/Driver.cpp | 3 + contrib/llvm-project/lld/COFF/Writer.cpp | 2 +- .../llvm/include/llvm/ADT/GenericUniformityImpl.h | 6 + .../llvm/include/llvm/ADT/SmallString.h | 65 +- .../llvm/include/llvm/Analysis/ConstraintSystem.h | 7 - .../include/llvm/Analysis/TargetTransformInfo.h | 22 + .../llvm/Analysis/TargetTransformInfoImpl.h | 7 + .../llvm/CodeGen/GlobalISel/CombinerHelper.h | 18 +- .../include/llvm/Frontend/OpenMP/OMPIRBuilder.h | 7 + .../llvm/include/llvm/IR/IntrinsicsAMDGPU.td | 10 +- .../include/llvm/Support/AMDHSAKernelDescriptor.h | 44 +- .../llvm/Support/X86DisassemblerDecoderCommon.h | 9 +- .../llvm/include/llvm/Target/GlobalISel/Combine.td | 15 +- .../llvm/lib/Analysis/ConstraintSystem.cpp | 10 +- .../llvm/lib/Analysis/InstructionSimplify.cpp | 32 +- .../llvm/lib/Analysis/LazyValueInfo.cpp | 163 ++- .../llvm/lib/Analysis/TargetTransformInfo.cpp | 9 + .../llvm/lib/Analysis/ValueTracking.cpp | 34 - .../llvm-project/llvm/lib/Analysis/VectorUtils.cpp | 2 + .../llvm/lib/Bitcode/Reader/BitcodeReader.cpp | 3 + .../llvm/lib/CodeGen/GlobalISel/CombinerHelper.cpp | 353 +++++- .../llvm/lib/CodeGen/MachineCopyPropagation.cpp | 42 +- .../llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp | 16 +- .../llvm/lib/CodeGen/SelectionDAG/InstrEmitter.cpp | 9 +- .../lib/CodeGen/SelectionDAG/ScheduleDAGFast.cpp | 3 +- .../lib/CodeGen/SelectionDAG/ScheduleDAGRRList.cpp | 8 +- .../llvm/lib/CodeGen/SelectionDAG/SelectionDAG.cpp | 4 +- .../lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp | 3 +- .../Orc/Debugging/DebugInfoSupport.cpp | 3 +- .../llvm/lib/ExecutionEngine/Orc/LLJIT.cpp | 6 +- .../llvm/lib/Frontend/OpenMP/OMPIRBuilder.cpp | 12 +- .../llvm-project/llvm/lib/FuzzMutate/FuzzerCLI.cpp | 16 +- contrib/llvm-project/llvm/lib/IR/DebugInfo.cpp | 4 + .../llvm-project/llvm/lib/MC/WasmObjectWriter.cpp | 3 +- .../llvm/lib/Object/WasmObjectFile.cpp | 21 +- .../llvm/lib/ProfileData/InstrProfReader.cpp | 2 +- .../llvm-project/llvm/lib/Support/RISCVISAInfo.cpp | 11 +- .../llvm-project/llvm/lib/Support/Windows/Path.inc | 5 +- .../lib/Target/AArch64/AArch64ISelDAGToDAG.cpp | 39 +- .../lib/Target/AArch64/AArch64ISelLowering.cpp | 59 +- .../AArch64/Disassembler/AArch64Disassembler.cpp | 2 +- .../Target/AArch64/GISel/AArch64LegalizerInfo.cpp | 14 +- .../llvm/lib/Target/AMDGPU/AMDGPUISelDAGToDAG.cpp | 10 +- .../llvm/lib/Target/AMDGPU/AMDGPUISelLowering.cpp | 18 +- .../llvm/lib/Target/AMDGPU/AMDGPUInstructions.td | 1 + .../lib/Target/AMDGPU/AMDGPURegisterBankInfo.cpp | 1 + .../llvm/lib/Target/AMDGPU/AMDGPURegisterBanks.td | 2 +- .../Target/AMDGPU/AMDGPUResourceUsageAnalysis.cpp | 3 +- .../lib/Target/AMDGPU/AMDGPURewriteUndefForPHI.cpp | 1 - .../lib/Target/AMDGPU/AMDGPUSearchableTables.td | 1 + .../AMDGPU/AMDGPUUnifyDivergentExitNodes.cpp | 3 - .../Target/AMDGPU/AsmParser/AMDGPUAsmParser.cpp | 9 +- .../AMDGPU/Disassembler/AMDGPUDisassembler.cpp | 57 +- .../llvm/lib/Target/AMDGPU/FLATInstructions.td | 11 +- .../AMDGPU/MCTargetDesc/AMDGPUTargetStreamer.cpp | 4 +- .../llvm/lib/Target/AMDGPU/R600ISelLowering.cpp | 6 +- .../llvm/lib/Target/AMDGPU/SIISelLowering.cpp | 58 +- .../llvm/lib/Target/AMDGPU/SIInstrInfo.cpp | 24 +- .../llvm/lib/Target/AMDGPU/SIInstructions.td | 10 + .../llvm/lib/Target/AMDGPU/SIRegisterInfo.cpp | 12 +- .../llvm/lib/Target/AMDGPU/SIRegisterInfo.td | 76 +- .../lib/Target/AMDGPU/Utils/AMDGPUBaseInfo.cpp | 2 - .../llvm/lib/Target/AMDGPU/VOP3PInstructions.td | 22 +- .../llvm/lib/Target/ARC/ARCISelLowering.cpp | 2 +- .../llvm/lib/Target/ARM/ARMBaseInstrInfo.cpp | 9 +- .../llvm/lib/Target/ARM/ARMISelDAGToDAG.cpp | 28 +- .../llvm/lib/Target/ARM/ARMISelLowering.cpp | 69 +- .../llvm/lib/Target/AVR/AVRISelDAGToDAG.cpp | 2 +- .../llvm/lib/Target/AVR/AVRISelLowering.cpp | 5 +- .../llvm/lib/Target/BPF/BPFISelDAGToDAG.cpp | 4 +- .../llvm/lib/Target/CSKY/CSKYISelLowering.cpp | 4 +- .../lib/Target/Hexagon/HexagonISelDAGToDAG.cpp | 34 +- .../lib/Target/Hexagon/HexagonISelDAGToDAGHVX.cpp | 6 +- .../lib/Target/Hexagon/HexagonISelLowering.cpp | 9 +- .../lib/Target/Hexagon/HexagonISelLoweringHVX.cpp | 4 +- .../llvm/lib/Target/Lanai/LanaiISelLowering.cpp | 4 +- .../LoongArch/AsmParser/LoongArchAsmParser.cpp | 12 +- .../lib/Target/LoongArch/LoongArchISelLowering.cpp | 59 +- .../lib/Target/LoongArch/LoongArchISelLowering.h | 1 + .../lib/Target/LoongArch/LoongArchLASXInstrInfo.td | 50 +- .../lib/Target/LoongArch/LoongArchLSXInstrInfo.td | 4 +- .../MCTargetDesc/LoongArchMCCodeEmitter.cpp | 13 + .../LoongArch/MCTargetDesc/LoongArchMCExpr.cpp | 7 +- .../LoongArch/MCTargetDesc/LoongArchMCExpr.h | 8 +- .../llvm/lib/Target/M68k/M68kExpandPseudo.cpp | 10 + .../llvm/lib/Target/M68k/M68kISelLowering.cpp | 243 ++-- .../llvm/lib/Target/M68k/M68kISelLowering.h | 9 + .../llvm/lib/Target/M68k/M68kInstrArithmetic.td | 70 +- .../llvm/lib/Target/M68k/M68kInstrData.td | 3 + .../llvm/lib/Target/M68k/M68kInstrFormats.td | 20 +- .../llvm/lib/Target/M68k/M68kInstrInfo.td | 30 +- .../llvm/lib/Target/MSP430/MSP430ISelLowering.cpp | 6 +- .../llvm/lib/Target/Mips/Mips64InstrInfo.td | 12 +- .../llvm/lib/Target/Mips/MipsISelDAGToDAG.cpp | 20 + .../llvm/lib/Target/Mips/MipsISelDAGToDAG.h | 1 + .../llvm/lib/Target/Mips/MipsISelLowering.cpp | 4 +- .../llvm/lib/Target/Mips/MipsInstrCompiler.td | 33 + .../llvm/lib/Target/Mips/MipsInstrInfo.td | 13 +- .../llvm/lib/Target/Mips/MipsSEISelDAGToDAG.cpp | 8 +- .../llvm/lib/Target/Mips/MipsSEISelLowering.cpp | 8 +- .../llvm/lib/Target/NVPTX/NVPTXISelDAGToDAG.cpp | 6 +- .../llvm/lib/Target/PowerPC/PPCISelDAGToDAG.cpp | 5 +- .../llvm/lib/Target/PowerPC/PPCISelLowering.cpp | 134 +- .../lib/Target/RISCV/AsmParser/RISCVAsmParser.cpp | 45 +- .../RISCV/Disassembler/RISCVDisassembler.cpp | 31 +- .../lib/Target/RISCV/GISel/RISCVLegalizerInfo.cpp | 2 +- .../Target/RISCV/MCTargetDesc/RISCVBaseInfo.cpp | 1 - .../lib/Target/RISCV/MCTargetDesc/RISCVBaseInfo.h | 14 +- .../Target/RISCV/MCTargetDesc/RISCVInstPrinter.cpp | 5 +- .../llvm/lib/Target/RISCV/RISCVCallingConv.td | 4 +- .../llvm/lib/Target/RISCV/RISCVFeatures.td | 29 +- .../llvm/lib/Target/RISCV/RISCVISelDAGToDAG.cpp | 6 +- .../llvm/lib/Target/RISCV/RISCVISelLowering.cpp | 230 +++- .../llvm/lib/Target/RISCV/RISCVInsertWriteVXRM.cpp | 14 +- .../llvm/lib/Target/RISCV/RISCVInstrInfo.cpp | 11 +- .../llvm/lib/Target/RISCV/RISCVInstrInfo.td | 11 +- .../lib/Target/RISCV/RISCVInstrInfoVPseudos.td | 152 +-- .../lib/Target/RISCV/RISCVInstrInfoVVLPatterns.td | 58 + .../llvm/lib/Target/RISCV/RISCVInstrInfoXSf.td | 83 +- .../llvm/lib/Target/RISCV/RISCVInstrInfoZc.td | 5 +- .../llvm/lib/Target/RISCV/RISCVInstrInfoZcmop.td | 34 + .../llvm/lib/Target/RISCV/RISCVInstrInfoZicfiss.td | 72 ++ .../llvm/lib/Target/RISCV/RISCVInstrInfoZimop.td | 59 + .../llvm/lib/Target/RISCV/RISCVProcessors.td | 3 +- .../llvm/lib/Target/RISCV/RISCVRegisterInfo.cpp | 3 + .../llvm/lib/Target/RISCV/RISCVRegisterInfo.td | 7 + .../llvm/lib/Target/RISCV/RISCVSystemOperands.td | 55 +- .../lib/Target/RISCV/RISCVTargetTransformInfo.h | 3 +- .../llvm/lib/Target/SPIRV/SPIRVGlobalRegistry.cpp | 6 +- .../llvm/lib/Target/Sparc/SparcISelLowering.cpp | 4 +- .../lib/Target/SystemZ/SystemZISelLowering.cpp | 76 +- .../llvm/lib/Target/SystemZ/SystemZOperators.td | 4 +- .../llvm/lib/Target/VE/VEISelLowering.cpp | 14 +- .../llvm/lib/Target/X86/AsmParser/X86AsmParser.cpp | 10 +- .../Target/X86/Disassembler/X86Disassembler.cpp | 6 +- .../X86/Disassembler/X86DisassemblerDecoder.h | 1 + .../llvm/lib/Target/X86/MCTargetDesc/X86BaseInfo.h | 13 +- .../X86/MCTargetDesc/X86InstPrinterCommon.cpp | 3 + .../Target/X86/MCTargetDesc/X86MCCodeEmitter.cpp | 43 +- contrib/llvm-project/llvm/lib/Target/X86/X86.td | 11 +- .../llvm/lib/Target/X86/X86ISelDAGToDAG.cpp | 4 +- .../llvm/lib/Target/X86/X86ISelLowering.cpp | 10 +- .../llvm/lib/Target/X86/X86InsertPrefetch.cpp | 3 +- .../llvm/lib/Target/X86/X86InstrAMX.td | 68 +- .../llvm/lib/Target/X86/X86InstrAVX512.td | 11 + .../llvm/lib/Target/X86/X86InstrArithmetic.td | 1306 +++++++++----------- .../llvm/lib/Target/X86/X86InstrFormats.td | 2 + .../llvm/lib/Target/X86/X86InstrPredicates.td | 3 +- .../llvm/lib/Target/X86/X86InstrSSE.td | 94 +- .../llvm/lib/Target/X86/X86InstrSystem.td | 4 +- .../llvm/lib/Target/X86/X86InstrUtils.td | 426 ++++++- .../llvm/lib/Target/X86/X86InstrVecCompiler.td | 9 + .../llvm/lib/Target/X86/X86TargetTransformInfo.cpp | 26 +- .../llvm/lib/Target/X86/X86TargetTransformInfo.h | 5 + .../llvm/lib/Target/XCore/XCoreISelDAGToDAG.cpp | 2 +- .../llvm/lib/Target/XCore/XCoreISelLowering.cpp | 56 +- .../llvm/lib/TargetParser/ARMTargetParser.cpp | 6 +- .../llvm-project/llvm/lib/TargetParser/Host.cpp | 2 +- .../llvm-project/llvm/lib/TargetParser/Triple.cpp | 3 +- .../llvm/lib/TargetParser/X86TargetParser.cpp | 4 +- .../llvm-project/llvm/lib/TextAPI/TextStubV5.cpp | 7 +- .../llvm/lib/Transforms/Coroutines/CoroFrame.cpp | 6 +- .../llvm/lib/Transforms/IPO/FunctionAttrs.cpp | 46 +- .../Transforms/InstCombine/InstCombineAddSub.cpp | 4 +- .../Transforms/InstCombine/InstCombineAndOrXor.cpp | 14 +- .../Transforms/InstCombine/InstCombineCalls.cpp | 6 + .../Transforms/InstCombine/InstCombineCompares.cpp | 196 ++- .../Transforms/InstCombine/InstCombineInternal.h | 7 +- .../Transforms/InstCombine/InstCombineSelect.cpp | 71 +- .../InstCombine/InstructionCombining.cpp | 58 +- .../Transforms/Scalar/ConstraintElimination.cpp | 64 +- .../Transforms/Utils/CanonicalizeFreezeInLoops.cpp | 60 +- .../llvm/lib/Transforms/Utils/Local.cpp | 5 +- .../lib/Transforms/Vectorize/LoopVectorize.cpp | 63 +- .../lib/Transforms/Vectorize/SLPVectorizer.cpp | 146 ++- .../llvm/lib/Transforms/Vectorize/VPlan.h | 30 + .../llvm/lib/Transforms/Vectorize/VPlanRecipes.cpp | 65 +- .../llvm/lib/Transforms/Vectorize/VPlanValue.h | 1 + .../llvm-project/llvm/tools/llvm-ar/llvm-ar.cpp | 3 +- .../llvm/tools/llvm-diff/llvm-diff.cpp | 3 +- .../llvm/utils/TableGen/X86DisassemblerTables.cpp | 21 +- .../llvm/utils/TableGen/X86FoldTablesEmitter.cpp | 18 +- .../llvm/utils/TableGen/X86RecognizableInstr.cpp | 37 +- .../llvm/utils/TableGen/X86RecognizableInstr.h | 4 +- lib/clang/include/Plugins/Plugins.def | 1 + lib/clang/include/VCSVersion.inc | 6 +- lib/clang/include/lld/Common/Version.inc | 2 +- lib/clang/include/llvm/Config/AsmParsers.def | 23 + lib/clang/include/llvm/Config/AsmPrinters.def | 23 + lib/clang/include/llvm/Config/Disassemblers.def | 23 + lib/clang/include/llvm/Config/TargetMCAs.def | 23 + lib/clang/include/llvm/Config/Targets.def | 22 + lib/clang/include/llvm/Support/VCSRevision.h | 2 +- lib/clang/liblldb/Makefile | 1 + lib/clang/libllvm/Makefile | 1 + 335 files changed, 5221 insertions(+), 3749 deletions(-) diff --cc ObsoleteFiles.inc index 146957a6b87f,000000000000..f9728ccd799e mode 100644,000000..100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@@ -1,18868 -1,0 +1,18871 @@@ +# +# +# This file lists old files (OLD_FILES), libraries (OLD_LIBS, MOVED_LIBS) +# and directories (OLD_DIRS) which should get removed after an update. +# Recently removed entries should be listed first (with the date as a +# comment). OLD_LIBS and MOVED_LIBS should only list dynamic libraries. +# Static libraries, links to dynamic libraries (lib*.so), and linker scripts +# should be listed in OLD_FILES. OLD_LIBS and MOVED_LIBS are removed by the +# delete-old-libs target, whereas OLD_FILES and OLD_DIRS are removed by the +# delete-old target. This separation allows users to avoid deleting old +# dynamic libraries still required by existing binaries. +# +# MOVED_LIBS should be used instead of OLD_LIBS when a library is moved +# from usr/lib to lib or vice versa. This avoids removing libraries for +# alternate ABIs (such as lib32) which store all libraries in a single +# directory (e.g. usr/lib32). +# +# For files listed in OLD_FILES, OLD_LIBS, and MOVED_LIBS, the check-old* +# and delete-old* targets will also delete associated debug symbols from +# usr/lib/debug. +# +# In case of a complete directory hierarchy the sorting is in depth first +# order. +# +# Files that are installed or removed depending on some build option +# should be listed in /usr/src/tools/build/mk/OptionalObsoleteFiles.inc +# instead of in this file. +# +# Before you commit changes to this file please check if any entries in +# tools/build/mk/OptionalObsoleteFiles.inc can be removed. The following +# command tells which files are listed more than once regardless of some +# architecture specific conditionals, so you can not blindly trust the +# output: +# ( grep '+=' /usr/src/ObsoleteFiles.inc | sort -u ; \ +# grep '+=' /usr/src/tools/build/mk/OptionalObsoleteFiles.inc | sort -u) | \ +# sort | uniq -d +# +# To find regular duplicates not dependent on optional components, you can +# also use something that will not give you false positives, e.g.: +# for t in `make -V TARGETS universe`; do +# __MAKE_CONF=/dev/null make -f Makefile.inc1 TARGET=$t \ +# -V OLD_FILES -V OLD_LIBS -V MOVED_LIBS -V OLD_DIRS check-old | \ +# xargs -n1 | sort | uniq -d; +# done +# +# For optional components, you can use the following to see if some entries +# in OptionalObsoleteFiles.inc have been obsoleted by ObsoleteFiles.inc +# for o in tools/build/options/WITH*; do +# __MAKE_CONF=/dev/null make -f Makefile.inc1 -D${o##*/} \ +# -V OLD_FILES -V OLD_LIBS -V MOVED_LIBS -V OLD_DIRS check-old | \ +# xargs -n1 | sort | uniq -d; +# done + +# 2024mmdd: new clang import which bumps version from 17 to 18 +OLD_FILES+=usr/lib/clang/17/include/__clang_cuda_builtin_vars.h +OLD_FILES+=usr/lib/clang/17/include/__clang_cuda_cmath.h +OLD_FILES+=usr/lib/clang/17/include/__clang_cuda_complex_builtins.h +OLD_FILES+=usr/lib/clang/17/include/__clang_cuda_device_functions.h +OLD_FILES+=usr/lib/clang/17/include/__clang_cuda_intrinsics.h +OLD_FILES+=usr/lib/clang/17/include/__clang_cuda_libdevice_declares.h +OLD_FILES+=usr/lib/clang/17/include/__clang_cuda_math.h +OLD_FILES+=usr/lib/clang/17/include/__clang_cuda_math_forward_declares.h +OLD_FILES+=usr/lib/clang/17/include/__clang_cuda_runtime_wrapper.h +OLD_FILES+=usr/lib/clang/17/include/__clang_cuda_texture_intrinsics.h +OLD_FILES+=usr/lib/clang/17/include/__clang_hip_cmath.h +OLD_FILES+=usr/lib/clang/17/include/__clang_hip_libdevice_declares.h +OLD_FILES+=usr/lib/clang/17/include/__clang_hip_math.h +OLD_FILES+=usr/lib/clang/17/include/__clang_hip_runtime_wrapper.h +OLD_FILES+=usr/lib/clang/17/include/__clang_hip_stdlib.h +OLD_FILES+=usr/lib/clang/17/include/__stddef_max_align_t.h +OLD_FILES+=usr/lib/clang/17/include/__wmmintrin_aes.h +OLD_FILES+=usr/lib/clang/17/include/__wmmintrin_pclmul.h +OLD_FILES+=usr/lib/clang/17/include/adxintrin.h +OLD_FILES+=usr/lib/clang/17/include/altivec.h +OLD_FILES+=usr/lib/clang/17/include/ammintrin.h +OLD_FILES+=usr/lib/clang/17/include/amxcomplexintrin.h +OLD_FILES+=usr/lib/clang/17/include/amxfp16intrin.h +OLD_FILES+=usr/lib/clang/17/include/amxintrin.h +OLD_FILES+=usr/lib/clang/17/include/arm64intr.h +OLD_FILES+=usr/lib/clang/17/include/arm_acle.h +OLD_FILES+=usr/lib/clang/17/include/arm_bf16.h +OLD_FILES+=usr/lib/clang/17/include/arm_cde.h +OLD_FILES+=usr/lib/clang/17/include/arm_cmse.h +OLD_FILES+=usr/lib/clang/17/include/arm_fp16.h +OLD_FILES+=usr/lib/clang/17/include/arm_mve.h +OLD_FILES+=usr/lib/clang/17/include/arm_neon.h +OLD_FILES+=usr/lib/clang/17/include/arm_neon_sve_bridge.h +OLD_FILES+=usr/lib/clang/17/include/arm_sme_draft_spec_subject_to_change.h +OLD_FILES+=usr/lib/clang/17/include/arm_sve.h +OLD_FILES+=usr/lib/clang/17/include/armintr.h +OLD_FILES+=usr/lib/clang/17/include/avx2intrin.h +OLD_FILES+=usr/lib/clang/17/include/avx512bf16intrin.h +OLD_FILES+=usr/lib/clang/17/include/avx512bitalgintrin.h +OLD_FILES+=usr/lib/clang/17/include/avx512bwintrin.h +OLD_FILES+=usr/lib/clang/17/include/avx512cdintrin.h +OLD_FILES+=usr/lib/clang/17/include/avx512dqintrin.h +OLD_FILES+=usr/lib/clang/17/include/avx512erintrin.h +OLD_FILES+=usr/lib/clang/17/include/avx512fintrin.h +OLD_FILES+=usr/lib/clang/17/include/avx512fp16intrin.h +OLD_FILES+=usr/lib/clang/17/include/avx512ifmaintrin.h +OLD_FILES+=usr/lib/clang/17/include/avx512ifmavlintrin.h +OLD_FILES+=usr/lib/clang/17/include/avx512pfintrin.h +OLD_FILES+=usr/lib/clang/17/include/avx512vbmi2intrin.h +OLD_FILES+=usr/lib/clang/17/include/avx512vbmiintrin.h +OLD_FILES+=usr/lib/clang/17/include/avx512vbmivlintrin.h +OLD_FILES+=usr/lib/clang/17/include/avx512vlbf16intrin.h +OLD_FILES+=usr/lib/clang/17/include/avx512vlbitalgintrin.h +OLD_FILES+=usr/lib/clang/17/include/avx512vlbwintrin.h +OLD_FILES+=usr/lib/clang/17/include/avx512vlcdintrin.h +OLD_FILES+=usr/lib/clang/17/include/avx512vldqintrin.h +OLD_FILES+=usr/lib/clang/17/include/avx512vlfp16intrin.h +OLD_FILES+=usr/lib/clang/17/include/avx512vlintrin.h +OLD_FILES+=usr/lib/clang/17/include/avx512vlvbmi2intrin.h +OLD_FILES+=usr/lib/clang/17/include/avx512vlvnniintrin.h +OLD_FILES+=usr/lib/clang/17/include/avx512vlvp2intersectintrin.h +OLD_FILES+=usr/lib/clang/17/include/avx512vnniintrin.h +OLD_FILES+=usr/lib/clang/17/include/avx512vp2intersectintrin.h +OLD_FILES+=usr/lib/clang/17/include/avx512vpopcntdqintrin.h +OLD_FILES+=usr/lib/clang/17/include/avx512vpopcntdqvlintrin.h +OLD_FILES+=usr/lib/clang/17/include/avxifmaintrin.h +OLD_FILES+=usr/lib/clang/17/include/avxintrin.h +OLD_FILES+=usr/lib/clang/17/include/avxneconvertintrin.h +OLD_FILES+=usr/lib/clang/17/include/avxvnniint16intrin.h +OLD_FILES+=usr/lib/clang/17/include/avxvnniint8intrin.h +OLD_FILES+=usr/lib/clang/17/include/avxvnniintrin.h +OLD_FILES+=usr/lib/clang/17/include/bmi2intrin.h +OLD_FILES+=usr/lib/clang/17/include/bmiintrin.h +OLD_FILES+=usr/lib/clang/17/include/builtins.h +OLD_FILES+=usr/lib/clang/17/include/cet.h +OLD_FILES+=usr/lib/clang/17/include/cetintrin.h +OLD_FILES+=usr/lib/clang/17/include/cldemoteintrin.h +OLD_FILES+=usr/lib/clang/17/include/clflushoptintrin.h +OLD_FILES+=usr/lib/clang/17/include/clwbintrin.h +OLD_FILES+=usr/lib/clang/17/include/clzerointrin.h +OLD_FILES+=usr/lib/clang/17/include/cmpccxaddintrin.h +OLD_FILES+=usr/lib/clang/17/include/cpuid.h +OLD_FILES+=usr/lib/clang/17/include/crc32intrin.h +OLD_FILES+=usr/lib/clang/17/include/cuda_wrappers/algorithm ++OLD_FILES+=usr/lib/clang/17/include/cuda_wrappers/bits/basic_string.h ++OLD_FILES+=usr/lib/clang/17/include/cuda_wrappers/bits/basic_string.tcc +OLD_FILES+=usr/lib/clang/17/include/cuda_wrappers/bits/shared_ptr_base.h +OLD_DIRS+=usr/lib/clang/17/include/cuda_wrappers/bits +OLD_FILES+=usr/lib/clang/17/include/cuda_wrappers/cmath +OLD_FILES+=usr/lib/clang/17/include/cuda_wrappers/complex +OLD_FILES+=usr/lib/clang/17/include/cuda_wrappers/new ++OLD_FILES+=usr/lib/clang/17/include/cuda_wrappers/shared_ptr_base.h +OLD_DIRS+=usr/lib/clang/17/include/cuda_wrappers +OLD_FILES+=usr/lib/clang/17/include/emmintrin.h +OLD_FILES+=usr/lib/clang/17/include/enqcmdintrin.h +OLD_FILES+=usr/lib/clang/17/include/f16cintrin.h +OLD_FILES+=usr/lib/clang/17/include/float.h +OLD_FILES+=usr/lib/clang/17/include/fma4intrin.h +OLD_FILES+=usr/lib/clang/17/include/fmaintrin.h +OLD_FILES+=usr/lib/clang/17/include/fuzzer/FuzzedDataProvider.h +OLD_DIRS+=usr/lib/clang/17/include/fuzzer +OLD_FILES+=usr/lib/clang/17/include/fxsrintrin.h +OLD_FILES+=usr/lib/clang/17/include/gfniintrin.h +OLD_FILES+=usr/lib/clang/17/include/hexagon_circ_brev_intrinsics.h +OLD_FILES+=usr/lib/clang/17/include/hexagon_protos.h +OLD_FILES+=usr/lib/clang/17/include/hexagon_types.h +OLD_FILES+=usr/lib/clang/17/include/hlsl/hlsl_basic_types.h +OLD_FILES+=usr/lib/clang/17/include/hlsl/hlsl_intrinsics.h +OLD_DIRS+=usr/lib/clang/17/include/hlsl +OLD_FILES+=usr/lib/clang/17/include/hlsl.h +OLD_FILES+=usr/lib/clang/17/include/hresetintrin.h +OLD_FILES+=usr/lib/clang/17/include/htmintrin.h +OLD_FILES+=usr/lib/clang/17/include/htmxlintrin.h +OLD_FILES+=usr/lib/clang/17/include/hvx_hexagon_protos.h +OLD_FILES+=usr/lib/clang/17/include/ia32intrin.h +OLD_FILES+=usr/lib/clang/17/include/immintrin.h +OLD_FILES+=usr/lib/clang/17/include/intrin.h +OLD_FILES+=usr/lib/clang/17/include/inttypes.h +OLD_FILES+=usr/lib/clang/17/include/invpcidintrin.h +OLD_FILES+=usr/lib/clang/17/include/iso646.h +OLD_FILES+=usr/lib/clang/17/include/keylockerintrin.h +OLD_FILES+=usr/lib/clang/17/include/larchintrin.h +OLD_FILES+=usr/lib/clang/17/include/limits.h +OLD_FILES+=usr/lib/clang/17/include/lwpintrin.h +OLD_FILES+=usr/lib/clang/17/include/lzcntintrin.h +OLD_FILES+=usr/lib/clang/17/include/mm3dnow.h +OLD_FILES+=usr/lib/clang/17/include/mm_malloc.h +OLD_FILES+=usr/lib/clang/17/include/mmintrin.h +OLD_FILES+=usr/lib/clang/17/include/module.modulemap +OLD_FILES+=usr/lib/clang/17/include/movdirintrin.h +OLD_FILES+=usr/lib/clang/17/include/msa.h +OLD_FILES+=usr/lib/clang/17/include/mwaitxintrin.h +OLD_FILES+=usr/lib/clang/17/include/nmmintrin.h +OLD_FILES+=usr/lib/clang/17/include/omp-tools.h +OLD_FILES+=usr/lib/clang/17/include/omp.h +OLD_FILES+=usr/lib/clang/17/include/ompt.h +OLD_FILES+=usr/lib/clang/17/include/opencl-c-base.h +OLD_FILES+=usr/lib/clang/17/include/opencl-c.h +OLD_FILES+=usr/lib/clang/17/include/openmp_wrappers/__clang_openmp_device_functions.h +OLD_FILES+=usr/lib/clang/17/include/openmp_wrappers/cmath +OLD_FILES+=usr/lib/clang/17/include/openmp_wrappers/complex +OLD_FILES+=usr/lib/clang/17/include/openmp_wrappers/complex.h +OLD_FILES+=usr/lib/clang/17/include/openmp_wrappers/complex_cmath.h +OLD_FILES+=usr/lib/clang/17/include/openmp_wrappers/math.h +OLD_FILES+=usr/lib/clang/17/include/openmp_wrappers/new +OLD_DIRS+=usr/lib/clang/17/include/openmp_wrappers +OLD_FILES+=usr/lib/clang/17/include/orc_rt/c_api.h +OLD_DIRS+=usr/lib/clang/17/include/orc_rt +OLD_FILES+=usr/lib/clang/17/include/pconfigintrin.h +OLD_FILES+=usr/lib/clang/17/include/pkuintrin.h +OLD_FILES+=usr/lib/clang/17/include/pmmintrin.h +OLD_FILES+=usr/lib/clang/17/include/popcntintrin.h +OLD_FILES+=usr/lib/clang/17/include/ppc_wrappers/bmi2intrin.h +OLD_FILES+=usr/lib/clang/17/include/ppc_wrappers/bmiintrin.h +OLD_FILES+=usr/lib/clang/17/include/ppc_wrappers/emmintrin.h +OLD_FILES+=usr/lib/clang/17/include/ppc_wrappers/immintrin.h +OLD_FILES+=usr/lib/clang/17/include/ppc_wrappers/mm_malloc.h +OLD_FILES+=usr/lib/clang/17/include/ppc_wrappers/mmintrin.h +OLD_FILES+=usr/lib/clang/17/include/ppc_wrappers/pmmintrin.h +OLD_FILES+=usr/lib/clang/17/include/ppc_wrappers/smmintrin.h +OLD_FILES+=usr/lib/clang/17/include/ppc_wrappers/tmmintrin.h +OLD_FILES+=usr/lib/clang/17/include/ppc_wrappers/x86gprintrin.h +OLD_FILES+=usr/lib/clang/17/include/ppc_wrappers/x86intrin.h +OLD_FILES+=usr/lib/clang/17/include/ppc_wrappers/xmmintrin.h +OLD_DIRS+=usr/lib/clang/17/include/ppc_wrappers +OLD_FILES+=usr/lib/clang/17/include/prfchiintrin.h +OLD_FILES+=usr/lib/clang/17/include/prfchwintrin.h +OLD_FILES+=usr/lib/clang/17/include/profile/InstrProfData.inc +OLD_FILES+=usr/lib/clang/17/include/profile/MemProfData.inc +OLD_DIRS+=usr/lib/clang/17/include/profile +OLD_FILES+=usr/lib/clang/17/include/ptwriteintrin.h +OLD_FILES+=usr/lib/clang/17/include/raointintrin.h +OLD_FILES+=usr/lib/clang/17/include/rdpruintrin.h +OLD_FILES+=usr/lib/clang/17/include/rdseedintrin.h +OLD_FILES+=usr/lib/clang/17/include/riscv_ntlh.h +OLD_FILES+=usr/lib/clang/17/include/riscv_vector.h +OLD_FILES+=usr/lib/clang/17/include/rtmintrin.h +OLD_FILES+=usr/lib/clang/17/include/s390intrin.h +OLD_FILES+=usr/lib/clang/17/include/sanitizer/allocator_interface.h +OLD_FILES+=usr/lib/clang/17/include/sanitizer/asan_interface.h +OLD_FILES+=usr/lib/clang/17/include/sanitizer/common_interface_defs.h +OLD_FILES+=usr/lib/clang/17/include/sanitizer/coverage_interface.h +OLD_FILES+=usr/lib/clang/17/include/sanitizer/dfsan_interface.h +OLD_FILES+=usr/lib/clang/17/include/sanitizer/hwasan_interface.h +OLD_FILES+=usr/lib/clang/17/include/sanitizer/linux_syscall_hooks.h +OLD_FILES+=usr/lib/clang/17/include/sanitizer/lsan_interface.h +OLD_FILES+=usr/lib/clang/17/include/sanitizer/memprof_interface.h +OLD_FILES+=usr/lib/clang/17/include/sanitizer/msan_interface.h +OLD_FILES+=usr/lib/clang/17/include/sanitizer/netbsd_syscall_hooks.h +OLD_FILES+=usr/lib/clang/17/include/sanitizer/scudo_interface.h +OLD_FILES+=usr/lib/clang/17/include/sanitizer/tsan_interface.h +OLD_FILES+=usr/lib/clang/17/include/sanitizer/tsan_interface_atomic.h +OLD_FILES+=usr/lib/clang/17/include/sanitizer/ubsan_interface.h +OLD_DIRS+=usr/lib/clang/17/include/sanitizer +OLD_FILES+=usr/lib/clang/17/include/serializeintrin.h +OLD_FILES+=usr/lib/clang/17/include/sgxintrin.h +OLD_FILES+=usr/lib/clang/17/include/sha512intrin.h +OLD_FILES+=usr/lib/clang/17/include/shaintrin.h +OLD_FILES+=usr/lib/clang/17/include/sifive_vector.h +OLD_FILES+=usr/lib/clang/17/include/sm3intrin.h +OLD_FILES+=usr/lib/clang/17/include/sm4intrin.h +OLD_FILES+=usr/lib/clang/17/include/smmintrin.h +OLD_FILES+=usr/lib/clang/17/include/stdalign.h +OLD_FILES+=usr/lib/clang/17/include/stdarg.h +OLD_FILES+=usr/lib/clang/17/include/stdatomic.h +OLD_FILES+=usr/lib/clang/17/include/stdbool.h +OLD_FILES+=usr/lib/clang/17/include/stddef.h +OLD_FILES+=usr/lib/clang/17/include/stdint.h +OLD_FILES+=usr/lib/clang/17/include/stdnoreturn.h +OLD_FILES+=usr/lib/clang/17/include/tbmintrin.h +OLD_FILES+=usr/lib/clang/17/include/tgmath.h +OLD_FILES+=usr/lib/clang/17/include/tmmintrin.h +OLD_FILES+=usr/lib/clang/17/include/tsxldtrkintrin.h +OLD_FILES+=usr/lib/clang/17/include/uintrintrin.h +OLD_FILES+=usr/lib/clang/17/include/unwind.h +OLD_FILES+=usr/lib/clang/17/include/vadefs.h +OLD_FILES+=usr/lib/clang/17/include/vaesintrin.h +OLD_FILES+=usr/lib/clang/17/include/varargs.h +OLD_FILES+=usr/lib/clang/17/include/vecintrin.h +OLD_FILES+=usr/lib/clang/17/include/velintrin.h +OLD_FILES+=usr/lib/clang/17/include/velintrin_approx.h +OLD_FILES+=usr/lib/clang/17/include/velintrin_gen.h +OLD_FILES+=usr/lib/clang/17/include/vpclmulqdqintrin.h +OLD_FILES+=usr/lib/clang/17/include/waitpkgintrin.h +OLD_FILES+=usr/lib/clang/17/include/wasm_simd128.h +OLD_FILES+=usr/lib/clang/17/include/wbnoinvdintrin.h +OLD_FILES+=usr/lib/clang/17/include/wmmintrin.h +OLD_FILES+=usr/lib/clang/17/include/x86gprintrin.h +OLD_FILES+=usr/lib/clang/17/include/x86intrin.h +OLD_FILES+=usr/lib/clang/17/include/xmmintrin.h +OLD_FILES+=usr/lib/clang/17/include/xopintrin.h +OLD_FILES+=usr/lib/clang/17/include/xray/xray_interface.h +OLD_FILES+=usr/lib/clang/17/include/xray/xray_log_interface.h +OLD_FILES+=usr/lib/clang/17/include/xray/xray_records.h +OLD_DIRS+=usr/lib/clang/17/include/xray +OLD_FILES+=usr/lib/clang/17/include/xsavecintrin.h +OLD_FILES+=usr/lib/clang/17/include/xsaveintrin.h +OLD_FILES+=usr/lib/clang/17/include/xsaveoptintrin.h +OLD_FILES+=usr/lib/clang/17/include/xsavesintrin.h +OLD_FILES+=usr/lib/clang/17/include/xtestintrin.h +OLD_DIRS+=usr/lib/clang/17/include +OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.asan-aarch64.a +OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.asan-aarch64.so +OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.asan-arm.a +OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.asan-arm.so +OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.asan-armhf.a +OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.asan-armhf.so +OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.asan-i386.a +OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.asan-i386.so +OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.asan-powerpc64.a +OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.asan-powerpc64.so +OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.asan-powerpc64le.a +OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.asan-powerpc64le.so +OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.asan-preinit-aarch64.a +OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.asan-preinit-arm.a +OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.asan-preinit-armhf.a +OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.asan-preinit-i386.a +OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.asan-preinit-powerpc64.a +OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.asan-preinit-powerpc64le.a +OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.asan-preinit-riscv64.a +OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.asan-preinit-x86_64.a +OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.asan-riscv64.a +OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.asan-riscv64.so +OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.asan-x86_64.a +OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.asan-x86_64.so +OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.asan_cxx-aarch64.a +OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.asan_cxx-arm.a +OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.asan_cxx-armhf.a +OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.asan_cxx-i386.a +OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.asan_cxx-powerpc64.a +OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.asan_cxx-powerpc64le.a +OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.asan_cxx-riscv64.a +OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.asan_cxx-x86_64.a +OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.asan_static-i386.a +OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.asan_static-powerpc64.a +OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.asan_static-powerpc64le.a +OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.asan_static-x86_64.a +OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.cfi-aarch64.a +OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.cfi-arm.a +OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.cfi-armhf.a +OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.cfi-i386.a +OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.cfi-x86_64.a +OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.cfi_diag-aarch64.a +OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.cfi_diag-arm.a +OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.cfi_diag-armhf.a +OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.cfi_diag-i386.a +OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.cfi_diag-x86_64.a +OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.dd-aarch64.a +OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.dd-x86_64.a +OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.fuzzer-aarch64.a +OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.fuzzer-x86_64.a +OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.fuzzer_interceptors-x86_64.a +OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.fuzzer_no_main-aarch64.a +OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.fuzzer_no_main-x86_64.a +OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.msan-aarch64.a +OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.msan-powerpc64.a +OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.msan-powerpc64le.a +OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.msan-x86_64.a +OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.msan_cxx-aarch64.a +OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.msan_cxx-powerpc64.a +OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.msan_cxx-powerpc64le.a +OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.msan_cxx-x86_64.a +OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.profile-aarch64.a +OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.profile-arm.a +OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.profile-armhf.a +OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.profile-i386.a +OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.profile-powerpc.a +OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.profile-powerpc64.a +OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.profile-powerpc64le.a +OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.profile-riscv64.a +OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.profile-x86_64.a +OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.safestack-aarch64.a +OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.safestack-i386.a +OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.safestack-x86_64.a +OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.stats-aarch64.a +OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.stats-arm.a +OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.stats-armhf.a +OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.stats-i386.a +OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.stats-powerpc64.a +OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.stats-powerpc64le.a +OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.stats-riscv64.a +OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.stats-x86_64.a +OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.stats_client-aarch64.a +OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.stats_client-arm.a +OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.stats_client-armhf.a +OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.stats_client-i386.a +OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.stats_client-powerpc64.a +OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.stats_client-powerpc64le.a +OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.stats_client-riscv64.a +OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.stats_client-x86_64.a +OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.tsan-aarch64.a +OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.tsan-powerpc64.a +OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.tsan-powerpc64le.a +OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.tsan-x86_64.a +OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.tsan_cxx-aarch64.a +OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.tsan_cxx-powerpc64.a +OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.tsan_cxx-powerpc64le.a +OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.tsan_cxx-x86_64.a +OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.ubsan_minimal-aarch64.a +OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.ubsan_minimal-arm.a +OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.ubsan_minimal-armhf.a +OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.ubsan_minimal-i386.a +OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.ubsan_minimal-powerpc64.a +OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.ubsan_minimal-powerpc64le.a +OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.ubsan_minimal-riscv64.a +OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.ubsan_minimal-x86_64.a +OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.ubsan_standalone-aarch64.a +OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.ubsan_standalone-arm.a +OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.ubsan_standalone-armhf.a +OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.ubsan_standalone-i386.a +OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.ubsan_standalone-powerpc64.a +OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.ubsan_standalone-powerpc64le.a +OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.ubsan_standalone-riscv64.a +OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.ubsan_standalone-x86_64.a +OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.ubsan_standalone_cxx-aarch64.a +OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.ubsan_standalone_cxx-arm.a +OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.ubsan_standalone_cxx-armhf.a +OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.ubsan_standalone_cxx-i386.a +OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.ubsan_standalone_cxx-powerpc64.a +OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.ubsan_standalone_cxx-powerpc64le.a +OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.ubsan_standalone_cxx-riscv64.a +OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.ubsan_standalone_cxx-x86_64.a +OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.xray-aarch64.a +OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.xray-arm.a +OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.xray-armhf.a +OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.xray-basic-aarch64.a +OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.xray-basic-arm.a +OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.xray-basic-armhf.a +OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.xray-basic-powerpc64le.a +OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.xray-basic-x86_64.a +OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.xray-fdr-aarch64.a +OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.xray-fdr-arm.a +OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.xray-fdr-armhf.a +OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.xray-fdr-powerpc64le.a +OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.xray-fdr-x86_64.a +OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.xray-powerpc64le.a +OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.xray-profiling-aarch64.a +OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.xray-profiling-arm.a +OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.xray-profiling-armhf.a +OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.xray-profiling-powerpc64le.a +OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.xray-profiling-x86_64.a +OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.xray-x86_64.a +OLD_DIRS+=usr/lib/clang/17/lib/freebsd +OLD_DIRS+=usr/lib/clang/17/lib +OLD_FILES+=usr/lib/clang/17/share/asan_ignorelist.txt +OLD_FILES+=usr/lib/clang/17/share/cfi_ignorelist.txt +OLD_FILES+=usr/lib/clang/17/share/msan_ignorelist.txt +OLD_DIRS+=usr/lib/clang/17/share +OLD_DIRS+=usr/lib/clang/17 + +# 2024mmdd: new libc++ import which bumps version from 17 to 18 - OLD_FILES+=usr/include/include/c++/v1/__pstl/internal/algorithm_fwd.h - OLD_FILES+=usr/include/include/c++/v1/__pstl/internal/algorithm_impl.h - OLD_FILES+=usr/include/include/c++/v1/__pstl/internal/execution_defs.h - OLD_FILES+=usr/include/include/c++/v1/__pstl/internal/execution_impl.h - OLD_FILES+=usr/include/include/c++/v1/__pstl/internal/glue_algorithm_defs.h - OLD_FILES+=usr/include/include/c++/v1/__pstl/internal/glue_algorithm_impl.h - OLD_FILES+=usr/include/include/c++/v1/__pstl/internal/glue_memory_defs.h - OLD_FILES+=usr/include/include/c++/v1/__pstl/internal/glue_memory_impl.h - OLD_FILES+=usr/include/include/c++/v1/__pstl/internal/glue_numeric_defs.h - OLD_FILES+=usr/include/include/c++/v1/__pstl/internal/glue_numeric_impl.h - OLD_FILES+=usr/include/include/c++/v1/__pstl/internal/memory_impl.h - OLD_FILES+=usr/include/include/c++/v1/__pstl/internal/numeric_fwd.h - OLD_FILES+=usr/include/include/c++/v1/__pstl/internal/numeric_impl.h - OLD_FILES+=usr/include/include/c++/v1/__pstl/internal/omp/parallel_for.h - OLD_FILES+=usr/include/include/c++/v1/__pstl/internal/omp/parallel_for_each.h - OLD_FILES+=usr/include/include/c++/v1/__pstl/internal/omp/parallel_invoke.h - OLD_FILES+=usr/include/include/c++/v1/__pstl/internal/omp/parallel_merge.h - OLD_FILES+=usr/include/include/c++/v1/__pstl/internal/omp/parallel_scan.h - OLD_FILES+=usr/include/include/c++/v1/__pstl/internal/omp/parallel_stable_partial_sort.h - OLD_FILES+=usr/include/include/c++/v1/__pstl/internal/omp/parallel_stable_sort.h - OLD_FILES+=usr/include/include/c++/v1/__pstl/internal/omp/parallel_transform_reduce.h - OLD_FILES+=usr/include/include/c++/v1/__pstl/internal/omp/parallel_transform_scan.h - OLD_FILES+=usr/include/include/c++/v1/__pstl/internal/omp/util.h - OLD_DIRS+=usr/include/include/c++/v1/__pstl/internal/omp - OLD_FILES+=usr/include/include/c++/v1/__pstl/internal/parallel_backend.h - OLD_FILES+=usr/include/include/c++/v1/__pstl/internal/parallel_backend_omp.h - OLD_FILES+=usr/include/include/c++/v1/__pstl/internal/parallel_backend_serial.h - OLD_FILES+=usr/include/include/c++/v1/__pstl/internal/parallel_backend_tbb.h - OLD_FILES+=usr/include/include/c++/v1/__pstl/internal/parallel_backend_utils.h - OLD_FILES+=usr/include/include/c++/v1/__pstl/internal/unseq_backend_simd.h - OLD_FILES+=usr/include/include/c++/v1/__pstl/internal/utils.h - OLD_DIRS+=usr/include/include/c++/v1/__pstl/internal - OLD_DIRS+=usr/include/include/c++/v1/__pstl - OLD_FILES+=usr/include/include/c++/v1/__pstl_algorithm - OLD_FILES+=usr/include/include/c++/v1/__pstl_memory - OLD_FILES+=usr/include/include/c++/v1/__pstl_numeric - OLD_FILES+=usr/include/include/c++/v1/__type_traits/predicate_traits.h - OLD_FILES+=usr/include/include/c++/v1/__utility/terminate_on_exception.h - OLD_FILES+=usr/include/include/c++/v1/experimental/deque - OLD_FILES+=usr/include/include/c++/v1/experimental/forward_list - OLD_FILES+=usr/include/include/c++/v1/experimental/list - OLD_FILES+=usr/include/include/c++/v1/experimental/map - OLD_FILES+=usr/include/include/c++/v1/experimental/memory_resource - OLD_FILES+=usr/include/include/c++/v1/experimental/regex - OLD_FILES+=usr/include/include/c++/v1/experimental/set - OLD_FILES+=usr/include/include/c++/v1/experimental/string - OLD_FILES+=usr/include/include/c++/v1/experimental/unordered_map - OLD_FILES+=usr/include/include/c++/v1/experimental/unordered_set - OLD_FILES+=usr/include/include/c++/v1/experimental/vector - OLD_FILES+=usr/include/include/c++/v1/limits.h - OLD_FILES+=usr/include/include/c++/v1/setjmp.h ++OLD_FILES+=usr/include/c++/v1/__pstl/internal/algorithm_fwd.h ++OLD_FILES+=usr/include/c++/v1/__pstl/internal/algorithm_impl.h ++OLD_FILES+=usr/include/c++/v1/__pstl/internal/execution_defs.h ++OLD_FILES+=usr/include/c++/v1/__pstl/internal/execution_impl.h ++OLD_FILES+=usr/include/c++/v1/__pstl/internal/glue_algorithm_defs.h ++OLD_FILES+=usr/include/c++/v1/__pstl/internal/glue_algorithm_impl.h ++OLD_FILES+=usr/include/c++/v1/__pstl/internal/glue_memory_defs.h ++OLD_FILES+=usr/include/c++/v1/__pstl/internal/glue_memory_impl.h ++OLD_FILES+=usr/include/c++/v1/__pstl/internal/glue_numeric_defs.h ++OLD_FILES+=usr/include/c++/v1/__pstl/internal/glue_numeric_impl.h ++OLD_FILES+=usr/include/c++/v1/__pstl/internal/memory_impl.h ++OLD_FILES+=usr/include/c++/v1/__pstl/internal/numeric_fwd.h ++OLD_FILES+=usr/include/c++/v1/__pstl/internal/numeric_impl.h ++OLD_FILES+=usr/include/c++/v1/__pstl/internal/omp/parallel_for.h ++OLD_FILES+=usr/include/c++/v1/__pstl/internal/omp/parallel_for_each.h ++OLD_FILES+=usr/include/c++/v1/__pstl/internal/omp/parallel_invoke.h ++OLD_FILES+=usr/include/c++/v1/__pstl/internal/omp/parallel_merge.h ++OLD_FILES+=usr/include/c++/v1/__pstl/internal/omp/parallel_scan.h ++OLD_FILES+=usr/include/c++/v1/__pstl/internal/omp/parallel_stable_partial_sort.h ++OLD_FILES+=usr/include/c++/v1/__pstl/internal/omp/parallel_stable_sort.h ++OLD_FILES+=usr/include/c++/v1/__pstl/internal/omp/parallel_transform_reduce.h ++OLD_FILES+=usr/include/c++/v1/__pstl/internal/omp/parallel_transform_scan.h ++OLD_FILES+=usr/include/c++/v1/__pstl/internal/omp/util.h ++OLD_DIRS+=usr/include/c++/v1/__pstl/internal/omp ++OLD_FILES+=usr/include/c++/v1/__pstl/internal/parallel_backend.h ++OLD_FILES+=usr/include/c++/v1/__pstl/internal/parallel_backend_omp.h ++OLD_FILES+=usr/include/c++/v1/__pstl/internal/parallel_backend_serial.h ++OLD_FILES+=usr/include/c++/v1/__pstl/internal/parallel_backend_tbb.h ++OLD_FILES+=usr/include/c++/v1/__pstl/internal/parallel_backend_utils.h ++OLD_FILES+=usr/include/c++/v1/__pstl/internal/unseq_backend_simd.h ++OLD_FILES+=usr/include/c++/v1/__pstl/internal/utils.h ++OLD_DIRS+=usr/include/c++/v1/__pstl/internal ++OLD_DIRS+=usr/include/c++/v1/__pstl ++OLD_FILES+=usr/include/c++/v1/__pstl_algorithm ++OLD_FILES+=usr/include/c++/v1/__pstl_memory ++OLD_FILES+=usr/include/c++/v1/__pstl_numeric ++OLD_FILES+=usr/include/c++/v1/__type_traits/predicate_traits.h ++OLD_FILES+=usr/include/c++/v1/__utility/terminate_on_exception.h ++OLD_FILES+=usr/include/c++/v1/experimental/deque ++OLD_FILES+=usr/include/c++/v1/experimental/forward_list ++OLD_FILES+=usr/include/c++/v1/experimental/list ++OLD_FILES+=usr/include/c++/v1/experimental/map ++OLD_FILES+=usr/include/c++/v1/experimental/memory_resource ++OLD_FILES+=usr/include/c++/v1/experimental/regex ++OLD_FILES+=usr/include/c++/v1/experimental/set ++OLD_FILES+=usr/include/c++/v1/experimental/string ++OLD_FILES+=usr/include/c++/v1/experimental/unordered_map ++OLD_FILES+=usr/include/c++/v1/experimental/unordered_set ++OLD_FILES+=usr/include/c++/v1/experimental/vector ++OLD_FILES+=usr/include/c++/v1/limits.h ++OLD_FILES+=usr/include/c++/v1/setjmp.h + +# 20240321: remove empty /usr/libdata/gcc directory +OLD_DIRS+=usr/libdata/gcc + +# 20240307: Improperly installed awk tests removed +OLD_FILES+=usr/tests/usr.bin/awk/bugs-fixed/missing-precision.ok +OLD_FILES+=usr/tests/usr.bin/awk/bugs-fixed/negative-nf.ok +OLD_FILES+=usr/tests/usr.bin/awk/bugs-fixed/pfile-overflow.ok +OLD_FILES+=usr/tests/usr.bin/awk/bugs-fixed/system-status.awk +OLD_FILES+=usr/tests/usr.bin/awk/bugs-fixed/system-status.bad +OLD_FILES+=usr/tests/usr.bin/awk/bugs-fixed/system-status.ok +OLD_FILES+=usr/tests/usr.bin/awk/bugs-fixed/system-status.ok2 + +# 20240211: caroot bundle updated +OLD_FILES+=usr/share/certs/trusted/Security_Communication_Root_CA.pem + +# 20240122: callout_async_drain() removed +OLD_FILES+=usr/share/man/man9/callout_async_drain.9.gz + +# 20240114: Removal of geom_map(4) +OLD_FILES+=usr/share/man/man4/geom_map.4 + +# 20240112: remove pmap_init2() +OLD_FILES+=usr/share/man/man9/pmap_init2.9.gz + +# 20240112: remove pmap_pinit2() +OLD_FILES+=usr/share/man/man9/pmap_pinit2.9.gz + +# 20240112: replaced NetBSD tests for uniq with our own +OLD_FILES+=usr/tests/usr.bin/uniq/d_basic.in +OLD_FILES+=usr/tests/usr.bin/uniq/d_basic.out +OLD_FILES+=usr/tests/usr.bin/uniq/d_counts.out +OLD_FILES+=usr/tests/usr.bin/uniq/d_input.in +OLD_FILES+=usr/tests/usr.bin/uniq/d_show_duplicates.out +OLD_FILES+=usr/tests/usr.bin/uniq/d_show_uniques.out + +# 20231208: new clang import which bumps version from 16 to 17 +OLD_FILES+=usr/lib/clang/16/include/__clang_cuda_builtin_vars.h +OLD_FILES+=usr/lib/clang/16/include/__clang_cuda_cmath.h +OLD_FILES+=usr/lib/clang/16/include/__clang_cuda_complex_builtins.h +OLD_FILES+=usr/lib/clang/16/include/__clang_cuda_device_functions.h +OLD_FILES+=usr/lib/clang/16/include/__clang_cuda_intrinsics.h +OLD_FILES+=usr/lib/clang/16/include/__clang_cuda_libdevice_declares.h +OLD_FILES+=usr/lib/clang/16/include/__clang_cuda_math.h +OLD_FILES+=usr/lib/clang/16/include/__clang_cuda_math_forward_declares.h +OLD_FILES+=usr/lib/clang/16/include/__clang_cuda_runtime_wrapper.h +OLD_FILES+=usr/lib/clang/16/include/__clang_cuda_texture_intrinsics.h +OLD_FILES+=usr/lib/clang/16/include/__clang_hip_cmath.h +OLD_FILES+=usr/lib/clang/16/include/__clang_hip_libdevice_declares.h +OLD_FILES+=usr/lib/clang/16/include/__clang_hip_math.h +OLD_FILES+=usr/lib/clang/16/include/__clang_hip_runtime_wrapper.h +OLD_FILES+=usr/lib/clang/16/include/__clang_hip_stdlib.h +OLD_FILES+=usr/lib/clang/16/include/__stddef_max_align_t.h +OLD_FILES+=usr/lib/clang/16/include/__wmmintrin_aes.h +OLD_FILES+=usr/lib/clang/16/include/__wmmintrin_pclmul.h +OLD_FILES+=usr/lib/clang/16/include/adxintrin.h +OLD_FILES+=usr/lib/clang/16/include/altivec.h +OLD_FILES+=usr/lib/clang/16/include/ammintrin.h +OLD_FILES+=usr/lib/clang/16/include/amxfp16intrin.h +OLD_FILES+=usr/lib/clang/16/include/amxintrin.h +OLD_FILES+=usr/lib/clang/16/include/arm64intr.h +OLD_FILES+=usr/lib/clang/16/include/arm_acle.h +OLD_FILES+=usr/lib/clang/16/include/arm_bf16.h +OLD_FILES+=usr/lib/clang/16/include/arm_cde.h +OLD_FILES+=usr/lib/clang/16/include/arm_cmse.h +OLD_FILES+=usr/lib/clang/16/include/arm_fp16.h +OLD_FILES+=usr/lib/clang/16/include/arm_mve.h +OLD_FILES+=usr/lib/clang/16/include/arm_neon.h +OLD_FILES+=usr/lib/clang/16/include/arm_neon_sve_bridge.h +OLD_FILES+=usr/lib/clang/16/include/arm_sve.h +OLD_FILES+=usr/lib/clang/16/include/armintr.h +OLD_FILES+=usr/lib/clang/16/include/avx2intrin.h +OLD_FILES+=usr/lib/clang/16/include/avx512bf16intrin.h +OLD_FILES+=usr/lib/clang/16/include/avx512bitalgintrin.h +OLD_FILES+=usr/lib/clang/16/include/avx512bwintrin.h +OLD_FILES+=usr/lib/clang/16/include/avx512cdintrin.h +OLD_FILES+=usr/lib/clang/16/include/avx512dqintrin.h *** 21791 LINES SKIPPED *** From nobody Sat Apr 6 20:17:50 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VBmqy3J6Qz5HGsf; Sat, 6 Apr 2024 20:17:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VBmqy20LJz4KPR; Sat, 6 Apr 2024 20:17:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712434670; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FvdXMa0T4MsOO4Aw+GCwhQ84JqKeLr6hbFCbBVW82DQ=; b=a1DC3tRAJ/MHVYwlfWWwx/03SuxB1ryn1fUFuk8xR4T/r1BK+oWQcASCGkoCko3fv1kQOC j7VWU4XtBMNc0Z66wnEJtuNJCOAvmB0BtrmHXU56nMJwAqRndsMSDHEQ+u4X9cyXnYEPvL n+nAlBr0piWoAQ4UC/PQ5qiHwEZJzfTumf0X95tfkJpmdbIbEyXWv/8l3EDiQPCqWr0AeU yapGjnhBytgq008+5RCmy4XeFLIKsQYciwdUCnHc62e9ha5CGFh1pS4QW/ORZdEM/wnBSJ IJPlbbVVmQ8ylNWeX0O93Hi+Onutu7gHib67+QolRu/dffxSON2FGEI7ofjHVg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712434670; a=rsa-sha256; cv=none; b=k+/FcImKfqOwmxybYFmwnCSo52nCPLkOjwy8pSV6EQj/PnNT6Jw9VxdMyGU9lLIKQ2ZZ7q LffAKabQSyVTm8dz3P21JpfypPaZyfpsQ83/N+UHmBMNPZt2oSsTOqNejnUGMdbsCewhKF YcovcMkyywdWqnJdu40CAfF9iyrxB7fXZx4JOxzaNWRF9F1eWT28ek/+bdp37WAhIatjZX Tdcn87xXTndLWEH4mxR+B2lcDaFwnxRlaEZkDuRYeS3/3M/1nAnwAvVxsIksbw3scWrXr7 UGzwRJEKjW3bGrfn3vtgn39zKJ/utIXwG+IPV5QPdUMoBp9juDW8soiU/JEUBQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712434670; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FvdXMa0T4MsOO4Aw+GCwhQ84JqKeLr6hbFCbBVW82DQ=; b=pw9ZAUBGZ2N6ZGbjvP0dgiXc6wvq0CG1NmJmQkSVNv/8UeQSgUXfnM6OQXzrM+ouTqYTrC RZao6GYPMX+GyxzsA5Q1nv2rEB73B9DFWfdgEyFp+A1ORI5jeu47MWSqLAhOgq44AebgOD 5HPjAreZJQk/GfRsQGnSX5dAZyJlCfLagOtuAH5LsCyrKnvzowBZdh4WsAK7mWLJdO4erI rmQTsnQgLha1pjHHOY+AmQPdcVpwL3QJd8QiA8zsTncc/qC95aA5/ahyZ87x8u239sWyTo 1yBEPcFrZdcY81YNYAoXg+Yj0+lYJPXbKQCFp9V/ox/qIdr+nkC/6bZfUfwsIQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VBmqy1cWlzxgC; Sat, 6 Apr 2024 20:17:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 436KHo8k029574; Sat, 6 Apr 2024 20:17:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 436KHoFH029571; Sat, 6 Apr 2024 20:17:50 GMT (envelope-from git) Date: Sat, 6 Apr 2024 20:17:50 GMT Message-Id: <202404062017.436KHoFH029571@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dimitry Andric Subject: git: 412fa3436f0d - main - Add two FreeBSD customizations to libc++ List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 412fa3436f0d1fe4a7e5e3b66783aa40f599125e Auto-Submitted: auto-generated The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=412fa3436f0d1fe4a7e5e3b66783aa40f599125e commit 412fa3436f0d1fe4a7e5e3b66783aa40f599125e Author: Dimitry Andric AuthorDate: 2024-01-07 11:32:29 +0000 Commit: Dimitry Andric CommitDate: 2024-04-06 20:13:25 +0000 Add two FreeBSD customizations to libc++ This is intended to better support ports usage of older clang versions: * Add _LIBCPP_ENABLE_COMPILER_VERSION_CHECKS block around compiler version checks, to avoid any warnings about support. This makes some ports that use -Werror fall over. * When using clang < 15.0, avoid using a type visibility attribute on the std namespace, as older versions of clang do not support this. PR: 276104 MFC after: 1 month --- contrib/llvm-project/libcxx/include/__config | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/contrib/llvm-project/libcxx/include/__config b/contrib/llvm-project/libcxx/include/__config index f52fb0441293..959082502a49 100644 --- a/contrib/llvm-project/libcxx/include/__config +++ b/contrib/llvm-project/libcxx/include/__config @@ -32,6 +32,7 @@ // Warn if a compiler version is used that is not supported anymore // LLVM RELEASE Update the minimum compiler versions +#if defined(_LIBCPP_ENABLE_COMPILER_VERSION_CHECKS) // FreeBSD customization # if defined(_LIBCPP_CLANG_VER) # if _LIBCPP_CLANG_VER < 1600 # warning "Libc++ only supports Clang 16 and later" @@ -45,6 +46,7 @@ # warning "Libc++ only supports GCC 13 and later" # endif # endif +#endif // _LIBCPP_ENABLE_COMPILER_VERSION_CHECKS // The attributes supported by clang are documented at https://clang.llvm.org/docs/AttributeReference.html @@ -725,7 +727,8 @@ typedef __char32_t char32_t; # define _LIBCPP_TEMPLATE_VIS # endif -# if !defined(_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS) && __has_attribute(__type_visibility__) +# if !defined(_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS) && __has_attribute(__type_visibility__) \ + && _LIBCPP_CLANG_VER >= 1500 // FreeBSD customization # define _LIBCPP_TYPE_VISIBILITY_DEFAULT __attribute__((__type_visibility__("default"))) # else # define _LIBCPP_TYPE_VISIBILITY_DEFAULT From nobody Sat Apr 6 20:17:48 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VBmqx2HLbz5HGf0; Sat, 6 Apr 2024 20:17:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VBmqx0zSwz4KG4; Sat, 6 Apr 2024 20:17:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712434669; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Is7Dfo5uYXyrbITwlV0SUxxhiezyCSLI+phzRBD205U=; b=v1zg7YAyqMxuivABWesNg3OT2hIOBlBaNDPN0oFD7jO2n8TNHvVADmVXw8pPV0FwZG8aol P6tZ3qwzG4yVUFT7+YfwywTuL3efj5J+p5Q+8xu7rVzNfYNI2oPR0Srs2HhTDxzf6EqKq/ ah7PFz3tu/zExprtIv6VPQGxnitAhYwSV/YWplGyyezOP9fg/r8rauGnGxdK0tAyO2rO79 WHdIOmCKImMObfq2jrDBpi03VsG+NB0Tk7MExAAXYBiRUiFYJN3RPgUp/e8H+ur8BCAuxD 843Frt+0kKsSI7/ODq0pHQT6soYZvleeAGPvudMHF5aLEYwb490pYVINjlJVZg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712434669; a=rsa-sha256; cv=none; b=Dkd0OYUKo/RmmfHUKoEwmURUmBrUdGICzPzNzX7ulQoZGzgBP2oqCnjm8yCx/TYIALphTD wgpLKBdVDg11t+X2EkcX/t6Gd0SRzYh3UnUJnvzPTnPpfGsScjo2rIiy2jZYauVSUxmPIz tC6R1EAv/0hsBhwD6+kE5i7HZxXwusbJ9kLq0FGTydloKlZ8DE/vR9VhX1lh+BqxYlx37s bePShCyIkhNN+RjJLEq89EEilP2QUyPFc9UxM+ADaQdiUD2/ocAE+KDW3/P/grtyV9zlwc OhSpj0rbwpf0KYCTaD4iuNvf/OCK7USTLMWxoQ3Op8uotWvfMaaXBvSBX6HHsw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712434669; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Is7Dfo5uYXyrbITwlV0SUxxhiezyCSLI+phzRBD205U=; b=ItviWI0Pf/NF5u/1I4OX1bVtnL0ZiTyXU489bzV0fMDsm/U8gcyL+AEWGi9eFNm2xaoEWv a1es97X1gNHC1V2BIpuCOrsWpqqKpojOZ2+E3fyPKPcp5afG253vPMyeaOfUKbcH4YIP5e 85Wp2gZP3RJNkptOzYwMm9YV0PACjgNWWoPBFzMJt8fBWabV6oP3m8QRgh1almo8Q9yn6i kkG8kij4SI40rc/dHy3apDD59YgN9awJ4c8qaHVnK3H30oQsLvXNSKCW6XEHSqZ5yLqXFV DG3m+1Dn2C8KNyphRumX/WIp2Kep8Zpgjqtdvf7T9vcx1mhM6FmIyIFsSi5TmQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VBmqx0bXFzxrM; Sat, 6 Apr 2024 20:17:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 436KHmhH029529; Sat, 6 Apr 2024 20:17:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 436KHm36029526; Sat, 6 Apr 2024 20:17:48 GMT (envelope-from git) Date: Sat, 6 Apr 2024 20:17:48 GMT Message-Id: <202404062017.436KHm36029526@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dimitry Andric Subject: git: 653487bbc800 - main - Tentatively merge https://github.com/llvm/llvm-project/pull/77242 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 653487bbc8006839d0895811942bb8a2fcdd5aa8 Auto-Submitted: auto-generated The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=653487bbc8006839d0895811942bb8a2fcdd5aa8 commit 653487bbc8006839d0895811942bb8a2fcdd5aa8 Author: Dimitry Andric AuthorDate: 2024-01-07 16:03:13 +0000 Commit: Dimitry Andric CommitDate: 2024-04-06 20:13:24 +0000 Tentatively merge https://github.com/llvm/llvm-project/pull/77242 [libcxx] Re-include in __config for FreeBSD In 0a97720d0197 some changes were made to `__config` for assuming that `__BYTE_ORDER__` is always present. However, this deleted a `` include for FreeBSD, which is required to get the value of `__FreeBSD_version`, and that is used later in the file to determine whether `_LIBCPP_C_HAS_NO_GETS` needs to be enabled. Include `` just after the other includes used for feature detection, to fix this. Note that when FreeBSD 13 is EOLed, this can be removed, as then all supported FreeBSD versions will no longer have `gets()`. PR: 276104 MFC after: 1 month --- contrib/llvm-project/libcxx/include/__config | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/contrib/llvm-project/libcxx/include/__config b/contrib/llvm-project/libcxx/include/__config index 40e6da8bc03a..f52fb0441293 100644 --- a/contrib/llvm-project/libcxx/include/__config +++ b/contrib/llvm-project/libcxx/include/__config @@ -477,6 +477,10 @@ _LIBCPP_HARDENING_MODE_DEBUG # include // for __NATIVE_ASCII_F # endif +# ifdef __FreeBSD__ +# include // for __FreeBSD_version +# endif + # ifndef __BYTE_ORDER__ # error \ "Your compiler doesn't seem to define __BYTE_ORDER__, which is required by libc++ to know the endianness of your target platform" From nobody Sat Apr 6 20:17:56 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VBmr9341Pz5HGsl; Sat, 6 Apr 2024 20:18:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VBmr902qxz4KW4; Sat, 6 Apr 2024 20:18:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712434681; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4lGnjARw9kuyRSDFwy+Z0FIIdL1Hch+9FSxh5/rxYIg=; b=YCVJr8wRT0xYHReRrYjnI2NBTZr60+3pD78rPr+pFKkYSi2paKw6qrCOj/VvliSN+gbtms UMjCZPwox1iqKhH2SrSivB0jnTn+1ARTsFfyes4mOPTw6pn6c07LWVkR85XQ8Skd+3TcNJ NrVIN8uugqxedb37eZ1W3iHiCD1eMFwsBaRglJg3AzqOLzI3sbI0Bo9RdyGjgmHnzWE+oY fuLQXAAoL4DgdNmqys1OX9FS7mESrr26dyoBxCwl1X5hltmnaZDch5s8NBdj19bl4A/Kth QeGnGRt4ISDHGkhHTlPAhrn/We6pYKLLYWh0R1S3rUpPYSyn1uqRCmgcmGomWw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712434681; a=rsa-sha256; cv=none; b=xv4NyYaHRQEEzoasAUQvzRcJAOabwwFnpzCzqKO3reKPnVnFtmlIXj53yK5CzpmlnOpGJt S4EUB7p7kmZ0bCmYOJe0Cnv+cKuE+IIvd62U9x4uFUkypWH8+7y1kT/TyOmEHyaiHgWHE3 MplqZG/KLN2dIgkP7qLyp3y7J6v3vvvmWID9R7GMY7wkz+SY0QjCwvXVwOyX2xKfvJ8wBa t8pGgEhZxCz3reX3ghZTG9dXXgxVfG5ALLRg30V2gI9DpKGNsvqkWei0UQCkqNszgjgHVB wy6+tMFAinmDXe03BnzVpir/If2IKPKX8pDhnY3i8s26cfTsuBb+PIhXNIKzAw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712434681; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4lGnjARw9kuyRSDFwy+Z0FIIdL1Hch+9FSxh5/rxYIg=; b=yEE/ffuRnGxUZm0HA0lIdtrGcNpg53pumwgbWNslWOlp7RUKY8S0Dlb+4TNAAGhhEklyRe gvohlKSsvmMTh0GGCwmFwsMBQ8EOEU8Mdp59QyoOBa3/OBwLG/9lMl4xgosQeIdMvIKVaA 8tIl7rYuy42MzdsnWwcuKEYkSKkizrnCdgh6NjFjtD6ABkLZRMqJ0erCa9ryoTa46HetAW Rnm9TONSIRNePp5Vr2ck/R020a+ykRFVyy+0FNGszMi+L6KUqaFZzpVwovymO61T7RdaLF +VTkaAHf3W6bS6ppb5BOQAC/l0PGCIw2Ht9Ptd+baEPDcfOKJCmsEMAziyvH1A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VBmr86kzqzxrN; Sat, 6 Apr 2024 20:18:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 436KI0PR029652; Sat, 6 Apr 2024 20:18:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 436KHuSm029621; Sat, 6 Apr 2024 20:17:56 GMT (envelope-from git) Date: Sat, 6 Apr 2024 20:17:56 GMT Message-Id: <202404062017.436KHuSm029621@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dimitry Andric Subject: git: 1db9f3b21e39 - main - Merge llvm-project main llvmorg-18-init-16595-g7c00a5be5cde List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1db9f3b21e39176dd5b67cf8ac378633b172463e Auto-Submitted: auto-generated The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=1db9f3b21e39176dd5b67cf8ac378633b172463e commit 1db9f3b21e39176dd5b67cf8ac378633b172463e Merge: 412fa3436f0d aca2e42c6729 Author: Dimitry Andric AuthorDate: 2024-01-09 20:00:28 +0000 Commit: Dimitry Andric CommitDate: 2024-04-06 20:13:28 +0000 Merge llvm-project main llvmorg-18-init-16595-g7c00a5be5cde This updates llvm, clang, compiler-rt, libc++, libunwind, lld, lldb and openmp to llvm-project main llvmorg-18-init-16595-g7c00a5be5cde. PR: 276104 MFC after: 1 month .../llvm-project/clang/include/clang/AST/Attr.h | 1 + .../llvm-project/clang/include/clang/AST/DeclCXX.h | 8 + .../clang/include/clang/AST/TextNodeDumper.h | 2 + .../llvm-project/clang/include/clang/AST/Type.h | 2 + .../clang/Analysis/Analyses/UnsafeBufferUsage.h | 2 +- .../Analysis/Analyses/UnsafeBufferUsageGadgets.def | 1 + .../clang/include/clang/Analysis/CFG.h | 4 +- .../llvm-project/clang/include/clang/Basic/Attr.td | 23 + .../clang/include/clang/Basic/AttrDocs.td | 35 +- .../clang/include/clang/Basic/CodeGenOptions.def | 1 + .../include/clang/Basic/DiagnosticCommonKinds.td | 3 + .../include/clang/Basic/DiagnosticDriverKinds.td | 3 + .../include/clang/Basic/DiagnosticParseKinds.td | 2 + .../include/clang/Basic/DiagnosticSemaKinds.td | 14 +- .../clang/include/clang/Basic/ObjCRuntime.h | 28 +- .../clang/include/clang/Basic/OpenACCKinds.h | 39 +- .../clang/include/clang/Basic/arm_sve.td | 115 ++- .../clang/include/clang/Basic/arm_sve_sme_incl.td | 1 + .../include/clang/Basic/riscv_sifive_vector.td | 10 +- .../clang/include/clang/Driver/Options.td | 12 +- .../llvm-project/clang/include/clang/Sema/Sema.h | 15 +- .../clang/include/clang/Sema/Template.h | 1 + contrib/llvm-project/clang/lib/AST/ASTContext.cpp | 23 +- contrib/llvm-project/clang/lib/AST/ASTImporter.cpp | 39 +- .../clang/lib/AST/ASTStructuralEquivalence.cpp | 13 +- .../clang/lib/AST/ComputeDependence.cpp | 2 + contrib/llvm-project/clang/lib/AST/Decl.cpp | 2 +- contrib/llvm-project/clang/lib/AST/DeclBase.cpp | 50 +- .../llvm-project/clang/lib/AST/FormatString.cpp | 1 - .../llvm-project/clang/lib/AST/Interp/Interp.cpp | 4 +- contrib/llvm-project/clang/lib/AST/Interp/Interp.h | 6 - .../llvm-project/clang/lib/AST/TextNodeDumper.cpp | 10 + contrib/llvm-project/clang/lib/AST/Type.cpp | 7 + .../clang/lib/Analysis/PathDiagnostic.cpp | 7 +- .../clang/lib/Analysis/UnsafeBufferUsage.cpp | 38 +- .../llvm-project/clang/lib/Basic/Targets/ARM.cpp | 64 ++ contrib/llvm-project/clang/lib/Basic/Targets/ARM.h | 13 + contrib/llvm-project/clang/lib/Basic/Targets/AVR.h | 4 +- .../llvm-project/clang/lib/Basic/Targets/RISCV.cpp | 23 +- .../llvm-project/clang/lib/Basic/Targets/X86.cpp | 3 + contrib/llvm-project/clang/lib/CodeGen/CGClass.cpp | 6 +- .../clang/lib/CodeGen/CGExprScalar.cpp | 61 +- .../llvm-project/clang/lib/CodeGen/CGObjCGNU.cpp | 2 + contrib/llvm-project/clang/lib/CodeGen/CGStmt.cpp | 14 +- .../clang/lib/CodeGen/CodeGenFunction.cpp | 98 +- .../clang/lib/CodeGen/CodeGenFunction.h | 58 +- .../clang/lib/CodeGen/CodeGenModule.cpp | 4 + .../llvm-project/clang/lib/CodeGen/CodeGenPGO.cpp | 263 ++++- .../llvm-project/clang/lib/CodeGen/CodeGenPGO.h | 14 +- .../clang/lib/CodeGen/CoverageMappingGen.cpp | 405 +++++++- .../clang/lib/CodeGen/CoverageMappingGen.h | 12 +- .../llvm-project/clang/lib/CodeGen/Targets/X86.cpp | 3 + contrib/llvm-project/clang/lib/Driver/Driver.cpp | 11 + .../clang/lib/Driver/ToolChains/Arch/Mips.cpp | 8 +- .../clang/lib/Driver/ToolChains/Arch/RISCV.cpp | 6 +- .../clang/lib/Driver/ToolChains/BareMetal.cpp | 5 +- .../clang/lib/Driver/ToolChains/Clang.cpp | 11 + .../clang/lib/Driver/ToolChains/Gnu.cpp | 9 + .../clang/lib/Driver/ToolChains/MinGW.cpp | 25 +- .../clang/lib/Format/TokenAnnotator.cpp | 8 + contrib/llvm-project/clang/lib/Headers/arm_acle.h | 59 ++ .../clang/lib/Headers/llvm_libc_wrappers/stdio.h | 34 +- contrib/llvm-project/clang/lib/Lex/ModuleMap.cpp | 4 +- contrib/llvm-project/clang/lib/Parse/ParseDecl.cpp | 3 +- .../llvm-project/clang/lib/Parse/ParseDeclCXX.cpp | 2 + .../llvm-project/clang/lib/Parse/ParseOpenACC.cpp | 129 ++- .../clang/lib/Sema/AnalysisBasedWarnings.cpp | 16 +- .../llvm-project/clang/lib/Sema/SemaChecking.cpp | 23 +- .../llvm-project/clang/lib/Sema/SemaConcept.cpp | 17 +- contrib/llvm-project/clang/lib/Sema/SemaDecl.cpp | 94 +- .../llvm-project/clang/lib/Sema/SemaDeclAttr.cpp | 19 + contrib/llvm-project/clang/lib/Sema/SemaExpr.cpp | 44 +- contrib/llvm-project/clang/lib/Sema/SemaInit.cpp | 55 +- contrib/llvm-project/clang/lib/Sema/SemaOpenMP.cpp | 56 +- .../llvm-project/clang/lib/Sema/SemaOverload.cpp | 90 +- .../clang/lib/Sema/SemaTemplateDeduction.cpp | 11 + .../clang/lib/Sema/SemaTemplateInstantiate.cpp | 79 +- .../llvm-project/clang/lib/Sema/TreeTransform.h | 78 +- .../Checkers/StdLibraryFunctionsChecker.cpp | 20 +- .../lib/StaticAnalyzer/Checkers/StreamChecker.cpp | 1 + contrib/llvm-project/clang/lib/Tooling/Tooling.cpp | 8 +- .../clang/utils/TableGen/ClangASTNodesEmitter.cpp | 103 +- .../clang/utils/TableGen/SveEmitter.cpp | 3 + .../llvm-project/clang/utils/TableGen/TableGen.cpp | 3 +- .../clang/utils/TableGen/TableGenBackends.h | 10 +- .../compiler-rt/lib/asan/asan_suppressions.cpp | 7 +- .../compiler-rt/lib/hwasan/hwasan_report.cpp | 6 +- .../compiler-rt/lib/lsan/lsan_common.cpp | 7 +- contrib/llvm-project/compiler-rt/lib/msan/msan.h | 34 +- .../compiler-rt/lib/msan/msan_allocator.cpp | 40 +- .../compiler-rt/lib/msan/msan_new_delete.cpp | 26 +- .../compiler-rt/lib/orc/executor_symbol_def.h | 151 +++ .../orc/tests/unit/executor_symbol_def_test.cpp | 19 + .../unit/simple_packed_serialization_test.cpp | 20 +- .../tests/unit/simple_packed_serialization_utils.h | 34 + .../lib/sanitizer_common/sanitizer_common.h | 3 + .../sanitizer_platform_interceptors.h | 3 +- .../sanitizer_stacktrace_libcdep.cpp | 12 +- .../lib/sanitizer_common/sanitizer_symbolizer.h | 20 + .../sanitizer_symbolizer_report.cpp | 25 +- .../compiler-rt/lib/tsan/rtl/tsan_report.cpp | 26 +- .../compiler-rt/lib/ubsan/ubsan_diag.cpp | 2 +- .../compiler-rt/lib/ubsan/ubsan_diag.h | 20 - .../libcxx/include/__algorithm/pop_heap.h | 3 +- .../libcxx/include/__algorithm/sift_down.h | 2 +- .../llvm-project/libcxx/include/__algorithm/sort.h | 4 +- .../libcxx/include/__charconv/to_chars_base_10.h | 6 +- .../libcxx/include/__charconv/to_chars_integral.h | 2 +- .../libcxx/include/__charconv/traits.h | 4 +- .../include/__chrono/parser_std_format_spec.h | 7 +- contrib/llvm-project/libcxx/include/__config | 7 + .../include/__filesystem/directory_iterator.h | 3 +- .../libcxx/include/__filesystem/path_iterator.h | 4 +- .../llvm-project/libcxx/include/__format/buffer.h | 12 +- .../libcxx/include/__format/format_arg.h | 2 +- .../libcxx/include/__format/format_arg_store.h | 8 +- .../libcxx/include/__format/formatter_bool.h | 2 +- .../include/__format/formatter_floating_point.h | 55 +- .../libcxx/include/__format/formatter_integral.h | 16 +- .../libcxx/include/__format/formatter_output.h | 6 +- .../libcxx/include/__format/formatter_string.h | 5 +- .../include/__format/parser_std_format_spec.h | 7 +- .../libcxx/include/__format/range_formatter.h | 5 +- .../llvm-project/libcxx/include/__format/unicode.h | 14 +- .../libcxx/include/__format/write_escaped.h | 2 +- contrib/llvm-project/libcxx/include/__hash_table | 5 +- .../libcxx/include/__iterator/advance.h | 13 +- .../llvm-project/libcxx/include/__iterator/next.h | 6 +- .../llvm-project/libcxx/include/__iterator/prev.h | 6 +- .../__random/negative_binomial_distribution.h | 7 +- .../libcxx/include/__ranges/chunk_by_view.h | 20 +- .../libcxx/include/__ranges/drop_while_view.h | 3 +- .../libcxx/include/__ranges/filter_view.h | 3 +- .../llvm-project/libcxx/include/__thread/thread.h | 2 +- .../libcxx/include/__utility/exception_guard.h | 2 +- .../libcxx/include/__utility/unreachable.h | 2 +- contrib/llvm-project/libcxx/include/fstream | 50 + contrib/llvm-project/libcxx/include/print | 8 +- contrib/llvm-project/libcxx/include/regex | 23 +- contrib/llvm-project/libcxx/include/set | 32 +- contrib/llvm-project/libcxx/include/span | 18 + contrib/llvm-project/libcxx/include/sstream | 6 +- contrib/llvm-project/libcxx/include/tuple | 32 +- contrib/llvm-project/libcxx/include/version | 4 +- contrib/llvm-project/libcxx/src/filesystem/error.h | 2 +- .../libcxx/src/filesystem/format_string.h | 2 +- .../libcxx/src/filesystem/posix_compat.h | 6 +- contrib/llvm-project/libcxx/src/fstream.cpp | 37 + .../libcxx/src/include/to_chars_floating_point.h | 20 +- .../llvm-project/libcxx/src/memory_resource.cpp | 2 +- contrib/llvm-project/libcxx/src/strstream.cpp | 2 +- contrib/llvm-project/libcxx/src/system_error.cpp | 2 +- .../llvm-project/libunwind/src/UnwindCursor.hpp | 77 +- contrib/llvm-project/lld/COFF/Config.h | 4 +- contrib/llvm-project/lld/ELF/Arch/AArch64.cpp | 3 +- contrib/llvm-project/lld/ELF/Arch/RISCV.cpp | 42 + contrib/llvm-project/lld/ELF/Arch/X86_64.cpp | 2 + contrib/llvm-project/lld/ELF/InputSection.cpp | 11 +- contrib/llvm-project/lld/ELF/LinkerScript.cpp | 4 + contrib/llvm-project/lld/ELF/Relocations.cpp | 6 +- contrib/llvm-project/lld/ELF/ScriptParser.cpp | 27 +- contrib/llvm-project/lld/ELF/SyntheticSections.cpp | 24 +- contrib/llvm-project/lld/ELF/SyntheticSections.h | 6 +- contrib/llvm-project/lld/ELF/Target.h | 10 + contrib/llvm-project/lld/ELF/Writer.cpp | 21 +- contrib/llvm-project/lld/ELF/Writer.h | 1 + .../lldb/include/lldb/API/SBBreakpoint.h | 2 + .../include/lldb/Breakpoint/BreakpointIDList.h | 6 +- .../lldb/include/lldb/Symbol/CompileUnit.h | 23 +- .../lldb/include/lldb/Symbol/SymbolFile.h | 2 +- .../lldb/include/lldb/Symbol/SymbolFileOnDemand.h | 2 +- .../lldb/include/lldb/Utility/FileSpecList.h | 106 +- .../lldb/include/lldb/Utility/StructuredData.h | 28 +- .../llvm-project/lldb/source/API/SBCompileUnit.cpp | 2 +- .../lldb/source/Breakpoint/BreakpointIDList.cpp | 21 +- .../Breakpoint/BreakpointResolverAddress.cpp | 12 +- .../source/Breakpoint/BreakpointResolverName.cpp | 8 +- .../source/Commands/CommandObjectBreakpoint.cpp | 4 +- .../lldb/source/Commands/CommandObjectSource.cpp | 2 +- .../llvm-project/lldb/source/Core/ModuleList.cpp | 2 +- .../ExpressionParser/Clang/ClangUserExpression.cpp | 12 +- .../Clang/CppModuleConfiguration.cpp | 6 +- .../TSan/InstrumentationRuntimeTSan.cpp | 5 +- .../source/Plugins/JITLoader/GDB/JITLoaderGDB.cpp | 2 +- .../SymbolFile/Breakpad/SymbolFileBreakpad.cpp | 5 +- .../SymbolFile/Breakpad/SymbolFileBreakpad.h | 3 +- .../source/Plugins/SymbolFile/CTF/SymbolFileCTF.h | 2 +- .../SymbolFile/DWARF/DWARFASTParserClang.cpp | 34 +- .../Plugins/SymbolFile/DWARF/DWARFASTParserClang.h | 1 + .../source/Plugins/SymbolFile/DWARF/DWARFIndex.cpp | 20 + .../source/Plugins/SymbolFile/DWARF/DWARFIndex.h | 14 + .../SymbolFile/DWARF/DebugNamesDWARFIndex.cpp | 2 +- .../SymbolFile/DWARF/DebugNamesDWARFIndex.h | 2 +- .../Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp | 116 ++- .../Plugins/SymbolFile/DWARF/SymbolFileDWARF.h | 9 +- .../SymbolFile/DWARF/SymbolFileDWARFDebugMap.cpp | 4 +- .../SymbolFile/DWARF/SymbolFileDWARFDebugMap.h | 2 +- .../Plugins/SymbolFile/JSON/SymbolFileJSON.h | 2 +- .../SymbolFile/NativePDB/SymbolFileNativePDB.cpp | 7 +- .../SymbolFile/NativePDB/SymbolFileNativePDB.h | 2 +- .../Plugins/SymbolFile/PDB/SymbolFilePDB.cpp | 2 +- .../source/Plugins/SymbolFile/PDB/SymbolFilePDB.h | 2 +- .../Plugins/SymbolFile/Symtab/SymbolFileSymtab.cpp | 2 +- .../Plugins/SymbolFile/Symtab/SymbolFileSymtab.h | 2 +- .../lldb/source/Symbol/CompileUnit.cpp | 13 +- .../lldb/source/Symbol/SymbolFileOnDemand.cpp | 2 +- .../lldb/source/Target/DynamicRegisterInfo.cpp | 15 +- .../lldb/source/Utility/FileSpecList.cpp | 58 +- .../llvm/include/llvm/Analysis/AliasSetTracker.h | 1 + .../llvm/include/llvm/Analysis/AssumptionCache.h | 2 + .../include/llvm/Analysis/BlockFrequencyInfo.h | 2 + .../include/llvm/Analysis/BranchProbabilityInfo.h | 2 + .../llvm/include/llvm/Analysis/CFGSCCPrinter.h | 1 + .../llvm/include/llvm/Analysis/CallGraph.h | 4 + .../llvm/include/llvm/Analysis/CallPrinter.h | 2 + .../llvm/include/llvm/Analysis/CostModel.h | 2 + .../llvm/include/llvm/Analysis/CycleAnalysis.h | 2 + .../llvm-project/llvm/include/llvm/Analysis/DDG.h | 1 + .../llvm/include/llvm/Analysis/DDGPrinter.h | 1 + .../llvm/include/llvm/Analysis/Delinearization.h | 1 + .../llvm/include/llvm/Analysis/DemandedBits.h | 2 + .../include/llvm/Analysis/DependenceAnalysis.h | 2 + .../llvm/include/llvm/Analysis/DominanceFrontier.h | 2 + .../llvm/Analysis/FunctionPropertiesAnalysis.h | 2 + .../include/llvm/Analysis/IRSimilarityIdentifier.h | 1 + .../llvm/include/llvm/Analysis/InlineAdvisor.h | 3 +- .../llvm/include/llvm/Analysis/InlineCost.h | 1 + .../llvm/Analysis/InlineSizeEstimatorAnalysis.h | 2 + .../llvm/include/llvm/Analysis/LazyCallGraph.h | 4 + .../llvm/include/llvm/Analysis/LazyValueInfo.h | 2 + .../llvm/include/llvm/Analysis/LoopCacheAnalysis.h | 2 + .../llvm/include/llvm/Analysis/LoopInfo.h | 2 + .../llvm/include/llvm/Analysis/LoopNestAnalysis.h | 2 + .../llvm/include/llvm/Analysis/MemDerefPrinter.h | 1 + .../llvm/include/llvm/Analysis/MemoryBuiltins.h | 165 ++-- .../llvm/include/llvm/Analysis/MemorySSA.h | 5 + .../include/llvm/Analysis/ModuleDebugInfoPrinter.h | 1 + .../llvm/include/llvm/Analysis/MustExecute.h | 2 + .../llvm/include/llvm/Analysis/PhiValues.h | 1 + .../llvm/include/llvm/Analysis/PostDominators.h | 2 + .../include/llvm/Analysis/ProfileSummaryInfo.h | 1 + .../llvm/include/llvm/Analysis/RegionInfo.h | 3 + .../llvm/include/llvm/Analysis/ScalarEvolution.h | 3 + .../llvm/include/llvm/Analysis/StackLifetime.h | 1 + .../include/llvm/Analysis/StackSafetyAnalysis.h | 2 + .../llvm/include/llvm/Analysis/StructuralHash.h | 2 + .../include/llvm/Analysis/TargetTransformInfo.h | 8 + .../llvm/Analysis/TargetTransformInfoImpl.h | 4 +- .../include/llvm/Analysis/UniformityAnalysis.h | 2 + .../llvm/include/llvm/Analysis/ValueTracking.h | 9 +- .../llvm/include/llvm/Analysis/VecFuncs.def | 36 + .../llvm/include/llvm/BinaryFormat/ELF.h | 1 + .../llvm/BinaryFormat/ELFRelocs/LoongArch.def | 23 + .../llvm/include/llvm/Bitstream/BitstreamWriter.h | 6 +- .../llvm/include/llvm/CodeGen/AccelTable.h | 15 +- .../llvm/CodeGen/BasicBlockSectionsProfileReader.h | 83 +- .../llvm/include/llvm/CodeGen/CodeGenPassBuilder.h | 25 +- .../llvm/include/llvm/CodeGen/CodeGenPrepare.h | 35 + .../llvm/include/llvm/CodeGen/FastISel.h | 14 + .../llvm/include/llvm/CodeGen/GCMetadata.h | 11 + .../include/llvm/CodeGen/GlobalISel/IRTranslator.h | 4 + .../GlobalISel/LegalizationArtifactCombiner.h | 21 +- .../llvm/CodeGen/GlobalISel/LegalizerHelper.h | 18 +- .../llvm/CodeGen/GlobalISel/LegalizerInfo.h | 10 +- .../include/llvm/CodeGen/MachinePassRegistry.def | 9 +- .../llvm/CodeGen/NonRelocatableStringpool.h | 3 +- .../llvm/include/llvm/CodeGen/Passes.h | 4 +- .../llvm/include/llvm/CodeGen/RuntimeLibcalls.h | 6 + .../llvm/include/llvm/CodeGen/SelectionDAGNodes.h | 20 +- .../include/llvm/CodeGen/ShadowStackGCLowering.h | 24 + .../llvm/include/llvm/CodeGen/StackProtector.h | 93 +- .../include/llvm/CodeGen/SwitchLoweringUtils.h | 16 + .../AddressesMap.h | 10 +- .../llvm/DWARFLinker/{ => Classic}/DWARFLinker.h | 216 +--- .../{ => Classic}/DWARFLinkerCompileUnit.h | 12 +- .../{ => Classic}/DWARFLinkerDeclContext.h | 12 +- .../llvm/DWARFLinker/{ => Classic}/DWARFStreamer.h | 28 +- .../DWARFFile.h | 17 +- .../include/llvm/DWARFLinker/DWARFLinkerBase.h | 100 ++ .../Parallel}/DWARFLinker.h | 108 +- .../StringPool.h | 25 +- .../include/llvm/DebugInfo/DWARF/DWARFDebugMacro.h | 9 +- .../llvm/include/llvm/DebugInfo/DWARF/DWARFUnit.h | 6 +- .../llvm/include/llvm/Demangle/Demangle.h | 5 +- .../llvm/include/llvm/Demangle/ItaniumDemangle.h | 22 +- .../include/llvm/ExecutionEngine/JITLink/JITLink.h | 5 + .../llvm/include/llvm/ExecutionEngine/Orc/Core.h | 10 +- .../Orc/EPCDynamicLibrarySearchGenerator.h | 23 +- .../ExecutionEngine/Orc/EPCGenericDylibManager.h | 7 +- .../llvm/ExecutionEngine/Orc/ExecutionUtils.h | 20 +- .../ExecutionEngine/Orc/Shared/ExecutorSymbolDef.h | 58 ++ .../llvm/ExecutionEngine/Orc/Shared/OrcRTBridge.h | 3 +- .../Orc/Shared/TargetProcessControlTypes.h | 3 +- .../Orc/TargetProcess/JITLoaderGDB.h | 26 + .../Orc/TargetProcess/SimpleExecutorDylibManager.h | 5 +- .../llvm-project/llvm/include/llvm/IR/Dominators.h | 3 + .../include/llvm/IR/GetElementPtrTypeIterator.h | 57 +- .../llvm/include/llvm/IR/IntrinsicsAMDGPU.td | 7 +- .../llvm/include/llvm/IR/IntrinsicsSPIRV.td | 1 + .../llvm/include/llvm/IR/PatternMatch.h | 2 +- .../llvm/include/llvm/IR/SafepointIRVerifier.h | 2 + .../llvm/include/llvm/InitializePasses.h | 4 +- contrib/llvm-project/llvm/include/llvm/LTO/LTO.h | 4 +- .../llvm-project/llvm/include/llvm/LinkAllPasses.h | 2 +- .../llvm/include/llvm/MC/MCAsmBackend.h | 6 +- .../llvm/include/llvm/Object/ELFObjectFile.h | 36 + .../llvm/include/llvm/Object/ELFTypes.h | 3 + .../llvm/include/llvm/Object/ObjectFile.h | 1 + .../include/llvm/Passes/StandardInstrumentations.h | 2 +- .../llvm/include/llvm/Support/RISCVISAInfo.h | 6 +- .../llvm/Target/GlobalISel/SelectionDAGCompat.td | 1 + .../include/llvm/Target/TargetInstrPredicate.td | 6 + .../llvm/include/llvm/Target/TargetMachine.h | 4 +- .../llvm/include/llvm/Target/TargetSchedule.td | 113 +++ .../llvm/include/llvm/Target/TargetSelectionDAG.td | 13 + .../llvm/TargetParser/AArch64TargetParser.h | 7 +- .../llvm/include/llvm/TargetParser/Triple.h | 6 + .../llvm/Transforms/Scalar/IVUsersPrinter.h | 1 + .../Transforms/Scalar/LoopAccessAnalysisPrinter.h | 1 + .../include/llvm/Transforms/Utils/PredicateInfo.h | 2 + .../llvm/lib/Analysis/AssumptionCache.cpp | 13 +- .../llvm/lib/Analysis/BasicAliasAnalysis.cpp | 61 +- .../llvm/lib/Analysis/ConstraintSystem.cpp | 4 +- .../llvm-project/llvm/lib/Analysis/InlineCost.cpp | 2 +- .../llvm/lib/Analysis/InstructionSimplify.cpp | 14 +- contrib/llvm-project/llvm/lib/Analysis/Local.cpp | 2 +- .../llvm/lib/Analysis/LoopAccessAnalysis.cpp | 5 +- .../llvm-project/llvm/lib/Analysis/LoopInfo.cpp | 4 +- .../llvm/lib/Analysis/MemoryBuiltins.cpp | 308 +++--- .../llvm/lib/Analysis/MemorySSAUpdater.cpp | 17 +- .../llvm/lib/Analysis/TargetTransformInfo.cpp | 9 + .../llvm/lib/Analysis/VFABIDemangling.cpp | 9 +- .../llvm/lib/Analysis/ValueTracking.cpp | 11 +- .../lib/BinaryFormat/AMDGPUMetadataVerifier.cpp | 1 + .../llvm/lib/CodeGen/AsmPrinter/AccelTable.cpp | 67 +- .../llvm/lib/CodeGen/AsmPrinter/AsmPrinter.cpp | 80 +- .../llvm/lib/CodeGen/BasicBlockPathCloning.cpp | 11 +- .../llvm/lib/CodeGen/BasicBlockSections.cpp | 8 +- .../CodeGen/BasicBlockSectionsProfileReader.cpp | 52 +- contrib/llvm-project/llvm/lib/CodeGen/CodeGen.cpp | 2 +- .../llvm/lib/CodeGen/CodeGenPrepare.cpp | 127 ++- .../llvm/lib/CodeGen/GCRootLowering.cpp | 33 +- .../llvm/lib/CodeGen/GlobalISel/IRTranslator.cpp | 81 +- .../lib/CodeGen/GlobalISel/LegalizerHelper.cpp | 312 +++++- .../llvm/lib/CodeGen/NonRelocatableStringpool.cpp | 3 - .../llvm/lib/CodeGen/ReplaceWithVeclib.cpp | 160 +-- .../llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp | 10 +- .../llvm/lib/CodeGen/SelectionDAG/FastISel.cpp | 329 ++++--- .../llvm/lib/CodeGen/SelectionDAG/InstrEmitter.cpp | 4 +- .../llvm/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp | 26 +- .../CodeGen/SelectionDAG/LegalizeFloatTypes.cpp | 48 +- .../CodeGen/SelectionDAG/LegalizeIntegerTypes.cpp | 17 +- .../llvm/lib/CodeGen/SelectionDAG/LegalizeTypes.h | 2 + .../CodeGen/SelectionDAG/LegalizeVectorTypes.cpp | 10 +- .../llvm/lib/CodeGen/SelectionDAG/SelectionDAG.cpp | 14 +- .../SelectionDAG/SelectionDAGAddressAnalysis.cpp | 19 +- .../CodeGen/SelectionDAG/SelectionDAGBuilder.cpp | 117 +-- .../lib/CodeGen/SelectionDAG/SelectionDAGBuilder.h | 6 - .../CodeGen/SelectionDAG/SelectionDAGDumper.cpp | 5 +- .../lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp | 19 +- .../lib/CodeGen/SelectionDAG/TargetLowering.cpp | 72 +- .../llvm/lib/CodeGen/ShadowStackGCLowering.cpp | 97 +- .../llvm/lib/CodeGen/StackProtector.cpp | 154 ++- .../llvm/lib/CodeGen/SwitchLoweringUtils.cpp | 81 ++ .../llvm/lib/CodeGen/TargetLoweringBase.cpp | 40 +- .../llvm/lib/CodeGen/TargetPassConfig.cpp | 4 +- .../lib/DWARFLinker/{ => Classic}/DWARFLinker.cpp | 66 +- .../{ => Classic}/DWARFLinkerCompileUnit.cpp | 7 +- .../{ => Classic}/DWARFLinkerDeclContext.cpp | 7 +- .../DWARFLinker/{ => Classic}/DWARFStreamer.cpp | 36 +- .../Parallel}/AcceleratorRecordsSaver.cpp | 8 +- .../Parallel}/AcceleratorRecordsSaver.h | 14 +- .../Parallel}/ArrayList.h | 18 +- .../Parallel}/DIEAttributeCloner.cpp | 8 +- .../Parallel}/DIEAttributeCloner.h | 14 +- .../Parallel}/DIEGenerator.h | 14 +- .../Parallel}/DWARFEmitterImpl.cpp | 10 +- .../Parallel}/DWARFEmitterImpl.h | 16 +- .../Parallel}/DWARFLinker.cpp | 12 +- .../Parallel}/DWARFLinkerCompileUnit.cpp | 5 +- .../Parallel}/DWARFLinkerCompileUnit.h | 16 +- .../Parallel}/DWARFLinkerGlobalData.h | 24 +- .../Parallel}/DWARFLinkerImpl.cpp | 207 ++-- .../Parallel}/DWARFLinkerImpl.h | 20 +- .../Parallel}/DWARFLinkerTypeUnit.cpp | 7 +- .../Parallel}/DWARFLinkerTypeUnit.h | 14 +- .../Parallel}/DWARFLinkerUnit.cpp | 8 +- .../Parallel}/DWARFLinkerUnit.h | 18 +- .../Parallel}/DebugLineSectionEmitter.h | 31 +- .../Parallel}/DependencyTracker.cpp | 8 +- .../Parallel}/DependencyTracker.h | 14 +- .../Parallel}/IndexedValuesMap.h | 14 +- .../Parallel}/OutputSections.cpp | 27 +- .../Parallel}/OutputSections.h | 34 +- .../StringEntryToDwarfStringPoolEntryMap.h | 16 +- .../Parallel}/SyntheticTypeNameBuilder.cpp | 8 +- .../Parallel}/SyntheticTypeNameBuilder.h | 14 +- .../Parallel}/TypePool.h | 35 +- .../Parallel}/Utils.h | 14 +- .../StringPool.cpp => DWARFLinker/Utils.cpp} | 4 +- .../llvm/lib/DWARFLinkerParallel/DWARFFile.cpp | 17 - .../llvm/lib/DebugInfo/DWARF/DWARFVerifier.cpp | 9 +- .../llvm-project/llvm/lib/Demangle/Demangle.cpp | 5 +- .../llvm/lib/Demangle/ItaniumDemangle.cpp | 4 +- .../lib/ExecutionEngine/Interpreter/Execution.cpp | 2 +- .../llvm/lib/ExecutionEngine/JITLink/JITLink.cpp | 35 + .../lib/ExecutionEngine/JITLink/JITLinkGeneric.cpp | 14 + .../Orc/EPCDebugObjectRegistrar.cpp | 3 +- .../Orc/EPCDynamicLibrarySearchGenerator.cpp | 16 +- .../ExecutionEngine/Orc/EPCGenericDylibManager.cpp | 10 +- .../lib/ExecutionEngine/Orc/ExecutionUtils.cpp | 12 +- .../ExecutionEngine/Orc/ExecutorProcessControl.cpp | 6 +- .../ExecutionEngine/Orc/LookupAndRecordAddrs.cpp | 2 +- .../llvm/lib/ExecutionEngine/Orc/MachOPlatform.cpp | 2 + .../lib/ExecutionEngine/Orc/ObjectLinkingLayer.cpp | 14 +- .../Orc/TargetProcess/JITLoaderGDB.cpp | 23 - .../TargetProcess/SimpleExecutorDylibManager.cpp | 9 +- contrib/llvm-project/llvm/lib/IR/AsmWriter.cpp | 13 +- contrib/llvm-project/llvm/lib/IR/AutoUpgrade.cpp | 499 +++++----- contrib/llvm-project/llvm/lib/IR/DataLayout.cpp | 5 +- contrib/llvm-project/llvm/lib/IR/Operator.cpp | 12 +- contrib/llvm-project/llvm/lib/IR/Value.cpp | 2 +- contrib/llvm-project/llvm/lib/LTO/LTO.cpp | 36 +- contrib/llvm-project/llvm/lib/MC/MCAssembler.cpp | 6 +- contrib/llvm-project/llvm/lib/MC/MCExpr.cpp | 6 + contrib/llvm-project/llvm/lib/Object/ELF.cpp | 7 +- .../llvm-project/llvm/lib/Object/ELFObjectFile.cpp | 2 +- .../llvm-project/llvm/lib/Object/ObjectFile.cpp | 11 +- .../llvm/lib/Object/WasmObjectFile.cpp | 1 + .../llvm-project/llvm/lib/Passes/PassBuilder.cpp | 9 +- .../llvm-project/llvm/lib/Passes/PassRegistry.def | 6 + .../llvm/lib/Passes/StandardInstrumentations.cpp | 52 +- .../llvm/lib/ProfileData/InstrProf.cpp | 27 +- .../llvm-project/llvm/lib/Support/CommandLine.cpp | 9 +- .../llvm-project/llvm/lib/Support/RISCVISAInfo.cpp | 41 +- .../llvm-project/llvm/lib/Target/AArch64/AArch64.h | 1 + .../llvm/lib/Target/AArch64/AArch64.td | 2 +- .../llvm/lib/Target/AArch64/AArch64FastISel.cpp | 19 +- .../lib/Target/AArch64/AArch64ISelDAGToDAG.cpp | 6 +- .../lib/Target/AArch64/AArch64ISelLowering.cpp | 15 +- .../llvm/lib/Target/AArch64/AArch64InstrFormats.td | 1 + .../Target/AArch64/AArch64LoopIdiomTransform.cpp | 828 ++++++++++++++++ .../lib/Target/AArch64/AArch64LoopIdiomTransform.h | 25 + .../llvm/lib/Target/AArch64/AArch64SMEInstrInfo.td | 2 +- .../llvm/lib/Target/AArch64/AArch64SVEInstrInfo.td | 5 +- .../lib/Target/AArch64/AArch64SelectionDAGInfo.cpp | 2 +- .../lib/Target/AArch64/AArch64TargetMachine.cpp | 11 + .../llvm/lib/Target/AArch64/AArch64TargetMachine.h | 4 + .../Target/AArch64/AArch64TargetTransformInfo.h | 2 + .../Target/AArch64/GISel/AArch64LegalizerInfo.cpp | 59 +- .../Target/AArch64/GISel/AArch64LegalizerInfo.h | 4 +- .../llvm/lib/Target/AArch64/SVEInstrFormats.td | 12 + .../llvm-project/llvm/lib/Target/AMDGPU/AMDGPU.td | 10 +- .../llvm/lib/Target/AMDGPU/AMDGPUCallingConv.td | 26 +- .../llvm/lib/Target/AMDGPU/AMDGPUCombine.td | 9 +- .../Target/AMDGPU/AMDGPUHSAMetadataStreamer.cpp | 10 +- .../llvm/lib/Target/AMDGPU/AMDGPUISelDAGToDAG.cpp | 23 +- .../llvm/lib/Target/AMDGPU/AMDGPUISelDAGToDAG.h | 14 +- .../llvm/lib/Target/AMDGPU/AMDGPUISelLowering.cpp | 58 +- .../Target/AMDGPU/AMDGPUInstructionSelector.cpp | 8 +- .../llvm/lib/Target/AMDGPU/AMDGPULegalizerInfo.cpp | 29 +- .../llvm/lib/Target/AMDGPU/AMDGPULegalizerInfo.h | 4 +- .../llvm/lib/Target/AMDGPU/AMDGPULibCalls.cpp | 32 +- .../lib/Target/AMDGPU/AMDGPUMachineFunction.cpp | 39 +- .../llvm/lib/Target/AMDGPU/AMDGPUMachineFunction.h | 7 + .../Target/AMDGPU/AMDGPUPostLegalizerCombiner.cpp | 34 + .../lib/Target/AMDGPU/AMDGPURegisterBankInfo.cpp | 168 +++- .../lib/Target/AMDGPU/AMDGPURegisterBankInfo.h | 5 + .../llvm/lib/Target/AMDGPU/AMDGPUTargetMachine.cpp | 3 +- .../llvm/lib/Target/AMDGPU/AMDGPUTargetMachine.h | 3 +- .../Target/AMDGPU/AsmParser/AMDGPUAsmParser.cpp | 37 +- .../llvm/lib/Target/AMDGPU/BUFInstructions.td | 10 +- .../llvm/lib/Target/AMDGPU/DSDIRInstructions.td | 192 ++++ .../llvm/lib/Target/AMDGPU/DSInstructions.td | 1 - .../AMDGPU/Disassembler/AMDGPUDisassembler.cpp | 6 + .../llvm/lib/Target/AMDGPU/EXPInstructions.td | 1 + .../llvm/lib/Target/AMDGPU/FLATInstructions.td | 46 +- .../llvm/lib/Target/AMDGPU/GCNSubtarget.h | 9 +- .../llvm/lib/Target/AMDGPU/LDSDIRInstructions.td | 116 --- .../AMDGPU/MCTargetDesc/AMDGPUInstPrinter.cpp | 139 ++- .../Target/AMDGPU/MCTargetDesc/AMDGPUInstPrinter.h | 10 +- .../AMDGPU/MCTargetDesc/AMDGPUMCCodeEmitter.cpp | 19 +- .../llvm/lib/Target/AMDGPU/R600ISelLowering.cpp | 8 +- .../llvm/lib/Target/AMDGPU/SIFoldOperands.cpp | 148 ++- .../llvm/lib/Target/AMDGPU/SIISelLowering.cpp | 287 +++++- .../llvm/lib/Target/AMDGPU/SIISelLowering.h | 2 + .../llvm/lib/Target/AMDGPU/SIInsertWaitcnts.cpp | 10 + .../llvm/lib/Target/AMDGPU/SIInstrFormats.td | 2 +- .../llvm/lib/Target/AMDGPU/SIInstrInfo.cpp | 210 +++- .../llvm/lib/Target/AMDGPU/SIInstrInfo.h | 6 + .../llvm/lib/Target/AMDGPU/SIInstrInfo.td | 19 +- .../llvm/lib/Target/AMDGPU/SIInstructions.td | 174 +++- .../llvm/lib/Target/AMDGPU/SIMemoryLegalizer.cpp | 70 +- .../llvm/lib/Target/AMDGPU/SIRegisterInfo.td | 8 +- .../llvm/lib/Target/AMDGPU/SIWholeQuadMode.cpp | 4 +- .../llvm/lib/Target/AMDGPU/SMInstructions.td | 44 +- .../llvm/lib/Target/AMDGPU/SOPInstructions.td | 52 +- .../lib/Target/AMDGPU/Utils/AMDGPUBaseInfo.cpp | 106 +- .../llvm/lib/Target/AMDGPU/Utils/AMDGPUBaseInfo.h | 11 +- .../llvm/lib/Target/AMDGPU/VOP2Instructions.td | 2 +- .../llvm/lib/Target/AMDGPU/VOP3PInstructions.td | 18 +- .../llvm/lib/Target/ARC/ARCISelDAGToDAG.cpp | 2 +- .../llvm/lib/Target/ARC/ARCISelLowering.cpp | 2 + .../llvm/lib/Target/ARC/ARCTargetMachine.cpp | 7 + .../llvm/lib/Target/ARM/ARMFastISel.cpp | 2 +- .../llvm/lib/Target/ARM/ARMISelDAGToDAG.cpp | 24 +- .../llvm/lib/Target/ARM/ARMISelLowering.cpp | 19 +- .../llvm/lib/Target/ARM/ARMLegalizerInfo.cpp | 10 +- .../llvm/lib/Target/ARM/ARMLegalizerInfo.h | 4 +- .../llvm/lib/Target/AVR/AVRISelLowering.cpp | 4 +- .../llvm/lib/Target/BPF/BPFISelLowering.cpp | 1 + .../llvm/lib/Target/BPF/BPFTargetMachine.cpp | 5 +- .../llvm/lib/Target/BPF/BPFTargetMachine.h | 3 +- .../llvm/lib/Target/DirectX/DXILResourceAnalysis.h | 1 + .../lib/Target/DirectX/DirectXTargetMachine.cpp | 3 +- .../llvm/lib/Target/DirectX/DirectXTargetMachine.h | 3 +- .../lib/Target/Hexagon/HexagonISelDAGToDAG.cpp | 2 +- .../lib/Target/Hexagon/HexagonISelLoweringHVX.cpp | 6 +- .../lib/Target/Hexagon/HexagonTargetMachine.cpp | 3 +- .../llvm/lib/Target/Hexagon/HexagonTargetMachine.h | 3 +- .../llvm/lib/Target/Lanai/LanaiISelLowering.cpp | 2 + .../llvm/lib/Target/Lanai/LanaiTargetMachine.cpp | 7 + .../LoongArch/AsmParser/LoongArchAsmParser.cpp | 61 ++ .../LoongArch/LoongArchExpandPseudoInsts.cpp | 521 +++++----- .../lib/Target/LoongArch/LoongArchISelLowering.cpp | 65 +- .../lib/Target/LoongArch/LoongArchISelLowering.h | 7 +- .../lib/Target/LoongArch/LoongArchInstrInfo.td | 106 +- .../lib/Target/LoongArch/LoongArchMCInstLower.cpp | 3 + .../lib/Target/LoongArch/LoongArchRegisterInfo.cpp | 23 + .../lib/Target/LoongArch/LoongArchRegisterInfo.h | 1 + .../Target/LoongArch/LoongArchTargetMachine.cpp | 4 +- .../LoongArch/MCTargetDesc/LoongArchAsmBackend.cpp | 69 +- .../LoongArch/MCTargetDesc/LoongArchAsmBackend.h | 3 + .../LoongArch/MCTargetDesc/LoongArchBaseInfo.h | 1 + .../MCTargetDesc/LoongArchELFObjectWriter.cpp | 2 + .../LoongArch/MCTargetDesc/LoongArchFixupKinds.h | 5 +- .../MCTargetDesc/LoongArchMCCodeEmitter.cpp | 3 + .../LoongArch/MCTargetDesc/LoongArchMCExpr.cpp | 3 + .../LoongArch/MCTargetDesc/LoongArchMCExpr.h | 1 + .../llvm/lib/Target/M68k/GISel/M68kLegalizerInfo.h | 1 - .../llvm/lib/Target/M68k/M68kISelLowering.cpp | 4 +- .../llvm/lib/Target/MSP430/MSP430ISelDAGToDAG.cpp | 4 +- .../llvm/lib/Target/MSP430/MSP430ISelLowering.cpp | 7 +- .../llvm/lib/Target/MSP430/MSP430TargetMachine.cpp | 7 + .../llvm/lib/Target/Mips/MipsFastISel.cpp | 2 +- .../llvm/lib/Target/Mips/MipsISelLowering.cpp | 3 +- .../llvm/lib/Target/Mips/MipsLegalizerInfo.cpp | 5 +- .../llvm/lib/Target/Mips/MipsLegalizerInfo.h | 3 +- .../llvm/lib/Target/Mips/MipsSEISelDAGToDAG.cpp | 2 +- .../llvm/lib/Target/NVPTX/NVPTXISelDAGToDAG.cpp | 8 +- .../llvm/lib/Target/NVPTX/NVPTXISelLowering.cpp | 3 +- .../llvm/lib/Target/NVPTX/NVPTXTargetMachine.cpp | 3 +- .../llvm/lib/Target/NVPTX/NVPTXTargetMachine.h | 3 +- .../lib/Target/NVPTX/NVPTXTargetTransformInfo.cpp | 34 - .../llvm/lib/Target/PowerPC/PPCFastISel.cpp | 2 +- .../llvm/lib/Target/PowerPC/PPCISelDAGToDAG.cpp | 13 +- .../llvm/lib/Target/PowerPC/PPCISelLowering.cpp | 16 +- .../llvm/lib/Target/PowerPC/PPCRegisterInfo.td | 9 +- .../lib/Target/RISCV/AsmParser/RISCVAsmParser.cpp | 9 +- .../lib/Target/RISCV/GISel/RISCVCallLowering.cpp | 2 +- .../lib/Target/RISCV/GISel/RISCVLegalizerInfo.cpp | 7 +- .../lib/Target/RISCV/GISel/RISCVLegalizerInfo.h | 4 +- .../lib/Target/RISCV/MCA/RISCVCustomBehaviour.cpp | 33 +- .../Target/RISCV/MCTargetDesc/RISCVAsmBackend.cpp | 9 +- .../Target/RISCV/MCTargetDesc/RISCVAsmBackend.h | 4 +- .../lib/Target/RISCV/MCTargetDesc/RISCVBaseInfo.h | 1 - .../lib/Target/RISCV/MCTargetDesc/RISCVMCExpr.cpp | 2 - .../llvm/lib/Target/RISCV/RISCVAsmPrinter.cpp | 3 - .../lib/Target/RISCV/RISCVExpandPseudoInsts.cpp | 10 +- .../llvm/lib/Target/RISCV/RISCVFeatures.td | 6 + .../Target/RISCV/RISCVGatherScatterLowering.cpp | 2 +- .../llvm/lib/Target/RISCV/RISCVISelDAGToDAG.cpp | 10 +- .../llvm/lib/Target/RISCV/RISCVISelLowering.cpp | 375 +++---- .../llvm/lib/Target/RISCV/RISCVISelLowering.h | 13 +- .../llvm/lib/Target/RISCV/RISCVInsertVSETVLI.cpp | 5 + .../llvm/lib/Target/RISCV/RISCVInstrInfo.cpp | 7 +- .../llvm/lib/Target/RISCV/RISCVInstrInfo.td | 54 +- .../llvm/lib/Target/RISCV/RISCVInstrInfoA.td | 12 +- .../llvm/lib/Target/RISCV/RISCVInstrInfoD.td | 2 + .../lib/Target/RISCV/RISCVInstrInfoVPseudos.td | 2 + .../lib/Target/RISCV/RISCVInstrInfoVSDPatterns.td | 16 + .../lib/Target/RISCV/RISCVInstrInfoVVLPatterns.td | 122 +-- .../llvm/lib/Target/RISCV/RISCVInstrInfoZa.td | 44 + .../llvm/lib/Target/RISCV/RISCVOptWInstrs.cpp | 6 +- .../llvm/lib/Target/RISCV/RISCVProcessors.td | 3 +- .../llvm/lib/Target/RISCV/RISCVRegisterInfo.td | 2 +- .../llvm/lib/Target/RISCV/RISCVSubtarget.h | 7 + .../lib/Target/RISCV/RISCVTargetTransformInfo.cpp | 114 ++- .../lib/Target/RISCV/RISCVTargetTransformInfo.h | 3 + .../llvm/lib/Target/SPIRV/SPIRVCallLowering.cpp | 7 +- .../llvm/lib/Target/SPIRV/SPIRVEmitIntrinsics.cpp | 125 ++- .../llvm/lib/Target/SPIRV/SPIRVLegalizerInfo.cpp | 5 +- .../llvm/lib/Target/SPIRV/SPIRVLegalizerInfo.h | 3 +- .../llvm/lib/Target/SPIRV/SPIRVPreLegalizer.cpp | 59 +- .../llvm/lib/Target/SPIRV/SPIRVTargetMachine.cpp | 14 + .../llvm/lib/Target/SPIRV/SPIRVUtils.cpp | 4 +- .../llvm/lib/Target/SPIRV/SPIRVUtils.h | 2 +- .../lib/Target/SystemZ/SystemZISelDAGToDAG.cpp | 8 +- .../lib/Target/SystemZ/SystemZISelLowering.cpp | 27 +- .../lib/Target/WebAssembly/WebAssemblyFastISel.cpp | 2 +- .../Target/WebAssembly/WebAssemblyISelLowering.cpp | 7 +- .../llvm/lib/Target/X86/GISel/X86LegalizerInfo.h | 1 - .../llvm/lib/Target/X86/MCTargetDesc/X86BaseInfo.h | 16 - .../Target/X86/MCTargetDesc/X86MCCodeEmitter.cpp | 3 + contrib/llvm-project/llvm/lib/Target/X86/X86.h | 8 +- .../X86/{X86EvexToVex.cpp => X86CompressEVEX.cpp} | 168 ++-- .../llvm/lib/Target/X86/X86DomainReassignment.cpp | 67 +- .../llvm/lib/Target/X86/X86FastISel.cpp | 12 +- .../llvm/lib/Target/X86/X86FlagsCopyLowering.cpp | 1 - .../llvm/lib/Target/X86/X86ISelDAGToDAG.cpp | 2 +- .../llvm/lib/Target/X86/X86ISelLowering.cpp | 122 ++- .../llvm/lib/Target/X86/X86ISelLowering.h | 10 - .../llvm/lib/Target/X86/X86ISelLoweringCall.cpp | 37 +- .../llvm/lib/Target/X86/X86InstrAVX512.td | 248 ++--- .../llvm/lib/Target/X86/X86InstrArithmetic.td | 1030 ++++++++++++-------- .../llvm/lib/Target/X86/X86InstrFormats.td | 6 - .../llvm/lib/Target/X86/X86InstrInfo.h | 4 +- .../llvm/lib/Target/X86/X86InstrMisc.td | 120 +-- .../llvm/lib/Target/X86/X86InstrPredicates.td | 33 + .../llvm/lib/Target/X86/X86InstrShiftRotate.td | 2 +- .../llvm/lib/Target/X86/X86InstrSystem.td | 13 +- .../llvm/lib/Target/X86/X86InstrUtils.td | 10 +- .../llvm/lib/Target/X86/X86MCInstLower.cpp | 7 +- .../llvm/lib/Target/X86/X86TargetMachine.cpp | 4 +- .../llvm/lib/Target/X86/X86TargetTransformInfo.cpp | 1 + .../llvm/lib/Target/XCore/XCoreISelDAGToDAG.cpp | 2 +- .../llvm-project/llvm/lib/TargetParser/Host.cpp | 3 +- .../llvm-project/llvm/lib/TargetParser/Triple.cpp | 7 +- .../llvm/lib/Transforms/Coroutines/CoroFrame.cpp | 12 +- .../lib/Transforms/IPO/AttributorAttributes.cpp | 6 +- .../Transforms/InstCombine/InstCombineAddSub.cpp | 7 - .../Transforms/InstCombine/InstCombineCalls.cpp | 62 +- .../Transforms/InstCombine/InstCombineCompares.cpp | 68 +- .../Transforms/InstCombine/InstCombineInternal.h | 23 +- .../InstCombine/InstCombineMulDivRem.cpp | 7 - .../InstCombine/InstructionCombining.cpp | 135 ++- .../Instrumentation/AddressSanitizer.cpp | 50 +- .../Transforms/Instrumentation/BoundsChecking.cpp | 8 +- .../Transforms/Instrumentation/InstrProfiling.cpp | 10 +- .../Instrumentation/PGOInstrumentation.cpp | 51 +- .../Transforms/Scalar/ConstraintElimination.cpp | 91 +- .../Scalar/CorrelatedValuePropagation.cpp | 51 +- .../llvm/lib/Transforms/Scalar/SROA.cpp | 6 +- .../Scalar/SeparateConstOffsetFromGEP.cpp | 6 +- .../Scalar/StraightLineStrengthReduce.cpp | 2 +- .../lib/Transforms/Utils/InjectTLIMappings.cpp | 46 +- .../llvm/lib/Transforms/Utils/SCCPSolver.cpp | 10 +- .../llvm/lib/Transforms/Utils/SimplifyCFG.cpp | 35 +- .../llvm/lib/Transforms/Utils/SimplifyLibCalls.cpp | 20 +- .../Transforms/Vectorize/LoadStoreVectorizer.cpp | 2 +- .../Vectorize/LoopVectorizationPlanner.h | 27 +- .../lib/Transforms/Vectorize/LoopVectorize.cpp | 481 ++++----- .../lib/Transforms/Vectorize/SLPVectorizer.cpp | 24 +- .../lib/Transforms/Vectorize/VPRecipeBuilder.h | 7 +- .../llvm/lib/Transforms/Vectorize/VPlan.cpp | 1 + .../llvm/lib/Transforms/Vectorize/VPlan.h | 34 +- .../llvm/lib/Transforms/Vectorize/VPlanRecipes.cpp | 88 +- .../lib/Transforms/Vectorize/VPlanTransforms.cpp | 23 +- .../llvm-project/llvm/tools/lli/ExecutionUtils.cpp | 32 +- .../llvm/tools/lli/ForwardingMemoryManager.h | 9 +- contrib/llvm-project/llvm/tools/lli/lli.cpp | 9 +- .../llvm-project/llvm/tools/llvm-cxxfilt/Opts.td | 2 + .../llvm/tools/llvm-cxxfilt/llvm-cxxfilt.cpp | 10 +- .../llvm/tools/llvm-dwarfutil/DebugInfoLinker.cpp | 32 +- .../llvm/tools/llvm-profdata/llvm-profdata.cpp | 23 +- .../llvm/tools/llvm-readobj/ELFDumper.cpp | 1 + contrib/llvm-project/llvm/tools/opt/opt.cpp | 2 +- .../utils/TableGen/GlobalISelCombinerEmitter.cpp | 16 +- .../TableGen/MacroFusionPredicatorEmitter.cpp | 236 +++++ .../llvm/utils/TableGen/PredicateExpander.cpp | 8 + .../llvm/utils/TableGen/PredicateExpander.h | 1 + .../TableGen/X86CompressEVEXTablesEmitter.cpp | 206 ++++ .../utils/TableGen/X86EVEX2VEXTablesEmitter.cpp | 210 ---- .../llvm/utils/TableGen/X86FoldTablesEmitter.cpp | 6 +- .../utils/TableGen/X86ManualCompressEVEXTables.def | 331 +++++++ contrib/llvm-project/openmp/runtime/src/kmp.h | 7 + .../openmp/runtime/src/kmp_config.h.cmake | 2 +- .../openmp/runtime/src/kmp_ftn_entry.h | 2 +- .../llvm-project/openmp/runtime/src/kmp_global.cpp | 2 +- .../openmp/runtime/src/kmp_gsupport.cpp | 3 +- contrib/llvm-project/openmp/runtime/src/kmp_os.h | 9 +- .../llvm-project/openmp/runtime/src/kmp_platform.h | 32 +- .../openmp/runtime/src/kmp_runtime.cpp | 8 +- .../openmp/runtime/src/kmp_settings.cpp | 4 +- .../openmp/runtime/src/kmp_wrapper_getpid.h | 5 + .../openmp/runtime/src/z_Linux_util.cpp | 21 +- lib/clang/include/VCSVersion.inc | 6 +- lib/clang/include/lld/Common/Version.inc | 2 +- lib/clang/include/llvm/Support/VCSRevision.h | 2 +- lib/clang/libllvm/Makefile | 7 +- usr.bin/clang/llvm-tblgen/Makefile | 3 +- 691 files changed, 13954 insertions(+), 6431 deletions(-) diff --cc contrib/llvm-project/clang/lib/Sema/SemaConcept.cpp index 719c6aab74e0,acfc00f41254..acfc00f41254 mode 100755,100644..100755 --- a/contrib/llvm-project/clang/lib/Sema/SemaConcept.cpp +++ b/contrib/llvm-project/clang/lib/Sema/SemaConcept.cpp diff --cc contrib/llvm-project/compiler-rt/lib/orc/executor_symbol_def.h index 000000000000,454cefe525cf..454cefe525cf mode 000000,100644..100644 --- a/contrib/llvm-project/compiler-rt/lib/orc/executor_symbol_def.h +++ b/contrib/llvm-project/compiler-rt/lib/orc/executor_symbol_def.h diff --cc contrib/llvm-project/compiler-rt/lib/orc/tests/unit/executor_symbol_def_test.cpp index 000000000000,181091ca1e60..181091ca1e60 mode 000000,100644..100644 --- a/contrib/llvm-project/compiler-rt/lib/orc/tests/unit/executor_symbol_def_test.cpp +++ b/contrib/llvm-project/compiler-rt/lib/orc/tests/unit/executor_symbol_def_test.cpp diff --cc contrib/llvm-project/compiler-rt/lib/orc/tests/unit/simple_packed_serialization_utils.h index 000000000000,746be43d250b..746be43d250b mode 000000,100644..100644 --- a/contrib/llvm-project/compiler-rt/lib/orc/tests/unit/simple_packed_serialization_utils.h +++ b/contrib/llvm-project/compiler-rt/lib/orc/tests/unit/simple_packed_serialization_utils.h diff --cc contrib/llvm-project/libcxx/src/fstream.cpp index 000000000000,55a4442b9c78..55a4442b9c78 mode 000000,100644..100644 --- a/contrib/llvm-project/libcxx/src/fstream.cpp +++ b/contrib/llvm-project/libcxx/src/fstream.cpp diff --cc contrib/llvm-project/llvm/include/llvm/CodeGen/CodeGenPrepare.h index 000000000000,dee3a9ee53d7..dee3a9ee53d7 mode 000000,100644..100644 --- a/contrib/llvm-project/llvm/include/llvm/CodeGen/CodeGenPrepare.h +++ b/contrib/llvm-project/llvm/include/llvm/CodeGen/CodeGenPrepare.h diff --cc contrib/llvm-project/llvm/include/llvm/CodeGen/ShadowStackGCLowering.h index 000000000000,1586c6cf545b..1586c6cf545b mode 000000,100644..100644 --- a/contrib/llvm-project/llvm/include/llvm/CodeGen/ShadowStackGCLowering.h +++ b/contrib/llvm-project/llvm/include/llvm/CodeGen/ShadowStackGCLowering.h diff --cc contrib/llvm-project/llvm/include/llvm/DWARFLinker/DWARFLinkerBase.h index 000000000000,626fb53d90f9..626fb53d90f9 mode 000000,100644..100644 --- a/contrib/llvm-project/llvm/include/llvm/DWARFLinker/DWARFLinkerBase.h +++ b/contrib/llvm-project/llvm/include/llvm/DWARFLinker/DWARFLinkerBase.h diff --cc contrib/llvm-project/llvm/lib/Target/AArch64/AArch64LoopIdiomTransform.cpp index 000000000000,6fcd9c290e9c..6fcd9c290e9c mode 000000,100644..100644 --- a/contrib/llvm-project/llvm/lib/Target/AArch64/AArch64LoopIdiomTransform.cpp +++ b/contrib/llvm-project/llvm/lib/Target/AArch64/AArch64LoopIdiomTransform.cpp diff --cc contrib/llvm-project/llvm/lib/Target/AArch64/AArch64LoopIdiomTransform.h index 000000000000,cc68425bb68b..cc68425bb68b mode 000000,100644..100644 --- a/contrib/llvm-project/llvm/lib/Target/AArch64/AArch64LoopIdiomTransform.h +++ b/contrib/llvm-project/llvm/lib/Target/AArch64/AArch64LoopIdiomTransform.h diff --cc contrib/llvm-project/llvm/lib/Target/AMDGPU/DSDIRInstructions.td index 000000000000,4416da605981..4416da605981 mode 000000,100644..100644 --- a/contrib/llvm-project/llvm/lib/Target/AMDGPU/DSDIRInstructions.td +++ b/contrib/llvm-project/llvm/lib/Target/AMDGPU/DSDIRInstructions.td diff --cc contrib/llvm-project/llvm/lib/Target/RISCV/RISCVInstrInfoZa.td index 000000000000,a09f5715b24f..a09f5715b24f mode 000000,100644..100644 --- a/contrib/llvm-project/llvm/lib/Target/RISCV/RISCVInstrInfoZa.td +++ b/contrib/llvm-project/llvm/lib/Target/RISCV/RISCVInstrInfoZa.td diff --cc contrib/llvm-project/llvm/utils/TableGen/MacroFusionPredicatorEmitter.cpp index 000000000000,78dcd4471ae7..78dcd4471ae7 mode 000000,100644..100644 --- a/contrib/llvm-project/llvm/utils/TableGen/MacroFusionPredicatorEmitter.cpp +++ b/contrib/llvm-project/llvm/utils/TableGen/MacroFusionPredicatorEmitter.cpp diff --cc contrib/llvm-project/llvm/utils/TableGen/X86CompressEVEXTablesEmitter.cpp index 000000000000,aa8527e75380..aa8527e75380 mode 000000,100644..100644 --- a/contrib/llvm-project/llvm/utils/TableGen/X86CompressEVEXTablesEmitter.cpp +++ b/contrib/llvm-project/llvm/utils/TableGen/X86CompressEVEXTablesEmitter.cpp diff --cc contrib/llvm-project/llvm/utils/TableGen/X86ManualCompressEVEXTables.def index 000000000000,58ca10e9e10f..58ca10e9e10f mode 000000,100644..100644 --- a/contrib/llvm-project/llvm/utils/TableGen/X86ManualCompressEVEXTables.def +++ b/contrib/llvm-project/llvm/utils/TableGen/X86ManualCompressEVEXTables.def diff --cc lib/clang/include/VCSVersion.inc index 2a9702274719,000000000000..57d5876fcc41 mode 100644,000000..100644 --- a/lib/clang/include/VCSVersion.inc +++ b/lib/clang/include/VCSVersion.inc @@@ -1,8 -1,0 +1,8 @@@ - #define LLVM_REVISION "llvmorg-18-init-16003-gfc5f51cf5af4" ++#define LLVM_REVISION "llvmorg-18-init-16595-g7c00a5be5cde" +#define LLVM_REPOSITORY "https://github.com/llvm/llvm-project.git" + - #define CLANG_REVISION "llvmorg-18-init-16003-gfc5f51cf5af4" ++#define CLANG_REVISION "llvmorg-18-init-16595-g7c00a5be5cde" +#define CLANG_REPOSITORY "https://github.com/llvm/llvm-project.git" + - #define LLDB_REVISION "llvmorg-18-init-16003-gfc5f51cf5af4" ++#define LLDB_REVISION "llvmorg-18-init-16595-g7c00a5be5cde" +#define LLDB_REPOSITORY "https://github.com/llvm/llvm-project.git" diff --cc lib/clang/include/lld/Common/Version.inc index 21535eaa12ca,000000000000..27669c9a009a mode 100644,000000..100644 --- a/lib/clang/include/lld/Common/Version.inc +++ b/lib/clang/include/lld/Common/Version.inc @@@ -1,4 -1,0 +1,4 @@@ +// Local identifier in __FreeBSD_version style +#define LLD_FREEBSD_VERSION 1500000 + - #define LLD_VERSION_STRING "18.0.0 (FreeBSD llvmorg-18-init-16003-gfc5f51cf5af4-" __XSTRING(LLD_FREEBSD_VERSION) ")" ++#define LLD_VERSION_STRING "18.0.0 (FreeBSD llvmorg-18-init-16595-g7c00a5be5cde-" __XSTRING(LLD_FREEBSD_VERSION) ")" diff --cc lib/clang/include/llvm/Support/VCSRevision.h index 5480b539a1e1,000000000000..e826e1ffc7ea mode 100644,000000..100644 --- a/lib/clang/include/llvm/Support/VCSRevision.h +++ b/lib/clang/include/llvm/Support/VCSRevision.h @@@ -1,2 -1,0 +1,2 @@@ - #define LLVM_REVISION "llvmorg-18-init-16003-gfc5f51cf5af4" ++#define LLVM_REVISION "llvmorg-18-init-16595-g7c00a5be5cde" +#define LLVM_REPOSITORY "https://github.com/llvm/llvm-project.git" diff --cc lib/clang/libllvm/Makefile index ca3504bb3dcd,000000000000..8446f8fb1f86 mode 100644,000000..100644 --- a/lib/clang/libllvm/Makefile +++ b/lib/clang/libllvm/Makefile @@@ -1,2276 -1,0 +1,2277 @@@ + +.include +.include "../llvm.pre.mk" + +LIB= llvm +INTERNALLIB= + +CFLAGS+= -I${.OBJDIR} +CFLAGS+= -I${SRCTOP}/sys/contrib/zstd/lib + +.if ${MK_LLVM_TARGET_AARCH64} == "no" && ${MK_LLVM_TARGET_ARM} == "no" && \ + ${MK_LLVM_TARGET_BPF} == "no" && ${MK_LLVM_TARGET_MIPS} == "no" && \ + ${MK_LLVM_TARGET_POWERPC} == "no" && ${MK_LLVM_TARGET_RISCV} == "no" && \ + ${MK_LLVM_TARGET_X86} == "no" +.error Please enable at least one of: MK_LLVM_TARGET_AARCH64,\ + MK_LLVM_TARGET_ARM, MK_LLVM_TARGET_BPF, MK_LLVM_TARGET_MIPS, \ + MK_LLVM_TARGET_POWERPC, MK_LLVM_TARGET_RISCV, or MK_LLVM_TARGET_X86 +.endif + +.for arch in AArch64 ARM BPF Mips PowerPC RISCV X86 +. if ${MK_LLVM_TARGET_${arch:tu}} != "no" +CFLAGS+= -I${LLVM_SRCS}/lib/Target/${arch} +. endif +.endfor + +CFLAGS+= -I${LLVM_SRCS}/lib/ObjCopy + +TARGET_ARCH?= ${MACHINE_ARCH} + +.if ${TARGET_ARCH} != "amd64" +CFLAGS+= -DBLAKE3_NO_AVX512 -DBLAKE3_NO_AVX2 -DBLAKE3_NO_SSE41 \ + -DBLAKE3_NO_SSE2 +.endif +.if ${TARGET_ARCH} != "arm64" +CFLAGS+= -DBLAKE3_USE_NEON=0 +.endif + +SRCDIR= llvm/lib + +# Explanation of different SRCS variants below: +# SRCS_MIN: always required, even for bootstrap +# SRCS_MIW: required for world stage (after cross-tools) +# SRCS_EXT: required for MK_CLANG_EXTRAS +# SRCS_EXL: required for MK_CLANG_EXTRAS and MK_LLD +# SRCS_FUL: required for MK_CLANG_FULL +# SRCS_LLD: required for MK_LLD +# SRCS_XDB: required for MK_CLANG_EXTRAS and MK_LLDB +# SRCS_XDL: required for MK_CLANG_EXTRAS, MK_LLD and MK_LLDB +# SRCS_XDW: required for MK_CLANG_EXTRAS and MK_LLDB in world stage +# SRCS_COV: required for MK_LLVM_COV + +SRCS_MIN+= Analysis/AliasAnalysis.cpp +SRCS_MIN+= Analysis/AliasAnalysisEvaluator.cpp +SRCS_MIN+= Analysis/AliasSetTracker.cpp +SRCS_EXT+= Analysis/Analysis.cpp +SRCS_MIN+= Analysis/AssumeBundleQueries.cpp +SRCS_MIN+= Analysis/AssumptionCache.cpp +SRCS_MIN+= Analysis/BasicAliasAnalysis.cpp +SRCS_MIN+= Analysis/BlockFrequencyInfo.cpp +SRCS_MIN+= Analysis/BlockFrequencyInfoImpl.cpp +SRCS_MIN+= Analysis/BranchProbabilityInfo.cpp +SRCS_MIN+= Analysis/CFG.cpp +SRCS_MIN+= Analysis/CFGPrinter.cpp +SRCS_MIN+= Analysis/CFGSCCPrinter.cpp +SRCS_MIN+= Analysis/CGSCCPassManager.cpp +SRCS_MIN+= Analysis/CallGraph.cpp +SRCS_MIN+= Analysis/CallGraphSCCPass.cpp +SRCS_MIN+= Analysis/CallPrinter.cpp +SRCS_MIN+= Analysis/CaptureTracking.cpp +SRCS_MIN+= Analysis/CmpInstAnalysis.cpp +SRCS_MIN+= Analysis/CodeMetrics.cpp +SRCS_MIN+= Analysis/ConstantFolding.cpp +SRCS_MIN+= Analysis/ConstraintSystem.cpp +SRCS_MIN+= Analysis/CostModel.cpp +SRCS_MIN+= Analysis/CycleAnalysis.cpp +SRCS_MIN+= Analysis/DDG.cpp +SRCS_MIN+= Analysis/DDGPrinter.cpp +SRCS_MIN+= Analysis/Delinearization.cpp +SRCS_MIN+= Analysis/DemandedBits.cpp +SRCS_MIN+= Analysis/DependenceAnalysis.cpp +SRCS_MIN+= Analysis/DependenceGraphBuilder.cpp +SRCS_MIN+= Analysis/DomConditionCache.cpp +SRCS_MIN+= Analysis/DomPrinter.cpp +SRCS_MIN+= Analysis/DomTreeUpdater.cpp +SRCS_MIN+= Analysis/DominanceFrontier.cpp +SRCS_MIN+= Analysis/FunctionPropertiesAnalysis.cpp +SRCS_MIN+= Analysis/GlobalsModRef.cpp +SRCS_MIN+= Analysis/GuardUtils.cpp +SRCS_MIN+= Analysis/HeatUtils.cpp +SRCS_MIN+= Analysis/IRSimilarityIdentifier.cpp +SRCS_MIN+= Analysis/IVDescriptors.cpp +SRCS_MIN+= Analysis/IVUsers.cpp +SRCS_MIN+= Analysis/ImportedFunctionsInliningStatistics.cpp +SRCS_MIN+= Analysis/IndirectCallPromotionAnalysis.cpp +SRCS_MIN+= Analysis/InlineAdvisor.cpp +SRCS_MIN+= Analysis/InlineCost.cpp +SRCS_MIN+= Analysis/InlineOrder.cpp +SRCS_MIN+= Analysis/InlineSizeEstimatorAnalysis.cpp +SRCS_MIN+= Analysis/InstCount.cpp +SRCS_MIN+= Analysis/InstructionPrecedenceTracking.cpp +SRCS_MIN+= Analysis/InstructionSimplify.cpp +SRCS_MIN+= Analysis/InteractiveModelRunner.cpp +SRCS_MIN+= Analysis/Interval.cpp +SRCS_MIN+= Analysis/IntervalPartition.cpp +SRCS_MIN+= Analysis/LazyBlockFrequencyInfo.cpp +SRCS_MIN+= Analysis/LazyBranchProbabilityInfo.cpp +SRCS_MIN+= Analysis/LazyCallGraph.cpp +SRCS_MIN+= Analysis/LazyValueInfo.cpp +SRCS_MIN+= Analysis/Lint.cpp +SRCS_MIN+= Analysis/Loads.cpp +SRCS_MIN+= Analysis/Local.cpp +SRCS_MIN+= Analysis/LoopAccessAnalysis.cpp +SRCS_MIN+= Analysis/LoopAnalysisManager.cpp +SRCS_MIN+= Analysis/LoopCacheAnalysis.cpp +SRCS_MIN+= Analysis/LoopInfo.cpp +SRCS_MIN+= Analysis/LoopNestAnalysis.cpp +SRCS_MIN+= Analysis/LoopPass.cpp +SRCS_MIN+= Analysis/LoopUnrollAnalyzer.cpp +SRCS_MIN+= Analysis/MLInlineAdvisor.cpp +SRCS_MIN+= Analysis/MemDerefPrinter.cpp +SRCS_MIN+= Analysis/MemoryBuiltins.cpp +SRCS_MIN+= Analysis/MemoryDependenceAnalysis.cpp +SRCS_MIN+= Analysis/MemoryLocation.cpp +SRCS_MIN+= Analysis/MemoryProfileInfo.cpp +SRCS_MIN+= Analysis/MemorySSA.cpp +SRCS_MIN+= Analysis/MemorySSAUpdater.cpp +SRCS_MIN+= Analysis/ModuleDebugInfoPrinter.cpp +SRCS_MIN+= Analysis/ModuleSummaryAnalysis.cpp +SRCS_MIN+= Analysis/MustExecute.cpp +SRCS_MIN+= Analysis/ObjCARCAliasAnalysis.cpp +SRCS_MIN+= Analysis/ObjCARCAnalysisUtils.cpp +SRCS_MIN+= Analysis/ObjCARCInstKind.cpp +SRCS_MIN+= Analysis/OptimizationRemarkEmitter.cpp +SRCS_MIN+= Analysis/OverflowInstAnalysis.cpp +SRCS_MIN+= Analysis/PHITransAddr.cpp +SRCS_MIN+= Analysis/PhiValues.cpp +SRCS_MIN+= Analysis/PostDominators.cpp +SRCS_MIN+= Analysis/ProfileSummaryInfo.cpp +SRCS_MIN+= Analysis/PtrUseVisitor.cpp +SRCS_MIN+= Analysis/RegionInfo.cpp +SRCS_MIN+= Analysis/RegionPass.cpp +SRCS_MIN+= Analysis/RegionPrinter.cpp +SRCS_MIN+= Analysis/ReplayInlineAdvisor.cpp +SRCS_MIN+= Analysis/ScalarEvolution.cpp +SRCS_MIN+= Analysis/ScalarEvolution.cpp +SRCS_MIN+= Analysis/ScalarEvolutionAliasAnalysis.cpp +SRCS_MIN+= Analysis/ScalarEvolutionDivision.cpp +SRCS_MIN+= Analysis/ScalarEvolutionNormalization.cpp +SRCS_MIN+= Analysis/ScopedNoAliasAA.cpp +SRCS_MIN+= Analysis/StackLifetime.cpp +SRCS_MIN+= Analysis/StackSafetyAnalysis.cpp +SRCS_MIN+= Analysis/StructuralHash.cpp +SRCS_MIN+= Analysis/SyntheticCountsUtils.cpp +SRCS_MIN+= Analysis/TargetLibraryInfo.cpp +SRCS_MIN+= Analysis/TargetTransformInfo.cpp +SRCS_MIN+= Analysis/TensorSpec.cpp *** 2219 LINES SKIPPED *** From nobody Sat Apr 6 20:18:07 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VBmrM4hqKz5HGy9; Sat, 6 Apr 2024 20:18:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VBmrM3Gpcz4L33; Sat, 6 Apr 2024 20:18:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712434691; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PdVMxtmfkVQPm6u/NsReQ9RmpscWB+lnuQ/WGIC/fWI=; b=fE3T7zFsSgAre/YRHzlJomBTB9eRK5MN/t0L870Cr41JdyBwixqU/SCfblvK/GA2msA6sj Pg4Cg/98lsyRB8k1DPvpOkPHhRtjNHv+UNf4MFM93mL6iFXgTCdlyLWm6zzTGVo0bH6Wiy 28MWfCylZscAGys/RqmCrZYuDNbN3ZEBrWtH/CwufmslYPLQMscX7oNW/TW7myurHVIC1p gkVVDKANsbj4IAtPPf2xeNBohbIjXxXX4BSJtX0yvVAYhPLBcOG40fndm7z9I1SPsnAYLo YcdTCLMP0XB7uiti2oCUoR0sQwL1Ejxk+eMeINe9RWTvGCX0IscL7TxDa8dW2w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712434691; a=rsa-sha256; cv=none; b=Eia4/0aS4SOPwX1pNXzLnpd2pRU1EjwMN7m3L5Iogzmf8AxG89+kuRBs2K8NhJOIKKoXht kpRNQr6J4tu7uuHoARtOOJfy2qCdWNbIHXYCle3TksIfEQPxuMFUj4fO2INrLXRDVo5291 IZIh2LyYmZ6mh07MkX0l0UmiqoILjSonsx1btlovFZTkh4r+rt+ewE6591QNER8nQza7DN 3ESGeSICjPRZ/i15/Z50Fo81tWMie0NUXQ4hgqj/igL9+kHrWJLl/2UXbkRDwJILVHEUrQ Q5WB32QXUkG386n3iwRjlr90KJDHr3oTCO4YcxLWczqWa1j8O23oyvLE/KGyfA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712434691; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PdVMxtmfkVQPm6u/NsReQ9RmpscWB+lnuQ/WGIC/fWI=; b=xlVrFPifUG61+l3J9eF2KNAhK+O82NepPcBPRCS10+V+FJShrd6gi1wsEkLQU7L5e6yRCu YEtk0W66InABv3/KxVNH+TvbE/F+JN3w/8tNWmNwu5VZLT41h+3/+T2dW3/L6iMgmBOr0/ oKpzp18eaa05AA7fam7QXumRwrgmT/9xwmp53zAyMjW7i1UDGWhiUJVl0xcnUFA0W5Fbfk G+rTpDCr2gpjrdbUz2yjb0C9jPOMB4Z3otQaKNBKr8Zd1wQcDb9iSvzy3fiXAvuqDWCUQg hTp8uydmJLv6sSWkwqHZ3u/LDwbCDIF5H2nnHQunyqjL3LtX0ipNZd6MeoVfig== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VBmrM2rc8zxgD; Sat, 6 Apr 2024 20:18: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 436KIBN4029714; Sat, 6 Apr 2024 20:18:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 436KI7J2029701; Sat, 6 Apr 2024 20:18:07 GMT (envelope-from git) Date: Sat, 6 Apr 2024 20:18:07 GMT Message-Id: <202404062018.436KI7J2029701@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dimitry Andric Subject: git: 297eecfb02bb - main - Merge llvm-project main llvmorg-18-init-16864-g3b3ee1f53424 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 297eecfb02bb25902531dbb5c3b9a88caf8adf29 Auto-Submitted: auto-generated The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=297eecfb02bb25902531dbb5c3b9a88caf8adf29 commit 297eecfb02bb25902531dbb5c3b9a88caf8adf29 Merge: 1db9f3b21e39 950076cd18f3 Author: Dimitry Andric AuthorDate: 2024-01-11 18:29:01 +0000 Commit: Dimitry Andric CommitDate: 2024-04-06 20:13:39 +0000 Merge llvm-project main llvmorg-18-init-16864-g3b3ee1f53424 This updates llvm, clang, compiler-rt, libc++, libunwind, lld, lldb and openmp to llvm-project main llvmorg-18-init-16864-g3b3ee1f53424. PR: 276104 MFC after: 1 month .../clang/include/clang/AST/DeclBase.h | 10 + .../llvm-project/clang/include/clang/AST/DeclCXX.h | 3 + .../llvm-project/clang/include/clang/AST/Stmt.h | 6 +- .../llvm-project/clang/include/clang/AST/Type.h | 3 + .../llvm-project/clang/include/clang/Basic/Attr.td | 18 + .../clang/include/clang/Basic/AttrDocs.td | 78 +++ .../include/clang/Basic/DiagnosticFrontendKinds.td | 2 +- .../include/clang/Basic/DiagnosticSemaKinds.td | 15 + .../clang/include/clang/Basic/LangOptions.def | 1 + .../clang/include/clang/Basic/TargetInfo.h | 1 + .../clang/include/clang/Basic/arm_sve.td | 22 +- .../clang/include/clang/Driver/Options.td | 18 +- .../clang/include/clang/Format/Format.h | 20 +- .../clang/include/clang/Parse/Parser.h | 24 +- .../llvm-project/clang/include/clang/Sema/Sema.h | 3 + .../clang/include/clang/Sema/TypoCorrection.h | 12 +- contrib/llvm-project/clang/lib/AST/ASTContext.cpp | 7 + contrib/llvm-project/clang/lib/AST/ASTImporter.cpp | 37 +- contrib/llvm-project/clang/lib/AST/DeclBase.cpp | 74 ++- contrib/llvm-project/clang/lib/AST/DeclCXX.cpp | 13 + contrib/llvm-project/clang/lib/AST/Expr.cpp | 83 +--- .../clang/lib/AST/Interp/ByteCodeExprGen.cpp | 7 + .../clang/lib/AST/Interp/Descriptor.cpp | 6 +- .../llvm-project/clang/lib/AST/Interp/Descriptor.h | 7 +- .../llvm-project/clang/lib/AST/Interp/Interp.cpp | 12 + .../clang/lib/AST/Interp/InterpBuiltin.cpp | 33 +- .../llvm-project/clang/lib/AST/Interp/Program.cpp | 16 +- contrib/llvm-project/clang/lib/AST/Type.cpp | 34 +- .../clang/lib/Analysis/ExprMutationAnalyzer.cpp | 355 +++++++------- .../clang/lib/Basic/Targets/AArch64.cpp | 7 + .../llvm-project/clang/lib/Basic/Targets/RISCV.cpp | 5 +- .../llvm-project/clang/lib/CodeGen/CGBuiltin.cpp | 244 +++++++++- contrib/llvm-project/clang/lib/CodeGen/CGCall.cpp | 2 + .../llvm-project/clang/lib/CodeGen/CGException.cpp | 7 +- contrib/llvm-project/clang/lib/CodeGen/CGExpr.cpp | 340 +++++++++++++- .../llvm-project/clang/lib/CodeGen/CGObjCGNU.cpp | 35 +- .../clang/lib/CodeGen/CodeGenFunction.h | 22 + .../clang/lib/CodeGen/CodeGenModule.cpp | 2 + .../clang/lib/CodeGen/CoverageMappingGen.cpp | 13 +- .../clang/lib/CodeGen/Targets/AArch64.cpp | 2 + .../clang/lib/Driver/ToolChains/Clang.cpp | 6 +- .../clang/lib/Driver/ToolChains/Flang.cpp | 57 ++- .../clang/lib/Driver/ToolChains/Flang.h | 7 + .../clang/lib/Driver/ToolChains/Gnu.cpp | 8 +- .../clang/lib/Driver/ToolChains/Linux.cpp | 8 +- contrib/llvm-project/clang/lib/Format/Format.cpp | 30 +- .../llvm-project/clang/lib/Format/FormatToken.cpp | 4 +- .../llvm-project/clang/lib/Format/FormatToken.h | 25 +- .../clang/lib/Format/TokenAnnotator.cpp | 14 +- .../clang/lib/Format/UnwrappedLineFormatter.cpp | 10 +- .../clang/lib/Format/UnwrappedLineParser.cpp | 4 +- .../clang/lib/Format/WhitespaceManager.cpp | 9 +- .../clang/lib/Format/WhitespaceManager.h | 1 + .../lib/Frontend/VerifyDiagnosticConsumer.cpp | 15 +- .../llvm-project/clang/lib/Headers/ia32intrin.h | 376 +++++++-------- .../clang/lib/Interpreter/Interpreter.cpp | 1 + contrib/llvm-project/clang/lib/Parse/ParseDecl.cpp | 8 +- contrib/llvm-project/clang/lib/Parse/ParseExpr.cpp | 26 +- .../llvm-project/clang/lib/Parse/ParseOpenACC.cpp | 65 +-- contrib/llvm-project/clang/lib/Sema/SemaDecl.cpp | 6 + .../llvm-project/clang/lib/Sema/SemaDeclAttr.cpp | 133 ++++++ contrib/llvm-project/clang/lib/Sema/SemaExpr.cpp | 16 +- .../llvm-project/clang/lib/Sema/SemaExprMember.cpp | 3 +- .../llvm-project/clang/lib/Sema/SemaOverload.cpp | 10 + contrib/llvm-project/clang/lib/Sema/SemaStmt.cpp | 2 +- .../llvm-project/clang/lib/Sema/TreeTransform.h | 20 +- .../Checkers/StdLibraryFunctionsChecker.cpp | 21 +- .../lib/StaticAnalyzer/Checkers/StreamChecker.cpp | 59 ++- .../clang/tools/clang-format/ClangFormat.cpp | 65 ++- .../compiler-rt/include/profile/InstrProfData.inc | 2 + .../lib/profile/InstrProfilingPlatformLinux.c | 9 - .../lib/sanitizer_common/sanitizer_flags.inc | 3 + .../sanitizer_symbolizer_report.cpp | 36 +- .../sanitizer_thread_arg_retval.cpp | 23 +- .../sanitizer_common/sanitizer_thread_arg_retval.h | 1 + .../lib/scudo/standalone/condition_variable.h | 2 +- contrib/llvm-project/libcxx/include/__config | 5 - .../libcxx/include/__memory/shared_ptr.h | 4 +- contrib/llvm-project/libcxx/include/cstdio | 2 +- contrib/llvm-project/libcxx/include/regex | 3 + contrib/llvm-project/libcxx/include/tuple | 2 +- contrib/llvm-project/lld/ELF/Arch/AArch64.cpp | 3 + contrib/llvm-project/lld/ELF/Arch/LoongArch.cpp | 110 ++--- contrib/llvm-project/lld/ELF/Arch/RISCV.cpp | 7 +- contrib/llvm-project/lld/ELF/InputSection.cpp | 10 +- contrib/llvm-project/lld/ELF/Target.h | 2 +- .../llvm-project/lldb/include/lldb/Core/Module.h | 6 + .../llvm-project/lldb/include/lldb/Symbol/Type.h | 4 + .../lldb/include/lldb/Utility/StreamString.h | 2 +- contrib/llvm-project/lldb/source/Core/Module.cpp | 17 + .../ExpressionParser/Clang/ClangASTImporter.cpp | 51 +- .../Language/CPlusPlus/CPlusPlusLanguage.cpp | 35 ++ .../source/Plugins/Language/CPlusPlus/LibCxx.cpp | 57 +++ .../source/Plugins/Language/CPlusPlus/LibCxx.h | 8 + .../source/Plugins/SymbolFile/DWARF/DWARFDIE.cpp | 44 +- .../Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp | 11 +- .../intel-pt/CommandObjectTraceStartIntelPT.cpp | 4 +- .../Plugins/Trace/intel-pt/DecodedThread.cpp | 32 +- .../source/Plugins/Trace/intel-pt/DecodedThread.h | 26 +- .../Plugins/Trace/intel-pt/LibiptDecoder.cpp | 4 +- .../Plugins/Trace/intel-pt/TraceCursorIntelPT.cpp | 4 +- .../Trace/intel-pt/TraceIntelPTBundleLoader.cpp | 13 +- contrib/llvm-project/lldb/source/Symbol/Type.cpp | 4 + .../lldb/source/Target/ProcessTrace.cpp | 2 + .../lldb/source/Utility/StreamString.cpp | 2 +- .../llvm-project/llvm/include/llvm/ADT/STLExtras.h | 29 +- .../llvm-project/llvm/include/llvm/ADT/StringRef.h | 4 +- .../llvm/include/llvm/Analysis/VecFuncs.def | 190 ++++---- .../llvm/BinaryFormat/ELFRelocs/AArch64.def | 1 + .../include/llvm/BinaryFormat/ELFRelocs/RISCV.def | 3 +- .../llvm/CodeGen/AssignmentTrackingAnalysis.h | 29 +- .../llvm/include/llvm/CodeGen/CodeGenPassBuilder.h | 1 + .../llvm/CodeGen/GlobalISel/CombinerHelper.h | 3 + .../llvm/CodeGen/GlobalISel/GenericMachineInstrs.h | 18 + .../include/llvm/CodeGen/GlobalISel/Localizer.h | 7 +- .../llvm/include/llvm/CodeGen/SelectionDAGISel.h | 16 + .../llvm/include/llvm/CodeGen/SelectionDAGNodes.h | 7 + .../Parallel => include/llvm/DWARFLinker}/Utils.h | 36 +- .../llvm/include/llvm/Frontend/OpenACC/ACC.td | 66 +-- .../llvm/include/llvm/IR/IntrinsicsAArch64.td | 6 +- .../llvm/include/llvm/IR/IntrinsicsNVVM.td | 10 + .../llvm/include/llvm/IR/ModuleSummaryIndex.h | 6 + .../llvm/include/llvm/IR/PatternMatch.h | 36 ++ .../llvm/include/llvm/ProfileData/InstrProf.h | 3 +- .../include/llvm/ProfileData/InstrProfData.inc | 2 + .../llvm/include/llvm/Support/RISCVISAInfo.h | 22 +- .../llvm/include/llvm/Support/TargetOpcodes.def | 3 + .../llvm/include/llvm/Target/GenericOpcodes.td | 21 + .../llvm/Target/GlobalISel/SelectionDAGCompat.td | 3 + .../llvm/include/llvm/Target/TargetPfmCounters.td | 21 + .../llvm/TargetParser/ARMTargetParserCommon.h | 1 + .../llvm/lib/Analysis/LazyValueInfo.cpp | 8 +- .../llvm/lib/Bitcode/Writer/BitcodeWriter.cpp | 17 +- .../lib/CodeGen/AssignmentTrackingAnalysis.cpp | 34 ++ .../llvm/lib/CodeGen/BranchFolding.cpp | 17 + .../llvm/lib/CodeGen/GlobalISel/CombinerHelper.cpp | 84 ++++ .../llvm/lib/CodeGen/GlobalISel/IRTranslator.cpp | 12 + .../lib/CodeGen/GlobalISel/LegalizerHelper.cpp | 10 + .../llvm/lib/CodeGen/GlobalISel/Localizer.cpp | 55 ++- .../CodeGen/LiveDebugValues/InstrRefBasedImpl.cpp | 9 +- .../llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp | 74 +-- .../CodeGen/SelectionDAG/LegalizeVectorTypes.cpp | 2 +- .../llvm/lib/CodeGen/SelectionDAG/SelectionDAG.cpp | 12 +- .../lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp | 48 +- .../lib/CodeGen/SelectionDAG/TargetLowering.cpp | 5 +- .../lib/CodeGen/TargetLoweringObjectFileImpl.cpp | 11 +- .../llvm/lib/DWARFLinker/Classic/DWARFLinker.cpp | 15 +- .../Parallel/AcceleratorRecordsSaver.cpp | 2 +- .../Parallel/DWARFLinkerCompileUnit.cpp | 23 +- .../lib/DWARFLinker/Parallel/DWARFLinkerImpl.cpp | 2 +- .../DWARFLinker/Parallel/DebugLineSectionEmitter.h | 38 +- .../llvm-project/llvm/lib/DWARFLinker/Utils.cpp | 2 + contrib/llvm-project/llvm/lib/IR/Verifier.cpp | 11 + .../llvm/lib/MC/MCParser/ELFAsmParser.cpp | 6 +- contrib/llvm-project/llvm/lib/MC/MCSectionELF.cpp | 18 +- .../llvm-project/llvm/lib/Passes/PassBuilder.cpp | 1 + .../llvm-project/llvm/lib/Passes/PassRegistry.def | 4 +- .../llvm-project/llvm/lib/Support/RISCVISAInfo.cpp | 331 +++++++------ contrib/llvm-project/llvm/lib/TableGen/Record.cpp | 15 +- .../llvm/lib/Target/AArch64/AArch64AsmPrinter.cpp | 5 + .../lib/Target/AArch64/AArch64ISelDAGToDAG.cpp | 4 +- .../lib/Target/AArch64/AArch64ISelLowering.cpp | 3 +- .../llvm/lib/Target/AArch64/AArch64InstrInfo.cpp | 3 + .../Target/AArch64/AArch64LoadStoreOptimizer.cpp | 64 ++- .../Target/AArch64/AArch64LoopIdiomTransform.cpp | 2 +- .../llvm/lib/Target/AArch64/AArch64SVEInstrInfo.td | 18 +- .../Target/AArch64/AArch64TargetTransformInfo.cpp | 98 ++-- .../Target/AArch64/GISel/AArch64LegalizerInfo.cpp | 3 +- .../MCTargetDesc/AArch64ELFObjectWriter.cpp | 8 +- .../llvm/lib/Target/AArch64/SMEInstrFormats.td | 2 +- .../llvm/lib/Target/AMDGPU/AMDGPUCombine.td | 2 +- .../llvm/lib/Target/AMDGPU/AMDGPUISelDAGToDAG.cpp | 12 +- .../lib/Target/AMDGPU/AMDGPULowerModuleLDSPass.cpp | 52 ++ .../Target/AMDGPU/AMDGPUPostLegalizerCombiner.cpp | 46 +- .../Target/AMDGPU/AsmParser/AMDGPUAsmParser.cpp | 43 +- .../llvm/lib/Target/AMDGPU/GCNHazardRecognizer.cpp | 17 +- .../llvm/lib/Target/AMDGPU/GCNSubtarget.h | 2 + .../Target/AMDGPU/MCTargetDesc/AMDGPUMCAsmInfo.cpp | 1 - .../llvm/lib/Target/AMDGPU/SIISelLowering.cpp | 8 +- .../llvm/lib/Target/AMDGPU/SIInsertWaitcnts.cpp | 5 +- .../llvm/lib/Target/AMDGPU/SIInstrInfo.cpp | 33 +- .../llvm/lib/Target/AMDGPU/SIInstrInfo.td | 33 +- .../llvm/lib/Target/AMDGPU/VOP1Instructions.td | 55 ++- .../llvm/lib/Target/AMDGPU/VOP2Instructions.td | 14 +- .../llvm/lib/Target/AMDGPU/VOPInstructions.td | 13 +- .../llvm/lib/Target/ARM/ARMISelLowering.cpp | 9 +- .../llvm/lib/Target/MSP430/MSP430ISelLowering.cpp | 13 +- .../llvm/lib/Target/NVPTX/NVPTXISelLowering.cpp | 6 +- .../llvm/lib/Target/NVPTX/NVPTXInstrInfo.td | 3 + .../llvm/lib/Target/NVPTX/NVPTXIntrinsics.td | 13 + .../llvm/lib/Target/PowerPC/PPCISelLowering.cpp | 2 +- .../llvm/lib/Target/PowerPC/PPCInstrInfo.td | 2 +- .../lib/Target/RISCV/AsmParser/RISCVAsmParser.cpp | 77 ++- .../RISCV/Disassembler/RISCVDisassembler.cpp | 6 +- .../lib/Target/RISCV/GISel/RISCVLegalizerInfo.cpp | 40 ++ .../RISCV/MCTargetDesc/RISCVELFObjectWriter.cpp | 2 + .../Target/RISCV/MCTargetDesc/RISCVELFStreamer.cpp | 7 + .../lib/Target/RISCV/RISCVExpandPseudoInsts.cpp | 12 +- .../llvm/lib/Target/RISCV/RISCVFeatures.td | 1 + .../llvm/lib/Target/RISCV/RISCVISelLowering.cpp | 46 +- .../llvm/lib/Target/RISCV/RISCVISelLowering.h | 6 +- .../llvm/lib/Target/RISCV/RISCVInsertVSETVLI.cpp | 37 +- .../llvm/lib/Target/RISCV/RISCVInstrInfo.cpp | 17 +- .../llvm/lib/Target/RISCV/RISCVInstrInfoA.td | 140 +++--- .../llvm/lib/Target/RISCV/RISCVInstrInfoD.td | 16 +- .../lib/Target/RISCV/RISCVInstrInfoVSDPatterns.td | 33 +- .../lib/Target/RISCV/RISCVInstrInfoVVLPatterns.td | 38 +- .../llvm/lib/Target/RISCV/RISCVInstrInfoZa.td | 98 +++- .../llvm/lib/Target/RISCV/RISCVRegisterInfo.td | 45 +- .../lib/Target/SystemZ/SystemZISelDAGToDAG.cpp | 2 +- .../lib/Target/SystemZ/SystemZISelLowering.cpp | 7 + .../lib/Target/WebAssembly/WebAssemblyFastISel.cpp | 4 +- .../llvm/lib/Target/X86/MCTargetDesc/X86BaseInfo.h | 16 + .../llvm/lib/Target/X86/X86FlagsCopyLowering.cpp | 1 + .../llvm/lib/Target/X86/X86ISelLowering.cpp | 53 ++- .../llvm/lib/Target/X86/X86InstrArithmetic.td | 110 +++-- .../llvm/lib/Target/X86/X86InstrCompiler.td | 380 ++++++++------- .../llvm/lib/Target/X86/X86InstrMisc.td | 12 +- .../llvm/lib/Target/X86/X86PfmCounters.td | 18 + .../lib/TargetParser/ARMTargetParserCommon.cpp | 7 +- .../llvm/lib/TextAPI/InterfaceFile.cpp | 8 + .../IPO/MemProfContextDisambiguation.cpp | 521 ++++++++++++++++++--- .../Transforms/InstCombine/InstCombineAddSub.cpp | 24 + .../Transforms/InstCombine/InstCombineAndOrXor.cpp | 114 +++-- .../Transforms/InstCombine/InstCombineCalls.cpp | 4 + .../Transforms/InstCombine/InstCombineSelect.cpp | 4 +- .../Instrumentation/AddressSanitizer.cpp | 2 +- .../Instrumentation/PGOInstrumentation.cpp | 12 +- .../llvm/lib/Transforms/Scalar/LoopFlatten.cpp | 79 ++-- .../Transforms/Scalar/RewriteStatepointsForGC.cpp | 23 +- .../Scalar/SeparateConstOffsetFromGEP.cpp | 58 +-- .../Scalar/StraightLineStrengthReduce.cpp | 55 +-- .../llvm/lib/Transforms/Utils/Local.cpp | 3 +- .../llvm/lib/Transforms/Utils/SimplifyCFG.cpp | 13 +- .../lib/Transforms/Vectorize/LoopVectorize.cpp | 6 +- .../lib/Transforms/Vectorize/SLPVectorizer.cpp | 69 ++- .../llvm/utils/TableGen/CodeGenDAGPatterns.cpp | 2 +- .../llvm/utils/TableGen/DAGISelMatcherEmitter.cpp | 81 +++- .../llvm/utils/TableGen/ExegesisEmitter.cpp | 52 +- .../utils/TableGen/GlobalISelCombinerEmitter.cpp | 2 +- .../openmp/runtime/src/z_Linux_util.cpp | 2 +- lib/clang/include/VCSVersion.inc | 6 +- lib/clang/include/lld/Common/Version.inc | 2 +- lib/clang/include/llvm/Support/VCSRevision.h | 2 +- lib/clang/libllvm/Makefile | 32 +- lib/libc++/Makefile | 40 +- lib/libc++/module.modulemap | 4 +- 247 files changed, 5252 insertions(+), 2361 deletions(-) diff --cc contrib/llvm-project/clang/include/clang/Format/Format.h index 8604dea689f9,59b645ecab71..59b645ecab71 mode 100755,100644..100755 --- a/contrib/llvm-project/clang/include/clang/Format/Format.h +++ b/contrib/llvm-project/clang/include/clang/Format/Format.h diff --cc lib/clang/include/VCSVersion.inc index 57d5876fcc41,000000000000..10f324e8b9b9 mode 100644,000000..100644 --- a/lib/clang/include/VCSVersion.inc +++ b/lib/clang/include/VCSVersion.inc @@@ -1,8 -1,0 +1,8 @@@ - #define LLVM_REVISION "llvmorg-18-init-16595-g7c00a5be5cde" ++#define LLVM_REVISION "llvmorg-18-init-16864-g3b3ee1f53424" +#define LLVM_REPOSITORY "https://github.com/llvm/llvm-project.git" + - #define CLANG_REVISION "llvmorg-18-init-16595-g7c00a5be5cde" ++#define CLANG_REVISION "llvmorg-18-init-16864-g3b3ee1f53424" +#define CLANG_REPOSITORY "https://github.com/llvm/llvm-project.git" + - #define LLDB_REVISION "llvmorg-18-init-16595-g7c00a5be5cde" ++#define LLDB_REVISION "llvmorg-18-init-16864-g3b3ee1f53424" +#define LLDB_REPOSITORY "https://github.com/llvm/llvm-project.git" diff --cc lib/clang/include/lld/Common/Version.inc index 27669c9a009a,000000000000..91388fc25c4b mode 100644,000000..100644 --- a/lib/clang/include/lld/Common/Version.inc +++ b/lib/clang/include/lld/Common/Version.inc @@@ -1,4 -1,0 +1,4 @@@ +// Local identifier in __FreeBSD_version style +#define LLD_FREEBSD_VERSION 1500000 + - #define LLD_VERSION_STRING "18.0.0 (FreeBSD llvmorg-18-init-16595-g7c00a5be5cde-" __XSTRING(LLD_FREEBSD_VERSION) ")" ++#define LLD_VERSION_STRING "18.0.0 (FreeBSD llvmorg-18-init-16864-g3b3ee1f53424-" __XSTRING(LLD_FREEBSD_VERSION) ")" diff --cc lib/clang/include/llvm/Support/VCSRevision.h index e826e1ffc7ea,000000000000..46ffcc524ca0 mode 100644,000000..100644 --- a/lib/clang/include/llvm/Support/VCSRevision.h +++ b/lib/clang/include/llvm/Support/VCSRevision.h @@@ -1,2 -1,0 +1,2 @@@ - #define LLVM_REVISION "llvmorg-18-init-16595-g7c00a5be5cde" ++#define LLVM_REVISION "llvmorg-18-init-16864-g3b3ee1f53424" +#define LLVM_REPOSITORY "https://github.com/llvm/llvm-project.git" diff --cc lib/clang/libllvm/Makefile index 8446f8fb1f86,000000000000..1f33632e684d mode 100644,000000..100644 --- a/lib/clang/libllvm/Makefile +++ b/lib/clang/libllvm/Makefile @@@ -1,2277 -1,0 +1,2277 @@@ + +.include +.include "../llvm.pre.mk" + +LIB= llvm +INTERNALLIB= + +CFLAGS+= -I${.OBJDIR} +CFLAGS+= -I${SRCTOP}/sys/contrib/zstd/lib + +.if ${MK_LLVM_TARGET_AARCH64} == "no" && ${MK_LLVM_TARGET_ARM} == "no" && \ + ${MK_LLVM_TARGET_BPF} == "no" && ${MK_LLVM_TARGET_MIPS} == "no" && \ + ${MK_LLVM_TARGET_POWERPC} == "no" && ${MK_LLVM_TARGET_RISCV} == "no" && \ + ${MK_LLVM_TARGET_X86} == "no" +.error Please enable at least one of: MK_LLVM_TARGET_AARCH64,\ + MK_LLVM_TARGET_ARM, MK_LLVM_TARGET_BPF, MK_LLVM_TARGET_MIPS, \ + MK_LLVM_TARGET_POWERPC, MK_LLVM_TARGET_RISCV, or MK_LLVM_TARGET_X86 +.endif + +.for arch in AArch64 ARM BPF Mips PowerPC RISCV X86 +. if ${MK_LLVM_TARGET_${arch:tu}} != "no" +CFLAGS+= -I${LLVM_SRCS}/lib/Target/${arch} +. endif +.endfor + +CFLAGS+= -I${LLVM_SRCS}/lib/ObjCopy + +TARGET_ARCH?= ${MACHINE_ARCH} + +.if ${TARGET_ARCH} != "amd64" +CFLAGS+= -DBLAKE3_NO_AVX512 -DBLAKE3_NO_AVX2 -DBLAKE3_NO_SSE41 \ + -DBLAKE3_NO_SSE2 +.endif +.if ${TARGET_ARCH} != "arm64" +CFLAGS+= -DBLAKE3_USE_NEON=0 +.endif + +SRCDIR= llvm/lib + +# Explanation of different SRCS variants below: +# SRCS_MIN: always required, even for bootstrap +# SRCS_MIW: required for world stage (after cross-tools) +# SRCS_EXT: required for MK_CLANG_EXTRAS +# SRCS_EXL: required for MK_CLANG_EXTRAS and MK_LLD +# SRCS_FUL: required for MK_CLANG_FULL +# SRCS_LLD: required for MK_LLD +# SRCS_XDB: required for MK_CLANG_EXTRAS and MK_LLDB +# SRCS_XDL: required for MK_CLANG_EXTRAS, MK_LLD and MK_LLDB +# SRCS_XDW: required for MK_CLANG_EXTRAS and MK_LLDB in world stage +# SRCS_COV: required for MK_LLVM_COV + +SRCS_MIN+= Analysis/AliasAnalysis.cpp +SRCS_MIN+= Analysis/AliasAnalysisEvaluator.cpp +SRCS_MIN+= Analysis/AliasSetTracker.cpp +SRCS_EXT+= Analysis/Analysis.cpp +SRCS_MIN+= Analysis/AssumeBundleQueries.cpp +SRCS_MIN+= Analysis/AssumptionCache.cpp +SRCS_MIN+= Analysis/BasicAliasAnalysis.cpp +SRCS_MIN+= Analysis/BlockFrequencyInfo.cpp +SRCS_MIN+= Analysis/BlockFrequencyInfoImpl.cpp +SRCS_MIN+= Analysis/BranchProbabilityInfo.cpp +SRCS_MIN+= Analysis/CFG.cpp +SRCS_MIN+= Analysis/CFGPrinter.cpp +SRCS_MIN+= Analysis/CFGSCCPrinter.cpp +SRCS_MIN+= Analysis/CGSCCPassManager.cpp +SRCS_MIN+= Analysis/CallGraph.cpp +SRCS_MIN+= Analysis/CallGraphSCCPass.cpp +SRCS_MIN+= Analysis/CallPrinter.cpp +SRCS_MIN+= Analysis/CaptureTracking.cpp +SRCS_MIN+= Analysis/CmpInstAnalysis.cpp +SRCS_MIN+= Analysis/CodeMetrics.cpp +SRCS_MIN+= Analysis/ConstantFolding.cpp +SRCS_MIN+= Analysis/ConstraintSystem.cpp +SRCS_MIN+= Analysis/CostModel.cpp +SRCS_MIN+= Analysis/CycleAnalysis.cpp +SRCS_MIN+= Analysis/DDG.cpp +SRCS_MIN+= Analysis/DDGPrinter.cpp +SRCS_MIN+= Analysis/Delinearization.cpp +SRCS_MIN+= Analysis/DemandedBits.cpp +SRCS_MIN+= Analysis/DependenceAnalysis.cpp +SRCS_MIN+= Analysis/DependenceGraphBuilder.cpp +SRCS_MIN+= Analysis/DomConditionCache.cpp +SRCS_MIN+= Analysis/DomPrinter.cpp +SRCS_MIN+= Analysis/DomTreeUpdater.cpp +SRCS_MIN+= Analysis/DominanceFrontier.cpp +SRCS_MIN+= Analysis/FunctionPropertiesAnalysis.cpp +SRCS_MIN+= Analysis/GlobalsModRef.cpp +SRCS_MIN+= Analysis/GuardUtils.cpp +SRCS_MIN+= Analysis/HeatUtils.cpp +SRCS_MIN+= Analysis/IRSimilarityIdentifier.cpp +SRCS_MIN+= Analysis/IVDescriptors.cpp +SRCS_MIN+= Analysis/IVUsers.cpp +SRCS_MIN+= Analysis/ImportedFunctionsInliningStatistics.cpp +SRCS_MIN+= Analysis/IndirectCallPromotionAnalysis.cpp +SRCS_MIN+= Analysis/InlineAdvisor.cpp +SRCS_MIN+= Analysis/InlineCost.cpp +SRCS_MIN+= Analysis/InlineOrder.cpp +SRCS_MIN+= Analysis/InlineSizeEstimatorAnalysis.cpp +SRCS_MIN+= Analysis/InstCount.cpp +SRCS_MIN+= Analysis/InstructionPrecedenceTracking.cpp +SRCS_MIN+= Analysis/InstructionSimplify.cpp +SRCS_MIN+= Analysis/InteractiveModelRunner.cpp +SRCS_MIN+= Analysis/Interval.cpp +SRCS_MIN+= Analysis/IntervalPartition.cpp +SRCS_MIN+= Analysis/LazyBlockFrequencyInfo.cpp +SRCS_MIN+= Analysis/LazyBranchProbabilityInfo.cpp +SRCS_MIN+= Analysis/LazyCallGraph.cpp +SRCS_MIN+= Analysis/LazyValueInfo.cpp +SRCS_MIN+= Analysis/Lint.cpp +SRCS_MIN+= Analysis/Loads.cpp +SRCS_MIN+= Analysis/Local.cpp +SRCS_MIN+= Analysis/LoopAccessAnalysis.cpp +SRCS_MIN+= Analysis/LoopAnalysisManager.cpp +SRCS_MIN+= Analysis/LoopCacheAnalysis.cpp +SRCS_MIN+= Analysis/LoopInfo.cpp +SRCS_MIN+= Analysis/LoopNestAnalysis.cpp +SRCS_MIN+= Analysis/LoopPass.cpp +SRCS_MIN+= Analysis/LoopUnrollAnalyzer.cpp +SRCS_MIN+= Analysis/MLInlineAdvisor.cpp +SRCS_MIN+= Analysis/MemDerefPrinter.cpp +SRCS_MIN+= Analysis/MemoryBuiltins.cpp +SRCS_MIN+= Analysis/MemoryDependenceAnalysis.cpp +SRCS_MIN+= Analysis/MemoryLocation.cpp +SRCS_MIN+= Analysis/MemoryProfileInfo.cpp +SRCS_MIN+= Analysis/MemorySSA.cpp +SRCS_MIN+= Analysis/MemorySSAUpdater.cpp +SRCS_MIN+= Analysis/ModuleDebugInfoPrinter.cpp +SRCS_MIN+= Analysis/ModuleSummaryAnalysis.cpp +SRCS_MIN+= Analysis/MustExecute.cpp +SRCS_MIN+= Analysis/ObjCARCAliasAnalysis.cpp +SRCS_MIN+= Analysis/ObjCARCAnalysisUtils.cpp +SRCS_MIN+= Analysis/ObjCARCInstKind.cpp +SRCS_MIN+= Analysis/OptimizationRemarkEmitter.cpp +SRCS_MIN+= Analysis/OverflowInstAnalysis.cpp +SRCS_MIN+= Analysis/PHITransAddr.cpp +SRCS_MIN+= Analysis/PhiValues.cpp +SRCS_MIN+= Analysis/PostDominators.cpp +SRCS_MIN+= Analysis/ProfileSummaryInfo.cpp +SRCS_MIN+= Analysis/PtrUseVisitor.cpp +SRCS_MIN+= Analysis/RegionInfo.cpp +SRCS_MIN+= Analysis/RegionPass.cpp +SRCS_MIN+= Analysis/RegionPrinter.cpp +SRCS_MIN+= Analysis/ReplayInlineAdvisor.cpp +SRCS_MIN+= Analysis/ScalarEvolution.cpp +SRCS_MIN+= Analysis/ScalarEvolution.cpp +SRCS_MIN+= Analysis/ScalarEvolutionAliasAnalysis.cpp +SRCS_MIN+= Analysis/ScalarEvolutionDivision.cpp +SRCS_MIN+= Analysis/ScalarEvolutionNormalization.cpp +SRCS_MIN+= Analysis/ScopedNoAliasAA.cpp +SRCS_MIN+= Analysis/StackLifetime.cpp +SRCS_MIN+= Analysis/StackSafetyAnalysis.cpp +SRCS_MIN+= Analysis/StructuralHash.cpp +SRCS_MIN+= Analysis/SyntheticCountsUtils.cpp +SRCS_MIN+= Analysis/TargetLibraryInfo.cpp +SRCS_MIN+= Analysis/TargetTransformInfo.cpp +SRCS_MIN+= Analysis/TensorSpec.cpp +SRCS_MIN+= Analysis/TrainingLogger.cpp +SRCS_MIN+= Analysis/TypeBasedAliasAnalysis.cpp +SRCS_MIN+= Analysis/TypeMetadataUtils.cpp +SRCS_MIN+= Analysis/UniformityAnalysis.cpp +SRCS_MIN+= Analysis/VFABIDemangling.cpp +SRCS_MIN+= Analysis/ValueLattice.cpp +SRCS_MIN+= Analysis/ValueLatticeUtils.cpp +SRCS_MIN+= Analysis/ValueTracking.cpp +SRCS_MIN+= Analysis/VectorUtils.cpp +SRCS_MIN+= AsmParser/LLLexer.cpp +SRCS_MIN+= AsmParser/LLParser.cpp +SRCS_MIN+= AsmParser/Parser.cpp +SRCS_MIN+= BinaryFormat/AMDGPUMetadataVerifier.cpp +SRCS_MIN+= BinaryFormat/COFF.cpp +SRCS_MIN+= BinaryFormat/Dwarf.cpp +SRCS_XDB+= BinaryFormat/ELF.cpp +SRCS_MIN+= BinaryFormat/MachO.cpp +SRCS_MIN+= BinaryFormat/Magic.cpp +SRCS_MIN+= BinaryFormat/MsgPackDocument.cpp +SRCS_MIN+= BinaryFormat/MsgPackDocumentYAML.cpp +SRCS_MIN+= BinaryFormat/MsgPackReader.cpp +SRCS_MIN+= BinaryFormat/MsgPackWriter.cpp +SRCS_MIN+= BinaryFormat/Wasm.cpp +SRCS_MIN+= BinaryFormat/XCOFF.cpp +SRCS_MIN+= Bitcode/Reader/BitReader.cpp +SRCS_EXT+= Bitcode/Reader/BitcodeAnalyzer.cpp +SRCS_MIN+= Bitcode/Reader/BitcodeReader.cpp +SRCS_MIN+= Bitcode/Reader/MetadataLoader.cpp +SRCS_MIN+= Bitcode/Reader/ValueList.cpp +SRCS_MIN+= Bitcode/Writer/BitcodeWriter.cpp +SRCS_MIN+= Bitcode/Writer/BitcodeWriterPass.cpp +SRCS_MIN+= Bitcode/Writer/ValueEnumerator.cpp +SRCS_MIN+= Bitstream/Reader/BitstreamReader.cpp +SRCS_MIN+= CodeGen/AggressiveAntiDepBreaker.cpp +SRCS_MIN+= CodeGen/AllocationOrder.cpp +SRCS_MIN+= CodeGen/Analysis.cpp +SRCS_MIN+= CodeGen/AsmPrinter/AIXException.cpp +SRCS_MIN+= CodeGen/AsmPrinter/ARMException.cpp +SRCS_MIN+= CodeGen/AsmPrinter/AccelTable.cpp +SRCS_MIN+= CodeGen/AsmPrinter/AddressPool.cpp +SRCS_MIN+= CodeGen/AsmPrinter/AsmPrinter.cpp +SRCS_MIN+= CodeGen/AsmPrinter/AsmPrinterDwarf.cpp +SRCS_MIN+= CodeGen/AsmPrinter/AsmPrinterInlineAsm.cpp +SRCS_MIN+= CodeGen/AsmPrinter/CodeViewDebug.cpp +SRCS_MIN+= CodeGen/AsmPrinter/DIE.cpp +SRCS_MIN+= CodeGen/AsmPrinter/DIEHash.cpp +SRCS_MIN+= CodeGen/AsmPrinter/DbgEntityHistoryCalculator.cpp +SRCS_MIN+= CodeGen/AsmPrinter/DebugHandlerBase.cpp +SRCS_MIN+= CodeGen/AsmPrinter/DebugLocStream.cpp +SRCS_MIN+= CodeGen/AsmPrinter/DwarfCFIException.cpp +SRCS_MIN+= CodeGen/AsmPrinter/DwarfCompileUnit.cpp +SRCS_MIN+= CodeGen/AsmPrinter/DwarfDebug.cpp +SRCS_MIN+= CodeGen/AsmPrinter/DwarfExpression.cpp +SRCS_MIN+= CodeGen/AsmPrinter/DwarfFile.cpp +SRCS_MIN+= CodeGen/AsmPrinter/DwarfStringPool.cpp +SRCS_MIN+= CodeGen/AsmPrinter/DwarfUnit.cpp +SRCS_MIN+= CodeGen/AsmPrinter/EHStreamer.cpp +SRCS_EXT+= CodeGen/AsmPrinter/ErlangGCPrinter.cpp +SRCS_MIN+= CodeGen/AsmPrinter/OcamlGCPrinter.cpp +SRCS_MIN+= CodeGen/AsmPrinter/PseudoProbePrinter.cpp +SRCS_MIN+= CodeGen/AsmPrinter/WasmException.cpp +SRCS_MIN+= CodeGen/AsmPrinter/WinCFGuard.cpp +SRCS_MIN+= CodeGen/AsmPrinter/WinException.cpp +SRCS_MIN+= CodeGen/AssignmentTrackingAnalysis.cpp +SRCS_MIN+= CodeGen/AtomicExpandPass.cpp +SRCS_MIN+= CodeGen/BasicBlockPathCloning.cpp +SRCS_MIN+= CodeGen/BasicBlockSections.cpp +SRCS_MIN+= CodeGen/BasicBlockSectionsProfileReader.cpp +SRCS_MIN+= CodeGen/BasicTargetTransformInfo.cpp +SRCS_MIN+= CodeGen/BranchFolding.cpp +SRCS_MIN+= CodeGen/BranchRelaxation.cpp +SRCS_MIN+= CodeGen/BreakFalseDeps.cpp +SRCS_MIN+= CodeGen/CFGuardLongjmp.cpp +SRCS_MIN+= CodeGen/CFIFixup.cpp +SRCS_MIN+= CodeGen/CFIInstrInserter.cpp +SRCS_MIN+= CodeGen/CalcSpillWeights.cpp +SRCS_MIN+= CodeGen/CallBrPrepare.cpp +SRCS_MIN+= CodeGen/CallingConvLower.cpp +SRCS_MIN+= CodeGen/CodeGen.cpp +SRCS_MIN+= CodeGen/CodeGenCommonISel.cpp +SRCS_MIN+= CodeGen/CodeGenPrepare.cpp +SRCS_EXL+= CodeGen/CommandFlags.cpp +SRCS_MIN+= CodeGen/ComplexDeinterleavingPass.cpp +SRCS_MIN+= CodeGen/CriticalAntiDepBreaker.cpp +SRCS_MIN+= CodeGen/DFAPacketizer.cpp +SRCS_MIN+= CodeGen/DeadMachineInstructionElim.cpp +SRCS_MIN+= CodeGen/DetectDeadLanes.cpp +SRCS_MIN+= CodeGen/DwarfEHPrepare.cpp +SRCS_MIN+= CodeGen/EHContGuardCatchret.cpp +SRCS_MIN+= CodeGen/EarlyIfConversion.cpp +SRCS_MIN+= CodeGen/EdgeBundles.cpp +SRCS_MIN+= CodeGen/ExecutionDomainFix.cpp +SRCS_MIN+= CodeGen/ExpandLargeDivRem.cpp +SRCS_MIN+= CodeGen/ExpandLargeFpConvert.cpp +SRCS_MIN+= CodeGen/ExpandMemCmp.cpp +SRCS_MIN+= CodeGen/ExpandPostRAPseudos.cpp +SRCS_MIN+= CodeGen/ExpandReductions.cpp +SRCS_MIN+= CodeGen/ExpandVectorPredication.cpp +SRCS_MIN+= CodeGen/FEntryInserter.cpp +SRCS_MIN+= CodeGen/FaultMaps.cpp +SRCS_MIN+= CodeGen/FinalizeISel.cpp +SRCS_MIN+= CodeGen/FixupStatepointCallerSaved.cpp +SRCS_MIN+= CodeGen/FuncletLayout.cpp +SRCS_MIN+= CodeGen/GCEmptyBasicBlocks.cpp +SRCS_MIN+= CodeGen/GCMetadata.cpp +SRCS_MIN+= CodeGen/GCMetadataPrinter.cpp +SRCS_MIN+= CodeGen/GCRootLowering.cpp +SRCS_MIN+= CodeGen/GlobalISel/CSEInfo.cpp +SRCS_MIN+= CodeGen/GlobalISel/CSEMIRBuilder.cpp +SRCS_MIN+= CodeGen/GlobalISel/CallLowering.cpp +SRCS_MIN+= CodeGen/GlobalISel/Combiner.cpp +SRCS_MIN+= CodeGen/GlobalISel/CombinerHelper.cpp +SRCS_MIN+= CodeGen/GlobalISel/GIMatchTableExecutor.cpp +SRCS_MIN+= CodeGen/GlobalISel/GISelChangeObserver.cpp +SRCS_MIN+= CodeGen/GlobalISel/GISelKnownBits.cpp +SRCS_MIN+= CodeGen/GlobalISel/GlobalISel.cpp +SRCS_MIN+= CodeGen/GlobalISel/IRTranslator.cpp +SRCS_MIN+= CodeGen/GlobalISel/InlineAsmLowering.cpp +SRCS_MIN+= CodeGen/GlobalISel/InstructionSelect.cpp +SRCS_MIN+= CodeGen/GlobalISel/InstructionSelector.cpp +SRCS_MIN+= CodeGen/GlobalISel/LegacyLegalizerInfo.cpp +SRCS_MIN+= CodeGen/GlobalISel/LegalityPredicates.cpp +SRCS_MIN+= CodeGen/GlobalISel/LegalizeMutations.cpp +SRCS_MIN+= CodeGen/GlobalISel/Legalizer.cpp +SRCS_MIN+= CodeGen/GlobalISel/LegalizerHelper.cpp +SRCS_MIN+= CodeGen/GlobalISel/LegalizerInfo.cpp +SRCS_MIN+= CodeGen/GlobalISel/LoadStoreOpt.cpp +SRCS_MIN+= CodeGen/GlobalISel/Localizer.cpp +SRCS_MIN+= CodeGen/GlobalISel/LostDebugLocObserver.cpp +SRCS_MIN+= CodeGen/GlobalISel/MachineIRBuilder.cpp +SRCS_MIN+= CodeGen/GlobalISel/RegBankSelect.cpp +SRCS_MIN+= CodeGen/GlobalISel/Utils.cpp +SRCS_MIN+= CodeGen/GlobalMerge.cpp +SRCS_MIN+= CodeGen/HardwareLoops.cpp +SRCS_MIN+= CodeGen/IfConversion.cpp +SRCS_MIN+= CodeGen/ImplicitNullChecks.cpp +SRCS_MIN+= CodeGen/IndirectBrExpandPass.cpp +SRCS_MIN+= CodeGen/InlineSpiller.cpp +SRCS_MIN+= CodeGen/InterferenceCache.cpp +SRCS_MIN+= CodeGen/InterleavedAccessPass.cpp +SRCS_MIN+= CodeGen/InterleavedLoadCombinePass.cpp +SRCS_MIN+= CodeGen/IntrinsicLowering.cpp +SRCS_MIN+= CodeGen/JMCInstrumenter.cpp +SRCS_MIN+= CodeGen/KCFI.cpp +SRCS_MIN+= CodeGen/LLVMTargetMachine.cpp +SRCS_MIN+= CodeGen/LatencyPriorityQueue.cpp +SRCS_MIN+= CodeGen/LazyMachineBlockFrequencyInfo.cpp +SRCS_MIN+= CodeGen/LexicalScopes.cpp +SRCS_MIN+= CodeGen/LiveDebugValues/InstrRefBasedImpl.cpp +SRCS_MIN+= CodeGen/LiveDebugValues/LiveDebugValues.cpp +SRCS_MIN+= CodeGen/LiveDebugValues/VarLocBasedImpl.cpp +SRCS_MIN+= CodeGen/LiveDebugVariables.cpp +SRCS_MIN+= CodeGen/LiveInterval.cpp +SRCS_MIN+= CodeGen/LiveIntervalCalc.cpp +SRCS_MIN+= CodeGen/LiveIntervalUnion.cpp +SRCS_MIN+= CodeGen/LiveIntervals.cpp +SRCS_MIN+= CodeGen/LivePhysRegs.cpp +SRCS_MIN+= CodeGen/LiveRangeCalc.cpp +SRCS_MIN+= CodeGen/LiveRangeEdit.cpp +SRCS_MIN+= CodeGen/LiveRangeShrink.cpp +SRCS_MIN+= CodeGen/LiveRegMatrix.cpp +SRCS_MIN+= CodeGen/LiveRegUnits.cpp +SRCS_MIN+= CodeGen/LiveStacks.cpp +SRCS_MIN+= CodeGen/LiveVariables.cpp +SRCS_MIN+= CodeGen/LocalStackSlotAllocation.cpp +SRCS_MIN+= CodeGen/LoopTraversal.cpp +SRCS_MIN+= CodeGen/LowLevelType.cpp +SRCS_MIN+= CodeGen/LowLevelTypeUtils.cpp +SRCS_MIN+= CodeGen/LowerEmuTLS.cpp +SRCS_MIN+= CodeGen/MBFIWrapper.cpp +SRCS_MIN+= CodeGen/MIRCanonicalizerPass.cpp +SRCS_MIN+= CodeGen/MIRFSDiscriminator.cpp +SRCS_MIN+= CodeGen/MIRNamerPass.cpp +SRCS_EXT+= CodeGen/MIRParser/MILexer.cpp +SRCS_EXT+= CodeGen/MIRParser/MIParser.cpp +SRCS_EXT+= CodeGen/MIRParser/MIRParser.cpp +SRCS_MIN+= CodeGen/MIRPrinter.cpp +SRCS_MIN+= CodeGen/MIRPrintingPass.cpp +SRCS_MIN+= CodeGen/MIRSampleProfile.cpp +SRCS_MIN+= CodeGen/MIRVRegNamerUtils.cpp +SRCS_MIN+= CodeGen/MLRegAllocEvictAdvisor.cpp +SRCS_MIN+= CodeGen/MLRegAllocPriorityAdvisor.cpp +SRCS_MIN+= CodeGen/MachineBasicBlock.cpp +SRCS_MIN+= CodeGen/MachineBlockFrequencyInfo.cpp +SRCS_MIN+= CodeGen/MachineBlockPlacement.cpp +SRCS_MIN+= CodeGen/MachineBranchProbabilityInfo.cpp +SRCS_MIN+= CodeGen/MachineCFGPrinter.cpp +SRCS_MIN+= CodeGen/MachineCSE.cpp +SRCS_MIN+= CodeGen/MachineCheckDebugify.cpp +SRCS_MIN+= CodeGen/MachineCombiner.cpp +SRCS_MIN+= CodeGen/MachineCopyPropagation.cpp +SRCS_MIN+= CodeGen/MachineCycleAnalysis.cpp +SRCS_MIN+= CodeGen/MachineDebugify.cpp +SRCS_MIN+= CodeGen/MachineDominanceFrontier.cpp +SRCS_MIN+= CodeGen/MachineDominators.cpp +SRCS_MIN+= CodeGen/MachineFrameInfo.cpp +SRCS_MIN+= CodeGen/MachineFunction.cpp +SRCS_MIN+= CodeGen/MachineFunctionPass.cpp +SRCS_MIN+= CodeGen/MachineFunctionPrinterPass.cpp +SRCS_MIN+= CodeGen/MachineFunctionSplitter.cpp +SRCS_MIN+= CodeGen/MachineInstr.cpp +SRCS_MIN+= CodeGen/MachineInstrBundle.cpp +SRCS_MIN+= CodeGen/MachineLICM.cpp +SRCS_MIN+= CodeGen/MachineLateInstrsCleanup.cpp +SRCS_MIN+= CodeGen/MachineLoopInfo.cpp +SRCS_MIN+= CodeGen/MachineLoopUtils.cpp +SRCS_MIN+= CodeGen/MachineModuleInfo.cpp +SRCS_MIN+= CodeGen/MachineModuleInfoImpls.cpp +SRCS_MIN+= CodeGen/MachineModuleSlotTracker.cpp +SRCS_MIN+= CodeGen/MachineOperand.cpp +SRCS_MIN+= CodeGen/MachineOptimizationRemarkEmitter.cpp +SRCS_MIN+= CodeGen/MachineOutliner.cpp +SRCS_MIN+= CodeGen/MachinePipeliner.cpp +SRCS_MIN+= CodeGen/MachinePostDominators.cpp +SRCS_MIN+= CodeGen/MachineRegionInfo.cpp +SRCS_MIN+= CodeGen/MachineRegisterInfo.cpp +SRCS_MIN+= CodeGen/MachineSSAContext.cpp +SRCS_MIN+= CodeGen/MachineSSAUpdater.cpp +SRCS_MIN+= CodeGen/MachineScheduler.cpp +SRCS_MIN+= CodeGen/MachineSink.cpp +SRCS_MIN+= CodeGen/MachineSizeOpts.cpp +SRCS_MIN+= CodeGen/MachineStableHash.cpp +SRCS_MIN+= CodeGen/MachineStripDebug.cpp +SRCS_MIN+= CodeGen/MachineTraceMetrics.cpp +SRCS_MIN+= CodeGen/MachineUniformityAnalysis.cpp +SRCS_MIN+= CodeGen/MachineVerifier.cpp +SRCS_MIN+= CodeGen/MacroFusion.cpp +SRCS_MIN+= CodeGen/ModuloSchedule.cpp +SRCS_MIN+= CodeGen/MultiHazardRecognizer.cpp +SRCS_EXT+= CodeGen/NonRelocatableStringpool.cpp +SRCS_MIN+= CodeGen/OptimizePHIs.cpp +SRCS_MIN+= CodeGen/PHIElimination.cpp +SRCS_MIN+= CodeGen/PHIEliminationUtils.cpp +SRCS_MIN+= CodeGen/ParallelCG.cpp +SRCS_MIN+= CodeGen/PatchableFunction.cpp +SRCS_MIN+= CodeGen/PeepholeOptimizer.cpp +SRCS_MIN+= CodeGen/PostRAHazardRecognizer.cpp +SRCS_MIN+= CodeGen/PostRASchedulerList.cpp +SRCS_MIN+= CodeGen/PreISelIntrinsicLowering.cpp +SRCS_MIN+= CodeGen/ProcessImplicitDefs.cpp +SRCS_MIN+= CodeGen/PrologEpilogInserter.cpp +SRCS_MIN+= CodeGen/PseudoProbeInserter.cpp +SRCS_MIN+= CodeGen/PseudoSourceValue.cpp +SRCS_MIN+= CodeGen/RDFGraph.cpp +SRCS_MIN+= CodeGen/RDFLiveness.cpp +SRCS_MIN+= CodeGen/RDFRegisters.cpp +SRCS_MIN+= CodeGen/ReachingDefAnalysis.cpp +SRCS_MIN+= CodeGen/RegAllocBase.cpp +SRCS_MIN+= CodeGen/RegAllocBasic.cpp +SRCS_MIN+= CodeGen/RegAllocEvictionAdvisor.cpp +SRCS_MIN+= CodeGen/RegAllocFast.cpp +SRCS_MIN+= CodeGen/RegAllocGreedy.cpp +SRCS_MIN+= CodeGen/RegAllocPBQP.cpp +SRCS_MIN+= CodeGen/RegAllocPriorityAdvisor.cpp +SRCS_MIN+= CodeGen/RegUsageInfoCollector.cpp +SRCS_MIN+= CodeGen/RegUsageInfoPropagate.cpp +SRCS_MIN+= CodeGen/RegisterBank.cpp +SRCS_MIN+= CodeGen/RegisterBankInfo.cpp +SRCS_MIN+= CodeGen/RegisterClassInfo.cpp +SRCS_MIN+= CodeGen/RegisterCoalescer.cpp +SRCS_MIN+= CodeGen/RegisterPressure.cpp +SRCS_MIN+= CodeGen/RegisterScavenging.cpp +SRCS_MIN+= CodeGen/RegisterUsageInfo.cpp +SRCS_MIN+= CodeGen/RemoveRedundantDebugValues.cpp +SRCS_MIN+= CodeGen/RenameIndependentSubregs.cpp +SRCS_MIN+= CodeGen/ReplaceWithVeclib.cpp +SRCS_MIN+= CodeGen/ResetMachineFunctionPass.cpp +SRCS_MIN+= CodeGen/SafeStack.cpp +SRCS_MIN+= CodeGen/SafeStackLayout.cpp +SRCS_MIN+= CodeGen/SanitizerBinaryMetadata.cpp +SRCS_MIN+= CodeGen/ScheduleDAG.cpp +SRCS_MIN+= CodeGen/ScheduleDAGInstrs.cpp +SRCS_MIN+= CodeGen/ScheduleDAGPrinter.cpp +SRCS_MIN+= CodeGen/ScoreboardHazardRecognizer.cpp +SRCS_MIN+= CodeGen/SelectOptimize.cpp +SRCS_MIN+= CodeGen/SelectionDAG/DAGCombiner.cpp +SRCS_MIN+= CodeGen/SelectionDAG/FastISel.cpp +SRCS_MIN+= CodeGen/SelectionDAG/FunctionLoweringInfo.cpp +SRCS_MIN+= CodeGen/SelectionDAG/InstrEmitter.cpp +SRCS_MIN+= CodeGen/SelectionDAG/LegalizeDAG.cpp +SRCS_MIN+= CodeGen/SelectionDAG/LegalizeFloatTypes.cpp +SRCS_MIN+= CodeGen/SelectionDAG/LegalizeIntegerTypes.cpp +SRCS_MIN+= CodeGen/SelectionDAG/LegalizeTypes.cpp +SRCS_MIN+= CodeGen/SelectionDAG/LegalizeTypesGeneric.cpp +SRCS_MIN+= CodeGen/SelectionDAG/LegalizeVectorOps.cpp +SRCS_MIN+= CodeGen/SelectionDAG/LegalizeVectorTypes.cpp +SRCS_MIN+= CodeGen/SelectionDAG/ResourcePriorityQueue.cpp +SRCS_MIN+= CodeGen/SelectionDAG/ScheduleDAGFast.cpp +SRCS_MIN+= CodeGen/SelectionDAG/ScheduleDAGRRList.cpp +SRCS_MIN+= CodeGen/SelectionDAG/ScheduleDAGSDNodes.cpp +SRCS_MIN+= CodeGen/SelectionDAG/ScheduleDAGVLIW.cpp +SRCS_MIN+= CodeGen/SelectionDAG/SelectionDAG.cpp +SRCS_MIN+= CodeGen/SelectionDAG/SelectionDAGAddressAnalysis.cpp +SRCS_MIN+= CodeGen/SelectionDAG/SelectionDAGBuilder.cpp +SRCS_MIN+= CodeGen/SelectionDAG/SelectionDAGDumper.cpp +SRCS_MIN+= CodeGen/SelectionDAG/SelectionDAGISel.cpp +SRCS_MIN+= CodeGen/SelectionDAG/SelectionDAGPrinter.cpp +SRCS_MIN+= CodeGen/SelectionDAG/SelectionDAGTargetInfo.cpp +SRCS_MIN+= CodeGen/SelectionDAG/StatepointLowering.cpp +SRCS_MIN+= CodeGen/SelectionDAG/TargetLowering.cpp +SRCS_MIN+= CodeGen/ShadowStackGCLowering.cpp +SRCS_MIN+= CodeGen/ShrinkWrap.cpp +SRCS_MIN+= CodeGen/SjLjEHPrepare.cpp +SRCS_MIN+= CodeGen/SlotIndexes.cpp +SRCS_MIN+= CodeGen/SpillPlacement.cpp +SRCS_MIN+= CodeGen/SplitKit.cpp +SRCS_MIN+= CodeGen/StackColoring.cpp +SRCS_MIN+= CodeGen/StackFrameLayoutAnalysisPass.cpp +SRCS_MIN+= CodeGen/StackMapLivenessAnalysis.cpp +SRCS_MIN+= CodeGen/StackMaps.cpp +SRCS_MIN+= CodeGen/StackProtector.cpp +SRCS_MIN+= CodeGen/StackSlotColoring.cpp +SRCS_MIN+= CodeGen/SwiftErrorValueTracking.cpp +SRCS_MIN+= CodeGen/SwitchLoweringUtils.cpp +SRCS_MIN+= CodeGen/TailDuplication.cpp +SRCS_MIN+= CodeGen/TailDuplicator.cpp +SRCS_MIN+= CodeGen/TargetFrameLoweringImpl.cpp +SRCS_MIN+= CodeGen/TargetInstrInfo.cpp +SRCS_MIN+= CodeGen/TargetLoweringBase.cpp +SRCS_MIN+= CodeGen/TargetLoweringObjectFileImpl.cpp +SRCS_MIN+= CodeGen/TargetOptionsImpl.cpp +SRCS_MIN+= CodeGen/TargetPassConfig.cpp +SRCS_MIN+= CodeGen/TargetRegisterInfo.cpp +SRCS_MIN+= CodeGen/TargetSchedule.cpp +SRCS_MIN+= CodeGen/TargetSubtargetInfo.cpp +SRCS_MIN+= CodeGen/TwoAddressInstructionPass.cpp +SRCS_MIN+= CodeGen/TypePromotion.cpp +SRCS_MIN+= CodeGen/UnreachableBlockElim.cpp +SRCS_MIN+= CodeGen/ValueTypes.cpp +SRCS_MIN+= CodeGen/VirtRegMap.cpp +SRCS_MIN+= CodeGen/WasmEHPrepare.cpp +SRCS_MIN+= CodeGen/WinEHPrepare.cpp +SRCS_MIN+= CodeGen/XRayInstrumentation.cpp - SRCS_EXT+= DWARFLinker/DWARFLinker.cpp - SRCS_EXT+= DWARFLinker/DWARFLinkerCompileUnit.cpp - SRCS_EXT+= DWARFLinker/DWARFLinkerDeclContext.cpp - SRCS_EXT+= DWARFLinker/DWARFStreamer.cpp - SRCS_EXT+= DWARFLinkerParallel/AcceleratorRecordsSaver.cpp - SRCS_EXT+= DWARFLinkerParallel/DIEAttributeCloner.cpp - SRCS_EXT+= DWARFLinkerParallel/DWARFEmitterImpl.cpp - SRCS_EXT+= DWARFLinkerParallel/DWARFFile.cpp - SRCS_EXT+= DWARFLinkerParallel/DWARFLinker.cpp - SRCS_EXT+= DWARFLinkerParallel/DWARFLinkerCompileUnit.cpp - SRCS_EXT+= DWARFLinkerParallel/DWARFLinkerImpl.cpp - SRCS_EXT+= DWARFLinkerParallel/DWARFLinkerTypeUnit.cpp - SRCS_EXT+= DWARFLinkerParallel/DWARFLinkerUnit.cpp - SRCS_EXT+= DWARFLinkerParallel/DependencyTracker.cpp - SRCS_EXT+= DWARFLinkerParallel/OutputSections.cpp - SRCS_EXT+= DWARFLinkerParallel/SyntheticTypeNameBuilder.cpp ++SRCS_EXT+= DWARFLinker/Classic/DWARFLinker.cpp ++SRCS_EXT+= DWARFLinker/Classic/DWARFLinkerCompileUnit.cpp ++SRCS_EXT+= DWARFLinker/Classic/DWARFLinkerDeclContext.cpp ++SRCS_EXT+= DWARFLinker/Classic/DWARFStreamer.cpp ++SRCS_EXT+= DWARFLinker/Parallel/AcceleratorRecordsSaver.cpp ++SRCS_EXT+= DWARFLinker/Parallel/DIEAttributeCloner.cpp ++SRCS_EXT+= DWARFLinker/Parallel/DWARFEmitterImpl.cpp ++SRCS_EXT+= DWARFLinker/Parallel/DWARFLinker.cpp ++SRCS_EXT+= DWARFLinker/Parallel/DWARFLinkerCompileUnit.cpp ++SRCS_EXT+= DWARFLinker/Parallel/DWARFLinkerImpl.cpp ++SRCS_EXT+= DWARFLinker/Parallel/DWARFLinkerTypeUnit.cpp ++SRCS_EXT+= DWARFLinker/Parallel/DWARFLinkerUnit.cpp ++SRCS_EXT+= DWARFLinker/Parallel/DependencyTracker.cpp ++SRCS_EXT+= DWARFLinker/Parallel/OutputSections.cpp ++SRCS_EXT+= DWARFLinker/Parallel/SyntheticTypeNameBuilder.cpp ++SRCS_EXT+= DWARFLinker/Utils.cpp +SRCS_EXT+= DWP/DWP.cpp +SRCS_EXT+= DWP/DWPError.cpp +SRCS_MIW+= DebugInfo/BTF/BTFContext.cpp +SRCS_MIW+= DebugInfo/BTF/BTFParser.cpp +SRCS_EXT+= DebugInfo/CodeView/AppendingTypeTableBuilder.cpp +SRCS_MIN+= DebugInfo/CodeView/CVSymbolVisitor.cpp +SRCS_MIN+= DebugInfo/CodeView/CVTypeVisitor.cpp +SRCS_MIN+= DebugInfo/CodeView/CodeViewError.cpp +SRCS_MIN+= DebugInfo/CodeView/CodeViewRecordIO.cpp +SRCS_MIN+= DebugInfo/CodeView/ContinuationRecordBuilder.cpp +SRCS_MIN+= DebugInfo/CodeView/DebugChecksumsSubsection.cpp +SRCS_EXT+= DebugInfo/CodeView/DebugCrossExSubsection.cpp +SRCS_EXT+= DebugInfo/CodeView/DebugCrossImpSubsection.cpp +SRCS_MIN+= DebugInfo/CodeView/DebugFrameDataSubsection.cpp +SRCS_MIN+= DebugInfo/CodeView/DebugInlineeLinesSubsection.cpp +SRCS_MIN+= DebugInfo/CodeView/DebugLinesSubsection.cpp +SRCS_MIN+= DebugInfo/CodeView/DebugStringTableSubsection.cpp +SRCS_MIW+= DebugInfo/CodeView/DebugSubsection.cpp +SRCS_EXT+= DebugInfo/CodeView/DebugSubsectionRecord.cpp +SRCS_EXT+= DebugInfo/CodeView/DebugSubsectionVisitor.cpp +SRCS_EXT+= DebugInfo/CodeView/DebugSymbolRVASubsection.cpp +SRCS_EXT+= DebugInfo/CodeView/DebugSymbolsSubsection.cpp +SRCS_MIN+= DebugInfo/CodeView/EnumTables.cpp +SRCS_MIN+= DebugInfo/CodeView/Formatters.cpp +SRCS_MIN+= DebugInfo/CodeView/GlobalTypeTableBuilder.cpp +SRCS_MIN+= DebugInfo/CodeView/LazyRandomTypeCollection.cpp +SRCS_MIN+= DebugInfo/CodeView/Line.cpp +SRCS_MIN+= DebugInfo/CodeView/MergingTypeTableBuilder.cpp +SRCS_MIN+= DebugInfo/CodeView/RecordName.cpp +SRCS_MIN+= DebugInfo/CodeView/RecordSerialization.cpp +SRCS_MIN+= DebugInfo/CodeView/SimpleTypeSerializer.cpp +SRCS_EXT+= DebugInfo/CodeView/StringsAndChecksums.cpp +SRCS_MIN+= DebugInfo/CodeView/SymbolDumper.cpp +SRCS_MIN+= DebugInfo/CodeView/SymbolRecordHelpers.cpp +SRCS_MIN+= DebugInfo/CodeView/SymbolRecordMapping.cpp +SRCS_EXT+= DebugInfo/CodeView/SymbolSerializer.cpp +SRCS_MIN+= DebugInfo/CodeView/TypeDumpVisitor.cpp +SRCS_MIN+= DebugInfo/CodeView/TypeHashing.cpp +SRCS_MIN+= DebugInfo/CodeView/TypeIndex.cpp +SRCS_MIN+= DebugInfo/CodeView/TypeIndexDiscovery.cpp +SRCS_EXT+= DebugInfo/CodeView/TypeRecordHelpers.cpp +SRCS_MIN+= DebugInfo/CodeView/TypeRecordMapping.cpp +SRCS_MIN+= DebugInfo/CodeView/TypeStreamMerger.cpp +SRCS_MIN+= DebugInfo/CodeView/TypeTableCollection.cpp +SRCS_MIW+= DebugInfo/DWARF/DWARFAbbreviationDeclaration.cpp +SRCS_MIW+= DebugInfo/DWARF/DWARFAcceleratorTable.cpp +SRCS_MIW+= DebugInfo/DWARF/DWARFAddressRange.cpp +SRCS_MIW+= DebugInfo/DWARF/DWARFCompileUnit.cpp +SRCS_MIW+= DebugInfo/DWARF/DWARFContext.cpp +SRCS_MIW+= DebugInfo/DWARF/DWARFDataExtractor.cpp +SRCS_MIW+= DebugInfo/DWARF/DWARFDebugAbbrev.cpp +SRCS_MIW+= DebugInfo/DWARF/DWARFDebugAddr.cpp +SRCS_MIW+= DebugInfo/DWARF/DWARFDebugArangeSet.cpp +SRCS_MIW+= DebugInfo/DWARF/DWARFDebugAranges.cpp +SRCS_MIW+= DebugInfo/DWARF/DWARFDebugFrame.cpp +SRCS_MIW+= DebugInfo/DWARF/DWARFDebugInfoEntry.cpp +SRCS_MIW+= DebugInfo/DWARF/DWARFDebugLine.cpp +SRCS_MIW+= DebugInfo/DWARF/DWARFDebugLoc.cpp +SRCS_MIW+= DebugInfo/DWARF/DWARFDebugMacro.cpp +SRCS_MIW+= DebugInfo/DWARF/DWARFDebugPubTable.cpp +SRCS_MIW+= DebugInfo/DWARF/DWARFDebugRangeList.cpp +SRCS_MIW+= DebugInfo/DWARF/DWARFDebugRnglists.cpp +SRCS_MIW+= DebugInfo/DWARF/DWARFDie.cpp +SRCS_MIN+= DebugInfo/DWARF/DWARFExpression.cpp +SRCS_MIW+= DebugInfo/DWARF/DWARFFormValue.cpp +SRCS_MIW+= DebugInfo/DWARF/DWARFGdbIndex.cpp +SRCS_MIW+= DebugInfo/DWARF/DWARFListTable.cpp +SRCS_MIW+= DebugInfo/DWARF/DWARFTypePrinter.cpp +SRCS_MIW+= DebugInfo/DWARF/DWARFTypeUnit.cpp +SRCS_MIW+= DebugInfo/DWARF/DWARFUnit.cpp +SRCS_MIW+= DebugInfo/DWARF/DWARFUnitIndex.cpp +SRCS_MIW+= DebugInfo/DWARF/DWARFVerifier.cpp +SRCS_MIN+= DebugInfo/MSF/MSFBuilder.cpp +SRCS_MIN+= DebugInfo/MSF/MSFCommon.cpp +SRCS_EXT+= DebugInfo/MSF/MSFError.cpp +SRCS_MIN+= DebugInfo/MSF/MappedBlockStream.cpp +SRCS_EXT+= DebugInfo/PDB/GenericError.cpp +SRCS_EXT+= DebugInfo/PDB/IPDBSourceFile.cpp +SRCS_EXT+= DebugInfo/PDB/Native/DbiModuleDescriptor.cpp +SRCS_EXT+= DebugInfo/PDB/Native/DbiModuleDescriptorBuilder.cpp +SRCS_EXT+= DebugInfo/PDB/Native/DbiModuleList.cpp +SRCS_EXT+= DebugInfo/PDB/Native/DbiStream.cpp +SRCS_EXT+= DebugInfo/PDB/Native/DbiStreamBuilder.cpp +SRCS_EXT+= DebugInfo/PDB/Native/EnumTables.cpp +SRCS_EXT+= DebugInfo/PDB/Native/FormatUtil.cpp +SRCS_EXT+= DebugInfo/PDB/Native/GSIStreamBuilder.cpp +SRCS_EXT+= DebugInfo/PDB/Native/GlobalsStream.cpp +SRCS_EXT+= DebugInfo/PDB/Native/Hash.cpp +SRCS_EXT+= DebugInfo/PDB/Native/HashTable.cpp +SRCS_EXT+= DebugInfo/PDB/Native/InfoStream.cpp +SRCS_EXT+= DebugInfo/PDB/Native/InfoStreamBuilder.cpp +SRCS_EXT+= DebugInfo/PDB/Native/InjectedSourceStream.cpp +SRCS_EXT+= DebugInfo/PDB/Native/InputFile.cpp +SRCS_EXT+= DebugInfo/PDB/Native/LinePrinter.cpp +SRCS_EXT+= DebugInfo/PDB/Native/ModuleDebugStream.cpp +SRCS_EXT+= DebugInfo/PDB/Native/NamedStreamMap.cpp +SRCS_EXT+= DebugInfo/PDB/Native/NativeCompilandSymbol.cpp +SRCS_EXT+= DebugInfo/PDB/Native/NativeEnumGlobals.cpp +SRCS_EXT+= DebugInfo/PDB/Native/NativeEnumInjectedSources.cpp +SRCS_EXT+= DebugInfo/PDB/Native/NativeEnumLineNumbers.cpp +SRCS_EXT+= DebugInfo/PDB/Native/NativeEnumModules.cpp +SRCS_EXT+= DebugInfo/PDB/Native/NativeEnumSymbols.cpp +SRCS_EXT+= DebugInfo/PDB/Native/NativeEnumTypes.cpp +SRCS_EXT+= DebugInfo/PDB/Native/NativeExeSymbol.cpp +SRCS_EXT+= DebugInfo/PDB/Native/NativeFunctionSymbol.cpp +SRCS_EXT+= DebugInfo/PDB/Native/NativeInlineSiteSymbol.cpp +SRCS_EXT+= DebugInfo/PDB/Native/NativeLineNumber.cpp +SRCS_EXT+= DebugInfo/PDB/Native/NativePublicSymbol.cpp +SRCS_EXT+= DebugInfo/PDB/Native/NativeRawSymbol.cpp +SRCS_EXT+= DebugInfo/PDB/Native/NativeSession.cpp +SRCS_EXT+= DebugInfo/PDB/Native/NativeSourceFile.cpp +SRCS_EXT+= DebugInfo/PDB/Native/NativeSymbolEnumerator.cpp +SRCS_EXT+= DebugInfo/PDB/Native/NativeTypeArray.cpp +SRCS_EXT+= DebugInfo/PDB/Native/NativeTypeBuiltin.cpp +SRCS_EXT+= DebugInfo/PDB/Native/NativeTypeEnum.cpp +SRCS_EXT+= DebugInfo/PDB/Native/NativeTypeFunctionSig.cpp +SRCS_EXT+= DebugInfo/PDB/Native/NativeTypePointer.cpp +SRCS_EXT+= DebugInfo/PDB/Native/NativeTypeTypedef.cpp +SRCS_EXT+= DebugInfo/PDB/Native/NativeTypeUDT.cpp +SRCS_EXT+= DebugInfo/PDB/Native/NativeTypeVTShape.cpp +SRCS_EXT+= DebugInfo/PDB/Native/PDBFile.cpp +SRCS_EXT+= DebugInfo/PDB/Native/PDBFileBuilder.cpp +SRCS_EXT+= DebugInfo/PDB/Native/PDBStringTable.cpp +SRCS_EXT+= DebugInfo/PDB/Native/PDBStringTableBuilder.cpp +SRCS_EXT+= DebugInfo/PDB/Native/PublicsStream.cpp +SRCS_EXT+= DebugInfo/PDB/Native/RawError.cpp +SRCS_EXT+= DebugInfo/PDB/Native/SymbolCache.cpp +SRCS_EXT+= DebugInfo/PDB/Native/SymbolStream.cpp +SRCS_EXT+= DebugInfo/PDB/Native/TpiHashing.cpp +SRCS_EXT+= DebugInfo/PDB/Native/TpiStream.cpp +SRCS_EXT+= DebugInfo/PDB/Native/TpiStreamBuilder.cpp +SRCS_EXT+= DebugInfo/PDB/PDB.cpp +SRCS_EXT+= DebugInfo/PDB/PDBContext.cpp +SRCS_EXT+= DebugInfo/PDB/PDBExtras.cpp +SRCS_EXT+= DebugInfo/PDB/PDBInterfaceAnchors.cpp +SRCS_EXT+= DebugInfo/PDB/PDBSymDumper.cpp +SRCS_EXT+= DebugInfo/PDB/PDBSymbol.cpp +SRCS_EXT+= DebugInfo/PDB/PDBSymbolAnnotation.cpp +SRCS_EXT+= DebugInfo/PDB/PDBSymbolBlock.cpp +SRCS_EXT+= DebugInfo/PDB/PDBSymbolCompiland.cpp +SRCS_EXT+= DebugInfo/PDB/PDBSymbolCompilandDetails.cpp +SRCS_EXT+= DebugInfo/PDB/PDBSymbolCompilandEnv.cpp +SRCS_EXT+= DebugInfo/PDB/PDBSymbolCustom.cpp +SRCS_EXT+= DebugInfo/PDB/PDBSymbolData.cpp +SRCS_EXT+= DebugInfo/PDB/PDBSymbolExe.cpp +SRCS_EXT+= DebugInfo/PDB/PDBSymbolFunc.cpp +SRCS_EXT+= DebugInfo/PDB/PDBSymbolFuncDebugEnd.cpp +SRCS_EXT+= DebugInfo/PDB/PDBSymbolFuncDebugStart.cpp +SRCS_EXT+= DebugInfo/PDB/PDBSymbolLabel.cpp *** 5094 LINES SKIPPED *** From nobody Sat Apr 6 20:18:12 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VBmrN4w2Tz5HGqJ; Sat, 6 Apr 2024 20:18: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 4VBmrN4FPHz4L0v; Sat, 6 Apr 2024 20:18:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712434692; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Hehrq1n1Co8vCvLEBmAXxQDp2sd+4zQ2drfHevTaHSY=; b=FAv6UaJuv20M+n31s88Y95/mBAs5GPxfPFpWwmEln2Qin4MKiHu9D0Q3N9becpIZx7et9e NqDI66BoAg5SweGuFeMSwCifsrvpuit105L4Zm/eLgHHt+k2DCzFF0XEG9ePPx4ypw2kI/ C/2g3xx4jvC2EBm9hDAkQmzldc4hP09pmOlZ6O/A/wYHICm+XGgcSb3mYV0YDtiMtJ3RyU 3dNECFMxuIJVebpI3kLoyralO0OfNIdj0QB1H1ZUlf4eDLu0b+eKgXLZhZzRW6r6oMcESI M9WmkGm3lHy4L9ZO9wo2kjH9xJP8bUoj5kabUfwmozabOkPPiuXEVF3WAyhNag== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712434692; a=rsa-sha256; cv=none; b=q8rYOqsP9ObmrEqykaTh/efe0FiJ0QQKVkZ0XtzedD+1GBbBa3vY9lUp1J28/tQSNJwDmR vKBfX8x6dveQSc/tfII7NdTiJoD2TpaD7beqwOmo3S3/mFIzxprYwsMwyDhnhFrNuWR/2a a+R+x2B6HUvj8HT5ZCqBzW2wTo9ezerEzF599TFB0fBurjjHHWQOVsE8lCvUc+YS1mtPui WTJO+MvEb5/iZmxvcCXoatIloucOibkPA8N4alEhnAlqqwgw8GVF7Oygn/HN8cRVP9xZ7A esE6xeaX53QaO44MN450WOytdj2uIlkp+UJFG5sEup3mkHGUuEffiDbF+i4cgw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712434692; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Hehrq1n1Co8vCvLEBmAXxQDp2sd+4zQ2drfHevTaHSY=; b=d+NkTjOrBLN42eAMHNlScgizMH2ODJWwlOauYyLZmxwBOwl7kGGhb2lmAn12G84qOyXlo1 qFwOAS2KnHMlPMRvNc38rxXGOz1xNjSiCzMGBpalQ483uxTVdqGxbxY4RIn4Ox4DxxUKxt fPciuonwJcos2qyLmN8M/i3sgXcMI6CDBBXSjl8IK+3CIjQ82E8bDVvR7S40vshUVS7N51 Q2Q/S0QdCMarNE+GVlpMZSuJqIQuycInzUOvQtzut25+nCsjSmyZkW9FbcBGGVbAKKUmJT RXBlVdUpSvq37JBaNQkQ2SCzxzyQU4d4FtGOgUrLmzkxy7xq89YAa7Og/5QeBg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VBmrN3t5KzxrP; Sat, 6 Apr 2024 20:18: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 436KICLb029750; Sat, 6 Apr 2024 20:18:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 436KICco029747; Sat, 6 Apr 2024 20:18:12 GMT (envelope-from git) Date: Sat, 6 Apr 2024 20:18:12 GMT Message-Id: <202404062018.436KICco029747@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dimitry Andric Subject: git: 46c59ea9b617 - main - Redo libc++ customizations List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 46c59ea9b61755455ff6bf9f3e7b834e1af634ea Auto-Submitted: auto-generated The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=46c59ea9b61755455ff6bf9f3e7b834e1af634ea commit 46c59ea9b61755455ff6bf9f3e7b834e1af634ea Author: Dimitry Andric AuthorDate: 2024-01-14 13:20:42 +0000 Commit: Dimitry Andric CommitDate: 2024-04-06 20:13:43 +0000 Redo libc++ customizations * Remove osreldate include because _LIBCPP_HAS_NO_GETS has disappeared * Instead, add direct major __FreeBSD__ check for using ::gets declaration * Mark EINTEGRITY values as FreeBSD customization * Reformat _LIBCPP_TYPE_VISIBILITY_DEFAULT customization PR: 276104 MFC after: 1 month --- contrib/llvm-project/libcxx/include/__config | 8 ++------ contrib/llvm-project/libcxx/include/__system_error/errc.h | 4 ++-- contrib/llvm-project/libcxx/include/cstdio | 2 +- 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/contrib/llvm-project/libcxx/include/__config b/contrib/llvm-project/libcxx/include/__config index ce4cece198b1..9154be8d8577 100644 --- a/contrib/llvm-project/libcxx/include/__config +++ b/contrib/llvm-project/libcxx/include/__config @@ -486,10 +486,6 @@ _LIBCPP_HARDENING_MODE_DEBUG # include // for __NATIVE_ASCII_F # endif -# ifdef __FreeBSD__ -# include // for __FreeBSD_version -# endif - # ifndef __BYTE_ORDER__ # error \ "Your compiler doesn't seem to define __BYTE_ORDER__, which is required by libc++ to know the endianness of your target platform" @@ -734,8 +730,8 @@ typedef __char32_t char32_t; # define _LIBCPP_TEMPLATE_VIS # endif -# if !defined(_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS) && __has_attribute(__type_visibility__) \ - && _LIBCPP_CLANG_VER >= 1500 // FreeBSD customization +# if !defined(_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS) && __has_attribute(__type_visibility__) && \ + _LIBCPP_CLANG_VER >= 1500 // FreeBSD customization # define _LIBCPP_TYPE_VISIBILITY_DEFAULT __attribute__((__type_visibility__("default"))) # else # define _LIBCPP_TYPE_VISIBILITY_DEFAULT diff --git a/contrib/llvm-project/libcxx/include/__system_error/errc.h b/contrib/llvm-project/libcxx/include/__system_error/errc.h index a14ec56070c4..b0cdacc5ec1d 100644 --- a/contrib/llvm-project/libcxx/include/__system_error/errc.h +++ b/contrib/llvm-project/libcxx/include/__system_error/errc.h @@ -45,7 +45,7 @@ enum class errc identifier_removed, // EIDRM illegal_byte_sequence, // EILSEQ inappropriate_io_control_operation, // ENOTTY - integrity_check_failed, // EINTEGRITY + integrity_check_failed, // EINTEGRITY // FreeBSD customization interrupted, // EINTR invalid_argument, // EINVAL invalid_seek, // ESPIPE @@ -143,7 +143,7 @@ _LIBCPP_DECLARE_STRONG_ENUM(errc){ illegal_byte_sequence = EILSEQ, inappropriate_io_control_operation = ENOTTY, #ifdef EINTEGRITY - integrity_check_failed = EINTEGRITY, + integrity_check_failed = EINTEGRITY, // FreeBSD customization #endif interrupted = EINTR, invalid_argument = EINVAL, diff --git a/contrib/llvm-project/libcxx/include/cstdio b/contrib/llvm-project/libcxx/include/cstdio index 0a867cec1a38..383655036d5f 100644 --- a/contrib/llvm-project/libcxx/include/cstdio +++ b/contrib/llvm-project/libcxx/include/cstdio @@ -159,7 +159,7 @@ using ::tmpfile _LIBCPP_USING_IF_EXISTS; using ::tmpnam _LIBCPP_USING_IF_EXISTS; using ::getchar _LIBCPP_USING_IF_EXISTS; -#if _LIBCPP_STD_VER <= 11 +#if _LIBCPP_STD_VER <= 11 && !(defined(__FreeBSD__) && __FreeBSD__ >= 13) // FreeBSD customization using ::gets _LIBCPP_USING_IF_EXISTS; #endif using ::scanf _LIBCPP_USING_IF_EXISTS; From nobody Sat Apr 6 20:18:19 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VBmrc39B6z5HGkx; Sat, 6 Apr 2024 20:18: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 4VBmrc1tr8z4LCZ; Sat, 6 Apr 2024 20:18:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712434704; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=w2zjrZByqjzblW9xkciU37kQRpcvhdxnTQDxLZylvug=; b=u76YQQnd9UFlglnA3daWS3JKNhuiQmSJEaoUDtjptKmsY6vWxPQnqVS4S7l43HnkkQrBPn 0V429tKOLzYlVSKA+2vF1XXVMbrp/jkLzj3qSJ70wu+0dwftoRuZKvoeLwyDgffDVyK97k hDO9W5Zsow/TtLrE7ZwaxCNmXbtW5VBTEazO5X/t6zyb1Kt0scQ4mHct5OfxDCM2iAt2+0 REMiScy4zyrLkSMFT8++DQ/E5MYotnYsRJBDpSMrwkMWFO+9+WBtpeOGx3IuKsmrFeeqxI Q3P8ngl/uaqZZtXGpUKwm7X2piGRjzEVCCNJ0+LBIugmN0w8eCk40uANv3oGxQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712434704; a=rsa-sha256; cv=none; b=jdL1HDG3i4rM6Ji4NWWSqt15YzdgTULEm2+GdBG/0c+BjwNbV7o50zcR2G1MCzXuyWqcYv F9yirMhnYPLYzTr35F3ESJ+XTnAg/6jImcJDgRtR50zXve1PsvfFMRcDvqs5OTQk5EMlbb nVjOr06WDgTmruTrZ7mOsmwi9sArq/eOqoJDy59tCBc3OilmrlWUXLOATbKsqTokEbyJ0C lfK+yGLfz5dCk+hhgFBDgN+2acVjUoiRBCsgF77/0AQwqC/oVxXc0QEoJyBfIOa4gdXSTB yNtA2szNHQBSgza45TWUzKKSuM0KdTx0UUclECJ8sGr52RMeNBLD6iw8+ScsNQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712434704; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=w2zjrZByqjzblW9xkciU37kQRpcvhdxnTQDxLZylvug=; b=AzHQoNLYGBK7X1y/zZxF8b/L38NVWCEUerYFlpMBlFgxI7eMo7C45+N8vJCuHb7aIItmxS YU9ViL2eOaQ51WLsDkuTtyZKEFt4tsI6cGmG1WIF+ZD1THTcesLV+guLYU+TjEd2ov7rKw aWByb3tHeSzIcY9wK0Jyr89GNJO1xLzK1mzRam/Mdb5U8ftvwV5JYchjQC4izO9XhMuGz/ oBBdCbCMc0ZoTVf+L3Ebe1ng7lbr85A0D7z9BSVKjZMYHoXqU3f3ErAzhyjCK9O43yvT6M BUsJTybSHmkek5BIF9i17DNzQMmNjNtxaS8lb169+QldWNcM5uvyIn3C/h32dw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VBmrc1VFXzxwl; Sat, 6 Apr 2024 20:18: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 436KIOgn029821; Sat, 6 Apr 2024 20:18:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 436KIJ5v029802; Sat, 6 Apr 2024 20:18:19 GMT (envelope-from git) Date: Sat, 6 Apr 2024 20:18:19 GMT Message-Id: <202404062018.436KIJ5v029802@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dimitry Andric Subject: git: 7a6dacaca14b - main - Merge llvm-project main llvmorg-18-init-18359-g93248729cfae List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7a6dacaca14b62ca4b74406814becb87a3fefac0 Auto-Submitted: auto-generated The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=7a6dacaca14b62ca4b74406814becb87a3fefac0 commit 7a6dacaca14b62ca4b74406814becb87a3fefac0 Merge: 46c59ea9b617 4df029cc74e5 Author: Dimitry Andric AuthorDate: 2024-01-24 19:17:23 +0000 Commit: Dimitry Andric CommitDate: 2024-04-06 20:13:49 +0000 Merge llvm-project main llvmorg-18-init-18359-g93248729cfae This updates llvm, clang, compiler-rt, libc++, libunwind, lld, lldb and openmp to llvm-project main llvmorg-18-init-18359-g93248729cfae, the last commit before the upstream release/18.x branch was created. PR: 276104 MFC after: 1 month contrib/llvm-project/FREEBSD-Xlist | 7 +- .../clang/include/clang/AST/APNumericStorage.h | 71 + .../llvm-project/clang/include/clang/AST/Decl.h | 25 +- .../clang/include/clang/AST/DeclBase.h | 9 +- .../llvm-project/clang/include/clang/AST/DeclCXX.h | 41 +- .../llvm-project/clang/include/clang/AST/Expr.h | 64 +- .../llvm-project/clang/include/clang/AST/ExprCXX.h | 19 +- .../llvm-project/clang/include/clang/AST/ODRHash.h | 3 + .../clang/include/clang/AST/PropertiesBase.td | 14 + .../clang/include/clang/AST/RecursiveASTVisitor.h | 2 + .../llvm-project/clang/include/clang/AST/Stmt.h | 8 +- .../include/clang/AST/TemplateArgumentVisitor.h | 2 + .../clang/include/clang/AST/TemplateBase.h | 86 +- .../llvm-project/clang/include/clang/AST/Type.h | 88 +- .../clang/include/clang/ASTMatchers/ASTMatchers.h | 205 +- .../clang/ASTMatchers/ASTMatchersInternal.h | 3 + .../Analysis/FlowSensitive/ControlFlowContext.h | 3 +- .../Analysis/FlowSensitive/DataflowAnalysis.h | 21 +- .../Analysis/FlowSensitive/DataflowEnvironment.h | 3 +- .../include/clang/Analysis/FlowSensitive/Formula.h | 4 + .../clang/Analysis/FlowSensitive/Transfer.h | 13 +- .../FlowSensitive/TypeErasedDataflowAnalysis.h | 9 +- .../llvm-project/clang/include/clang/Basic/Attr.td | 98 +- .../clang/include/clang/Basic/AttrDocs.td | 84 +- .../include/clang/Basic/AttributeCommonInfo.h | 13 + .../clang/include/clang/Basic/BuiltinsAMDGPU.def | 28 +- .../include/clang/Basic/BuiltinsLoongArchBase.def | 5 + .../include/clang/Basic/BuiltinsLoongArchLASX.def | 6 + .../include/clang/Basic/BuiltinsLoongArchLSX.def | 6 + .../clang/include/clang/Basic/BuiltinsPPC.def | 4 + .../clang/include/clang/Basic/CodeGenOptions.def | 15 +- .../clang/include/clang/Basic/CodeGenOptions.h | 3 + .../include/clang/Basic/DiagnosticCommonKinds.td | 8 +- .../include/clang/Basic/DiagnosticDriverKinds.td | 15 +- .../include/clang/Basic/DiagnosticParseKinds.td | 12 + .../include/clang/Basic/DiagnosticSemaKinds.td | 41 +- .../clang/Basic/DiagnosticSerializationKinds.td | 6 +- .../clang/include/clang/Basic/Features.def | 4 + .../clang/include/clang/Basic/LangOptions.def | 28 +- .../clang/include/clang/Basic/LangOptions.h | 44 +- .../clang/include/clang/Basic/ObjCRuntime.h | 15 +- .../clang/include/clang/Basic/OpenACCKinds.h | 294 +- .../clang/include/clang/Basic/TargetBuiltins.h | 4 +- .../clang/include/clang/Basic/TokenKinds.def | 5 +- .../clang/include/clang/Basic/TokenKinds.h | 4 +- .../clang/include/clang/Basic/arm_sme.td | 572 +- .../clang/include/clang/Basic/arm_sve.td | 222 +- .../clang/include/clang/Basic/arm_sve_sme_incl.td | 72 +- .../clang/include/clang/Basic/riscv_vector.td | 44 +- .../clang/include/clang/Driver/Options.td | 69 +- .../clang/include/clang/Driver/Types.def | 6 +- .../clang/include/clang/ExtractAPI/API.h | 289 +- .../include/clang/ExtractAPI/AvailabilityInfo.h | 55 +- .../clang/ExtractAPI/DeclarationFragments.h | 5 +- .../include/clang/ExtractAPI/ExtractAPIVisitor.h | 195 +- .../ExtractAPI/Serialization/SerializerBase.h | 12 +- .../Serialization/SymbolGraphSerializer.h | 4 +- .../clang/include/clang/Format/Format.h | 11 + .../clang/include/clang/Frontend/ASTUnit.h | 2 +- .../clang/include/clang/Frontend/Utils.h | 4 +- .../clang/include/clang/Interpreter/Interpreter.h | 4 +- .../llvm-project/clang/include/clang/Lex/Lexer.h | 2 +- .../clang/include/clang/Lex/Preprocessor.h | 14 +- .../clang/include/clang/Parse/Parser.h | 32 + .../clang/include/clang/Sema/ScopeInfo.h | 6 +- .../llvm-project/clang/include/clang/Sema/Sema.h | 64 +- .../clang/include/clang/Serialization/ASTReader.h | 4 + .../include/clang/Support/RISCVVIntrinsicUtils.h | 2 +- .../clang/lib/ARCMigrate/FileRemapper.cpp | 2 +- .../llvm-project/clang/lib/ARCMigrate/ObjCMT.cpp | 2 +- contrib/llvm-project/clang/lib/AST/ASTContext.cpp | 12 +- contrib/llvm-project/clang/lib/AST/ASTImporter.cpp | 39 +- .../clang/lib/AST/ASTStructuralEquivalence.cpp | 62 +- contrib/llvm-project/clang/lib/AST/Decl.cpp | 21 +- contrib/llvm-project/clang/lib/AST/DeclCXX.cpp | 31 +- contrib/llvm-project/clang/lib/AST/DeclPrinter.cpp | 2 +- contrib/llvm-project/clang/lib/AST/Expr.cpp | 9 +- contrib/llvm-project/clang/lib/AST/ExprCXX.cpp | 10 +- .../llvm-project/clang/lib/AST/ExprConstant.cpp | 45 +- .../clang/lib/AST/Interp/ByteCodeEmitter.cpp | 13 +- .../clang/lib/AST/Interp/ByteCodeEmitter.h | 10 +- .../clang/lib/AST/Interp/ByteCodeExprGen.cpp | 96 +- .../clang/lib/AST/Interp/ByteCodeExprGen.h | 6 +- .../clang/lib/AST/Interp/ByteCodeStmtGen.cpp | 68 +- .../llvm-project/clang/lib/AST/Interp/Context.cpp | 106 +- .../llvm-project/clang/lib/AST/Interp/Context.h | 3 + .../clang/lib/AST/Interp/EvalEmitter.cpp | 174 +- .../clang/lib/AST/Interp/EvalEmitter.h | 15 +- .../clang/lib/AST/Interp/EvaluationResult.cpp | 196 + .../clang/lib/AST/Interp/EvaluationResult.h | 111 + .../llvm-project/clang/lib/AST/Interp/IntegralAP.h | 12 +- .../llvm-project/clang/lib/AST/Interp/Interp.cpp | 166 +- contrib/llvm-project/clang/lib/AST/Interp/Interp.h | 37 +- .../llvm-project/clang/lib/AST/Interp/Opcodes.td | 9 +- .../llvm-project/clang/lib/AST/Interp/Pointer.cpp | 154 +- .../llvm-project/clang/lib/AST/Interp/Pointer.h | 3 +- .../llvm-project/clang/lib/AST/ItaniumMangle.cpp | 40 +- .../llvm-project/clang/lib/AST/JSONNodeDumper.cpp | 7 +- contrib/llvm-project/clang/lib/AST/Mangle.cpp | 2 +- .../llvm-project/clang/lib/AST/MicrosoftMangle.cpp | 78 +- .../llvm-project/clang/lib/AST/ODRDiagsEmitter.cpp | 4 +- contrib/llvm-project/clang/lib/AST/ODRHash.cpp | 120 +- .../clang/lib/AST/RecordLayoutBuilder.cpp | 4 +- contrib/llvm-project/clang/lib/AST/StmtPrinter.cpp | 5 +- contrib/llvm-project/clang/lib/AST/StmtProfile.cpp | 6 + .../llvm-project/clang/lib/AST/TemplateBase.cpp | 113 +- .../llvm-project/clang/lib/AST/TextNodeDumper.cpp | 2 +- contrib/llvm-project/clang/lib/AST/Type.cpp | 12 +- contrib/llvm-project/clang/lib/AST/TypeLoc.cpp | 1 + contrib/llvm-project/clang/lib/AST/TypePrinter.cpp | 39 +- .../llvm-project/clang/lib/AST/VTableBuilder.cpp | 18 +- .../clang/lib/ASTMatchers/ASTMatchersInternal.cpp | 1 + .../clang/lib/ASTMatchers/Dynamic/Registry.cpp | 7 + .../clang/lib/Analysis/ExprMutationAnalyzer.cpp | 17 +- .../Analysis/FlowSensitive/ControlFlowContext.cpp | 2 +- .../FlowSensitive/DataflowAnalysisContext.cpp | 8 +- .../Analysis/FlowSensitive/DataflowEnvironment.cpp | 24 +- .../Analysis/FlowSensitive/SimplifyConstraints.cpp | 4 +- .../clang/lib/Analysis/FlowSensitive/Transfer.cpp | 2 + .../FlowSensitive/TypeErasedDataflowAnalysis.cpp | 92 +- .../clang/lib/Analysis/FlowSensitive/Value.cpp | 14 +- .../clang/lib/Analysis/RetainSummaryManager.cpp | 2 +- .../clang/lib/Analysis/UnsafeBufferUsage.cpp | 5 +- .../clang/lib/Basic/CodeGenOptions.cpp | 2 + .../llvm-project/clang/lib/Basic/FileManager.cpp | 2 +- contrib/llvm-project/clang/lib/Basic/Targets.cpp | 2 + .../clang/lib/Basic/Targets/AArch64.cpp | 27 +- .../llvm-project/clang/lib/Basic/Targets/AMDGPU.h | 17 +- .../llvm-project/clang/lib/Basic/Targets/ARM.cpp | 4 + .../clang/lib/Basic/Targets/OSTargets.h | 6 +- .../llvm-project/clang/lib/Basic/Targets/PPC.cpp | 1 + .../llvm-project/clang/lib/Basic/Targets/RISCV.cpp | 93 +- .../llvm-project/clang/lib/Basic/Targets/RISCV.h | 12 + .../llvm-project/clang/lib/Basic/Targets/SPIR.h | 6 +- .../llvm-project/clang/lib/Basic/Targets/X86.cpp | 11 + contrib/llvm-project/clang/lib/Basic/Warnings.cpp | 3 +- .../llvm-project/clang/lib/CodeGen/BackendUtil.cpp | 8 +- .../llvm-project/clang/lib/CodeGen/CGBuiltin.cpp | 45 +- .../llvm-project/clang/lib/CodeGen/CGCUDANV.cpp | 2 +- contrib/llvm-project/clang/lib/CodeGen/CGCXX.cpp | 5 + contrib/llvm-project/clang/lib/CodeGen/CGCall.cpp | 28 +- contrib/llvm-project/clang/lib/CodeGen/CGCleanup.h | 1 + .../llvm-project/clang/lib/CodeGen/CGDebugInfo.cpp | 12 +- contrib/llvm-project/clang/lib/CodeGen/CGDecl.cpp | 14 + .../llvm-project/clang/lib/CodeGen/CGException.cpp | 4 + contrib/llvm-project/clang/lib/CodeGen/CGExpr.cpp | 12 +- .../llvm-project/clang/lib/CodeGen/CGExprCXX.cpp | 60 +- .../clang/lib/CodeGen/CGExprComplex.cpp | 10 +- .../clang/lib/CodeGen/CGExprScalar.cpp | 18 +- contrib/llvm-project/clang/lib/CodeGen/CGObjC.cpp | 5 + .../llvm-project/clang/lib/CodeGen/CGObjCGNU.cpp | 244 +- .../clang/lib/CodeGen/CGOpenMPRuntime.cpp | 7 + contrib/llvm-project/clang/lib/CodeGen/CGStmt.cpp | 4 +- .../llvm-project/clang/lib/CodeGen/CGVTables.cpp | 2 +- .../clang/lib/CodeGen/CodeGenModule.cpp | 122 +- .../llvm-project/clang/lib/CodeGen/CodeGenPGO.cpp | 4 +- .../clang/lib/CodeGen/CoverageMappingGen.cpp | 437 +- .../llvm-project/clang/lib/CodeGen/TargetInfo.h | 3 +- .../clang/lib/CodeGen/Targets/RISCV.cpp | 35 +- .../llvm-project/clang/lib/CodeGen/Targets/X86.cpp | 5 + .../clang/lib/CrossTU/CrossTranslationUnit.cpp | 2 +- contrib/llvm-project/clang/lib/Driver/Driver.cpp | 45 +- .../clang/lib/Driver/SanitizerArgs.cpp | 10 +- .../llvm-project/clang/lib/Driver/ToolChain.cpp | 8 +- .../clang/lib/Driver/ToolChains/AMDGPU.cpp | 33 +- .../clang/lib/Driver/ToolChains/AVR.cpp | 2 +- .../clang/lib/Driver/ToolChains/Arch/AArch64.cpp | 288 +- .../clang/lib/Driver/ToolChains/Arch/ARM.cpp | 5 +- .../clang/lib/Driver/ToolChains/Arch/RISCV.cpp | 4 + .../clang/lib/Driver/ToolChains/CSKYToolChain.cpp | 2 +- .../clang/lib/Driver/ToolChains/Clang.cpp | 129 +- .../clang/lib/Driver/ToolChains/CommonArgs.cpp | 23 +- .../clang/lib/Driver/ToolChains/Cuda.cpp | 2 +- .../clang/lib/Driver/ToolChains/Darwin.cpp | 79 +- .../clang/lib/Driver/ToolChains/Darwin.h | 21 +- .../clang/lib/Driver/ToolChains/Fuchsia.cpp | 4 +- .../clang/lib/Driver/ToolChains/Gnu.cpp | 24 +- .../clang/lib/Driver/ToolChains/Hexagon.cpp | 2 +- .../clang/lib/Driver/ToolChains/Hurd.cpp | 18 +- .../clang/lib/Driver/ToolChains/MSP430.cpp | 2 +- .../clang/lib/Driver/ToolChains/MSVC.cpp | 12 +- .../clang/lib/Driver/ToolChains/MSVC.h | 5 +- .../clang/lib/Driver/ToolChains/MinGW.cpp | 8 +- .../clang/lib/Driver/ToolChains/MinGW.h | 5 +- .../clang/lib/Driver/ToolChains/MipsLinux.cpp | 2 +- .../clang/lib/Driver/ToolChains/OpenBSD.cpp | 4 +- .../clang/lib/Driver/ToolChains/PS4CPU.cpp | 8 +- .../clang/lib/Driver/ToolChains/RISCVToolchain.cpp | 2 +- contrib/llvm-project/clang/lib/Driver/Types.cpp | 7 +- contrib/llvm-project/clang/lib/ExtractAPI/API.cpp | 150 +- .../clang/lib/ExtractAPI/AvailabilityInfo.cpp | 63 +- .../clang/lib/ExtractAPI/DeclarationFragments.cpp | 89 +- .../Serialization/SymbolGraphSerializer.cpp | 74 +- .../clang/lib/Format/ContinuationIndenter.cpp | 34 +- contrib/llvm-project/clang/lib/Format/Format.cpp | 7 +- .../llvm-project/clang/lib/Format/FormatToken.h | 76 + .../clang/lib/Format/FormatTokenLexer.cpp | 84 + .../clang/lib/Format/FormatTokenLexer.h | 7 + .../clang/lib/Format/TokenAnnotator.cpp | 17 +- .../clang/lib/Format/UnwrappedLineFormatter.cpp | 2 +- .../clang/lib/Format/UnwrappedLineParser.cpp | 66 +- .../clang/lib/Format/WhitespaceManager.cpp | 15 +- .../clang/lib/Format/WhitespaceManager.h | 2 +- .../clang/lib/Frontend/CompilerInstance.cpp | 6 +- .../clang/lib/Frontend/CompilerInvocation.cpp | 53 +- .../clang/lib/Frontend/InitPreprocessor.cpp | 24 +- .../clang/lib/Frontend/LogDiagnosticPrinter.cpp | 2 +- .../clang/lib/Frontend/Rewrite/FrontendActions.cpp | 4 +- .../clang/lib/Frontend/TextDiagnosticBuffer.cpp | 8 +- contrib/llvm-project/clang/lib/Headers/arm_acle.h | 70 +- contrib/llvm-project/clang/lib/Headers/bmiintrin.h | 273 +- .../llvm-project/clang/lib/Headers/ia32intrin.h | 444 +- contrib/llvm-project/clang/lib/Headers/immintrin.h | 57 + .../llvm-project/clang/lib/Headers/larchintrin.h | 12 + .../llvm-project/clang/lib/Headers/lasxintrin.h | 24 + .../clang/lib/Headers/llvm_libc_wrappers/string.h | 4 +- contrib/llvm-project/clang/lib/Headers/lsxintrin.h | 24 + .../llvm-project/clang/lib/Index/USRGeneration.cpp | 10 + .../clang/lib/Interpreter/Interpreter.cpp | 34 +- .../llvm-project/clang/lib/Lex/HeaderSearch.cpp | 78 +- contrib/llvm-project/clang/lib/Lex/ModuleMap.cpp | 2 +- .../llvm-project/clang/lib/Lex/Preprocessor.cpp | 5 + .../llvm-project/clang/lib/Lex/UnicodeCharSets.h | 47 +- contrib/llvm-project/clang/lib/Parse/ParseDecl.cpp | 75 +- .../llvm-project/clang/lib/Parse/ParseDeclCXX.cpp | 28 +- contrib/llvm-project/clang/lib/Parse/ParseExpr.cpp | 13 +- .../llvm-project/clang/lib/Parse/ParseExprCXX.cpp | 9 +- contrib/llvm-project/clang/lib/Parse/ParseObjc.cpp | 6 +- .../llvm-project/clang/lib/Parse/ParseOpenACC.cpp | 523 +- .../clang/lib/Parse/ParseTentative.cpp | 3 +- contrib/llvm-project/clang/lib/Parse/Parser.cpp | 5 + .../clang/lib/Sema/AnalysisBasedWarnings.cpp | 17 +- contrib/llvm-project/clang/lib/Sema/Sema.cpp | 4 +- .../llvm-project/clang/lib/Sema/SemaChecking.cpp | 133 +- .../llvm-project/clang/lib/Sema/SemaCoroutine.cpp | 5 + contrib/llvm-project/clang/lib/Sema/SemaDecl.cpp | 174 +- .../llvm-project/clang/lib/Sema/SemaDeclAttr.cpp | 120 +- .../llvm-project/clang/lib/Sema/SemaDeclCXX.cpp | 41 +- .../llvm-project/clang/lib/Sema/SemaDeclObjC.cpp | 4 +- contrib/llvm-project/clang/lib/Sema/SemaExpr.cpp | 43 +- .../llvm-project/clang/lib/Sema/SemaExprCXX.cpp | 49 +- contrib/llvm-project/clang/lib/Sema/SemaInit.cpp | 70 +- contrib/llvm-project/clang/lib/Sema/SemaLambda.cpp | 2 +- contrib/llvm-project/clang/lib/Sema/SemaLookup.cpp | 1 + .../clang/lib/Sema/SemaObjCProperty.cpp | 2 +- contrib/llvm-project/clang/lib/Sema/SemaOpenMP.cpp | 4 +- .../llvm-project/clang/lib/Sema/SemaOverload.cpp | 187 +- .../clang/lib/Sema/SemaRISCVVectorLookup.cpp | 5 +- contrib/llvm-project/clang/lib/Sema/SemaStmt.cpp | 6 + .../llvm-project/clang/lib/Sema/SemaTemplate.cpp | 265 +- .../clang/lib/Sema/SemaTemplateDeduction.cpp | 64 +- .../clang/lib/Sema/SemaTemplateInstantiate.cpp | 17 +- .../clang/lib/Sema/SemaTemplateInstantiateDecl.cpp | 23 +- .../clang/lib/Sema/SemaTemplateVariadic.cpp | 2 + contrib/llvm-project/clang/lib/Sema/SemaType.cpp | 269 +- .../llvm-project/clang/lib/Sema/TreeTransform.h | 24 +- .../clang/lib/Serialization/ASTReader.cpp | 90 +- .../clang/lib/Serialization/ASTReaderDecl.cpp | 6 +- .../clang/lib/Serialization/ASTReaderStmt.cpp | 1 + .../clang/lib/Serialization/ASTWriter.cpp | 23 +- .../clang/lib/Serialization/ASTWriterDecl.cpp | 2 +- .../clang/lib/Serialization/ASTWriterStmt.cpp | 1 + .../Checkers/CheckSecuritySyntaxOnly.cpp | 2 + .../Checkers/LocalizationChecker.cpp | 6 +- .../Checkers/StdLibraryFunctionsChecker.cpp | 91 +- .../lib/StaticAnalyzer/Checkers/StreamChecker.cpp | 183 + .../StaticAnalyzer/Checkers/VirtualCallChecker.cpp | 2 +- .../lib/StaticAnalyzer/Core/HTMLDiagnostics.cpp | 14 +- .../clang/lib/Tooling/ASTDiff/ASTDiff.cpp | 4 +- .../clang/lib/Tooling/CompilationDatabase.cpp | 6 +- .../DependencyScanningWorker.cpp | 2 +- .../clang/lib/Tooling/Syntax/Tokens.cpp | 6 + contrib/llvm-project/clang/lib/Tooling/Tooling.cpp | 2 +- .../clang/tools/clang-format/ClangFormat.cpp | 24 +- contrib/llvm-project/clang/tools/driver/driver.cpp | 4 +- .../clang/utils/TableGen/ClangAttrEmitter.cpp | 63 +- ...ngCommentHTMLNamedCharacterReferenceEmitter.cpp | 2 +- .../utils/TableGen/ClangDiagnosticsEmitter.cpp | 2 +- .../clang/utils/TableGen/MveEmitter.cpp | 2 +- .../clang/utils/TableGen/RISCVVEmitter.cpp | 2 +- .../clang/utils/TableGen/SveEmitter.cpp | 56 +- .../llvm-project/clang/utils/TableGen/TableGen.cpp | 21 +- .../clang/utils/TableGen/TableGenBackends.h | 4 +- .../include/profile/instr_prof_interface.h | 92 + .../llvm-project/compiler-rt/lib/asan/asan_win.cpp | 7 +- .../lib/builtins/aarch64/sme-libc-routines.c | 87 + .../compiler-rt/lib/builtins/cpu_model/aarch64.c | 1 + .../lib/builtins/cpu_model/aarch64/fmv/apple.inc | 30 +- .../lib/builtins/cpu_model/aarch64/fmv/mrs.inc | 2 + .../lib/builtins/cpu_model/aarch64/hwcap.inc | 3 + .../compiler-rt/lib/builtins/cpu_model/x86.c | 5 +- .../compiler-rt/lib/builtins/fp_extend_impl.inc | 2 +- .../compiler-rt/lib/builtins/int_lib.h | 10 +- .../compiler-rt/lib/dfsan/dfsan_custom.cpp | 8 +- .../compiler-rt/lib/hwasan/hwasan_report.cpp | 2 +- .../compiler-rt/lib/interception/interception.h | 5 +- .../lib/interception/interception_win.cpp | 33 +- .../compiler-rt/lib/orc/coff_platform.cpp | 8 +- .../compiler-rt/lib/orc/wrapper_function_utils.h | 6 +- .../compiler-rt/lib/profile/InstrProfiling.h | 61 +- .../compiler-rt/lib/profile/InstrProfilingFile.c | 14 +- .../compiler-rt/lib/profile/InstrProfilingMerge.c | 5 + .../compiler-rt/lib/profile/InstrProfilingValue.c | 5 + .../compiler-rt/lib/profile/WindowsMMap.c | 3 +- .../compiler-rt/lib/profile/WindowsMMap.h | 6 + .../lib/sanitizer_common/sanitizer_asm.h | 23 + .../sanitizer_common_interceptors.inc | 8 +- .../lib/sanitizer_common/sanitizer_fuchsia.cpp | 87 +- .../lib/sanitizer_common/sanitizer_internal_defs.h | 9 +- .../sanitizer_symbolizer_report.cpp | 3 +- .../symbolizer/scripts/build_symbolizer.sh | 1 + .../compiler-rt/lib/tsan/rtl/tsan_dispatch_defs.h | 7 - .../compiler-rt/lib/tsan/rtl/tsan_platform.h | 2 +- .../lib/tsan/rtl/tsan_platform_linux.cpp | 140 +- .../compiler-rt/lib/tsan/rtl/tsan_platform_mac.cpp | 5 +- .../lib/tsan/rtl/tsan_platform_posix.cpp | 43 +- .../libcxx/include/__algorithm/clamp.h | 2 +- .../libcxx/include/__algorithm/comp_ref_type.h | 5 +- .../libcxx/include/__algorithm/nth_element.h | 8 +- .../libcxx/include/__algorithm/ranges_clamp.h | 5 +- .../llvm-project/libcxx/include/__algorithm/sort.h | 22 +- .../include/__algorithm/three_way_comp_ref_type.h | 6 +- contrib/llvm-project/libcxx/include/__assert | 6 +- .../libcxx/include/__atomic/is_always_lock_free.h | 2 +- contrib/llvm-project/libcxx/include/__availability | 29 +- .../llvm-project/libcxx/include/__bit/bit_ceil.h | 2 +- .../llvm-project/libcxx/include/__chrono/ostream.h | 9 +- .../libcxx/include/__concepts/arithmetic.h | 4 + contrib/llvm-project/libcxx/include/__config | 71 +- .../libcxx/include/__coroutine/coroutine_handle.h | 16 +- .../__debug_utils/strict_weak_ordering_check.h | 14 +- .../libcxx/include/__exception/exception_ptr.h | 50 + .../libcxx/include/__expected/expected.h | 1142 +- contrib/llvm-project/libcxx/include/__hash_table | 2 +- .../libcxx/include/__iterator/iterator_traits.h | 2 +- .../libcxx/include/__memory/allocator.h | 14 +- .../libcxx/include/__memory/assume_aligned.h | 4 +- .../__memory_resource/polymorphic_allocator.h | 5 +- .../libcxx/include/__numeric/gcd_lcm.h | 2 +- .../include/__numeric/saturation_arithmetic.h | 110 + .../libcxx/include/__ranges/chunk_by_view.h | 3 +- .../libcxx/include/__ranges/drop_while_view.h | 3 +- .../libcxx/include/__ranges/filter_view.h | 2 +- .../libcxx/include/__ranges/repeat_view.h | 2 +- .../libcxx/include/__ranges/single_view.h | 2 +- .../libcxx/include/__ranges/take_while_view.h | 3 +- .../libcxx/include/__ranges/transform_view.h | 3 +- .../llvm-project/libcxx/include/__utility/cmp.h | 43 +- contrib/llvm-project/libcxx/include/any | 3 + contrib/llvm-project/libcxx/include/barrier | 23 +- contrib/llvm-project/libcxx/include/chrono | 4 + contrib/llvm-project/libcxx/include/concepts | 2 +- .../llvm-project/libcxx/include/condition_variable | 93 +- .../include/experimental/__simd/aligned_tag.h | 3 +- .../libcxx/include/experimental/__simd/scalar.h | 7 + .../libcxx/include/experimental/__simd/simd.h | 6 + .../libcxx/include/experimental/__simd/simd_mask.h | 6 + .../libcxx/include/experimental/__simd/vec_ext.h | 11 + contrib/llvm-project/libcxx/include/future | 11 +- contrib/llvm-project/libcxx/include/latch | 21 +- contrib/llvm-project/libcxx/include/libcxx.imp | 888 +- contrib/llvm-project/libcxx/include/locale | 12 +- contrib/llvm-project/libcxx/include/memory | 2 +- .../libcxx/include/module.modulemap.in | 1 + contrib/llvm-project/libcxx/include/new | 1 - contrib/llvm-project/libcxx/include/numeric | 13 + contrib/llvm-project/libcxx/include/ostream | 21 +- contrib/llvm-project/libcxx/include/print | 18 +- contrib/llvm-project/libcxx/include/regex | 11 +- contrib/llvm-project/libcxx/include/semaphore | 19 +- contrib/llvm-project/libcxx/include/shared_mutex | 11 +- contrib/llvm-project/libcxx/include/span | 16 + contrib/llvm-project/libcxx/include/sstream | 2 +- contrib/llvm-project/libcxx/include/stop_token | 11 +- contrib/llvm-project/libcxx/include/string | 5 +- contrib/llvm-project/libcxx/include/string_view | 7 +- contrib/llvm-project/libcxx/include/thread | 11 +- contrib/llvm-project/libcxx/include/typeinfo | 1 - contrib/llvm-project/libcxx/include/variant | 53 +- contrib/llvm-project/libcxx/include/vector | 14 +- contrib/llvm-project/libcxx/include/version | 4 +- .../llvm-project/libcxx/modules/modules.json.in | 26 + .../llvm-project/libcxx/modules/std.compat.cppm.in | 125 +- .../libcxx/modules/std.compat/cstdlib.inc | 4 +- .../libcxx/modules/std.compat/ctime.inc | 2 +- contrib/llvm-project/libcxx/modules/std.cppm.in | 1 + contrib/llvm-project/libcxx/modules/std/ctime.inc | 2 +- contrib/llvm-project/libcxx/modules/std/memory.inc | 2 + .../llvm-project/libcxx/modules/std/numeric.inc | 10 + .../libcxx/src/filesystem/operations.cpp | 26 +- .../libcxx/src/include/overridable_function.h | 119 + .../libcxx/src/include/to_chars_floating_point.h | 2 +- .../llvm-project/libcxx/src/memory_resource.cpp | 3 +- contrib/llvm-project/libcxx/src/mutex.cpp | 8 +- contrib/llvm-project/libcxx/src/new.cpp | 107 +- contrib/llvm-project/libcxx/src/ostream.cpp | 2 +- .../support/runtime/exception_pointer_cxxabi.ipp | 8 + .../support/runtime/exception_pointer_glibcxx.ipp | 8 + .../runtime/exception_pointer_unimplemented.ipp | 6 + .../vendor/llvm/default_assertion_handler.in | 31 + .../llvm-project/libunwind/src/UnwindCursor.hpp | 4 +- contrib/llvm-project/libunwind/src/libunwind.cpp | 6 +- contrib/llvm-project/lld/COFF/Driver.cpp | 12 +- contrib/llvm-project/lld/COFF/DriverUtils.cpp | 8 +- contrib/llvm-project/lld/COFF/InputFiles.cpp | 4 +- contrib/llvm-project/lld/COFF/Writer.cpp | 2 + contrib/llvm-project/lld/Common/Args.cpp | 15 +- .../llvm-project/lld/Common/DriverDispatcher.cpp | 1 - contrib/llvm-project/lld/ELF/Arch/ARM.cpp | 6 +- contrib/llvm-project/lld/ELF/Arch/Mips.cpp | 7 +- contrib/llvm-project/lld/ELF/Arch/PPC64.cpp | 2 +- contrib/llvm-project/lld/ELF/Arch/RISCV.cpp | 10 +- contrib/llvm-project/lld/ELF/Arch/X86_64.cpp | 8 +- contrib/llvm-project/lld/ELF/Config.h | 2 + contrib/llvm-project/lld/ELF/Driver.cpp | 200 +- contrib/llvm-project/lld/ELF/DriverUtils.cpp | 2 +- contrib/llvm-project/lld/ELF/InputFiles.cpp | 10 +- contrib/llvm-project/lld/ELF/InputFiles.h | 11 +- contrib/llvm-project/lld/ELF/InputSection.cpp | 4 +- contrib/llvm-project/lld/ELF/InputSection.h | 3 +- contrib/llvm-project/lld/ELF/LTO.cpp | 84 +- contrib/llvm-project/lld/ELF/LTO.h | 4 +- contrib/llvm-project/lld/ELF/LinkerScript.cpp | 8 +- contrib/llvm-project/lld/ELF/Relocations.cpp | 17 +- contrib/llvm-project/lld/ELF/ScriptLexer.h | 4 +- contrib/llvm-project/lld/ELF/ScriptParser.cpp | 3 +- contrib/llvm-project/lld/ELF/Symbols.cpp | 6 +- contrib/llvm-project/lld/ELF/Symbols.h | 32 +- contrib/llvm-project/lld/ELF/SyntheticSections.cpp | 4 +- contrib/llvm-project/lld/ELF/Target.cpp | 2 +- contrib/llvm-project/lld/ELF/Writer.cpp | 38 +- contrib/llvm-project/lld/MachO/Arch/ARM64.cpp | 51 +- contrib/llvm-project/lld/MachO/Arch/ARM64Common.h | 37 +- contrib/llvm-project/lld/MachO/Arch/ARM64_32.cpp | 11 +- contrib/llvm-project/lld/MachO/Arch/X86_64.cpp | 20 +- contrib/llvm-project/lld/MachO/Driver.cpp | 17 +- contrib/llvm-project/lld/MachO/DriverUtils.cpp | 2 +- .../llvm-project/lld/MachO/SyntheticSections.cpp | 42 +- contrib/llvm-project/lld/MachO/SyntheticSections.h | 2 +- contrib/llvm-project/lld/MachO/Target.h | 9 +- contrib/llvm-project/lld/docs/ReleaseNotes.rst | 4 + contrib/llvm-project/lld/tools/lld/lld.cpp | 2 - contrib/llvm-project/lldb/include/lldb/API/LLDB.h | 1 + .../lldb/include/lldb/Breakpoint/Breakpoint.h | 2 +- .../include/lldb/Breakpoint/BreakpointIDList.h | 17 +- .../lldb/include/lldb/Breakpoint/Watchpoint.h | 2 - .../llvm-project/lldb/include/lldb/Core/Address.h | 10 +- .../lldb/include/lldb/Core/DebuggerEvents.h | 7 +- .../llvm-project/lldb/include/lldb/Core/Progress.h | 16 +- .../lldb/include/lldb/Core/ValueObject.h | 3 +- .../lldb/include/lldb/Host/Config.h.cmake | 2 + .../lldb/include/lldb/Symbol/CompileUnit.h | 16 +- .../lldb/include/lldb/Symbol/LineEntry.h | 10 +- .../llvm-project/lldb/include/lldb/Symbol/Symbol.h | 6 +- .../lldb/include/lldb/Symbol/SymbolContext.h | 16 +- .../lldb/include/lldb/Target/Platform.h | 26 + .../lldb/include/lldb/Utility/Broadcaster.h | 6 +- .../lldb/include/lldb/Utility/FileSpec.h | 24 +- .../lldb/include/lldb/Utility/FileSpecList.h | 33 +- .../lldb/include/lldb/Utility/Stream.h | 18 +- .../lldb/include/lldb/Utility/SupportFile.h | 55 + .../lldb/include/lldb/Utility/XcodeSDK.h | 2 + .../lldb/include/lldb/lldb-enumerations.h | 1 + .../llvm-project/lldb/include/lldb/lldb-forward.h | 2 + .../llvm-project/lldb/source/API/SBTypeFilter.cpp | 2 +- .../llvm-project/lldb/source/API/SBTypeFormat.cpp | 2 +- .../llvm-project/lldb/source/API/SBTypeSummary.cpp | 2 +- .../lldb/source/API/SBTypeSynthetic.cpp | 2 +- .../lldb/source/Breakpoint/Breakpoint.cpp | 53 +- .../lldb/source/Breakpoint/BreakpointIDList.cpp | 66 +- .../lldb/source/Breakpoint/BreakpointList.cpp | 7 +- .../lldb/source/Breakpoint/BreakpointLocation.cpp | 6 +- .../lldb/source/Breakpoint/BreakpointResolver.cpp | 3 +- .../lldb/source/Breakpoint/Watchpoint.cpp | 22 +- .../lldb/source/Breakpoint/WatchpointList.cpp | 23 +- .../source/Commands/CommandObjectBreakpoint.cpp | 54 +- .../lldb/source/Commands/CommandObjectFrame.cpp | 1 + .../lldb/source/Commands/CommandObjectSource.cpp | 4 +- .../lldb/source/Commands/CommandObjectTarget.cpp | 38 +- contrib/llvm-project/lldb/source/Core/Address.cpp | 26 +- .../llvm-project/lldb/source/Core/Disassembler.cpp | 5 +- .../llvm-project/lldb/source/Core/FormatEntity.cpp | 38 +- contrib/llvm-project/lldb/source/Core/Module.cpp | 16 +- .../llvm-project/lldb/source/Core/ModuleList.cpp | 28 +- contrib/llvm-project/lldb/source/Core/Progress.cpp | 30 +- .../llvm-project/lldb/source/Core/ValueObject.cpp | 343 +- .../lldb/source/Expression/DiagnosticManager.cpp | 15 +- .../Instruction/ARM/EmulateInstructionARM.cpp | 1 + .../Language/CPlusPlus/CPlusPlusLanguage.cpp | 84 +- .../source/Plugins/Language/CPlusPlus/LibCxx.cpp | 94 +- .../source/Plugins/Language/CPlusPlus/LibCxx.h | 12 + .../ObjC/AppleObjCRuntime/AppleObjCRuntimeV2.cpp | 6 +- .../Plugins/ObjectFile/ELF/ObjectFileELF.cpp | 5 +- .../Utility/RegisterContextPOSIX_mips64.cpp | 23 +- .../gdb-remote/GDBRemoteCommunicationClient.cpp | 3 +- .../Process/gdb-remote/ProcessGDBRemote.cpp | 79 +- .../SymbolFile/Breakpad/SymbolFileBreakpad.cpp | 9 +- .../Plugins/SymbolFile/CTF/SymbolFileCTF.cpp | 1 + .../Plugins/SymbolFile/DWARF/DWARFDebugInfo.cpp | 6 + .../Plugins/SymbolFile/DWARF/DWARFDebugInfo.h | 5 + .../Plugins/SymbolFile/DWARF/DWARFFormValue.cpp | 24 +- .../Plugins/SymbolFile/DWARF/DWARFFormValue.h | 6 + .../source/Plugins/SymbolFile/DWARF/DWARFUnit.cpp | 24 + .../source/Plugins/SymbolFile/DWARF/DWARFUnit.h | 5 + .../Plugins/SymbolFile/DWARF/ManualDWARFIndex.cpp | 5 +- .../Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp | 16 +- .../SymbolFile/DWARF/SymbolFileDWARFDebugMap.cpp | 11 +- .../SymbolFile/NativePDB/SymbolFileNativePDB.cpp | 6 +- .../Debuginfod/SymbolLocatorDebuginfod.cpp | 83 +- .../SymbolLocatorDebuginfodProperties.td | 8 +- .../SymbolLocator/Default/SymbolLocatorDefault.cpp | 6 +- .../Plugins/TypeSystem/Clang/TypeSystemClang.cpp | 5 +- .../lldb/source/Symbol/CompileUnit.cpp | 11 +- .../llvm-project/lldb/source/Symbol/LineEntry.cpp | 23 +- .../llvm-project/lldb/source/Symbol/LineTable.cpp | 12 +- contrib/llvm-project/lldb/source/Symbol/Symbol.cpp | 17 +- .../lldb/source/Symbol/SymbolContext.cpp | 46 +- .../llvm-project/lldb/source/Target/Process.cpp | 10 +- contrib/llvm-project/lldb/source/Target/Target.cpp | 15 +- .../lldb/source/Target/TargetProperties.td | 2 +- contrib/llvm-project/lldb/source/Target/Thread.cpp | 15 +- .../llvm-project/lldb/source/Target/ThreadList.cpp | 10 +- .../lldb/source/Target/ThreadPlanStepOverRange.cpp | 12 +- .../lldb/source/Target/ThreadPlanStepRange.cpp | 4 +- .../lldb/source/Utility/Broadcaster.cpp | 5 +- .../llvm-project/lldb/source/Utility/FileSpec.cpp | 9 +- .../lldb/source/Utility/FileSpecList.cpp | 9 +- .../llvm-project/lldb/source/Utility/Stream.cpp | 17 +- .../llvm-project/lldb/source/Utility/XcodeSDK.cpp | 23 + contrib/llvm-project/lldb/tools/driver/Driver.cpp | 3 + .../lldb/tools/lldb-server/lldb-server.cpp | 4 +- .../llvm/include/llvm/ADT/APFixedPoint.h | 2 +- .../llvm/include/llvm/ADT/FunctionExtras.h | 7 +- .../llvm-project/llvm/include/llvm/ADT/Hashing.h | 4 +- .../llvm-project/llvm/include/llvm/ADT/SetVector.h | 2 +- .../llvm/include/llvm/ADT/SmallVector.h | 19 +- .../llvm/include/llvm/ADT/StringExtras.h | 2 +- .../llvm/include/llvm/Analysis/AliasAnalysis.h | 2 + .../llvm/include/llvm/Analysis/AliasSetTracker.h | 244 +- .../include/llvm/Analysis/BlockFrequencyInfoImpl.h | 5 +- .../include/llvm/Analysis/DOTGraphTraitsPass.h | 28 +- .../llvm/include/llvm/Analysis/RegionInfoImpl.h | 33 +- .../include/llvm/Analysis/TargetTransformInfo.h | 10 + .../llvm/Analysis/TargetTransformInfoImpl.h | 9 + .../llvm/include/llvm/Analysis/VecFuncs.def | 146 + .../llvm/include/llvm/Analysis/VectorUtils.h | 187 +- .../llvm/include/llvm/AsmParser/LLParser.h | 33 +- .../llvm/include/llvm/BinaryFormat/ELF.h | 2 + .../include/llvm/BinaryFormat/ELFRelocs/RISCV.def | 5 + .../llvm/include/llvm/BinaryFormat/MachO.def | 2 + .../llvm/include/llvm/BinaryFormat/Magic.h | 1 + .../llvm/include/llvm/BinaryFormat/Wasm.h | 396 +- .../llvm/include/llvm/BinaryFormat/WasmTraits.h | 5 +- .../llvm/include/llvm/Bitcode/BitcodeWriterPass.h | 10 +- .../llvm/include/llvm/CodeGen/AccelTable.h | 53 +- .../llvm/include/llvm/CodeGen/AsmPrinter.h | 4 - .../llvm/include/llvm/CodeGen/CodeGenPassBuilder.h | 210 +- .../llvm/include/llvm/CodeGen/CommandFlags.h | 3 + .../include/llvm/CodeGen/GlobalISel/CallLowering.h | 4 +- .../llvm/CodeGen/GlobalISel/GenericMachineInstrs.h | 19 +- .../include/llvm/CodeGen/GlobalISel/IRTranslator.h | 37 +- .../llvm/CodeGen/GlobalISel/LegalizerHelper.h | 16 - .../llvm/include/llvm/CodeGen/GlobalISel/Utils.h | 19 + .../llvm/include/llvm/CodeGen/GlobalMerge.h | 50 + .../llvm/include/llvm/CodeGen/MachineBasicBlock.h | 4 +- .../llvm/include/llvm/CodeGen/MachineOperand.h | 4 + .../llvm/include/llvm/CodeGen/MachineOutliner.h | 11 +- .../include/llvm/CodeGen/MachinePassRegistry.def | 3 +- .../llvm/include/llvm/CodeGen/MachinePipeliner.h | 18 +- .../llvm/include/llvm/CodeGen/MachineScheduler.h | 10 +- .../llvm/include/llvm/CodeGen/SelectionDAGISel.h | 8 + .../llvm/include/llvm/CodeGen/StackMaps.h | 21 +- .../llvm/include/llvm/CodeGen/TargetLowering.h | 28 +- .../llvm/include/llvm/CodeGen/TargetPassConfig.h | 24 +- .../include/llvm/CodeGen/TargetSubtargetInfo.h | 4 + .../llvm/include/llvm/DWARFLinker/AddressesMap.h | 24 +- .../include/llvm/DWARFLinker/Classic/DWARFLinker.h | 45 +- .../llvm/DWARFLinker/Classic/DWARFStreamer.h | 18 +- .../include/llvm/DWARFLinker/DWARFLinkerBase.h | 47 + .../llvm/DWARFLinker}/IndexedValuesMap.h | 11 +- .../llvm/DWARFLinker/Parallel/DWARFLinker.h | 59 +- .../llvm/include/llvm/DebugInfo/DIContext.h | 1 + .../include/llvm/DebugInfo/DWARF/DWARFContext.h | 8 +- .../llvm/include/llvm/Debuginfod/Debuginfod.h | 14 + .../include/llvm/ExecutionEngine/JITLink/aarch32.h | 162 +- .../llvm/ExecutionEngine/Orc/MachOBuilder.h | 83 +- .../llvm/ExecutionEngine/Orc/MachOPlatform.h | 46 +- .../llvm/ExecutionEngine/RuntimeDyldChecker.h | 2 +- .../llvm/Frontend/Offloading/OffloadWrapper.h | 52 + .../include/llvm/Frontend/Offloading/Utility.h | 6 + .../llvm-project/llvm/include/llvm/IR/Attributes.h | 2 +- .../llvm/include/llvm/IR/CallingConv.h | 10 + .../llvm-project/llvm/include/llvm/IR/DebugInfo.h | 26 +- .../llvm/include/llvm/IR/DebugInfoMetadata.h | 4 + .../llvm/include/llvm/IR/DebugProgramInstruction.h | 109 +- .../llvm-project/llvm/include/llvm/IR/Function.h | 3 +- .../llvm/include/llvm/IR/GlobalObject.h | 1 + .../llvm/include/llvm/IR/GlobalValue.h | 3 +- .../llvm-project/llvm/include/llvm/IR/IRBuilder.h | 10 + .../llvm/include/llvm/IR/Instruction.h | 3 + .../llvm/include/llvm/IR/Intrinsics.td | 10 + .../llvm/include/llvm/IR/IntrinsicsAArch64.td | 36 +- .../llvm/include/llvm/IR/IntrinsicsAMDGPU.td | 335 +- .../llvm/include/llvm/IR/IntrinsicsLoongArch.td | 13 + .../llvm/include/llvm/IR/IntrinsicsNVVM.td | 85 +- .../llvm/include/llvm/IR/IntrinsicsPowerPC.td | 5 + .../llvm/include/llvm/IR/IntrinsicsRISCV.td | 29 +- .../llvm-project/llvm/include/llvm/IR/Metadata.h | 87 +- .../llvm/include/llvm/IR/ModuleSummaryIndex.h | 2 +- .../llvm/include/llvm/IR/ProfileSummary.h | 8 +- .../llvm/include/llvm/IR/VFABIDemangler.h | 217 + .../llvm/include/llvm/IR/VPIntrinsics.def | 18 +- contrib/llvm-project/llvm/include/llvm/IR/Value.h | 15 +- .../llvm/include/llvm/MC/MCObjectWriter.h | 3 + .../llvm-project/llvm/include/llvm/MC/MCSymbol.h | 2 +- .../llvm/include/llvm/MC/MCSymbolWasm.h | 4 +- .../llvm/include/llvm/Object/COFFImportFile.h | 2 + .../llvm/include/llvm/Object/ELFObjectFile.h | 11 +- .../llvm-project/llvm/include/llvm/Object/MachO.h | 2 +- .../llvm/include/llvm/Object/OffloadBinary.h | 25 + .../llvm/include/llvm/Passes/PassBuilder.h | 132 +- .../llvm/ProfileData/Coverage/CoverageMapping.h | 18 +- .../llvm/include/llvm/ProfileData/SampleProf.h | 2 + .../llvm/include/llvm/Support/AMDGPUMetadata.h | 10 +- .../llvm/include/llvm/Support/FormatCommon.h | 4 +- .../llvm/include/llvm/Support/GenericDomTree.h | 7 +- .../llvm/include/llvm/Support/GenericLoopInfo.h | 18 +- .../include/llvm/Support/GenericLoopInfoImpl.h | 29 +- .../llvm-project/llvm/include/llvm/Support/JSON.h | 15 +- .../llvm/include/llvm/Support/MathExtras.h | 4 +- .../llvm/include/llvm/Support/RISCVAttributes.h | 2 +- .../llvm/include/llvm/Support/TargetOpcodes.def | 11 +- .../include/llvm/TableGen/StringToOffsetTable.h | 2 +- .../llvm/include/llvm/Target/CGPassBuilderOption.h | 2 +- .../llvm/include/llvm/Target/Target.td | 92 +- .../llvm/include/llvm/Target/TargetMachine.h | 3 + .../llvm/include/llvm/Target/TargetOptions.h | 17 +- .../llvm/include/llvm/Target/TargetPfmCounters.td | 7 + .../llvm/include/llvm/Target/TargetSchedule.td | 37 +- .../llvm/TargetParser/AArch64TargetParser.h | 135 +- .../include/llvm/TargetParser/ARMTargetParser.def | 5 + .../llvm/include/llvm/TargetParser/Triple.h | 25 +- .../include/llvm/TargetParser/X86TargetParser.def | 5 +- .../include/llvm/Transforms/IPO/EmbedBitcodePass.h | 16 +- .../llvm/Transforms/Instrumentation/CGProfile.h | 4 + .../llvm/Transforms/Scalar/ConstantHoisting.h | 1 + .../include/llvm/Transforms/Utils/ModuleUtils.h | 6 - .../llvm/Transforms/Utils/NameAnonGlobals.h | 2 + .../llvm/lib/Analysis/AliasAnalysis.cpp | 5 + .../llvm/lib/Analysis/AliasSetTracker.cpp | 338 +- .../llvm/lib/Analysis/BasicAliasAnalysis.cpp | 25 +- .../llvm-project/llvm/lib/Analysis/InlineOrder.cpp | 2 +- .../llvm/lib/Analysis/LoopAccessAnalysis.cpp | 23 +- .../llvm/lib/Analysis/ScalarEvolution.cpp | 4 + .../llvm/lib/Analysis/StackSafetyAnalysis.cpp | 2 +- .../llvm/lib/Analysis/TargetLibraryInfo.cpp | 9 +- .../llvm/lib/Analysis/TargetTransformInfo.cpp | 5 + .../llvm/lib/Analysis/ValueTracking.cpp | 24 +- .../llvm-project/llvm/lib/Analysis/VectorUtils.cpp | 93 +- .../llvm-project/llvm/lib/AsmParser/LLParser.cpp | 235 +- .../llvm-project/llvm/lib/BinaryFormat/Magic.cpp | 2 + .../llvm/lib/Bitcode/Reader/MetadataLoader.cpp | 37 +- .../llvm/lib/Bitcode/Writer/BitcodeWriterPass.cpp | 24 +- .../llvm/lib/Bitcode/Writer/ValueEnumerator.cpp | 4 +- .../llvm/lib/CodeGen/AsmPrinter/AccelTable.cpp | 127 +- .../llvm/lib/CodeGen/AsmPrinter/AsmPrinter.cpp | 84 +- .../llvm/lib/CodeGen/AsmPrinter/DwarfDebug.cpp | 12 +- .../lib/CodeGen/AssignmentTrackingAnalysis.cpp | 802 +- .../llvm/lib/CodeGen/BasicBlockSections.cpp | 10 +- .../CodeGen/BasicBlockSectionsProfileReader.cpp | 7 - .../llvm/lib/CodeGen/BranchFolding.cpp | 2 +- .../llvm/lib/CodeGen/CodeGenPrepare.cpp | 23 +- .../llvm-project/llvm/lib/CodeGen/CommandFlags.cpp | 8 + .../llvm/lib/CodeGen/ExpandVectorPredication.cpp | 2 + .../llvm/lib/CodeGen/GlobalISel/CallLowering.cpp | 42 +- .../llvm/lib/CodeGen/GlobalISel/CombinerHelper.cpp | 30 +- .../llvm/lib/CodeGen/GlobalISel/IRTranslator.cpp | 214 +- .../lib/CodeGen/GlobalISel/InstructionSelect.cpp | 11 + .../lib/CodeGen/GlobalISel/LegalizerHelper.cpp | 168 +- .../llvm/lib/CodeGen/GlobalISel/Utils.cpp | 147 + .../llvm-project/llvm/lib/CodeGen/GlobalMerge.cpp | 167 +- .../CodeGen/LiveDebugValues/InstrRefBasedImpl.h | 4 +- .../llvm/lib/CodeGen/MachineCopyPropagation.cpp | 2 +- .../llvm/lib/CodeGen/MachineOperand.cpp | 13 + .../llvm/lib/CodeGen/MachineOutliner.cpp | 27 +- .../llvm/lib/CodeGen/MachinePipeliner.cpp | 482 +- .../llvm/lib/CodeGen/MachineScheduler.cpp | 37 +- .../llvm/lib/CodeGen/PatchableFunction.cpp | 52 +- .../llvm/lib/CodeGen/PreISelIntrinsicLowering.cpp | 5 +- contrib/llvm-project/llvm/lib/CodeGen/RDFGraph.cpp | 2 +- .../llvm/lib/CodeGen/ReplaceWithVeclib.cpp | 31 +- .../llvm-project/llvm/lib/CodeGen/SafeStack.cpp | 22 +- .../llvm/lib/CodeGen/SelectOptimize.cpp | 408 +- .../llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp | 10 + .../llvm/lib/CodeGen/SelectionDAG/FastISel.cpp | 5 +- .../llvm/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp | 3 +- .../CodeGen/SelectionDAG/LegalizeFloatTypes.cpp | 9 +- .../CodeGen/SelectionDAG/LegalizeVectorTypes.cpp | 4 + .../llvm/lib/CodeGen/SelectionDAG/SelectionDAG.cpp | 24 +- .../CodeGen/SelectionDAG/SelectionDAGBuilder.cpp | 87 +- .../lib/CodeGen/SelectionDAG/SelectionDAGBuilder.h | 4 +- .../lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp | 30 +- .../lib/CodeGen/SelectionDAG/TargetLowering.cpp | 8 +- .../llvm-project/llvm/lib/CodeGen/SlotIndexes.cpp | 2 +- .../llvm-project/llvm/lib/CodeGen/StackMaps.cpp | 42 +- .../llvm/lib/CodeGen/TargetLoweringBase.cpp | 4 +- .../llvm/lib/CodeGen/TargetPassConfig.cpp | 116 +- .../llvm/lib/CodeGen/TwoAddressInstructionPass.cpp | 13 +- .../llvm/lib/CodeGen/UnreachableBlockElim.cpp | 2 +- .../llvm/lib/DWARFLinker/Classic/DWARFLinker.cpp | 66 +- .../llvm/lib/DWARFLinker/Classic/DWARFStreamer.cpp | 90 +- .../llvm/lib/DWARFLinker/DWARFLinkerBase.cpp | 64 + .../lib/DWARFLinker/Parallel/DWARFEmitterImpl.cpp | 66 - .../lib/DWARFLinker/Parallel/DWARFEmitterImpl.h | 23 +- .../Parallel/DWARFLinkerCompileUnit.cpp | 20 +- .../DWARFLinker/Parallel/DWARFLinkerCompileUnit.h | 7 +- .../DWARFLinker/Parallel/DWARFLinkerGlobalData.h | 29 +- .../lib/DWARFLinker/Parallel/DWARFLinkerImpl.cpp | 98 +- .../lib/DWARFLinker/Parallel/DWARFLinkerImpl.h | 23 +- .../DWARFLinker/Parallel/DWARFLinkerTypeUnit.cpp | 12 +- .../lib/DWARFLinker/Parallel/DWARFLinkerTypeUnit.h | 2 +- .../lib/DWARFLinker/Parallel/DWARFLinkerUnit.h | 2 +- .../lib/DWARFLinker/Parallel/DependencyTracker.cpp | 4 +- .../lib/DWARFLinker/Parallel/OutputSections.cpp | 53 - .../llvm/lib/DWARFLinker/Parallel/OutputSections.h | 124 +- .../llvm/lib/DebugInfo/DWARF/DWARFCompileUnit.cpp | 10 +- .../llvm/lib/DebugInfo/DWARF/DWARFContext.cpp | 45 +- .../llvm/lib/DebugInfo/DWARF/DWARFDebugLine.cpp | 2 +- .../llvm/lib/DebugInfo/DWARF/DWARFTypePrinter.cpp | 3 +- .../llvm/lib/DebugInfo/DWARF/DWARFVerifier.cpp | 16 +- .../LogicalView/Readers/LVCodeViewReader.cpp | 4 +- .../llvm/lib/DebugInfo/Symbolize/MarkupFilter.cpp | 9 +- .../DebugInfo/Symbolize/SymbolizableObjectFile.cpp | 4 +- .../llvm/lib/DebugInfo/Symbolize/Symbolize.cpp | 8 +- .../llvm/lib/Debuginfod/Debuginfod.cpp | 36 +- .../llvm/lib/ExecutionEngine/ExecutionEngine.cpp | 4 +- .../ExecutionEngine/JITLink/ELFLinkGraphBuilder.h | 6 + .../lib/ExecutionEngine/JITLink/ELF_aarch32.cpp | 66 +- .../llvm/lib/ExecutionEngine/JITLink/aarch32.cpp | 286 +- .../llvm/lib/ExecutionEngine/Orc/LLJIT.cpp | 6 + .../llvm/lib/ExecutionEngine/Orc/MachOPlatform.cpp | 60 +- .../Orc/TargetProcess/JITLoaderPerf.cpp | 2 +- .../RuntimeDyld/RuntimeDyldChecker.cpp | 27 +- .../RuntimeDyld/RuntimeDyldCheckerImpl.h | 3 +- .../llvm-project/llvm/lib/FileCheck/FileCheck.cpp | 61 +- .../llvm/lib/FileCheck/FileCheckImpl.h | 20 +- .../lib/Frontend/Offloading/OffloadWrapper.cpp | 620 + .../llvm/lib/Frontend/Offloading/Utility.cpp | 21 +- .../llvm/lib/Frontend/OpenMP/OMPIRBuilder.cpp | 7 +- contrib/llvm-project/llvm/lib/IR/AsmWriter.cpp | 28 +- contrib/llvm-project/llvm/lib/IR/AutoUpgrade.cpp | 305 +- contrib/llvm-project/llvm/lib/IR/BasicBlock.cpp | 19 +- contrib/llvm-project/llvm/lib/IR/ConstantFold.cpp | 49 +- contrib/llvm-project/llvm/lib/IR/DebugInfo.cpp | 258 +- .../llvm/lib/IR/DebugProgramInstruction.cpp | 190 +- contrib/llvm-project/llvm/lib/IR/Dominators.cpp | 5 +- contrib/llvm-project/llvm/lib/IR/Globals.cpp | 3 +- contrib/llvm-project/llvm/lib/IR/Instruction.cpp | 6 +- contrib/llvm-project/llvm/lib/IR/Instructions.cpp | 4 +- contrib/llvm-project/llvm/lib/IR/Metadata.cpp | 103 +- .../llvm-project/llvm/lib/IR/StructuralHash.cpp | 9 +- .../VFABIDemangling.cpp => IR/VFABIDemangler.cpp} | 133 +- contrib/llvm-project/llvm/lib/IR/Value.cpp | 6 +- contrib/llvm-project/llvm/lib/IR/Verifier.cpp | 28 + .../llvm/lib/InterfaceStub/IFSHandler.cpp | 6 + .../llvm/lib/InterfaceStub/IFSStub.cpp | 3 +- contrib/llvm-project/llvm/lib/LTO/LTO.cpp | 2 +- .../llvm/lib/LTO/ThinLTOCodeGenerator.cpp | 6 +- .../llvm/lib/LineEditor/LineEditor.cpp | 2 +- .../llvm-project/llvm/lib/MC/ELFObjectWriter.cpp | 11 +- contrib/llvm-project/llvm/lib/MC/MCFragment.cpp | 2 +- .../llvm-project/llvm/lib/MC/MCObjectFileInfo.cpp | 4 + .../llvm/lib/MC/MCParser/DarwinAsmParser.cpp | 2 + contrib/llvm-project/llvm/lib/MC/MCStreamer.cpp | 9 + .../llvm-project/llvm/lib/MC/WasmObjectWriter.cpp | 2 +- .../llvm-project/llvm/lib/ObjCopy/CommonConfig.cpp | 6 +- contrib/llvm-project/llvm/lib/Object/Archive.cpp | 2 +- .../llvm-project/llvm/lib/Object/ArchiveWriter.cpp | 2 +- contrib/llvm-project/llvm/lib/Object/Binary.cpp | 1 + .../llvm/lib/Object/COFFImportFile.cpp | 80 +- .../llvm-project/llvm/lib/Object/ELFObjectFile.cpp | 4 + .../llvm-project/llvm/lib/Object/ObjectFile.cpp | 1 + .../llvm-project/llvm/lib/Object/OffloadBinary.cpp | 32 + .../llvm/lib/Object/RelocationResolver.cpp | 12 +- .../llvm/lib/Object/WasmObjectFile.cpp | 23 +- .../llvm-project/llvm/lib/Passes/PassBuilder.cpp | 237 +- .../llvm/lib/Passes/PassBuilderPipelines.cpp | 20 +- .../llvm-project/llvm/lib/Passes/PassRegistry.def | 17 +- .../llvm/lib/Passes/StandardInstrumentations.cpp | 4 +- .../lib/ProfileData/Coverage/CoverageMapping.cpp | 52 +- contrib/llvm-project/llvm/lib/ProfileData/GCOV.cpp | 2 +- .../llvm/lib/ProfileData/InstrProf.cpp | 8 +- .../llvm/lib/Remarks/YAMLRemarkParser.cpp | 14 +- .../llvm/lib/Support/BalancedPartitioning.cpp | 16 +- contrib/llvm-project/llvm/lib/Support/Caching.cpp | 4 +- .../llvm-project/llvm/lib/Support/CommandLine.cpp | 37 +- .../llvm/lib/Support/FileCollector.cpp | 2 +- .../llvm/lib/Support/FormatVariadic.cpp | 3 +- .../llvm-project/llvm/lib/Support/GraphWriter.cpp | 2 +- contrib/llvm-project/llvm/lib/Support/InitLLVM.cpp | 5 + .../llvm/lib/Support/LockFileManager.cpp | 8 +- contrib/llvm-project/llvm/lib/Support/Path.cpp | 4 +- contrib/llvm-project/llvm/lib/Support/Process.cpp | 2 +- .../llvm-project/llvm/lib/Support/RISCVISAInfo.cpp | 22 +- .../llvm-project/llvm/lib/Support/SmallVector.cpp | 3 +- .../llvm-project/llvm/lib/Support/StringRef.cpp | 15 +- contrib/llvm-project/llvm/lib/Support/Unicode.cpp | 342 +- .../llvm/lib/Support/UnicodeCaseFold.cpp | 13 +- .../llvm/lib/Support/UnicodeNameToCodepoint.cpp | 3 +- .../Support/UnicodeNameToCodepointGenerated.cpp | 39628 ++++++++++--------- .../llvm-project/llvm/lib/Support/Unix/Program.inc | 2 +- .../llvm-project/llvm/lib/Support/VersionTuple.cpp | 6 +- .../llvm/lib/Support/VirtualFileSystem.cpp | 12 +- .../llvm-project/llvm/lib/Support/Windows/Path.inc | 41 +- .../llvm-project/llvm/lib/Target/AArch64/AArch64.h | 2 + .../llvm/lib/Target/AArch64/AArch64.td | 3 +- .../Target/AArch64/AArch64Arm64ECCallLowering.cpp | 769 + .../llvm/lib/Target/AArch64/AArch64AsmPrinter.cpp | 77 + .../lib/Target/AArch64/AArch64CallingConvention.h | 16 + .../lib/Target/AArch64/AArch64CallingConvention.td | 128 + .../llvm/lib/Target/AArch64/AArch64Combine.td | 11 +- .../Target/AArch64/AArch64ExpandPseudoInsts.cpp | 18 +- .../llvm/lib/Target/AArch64/AArch64FastISel.cpp | 3 + .../lib/Target/AArch64/AArch64FrameLowering.cpp | 26 + .../lib/Target/AArch64/AArch64GlobalsTagging.cpp | 26 +- .../lib/Target/AArch64/AArch64ISelDAGToDAG.cpp | 62 +- .../lib/Target/AArch64/AArch64ISelLowering.cpp | 524 +- .../llvm/lib/Target/AArch64/AArch64ISelLowering.h | 16 +- .../llvm/lib/Target/AArch64/AArch64InstrGISel.td | 30 + .../llvm/lib/Target/AArch64/AArch64InstrInfo.cpp | 68 +- .../llvm/lib/Target/AArch64/AArch64InstrInfo.td | 131 +- .../Target/AArch64/AArch64LoopIdiomTransform.cpp | 11 +- .../llvm/lib/Target/AArch64/AArch64MCInstLower.cpp | 55 +- .../llvm/lib/Target/AArch64/AArch64MCInstLower.h | 3 + .../Target/AArch64/AArch64MachineFunctionInfo.h | 7 + .../lib/Target/AArch64/AArch64RegisterInfo.cpp | 3 + .../llvm/lib/Target/AArch64/AArch64SMEInstrInfo.td | 10 +- .../llvm/lib/Target/AArch64/AArch64SVEInstrInfo.td | 4 +- .../llvm/lib/Target/AArch64/AArch64Subtarget.cpp | 19 +- .../llvm/lib/Target/AArch64/AArch64Subtarget.h | 5 +- .../lib/Target/AArch64/AArch64SystemOperands.td | 2 + .../lib/Target/AArch64/AArch64TargetMachine.cpp | 8 +- .../lib/Target/AArch64/AArch64TargetObjectFile.cpp | 10 + .../lib/Target/AArch64/AArch64TargetObjectFile.h | 7 + .../Target/AArch64/AArch64TargetTransformInfo.cpp | 69 +- .../Target/AArch64/AArch64TargetTransformInfo.h | 2 + .../Target/AArch64/AsmParser/AArch64AsmParser.cpp | 24 +- .../Target/AArch64/GISel/AArch64CallLowering.cpp | 24 +- .../AArch64/GISel/AArch64InstructionSelector.cpp | 9 +- .../Target/AArch64/GISel/AArch64LegalizerInfo.cpp | 66 +- .../AArch64/GISel/AArch64PreLegalizerCombiner.cpp | 222 +- .../llvm/lib/Target/AArch64/SMEABIPass.cpp | 132 +- .../lib/Target/AArch64/Utils/AArch64BaseInfo.h | 39 +- .../Target/AArch64/Utils/AArch64SMEAttributes.cpp | 53 +- .../Target/AArch64/Utils/AArch64SMEAttributes.h | 78 +- .../llvm-project/llvm/lib/Target/AMDGPU/AMDGPU.h | 3 + .../llvm-project/llvm/lib/Target/AMDGPU/AMDGPU.td | 54 +- .../llvm/lib/Target/AMDGPU/AMDGPUAsmPrinter.cpp | 26 +- .../llvm/lib/Target/AMDGPU/AMDGPUAttributor.cpp | 2 +- .../llvm/lib/Target/AMDGPU/AMDGPUCallLowering.cpp | 17 +- .../llvm/lib/Target/AMDGPU/AMDGPUGISel.td | 16 +- .../Target/AMDGPU/AMDGPUHSAMetadataStreamer.cpp | 3 +- .../llvm/lib/Target/AMDGPU/AMDGPUISelDAGToDAG.cpp | 21 +- .../llvm/lib/Target/AMDGPU/AMDGPUISelDAGToDAG.h | 2 +- .../llvm/lib/Target/AMDGPU/AMDGPUISelLowering.cpp | 35 + .../llvm/lib/Target/AMDGPU/AMDGPUISelLowering.h | 8 + .../Target/AMDGPU/AMDGPUInstCombineIntrinsic.cpp | 38 +- .../Target/AMDGPU/AMDGPUInstructionSelector.cpp | 28 +- .../lib/Target/AMDGPU/AMDGPUInstructionSelector.h | 6 +- .../llvm/lib/Target/AMDGPU/AMDGPUInstructions.td | 3 + .../lib/Target/AMDGPU/AMDGPULateCodeGenPrepare.cpp | 10 + .../llvm/lib/Target/AMDGPU/AMDGPULegalizerInfo.cpp | 63 +- .../Target/AMDGPU/AMDGPULowerKernelArguments.cpp | 3 +- .../Target/AMDGPU/AMDGPULowerKernelAttributes.cpp | 5 +- .../Target/AMDGPU/AMDGPUMachineCFGStructurizer.cpp | 2 +- .../Target/AMDGPU/AMDGPUMarkLastScratchLoad.cpp | 142 + .../Target/AMDGPU/AMDGPUPostLegalizerCombiner.cpp | 6 + .../lib/Target/AMDGPU/AMDGPURegisterBankInfo.cpp | 42 +- .../AMDGPU/AMDGPURemoveIncompatibleFunctions.cpp | 3 +- .../Target/AMDGPU/AMDGPUResourceUsageAnalysis.cpp | 2 +- .../lib/Target/AMDGPU/AMDGPUSearchableTables.td | 10 + .../llvm/lib/Target/AMDGPU/AMDGPUSubtarget.cpp | 2 +- .../llvm/lib/Target/AMDGPU/AMDGPUTargetMachine.cpp | 3 + .../Target/AMDGPU/AsmParser/AMDGPUAsmParser.cpp | 144 +- .../llvm/lib/Target/AMDGPU/BUFInstructions.td | 96 +- .../llvm/lib/Target/AMDGPU/DSInstructions.td | 41 +- .../AMDGPU/Disassembler/AMDGPUDisassembler.cpp | 7 +- .../llvm/lib/Target/AMDGPU/FLATInstructions.td | 189 +- .../llvm/lib/Target/AMDGPU/GCNDPPCombine.cpp | 28 +- .../llvm/lib/Target/AMDGPU/GCNHazardRecognizer.cpp | 31 +- .../llvm/lib/Target/AMDGPU/GCNNSAReassign.cpp | 2 +- .../llvm/lib/Target/AMDGPU/GCNSubtarget.h | 49 +- .../AMDGPU/MCTargetDesc/AMDGPUAsmBackend.cpp | 14 +- .../AMDGPU/MCTargetDesc/AMDGPUELFObjectWriter.cpp | 19 +- .../AMDGPU/MCTargetDesc/AMDGPUInstPrinter.cpp | 17 +- .../AMDGPU/MCTargetDesc/AMDGPUMCCodeEmitter.cpp | 43 +- .../AMDGPU/MCTargetDesc/AMDGPUMCTargetDesc.h | 4 +- .../AMDGPU/MCTargetDesc/AMDGPUTargetStreamer.cpp | 134 +- .../AMDGPU/MCTargetDesc/AMDGPUTargetStreamer.h | 59 +- .../llvm/lib/Target/AMDGPU/MIMGInstructions.td | 5 + .../llvm/lib/Target/AMDGPU/R600ISelLowering.cpp | 13 +- .../lib/Target/AMDGPU/SIAnnotateControlFlow.cpp | 7 +- .../llvm/lib/Target/AMDGPU/SIDefines.h | 10 +- .../llvm/lib/Target/AMDGPU/SIFoldOperands.cpp | 14 +- .../llvm/lib/Target/AMDGPU/SIFrameLowering.cpp | 7 +- .../llvm/lib/Target/AMDGPU/SIISelLowering.cpp | 262 +- .../llvm/lib/Target/AMDGPU/SIISelLowering.h | 3 +- .../llvm/lib/Target/AMDGPU/SIInsertWaitcnts.cpp | 1095 +- .../llvm/lib/Target/AMDGPU/SIInstrInfo.cpp | 44 +- .../llvm/lib/Target/AMDGPU/SIInstrInfo.h | 41 +- .../llvm/lib/Target/AMDGPU/SIInstrInfo.td | 291 +- .../llvm/lib/Target/AMDGPU/SIInstructions.td | 24 +- .../llvm/lib/Target/AMDGPU/SILowerSGPRSpills.cpp | 12 +- .../lib/Target/AMDGPU/SIMachineFunctionInfo.cpp | 54 +- .../llvm/lib/Target/AMDGPU/SIMachineFunctionInfo.h | 25 +- .../llvm/lib/Target/AMDGPU/SIMemoryLegalizer.cpp | 180 + .../llvm/lib/Target/AMDGPU/SIModeRegister.cpp | 2 +- .../llvm/lib/Target/AMDGPU/SIRegisterInfo.cpp | 9 +- .../llvm/lib/Target/AMDGPU/SMInstructions.td | 77 +- .../llvm/lib/Target/AMDGPU/SOPInstructions.td | 47 +- .../lib/Target/AMDGPU/Utils/AMDGPUBaseInfo.cpp | 233 +- .../llvm/lib/Target/AMDGPU/Utils/AMDGPUBaseInfo.h | 154 +- .../llvm/lib/Target/AMDGPU/VOP1Instructions.td | 8 +- .../llvm/lib/Target/AMDGPU/VOP2Instructions.td | 45 +- .../llvm/lib/Target/AMDGPU/VOP3Instructions.td | 4 +- .../llvm/lib/Target/AMDGPU/VOP3PInstructions.td | 83 +- .../llvm/lib/Target/AMDGPU/VOPCInstructions.td | 44 +- .../llvm/lib/Target/AMDGPU/VOPInstructions.td | 19 +- contrib/llvm-project/llvm/lib/Target/ARM/ARM.td | 18 + .../llvm/lib/Target/ARM/ARMBaseInstrInfo.cpp | 19 +- .../llvm/lib/Target/ARM/ARMCallLowering.cpp | 6 +- .../llvm/lib/Target/ARM/ARMISelLowering.cpp | 11 +- .../llvm/lib/Target/ARM/ARMInstrMVE.td | 2 +- .../llvm/lib/Target/ARM/ARMSubtarget.h | 1 + .../llvm/lib/Target/ARM/AsmParser/ARMAsmParser.cpp | 14 +- .../lib/Target/ARM/MCTargetDesc/ARMAsmBackend.cpp | 20 +- .../lib/Target/ARM/MCTargetDesc/ARMELFStreamer.cpp | 1 + .../lib/Target/ARM/MCTargetDesc/ARMFixupKinds.h | 2 +- .../lib/Target/ARM/MVEGatherScatterLowering.cpp | 4 +- .../llvm/lib/Target/ARM/Thumb1InstrInfo.cpp | 4 +- .../llvm/lib/Target/ARM/Thumb2InstrInfo.cpp | 6 +- .../Hexagon/Disassembler/HexagonDisassembler.cpp | 2 + .../llvm/lib/Target/Hexagon/HexagonEarlyIfConv.cpp | 4 +- .../lib/Target/Hexagon/HexagonISelDAGToDAG.cpp | 3 +- .../lib/Target/Hexagon/HexagonISelDAGToDAGHVX.cpp | 3 +- .../lib/Target/Hexagon/HexagonVectorCombine.cpp | 3 +- .../Hexagon/MCTargetDesc/HexagonMCInstrInfo.cpp | 6 +- .../llvm/lib/Target/LoongArch/LoongArch.td | 12 + .../Target/LoongArch/LoongArchFloat32InstrInfo.td | 8 + .../Target/LoongArch/LoongArchFloat64InstrInfo.td | 8 + .../lib/Target/LoongArch/LoongArchISelLowering.cpp | 8 + .../lib/Target/LoongArch/LoongArchInstrInfo.td | 34 +- .../lib/Target/LoongArch/LoongArchLASXInstrInfo.td | 58 + .../lib/Target/LoongArch/LoongArchLSXInstrInfo.td | 30 + .../llvm/lib/Target/LoongArch/LoongArchSubtarget.h | 4 + .../LoongArch/LoongArchTargetTransformInfo.cpp | 18 + .../LoongArch/LoongArchTargetTransformInfo.h | 2 + .../LoongArch/MCTargetDesc/LoongArchAsmBackend.cpp | 196 + .../LoongArch/MCTargetDesc/LoongArchAsmBackend.h | 20 + .../LoongArch/MCTargetDesc/LoongArchFixupKinds.h | 2 + .../llvm/lib/Target/Mips/MipsAsmPrinter.cpp | 5 +- .../llvm/lib/Target/Mips/MipsCallLowering.cpp | 2 +- .../llvm/lib/Target/Mips/MipsRegisterBankInfo.cpp | 8 +- .../llvm/lib/Target/NVPTX/NVPTXISelDAGToDAG.cpp | 24 + .../llvm/lib/Target/NVPTX/NVPTXISelLowering.cpp | 50 +- .../llvm/lib/Target/NVPTX/NVPTXISelLowering.h | 10 +- *** 8637 LINES SKIPPED *** From nobody Sat Apr 6 20:18:25 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VBmrd4qnQz5HGqQ; Sat, 6 Apr 2024 20:18:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VBmrd2CHkz4LFv; Sat, 6 Apr 2024 20:18:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712434705; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1EKPu8EnHI2DHEtAOFFi1pIRJ41b/v7W0wgZc2Fkpnc=; b=x7RNbwVhAYfkebzVNi2+v8/7QsLbgEsfrX38fxKArsVvIBaUZ2O3tTjzP2FEq6jATjrRhJ Ffu+zJv74ZFV2lXEGZJ/16oYBAu3Ro/m9MlhGQivOej0mAyOXnbG4qR5trDypXXrsH+a1N 6mBFH4CrUTVby/Lt+d+LCxQYLaAEOLUiApfAhxa9QscIR6QotzoWZ6YAAatSmv2MBu4/Ay 4mSwziYWgL8HOb4YXdsLcEtT6Lt3Y5Wn9Q/jf30WjutIQf9JlNoG9WhX6PRCkXXxILzV6s oe61GKSymCLNh6mZZ0l8oe/g1vvH2kNqn9SYDQDLw6PIkU+PXGYz+2j5Dan5gw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712434705; a=rsa-sha256; cv=none; b=cBl/yP8PdIoIZzasU7AqircJuTRyqnGJZ5Nf+6SXX+XGPNJ+Om5JwLUzZUbkA9+5pEG7qP bfyGPanUT3w7aEFFyMNanyG40bdI6THNiCK+j7kr1PruaJ80MduQHetlJB7gwHqu/CT8Lg FVQLXXl3Dsr5v2Xux+pmI2yvnrz+Ct9D1/oSSF/VDdNXojYCk4/auvm3Pg5CCeYOOY4FZK 2wIiAX7pJOkKk/R5Is26pDn7rcG+/fg9HdRl4BYx82wQVPxaKNf+KlksZJ2wpLhKUP7qfA 6inUmqkVn62tyVlpQTiHDc1aQx3ezHjW2MpNj2PetT8eNuNARxtAvgJ5mS420A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712434705; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1EKPu8EnHI2DHEtAOFFi1pIRJ41b/v7W0wgZc2Fkpnc=; b=I9Yrpt9YNmYxhEs66th4sEzoAM1UvQNOphyyk/AGg+CLMAa5iYHuz6Rs8IvYZ086v+aNK5 QCWqZYtiUvMzVuDHpVUepw3HbtCvTS/OJOFyhlOKzuut72VkpA8tD00klUhctSvxMrnG44 zvqQ2+uClO/9wdRjtB0h2yXILA7ysISGX9oeEbztBkwg5hx71Nc/OIWVSka0S3AQWp3TGB OCRMV1n1m9rlae1fj4dyLF2bhgXuk1SMfkxllD9pWH9DK50UllU4wtPeM97k2n8VNVb/Bm lsadQ3NFgwm6pi4GC5M3kpZAZ+XVIddo84plks/IPq2iUfREqP8s+hrBKHPBgA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VBmrd1qS8zxgF; Sat, 6 Apr 2024 20:18: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 436KIPIJ029857; Sat, 6 Apr 2024 20:18:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 436KIPT8029854; Sat, 6 Apr 2024 20:18:25 GMT (envelope-from git) Date: Sat, 6 Apr 2024 20:18:25 GMT Message-Id: <202404062018.436KIPT8029854@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dimitry Andric Subject: git: 3fb2e045791e - main - Tentatively apply https://github.com/libcxxrt/libcxxrt/pull/27 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3fb2e045791eb6f003205902cdc4f74702770ec6 Auto-Submitted: auto-generated The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=3fb2e045791eb6f003205902cdc4f74702770ec6 commit 3fb2e045791eb6f003205902cdc4f74702770ec6 Author: Dimitry Andric AuthorDate: 2024-01-26 15:03:20 +0000 Commit: Dimitry Andric CommitDate: 2024-04-06 20:13:54 +0000 Tentatively apply https://github.com/libcxxrt/libcxxrt/pull/27 This marks __cxa_allocate_exception, __cxa_free_exception and __cxa_init_primary_exception noexcept, to ensure compatibility with libc++'s declarations. PR: 276104 MFC after: 1 month --- contrib/libcxxrt/cxxabi.h | 6 +++--- contrib/libcxxrt/exception.cc | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/contrib/libcxxrt/cxxabi.h b/contrib/libcxxrt/cxxabi.h index e021f85c905a..ef4076a08a0a 100644 --- a/contrib/libcxxrt/cxxabi.h +++ b/contrib/libcxxrt/cxxabi.h @@ -204,12 +204,12 @@ __cxa_eh_globals *__cxa_get_globals_fast(void); std::type_info * __cxa_current_exception_type(); -void *__cxa_allocate_exception(size_t thrown_size); +void *__cxa_allocate_exception(size_t thrown_size) throw(); -void __cxa_free_exception(void* thrown_exception); +void __cxa_free_exception(void* thrown_exception) throw(); __cxa_exception *__cxa_init_primary_exception( - void *object, std::type_info* tinfo, void (*dest)(void *)); + void *object, std::type_info* tinfo, void (*dest)(void *)) throw(); /** * Throws an exception returned by __cxa_current_primary_exception(). This diff --git a/contrib/libcxxrt/exception.cc b/contrib/libcxxrt/exception.cc index b1659c902f56..35ff997dd445 100644 --- a/contrib/libcxxrt/exception.cc +++ b/contrib/libcxxrt/exception.cc @@ -121,7 +121,7 @@ static inline _Unwind_Reason_Code continueUnwinding(struct _Unwind_Exception *ex } -extern "C" void __cxa_free_exception(void *thrown_exception); +extern "C" void __cxa_free_exception(void *thrown_exception) throw(); extern "C" void __cxa_free_dependent_exception(void *thrown_exception); extern "C" void* __dynamic_cast(const void *sub, const __class_type_info *src, @@ -611,7 +611,7 @@ static void free_exception(char *e) * emergency buffer if malloc() fails, and may block if there are no such * buffers available. */ -extern "C" void *__cxa_allocate_exception(size_t thrown_size) +extern "C" void *__cxa_allocate_exception(size_t thrown_size) throw() { size_t size = thrown_size + sizeof(__cxa_exception); char *buffer = alloc_or_die(size); @@ -633,7 +633,7 @@ extern "C" void *__cxa_allocate_dependent_exception(void) * In this implementation, it is also called by __cxa_end_catch() and during * thread cleanup. */ -extern "C" void __cxa_free_exception(void *thrown_exception) +extern "C" void __cxa_free_exception(void *thrown_exception) throw() { __cxa_exception *ex = reinterpret_cast<__cxa_exception*>(thrown_exception) - 1; // Free the object that was thrown, calling its destructor @@ -794,7 +794,7 @@ static void throw_exception(__cxa_exception *ex) } extern "C" __cxa_exception *__cxa_init_primary_exception( - void *object, std::type_info* tinfo, void (*dest)(void *)) { + void *object, std::type_info* tinfo, void (*dest)(void *)) throw() { __cxa_exception *ex = reinterpret_cast<__cxa_exception*>(object) - 1; ex->referenceCount = 0; From nobody Sat Apr 6 20:18:36 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VBmrr35c5z5HGl2; Sat, 6 Apr 2024 20:18:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VBmrr1Z09z4LmS; Sat, 6 Apr 2024 20:18:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712434716; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vK/TWTvMbRuBSgrvhMlFPHsV/O8s+oVI3htxkLcnyJ4=; b=uulWkOBZa624DAUnjDOT5/smLrmnhAarzxE28tyAce/vslT8haFSjXps5CWYiFHCgUVWfr k8/lOf+OOtEwPbNKg73LlV1a6/3X9sKSiYiBGpL7J2w4+dRCcOWmT7zkEABMBHxugGqn0z Y+wwXkHLcsQdqVTagfjtngMxoqhTAPFLX70hW1ag/YSlmCNqzLWzxG1Lvqiw2cXj80FdxD yC3bpdKUTZzO2b9gYwkKGL056E5yuG4lFf6DfO1s6GrFHLluq7f8PvhYVohWb7eOd3l5YS j8btFAb1wULTnzNR7CMprj/5oq/LeKfU0WZH43OnCN8MxUpvI3veH/KHqCtyiA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712434716; a=rsa-sha256; cv=none; b=p3JOZ2ZMLGU3NeOQy4seqqKsSvk81P0aLl3uB/pem9hLrhFHBzbwZZNpnK0xpIjaOQ9R4E SYGjWbEDP4//LVtv5S02Odr6bbd5CBMYP3qi0Siay3q3LZWt5SDcsrZdUes8zYNx9EMBjY YsQ74Uv09tCWBYXcspQyHvDhgCWzjaUZplLPv8XJifTWnIuC28ZzQOLgAcw15vBSozjR0N +Ngq3DfSCJ6XlBEYsrlAN1HxcjJSB39Z+z931kUlgymzPkLWE02RGMtmqLEknjW+Hh7+Gu 3l61mfWAhDmUABUJ+KTkuM8uaKjopGFtQ4PKLVDrPZqtLV/Co5yQpnahwMKKaw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712434716; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vK/TWTvMbRuBSgrvhMlFPHsV/O8s+oVI3htxkLcnyJ4=; b=ZN8C8D+A3zndHNlVjYElk+WUecARDS7FTaOnkqR0YBEEkgq+xDY9oibxhrhle/vmEG47SO UYwJoyMtjifWdMq0hYc0xQQcuw4A+1pTmhYCOGFHX3qN+5493B6JOcp18iWK+W32eKzYMz a6uP1YE3wKUaGKv5Ylrx3zCl2KAXV/Taq7ais9NWwTDxQXCe9XdY8cLGDcTrdOA1FWuM4i En8Bn2RNOMIPbKVX0FGQkE7eIl5vvRn/buZI2BzPEnDarkQC6hO6/8Booq2pYsnCspW9ia 57B0smOxJQzOlw5p4C43LVTy161fBSGaBlaXnUZgMARbpvtHkD96Gv/uJF1wIA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VBmrr17pPzxrQ; Sat, 6 Apr 2024 20:18:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 436KIar1029965; Sat, 6 Apr 2024 20:18:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 436KIaKr029962; Sat, 6 Apr 2024 20:18:36 GMT (envelope-from git) Date: Sat, 6 Apr 2024 20:18:36 GMT Message-Id: <202404062018.436KIaKr029962@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dimitry Andric Subject: git: ddbac700c256 - main - Merge commit 6e4930c67508 from llvm-project (by Alexander Kornienko): List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ddbac700c256bec42c441b75a5cb5f74e9be601f Auto-Submitted: auto-generated The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=ddbac700c256bec42c441b75a5cb5f74e9be601f commit ddbac700c256bec42c441b75a5cb5f74e9be601f Author: Dimitry Andric AuthorDate: 2024-01-28 20:34:42 +0000 Commit: Dimitry Andric CommitDate: 2024-04-06 20:14:01 +0000 Merge commit 6e4930c67508 from llvm-project (by Alexander Kornienko): Revert "[SemaCXX] Implement CWG2137 (list-initialization from objects of the same type) (#77768)" This reverts commit 924701311aa79180e86ad8ce43d253f27d25ec7d. Causes compilation errors on valid code, see https://github.com/llvm/llvm-project/pull/77768#issuecomment-1908062472. In particular, this fixes bogus "call to constructor of 'SomeType' is ambiguous" errors. PR: 276104 MFC after: 1 month --- contrib/llvm-project/clang/lib/Sema/SemaInit.cpp | 40 ++++++---------------- .../llvm-project/clang/lib/Sema/SemaOverload.cpp | 38 ++++++-------------- 2 files changed, 20 insertions(+), 58 deletions(-) diff --git a/contrib/llvm-project/clang/lib/Sema/SemaInit.cpp b/contrib/llvm-project/clang/lib/Sema/SemaInit.cpp index 91e4cb7b68a2..457fa377355a 100644 --- a/contrib/llvm-project/clang/lib/Sema/SemaInit.cpp +++ b/contrib/llvm-project/clang/lib/Sema/SemaInit.cpp @@ -4200,7 +4200,7 @@ static OverloadingResult ResolveConstructorOverload( /// \param IsListInit Is this list-initialization? /// \param IsInitListCopy Is this non-list-initialization resulting from a /// list-initialization from {x} where x is the same -/// aggregate type as the entity? +/// type as the entity? static void TryConstructorInitialization(Sema &S, const InitializedEntity &Entity, const InitializationKind &Kind, @@ -4230,14 +4230,6 @@ static void TryConstructorInitialization(Sema &S, Entity.getKind() != InitializedEntity::EK_LambdaToBlockConversionBlockElement); - bool CopyElisionPossible = false; - auto ElideConstructor = [&] { - // Convert qualifications if necessary. - Sequence.AddQualificationConversionStep(DestType, VK_PRValue); - if (ILE) - Sequence.RewrapReferenceInitList(DestType, ILE); - }; - // C++17 [dcl.init]p17: // - If the initializer expression is a prvalue and the cv-unqualified // version of the source type is the same class as the class of the @@ -4250,17 +4242,11 @@ static void TryConstructorInitialization(Sema &S, if (S.getLangOpts().CPlusPlus17 && !RequireActualConstructor && UnwrappedArgs.size() == 1 && UnwrappedArgs[0]->isPRValue() && S.Context.hasSameUnqualifiedType(UnwrappedArgs[0]->getType(), DestType)) { - if (ILE && !DestType->isAggregateType()) { - // CWG2311: T{ prvalue_of_type_T } is not eligible for copy elision - // Make this an elision if this won't call an initializer-list - // constructor. (Always on an aggregate type or check constructors first.) - assert(!IsInitListCopy && - "IsInitListCopy only possible with aggregate types"); - CopyElisionPossible = true; - } else { - ElideConstructor(); - return; - } + // Convert qualifications if necessary. + Sequence.AddQualificationConversionStep(DestType, VK_PRValue); + if (ILE) + Sequence.RewrapReferenceInitList(DestType, ILE); + return; } const RecordType *DestRecordType = DestType->getAs(); @@ -4305,12 +4291,6 @@ static void TryConstructorInitialization(Sema &S, S, Kind.getLocation(), Args, CandidateSet, DestType, Ctors, Best, CopyInitialization, AllowExplicit, /*OnlyListConstructors=*/true, IsListInit, RequireActualConstructor); - - if (CopyElisionPossible && Result == OR_No_Viable_Function) { - // No initializer list candidate - ElideConstructor(); - return; - } } // C++11 [over.match.list]p1: @@ -4592,9 +4572,9 @@ static void TryListInitialization(Sema &S, return; } - // C++11 [dcl.init.list]p3, per DR1467 and DR2137: - // - If T is an aggregate class and the initializer list has a single element - // of type cv U, where U is T or a class derived from T, the object is + // C++11 [dcl.init.list]p3, per DR1467: + // - If T is a class type and the initializer list has a single element of + // type cv U, where U is T or a class derived from T, the object is // initialized from that element (by copy-initialization for // copy-list-initialization, or by direct-initialization for // direct-list-initialization). @@ -4605,7 +4585,7 @@ static void TryListInitialization(Sema &S, // - Otherwise, if T is an aggregate, [...] (continue below). if (S.getLangOpts().CPlusPlus11 && InitList->getNumInits() == 1 && !IsDesignatedInit) { - if (DestType->isRecordType() && DestType->isAggregateType()) { + if (DestType->isRecordType()) { QualType InitType = InitList->getInit(0)->getType(); if (S.Context.hasSameUnqualifiedType(InitType, DestType) || S.IsDerivedFrom(InitList->getBeginLoc(), InitType, DestType)) { diff --git a/contrib/llvm-project/clang/lib/Sema/SemaOverload.cpp b/contrib/llvm-project/clang/lib/Sema/SemaOverload.cpp index 030878899b81..c9eb67898356 100644 --- a/contrib/llvm-project/clang/lib/Sema/SemaOverload.cpp +++ b/contrib/llvm-project/clang/lib/Sema/SemaOverload.cpp @@ -1568,37 +1568,19 @@ TryUserDefinedConversion(Sema &S, Expr *From, QualType ToType, // called for those cases. if (CXXConstructorDecl *Constructor = dyn_cast(ICS.UserDefined.ConversionFunction)) { - QualType FromType; - SourceLocation FromLoc; - // C++11 [over.ics.list]p6, per DR2137: - // C++17 [over.ics.list]p6: - // If C is not an initializer-list constructor and the initializer list - // has a single element of type cv U, where U is X or a class derived - // from X, the implicit conversion sequence has Exact Match rank if U is - // X, or Conversion rank if U is derived from X. - if (const auto *InitList = dyn_cast(From); - InitList && InitList->getNumInits() == 1 && - !S.isInitListConstructor(Constructor)) { - const Expr *SingleInit = InitList->getInit(0); - FromType = SingleInit->getType(); - FromLoc = SingleInit->getBeginLoc(); - } else { - FromType = From->getType(); - FromLoc = From->getBeginLoc(); - } - QualType FromCanon = - S.Context.getCanonicalType(FromType.getUnqualifiedType()); + QualType FromCanon + = S.Context.getCanonicalType(From->getType().getUnqualifiedType()); QualType ToCanon = S.Context.getCanonicalType(ToType).getUnqualifiedType(); if (Constructor->isCopyConstructor() && (FromCanon == ToCanon || - S.IsDerivedFrom(FromLoc, FromCanon, ToCanon))) { + S.IsDerivedFrom(From->getBeginLoc(), FromCanon, ToCanon))) { // Turn this into a "standard" conversion sequence, so that it // gets ranked with standard conversion sequences. DeclAccessPair Found = ICS.UserDefined.FoundConversionFunction; ICS.setStandard(); ICS.Standard.setAsIdentityConversion(); - ICS.Standard.setFromType(FromType); + ICS.Standard.setFromType(From->getType()); ICS.Standard.setAllToTypes(ToType); ICS.Standard.CopyConstructor = Constructor; ICS.Standard.FoundCopyConstructor = Found; @@ -5324,18 +5306,18 @@ TryListConversion(Sema &S, InitListExpr *From, QualType ToType, IsDesignatedInit) return Result; - // Per DR1467 and DR2137: - // If the parameter type is an aggregate class X and the initializer list - // has a single element of type cv U, where U is X or a class derived from - // X, the implicit conversion sequence is the one required to convert the - // element to the parameter type. + // Per DR1467: + // If the parameter type is a class X and the initializer list has a single + // element of type cv U, where U is X or a class derived from X, the + // implicit conversion sequence is the one required to convert the element + // to the parameter type. // // Otherwise, if the parameter type is a character array [... ] // and the initializer list has a single element that is an // appropriately-typed string literal (8.5.2 [dcl.init.string]), the // implicit conversion sequence is the identity conversion. if (From->getNumInits() == 1 && !IsDesignatedInit) { - if (ToType->isRecordType() && ToType->isAggregateType()) { + if (ToType->isRecordType()) { QualType InitType = From->getInit(0)->getType(); if (S.Context.hasSameUnqualifiedType(InitType, ToType) || S.IsDerivedFrom(From->getBeginLoc(), InitType, ToType)) From nobody Sat Apr 6 20:18:37 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VBmrs4XhFz5HGfV; Sat, 6 Apr 2024 20:18: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 4VBmrs2fQVz4Lsf; Sat, 6 Apr 2024 20:18:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712434717; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kEtInG5v1OBgNH2P2uwHb6npSYyDRQPHtp7ORkHk7bI=; b=ZQa5ePgMEBnB1fsm7S550JgcqmK8yuJiRX+9XZdodIEXEnfLD3rRfYTcBUqn+7zFb0KklR AeaVhK8IYuhAyH+H1KpG29KmtR//jkTFc5W+SoyF07tT/8oiaACKbnKjjSRGAaj3Jbxs6Q n+Z9Fyy6fxCvXOrUHPPVDFuhXyP0fKvSCJBBvgbWQVQdHBMvLlZ2K5oUN3ZOKzjodpQmkQ FDPmNe9tqr2fpxVrm9RlRK0KYWp8cS+38b613DDFyp2G6JFFU6gCM1v0QAUg/P5PLZvOc6 /6TcPV5jDPz+JOMioGqSANk1A1QhYoS8nFjD3nd31Bx7dcWNEfaHJxVfSLSqDQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712434717; a=rsa-sha256; cv=none; b=e5Zx/Ndk2puKy3WP+HAcijM2WBkrAdbOPHzpAbQfBUc9tJAJtpU21HGbW5xS0MdNuZ1d3p zwsehFV8oI0fuYfb09MH+x7xm48/u3FiyZgtn7lsrCaOj9AR48Foj68RSeNg997aD3xIDc K0XSyk3ypn0ZPLdfB4VgfbGJxAokRWytWRH1bhzAym1GMZKr7JHwSkdYVw7dc+NySIeMCv 3rXKGMdpV3SmB6Ng6ryZ5gl9/ufTZbSOiUNw4jqQCyGcPs7fbbVfz0ciD2gB9+PuwTTSa8 ShILIbzH0uMMZUPZ2T0F0w2ypluZdq2CSkiLa50aH3PiX3AxsQoXFZj5bTMT9Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712434717; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kEtInG5v1OBgNH2P2uwHb6npSYyDRQPHtp7ORkHk7bI=; b=OncR+gcOBH5DVv+8k8EdG9N/lmA+XTDl9jxwRWdGfy5Q5eeo5wlpJXHx4SdtV+WEMqcuQY VQTkHhNku8if0grhhPaYY+t+Ep+go/Lel7zFic9j+qzxgvu4J6pHi3ZE9/gRWlfWX/rIj3 vGn5PHjkD/mzfZsR6gUIk3YGd/DWqS3pIJ58BYxz9+16deiHTWbpJFJB/6jrVAEJ/MlgF0 UOuBlT5oc7+NQpInVqCa76hdiTZO+9PAYadKx0+niMe52YZeTo5z/vo+MLgAFOaefVzNtJ By60k9SUC86igK+yLk81eycSKvjKD86xzVI4tCIvDHX2oVE4ragujVaRl4cH5g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VBmrs2Djjzxcr; Sat, 6 Apr 2024 20:18: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 436KIbTY030013; Sat, 6 Apr 2024 20:18:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 436KIbAO030010; Sat, 6 Apr 2024 20:18:37 GMT (envelope-from git) Date: Sat, 6 Apr 2024 20:18:37 GMT Message-Id: <202404062018.436KIbAO030010@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dimitry Andric Subject: git: dc36515b6283 - main - Merge commit 5f4ee5a2dfa9 from llvm-project (by Shanzhi): List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: dc36515b628331e03ac8c23a6749f7f3eb1ebec8 Auto-Submitted: auto-generated The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=dc36515b628331e03ac8c23a6749f7f3eb1ebec8 commit dc36515b628331e03ac8c23a6749f7f3eb1ebec8 Author: Dimitry Andric AuthorDate: 2024-02-05 09:16:17 +0000 Commit: Dimitry Andric CommitDate: 2024-04-06 20:14:02 +0000 Merge commit 5f4ee5a2dfa9 from llvm-project (by Shanzhi): [Clang][AST] Fix a crash on attaching doc comments (#78716) This crash is basically caused by calling `ASTContext::getRawCommentForDeclNoCacheImp` with its input arguments `RepresentativeLocForDecl` and `CommentsInTheFile` refering to different files. A reduced reproducer is provided in this patch. After the source locations for instantiations of funtion template are corrected in the commit 256a0b298c68b89688b80350b034daf2f7785b67, the variable `CommitsInThisFile` in the function `ASTContext::attachCommentsToJustParsedDecls` would refer to the source file rather than the header file for implicit function template instantiation. Therefore, in the first loop in `ASTContext::attachCommentsToJustParsedDecls`, `D` should also be adjusted for relevant scenarios like the second loop. Fixes #67979 Fixes #68524 Fixes #70550 This should fix a segfault when compiling graphics/gdal. PR: 276104 MFC after: 1 month --- contrib/llvm-project/clang/lib/AST/ASTContext.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/contrib/llvm-project/clang/lib/AST/ASTContext.cpp b/contrib/llvm-project/clang/lib/AST/ASTContext.cpp index 5eb7aa366456..9a0ede201059 100644 --- a/contrib/llvm-project/clang/lib/AST/ASTContext.cpp +++ b/contrib/llvm-project/clang/lib/AST/ASTContext.cpp @@ -498,7 +498,11 @@ void ASTContext::attachCommentsToJustParsedDecls(ArrayRef Decls, return; FileID File; - for (Decl *D : Decls) { + for (const Decl *D : Decls) { + if (D->isInvalidDecl()) + continue; + + D = &adjustDeclToTemplate(*D); SourceLocation Loc = D->getLocation(); if (Loc.isValid()) { // See if there are any new comments that are not attached to a decl. From nobody Sat Apr 6 20:18:32 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VBmrq0mHlz5HGqZ; Sat, 6 Apr 2024 20:18:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VBmrq0NPXz4LmB; Sat, 6 Apr 2024 20:18:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712434715; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=e+m5nRDNLo1JH5koYRsKtadOlMkGaVGefqS69Le4RcQ=; b=Z88wB253bs4dkfKvVhBCCklrh3cZWD97wDFom+7aagzTJ4Fy/ECSfUgqtWaPqQUyKJge/3 Is73RB7rx8b54b3gpd1ASvK81W4f+PAQm3nbhmd+sZ/G2zf2HSI62GrMu6F2JjmoqUDreB 6Cf024m6HjaowS2t7qTk0znZnzh8AhMHv+dwuj1jRHW3F9w6z2NueUXCDPISlgdsGDx1eD ugBpkSzqb3h2vka20HisvGlEfwMNKnH55b8UpOZt5Z0SnoljhKJBNZbysfFtPbjmITqO45 mkxh5sILwq65KeOWg/d206Wxgo2gQjErmjy3Y6bDJcMsJtualhknH8FWtc0OnA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712434715; a=rsa-sha256; cv=none; b=fcDlsCiAZScCwzhbsQvTmxusCuBGYEQuCpbPWtkp6sYVXrZeOjJVmYIkHhfw91b3PWLSHN 5f4/IGkuVMHxwJbqir0P+zThiZjwvSz9+OuUSkcftJodOb/OLGOVJyDk5teSFWWE/HvvxS bmu54OZFYPIKrfeOunY5soXSF71PyG5SCpCUW4PLpVWLXVerfcCnyqOo/TTmk3vIdUwZje 8NWcLXieua9adNPDzOmXBf/uOpjsb+8RLB5s9Txzh495EDlqFJmOqDYnGYJo4NvnOkB8QG eisa/u6ZoixeRxLmJjxY0wavIzZuBMRBO9X/q/tRhgRgRnZ6wrsfFxOrQG27Ww== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712434715; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=e+m5nRDNLo1JH5koYRsKtadOlMkGaVGefqS69Le4RcQ=; b=Vm3M/PoRNZWkhvXvAdGYS06X+t84/0NHBM1aO7Vkglxr5D0iQGEtKTbMO+lhtXPIBI5Qn/ /rTPtHg6XPCtUkAmF9jt0aFnmMCuwuHKnJnL1l9hNoMngGVrW0SvXinPyoaOIRtC8+vBNH 3P82rRClRtoQTD+LIbY+FpCBLhPQ8KXjj/F1DnOrp3RHCGPqbvHTRFtBbc9KusPMRBN6lU NfIoScKF2SnqUE6ErvQkDzbmrimfSHaTfwEYkfa/ZwjdtF9S03qMdc4zBVQwBMHxnJqV8O 8vPP/nXIP0gDvqYOgETPoo5hqolZjqyfuxBTEZp4MjrThhfrNRVjDtb+6kJh6w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VBmrp748jzxcq; Sat, 6 Apr 2024 20:18:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 436KIYFh029911; Sat, 6 Apr 2024 20:18:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 436KIWY6029908; Sat, 6 Apr 2024 20:18:32 GMT (envelope-from git) Date: Sat, 6 Apr 2024 20:18:32 GMT Message-Id: <202404062018.436KIWY6029908@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dimitry Andric Subject: git: 878ed4957e07 - main - Merge llvm-project release/18.x llvmorg-18-init-18361-g22683463740e List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 878ed4957e077721efaf90ab5b70dce86dc94f4b Auto-Submitted: auto-generated The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=878ed4957e077721efaf90ab5b70dce86dc94f4b commit 878ed4957e077721efaf90ab5b70dce86dc94f4b Merge: 3fb2e045791e 2d835ae86572 Author: Dimitry Andric AuthorDate: 2024-01-26 15:04:14 +0000 Commit: Dimitry Andric CommitDate: 2024-04-06 20:13:56 +0000 Merge llvm-project release/18.x llvmorg-18-init-18361-g22683463740e This updates llvm, clang, compiler-rt, libc++, libunwind, lld, lldb and openmp to llvm-project release/18.x llvmorg-18-init-18361-g22683463740e. PR: 276104 MFC after: 1 month contrib/llvm-project/libcxx/include/__config | 2 +- lib/clang/include/VCSVersion.inc | 6 +++--- lib/clang/include/clang/Basic/Version.inc | 6 +++--- lib/clang/include/lld/Common/Version.inc | 2 +- lib/clang/include/lldb/Version/Version.inc | 6 +++--- lib/clang/include/llvm/Config/config.h | 4 ++-- lib/clang/include/llvm/Config/llvm-config.h | 4 ++-- lib/clang/include/llvm/Support/VCSRevision.h | 2 +- 8 files changed, 16 insertions(+), 16 deletions(-) diff --cc lib/clang/include/VCSVersion.inc index c4390452d813,000000000000..ca4f5d50df14 mode 100644,000000..100644 --- a/lib/clang/include/VCSVersion.inc +++ b/lib/clang/include/VCSVersion.inc @@@ -1,8 -1,0 +1,8 @@@ - #define LLVM_REVISION "llvmorg-18-init-18359-g93248729cfae" ++#define LLVM_REVISION "llvmorg-18-init-18361-g22683463740e" +#define LLVM_REPOSITORY "https://github.com/llvm/llvm-project.git" + - #define CLANG_REVISION "llvmorg-18-init-18359-g93248729cfae" ++#define CLANG_REVISION "llvmorg-18-init-18361-g22683463740e" +#define CLANG_REPOSITORY "https://github.com/llvm/llvm-project.git" + - #define LLDB_REVISION "llvmorg-18-init-18359-g93248729cfae" ++#define LLDB_REVISION "llvmorg-18-init-18361-g22683463740e" +#define LLDB_REPOSITORY "https://github.com/llvm/llvm-project.git" diff --cc lib/clang/include/clang/Basic/Version.inc index adf6c5966121,000000000000..26d6b3b2938f mode 100644,000000..100644 --- a/lib/clang/include/clang/Basic/Version.inc +++ b/lib/clang/include/clang/Basic/Version.inc @@@ -1,8 -1,0 +1,8 @@@ - #define CLANG_VERSION 18.0.0git - #define CLANG_VERSION_STRING "18.0.0git" ++#define CLANG_VERSION 18.1.0rc ++#define CLANG_VERSION_STRING "18.1.0rc" +#define CLANG_VERSION_MAJOR 18 +#define CLANG_VERSION_MAJOR_STRING "18" - #define CLANG_VERSION_MINOR 0 ++#define CLANG_VERSION_MINOR 1 +#define CLANG_VERSION_PATCHLEVEL 0 + +#define CLANG_VENDOR "FreeBSD " diff --cc lib/clang/include/lld/Common/Version.inc index c1db1f1ca20b,000000000000..e9be63b6430e mode 100644,000000..100644 --- a/lib/clang/include/lld/Common/Version.inc +++ b/lib/clang/include/lld/Common/Version.inc @@@ -1,4 -1,0 +1,4 @@@ +// Local identifier in __FreeBSD_version style +#define LLD_FREEBSD_VERSION 1500000 + - #define LLD_VERSION_STRING "18.0.0 (FreeBSD llvmorg-18-init-18359-g93248729cfae-" __XSTRING(LLD_FREEBSD_VERSION) ")" ++#define LLD_VERSION_STRING "18.1.0 (FreeBSD llvmorg-18-init-18361-g22683463740e-" __XSTRING(LLD_FREEBSD_VERSION) ")" diff --cc lib/clang/include/lldb/Version/Version.inc index c5e07a4eefbd,000000000000..7a9546b4696f mode 100644,000000..100644 --- a/lib/clang/include/lldb/Version/Version.inc +++ b/lib/clang/include/lldb/Version/Version.inc @@@ -1,6 -1,0 +1,6 @@@ - #define LLDB_VERSION 18.0.0git - #define LLDB_VERSION_STRING "18.0.0git" ++#define LLDB_VERSION 18.1.0rc ++#define LLDB_VERSION_STRING "18.1.0rc" +#define LLDB_VERSION_MAJOR 18 - #define LLDB_VERSION_MINOR 0 ++#define LLDB_VERSION_MINOR 1 +#define LLDB_VERSION_PATCH 0 +/* #undef LLDB_FULL_VERSION_STRING */ diff --cc lib/clang/include/llvm/Config/config.h index fdc104e49231,000000000000..718c44fff94d mode 100644,000000..100644 --- a/lib/clang/include/llvm/Config/config.h +++ b/lib/clang/include/llvm/Config/config.h @@@ -1,378 -1,0 +1,378 @@@ +#ifndef CONFIG_H +#define CONFIG_H + +// Include this header only under the llvm source tree. +// This is a private header. + +/* Exported configuration */ +#include "llvm/Config/llvm-config.h" + +/* Bug report URL. */ +#define BUG_REPORT_URL "https://bugs.freebsd.org/submit/" + +/* Define to 1 to enable backtraces, and to 0 otherwise. */ +#define ENABLE_BACKTRACES 1 + +/* Define to 1 to enable crash overrides, and to 0 otherwise. */ +#define ENABLE_CRASH_OVERRIDES 1 + +/* Define to 1 to enable crash memory dumps, and to 0 otherwise. */ +#define LLVM_ENABLE_CRASH_DUMPS 0 + +/* Define to 1 to prefer forward slashes on Windows, and to 0 prefer + backslashes. */ +#define LLVM_WINDOWS_PREFER_FORWARD_SLASH 0 + +/* Define to 1 if you have the `backtrace' function. */ +#define HAVE_BACKTRACE TRUE + +#define BACKTRACE_HEADER + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_CRASHREPORTERCLIENT_H */ + +/* can use __crashreporter_info__ */ +#if defined(__APPLE__) +#define HAVE_CRASHREPORTER_INFO 1 +#else +#define HAVE_CRASHREPORTER_INFO 0 +#endif + +/* Define to 1 if you have the declaration of `arc4random', and to 0 if you + don't. */ +#define HAVE_DECL_ARC4RANDOM 1 + +/* Define to 1 if you have the declaration of `FE_ALL_EXCEPT', and to 0 if you + don't. */ +#define HAVE_DECL_FE_ALL_EXCEPT 1 + +/* Define to 1 if you have the declaration of `FE_INEXACT', and to 0 if you + don't. */ +#define HAVE_DECL_FE_INEXACT 1 + +/* Define to 1 if you have the declaration of `strerror_s', and to 0 if you + don't. */ +#define HAVE_DECL_STRERROR_S 0 + +/* Define to 1 if you have the header file. */ +#define HAVE_DLFCN_H 1 + +/* Define if dlopen() is available on this platform. */ +#define HAVE_DLOPEN 1 + +/* Define if dladdr() is available on this platform. */ +#define HAVE_DLADDR 1 + +#if !defined(__arm__) || defined(__USING_SJLJ_EXCEPTIONS__) || defined(__ARM_DWARF_EH__) +/* Define to 1 if we can register EH frames on this platform. */ +#define HAVE_REGISTER_FRAME 1 + +/* Define to 1 if we can deregister EH frames on this platform. */ +#define HAVE_DEREGISTER_FRAME 1 +#endif // !arm || USING_SJLJ_EXCEPTIONS || ARM_DWARF_EH_ + +/* Define if __unw_add_dynamic_fde() is available on this platform. */ +/* #undef HAVE_UNW_ADD_DYNAMIC_FDE */ + +/* Define to 1 if you have the header file. */ +#define HAVE_ERRNO_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_FCNTL_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_FENV_H 1 + +/* Define if libffi is available on this platform. */ +/* #undef HAVE_FFI_CALL */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_FFI_FFI_H */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_FFI_H */ + +/* Define to 1 if you have the `futimens' function. */ +#define HAVE_FUTIMENS 1 + +/* Define to 1 if you have the `futimes' function. */ +#define HAVE_FUTIMES 1 + +/* Define to 1 if you have the `getpagesize' function. */ +#define HAVE_GETPAGESIZE 1 + +/* Define to 1 if you have the `getrlimit' function. */ +#define HAVE_GETRLIMIT 1 + +/* Define to 1 if you have the `getrusage' function. */ +#define HAVE_GETRUSAGE 1 + +/* Define to 1 if you have the `isatty' function. */ +#define HAVE_ISATTY 1 + +/* Define to 1 if you have the `edit' library (-ledit). */ +#define HAVE_LIBEDIT TRUE + +/* Define to 1 if you have the `pfm' library (-lpfm). */ +/* #undef HAVE_LIBPFM */ + +/* Define to 1 if the `perf_branch_entry' struct has field cycles. */ +/* #undef LIBPFM_HAS_FIELD_CYCLES */ + +/* Define to 1 if you have the `psapi' library (-lpsapi). */ +/* #undef HAVE_LIBPSAPI */ + +/* Define to 1 if you have the `pthread' library (-lpthread). */ +#define HAVE_LIBPTHREAD 1 + +/* Define to 1 if you have the `pthread_getname_np' function. */ +#define HAVE_PTHREAD_GETNAME_NP 1 + +/* Define to 1 if you have the `pthread_setname_np' function. */ +#define HAVE_PTHREAD_SETNAME_NP 1 + +/* Define to 1 if you have the header file. */ +#if __has_include() +#define HAVE_LINK_H 1 +#else +#define HAVE_LINK_H 0 +#endif + +/* Define to 1 if you have the header file. */ +#if __has_include() +#define HAVE_MACH_MACH_H 1 +#endif + +/* Define to 1 if you have the `mallctl' function. */ +#if defined(__FreeBSD__) +#define HAVE_MALLCTL 1 +#endif + +/* Define to 1 if you have the `mallinfo' function. */ +#if defined(__linux__) +#define HAVE_MALLINFO 1 +#endif + +/* Define to 1 if you have the `mallinfo2' function. */ +/* #undef HAVE_MALLINFO2 */ + +/* Define to 1 if you have the header file. */ +#if __has_include() +#define HAVE_MALLOC_MALLOC_H 1 +#endif + +/* Define to 1 if you have the `malloc_zone_statistics' function. */ +#if defined(__APPLE__) +#define HAVE_MALLOC_ZONE_STATISTICS 1 +#endif + +/* Define to 1 if you have the `posix_spawn' function. */ +#define HAVE_POSIX_SPAWN 1 + +/* Define to 1 if you have the `pread' function. */ +#define HAVE_PREAD 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_PTHREAD_H 1 + +/* Have pthread_mutex_lock */ +#define HAVE_PTHREAD_MUTEX_LOCK 1 + +/* Have pthread_rwlock_init */ +#define HAVE_PTHREAD_RWLOCK_INIT 1 + +/* Define to 1 if you have the `sbrk' function. */ +#define HAVE_SBRK 1 + +/* Define to 1 if you have the `setenv' function. */ +#define HAVE_SETENV 1 + +/* Define to 1 if you have the `setrlimit' function. */ +#define HAVE_SETRLIMIT 1 + +/* Define to 1 if you have the `sigaltstack' function. */ +#define HAVE_SIGALTSTACK 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SIGNAL_H 1 + +/* Define to 1 if you have the `strerror_r' function. */ +#define HAVE_STRERROR_R 1 + +/* Define to 1 if you have the `sysconf' function. */ +#define HAVE_SYSCONF 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_IOCTL_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_MMAN_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_PARAM_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_RESOURCE_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_STAT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_TIME_H 1 + +/* Define to 1 if stat struct has st_mtimespec member .*/ +#if !defined(__linux__) +#define HAVE_STRUCT_STAT_ST_MTIMESPEC_TV_NSEC 1 +#endif + +/* Define to 1 if stat struct has st_mtim member. */ +#if !defined(__APPLE__) +#define HAVE_STRUCT_STAT_ST_MTIM_TV_NSEC 1 +#endif + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_TYPES_H 1 + +/* Define if the setupterm() function is supported this platform. */ +#if defined(__FreeBSD__) +/* + * This is only needed for terminalHasColors(). When disabled LLVM falls back + * to checking a list of TERM prefixes which is sufficient for a bootstrap tool. + */ +#define LLVM_ENABLE_TERMINFO TRUE +#endif + +/* Define to 1 if you have the header file. */ +#define HAVE_TERMIOS_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_UNISTD_H 1 + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_VALGRIND_VALGRIND_H */ + +/* Have host's _alloca */ +/* #undef HAVE__ALLOCA */ + +/* Define to 1 if you have the `_chsize_s' function. */ +/* #undef HAVE__CHSIZE_S */ + +/* Define to 1 if you have the `_Unwind_Backtrace' function. */ +#define HAVE__UNWIND_BACKTRACE 1 + +/* Have host's __alloca */ +/* #undef HAVE___ALLOCA */ + +/* Have host's __ashldi3 */ +/* #undef HAVE___ASHLDI3 */ + +/* Have host's __ashrdi3 */ +/* #undef HAVE___ASHRDI3 */ + +/* Have host's __chkstk */ +/* #undef HAVE___CHKSTK */ + +/* Have host's __chkstk_ms */ +/* #undef HAVE___CHKSTK_MS */ + +/* Have host's __cmpdi2 */ +/* #undef HAVE___CMPDI2 */ + +/* Have host's __divdi3 */ +/* #undef HAVE___DIVDI3 */ + +/* Have host's __fixdfdi */ +/* #undef HAVE___FIXDFDI */ + +/* Have host's __fixsfdi */ +/* #undef HAVE___FIXSFDI */ + +/* Have host's __floatdidf */ +/* #undef HAVE___FLOATDIDF */ + +/* Have host's __lshrdi3 */ +/* #undef HAVE___LSHRDI3 */ + +/* Have host's __main */ +/* #undef HAVE___MAIN */ + +/* Have host's __moddi3 */ +/* #undef HAVE___MODDI3 */ + +/* Have host's __udivdi3 */ +/* #undef HAVE___UDIVDI3 */ + +/* Have host's __umoddi3 */ +/* #undef HAVE___UMODDI3 */ + +/* Have host's ___chkstk */ +/* #undef HAVE____CHKSTK */ + +/* Have host's ___chkstk_ms */ +/* #undef HAVE____CHKSTK_MS */ + +/* Linker version detected at compile time. */ +/* #undef HOST_LINK_VERSION */ + +/* Define if overriding target triple is enabled */ +/* #undef LLVM_TARGET_TRIPLE_ENV */ + +/* Whether tools show host and target info when invoked with --version */ +#define LLVM_VERSION_PRINTER_SHOW_HOST_TARGET_INFO 1 + +/* Define if libxml2 is supported on this platform. */ +/* #undef LLVM_ENABLE_LIBXML2 */ + +/* Define to the extension used for shared libraries, say, ".so". */ +#if defined(__APPLE__) +#define LTDL_SHLIB_EXT ".dylib" +#else +#define LTDL_SHLIB_EXT ".so" +#endif + +/* Define to the extension used for plugin libraries, say, ".so". */ +#if defined(__APPLE__) +#define LLVM_PLUGIN_EXT ".dylib" +#else +#define LLVM_PLUGIN_EXT ".so" +#endif + +/* Define to the address where bug reports for this package should be sent. */ +#define PACKAGE_BUGREPORT "https://bugs.freebsd.org/submit/" + +/* Define to the full name of this package. */ +#define PACKAGE_NAME "LLVM" + +/* Define to the full name and version of this package. */ - #define PACKAGE_STRING "LLVM 18.0.0git" ++#define PACKAGE_STRING "LLVM 18.1.0rc" + +/* Define to the version of this package. */ - #define PACKAGE_VERSION "18.0.0git" ++#define PACKAGE_VERSION "18.1.0rc" + +/* Define to the vendor of this package. */ +/* #undef PACKAGE_VENDOR */ + +/* Define to a function implementing stricmp */ +/* #undef stricmp */ + +/* Define to a function implementing strdup */ +/* #undef strdup */ + +/* Whether GlobalISel rule coverage is being collected */ +#define LLVM_GISEL_COV_ENABLED 0 + +/* Define to the default GlobalISel coverage file prefix */ +/* #undef LLVM_GISEL_COV_PREFIX */ + +/* Whether Timers signpost passes in Xcode Instruments */ +#if defined(__APPLE__) +#define LLVM_SUPPORT_XCODE_SIGNPOSTS 1 +#else +#define LLVM_SUPPORT_XCODE_SIGNPOSTS 0 +#endif + +/* #undef HAVE_PROC_PID_RUSAGE */ + +#define HAVE_BUILTIN_THREAD_POINTER 1 + +#endif diff --cc lib/clang/include/llvm/Config/llvm-config.h index f3555d0868e2,000000000000..111e0a296ed5 mode 100644,000000..100644 --- a/lib/clang/include/llvm/Config/llvm-config.h +++ b/lib/clang/include/llvm/Config/llvm-config.h @@@ -1,233 -1,0 +1,233 @@@ +/*===------- llvm/Config/llvm-config.h - llvm configuration -------*- C -*-===*/ +/* */ +/* Part of the LLVM Project, under the Apache License v2.0 with LLVM */ +/* Exceptions. */ +/* See https://llvm.org/LICENSE.txt for license information. */ +/* SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception */ +/* */ +/*===----------------------------------------------------------------------===*/ + +/* This file enumerates variables from the LLVM configuration so that they + can be in exported headers and won't override package specific directives. + This is a C header that can be included in the llvm-c headers. */ + +#ifndef LLVM_CONFIG_H +#define LLVM_CONFIG_H + +/* Define if LLVM_ENABLE_DUMP is enabled */ +/* #undef LLVM_ENABLE_DUMP */ + +/* Target triple LLVM will generate code for by default */ +/* Doesn't use `cmakedefine` because it is allowed to be empty. */ +/* #undef LLVM_DEFAULT_TARGET_TRIPLE */ + +/* Define if threads enabled */ +#define LLVM_ENABLE_THREADS 1 + +/* Has gcc/MSVC atomic intrinsics */ +#define LLVM_HAS_ATOMICS 1 + +/* Host triple LLVM will be executed on */ +/* #undef LLVM_HOST_TRIPLE */ + +/* LLVM architecture name for the native architecture, if available */ +/* #undef LLVM_NATIVE_ARCH */ + +/* LLVM name for the native AsmParser init function, if available */ +/* #undef LLVM_NATIVE_ASMPARSER */ + +/* LLVM name for the native AsmPrinter init function, if available */ +/* #undef LLVM_NATIVE_ASMPRINTER */ + +/* LLVM name for the native Disassembler init function, if available */ +/* #undef LLVM_NATIVE_DISASSEMBLER */ + +/* LLVM name for the native Target init function, if available */ +/* #undef LLVM_NATIVE_TARGET */ + +/* LLVM name for the native TargetInfo init function, if available */ +/* #undef LLVM_NATIVE_TARGETINFO */ + +/* LLVM name for the native target MC init function, if available */ +/* #undef LLVM_NATIVE_TARGETMC */ + +/* LLVM name for the native target MCA init function, if available */ +/* #undef LLVM_NATIVE_TARGETMCA */ + +/* Define if the AArch64 target is built in */ +#ifdef LLVM_TARGET_ENABLE_AARCH64 +#define LLVM_HAS_AARCH64_TARGET 1 +#else +#define LLVM_HAS_AARCH64_TARGET 0 +#endif + +/* Define if the AMDGPU target is built in */ +#define LLVM_HAS_AMDGPU_TARGET 0 + +/* Define if the ARC target is built in */ +#define LLVM_HAS_ARC_TARGET 0 + +/* Define if the ARM target is built in */ +#ifdef LLVM_TARGET_ENABLE_ARM +#define LLVM_HAS_ARM_TARGET 1 +#else +#define LLVM_HAS_ARM_TARGET 0 +#endif + +/* Define if the AVR target is built in */ +#define LLVM_HAS_AVR_TARGET 0 + +/* Define if the BPF target is built in */ +#ifdef LLVM_TARGET_ENABLE_BPF +#define LLVM_HAS_BPF_TARGET 1 +#else +#define LLVM_HAS_BPF_TARGET 0 +#endif + +/* Define if the CSKY target is built in */ +#define LLVM_HAS_CSKY_TARGET 0 + +/* Define if the DirectX target is built in */ +#define LLVM_HAS_DIRECTX_TARGET 0 + +/* Define if the Hexagon target is built in */ +#define LLVM_HAS_HEXAGON_TARGET 0 + +/* Define if the Lanai target is built in */ +#define LLVM_HAS_LANAI_TARGET 0 + +/* Define if the LoongArch target is built in */ +#define LLVM_HAS_LOONGARCH_TARGET 0 + +/* Define if the M68k target is built in */ +#define LLVM_HAS_M68K_TARGET 0 + +/* Define if the Mips target is built in */ +#ifdef LLVM_TARGET_ENABLE_MIPS +#define LLVM_HAS_MIPS_TARGET 1 +#else +#define LLVM_HAS_MIPS_TARGET 0 +#endif + +/* Define if the MSP430 target is built in */ +#define LLVM_HAS_MSP430_TARGET 0 + +/* Define if the NVPTX target is built in */ +#define LLVM_HAS_NVPTX_TARGET 0 + +/* Define if the PowerPC target is built in */ +#ifdef LLVM_TARGET_ENABLE_POWERPC +#define LLVM_HAS_POWERPC_TARGET 1 +#else +#define LLVM_HAS_POWERPC_TARGET 0 +#endif + +/* Define if the RISCV target is built in */ +#ifdef LLVM_TARGET_ENABLE_RISCV +#define LLVM_HAS_RISCV_TARGET 1 +#else +#define LLVM_HAS_RISCV_TARGET 0 +#endif + +/* Define if the Sparc target is built in */ +#ifdef LLVM_TARGET_ENABLE_SPARC +#define LLVM_HAS_SPARC_TARGET 1 +#else +#define LLVM_HAS_SPARC_TARGET 0 +#endif + +/* Define if the SPIRV target is built in */ +#define LLVM_HAS_SPIRV_TARGET 0 + +/* Define if the SystemZ target is built in */ +#define LLVM_HAS_SYSTEMZ_TARGET 0 + +/* Define if the VE target is built in */ +#define LLVM_HAS_VE_TARGET 0 + +/* Define if the WebAssembly target is built in */ +#define LLVM_HAS_WEBASSEMBLY_TARGET 0 + +/* Define if the X86 target is built in */ +#ifdef LLVM_TARGET_ENABLE_X86 +#define LLVM_HAS_X86_TARGET 1 +#else +#define LLVM_HAS_X86_TARGET 0 +#endif + +/* Define if the XCore target is built in */ +#define LLVM_HAS_XCORE_TARGET 0 + +/* Define if the Xtensa target is built in */ +#define LLVM_HAS_XTENSA_TARGET 0 + +/* Define if this is Unixish platform */ +#define LLVM_ON_UNIX 1 + +/* Define if we have the Intel JIT API runtime support library */ +#define LLVM_USE_INTEL_JITEVENTS 0 + +/* Define if we have the oprofile JIT-support library */ +#define LLVM_USE_OPROFILE 0 + +/* Define if we have the perf JIT-support library */ +#define LLVM_USE_PERF 0 + +/* Major version of the LLVM API */ +#define LLVM_VERSION_MAJOR 18 + +/* Minor version of the LLVM API */ - #define LLVM_VERSION_MINOR 0 ++#define LLVM_VERSION_MINOR 1 + +/* Patch version of the LLVM API */ +#define LLVM_VERSION_PATCH 0 + +/* LLVM version string */ - #define LLVM_VERSION_STRING "18.0.0git" ++#define LLVM_VERSION_STRING "18.1.0rc" + +/* Whether LLVM records statistics for use with GetStatistics(), + * PrintStatistics() or PrintStatisticsJSON() + */ +#define LLVM_FORCE_ENABLE_STATS 0 + +/* Define if we have z3 and want to build it */ +/* #undef LLVM_WITH_Z3 */ + +/* Define if we have curl and want to use it */ +/* #undef LLVM_ENABLE_CURL */ + +/* Define if we have cpp-httplib and want to use it */ +/* #undef LLVM_ENABLE_HTTPLIB */ + +/* Define if zlib compression is available */ +#define LLVM_ENABLE_ZLIB 1 + +/* Define if zstd compression is available */ +#define LLVM_ENABLE_ZSTD 1 + +/* Define if LLVM is using tflite */ +/* #undef LLVM_HAVE_TFLITE */ + +/* Define to 1 if you have the header file. */ +#define HAVE_SYSEXITS_H 1 + +/* Define if building libLLVM shared library */ +/* #undef LLVM_BUILD_LLVM_DYLIB */ + +/* Define if building LLVM with BUILD_SHARED_LIBS */ +/* #undef LLVM_BUILD_SHARED_LIBS */ + +/* Define if building LLVM with LLVM_FORCE_USE_OLD_TOOLCHAIN_LIBS */ +/* #undef LLVM_FORCE_USE_OLD_TOOLCHAIN */ + +/* Define if llvm_unreachable should be optimized with undefined behavior + * in non assert builds */ +#define LLVM_UNREACHABLE_OPTIMIZE 1 + +/* Define to 1 if you have the DIA SDK installed, and to 0 if you don't. */ +#define LLVM_ENABLE_DIA_SDK 0 + +/* Define if plugins enabled */ +/* #undef LLVM_ENABLE_PLUGINS */ + +#endif diff --cc lib/clang/include/llvm/Support/VCSRevision.h index 7cc55b62be19,000000000000..fa5c1df71357 mode 100644,000000..100644 --- a/lib/clang/include/llvm/Support/VCSRevision.h +++ b/lib/clang/include/llvm/Support/VCSRevision.h @@@ -1,2 -1,0 +1,2 @@@ - #define LLVM_REVISION "llvmorg-18-init-18359-g93248729cfae" ++#define LLVM_REVISION "llvmorg-18-init-18361-g22683463740e" +#define LLVM_REPOSITORY "https://github.com/llvm/llvm-project.git" From nobody Sat Apr 6 20:18:38 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VBmrt6yJcz5HGfW; Sat, 6 Apr 2024 20:18: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 4VBmrt3f6nz4LfJ; Sat, 6 Apr 2024 20:18:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712434718; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bgh6IMF/JGYQrAM3EabesKd8amdKtBp8/80ld/uQqjY=; b=yURaj4IpwIrqBztcRyqON3+vSnT66oGbmsG7dCFXkrW2bJnJRY3KNt2QcEJma7YZNXO9KK Y5UAxdMyNN8HJCnni3Xomad5ePYfh8ddGxT1TXQ5MxO2ALea8NwPR3kK5AMPVmwPgR268t 4Reu8rYViYHE7f0KC74uPjlghML+99iAp+DOZORgc8XLZFlXEaBrLPEUB4/IkgG/YmKNih qS1uZP+AquUMZovrn0AAXbsnTA0u1VnavMaKfVoEoRab9EFMNf6pgTzfnenuNbnL3g9IzA UwQXiQCq+CROemJKw01fDB8FLJ+r26OY20LApEgyuJk/+DUo0WOl0bDe3wIpww== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712434718; a=rsa-sha256; cv=none; b=Q49XRq1uR7MYKp1D/tq18M0QWFlmyNZL+pN2fpy0TITUhn+/RNOyAxHpR24rRmNKHGLeiU n7CPtN+W4QN4MD28Ny+5Wi3BsS2hS40WpyHqeV6qVgiL99DlBz18ylLUNphzoqObKHJk10 1fGrBEsU+gzS4CJOAAsoFTykEGLzdddzCrc4mLCLrgdo7UORvwdQocF/QAWpizaP+vrBMH ROMAyqsOFDOtV+BfmYcHG40Di2mzwILJ917+5KdTJuFRsl4ud2heKBGG/6lKBIL94+pR0P UnOzJbxEj9WyWKFPW2CpLABWKWJQ2mvnE951Hl7RT+G8jZJBaeFSw5JC6DppKQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712434718; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bgh6IMF/JGYQrAM3EabesKd8amdKtBp8/80ld/uQqjY=; b=Zi6rYQVmEMs2Z9cTkHcRh/fHrnV/ZPPKAiQwlq75O3G/Unl8LNzQ5UvU4qSdJBBmLGOM73 WkkPtxJVxk3q01WnT/PWHlxezGwa4oKlvKWJDuEYiWfwJVyu9tuNsjEXwiQzOnUfAQ8myG pTYahgxx8caKkE/pyvUNmJmtaXvUffMNl9J03V1UroHmeOtfCAaAP2jTL5z2r/n4HONj+i dPYRSpZjTso+JPpwEnJdb07Y7r8YY1QjxLKdlGXeRRAZab0wTsr+sCapuW2Yw0N34Od0Eq niZfERGZWLchP2maOFTTj7ztsHv8CIog6LWxB/u0b+Ze+w/bb2POp4Xa+cSd8A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VBmrt3CbgzxtX; Sat, 6 Apr 2024 20:18: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 436KIcD5030080; Sat, 6 Apr 2024 20:18:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 436KIcST030077; Sat, 6 Apr 2024 20:18:38 GMT (envelope-from git) Date: Sat, 6 Apr 2024 20:18:38 GMT Message-Id: <202404062018.436KIcST030077@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dimitry Andric Subject: git: 868ee3f28556 - main - [libc++] Rename __bit_reference template parameter to avoid conflict List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 868ee3f2855615016ba87c14b9444c18a2e1ba30 Auto-Submitted: auto-generated The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=868ee3f2855615016ba87c14b9444c18a2e1ba30 commit 868ee3f2855615016ba87c14b9444c18a2e1ba30 Author: Dimitry Andric AuthorDate: 2024-02-05 11:41:51 +0000 Commit: Dimitry Andric CommitDate: 2024-04-06 20:14:03 +0000 [libc++] Rename __bit_reference template parameter to avoid conflict As of 4d20cfcf4eb08217ed37c4d4c38dc395d7a66d26, `__bit_reference` contains a template `__fill_n` with a bool `_FillValue` parameter. Unfortunately there is a relatively widely used piece of scientific software called NetCDF, which exposes a (C) macro `_FillValue` in its public headers. When building the NetCDF C++ bindings, this quickly leads to compilation errors when the macro interferes with the template in `__bit_reference`. Rename the parameter to `_FillVal` to avoid the conflict. PR: 276104 MFC after: 1 month --- contrib/llvm-project/libcxx/include/__bit_reference | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/contrib/llvm-project/libcxx/include/__bit_reference b/contrib/llvm-project/libcxx/include/__bit_reference index 9032b8f01809..3a5339b72ddc 100644 --- a/contrib/llvm-project/libcxx/include/__bit_reference +++ b/contrib/llvm-project/libcxx/include/__bit_reference @@ -173,7 +173,7 @@ private: // fill_n -template +template _LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI void __fill_n(__bit_iterator<_Cp, false> __first, typename _Cp::size_type __n) { using _It = __bit_iterator<_Cp, false>; @@ -185,7 +185,7 @@ __fill_n(__bit_iterator<_Cp, false> __first, typename _Cp::size_type __n) { __storage_type __clz_f = static_cast<__storage_type>(__bits_per_word - __first.__ctz_); __storage_type __dn = std::min(__clz_f, __n); __storage_type __m = (~__storage_type(0) << __first.__ctz_) & (~__storage_type(0) >> (__clz_f - __dn)); - if (_FillValue) + if (_FillVal) *__first.__seg_ |= __m; else *__first.__seg_ &= ~__m; @@ -194,13 +194,13 @@ __fill_n(__bit_iterator<_Cp, false> __first, typename _Cp::size_type __n) { } // do middle whole words __storage_type __nw = __n / __bits_per_word; - std::fill_n(std::__to_address(__first.__seg_), __nw, _FillValue ? static_cast<__storage_type>(-1) : 0); + std::fill_n(std::__to_address(__first.__seg_), __nw, _FillVal ? static_cast<__storage_type>(-1) : 0); __n -= __nw * __bits_per_word; // do last partial word if (__n > 0) { __first.__seg_ += __nw; __storage_type __m = ~__storage_type(0) >> (__bits_per_word - __n); - if (_FillValue) + if (_FillVal) *__first.__seg_ |= __m; else *__first.__seg_ &= ~__m; @@ -1007,7 +1007,7 @@ private: friend class __bit_iterator<_Cp, true>; template friend struct __bit_array; - template + template _LIBCPP_CONSTEXPR_SINCE_CXX20 friend void __fill_n(__bit_iterator<_Dp, false> __first, typename _Dp::size_type __n); template From nobody Sat Apr 6 20:18:45 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VBms46ymnz5HGqn; Sat, 6 Apr 2024 20:18:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VBms44xdFz4M9T; Sat, 6 Apr 2024 20:18:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712434728; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rXfWsRn5eHy5YxUbIcLLBhW/iBOHKMFVUVeb8uNYt0A=; b=WprBLSaJHOHoMmaNItpA3l+Xwmtz+9yxO9pj5nsgBNSkf3ii3Ws5SPe617bKM6RdpAnDbW BxqhN7YkurTepI81oc86NI2AY5A4BP5j1VRUNcu3h+AK0s/qyVBn9lUXwkEIB7C1Eu0erD PftyfBIDPEE19EwcR82/3k5uWqcv08nYezQSuvRNCNBFHZDxUv6ShRopevMEedBdl3yH98 mubISFR27JdkqVH/fq9cqcD2n9M7bs5Z0TNI4qpoCzlstsfyB9OU8OaJ0lSliY8pWpZHd+ WxBIVTqNIAwFXJdd+kf9bQNcLd+cCw5ec5N3TqkTiJ3lCdYB6xCz/94LyYTGlQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712434728; a=rsa-sha256; cv=none; b=n865GRzwm/R2LazD2e6iCUfGrR7rjzmCYmUeU4PRep6gCppO2+15x2Jk5e7AZMzvmzsvjE fuUK+Ehwb9SyipXZyaXaOIvz6v8A3ZcdkiFbNy3UL8DBp1eRvQFEqeMlkz2QLqAy+snf/b VYu6FcaGdAuZEt237yj+KFVGAhblh5uCs6GfJMBqiMO3rKhOV1JM9HoSdp6OdoVw1QmpRi HVWg/8DfxxTWnTR4gqhqqa65F7ZrbiT5BkaAY7eDWIdh0jKl9tLXUkLdfrDol5+ocbFEbI Mlv+vM5O+WcbkqX3LhGiF9ExfIGvxs21USaXLpIGQGK6fzlKBeAM4NN7eQcM/A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712434728; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rXfWsRn5eHy5YxUbIcLLBhW/iBOHKMFVUVeb8uNYt0A=; b=B6pBdbx+9ILBog6sEHRtw/ndEnlcWLCCJ3vYt5QUqxcNA/kdspDE+f3kmInW7QtG+rRiVl EOcIaJMp7XtpJpQs3FoioZaWBilp0pzxD8psO49jlF1wEgmFjgK1Zgb6PGlJHUBh90bXhZ 6trsTgbpFdT1EWF67e6GkCLNVs2NXoi3hat1ojFrcA/lr3zYuTqHR191sjAwtRaCKG2MA7 mvsTfrWzAkXMdHKDiXdEqtpdeBQgb2lv7ImJhIMcQg0OGFCQo0IAnsAUD64LQ9FaP1zfFB yi3KOArOQ6ce8j6l7AOZGAjdX7N4BzO1GXh5aR1mQYKYNJimuOlHG+wlQy4iQg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VBms44VbnzxQC; Sat, 6 Apr 2024 20:18:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 436KIm2W030134; Sat, 6 Apr 2024 20:18:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 436KIjcI030131; Sat, 6 Apr 2024 20:18:45 GMT (envelope-from git) Date: Sat, 6 Apr 2024 20:18:45 GMT Message-Id: <202404062018.436KIjcI030131@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dimitry Andric Subject: git: b3edf4467982 - main - Merge llvm-project release/18.x llvmorg-18.1.0-rc2-0-gc6c86965d967 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b3edf4467982447620505a28fc82e38a414c07dc Auto-Submitted: auto-generated The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=b3edf4467982447620505a28fc82e38a414c07dc commit b3edf4467982447620505a28fc82e38a414c07dc Merge: 868ee3f28556 4fdf604ba667 Author: Dimitry Andric AuthorDate: 2024-02-07 14:58:02 +0000 Commit: Dimitry Andric CommitDate: 2024-04-06 20:14:07 +0000 Merge llvm-project release/18.x llvmorg-18.1.0-rc2-0-gc6c86965d967 This updates llvm, clang, compiler-rt, libc++, libunwind, lld, lldb and openmp to llvm-project release/18.x llvmorg-18.1.0-rc2-0-gc6c86965d967. PR: 276104 MFC after: 1 month .../llvm-project/clang/include/clang/AST/Type.h | 3 + .../clang/include/clang/Basic/AttrDocs.td | 5 +- .../clang/include/clang/Basic/BuiltinsAMDGPU.def | 62 +++ .../clang/include/clang/Basic/CodeGenOptions.def | 3 + .../include/clang/Basic/DiagnosticCommonKinds.td | 2 +- .../clang/include/clang/Basic/DiagnosticDocs.td | 9 + .../include/clang/Basic/DiagnosticSemaKinds.td | 6 + .../clang/include/clang/Basic/LangOptions.def | 1 + .../clang/include/clang/Driver/Options.td | 13 + .../clang/include/clang/Format/Format.h | 43 +- .../clang/include/clang/Lex/Preprocessor.h | 11 +- .../llvm-project/clang/include/clang/Sema/Lookup.h | 3 +- .../clang/include/clang/Serialization/ASTReader.h | 6 + contrib/llvm-project/clang/lib/AST/ASTContext.cpp | 20 +- .../llvm-project/clang/lib/AST/ExprConstant.cpp | 9 +- .../llvm-project/clang/lib/AST/ItaniumMangle.cpp | 25 +- .../llvm-project/clang/lib/AST/JSONNodeDumper.cpp | 3 + contrib/llvm-project/clang/lib/AST/ODRHash.cpp | 49 +- .../llvm-project/clang/lib/AST/TemplateBase.cpp | 3 +- .../llvm-project/clang/lib/AST/TextNodeDumper.cpp | 3 + contrib/llvm-project/clang/lib/AST/Type.cpp | 15 +- contrib/llvm-project/clang/lib/AST/TypePrinter.cpp | 2 + .../clang/lib/Basic/Targets/AArch64.cpp | 23 + .../llvm-project/clang/lib/Basic/Targets/AArch64.h | 1 + .../llvm-project/clang/lib/CodeGen/BackendUtil.cpp | 1 + .../llvm-project/clang/lib/CodeGen/CGBuiltin.cpp | 177 +++++++- contrib/llvm-project/clang/lib/CodeGen/CGExpr.cpp | 17 +- .../clang/lib/CodeGen/CoverageMappingGen.cpp | 6 +- .../clang/lib/CodeGen/Targets/RISCV.cpp | 21 +- contrib/llvm-project/clang/lib/Driver/Driver.cpp | 6 +- .../clang/lib/Driver/ToolChains/Clang.cpp | 15 + .../clang/lib/Driver/ToolChains/CommonArgs.cpp | 52 +++ .../clang/lib/Driver/ToolChains/CommonArgs.h | 3 + contrib/llvm-project/clang/lib/Format/Format.cpp | 23 +- .../clang/lib/Format/TokenAnnotator.cpp | 11 +- .../llvm-project/clang/lib/Lex/PPDirectives.cpp | 2 +- .../llvm-project/clang/lib/Lex/PPExpressions.cpp | 4 +- .../llvm-project/clang/lib/Sema/SemaChecking.cpp | 55 ++- .../llvm-project/clang/lib/Sema/SemaConcept.cpp | 8 +- contrib/llvm-project/clang/lib/Sema/SemaDecl.cpp | 3 +- contrib/llvm-project/clang/lib/Sema/SemaExpr.cpp | 6 +- .../llvm-project/clang/lib/Sema/SemaOverload.cpp | 44 +- .../llvm-project/clang/lib/Sema/SemaTemplate.cpp | 44 +- contrib/llvm-project/clang/lib/Sema/SemaType.cpp | 21 +- .../clang/lib/Serialization/ASTReader.cpp | 3 + .../clang/lib/Serialization/ASTReaderDecl.cpp | 38 +- .../clang/lib/Serialization/ASTWriter.cpp | 8 +- .../clang/lib/Serialization/ASTWriterDecl.cpp | 13 +- .../clang/lib/StaticAnalyzer/Core/Environment.cpp | 8 +- .../compiler-rt/lib/builtins/i386/chkstk.S | 2 - .../compiler-rt/lib/builtins/x86_64/chkstk.S | 2 - .../lib/profile/InstrProfilingPlatformWindows.c | 2 +- .../sanitizer_symbolizer_report.cpp | 4 +- .../libcxx/include/__algorithm/copy_move_common.h | 5 + .../libcxx/include/__algorithm/equal.h | 5 + .../libcxx/include/__algorithm/equal_range.h | 5 + .../llvm-project/libcxx/include/__algorithm/fold.h | 5 + .../libcxx/include/__algorithm/in_found_result.h | 5 + .../libcxx/include/__algorithm/in_fun_result.h | 5 + .../libcxx/include/__algorithm/in_in_out_result.h | 5 + .../libcxx/include/__algorithm/in_in_result.h | 5 + .../libcxx/include/__algorithm/in_out_out_result.h | 5 + .../libcxx/include/__algorithm/includes.h | 5 + .../libcxx/include/__algorithm/next_permutation.h | 5 + .../libcxx/include/__algorithm/nth_element.h | 5 + .../libcxx/include/__algorithm/partial_sort.h | 5 + .../libcxx/include/__algorithm/partial_sort_copy.h | 5 + .../libcxx/include/__algorithm/partition.h | 5 + .../libcxx/include/__algorithm/prev_permutation.h | 5 + .../include/__algorithm/pstl_any_all_none_of.h | 5 + .../pstl_backends/cpu_backends/transform_reduce.h | 5 + .../libcxx/include/__algorithm/pstl_copy.h | 5 + .../libcxx/include/__algorithm/pstl_count.h | 5 + .../libcxx/include/__algorithm/pstl_equal.h | 5 + .../libcxx/include/__algorithm/pstl_fill.h | 5 + .../libcxx/include/__algorithm/pstl_find.h | 5 + .../libcxx/include/__algorithm/pstl_for_each.h | 5 + .../libcxx/include/__algorithm/pstl_generate.h | 5 + .../include/__algorithm/pstl_is_partitioned.h | 5 + .../libcxx/include/__algorithm/pstl_merge.h | 5 + .../libcxx/include/__algorithm/pstl_move.h | 5 + .../libcxx/include/__algorithm/pstl_replace.h | 5 + .../libcxx/include/__algorithm/pstl_rotate_copy.h | 5 + .../libcxx/include/__algorithm/pstl_sort.h | 5 + .../libcxx/include/__algorithm/pstl_stable_sort.h | 5 + .../libcxx/include/__algorithm/pstl_transform.h | 5 + .../libcxx/include/__algorithm/ranges_all_of.h | 5 + .../libcxx/include/__algorithm/ranges_any_of.h | 5 + .../include/__algorithm/ranges_binary_search.h | 5 + .../libcxx/include/__algorithm/ranges_clamp.h | 5 + .../libcxx/include/__algorithm/ranges_contains.h | 5 + .../libcxx/include/__algorithm/ranges_copy.h | 5 + .../include/__algorithm/ranges_copy_backward.h | 5 + .../libcxx/include/__algorithm/ranges_copy_if.h | 5 + .../libcxx/include/__algorithm/ranges_copy_n.h | 5 + .../libcxx/include/__algorithm/ranges_count.h | 5 + .../libcxx/include/__algorithm/ranges_count_if.h | 5 + .../libcxx/include/__algorithm/ranges_ends_with.h | 5 + .../libcxx/include/__algorithm/ranges_equal.h | 5 + .../include/__algorithm/ranges_equal_range.h | 5 + .../libcxx/include/__algorithm/ranges_fill.h | 5 + .../libcxx/include/__algorithm/ranges_fill_n.h | 5 + .../libcxx/include/__algorithm/ranges_find.h | 5 + .../libcxx/include/__algorithm/ranges_find_end.h | 5 + .../include/__algorithm/ranges_find_first_of.h | 5 + .../libcxx/include/__algorithm/ranges_find_if.h | 5 + .../include/__algorithm/ranges_find_if_not.h | 5 + .../libcxx/include/__algorithm/ranges_for_each.h | 5 + .../libcxx/include/__algorithm/ranges_for_each_n.h | 5 + .../libcxx/include/__algorithm/ranges_generate.h | 5 + .../libcxx/include/__algorithm/ranges_generate_n.h | 5 + .../libcxx/include/__algorithm/ranges_includes.h | 5 + .../include/__algorithm/ranges_inplace_merge.h | 5 + .../libcxx/include/__algorithm/ranges_is_heap.h | 5 + .../include/__algorithm/ranges_is_heap_until.h | 5 + .../include/__algorithm/ranges_is_partitioned.h | 5 + .../include/__algorithm/ranges_is_permutation.h | 5 + .../libcxx/include/__algorithm/ranges_is_sorted.h | 5 + .../include/__algorithm/ranges_is_sorted_until.h | 5 + .../include/__algorithm/ranges_iterator_concept.h | 5 + .../__algorithm/ranges_lexicographical_compare.h | 5 + .../include/__algorithm/ranges_lower_bound.h | 5 + .../libcxx/include/__algorithm/ranges_make_heap.h | 5 + .../include/__algorithm/ranges_max_element.h | 5 + .../libcxx/include/__algorithm/ranges_merge.h | 5 + .../include/__algorithm/ranges_min_element.h | 5 + .../include/__algorithm/ranges_minmax_element.h | 5 + .../libcxx/include/__algorithm/ranges_mismatch.h | 5 + .../libcxx/include/__algorithm/ranges_move.h | 5 + .../include/__algorithm/ranges_move_backward.h | 5 + .../include/__algorithm/ranges_next_permutation.h | 5 + .../libcxx/include/__algorithm/ranges_none_of.h | 5 + .../include/__algorithm/ranges_nth_element.h | 5 + .../include/__algorithm/ranges_partial_sort.h | 5 + .../include/__algorithm/ranges_partial_sort_copy.h | 5 + .../libcxx/include/__algorithm/ranges_partition.h | 5 + .../include/__algorithm/ranges_partition_copy.h | 5 + .../include/__algorithm/ranges_partition_point.h | 5 + .../libcxx/include/__algorithm/ranges_pop_heap.h | 5 + .../include/__algorithm/ranges_prev_permutation.h | 5 + .../libcxx/include/__algorithm/ranges_push_heap.h | 5 + .../libcxx/include/__algorithm/ranges_remove.h | 5 + .../include/__algorithm/ranges_remove_copy.h | 5 + .../include/__algorithm/ranges_remove_copy_if.h | 5 + .../libcxx/include/__algorithm/ranges_remove_if.h | 5 + .../libcxx/include/__algorithm/ranges_replace.h | 5 + .../include/__algorithm/ranges_replace_copy.h | 5 + .../include/__algorithm/ranges_replace_copy_if.h | 5 + .../libcxx/include/__algorithm/ranges_replace_if.h | 5 + .../include/__algorithm/ranges_reverse_copy.h | 5 + .../libcxx/include/__algorithm/ranges_rotate.h | 5 + .../include/__algorithm/ranges_rotate_copy.h | 5 + .../libcxx/include/__algorithm/ranges_sample.h | 5 + .../libcxx/include/__algorithm/ranges_search_n.h | 5 + .../include/__algorithm/ranges_set_difference.h | 6 + .../include/__algorithm/ranges_set_intersection.h | 6 + .../__algorithm/ranges_set_symmetric_difference.h | 6 + .../libcxx/include/__algorithm/ranges_set_union.h | 5 + .../libcxx/include/__algorithm/ranges_shuffle.h | 5 + .../libcxx/include/__algorithm/ranges_sort.h | 5 + .../libcxx/include/__algorithm/ranges_sort_heap.h | 5 + .../include/__algorithm/ranges_stable_partition.h | 5 + .../include/__algorithm/ranges_stable_sort.h | 5 + .../include/__algorithm/ranges_starts_with.h | 5 + .../include/__algorithm/ranges_swap_ranges.h | 5 + .../libcxx/include/__algorithm/ranges_transform.h | 5 + .../libcxx/include/__algorithm/ranges_unique.h | 5 + .../include/__algorithm/ranges_unique_copy.h | 5 + .../libcxx/include/__algorithm/remove.h | 5 + .../libcxx/include/__algorithm/remove_if.h | 5 + .../libcxx/include/__algorithm/reverse.h | 5 + .../libcxx/include/__algorithm/rotate.h | 5 + .../libcxx/include/__algorithm/set_difference.h | 5 + .../libcxx/include/__algorithm/set_intersection.h | 5 + .../include/__algorithm/set_symmetric_difference.h | 5 + .../libcxx/include/__algorithm/set_union.h | 5 + .../libcxx/include/__algorithm/shift_left.h | 5 + .../libcxx/include/__algorithm/shift_right.h | 5 + .../llvm-project/libcxx/include/__algorithm/sort.h | 5 + .../libcxx/include/__algorithm/sort_heap.h | 5 + .../libcxx/include/__algorithm/stable_partition.h | 5 + .../libcxx/include/__algorithm/stable_sort.h | 5 + .../libcxx/include/__algorithm/swap_ranges.h | 5 + .../libcxx/include/__algorithm/unique.h | 5 + .../libcxx/include/__algorithm/unique_copy.h | 5 + .../libcxx/include/__algorithm/unwrap_iter.h | 2 +- .../libcxx/include/__algorithm/unwrap_range.h | 5 + contrib/llvm-project/libcxx/include/__config | 9 +- .../include/__filesystem/directory_iterator.h | 5 + .../libcxx/include/__filesystem/path.h | 5 + .../__filesystem/recursive_directory_iterator.h | 5 + .../libcxx/include/__format/format_arg.h | 5 + .../libcxx/include/__format/format_context.h | 5 + .../libcxx/include/__format/format_functions.h | 5 + .../libcxx/include/__format/formatter_output.h | 5 + .../libcxx/include/__format/write_escaped.h | 5 + .../libcxx/include/__functional/function.h | 5 + .../include/__iterator/cpp17_iterator_concepts.h | 5 + .../libcxx/include/__iterator/iterator_with_data.h | 5 + .../__memory/ranges_uninitialized_algorithms.h | 5 + .../libcxx/include/__memory/raw_storage_iterator.h | 5 + .../libcxx/include/__memory/shared_ptr.h | 5 + .../include/__memory/uninitialized_algorithms.h | 5 + .../libcxx/include/__mutex/once_flag.h | 5 + .../libcxx/include/__numeric/pstl_reduce.h | 5 + .../include/__numeric/pstl_transform_reduce.h | 5 + .../llvm-project/libcxx/include/__numeric/reduce.h | 5 + .../include/__numeric/saturation_arithmetic.h | 5 + .../libcxx/include/__numeric/transform_reduce.h | 5 + .../llvm-project/libcxx/include/__ranges/counted.h | 5 + .../libcxx/include/__ranges/drop_while_view.h | 5 + .../libcxx/include/__ranges/elements_view.h | 5 + .../libcxx/include/__ranges/filter_view.h | 5 + .../libcxx/include/__ranges/iota_view.h | 5 + .../libcxx/include/__ranges/join_view.h | 5 + .../libcxx/include/__ranges/lazy_split_view.h | 5 + .../libcxx/include/__ranges/repeat_view.h | 5 + .../libcxx/include/__ranges/reverse_view.h | 5 + .../libcxx/include/__ranges/single_view.h | 5 + .../libcxx/include/__ranges/split_view.h | 5 + .../libcxx/include/__ranges/take_while_view.h | 5 + .../libcxx/include/__ranges/transform_view.h | 5 + .../llvm-project/libcxx/include/__thread/jthread.h | 5 + .../llvm-project/libcxx/include/__thread/thread.h | 5 + contrib/llvm-project/libcxx/include/array | 5 + .../llvm-project/libcxx/include/condition_variable | 5 + .../libcxx/include/experimental/iterator | 5 + contrib/llvm-project/libcxx/include/future | 5 + contrib/llvm-project/libcxx/include/ios | 5 + contrib/llvm-project/libcxx/include/map | 5 + contrib/llvm-project/libcxx/include/ostream | 5 + contrib/llvm-project/libcxx/include/queue | 5 + contrib/llvm-project/libcxx/include/set | 5 + contrib/llvm-project/libcxx/include/stack | 5 + contrib/llvm-project/libcxx/include/string | 7 +- contrib/llvm-project/libcxx/include/strstream | 5 + contrib/llvm-project/libcxx/include/unordered_map | 5 + contrib/llvm-project/libcxx/include/unordered_set | 5 + contrib/llvm-project/libcxx/include/version | 14 +- contrib/llvm-project/libcxx/modules/std/atomic.inc | 2 + contrib/llvm-project/libcxx/modules/std/iosfwd.inc | 2 + contrib/llvm-project/libcxx/modules/std/string.inc | 4 + .../libcxx/modules/std/string_view.inc | 2 + contrib/llvm-project/lld/ELF/Arch/RISCV.cpp | 199 ++++++-- contrib/llvm-project/lld/ELF/InputFiles.cpp | 7 +- contrib/llvm-project/lld/ELF/InputSection.cpp | 13 +- contrib/llvm-project/lld/ELF/Relocations.cpp | 50 ++- contrib/llvm-project/lld/ELF/Writer.cpp | 12 +- contrib/llvm-project/lld/docs/ReleaseNotes.rst | 62 +++ .../llvm/include/llvm/Analysis/AliasAnalysis.h | 7 + .../include/llvm/Analysis/BasicAliasAnalysis.h | 14 +- .../include/llvm/Analysis/BranchProbabilityInfo.h | 13 +- .../llvm/include/llvm/Analysis/Loads.h | 12 +- .../llvm/include/llvm/Analysis/VecFuncs.def | 18 +- .../llvm/include/llvm/CodeGen/LivePhysRegs.h | 11 +- .../llvm/include/llvm/CodeGen/MachineBasicBlock.h | 6 + .../llvm/include/llvm/IR/IntrinsicsAMDGPU.td | 119 +++-- .../llvm/include/llvm/Support/X86FoldTablesUtils.h | 11 +- .../include/llvm/Target/TargetInstrPredicate.td | 34 ++ .../llvm/TargetParser/AArch64TargetParser.h | 3 +- .../llvm/include/llvm/TargetParser/Triple.h | 6 +- .../llvm/lib/Analysis/BasicAliasAnalysis.cpp | 6 +- contrib/llvm-project/llvm/lib/Analysis/Lint.cpp | 3 +- contrib/llvm-project/llvm/lib/Analysis/Loads.cpp | 9 +- .../llvm/lib/Analysis/LoopAccessAnalysis.cpp | 53 ++- .../llvm/lib/Analysis/MemorySSAUpdater.cpp | 22 +- .../llvm/lib/CodeGen/BranchFolding.cpp | 6 +- .../lib/ProfileData/Coverage/CoverageMapping.cpp | 240 ++++++++-- .../ProfileData/Coverage/CoverageMappingWriter.cpp | 10 +- .../llvm-project/llvm/lib/Support/RISCVISAInfo.cpp | 3 +- .../Target/AArch64/AArch64ExpandPseudoInsts.cpp | 6 + .../lib/Target/AArch64/AArch64FrameLowering.cpp | 6 +- .../lib/Target/AArch64/AArch64ISelLowering.cpp | 28 +- .../llvm/lib/Target/AArch64/AArch64ISelLowering.h | 4 +- .../llvm/lib/Target/AArch64/AArch64InstrInfo.cpp | 20 +- .../llvm/lib/Target/AArch64/AArch64InstrInfo.h | 3 - .../Target/AArch64/AArch64LoadStoreOptimizer.cpp | 229 ---------- .../lib/Target/AArch64/AArch64RegisterInfo.cpp | 35 ++ .../llvm/lib/Target/AArch64/AArch64SMEInstrInfo.td | 22 + .../Target/AArch64/AArch64TargetTransformInfo.cpp | 17 +- .../llvm-project/llvm/lib/Target/AMDGPU/AMDGPU.td | 1 + .../llvm/lib/Target/AMDGPU/AMDGPUGISel.td | 24 + .../llvm/lib/Target/AMDGPU/AMDGPUISelDAGToDAG.cpp | 330 ++++++++++++++ .../llvm/lib/Target/AMDGPU/AMDGPUISelDAGToDAG.h | 10 + .../llvm/lib/Target/AMDGPU/AMDGPUISelLowering.cpp | 1 + .../Target/AMDGPU/AMDGPUInstructionSelector.cpp | 213 +++++++++ .../lib/Target/AMDGPU/AMDGPUInstructionSelector.h | 13 + .../llvm/lib/Target/AMDGPU/AMDGPULegalizerInfo.cpp | 79 +++- .../llvm/lib/Target/AMDGPU/AMDGPULegalizerInfo.h | 1 + .../llvm/lib/Target/AMDGPU/AMDGPUPromoteAlloca.cpp | 16 +- .../lib/Target/AMDGPU/AMDGPURegisterBankInfo.cpp | 16 + .../lib/Target/AMDGPU/AMDGPUSearchableTables.td | 16 + .../Target/AMDGPU/AsmParser/AMDGPUAsmParser.cpp | 142 +++++- .../AMDGPU/Disassembler/AMDGPUDisassembler.cpp | 34 ++ .../llvm/lib/Target/AMDGPU/GCNHazardRecognizer.cpp | 19 +- .../AMDGPU/MCTargetDesc/AMDGPUInstPrinter.cpp | 47 ++ .../Target/AMDGPU/MCTargetDesc/AMDGPUInstPrinter.h | 4 + .../llvm/lib/Target/AMDGPU/SIDefines.h | 3 + .../llvm/lib/Target/AMDGPU/SIFoldOperands.cpp | 1 + .../llvm/lib/Target/AMDGPU/SIISelLowering.cpp | 111 ++++- .../llvm/lib/Target/AMDGPU/SIISelLowering.h | 1 + .../llvm/lib/Target/AMDGPU/SIInstrFormats.td | 5 + .../llvm/lib/Target/AMDGPU/SIInstrInfo.h | 8 + .../llvm/lib/Target/AMDGPU/SIInstrInfo.td | 18 +- .../llvm/lib/Target/AMDGPU/SIMachineFunctionInfo.h | 32 +- .../llvm/lib/Target/AMDGPU/SIRegisterInfo.td | 5 + .../lib/Target/AMDGPU/Utils/AMDGPUBaseInfo.cpp | 11 + .../llvm/lib/Target/AMDGPU/Utils/AMDGPUBaseInfo.h | 3 + .../llvm/lib/Target/AMDGPU/VOP1Instructions.td | 93 +++- .../llvm/lib/Target/AMDGPU/VOP3Instructions.td | 53 ++- .../llvm/lib/Target/AMDGPU/VOP3PInstructions.td | 500 ++++++++++++++++++++- .../llvm/lib/Target/AMDGPU/VOPInstructions.td | 32 +- .../llvm/lib/Target/ARM/ARMLowOverheadLoops.cpp | 13 +- .../LoongArch/LoongArchTargetTransformInfo.cpp | 11 +- .../llvm/lib/Target/Mips/MipsAsmPrinter.cpp | 39 -- .../llvm/lib/Target/Mips/MipsAsmPrinter.h | 2 - .../Target/PowerPC/PPCExpandAtomicPseudoInsts.cpp | 14 +- .../llvm/lib/Target/PowerPC/PPCFrameLowering.cpp | 13 +- .../llvm-project/llvm/lib/Target/RISCV/RISCV.td | 6 + .../llvm/lib/Target/RISCV/RISCVFeatures.td | 26 +- .../llvm/lib/Target/RISCV/RISCVISelLowering.cpp | 2 +- .../llvm/lib/Target/RISCV/RISCVInstrInfoZicond.td | 2 - .../llvm/lib/Target/RISCV/RISCVMacroFusion.cpp | 210 --------- .../llvm/lib/Target/RISCV/RISCVMacroFusion.h | 28 -- .../llvm/lib/Target/RISCV/RISCVMacroFusion.td | 93 ++++ .../llvm/lib/Target/RISCV/RISCVSubtarget.cpp | 8 +- .../llvm/lib/Target/RISCV/RISCVSubtarget.h | 8 +- .../llvm/lib/Target/RISCV/RISCVTargetMachine.cpp | 13 +- .../lib/Target/SystemZ/SystemZFrameLowering.cpp | 12 +- .../llvm/lib/Target/X86/X86AsmPrinter.cpp | 1 - .../llvm/lib/Target/X86/X86FrameLowering.cpp | 15 +- .../llvm/lib/Target/X86/X86InstrAVX512.td | 2 +- .../llvm/lib/Target/X86/X86InstrFoldTables.cpp | 11 +- .../llvm/lib/Target/X86/X86InstrInfo.cpp | 35 +- .../llvm/lib/TargetParser/TargetParser.cpp | 1 + .../InstCombine/InstCombineLoadStoreAlloca.cpp | 3 +- .../InstCombine/InstCombineSimplifyDemanded.cpp | 3 + .../Transforms/Scalar/ConstraintElimination.cpp | 7 +- .../llvm/lib/Transforms/Scalar/JumpThreading.cpp | 13 +- .../lib/Transforms/Vectorize/LoopVectorize.cpp | 62 ++- .../llvm/lib/Transforms/Vectorize/VPlanRecipes.cpp | 12 +- .../llvm/utils/TableGen/DAGISelMatcherEmitter.cpp | 3 +- .../llvm/utils/TableGen/PredicateExpander.cpp | 34 ++ .../llvm/utils/TableGen/PredicateExpander.h | 4 + .../llvm/utils/TableGen/X86FoldTablesEmitter.cpp | 58 +-- lib/clang/include/VCSVersion.inc | 6 +- lib/clang/include/lld/Common/Version.inc | 2 +- lib/clang/include/llvm/Support/VCSRevision.h | 2 +- lib/clang/libllvm/Makefile | 3 +- usr.bin/clang/clang/clang-driver.cpp | 2 + usr.bin/clang/lld/lld-driver.cpp | 2 + usr.bin/clang/llvm-ar/llvm-ar-driver.cpp | 2 + usr.bin/clang/llvm-cxxfilt/llvm-cxxfilt-driver.cpp | 2 + usr.bin/clang/llvm-dwp/llvm-dwp-driver.cpp | 2 + usr.bin/clang/llvm-nm/llvm-nm-driver.cpp | 2 + usr.bin/clang/llvm-objcopy/llvm-objcopy-driver.cpp | 2 + usr.bin/clang/llvm-objdump/llvm-objdump-driver.cpp | 2 + .../clang/llvm-profdata/llvm-profdata-driver.cpp | 2 + usr.bin/clang/llvm-readobj/llvm-readobj-driver.cpp | 2 + usr.bin/clang/llvm-size/llvm-size-driver.cpp | 2 + .../llvm-symbolizer/llvm-symbolizer-driver.cpp | 2 + 361 files changed, 4552 insertions(+), 1284 deletions(-) diff --cc contrib/llvm-project/clang/include/clang/Format/Format.h index bc9eecd42f9e,efcb4e1d87ea..efcb4e1d87ea mode 100755,100644..100755 --- a/contrib/llvm-project/clang/include/clang/Format/Format.h +++ b/contrib/llvm-project/clang/include/clang/Format/Format.h diff --cc contrib/llvm-project/clang/lib/Sema/SemaConcept.cpp index acfc00f41254,88fc846c89e4..88fc846c89e4 mode 100755,100644..100755 --- a/contrib/llvm-project/clang/lib/Sema/SemaConcept.cpp +++ b/contrib/llvm-project/clang/lib/Sema/SemaConcept.cpp diff --cc contrib/llvm-project/llvm/lib/Target/RISCV/RISCVMacroFusion.td index 000000000000,875a93d09a2c..875a93d09a2c mode 000000,100644..100644 --- a/contrib/llvm-project/llvm/lib/Target/RISCV/RISCVMacroFusion.td +++ b/contrib/llvm-project/llvm/lib/Target/RISCV/RISCVMacroFusion.td diff --cc lib/clang/include/VCSVersion.inc index ca4f5d50df14,000000000000..78d32ba9f856 mode 100644,000000..100644 --- a/lib/clang/include/VCSVersion.inc +++ b/lib/clang/include/VCSVersion.inc @@@ -1,8 -1,0 +1,8 @@@ - #define LLVM_REVISION "llvmorg-18-init-18361-g22683463740e" ++#define LLVM_REVISION "llvmorg-18.1.0-rc2-0-gc6c86965d967" +#define LLVM_REPOSITORY "https://github.com/llvm/llvm-project.git" + - #define CLANG_REVISION "llvmorg-18-init-18361-g22683463740e" ++#define CLANG_REVISION "llvmorg-18.1.0-rc2-0-gc6c86965d967" +#define CLANG_REPOSITORY "https://github.com/llvm/llvm-project.git" + - #define LLDB_REVISION "llvmorg-18-init-18361-g22683463740e" ++#define LLDB_REVISION "llvmorg-18.1.0-rc2-0-gc6c86965d967" +#define LLDB_REPOSITORY "https://github.com/llvm/llvm-project.git" diff --cc lib/clang/include/lld/Common/Version.inc index e9be63b6430e,000000000000..10c2eab8fae5 mode 100644,000000..100644 --- a/lib/clang/include/lld/Common/Version.inc +++ b/lib/clang/include/lld/Common/Version.inc @@@ -1,4 -1,0 +1,4 @@@ +// Local identifier in __FreeBSD_version style +#define LLD_FREEBSD_VERSION 1500000 + - #define LLD_VERSION_STRING "18.1.0 (FreeBSD llvmorg-18-init-18361-g22683463740e-" __XSTRING(LLD_FREEBSD_VERSION) ")" ++#define LLD_VERSION_STRING "18.1.0 (FreeBSD llvmorg-18.1.0-rc2-0-gc6c86965d967-" __XSTRING(LLD_FREEBSD_VERSION) ")" diff --cc lib/clang/include/llvm/Support/VCSRevision.h index fa5c1df71357,000000000000..261c83737634 mode 100644,000000..100644 --- a/lib/clang/include/llvm/Support/VCSRevision.h +++ b/lib/clang/include/llvm/Support/VCSRevision.h @@@ -1,2 -1,0 +1,2 @@@ - #define LLVM_REVISION "llvmorg-18-init-18361-g22683463740e" ++#define LLVM_REVISION "llvmorg-18.1.0-rc2-0-gc6c86965d967" +#define LLVM_REPOSITORY "https://github.com/llvm/llvm-project.git" diff --cc lib/clang/libllvm/Makefile index 79428f79e097,000000000000..5dc864fabbcd mode 100644,000000..100644 --- a/lib/clang/libllvm/Makefile +++ b/lib/clang/libllvm/Makefile @@@ -1,2282 -1,0 +1,2283 @@@ + +.include +.include "../llvm.pre.mk" + +LIB= llvm +INTERNALLIB= + +CFLAGS+= -I${.OBJDIR} +CFLAGS+= -I${SRCTOP}/sys/contrib/zstd/lib + +.if ${MK_LLVM_TARGET_AARCH64} == "no" && ${MK_LLVM_TARGET_ARM} == "no" && \ + ${MK_LLVM_TARGET_BPF} == "no" && ${MK_LLVM_TARGET_MIPS} == "no" && \ + ${MK_LLVM_TARGET_POWERPC} == "no" && ${MK_LLVM_TARGET_RISCV} == "no" && \ + ${MK_LLVM_TARGET_X86} == "no" +.error Please enable at least one of: MK_LLVM_TARGET_AARCH64,\ + MK_LLVM_TARGET_ARM, MK_LLVM_TARGET_BPF, MK_LLVM_TARGET_MIPS, \ + MK_LLVM_TARGET_POWERPC, MK_LLVM_TARGET_RISCV, or MK_LLVM_TARGET_X86 +.endif + +.for arch in AArch64 ARM BPF Mips PowerPC RISCV X86 +. if ${MK_LLVM_TARGET_${arch:tu}} != "no" +CFLAGS+= -I${LLVM_SRCS}/lib/Target/${arch} +. endif +.endfor + +CFLAGS+= -I${LLVM_SRCS}/lib/ObjCopy + +TARGET_ARCH?= ${MACHINE_ARCH} + +.if ${TARGET_ARCH} != "amd64" +CFLAGS+= -DBLAKE3_NO_AVX512 -DBLAKE3_NO_AVX2 -DBLAKE3_NO_SSE41 \ + -DBLAKE3_NO_SSE2 +.endif +.if ${TARGET_ARCH} != "arm64" +CFLAGS+= -DBLAKE3_USE_NEON=0 +.endif + +SRCDIR= llvm/lib + +# Explanation of different SRCS variants below: +# SRCS_MIN: always required, even for bootstrap +# SRCS_MIW: required for world stage (after cross-tools) +# SRCS_EXT: required for MK_CLANG_EXTRAS +# SRCS_EXL: required for MK_CLANG_EXTRAS and MK_LLD +# SRCS_FUL: required for MK_CLANG_FULL +# SRCS_LLD: required for MK_LLD +# SRCS_XDB: required for MK_CLANG_EXTRAS and MK_LLDB +# SRCS_XDL: required for MK_CLANG_EXTRAS, MK_LLD and MK_LLDB +# SRCS_XDW: required for MK_CLANG_EXTRAS and MK_LLDB in world stage +# SRCS_COV: required for MK_LLVM_COV + +SRCS_MIN+= Analysis/AliasAnalysis.cpp +SRCS_MIN+= Analysis/AliasAnalysisEvaluator.cpp +SRCS_MIN+= Analysis/AliasSetTracker.cpp +SRCS_EXT+= Analysis/Analysis.cpp +SRCS_MIN+= Analysis/AssumeBundleQueries.cpp +SRCS_MIN+= Analysis/AssumptionCache.cpp +SRCS_MIN+= Analysis/BasicAliasAnalysis.cpp +SRCS_MIN+= Analysis/BlockFrequencyInfo.cpp +SRCS_MIN+= Analysis/BlockFrequencyInfoImpl.cpp +SRCS_MIN+= Analysis/BranchProbabilityInfo.cpp +SRCS_MIN+= Analysis/CFG.cpp +SRCS_MIN+= Analysis/CFGPrinter.cpp +SRCS_MIN+= Analysis/CFGSCCPrinter.cpp +SRCS_MIN+= Analysis/CGSCCPassManager.cpp +SRCS_MIN+= Analysis/CallGraph.cpp +SRCS_MIN+= Analysis/CallGraphSCCPass.cpp +SRCS_MIN+= Analysis/CallPrinter.cpp +SRCS_MIN+= Analysis/CaptureTracking.cpp +SRCS_MIN+= Analysis/CmpInstAnalysis.cpp +SRCS_MIN+= Analysis/CodeMetrics.cpp +SRCS_MIN+= Analysis/ConstantFolding.cpp +SRCS_MIN+= Analysis/ConstraintSystem.cpp +SRCS_MIN+= Analysis/CostModel.cpp +SRCS_MIN+= Analysis/CycleAnalysis.cpp +SRCS_MIN+= Analysis/DDG.cpp +SRCS_MIN+= Analysis/DDGPrinter.cpp +SRCS_MIN+= Analysis/Delinearization.cpp +SRCS_MIN+= Analysis/DemandedBits.cpp +SRCS_MIN+= Analysis/DependenceAnalysis.cpp +SRCS_MIN+= Analysis/DependenceGraphBuilder.cpp +SRCS_MIN+= Analysis/DomConditionCache.cpp +SRCS_MIN+= Analysis/DomPrinter.cpp +SRCS_MIN+= Analysis/DomTreeUpdater.cpp +SRCS_MIN+= Analysis/DominanceFrontier.cpp +SRCS_MIN+= Analysis/FunctionPropertiesAnalysis.cpp +SRCS_MIN+= Analysis/GlobalsModRef.cpp +SRCS_MIN+= Analysis/GuardUtils.cpp +SRCS_MIN+= Analysis/HeatUtils.cpp +SRCS_MIN+= Analysis/IRSimilarityIdentifier.cpp +SRCS_MIN+= Analysis/IVDescriptors.cpp +SRCS_MIN+= Analysis/IVUsers.cpp +SRCS_MIN+= Analysis/ImportedFunctionsInliningStatistics.cpp +SRCS_MIN+= Analysis/IndirectCallPromotionAnalysis.cpp +SRCS_MIN+= Analysis/InlineAdvisor.cpp +SRCS_MIN+= Analysis/InlineCost.cpp +SRCS_MIN+= Analysis/InlineOrder.cpp +SRCS_MIN+= Analysis/InlineSizeEstimatorAnalysis.cpp +SRCS_MIN+= Analysis/InstCount.cpp +SRCS_MIN+= Analysis/InstructionPrecedenceTracking.cpp +SRCS_MIN+= Analysis/InstructionSimplify.cpp +SRCS_MIN+= Analysis/InteractiveModelRunner.cpp +SRCS_MIN+= Analysis/Interval.cpp +SRCS_MIN+= Analysis/IntervalPartition.cpp +SRCS_MIN+= Analysis/LazyBlockFrequencyInfo.cpp +SRCS_MIN+= Analysis/LazyBranchProbabilityInfo.cpp +SRCS_MIN+= Analysis/LazyCallGraph.cpp +SRCS_MIN+= Analysis/LazyValueInfo.cpp +SRCS_MIN+= Analysis/Lint.cpp +SRCS_MIN+= Analysis/Loads.cpp +SRCS_MIN+= Analysis/Local.cpp +SRCS_MIN+= Analysis/LoopAccessAnalysis.cpp +SRCS_MIN+= Analysis/LoopAnalysisManager.cpp +SRCS_MIN+= Analysis/LoopCacheAnalysis.cpp +SRCS_MIN+= Analysis/LoopInfo.cpp +SRCS_MIN+= Analysis/LoopNestAnalysis.cpp +SRCS_MIN+= Analysis/LoopPass.cpp +SRCS_MIN+= Analysis/LoopUnrollAnalyzer.cpp +SRCS_MIN+= Analysis/MLInlineAdvisor.cpp +SRCS_MIN+= Analysis/MemDerefPrinter.cpp +SRCS_MIN+= Analysis/MemoryBuiltins.cpp +SRCS_MIN+= Analysis/MemoryDependenceAnalysis.cpp +SRCS_MIN+= Analysis/MemoryLocation.cpp +SRCS_MIN+= Analysis/MemoryProfileInfo.cpp +SRCS_MIN+= Analysis/MemorySSA.cpp +SRCS_MIN+= Analysis/MemorySSAUpdater.cpp +SRCS_MIN+= Analysis/ModuleDebugInfoPrinter.cpp +SRCS_MIN+= Analysis/ModuleSummaryAnalysis.cpp +SRCS_MIN+= Analysis/MustExecute.cpp +SRCS_MIN+= Analysis/ObjCARCAliasAnalysis.cpp +SRCS_MIN+= Analysis/ObjCARCAnalysisUtils.cpp +SRCS_MIN+= Analysis/ObjCARCInstKind.cpp +SRCS_MIN+= Analysis/OptimizationRemarkEmitter.cpp +SRCS_MIN+= Analysis/OverflowInstAnalysis.cpp +SRCS_MIN+= Analysis/PHITransAddr.cpp +SRCS_MIN+= Analysis/PhiValues.cpp +SRCS_MIN+= Analysis/PostDominators.cpp +SRCS_MIN+= Analysis/ProfileSummaryInfo.cpp +SRCS_MIN+= Analysis/PtrUseVisitor.cpp +SRCS_MIN+= Analysis/RegionInfo.cpp +SRCS_MIN+= Analysis/RegionPass.cpp +SRCS_MIN+= Analysis/RegionPrinter.cpp +SRCS_MIN+= Analysis/ReplayInlineAdvisor.cpp +SRCS_MIN+= Analysis/ScalarEvolution.cpp +SRCS_MIN+= Analysis/ScalarEvolution.cpp +SRCS_MIN+= Analysis/ScalarEvolutionAliasAnalysis.cpp +SRCS_MIN+= Analysis/ScalarEvolutionDivision.cpp +SRCS_MIN+= Analysis/ScalarEvolutionNormalization.cpp +SRCS_MIN+= Analysis/ScopedNoAliasAA.cpp +SRCS_MIN+= Analysis/StackLifetime.cpp +SRCS_MIN+= Analysis/StackSafetyAnalysis.cpp +SRCS_MIN+= Analysis/StructuralHash.cpp +SRCS_MIN+= Analysis/SyntheticCountsUtils.cpp +SRCS_MIN+= Analysis/TargetLibraryInfo.cpp +SRCS_MIN+= Analysis/TargetTransformInfo.cpp +SRCS_MIN+= Analysis/TensorSpec.cpp +SRCS_MIN+= Analysis/TrainingLogger.cpp +SRCS_MIN+= Analysis/TypeBasedAliasAnalysis.cpp +SRCS_MIN+= Analysis/TypeMetadataUtils.cpp +SRCS_MIN+= Analysis/UniformityAnalysis.cpp +SRCS_MIN+= Analysis/ValueLattice.cpp +SRCS_MIN+= Analysis/ValueLatticeUtils.cpp +SRCS_MIN+= Analysis/ValueTracking.cpp +SRCS_MIN+= Analysis/VectorUtils.cpp +SRCS_MIN+= AsmParser/LLLexer.cpp +SRCS_MIN+= AsmParser/LLParser.cpp +SRCS_MIN+= AsmParser/Parser.cpp +SRCS_MIN+= BinaryFormat/AMDGPUMetadataVerifier.cpp +SRCS_MIN+= BinaryFormat/COFF.cpp +SRCS_MIN+= BinaryFormat/Dwarf.cpp +SRCS_XDB+= BinaryFormat/ELF.cpp +SRCS_MIN+= BinaryFormat/MachO.cpp +SRCS_MIN+= BinaryFormat/Magic.cpp +SRCS_MIN+= BinaryFormat/MsgPackDocument.cpp +SRCS_MIN+= BinaryFormat/MsgPackDocumentYAML.cpp +SRCS_MIN+= BinaryFormat/MsgPackReader.cpp +SRCS_MIN+= BinaryFormat/MsgPackWriter.cpp +SRCS_MIN+= BinaryFormat/Wasm.cpp +SRCS_MIN+= BinaryFormat/XCOFF.cpp +SRCS_MIN+= Bitcode/Reader/BitReader.cpp +SRCS_EXT+= Bitcode/Reader/BitcodeAnalyzer.cpp +SRCS_MIN+= Bitcode/Reader/BitcodeReader.cpp +SRCS_MIN+= Bitcode/Reader/MetadataLoader.cpp +SRCS_MIN+= Bitcode/Reader/ValueList.cpp +SRCS_MIN+= Bitcode/Writer/BitcodeWriter.cpp +SRCS_MIN+= Bitcode/Writer/BitcodeWriterPass.cpp +SRCS_MIN+= Bitcode/Writer/ValueEnumerator.cpp +SRCS_MIN+= Bitstream/Reader/BitstreamReader.cpp +SRCS_MIN+= CodeGen/AggressiveAntiDepBreaker.cpp +SRCS_MIN+= CodeGen/AllocationOrder.cpp +SRCS_MIN+= CodeGen/Analysis.cpp +SRCS_MIN+= CodeGen/AsmPrinter/AIXException.cpp +SRCS_MIN+= CodeGen/AsmPrinter/ARMException.cpp +SRCS_MIN+= CodeGen/AsmPrinter/AccelTable.cpp +SRCS_MIN+= CodeGen/AsmPrinter/AddressPool.cpp +SRCS_MIN+= CodeGen/AsmPrinter/AsmPrinter.cpp +SRCS_MIN+= CodeGen/AsmPrinter/AsmPrinterDwarf.cpp +SRCS_MIN+= CodeGen/AsmPrinter/AsmPrinterInlineAsm.cpp +SRCS_MIN+= CodeGen/AsmPrinter/CodeViewDebug.cpp +SRCS_MIN+= CodeGen/AsmPrinter/DIE.cpp +SRCS_MIN+= CodeGen/AsmPrinter/DIEHash.cpp +SRCS_MIN+= CodeGen/AsmPrinter/DbgEntityHistoryCalculator.cpp +SRCS_MIN+= CodeGen/AsmPrinter/DebugHandlerBase.cpp +SRCS_MIN+= CodeGen/AsmPrinter/DebugLocStream.cpp +SRCS_MIN+= CodeGen/AsmPrinter/DwarfCFIException.cpp +SRCS_MIN+= CodeGen/AsmPrinter/DwarfCompileUnit.cpp +SRCS_MIN+= CodeGen/AsmPrinter/DwarfDebug.cpp +SRCS_MIN+= CodeGen/AsmPrinter/DwarfExpression.cpp +SRCS_MIN+= CodeGen/AsmPrinter/DwarfFile.cpp +SRCS_MIN+= CodeGen/AsmPrinter/DwarfStringPool.cpp +SRCS_MIN+= CodeGen/AsmPrinter/DwarfUnit.cpp +SRCS_MIN+= CodeGen/AsmPrinter/EHStreamer.cpp +SRCS_EXT+= CodeGen/AsmPrinter/ErlangGCPrinter.cpp +SRCS_MIN+= CodeGen/AsmPrinter/OcamlGCPrinter.cpp +SRCS_MIN+= CodeGen/AsmPrinter/PseudoProbePrinter.cpp +SRCS_MIN+= CodeGen/AsmPrinter/WasmException.cpp +SRCS_MIN+= CodeGen/AsmPrinter/WinCFGuard.cpp +SRCS_MIN+= CodeGen/AsmPrinter/WinException.cpp +SRCS_MIN+= CodeGen/AssignmentTrackingAnalysis.cpp +SRCS_MIN+= CodeGen/AtomicExpandPass.cpp +SRCS_MIN+= CodeGen/BasicBlockPathCloning.cpp +SRCS_MIN+= CodeGen/BasicBlockSections.cpp +SRCS_MIN+= CodeGen/BasicBlockSectionsProfileReader.cpp +SRCS_MIN+= CodeGen/BasicTargetTransformInfo.cpp +SRCS_MIN+= CodeGen/BranchFolding.cpp +SRCS_MIN+= CodeGen/BranchRelaxation.cpp +SRCS_MIN+= CodeGen/BreakFalseDeps.cpp +SRCS_MIN+= CodeGen/CFGuardLongjmp.cpp +SRCS_MIN+= CodeGen/CFIFixup.cpp +SRCS_MIN+= CodeGen/CFIInstrInserter.cpp +SRCS_MIN+= CodeGen/CalcSpillWeights.cpp +SRCS_MIN+= CodeGen/CallBrPrepare.cpp +SRCS_MIN+= CodeGen/CallingConvLower.cpp +SRCS_MIN+= CodeGen/CodeGen.cpp +SRCS_MIN+= CodeGen/CodeGenCommonISel.cpp +SRCS_MIN+= CodeGen/CodeGenPrepare.cpp +SRCS_EXL+= CodeGen/CommandFlags.cpp +SRCS_MIN+= CodeGen/ComplexDeinterleavingPass.cpp +SRCS_MIN+= CodeGen/CriticalAntiDepBreaker.cpp +SRCS_MIN+= CodeGen/DFAPacketizer.cpp +SRCS_MIN+= CodeGen/DeadMachineInstructionElim.cpp +SRCS_MIN+= CodeGen/DetectDeadLanes.cpp +SRCS_MIN+= CodeGen/DwarfEHPrepare.cpp +SRCS_MIN+= CodeGen/EHContGuardCatchret.cpp +SRCS_MIN+= CodeGen/EarlyIfConversion.cpp +SRCS_MIN+= CodeGen/EdgeBundles.cpp +SRCS_MIN+= CodeGen/ExecutionDomainFix.cpp +SRCS_MIN+= CodeGen/ExpandLargeDivRem.cpp +SRCS_MIN+= CodeGen/ExpandLargeFpConvert.cpp +SRCS_MIN+= CodeGen/ExpandMemCmp.cpp +SRCS_MIN+= CodeGen/ExpandPostRAPseudos.cpp +SRCS_MIN+= CodeGen/ExpandReductions.cpp +SRCS_MIN+= CodeGen/ExpandVectorPredication.cpp +SRCS_MIN+= CodeGen/FEntryInserter.cpp +SRCS_MIN+= CodeGen/FaultMaps.cpp +SRCS_MIN+= CodeGen/FinalizeISel.cpp +SRCS_MIN+= CodeGen/FixupStatepointCallerSaved.cpp +SRCS_MIN+= CodeGen/FuncletLayout.cpp +SRCS_MIN+= CodeGen/GCEmptyBasicBlocks.cpp +SRCS_MIN+= CodeGen/GCMetadata.cpp +SRCS_MIN+= CodeGen/GCMetadataPrinter.cpp +SRCS_MIN+= CodeGen/GCRootLowering.cpp +SRCS_MIN+= CodeGen/GlobalISel/CSEInfo.cpp +SRCS_MIN+= CodeGen/GlobalISel/CSEMIRBuilder.cpp +SRCS_MIN+= CodeGen/GlobalISel/CallLowering.cpp +SRCS_MIN+= CodeGen/GlobalISel/Combiner.cpp +SRCS_MIN+= CodeGen/GlobalISel/CombinerHelper.cpp +SRCS_MIN+= CodeGen/GlobalISel/GIMatchTableExecutor.cpp +SRCS_MIN+= CodeGen/GlobalISel/GISelChangeObserver.cpp +SRCS_MIN+= CodeGen/GlobalISel/GISelKnownBits.cpp +SRCS_MIN+= CodeGen/GlobalISel/GlobalISel.cpp +SRCS_MIN+= CodeGen/GlobalISel/IRTranslator.cpp +SRCS_MIN+= CodeGen/GlobalISel/InlineAsmLowering.cpp +SRCS_MIN+= CodeGen/GlobalISel/InstructionSelect.cpp +SRCS_MIN+= CodeGen/GlobalISel/InstructionSelector.cpp +SRCS_MIN+= CodeGen/GlobalISel/LegacyLegalizerInfo.cpp +SRCS_MIN+= CodeGen/GlobalISel/LegalityPredicates.cpp +SRCS_MIN+= CodeGen/GlobalISel/LegalizeMutations.cpp +SRCS_MIN+= CodeGen/GlobalISel/Legalizer.cpp +SRCS_MIN+= CodeGen/GlobalISel/LegalizerHelper.cpp +SRCS_MIN+= CodeGen/GlobalISel/LegalizerInfo.cpp +SRCS_MIN+= CodeGen/GlobalISel/LoadStoreOpt.cpp +SRCS_MIN+= CodeGen/GlobalISel/Localizer.cpp +SRCS_MIN+= CodeGen/GlobalISel/LostDebugLocObserver.cpp +SRCS_MIN+= CodeGen/GlobalISel/MachineIRBuilder.cpp +SRCS_MIN+= CodeGen/GlobalISel/RegBankSelect.cpp +SRCS_MIN+= CodeGen/GlobalISel/Utils.cpp +SRCS_MIN+= CodeGen/GlobalMerge.cpp +SRCS_MIN+= CodeGen/HardwareLoops.cpp +SRCS_MIN+= CodeGen/IfConversion.cpp +SRCS_MIN+= CodeGen/ImplicitNullChecks.cpp +SRCS_MIN+= CodeGen/IndirectBrExpandPass.cpp +SRCS_MIN+= CodeGen/InlineSpiller.cpp +SRCS_MIN+= CodeGen/InterferenceCache.cpp +SRCS_MIN+= CodeGen/InterleavedAccessPass.cpp +SRCS_MIN+= CodeGen/InterleavedLoadCombinePass.cpp +SRCS_MIN+= CodeGen/IntrinsicLowering.cpp +SRCS_MIN+= CodeGen/JMCInstrumenter.cpp +SRCS_MIN+= CodeGen/KCFI.cpp +SRCS_MIN+= CodeGen/LLVMTargetMachine.cpp +SRCS_MIN+= CodeGen/LatencyPriorityQueue.cpp +SRCS_MIN+= CodeGen/LazyMachineBlockFrequencyInfo.cpp +SRCS_MIN+= CodeGen/LexicalScopes.cpp +SRCS_MIN+= CodeGen/LiveDebugValues/InstrRefBasedImpl.cpp +SRCS_MIN+= CodeGen/LiveDebugValues/LiveDebugValues.cpp +SRCS_MIN+= CodeGen/LiveDebugValues/VarLocBasedImpl.cpp +SRCS_MIN+= CodeGen/LiveDebugVariables.cpp +SRCS_MIN+= CodeGen/LiveInterval.cpp +SRCS_MIN+= CodeGen/LiveIntervalCalc.cpp +SRCS_MIN+= CodeGen/LiveIntervalUnion.cpp +SRCS_MIN+= CodeGen/LiveIntervals.cpp +SRCS_MIN+= CodeGen/LivePhysRegs.cpp +SRCS_MIN+= CodeGen/LiveRangeCalc.cpp +SRCS_MIN+= CodeGen/LiveRangeEdit.cpp +SRCS_MIN+= CodeGen/LiveRangeShrink.cpp +SRCS_MIN+= CodeGen/LiveRegMatrix.cpp +SRCS_MIN+= CodeGen/LiveRegUnits.cpp +SRCS_MIN+= CodeGen/LiveStacks.cpp +SRCS_MIN+= CodeGen/LiveVariables.cpp +SRCS_MIN+= CodeGen/LocalStackSlotAllocation.cpp +SRCS_MIN+= CodeGen/LoopTraversal.cpp +SRCS_MIN+= CodeGen/LowLevelType.cpp +SRCS_MIN+= CodeGen/LowLevelTypeUtils.cpp +SRCS_MIN+= CodeGen/LowerEmuTLS.cpp +SRCS_MIN+= CodeGen/MBFIWrapper.cpp +SRCS_MIN+= CodeGen/MIRCanonicalizerPass.cpp +SRCS_MIN+= CodeGen/MIRFSDiscriminator.cpp +SRCS_MIN+= CodeGen/MIRNamerPass.cpp +SRCS_EXT+= CodeGen/MIRParser/MILexer.cpp +SRCS_EXT+= CodeGen/MIRParser/MIParser.cpp +SRCS_EXT+= CodeGen/MIRParser/MIRParser.cpp +SRCS_MIN+= CodeGen/MIRPrinter.cpp +SRCS_MIN+= CodeGen/MIRPrintingPass.cpp +SRCS_MIN+= CodeGen/MIRSampleProfile.cpp +SRCS_MIN+= CodeGen/MIRVRegNamerUtils.cpp +SRCS_MIN+= CodeGen/MLRegAllocEvictAdvisor.cpp +SRCS_MIN+= CodeGen/MLRegAllocPriorityAdvisor.cpp +SRCS_MIN+= CodeGen/MachineBasicBlock.cpp +SRCS_MIN+= CodeGen/MachineBlockFrequencyInfo.cpp +SRCS_MIN+= CodeGen/MachineBlockPlacement.cpp +SRCS_MIN+= CodeGen/MachineBranchProbabilityInfo.cpp +SRCS_MIN+= CodeGen/MachineCFGPrinter.cpp +SRCS_MIN+= CodeGen/MachineCSE.cpp +SRCS_MIN+= CodeGen/MachineCheckDebugify.cpp +SRCS_MIN+= CodeGen/MachineCombiner.cpp +SRCS_MIN+= CodeGen/MachineCopyPropagation.cpp +SRCS_MIN+= CodeGen/MachineCycleAnalysis.cpp +SRCS_MIN+= CodeGen/MachineDebugify.cpp +SRCS_MIN+= CodeGen/MachineDominanceFrontier.cpp +SRCS_MIN+= CodeGen/MachineDominators.cpp +SRCS_MIN+= CodeGen/MachineFrameInfo.cpp +SRCS_MIN+= CodeGen/MachineFunction.cpp +SRCS_MIN+= CodeGen/MachineFunctionPass.cpp +SRCS_MIN+= CodeGen/MachineFunctionPrinterPass.cpp +SRCS_MIN+= CodeGen/MachineFunctionSplitter.cpp +SRCS_MIN+= CodeGen/MachineInstr.cpp +SRCS_MIN+= CodeGen/MachineInstrBundle.cpp +SRCS_MIN+= CodeGen/MachineLICM.cpp +SRCS_MIN+= CodeGen/MachineLateInstrsCleanup.cpp +SRCS_MIN+= CodeGen/MachineLoopInfo.cpp +SRCS_MIN+= CodeGen/MachineLoopUtils.cpp +SRCS_MIN+= CodeGen/MachineModuleInfo.cpp +SRCS_MIN+= CodeGen/MachineModuleInfoImpls.cpp +SRCS_MIN+= CodeGen/MachineModuleSlotTracker.cpp +SRCS_MIN+= CodeGen/MachineOperand.cpp +SRCS_MIN+= CodeGen/MachineOptimizationRemarkEmitter.cpp +SRCS_MIN+= CodeGen/MachineOutliner.cpp +SRCS_MIN+= CodeGen/MachinePassManager.cpp +SRCS_MIN+= CodeGen/MachinePipeliner.cpp +SRCS_MIN+= CodeGen/MachinePostDominators.cpp +SRCS_MIN+= CodeGen/MachineRegionInfo.cpp +SRCS_MIN+= CodeGen/MachineRegisterInfo.cpp +SRCS_MIN+= CodeGen/MachineSSAContext.cpp +SRCS_MIN+= CodeGen/MachineSSAUpdater.cpp +SRCS_MIN+= CodeGen/MachineScheduler.cpp +SRCS_MIN+= CodeGen/MachineSink.cpp +SRCS_MIN+= CodeGen/MachineSizeOpts.cpp +SRCS_MIN+= CodeGen/MachineStableHash.cpp +SRCS_MIN+= CodeGen/MachineStripDebug.cpp +SRCS_MIN+= CodeGen/MachineTraceMetrics.cpp +SRCS_MIN+= CodeGen/MachineUniformityAnalysis.cpp +SRCS_MIN+= CodeGen/MachineVerifier.cpp +SRCS_MIN+= CodeGen/MacroFusion.cpp +SRCS_MIN+= CodeGen/ModuloSchedule.cpp +SRCS_MIN+= CodeGen/MultiHazardRecognizer.cpp +SRCS_EXT+= CodeGen/NonRelocatableStringpool.cpp +SRCS_MIN+= CodeGen/OptimizePHIs.cpp +SRCS_MIN+= CodeGen/PHIElimination.cpp +SRCS_MIN+= CodeGen/PHIEliminationUtils.cpp +SRCS_MIN+= CodeGen/ParallelCG.cpp +SRCS_MIN+= CodeGen/PatchableFunction.cpp +SRCS_MIN+= CodeGen/PeepholeOptimizer.cpp +SRCS_MIN+= CodeGen/PostRAHazardRecognizer.cpp +SRCS_MIN+= CodeGen/PostRASchedulerList.cpp +SRCS_MIN+= CodeGen/PreISelIntrinsicLowering.cpp +SRCS_MIN+= CodeGen/ProcessImplicitDefs.cpp +SRCS_MIN+= CodeGen/PrologEpilogInserter.cpp +SRCS_MIN+= CodeGen/PseudoProbeInserter.cpp +SRCS_MIN+= CodeGen/PseudoSourceValue.cpp +SRCS_MIN+= CodeGen/RDFGraph.cpp +SRCS_MIN+= CodeGen/RDFLiveness.cpp +SRCS_MIN+= CodeGen/RDFRegisters.cpp +SRCS_MIN+= CodeGen/ReachingDefAnalysis.cpp +SRCS_MIN+= CodeGen/RegAllocBase.cpp +SRCS_MIN+= CodeGen/RegAllocBasic.cpp +SRCS_MIN+= CodeGen/RegAllocEvictionAdvisor.cpp +SRCS_MIN+= CodeGen/RegAllocFast.cpp +SRCS_MIN+= CodeGen/RegAllocGreedy.cpp +SRCS_MIN+= CodeGen/RegAllocPBQP.cpp +SRCS_MIN+= CodeGen/RegAllocPriorityAdvisor.cpp +SRCS_MIN+= CodeGen/RegUsageInfoCollector.cpp +SRCS_MIN+= CodeGen/RegUsageInfoPropagate.cpp +SRCS_MIN+= CodeGen/RegisterBank.cpp +SRCS_MIN+= CodeGen/RegisterBankInfo.cpp +SRCS_MIN+= CodeGen/RegisterClassInfo.cpp +SRCS_MIN+= CodeGen/RegisterCoalescer.cpp +SRCS_MIN+= CodeGen/RegisterPressure.cpp +SRCS_MIN+= CodeGen/RegisterScavenging.cpp +SRCS_MIN+= CodeGen/RegisterUsageInfo.cpp +SRCS_MIN+= CodeGen/RemoveRedundantDebugValues.cpp +SRCS_MIN+= CodeGen/RenameIndependentSubregs.cpp +SRCS_MIN+= CodeGen/ReplaceWithVeclib.cpp +SRCS_MIN+= CodeGen/ResetMachineFunctionPass.cpp +SRCS_MIN+= CodeGen/SafeStack.cpp +SRCS_MIN+= CodeGen/SafeStackLayout.cpp +SRCS_MIN+= CodeGen/SanitizerBinaryMetadata.cpp +SRCS_MIN+= CodeGen/ScheduleDAG.cpp +SRCS_MIN+= CodeGen/ScheduleDAGInstrs.cpp +SRCS_MIN+= CodeGen/ScheduleDAGPrinter.cpp +SRCS_MIN+= CodeGen/ScoreboardHazardRecognizer.cpp +SRCS_MIN+= CodeGen/SelectOptimize.cpp +SRCS_MIN+= CodeGen/SelectionDAG/DAGCombiner.cpp +SRCS_MIN+= CodeGen/SelectionDAG/FastISel.cpp +SRCS_MIN+= CodeGen/SelectionDAG/FunctionLoweringInfo.cpp +SRCS_MIN+= CodeGen/SelectionDAG/InstrEmitter.cpp +SRCS_MIN+= CodeGen/SelectionDAG/LegalizeDAG.cpp +SRCS_MIN+= CodeGen/SelectionDAG/LegalizeFloatTypes.cpp +SRCS_MIN+= CodeGen/SelectionDAG/LegalizeIntegerTypes.cpp +SRCS_MIN+= CodeGen/SelectionDAG/LegalizeTypes.cpp +SRCS_MIN+= CodeGen/SelectionDAG/LegalizeTypesGeneric.cpp +SRCS_MIN+= CodeGen/SelectionDAG/LegalizeVectorOps.cpp +SRCS_MIN+= CodeGen/SelectionDAG/LegalizeVectorTypes.cpp +SRCS_MIN+= CodeGen/SelectionDAG/ResourcePriorityQueue.cpp +SRCS_MIN+= CodeGen/SelectionDAG/ScheduleDAGFast.cpp +SRCS_MIN+= CodeGen/SelectionDAG/ScheduleDAGRRList.cpp +SRCS_MIN+= CodeGen/SelectionDAG/ScheduleDAGSDNodes.cpp +SRCS_MIN+= CodeGen/SelectionDAG/ScheduleDAGVLIW.cpp +SRCS_MIN+= CodeGen/SelectionDAG/SelectionDAG.cpp +SRCS_MIN+= CodeGen/SelectionDAG/SelectionDAGAddressAnalysis.cpp +SRCS_MIN+= CodeGen/SelectionDAG/SelectionDAGBuilder.cpp +SRCS_MIN+= CodeGen/SelectionDAG/SelectionDAGDumper.cpp +SRCS_MIN+= CodeGen/SelectionDAG/SelectionDAGISel.cpp +SRCS_MIN+= CodeGen/SelectionDAG/SelectionDAGPrinter.cpp +SRCS_MIN+= CodeGen/SelectionDAG/SelectionDAGTargetInfo.cpp +SRCS_MIN+= CodeGen/SelectionDAG/StatepointLowering.cpp +SRCS_MIN+= CodeGen/SelectionDAG/TargetLowering.cpp +SRCS_MIN+= CodeGen/ShadowStackGCLowering.cpp +SRCS_MIN+= CodeGen/ShrinkWrap.cpp +SRCS_MIN+= CodeGen/SjLjEHPrepare.cpp +SRCS_MIN+= CodeGen/SlotIndexes.cpp +SRCS_MIN+= CodeGen/SpillPlacement.cpp +SRCS_MIN+= CodeGen/SplitKit.cpp +SRCS_MIN+= CodeGen/StackColoring.cpp +SRCS_MIN+= CodeGen/StackFrameLayoutAnalysisPass.cpp +SRCS_MIN+= CodeGen/StackMapLivenessAnalysis.cpp +SRCS_MIN+= CodeGen/StackMaps.cpp +SRCS_MIN+= CodeGen/StackProtector.cpp +SRCS_MIN+= CodeGen/StackSlotColoring.cpp +SRCS_MIN+= CodeGen/SwiftErrorValueTracking.cpp +SRCS_MIN+= CodeGen/SwitchLoweringUtils.cpp +SRCS_MIN+= CodeGen/TailDuplication.cpp +SRCS_MIN+= CodeGen/TailDuplicator.cpp +SRCS_MIN+= CodeGen/TargetFrameLoweringImpl.cpp +SRCS_MIN+= CodeGen/TargetInstrInfo.cpp +SRCS_MIN+= CodeGen/TargetLoweringBase.cpp +SRCS_MIN+= CodeGen/TargetLoweringObjectFileImpl.cpp +SRCS_MIN+= CodeGen/TargetOptionsImpl.cpp +SRCS_MIN+= CodeGen/TargetPassConfig.cpp +SRCS_MIN+= CodeGen/TargetRegisterInfo.cpp +SRCS_MIN+= CodeGen/TargetSchedule.cpp +SRCS_MIN+= CodeGen/TargetSubtargetInfo.cpp +SRCS_MIN+= CodeGen/TwoAddressInstructionPass.cpp +SRCS_MIN+= CodeGen/TypePromotion.cpp +SRCS_MIN+= CodeGen/UnreachableBlockElim.cpp +SRCS_MIN+= CodeGen/ValueTypes.cpp +SRCS_MIN+= CodeGen/VirtRegMap.cpp +SRCS_MIN+= CodeGen/WasmEHPrepare.cpp +SRCS_MIN+= CodeGen/WinEHPrepare.cpp +SRCS_MIN+= CodeGen/XRayInstrumentation.cpp +SRCS_EXT+= DWARFLinker/Classic/DWARFLinker.cpp +SRCS_EXT+= DWARFLinker/Classic/DWARFLinkerCompileUnit.cpp +SRCS_EXT+= DWARFLinker/Classic/DWARFLinkerDeclContext.cpp +SRCS_EXT+= DWARFLinker/Classic/DWARFStreamer.cpp +SRCS_EXT+= DWARFLinker/DWARFLinkerBase.cpp +SRCS_EXT+= DWARFLinker/Parallel/AcceleratorRecordsSaver.cpp +SRCS_EXT+= DWARFLinker/Parallel/DIEAttributeCloner.cpp +SRCS_EXT+= DWARFLinker/Parallel/DWARFEmitterImpl.cpp +SRCS_EXT+= DWARFLinker/Parallel/DWARFLinker.cpp +SRCS_EXT+= DWARFLinker/Parallel/DWARFLinkerCompileUnit.cpp +SRCS_EXT+= DWARFLinker/Parallel/DWARFLinkerImpl.cpp +SRCS_EXT+= DWARFLinker/Parallel/DWARFLinkerTypeUnit.cpp +SRCS_EXT+= DWARFLinker/Parallel/DWARFLinkerUnit.cpp +SRCS_EXT+= DWARFLinker/Parallel/DependencyTracker.cpp +SRCS_EXT+= DWARFLinker/Parallel/OutputSections.cpp +SRCS_EXT+= DWARFLinker/Parallel/SyntheticTypeNameBuilder.cpp +SRCS_EXT+= DWARFLinker/Utils.cpp +SRCS_EXT+= DWP/DWP.cpp +SRCS_EXT+= DWP/DWPError.cpp +SRCS_MIW+= DebugInfo/BTF/BTFContext.cpp +SRCS_MIW+= DebugInfo/BTF/BTFParser.cpp +SRCS_EXT+= DebugInfo/CodeView/AppendingTypeTableBuilder.cpp +SRCS_MIN+= DebugInfo/CodeView/CVSymbolVisitor.cpp +SRCS_MIN+= DebugInfo/CodeView/CVTypeVisitor.cpp +SRCS_MIN+= DebugInfo/CodeView/CodeViewError.cpp +SRCS_MIN+= DebugInfo/CodeView/CodeViewRecordIO.cpp +SRCS_MIN+= DebugInfo/CodeView/ContinuationRecordBuilder.cpp +SRCS_MIN+= DebugInfo/CodeView/DebugChecksumsSubsection.cpp +SRCS_EXT+= DebugInfo/CodeView/DebugCrossExSubsection.cpp +SRCS_EXT+= DebugInfo/CodeView/DebugCrossImpSubsection.cpp +SRCS_MIN+= DebugInfo/CodeView/DebugFrameDataSubsection.cpp +SRCS_MIN+= DebugInfo/CodeView/DebugInlineeLinesSubsection.cpp +SRCS_MIN+= DebugInfo/CodeView/DebugLinesSubsection.cpp +SRCS_MIN+= DebugInfo/CodeView/DebugStringTableSubsection.cpp +SRCS_MIW+= DebugInfo/CodeView/DebugSubsection.cpp +SRCS_EXT+= DebugInfo/CodeView/DebugSubsectionRecord.cpp +SRCS_EXT+= DebugInfo/CodeView/DebugSubsectionVisitor.cpp +SRCS_EXT+= DebugInfo/CodeView/DebugSymbolRVASubsection.cpp +SRCS_EXT+= DebugInfo/CodeView/DebugSymbolsSubsection.cpp +SRCS_MIN+= DebugInfo/CodeView/EnumTables.cpp +SRCS_MIN+= DebugInfo/CodeView/Formatters.cpp +SRCS_MIN+= DebugInfo/CodeView/GlobalTypeTableBuilder.cpp +SRCS_MIN+= DebugInfo/CodeView/LazyRandomTypeCollection.cpp +SRCS_MIN+= DebugInfo/CodeView/Line.cpp +SRCS_MIN+= DebugInfo/CodeView/MergingTypeTableBuilder.cpp +SRCS_MIN+= DebugInfo/CodeView/RecordName.cpp +SRCS_MIN+= DebugInfo/CodeView/RecordSerialization.cpp +SRCS_MIN+= DebugInfo/CodeView/SimpleTypeSerializer.cpp +SRCS_EXT+= DebugInfo/CodeView/StringsAndChecksums.cpp +SRCS_MIN+= DebugInfo/CodeView/SymbolDumper.cpp +SRCS_MIN+= DebugInfo/CodeView/SymbolRecordHelpers.cpp +SRCS_MIN+= DebugInfo/CodeView/SymbolRecordMapping.cpp +SRCS_EXT+= DebugInfo/CodeView/SymbolSerializer.cpp +SRCS_MIN+= DebugInfo/CodeView/TypeDumpVisitor.cpp +SRCS_MIN+= DebugInfo/CodeView/TypeHashing.cpp +SRCS_MIN+= DebugInfo/CodeView/TypeIndex.cpp +SRCS_MIN+= DebugInfo/CodeView/TypeIndexDiscovery.cpp *** 2026 LINES SKIPPED *** From nobody Sat Apr 6 20:18:55 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VBmsG6xZCz5HH1Y; Sat, 6 Apr 2024 20:18: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 4VBmsG5JMMz4MDx; Sat, 6 Apr 2024 20:18:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712434738; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sj0n+HFJN5PzR8XDstWfDkOIJNSqs2FbhpSDdVaKyJw=; b=pmbUXgUYW4YZ+uRZbsSsG1nSBBMwM744Xy+v3pBc4+nvdNql3qKva1YETLH3Px0kKRF092 9oi5yM/vDIkvYJUdRgOvDEryaSuCoYssr9C4khQ71goU20mgQkqiECLEDaCqhWFX9kt8r/ Yp8uMoenPzoXO7rmjthRp78A/sqjUnZbYaW2RhlB2YRW0He7uwLasQXUD55FKExtup/R2c v2LxfpyAdVESo/4pKuIJT0n7fEYw+mKB7DEJVPMn9IGwJJ3f/npeomlhuEqhQPBNPhyD9S cUjilz5L58a8mnBVGXV62xPx8pguWwNJE2JBznTwQolOBm3hUZ1RkcV+ivHLDw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712434738; a=rsa-sha256; cv=none; b=ZT4MgYip8HP34W3IAqPFU8Fh9FOk4gK/vT9deeusk4xLsSEgDFXyNbvLhzYn6VG4SAuQlD FeJ6lO3G6iLDEsyiauwcUNY7wclivcUc51qD/k4n6HIzXCWl186fEtejzbcCs0ujtV843D 3Uf5OCjjbzRrBhBq4Vxl6dHsdAIijFRMmeO0XfuXfyaHzwdmeaV2B5TQUDeDarFGOk9d5w 5tAFES1l87XfiEfo3iBmqnagxhyeZjmx9l0+cfhod91+MMbHbbIU+nO8xy1bVGsvuzGiyH jv0SYIQovVuc/Y7YSJ399qrqtXFZbtwmPU9eiUguSFjcBkLOHcth6N9tri4WGg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712434738; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sj0n+HFJN5PzR8XDstWfDkOIJNSqs2FbhpSDdVaKyJw=; b=c4+7UE5qGkN5TNJifW2EmLJIDQZsfqtnxtnYofPuDbVuvP3JukNMn9L0pUmeLZqPu6P+2L Wb1GxhAfc/56v96NGBRUH7ic9VZaUzatoM/9eJ3LdVgHBnJl+m86NGUmZbPGvh5Y3G/D5b 1mG3cne05S5T5Ea9EiVBGi4oFZijWFRbZq6YgWAUiaMZc7zR8a9R4fitb2pc+bGsOfnk2y iDqFgIuYdftBIMOnAiowD3YnrwMY0ISHCEkxMQiE94pdB3EV4ld1qNPXRJQbwY9y3E3Ulv FdQ5civY9qMoiOtK0BKFw8QtSDilusJQnKGn94T2KZoWS4+VMU3vm2nRh9V26A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VBmsG4BPNzxcs; Sat, 6 Apr 2024 20:18: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 436KIwGU030189; Sat, 6 Apr 2024 20:18:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 436KItB9030185; Sat, 6 Apr 2024 20:18:55 GMT (envelope-from git) Date: Sat, 6 Apr 2024 20:18:55 GMT Message-Id: <202404062018.436KItB9030185@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dimitry Andric Subject: git: 74626c16ff48 - main - Merge llvm-project release/18.x llvmorg-18.1.0-rc2-53-gc7b0a6ecd442 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 74626c16ff489c0d64cf2843dfd522e7c544f3ce Auto-Submitted: auto-generated The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=74626c16ff489c0d64cf2843dfd522e7c544f3ce commit 74626c16ff489c0d64cf2843dfd522e7c544f3ce Merge: b3edf4467982 e15a4f0a320e Author: Dimitry Andric AuthorDate: 2024-02-20 18:57:23 +0000 Commit: Dimitry Andric CommitDate: 2024-04-06 20:14:13 +0000 Merge llvm-project release/18.x llvmorg-18.1.0-rc2-53-gc7b0a6ecd442 This updates llvm, clang, compiler-rt, libc++, libunwind, lld, lldb and openmp to llvm-project release/18.x llvmorg-18.1.0-rc2-53-gc7b0a6ecd442. PR: 276104 MFC after: 1 month .../clang/include/clang/Basic/arm_sme.td | 28 +- .../clang/include/clang/Driver/Options.td | 12 + .../clang/lib/Basic/Targets/AArch64.cpp | 9 +- .../clang/lib/Driver/ToolChains/Arch/Sparc.cpp | 81 +++ .../clang/lib/Format/UnwrappedLineParser.cpp | 2 +- contrib/llvm-project/clang/lib/Sema/SemaExpr.cpp | 2 +- .../clang/tools/clang-format/ClangFormat.cpp | 49 +- .../compiler-rt/lib/dfsan/dfsan_custom.cpp | 203 ++----- .../compiler-rt/lib/dfsan/done_abilist.txt | 6 + .../lib/dfsan/libc_ubuntu1404_abilist.txt | 5 + .../lib/profile/InstrProfilingPlatformAIX.c | 4 +- contrib/llvm-project/libcxx/include/print | 14 +- .../llvm-project/libcxx/modules/CMakeLists.txt.in | 88 +++ .../llvm-project/libcxx/modules/std/ostream.inc | 4 +- contrib/llvm-project/libcxx/src/print.cpp | 25 +- contrib/llvm-project/lld/COFF/Driver.cpp | 10 +- contrib/llvm-project/lld/ELF/Arch/LoongArch.cpp | 156 +++++- contrib/llvm-project/lld/ELF/Arch/RISCV.cpp | 29 +- contrib/llvm-project/lld/ELF/Arch/SystemZ.cpp | 607 +++++++++++++++++++++ contrib/llvm-project/lld/ELF/Driver.cpp | 3 +- contrib/llvm-project/lld/ELF/InputFiles.cpp | 2 + contrib/llvm-project/lld/ELF/InputSection.cpp | 14 +- contrib/llvm-project/lld/ELF/InputSection.h | 24 +- contrib/llvm-project/lld/ELF/Relocations.cpp | 27 +- contrib/llvm-project/lld/ELF/Relocations.h | 3 + contrib/llvm-project/lld/ELF/ScriptParser.cpp | 1 + contrib/llvm-project/lld/ELF/SyntheticSections.cpp | 3 + contrib/llvm-project/lld/ELF/Target.cpp | 2 + contrib/llvm-project/lld/ELF/Target.h | 4 + contrib/llvm-project/lld/ELF/Writer.cpp | 4 +- contrib/llvm-project/lld/docs/ReleaseNotes.rst | 53 +- .../llvm/include/llvm/BinaryFormat/ELF.h | 1 + .../llvm/lib/Analysis/ValueTracking.cpp | 7 +- .../lib/CodeGen/GlobalISel/LegalizerHelper.cpp | 2 + .../llvm/lib/CodeGen/RegisterCoalescer.cpp | 27 +- .../llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp | 2 +- .../lib/Target/AArch64/AArch64ISelLowering.cpp | 11 +- .../lib/Target/AArch64/AArch64RegisterInfo.cpp | 4 + .../Target/AArch64/GISel/AArch64LegalizerInfo.cpp | 5 +- .../lib/Target/Mips/AsmParser/MipsAsmParser.cpp | 7 +- .../llvm/lib/Target/RISCV/RISCVISelLowering.cpp | 98 ++-- .../llvm/lib/Target/RISCV/RISCVInstrInfo.cpp | 3 +- .../llvm-project/llvm/lib/Target/Sparc/Sparc.td | 14 + .../llvm/lib/Target/Sparc/SparcISelLowering.cpp | 43 ++ .../llvm/lib/Target/Sparc/SparcRegisterInfo.cpp | 14 +- .../llvm/lib/Target/Sparc/SparcRegisterInfo.h | 1 + .../llvm/lib/Target/Sparc/SparcRegisterInfo.td | 4 + .../llvm/lib/Target/Sparc/SparcSubtarget.cpp | 1 + .../llvm/lib/Target/Sparc/SparcSubtarget.h | 10 + .../llvm/lib/Target/X86/X86ISelLowering.cpp | 10 +- .../llvm/lib/Transforms/IPO/LowerTypeTests.cpp | 28 +- .../lib/Transforms/Vectorize/SLPVectorizer.cpp | 14 +- contrib/llvm-project/openmp/runtime/src/kmp.h | 7 +- .../openmp/runtime/src/kmp_csupport.cpp | 5 +- .../openmp/runtime/src/kmp_gsupport.cpp | 2 +- .../llvm-project/openmp/runtime/src/kmp_lock.cpp | 6 +- contrib/llvm-project/openmp/runtime/src/kmp_lock.h | 17 +- .../openmp/runtime/src/kmp_settings.cpp | 5 + lib/clang/include/VCSVersion.inc | 6 +- lib/clang/include/lld/Common/Version.inc | 2 +- lib/clang/include/llvm/Support/VCSRevision.h | 2 +- usr.bin/clang/lld/Makefile | 1 + 62 files changed, 1481 insertions(+), 352 deletions(-) diff --cc contrib/llvm-project/libcxx/modules/CMakeLists.txt.in index 000000000000,e332d70cc163..e332d70cc163 mode 000000,100644..100644 --- a/contrib/llvm-project/libcxx/modules/CMakeLists.txt.in +++ b/contrib/llvm-project/libcxx/modules/CMakeLists.txt.in diff --cc contrib/llvm-project/lld/ELF/Arch/SystemZ.cpp index 000000000000,d37db6877559..d37db6877559 mode 000000,100644..100644 --- a/contrib/llvm-project/lld/ELF/Arch/SystemZ.cpp +++ b/contrib/llvm-project/lld/ELF/Arch/SystemZ.cpp diff --cc lib/clang/include/VCSVersion.inc index 78d32ba9f856,000000000000..fd0a56bce1b7 mode 100644,000000..100644 --- a/lib/clang/include/VCSVersion.inc +++ b/lib/clang/include/VCSVersion.inc @@@ -1,8 -1,0 +1,8 @@@ - #define LLVM_REVISION "llvmorg-18.1.0-rc2-0-gc6c86965d967" ++#define LLVM_REVISION "llvmorg-18.1.0-rc2-53-gc7b0a6ecd442" +#define LLVM_REPOSITORY "https://github.com/llvm/llvm-project.git" + - #define CLANG_REVISION "llvmorg-18.1.0-rc2-0-gc6c86965d967" ++#define CLANG_REVISION "llvmorg-18.1.0-rc2-53-gc7b0a6ecd442" +#define CLANG_REPOSITORY "https://github.com/llvm/llvm-project.git" + - #define LLDB_REVISION "llvmorg-18.1.0-rc2-0-gc6c86965d967" ++#define LLDB_REVISION "llvmorg-18.1.0-rc2-53-gc7b0a6ecd442" +#define LLDB_REPOSITORY "https://github.com/llvm/llvm-project.git" diff --cc lib/clang/include/lld/Common/Version.inc index 10c2eab8fae5,000000000000..87eb422879b9 mode 100644,000000..100644 --- a/lib/clang/include/lld/Common/Version.inc +++ b/lib/clang/include/lld/Common/Version.inc @@@ -1,4 -1,0 +1,4 @@@ +// Local identifier in __FreeBSD_version style +#define LLD_FREEBSD_VERSION 1500000 + - #define LLD_VERSION_STRING "18.1.0 (FreeBSD llvmorg-18.1.0-rc2-0-gc6c86965d967-" __XSTRING(LLD_FREEBSD_VERSION) ")" ++#define LLD_VERSION_STRING "18.1.0 (FreeBSD llvmorg-18.1.0-rc2-53-gc7b0a6ecd442-" __XSTRING(LLD_FREEBSD_VERSION) ")" diff --cc lib/clang/include/llvm/Support/VCSRevision.h index 261c83737634,000000000000..d06ac507357e mode 100644,000000..100644 --- a/lib/clang/include/llvm/Support/VCSRevision.h +++ b/lib/clang/include/llvm/Support/VCSRevision.h @@@ -1,2 -1,0 +1,2 @@@ - #define LLVM_REVISION "llvmorg-18.1.0-rc2-0-gc6c86965d967" ++#define LLVM_REVISION "llvmorg-18.1.0-rc2-53-gc7b0a6ecd442" +#define LLVM_REPOSITORY "https://github.com/llvm/llvm-project.git" diff --cc usr.bin/clang/lld/Makefile index e68a1f803cf4,000000000000..8fbc41ee992a mode 100644,000000..100644 --- a/usr.bin/clang/lld/Makefile +++ b/usr.bin/clang/lld/Makefile @@@ -1,109 -1,0 +1,110 @@@ + +.include + +LLVM_BASE= ${SRCTOP}/contrib/llvm-project +LLVM_SRCS= ${LLVM_BASE}/llvm +LLD_SRCS= ${LLVM_BASE}/lld + +PACKAGE= lld +PROG_CXX= ld.lld +# Man page directory +.PATH: ${LLD_SRCS}/docs +.if !defined(TOOLS_PREFIX) || \ + (defined(TOOLS_PREFIX) && ${MK_LLD_BOOTSTRAP} != "no") +SYMLINKS= ${PROG_CXX} ${BINDIR}/ld +MLINKS= ld.lld.1 ld.1 +.endif + +.include "${SRCTOP}/lib/clang/llvm.pre.mk" + +CFLAGS+= -I${LLD_SRCS}/ELF +CFLAGS+= -I${LLD_SRCS}/include +CFLAGS+= -I${.OBJDIR} +CFLAGS+= -I${OBJTOP}/lib/clang/libllvm +CFLAGS+= -I${SRCTOP}/sys/contrib/zstd/lib + +SRCDIR= lld +SRCS+= Common/Args.cpp +SRCS+= Common/CommonLinkerContext.cpp +SRCS+= Common/DWARF.cpp +SRCS+= Common/DriverDispatcher.cpp +SRCS+= Common/ErrorHandler.cpp +SRCS+= Common/Filesystem.cpp +SRCS+= Common/Memory.cpp +SRCS+= Common/Reproduce.cpp +SRCS+= Common/Strings.cpp +SRCS+= Common/TargetOptionsCommandFlags.cpp +SRCS+= Common/Version.cpp +SRCS+= ELF/AArch64ErrataFix.cpp +SRCS+= ELF/ARMErrataFix.cpp +SRCS+= ELF/Arch/AArch64.cpp +SRCS+= ELF/Arch/AMDGPU.cpp +SRCS+= ELF/Arch/ARM.cpp +SRCS+= ELF/Arch/AVR.cpp +SRCS+= ELF/Arch/Hexagon.cpp +SRCS+= ELF/Arch/LoongArch.cpp +SRCS+= ELF/Arch/MSP430.cpp +SRCS+= ELF/Arch/Mips.cpp +SRCS+= ELF/Arch/MipsArchTree.cpp +SRCS+= ELF/Arch/PPC.cpp +SRCS+= ELF/Arch/PPC64.cpp +SRCS+= ELF/Arch/RISCV.cpp +SRCS+= ELF/Arch/SPARCV9.cpp ++SRCS+= ELF/Arch/SystemZ.cpp +SRCS+= ELF/Arch/X86.cpp +SRCS+= ELF/Arch/X86_64.cpp +SRCS+= ELF/CallGraphSort.cpp +SRCS+= ELF/DWARF.cpp +SRCS+= ELF/Driver.cpp +SRCS+= ELF/DriverUtils.cpp +SRCS+= ELF/EhFrame.cpp +SRCS+= ELF/ICF.cpp +SRCS+= ELF/InputFiles.cpp +SRCS+= ELF/InputSection.cpp +SRCS+= ELF/LTO.cpp +SRCS+= ELF/LinkerScript.cpp +SRCS+= ELF/MapFile.cpp +SRCS+= ELF/MarkLive.cpp +SRCS+= ELF/OutputSections.cpp +SRCS+= ELF/Relocations.cpp +SRCS+= ELF/ScriptLexer.cpp +SRCS+= ELF/ScriptParser.cpp +SRCS+= ELF/SymbolTable.cpp +SRCS+= ELF/Symbols.cpp +SRCS+= ELF/SyntheticSections.cpp +SRCS+= ELF/Target.cpp +SRCS+= ELF/Thunks.cpp +SRCS+= ELF/Writer.cpp +SRCS+= lld-driver.cpp +SRCS+= tools/lld/lld.cpp + +.include "${SRCTOP}/lib/clang/llvm.build.mk" + +LIBDEPS+= llvm + +.for lib in ${LIBDEPS} +DPADD+= ${OBJTOP}/lib/clang/lib${lib}/lib${lib}.a +LDADD+= ${OBJTOP}/lib/clang/lib${lib}/lib${lib}.a +.endfor + +INCFILE= Options.inc +TDFILE= ${LLD_SRCS}/ELF/Options.td +GENOPT= -gen-opt-parser-defs +${INCFILE}: ${TDFILE} + ${LLVM_TBLGEN} ${GENOPT} -I ${LLVM_SRCS}/include -d ${.TARGET:C/$/.d/} \ + -o ${.TARGET} ${TDFILE} +TGHDRS+= ${INCFILE} + +DEPENDFILES+= ${TGHDRS:C/$/.d/} +DPSRCS+= ${TGHDRS} +CLEANFILES+= ${TGHDRS} ${TGHDRS:C/$/.d/} + +.if ${.MAKE.OS} == "FreeBSD" || !defined(BOOTSTRAPPING) +LIBADD+= execinfo +LIBADD+= tinfow +.endif +LIBADD+= pthread +LIBADD+= z +LIBADD+= zstd + +.include From nobody Sat Apr 6 20:19:05 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VBmsT01N9z5HGyc; Sat, 6 Apr 2024 20:19: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 4VBmsS3Hyxz4MT1; Sat, 6 Apr 2024 20:19:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712434748; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rdZf1NOfYeWcV/YL6ngtv4rdnxjTJi+ujVLsx3wsCto=; b=Um9JWNxlA/8F43bmWwjpmDo7ztk/cfbbDdnMTIP0VuCi5QTdNNzYH9FUY8eaqEPZkjVW/Z EwppCPNvqFalvTRPcZlT6RCE12P9iNdWDYR/eBLwK+Xn4Ld/N3r4oWcOhFxmUlQZxmYexa ERW0UpIqIOf6roiv6XBqgzmtX3TiK45NSn0CmZkZpeIOw+scO9t1EaWpFs/BG8jR4TCFhO 6FX28SSjuH6wDpcxCnP1+RoNAHKGHF+KF8KQ4KH7OE+dUegipSFlRWss/FiVPlQwf+H15Q fhi8dtg07gqMsC9guwD5BPL6NggPtyTeTFm+kH2u207le6IT4ydEP6klVhDElg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712434748; a=rsa-sha256; cv=none; b=GfpclEeYpxuw+Ks8ss2CGIwdFptFxAl2JWDQz76MGtumZa1g77pWHYNyBjLN7HsQGmifi5 FRxsbMdKnWQ4eTaQpL75XowjvzvT7L9q1djCSmvKNkSeCAU0QOb5ji91pkI6SGCrpVlhaB kPqQfN1puKI4wWBIU1lWpaSR9TH/gLSbnBJlB7HpmW1EQZiqO+Bexd+5oLXwqT5+Dlunj0 n4kqQqS8qE7YNgKdLzlR8oa/GDowZg6KRDx2Yb41PDcCYa0U3biwFa7kivH95yVnR7qrRj PEMG1pZoA13Xy9jO8ykpq45BvukGZg5KdJiF4LdgvSnTy7FRY2OV9oK7OBUzZA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712434748; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rdZf1NOfYeWcV/YL6ngtv4rdnxjTJi+ujVLsx3wsCto=; b=BSMLUiNxzk6Wf7lHz3UXu/9BlmtPm0TKNQY1a4WEGWq6tqDRTk+C/EnBLnnmaxrAf8Rt75 TsqBW+RIy4yHkZ9dViN8pNCsUQNrQI1OGXKYXRl+Jdtz/NEG6sIQUzlT5dkbCp82OnEhHm kVr81yQvFG0mFrw25goFIIp0GkAdwfD/vRp56b9Yc0VH3c62G1uBWl+mPU2SXNjAkekTmb diJJ7nFHaKyYczGyP7ct9MVJTaIMYoJvh31cqVQztTO+NWGCb8yuy87draPs0UHk1tDmZH PC1wl4is31BQzQPKjDeOR2u7dAsLbq8z2sDgaOiE6rgaJ7YDXpZWBMO/GII0Ig== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VBmsS2RfhzxtY; Sat, 6 Apr 2024 20:19: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 436KJ83C030250; Sat, 6 Apr 2024 20:19:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 436KJ5r4030239; Sat, 6 Apr 2024 20:19:05 GMT (envelope-from git) Date: Sat, 6 Apr 2024 20:19:05 GMT Message-Id: <202404062019.436KJ5r4030239@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dimitry Andric Subject: git: 56727255ad47 - main - Merge llvm-project release/18.x llvmorg-18.1.0-rc3-0-g6c90f8dd5463 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 56727255ad47072ec2cc81b4ae728a099697b0e4 Auto-Submitted: auto-generated The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=56727255ad47072ec2cc81b4ae728a099697b0e4 commit 56727255ad47072ec2cc81b4ae728a099697b0e4 Merge: 74626c16ff48 b3ca86c61e06 Author: Dimitry Andric AuthorDate: 2024-02-21 10:24:23 +0000 Commit: Dimitry Andric CommitDate: 2024-04-06 20:14:19 +0000 Merge llvm-project release/18.x llvmorg-18.1.0-rc3-0-g6c90f8dd5463 This updates llvm, clang, compiler-rt, libc++, libunwind, lld, lldb and openmp to llvm-project release/18.x llvmorg-18.1.0-rc3-0-g6c90f8dd5463. PR: 276104 MFC after: 1 month .../clang/lib/Serialization/ASTReaderDecl.cpp | 10 +- .../clang/lib/Serialization/ASTWriter.cpp | 6 +- .../clang/lib/Serialization/ASTWriterDecl.cpp | 15 +- .../compiler-rt/lib/profile/InstrProfilingFile.c | 3 + .../llvm/include/llvm/Analysis/ScalarEvolution.h | 7 + .../llvm/lib/Analysis/ScalarEvolution.cpp | 62 ++++ .../llvm/lib/Target/PowerPC/PPCISelDAGToDAG.cpp | 37 +- .../InstCombine/InstructionCombining.cpp | 6 +- .../Transforms/Utils/ScalarEvolutionExpander.cpp | 57 +-- .../llvm/lib/Transforms/Utils/SimplifyIndVar.cpp | 18 +- .../llvm/tools/llvm-objcopy/ObjcopyOptions.cpp | 2 + .../llvm/tools/llvm-objdump/ELFDump.cpp | 3 + .../llvm/tools/llvm-readobj/ELFDumper.cpp | 1 + .../llvm-project/openmp/runtime/src/z_AIX_asm.S | 410 +++++++++++++++++++++ lib/clang/include/VCSVersion.inc | 6 +- lib/clang/include/lld/Common/Version.inc | 2 +- lib/clang/include/llvm/Support/VCSRevision.h | 2 +- 17 files changed, 558 insertions(+), 89 deletions(-) diff --cc contrib/llvm-project/openmp/runtime/src/z_AIX_asm.S index 000000000000,d711fcb7a785..d711fcb7a785 mode 000000,100644..100644 --- a/contrib/llvm-project/openmp/runtime/src/z_AIX_asm.S +++ b/contrib/llvm-project/openmp/runtime/src/z_AIX_asm.S diff --cc lib/clang/include/VCSVersion.inc index fd0a56bce1b7,000000000000..1dd3c861dbb2 mode 100644,000000..100644 --- a/lib/clang/include/VCSVersion.inc +++ b/lib/clang/include/VCSVersion.inc @@@ -1,8 -1,0 +1,8 @@@ - #define LLVM_REVISION "llvmorg-18.1.0-rc2-53-gc7b0a6ecd442" ++#define LLVM_REVISION "llvmorg-18.1.0-rc3-0-g6c90f8dd5463" +#define LLVM_REPOSITORY "https://github.com/llvm/llvm-project.git" + - #define CLANG_REVISION "llvmorg-18.1.0-rc2-53-gc7b0a6ecd442" ++#define CLANG_REVISION "llvmorg-18.1.0-rc3-0-g6c90f8dd5463" +#define CLANG_REPOSITORY "https://github.com/llvm/llvm-project.git" + - #define LLDB_REVISION "llvmorg-18.1.0-rc2-53-gc7b0a6ecd442" ++#define LLDB_REVISION "llvmorg-18.1.0-rc3-0-g6c90f8dd5463" +#define LLDB_REPOSITORY "https://github.com/llvm/llvm-project.git" diff --cc lib/clang/include/lld/Common/Version.inc index 87eb422879b9,000000000000..078d411bef3d mode 100644,000000..100644 --- a/lib/clang/include/lld/Common/Version.inc +++ b/lib/clang/include/lld/Common/Version.inc @@@ -1,4 -1,0 +1,4 @@@ +// Local identifier in __FreeBSD_version style +#define LLD_FREEBSD_VERSION 1500000 + - #define LLD_VERSION_STRING "18.1.0 (FreeBSD llvmorg-18.1.0-rc2-53-gc7b0a6ecd442-" __XSTRING(LLD_FREEBSD_VERSION) ")" ++#define LLD_VERSION_STRING "18.1.0 (FreeBSD llvmorg-18.1.0-rc3-0-g6c90f8dd5463-" __XSTRING(LLD_FREEBSD_VERSION) ")" diff --cc lib/clang/include/llvm/Support/VCSRevision.h index d06ac507357e,000000000000..6950d566ff2f mode 100644,000000..100644 --- a/lib/clang/include/llvm/Support/VCSRevision.h +++ b/lib/clang/include/llvm/Support/VCSRevision.h @@@ -1,2 -1,0 +1,2 @@@ - #define LLVM_REVISION "llvmorg-18.1.0-rc2-53-gc7b0a6ecd442" ++#define LLVM_REVISION "llvmorg-18.1.0-rc3-0-g6c90f8dd5463" +#define LLVM_REPOSITORY "https://github.com/llvm/llvm-project.git" From nobody Sat Apr 6 20:19:15 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VBmsg51bVz5HGwS; Sat, 6 Apr 2024 20:19: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 4VBmsg05lrz4MXj; Sat, 6 Apr 2024 20:19:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712434759; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=burXNRol/d3ZSYUjHh0M6gLNLvv6GweIeWXWq10GcLQ=; b=bG54Flh7x1OyKJ93leGWMMsckUqCudtbEuux42MHz/VOd4mXWA5x6ZwvvlnjrLBWZP+nDN t+0tRxu7zkLbZo5juDcQCQtB+eWeTYuRQme1Nfx6Rkj5P3hrirUF2mbgvluB2qOvBYnDGj qYyj1eXlVafjpGIn8pPGRUwSlzq1vn9y337aBjJs7qBHpqAuBqOq1b0PC3IBwW1JrzFDvi hHmJUnBYTq2M3zvoCQj7czeZDWvzMfNY1Ci/kCUEph0I0ghXtLnkcCErDP600XMHNC21Y3 PbvNoPnLYU5BRRR0YFqr/gQR6n9bJryG+uEkKVYUGUhtaYDWjF6/FsiTP1VrMA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712434759; a=rsa-sha256; cv=none; b=M5072N9k7/e2mKlu3aICBqGxFpdCdD8V24W2rIS3236mguWeEdwNVVyh4CwtZvQoTY6/eX nuZ8jgiDuwNG47XSvmKHw4atXOv6Gw2krR3bqdKir+tBNLtaVslZw7GzeGM+JB3BdeC7zR rrMBsLZsNWc/yhvALbtrHMREwIQDZOK6bfIvnVR9gf+Ep8NTT60XeNfAjmHayzw5HxqrIz sYm/Tw+OmjFNEh0JAdFAMcNokLMG8f9XUO32Jm+b5UefDMDWyfHcHUz5hkD2HnrF1eUfDo UFWN/mYpt6VZ2GjIT2nqMmOQnd1O0g54amp5m5DBtIPcqZnZD8ddlPqsQr5TYg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712434759; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=burXNRol/d3ZSYUjHh0M6gLNLvv6GweIeWXWq10GcLQ=; b=gZ+f2Af1yLZu6MQ3kV4kwF0myhKXfPp1k5CXKTXRxMx0pWG/xX5N2yoLQi8kR8C0LRKkdl zEBxoQbvCX2Hg8lsPTuf4SkPWrCO3XE4itVWD40jAvIUaHwJhQjy4wLdKIRKPS7bwMHIue 8QNChmXz1syyyyAR58XbI96h5dnYd+WpcuZFsUatwVyTL97WXsEwTiiSfivVh+vYA3Qbg8 I8jmQU/7bH1LRj27FhtVwVsWeuaRzAKCf5F6NYC1FOfwbUDdlT3Gz3VuFQXG2n06qq4o7w HpUd5yIp2FR+aitVKYaBHt43ZJhI+EbiaQZWGZy+RJpafV3byXFrh8X35Hc71Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VBmsf6jBYzxQD; Sat, 6 Apr 2024 20:19: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 436KJIMP030303; Sat, 6 Apr 2024 20:19:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 436KJFc7030294; Sat, 6 Apr 2024 20:19:15 GMT (envelope-from git) Date: Sat, 6 Apr 2024 20:19:15 GMT Message-Id: <202404062019.436KJFc7030294@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dimitry Andric Subject: git: 4c2d3b022a1d - main - Merge llvm-project release/18.x llvmorg-18.1.1-0-gdba2a75e9c7e List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4c2d3b022a1d543dbbff75a0c53e8d3d7242216d Auto-Submitted: auto-generated The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=4c2d3b022a1d543dbbff75a0c53e8d3d7242216d commit 4c2d3b022a1d543dbbff75a0c53e8d3d7242216d Merge: 56727255ad47 8b885620ff1b Author: Dimitry Andric AuthorDate: 2024-03-10 12:37:50 +0000 Commit: Dimitry Andric CommitDate: 2024-04-06 20:14:25 +0000 Merge llvm-project release/18.x llvmorg-18.1.1-0-gdba2a75e9c7e This updates llvm, clang, compiler-rt, libc++, libunwind, lld, lldb and openmp to llvm-project release/18.x llvmorg-18.1.1-0-gdba2a75e9c7e. PR: 276104 MFC after: 1 month .../llvm-project/clang/include/clang/Sema/Sema.h | 4 +- .../clang/lib/Basic/Targets/AArch64.cpp | 1 - .../llvm-project/clang/lib/Basic/Targets/Mips.h | 4 +- .../llvm-project/clang/lib/CodeGen/CodeGenPGO.cpp | 11 +- contrib/llvm-project/clang/lib/Sema/SemaExpr.cpp | 4 +- contrib/llvm-project/libcxx/include/csetjmp | 8 +- .../llvm/include/llvm/ADT/iterator_range.h | 4 +- .../llvm/include/llvm/IR/Attributes.td | 28 +- .../llvm/TargetParser/AArch64TargetParser.h | 8 +- contrib/llvm-project/llvm/lib/Analysis/Loads.cpp | 6 +- contrib/llvm-project/llvm/lib/IR/Attributes.cpp | 5 + .../llvm/lib/Target/AArch64/AArch64.td | 27 + .../llvm/lib/Target/AArch64/AArch64SchedA53.td | 2 +- .../llvm/lib/Target/AArch64/AArch64SchedA57.td | 2 +- .../llvm/lib/Target/AArch64/AArch64SchedA64FX.td | 3 +- .../lib/Target/AArch64/AArch64SchedAmpere1B.td | 1149 ++++++++++++++++++++ .../llvm/lib/Target/AArch64/AArch64SchedCyclone.td | 2 +- .../lib/Target/AArch64/AArch64SchedExynosM3.td | 2 +- .../lib/Target/AArch64/AArch64SchedExynosM4.td | 2 +- .../lib/Target/AArch64/AArch64SchedExynosM5.td | 2 +- .../llvm/lib/Target/AArch64/AArch64SchedFalkor.td | 2 +- .../llvm/lib/Target/AArch64/AArch64SchedKryo.td | 2 +- .../lib/Target/AArch64/AArch64SchedNeoverseN1.td | 2 +- .../lib/Target/AArch64/AArch64SchedNeoverseN2.td | 2 +- .../lib/Target/AArch64/AArch64SchedNeoverseV1.td | 3 +- .../lib/Target/AArch64/AArch64SchedNeoverseV2.td | 3 +- .../llvm/lib/Target/AArch64/AArch64SchedTSV110.td | 2 +- .../lib/Target/AArch64/AArch64SchedThunderX.td | 2 +- .../lib/Target/AArch64/AArch64SchedThunderX2T99.td | 2 +- .../Target/AArch64/AArch64SchedThunderX3T110.td | 2 +- .../llvm/lib/Target/AArch64/AArch64Subtarget.cpp | 1 + .../llvm/lib/Target/AArch64/AArch64Subtarget.h | 1 + .../lib/Target/Mips/AsmParser/MipsAsmParser.cpp | 78 +- .../llvm/lib/Target/Mips/MipsISelLowering.cpp | 10 +- .../lib/Target/SystemZ/SystemZISelLowering.cpp | 5 +- .../llvm-project/llvm/lib/TargetParser/Host.cpp | 1 + .../llvm/lib/Transforms/Utils/FlattenCFG.cpp | 14 +- .../llvm/lib/Transforms/Utils/Local.cpp | 8 +- .../llvm/tools/llvm-cov/SourceCoverageView.cpp | 2 +- .../llvm/tools/llvm-cov/SourceCoverageViewHTML.cpp | 9 +- .../llvm/tools/llvm-cov/SourceCoverageViewText.cpp | 3 +- .../llvm/tools/llvm-readobj/ObjDumper.cpp | 26 +- .../llvm/tools/llvm-readobj/ObjDumper.h | 4 +- .../llvm-project/llvm/tools/llvm-readobj/Opts.td | 2 + .../llvm/tools/llvm-readobj/llvm-readobj.cpp | 6 +- .../llvm/utils/TableGen/Attributes.cpp | 6 +- lib/clang/include/VCSVersion.inc | 6 +- lib/clang/include/clang/Basic/Version.inc | 6 +- lib/clang/include/lld/Common/Version.inc | 2 +- lib/clang/include/lldb/Version/Version.inc | 6 +- lib/clang/include/llvm/Config/config.h | 4 +- lib/clang/include/llvm/Config/llvm-config.h | 4 +- lib/clang/include/llvm/Support/VCSRevision.h | 2 +- lib/clang/liblldb/LLDBWrapLua.cpp | 162 +-- 54 files changed, 1501 insertions(+), 163 deletions(-) diff --cc contrib/llvm-project/llvm/lib/Target/AArch64/AArch64SchedAmpere1B.td index 000000000000,9c4f000cf351..9c4f000cf351 mode 000000,100644..100644 --- a/contrib/llvm-project/llvm/lib/Target/AArch64/AArch64SchedAmpere1B.td +++ b/contrib/llvm-project/llvm/lib/Target/AArch64/AArch64SchedAmpere1B.td diff --cc lib/clang/include/VCSVersion.inc index 1dd3c861dbb2,000000000000..da180cecd0ca mode 100644,000000..100644 --- a/lib/clang/include/VCSVersion.inc +++ b/lib/clang/include/VCSVersion.inc @@@ -1,8 -1,0 +1,8 @@@ - #define LLVM_REVISION "llvmorg-18.1.0-rc3-0-g6c90f8dd5463" ++#define LLVM_REVISION "llvmorg-18.1.1-0-gdba2a75e9c7e" +#define LLVM_REPOSITORY "https://github.com/llvm/llvm-project.git" + - #define CLANG_REVISION "llvmorg-18.1.0-rc3-0-g6c90f8dd5463" ++#define CLANG_REVISION "llvmorg-18.1.1-0-gdba2a75e9c7e" +#define CLANG_REPOSITORY "https://github.com/llvm/llvm-project.git" + - #define LLDB_REVISION "llvmorg-18.1.0-rc3-0-g6c90f8dd5463" ++#define LLDB_REVISION "llvmorg-18.1.1-0-gdba2a75e9c7e" +#define LLDB_REPOSITORY "https://github.com/llvm/llvm-project.git" diff --cc lib/clang/include/clang/Basic/Version.inc index 26d6b3b2938f,000000000000..6e28151f8a06 mode 100644,000000..100644 --- a/lib/clang/include/clang/Basic/Version.inc +++ b/lib/clang/include/clang/Basic/Version.inc @@@ -1,8 -1,0 +1,8 @@@ - #define CLANG_VERSION 18.1.0rc - #define CLANG_VERSION_STRING "18.1.0rc" ++#define CLANG_VERSION 18.1.1 ++#define CLANG_VERSION_STRING "18.1.1" +#define CLANG_VERSION_MAJOR 18 +#define CLANG_VERSION_MAJOR_STRING "18" +#define CLANG_VERSION_MINOR 1 - #define CLANG_VERSION_PATCHLEVEL 0 ++#define CLANG_VERSION_PATCHLEVEL 1 + +#define CLANG_VENDOR "FreeBSD " diff --cc lib/clang/include/lld/Common/Version.inc index 078d411bef3d,000000000000..e314863472f6 mode 100644,000000..100644 --- a/lib/clang/include/lld/Common/Version.inc +++ b/lib/clang/include/lld/Common/Version.inc @@@ -1,4 -1,0 +1,4 @@@ +// Local identifier in __FreeBSD_version style +#define LLD_FREEBSD_VERSION 1500000 + - #define LLD_VERSION_STRING "18.1.0 (FreeBSD llvmorg-18.1.0-rc3-0-g6c90f8dd5463-" __XSTRING(LLD_FREEBSD_VERSION) ")" ++#define LLD_VERSION_STRING "18.1.1 (FreeBSD llvmorg-18.1.1-0-gdba2a75e9c7e-" __XSTRING(LLD_FREEBSD_VERSION) ")" diff --cc lib/clang/include/lldb/Version/Version.inc index 7a9546b4696f,000000000000..134bce0f32c8 mode 100644,000000..100644 --- a/lib/clang/include/lldb/Version/Version.inc +++ b/lib/clang/include/lldb/Version/Version.inc @@@ -1,6 -1,0 +1,6 @@@ - #define LLDB_VERSION 18.1.0rc - #define LLDB_VERSION_STRING "18.1.0rc" ++#define LLDB_VERSION 18.1.1 ++#define LLDB_VERSION_STRING "18.1.1" +#define LLDB_VERSION_MAJOR 18 +#define LLDB_VERSION_MINOR 1 - #define LLDB_VERSION_PATCH 0 ++#define LLDB_VERSION_PATCH 1 +/* #undef LLDB_FULL_VERSION_STRING */ diff --cc lib/clang/include/llvm/Config/config.h index 718c44fff94d,000000000000..3adaae16913f mode 100644,000000..100644 --- a/lib/clang/include/llvm/Config/config.h +++ b/lib/clang/include/llvm/Config/config.h @@@ -1,378 -1,0 +1,378 @@@ +#ifndef CONFIG_H +#define CONFIG_H + +// Include this header only under the llvm source tree. +// This is a private header. + +/* Exported configuration */ +#include "llvm/Config/llvm-config.h" + +/* Bug report URL. */ +#define BUG_REPORT_URL "https://bugs.freebsd.org/submit/" + +/* Define to 1 to enable backtraces, and to 0 otherwise. */ +#define ENABLE_BACKTRACES 1 + +/* Define to 1 to enable crash overrides, and to 0 otherwise. */ +#define ENABLE_CRASH_OVERRIDES 1 + +/* Define to 1 to enable crash memory dumps, and to 0 otherwise. */ +#define LLVM_ENABLE_CRASH_DUMPS 0 + +/* Define to 1 to prefer forward slashes on Windows, and to 0 prefer + backslashes. */ +#define LLVM_WINDOWS_PREFER_FORWARD_SLASH 0 + +/* Define to 1 if you have the `backtrace' function. */ +#define HAVE_BACKTRACE TRUE + +#define BACKTRACE_HEADER + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_CRASHREPORTERCLIENT_H */ + +/* can use __crashreporter_info__ */ +#if defined(__APPLE__) +#define HAVE_CRASHREPORTER_INFO 1 +#else +#define HAVE_CRASHREPORTER_INFO 0 +#endif + +/* Define to 1 if you have the declaration of `arc4random', and to 0 if you + don't. */ +#define HAVE_DECL_ARC4RANDOM 1 + +/* Define to 1 if you have the declaration of `FE_ALL_EXCEPT', and to 0 if you + don't. */ +#define HAVE_DECL_FE_ALL_EXCEPT 1 + +/* Define to 1 if you have the declaration of `FE_INEXACT', and to 0 if you + don't. */ +#define HAVE_DECL_FE_INEXACT 1 + +/* Define to 1 if you have the declaration of `strerror_s', and to 0 if you + don't. */ +#define HAVE_DECL_STRERROR_S 0 + +/* Define to 1 if you have the header file. */ +#define HAVE_DLFCN_H 1 + +/* Define if dlopen() is available on this platform. */ +#define HAVE_DLOPEN 1 + +/* Define if dladdr() is available on this platform. */ +#define HAVE_DLADDR 1 + +#if !defined(__arm__) || defined(__USING_SJLJ_EXCEPTIONS__) || defined(__ARM_DWARF_EH__) +/* Define to 1 if we can register EH frames on this platform. */ +#define HAVE_REGISTER_FRAME 1 + +/* Define to 1 if we can deregister EH frames on this platform. */ +#define HAVE_DEREGISTER_FRAME 1 +#endif // !arm || USING_SJLJ_EXCEPTIONS || ARM_DWARF_EH_ + +/* Define if __unw_add_dynamic_fde() is available on this platform. */ +/* #undef HAVE_UNW_ADD_DYNAMIC_FDE */ + +/* Define to 1 if you have the header file. */ +#define HAVE_ERRNO_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_FCNTL_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_FENV_H 1 + +/* Define if libffi is available on this platform. */ +/* #undef HAVE_FFI_CALL */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_FFI_FFI_H */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_FFI_H */ + +/* Define to 1 if you have the `futimens' function. */ +#define HAVE_FUTIMENS 1 + +/* Define to 1 if you have the `futimes' function. */ +#define HAVE_FUTIMES 1 + +/* Define to 1 if you have the `getpagesize' function. */ +#define HAVE_GETPAGESIZE 1 + +/* Define to 1 if you have the `getrlimit' function. */ +#define HAVE_GETRLIMIT 1 + +/* Define to 1 if you have the `getrusage' function. */ +#define HAVE_GETRUSAGE 1 + +/* Define to 1 if you have the `isatty' function. */ +#define HAVE_ISATTY 1 + +/* Define to 1 if you have the `edit' library (-ledit). */ +#define HAVE_LIBEDIT TRUE + +/* Define to 1 if you have the `pfm' library (-lpfm). */ +/* #undef HAVE_LIBPFM */ + +/* Define to 1 if the `perf_branch_entry' struct has field cycles. */ +/* #undef LIBPFM_HAS_FIELD_CYCLES */ + +/* Define to 1 if you have the `psapi' library (-lpsapi). */ +/* #undef HAVE_LIBPSAPI */ + +/* Define to 1 if you have the `pthread' library (-lpthread). */ +#define HAVE_LIBPTHREAD 1 + +/* Define to 1 if you have the `pthread_getname_np' function. */ +#define HAVE_PTHREAD_GETNAME_NP 1 + +/* Define to 1 if you have the `pthread_setname_np' function. */ +#define HAVE_PTHREAD_SETNAME_NP 1 + +/* Define to 1 if you have the header file. */ +#if __has_include() +#define HAVE_LINK_H 1 +#else +#define HAVE_LINK_H 0 +#endif + +/* Define to 1 if you have the header file. */ +#if __has_include() +#define HAVE_MACH_MACH_H 1 +#endif + +/* Define to 1 if you have the `mallctl' function. */ +#if defined(__FreeBSD__) +#define HAVE_MALLCTL 1 +#endif + +/* Define to 1 if you have the `mallinfo' function. */ +#if defined(__linux__) +#define HAVE_MALLINFO 1 +#endif + +/* Define to 1 if you have the `mallinfo2' function. */ +/* #undef HAVE_MALLINFO2 */ + +/* Define to 1 if you have the header file. */ +#if __has_include() +#define HAVE_MALLOC_MALLOC_H 1 +#endif + +/* Define to 1 if you have the `malloc_zone_statistics' function. */ +#if defined(__APPLE__) +#define HAVE_MALLOC_ZONE_STATISTICS 1 +#endif + +/* Define to 1 if you have the `posix_spawn' function. */ +#define HAVE_POSIX_SPAWN 1 + +/* Define to 1 if you have the `pread' function. */ +#define HAVE_PREAD 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_PTHREAD_H 1 + +/* Have pthread_mutex_lock */ +#define HAVE_PTHREAD_MUTEX_LOCK 1 + +/* Have pthread_rwlock_init */ +#define HAVE_PTHREAD_RWLOCK_INIT 1 + +/* Define to 1 if you have the `sbrk' function. */ +#define HAVE_SBRK 1 + +/* Define to 1 if you have the `setenv' function. */ +#define HAVE_SETENV 1 + +/* Define to 1 if you have the `setrlimit' function. */ +#define HAVE_SETRLIMIT 1 + +/* Define to 1 if you have the `sigaltstack' function. */ +#define HAVE_SIGALTSTACK 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SIGNAL_H 1 + +/* Define to 1 if you have the `strerror_r' function. */ +#define HAVE_STRERROR_R 1 + +/* Define to 1 if you have the `sysconf' function. */ +#define HAVE_SYSCONF 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_IOCTL_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_MMAN_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_PARAM_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_RESOURCE_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_STAT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_TIME_H 1 + +/* Define to 1 if stat struct has st_mtimespec member .*/ +#if !defined(__linux__) +#define HAVE_STRUCT_STAT_ST_MTIMESPEC_TV_NSEC 1 +#endif + +/* Define to 1 if stat struct has st_mtim member. */ +#if !defined(__APPLE__) +#define HAVE_STRUCT_STAT_ST_MTIM_TV_NSEC 1 +#endif + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_TYPES_H 1 + +/* Define if the setupterm() function is supported this platform. */ +#if defined(__FreeBSD__) +/* + * This is only needed for terminalHasColors(). When disabled LLVM falls back + * to checking a list of TERM prefixes which is sufficient for a bootstrap tool. + */ +#define LLVM_ENABLE_TERMINFO TRUE +#endif + +/* Define to 1 if you have the header file. */ +#define HAVE_TERMIOS_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_UNISTD_H 1 + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_VALGRIND_VALGRIND_H */ + +/* Have host's _alloca */ +/* #undef HAVE__ALLOCA */ + +/* Define to 1 if you have the `_chsize_s' function. */ +/* #undef HAVE__CHSIZE_S */ + +/* Define to 1 if you have the `_Unwind_Backtrace' function. */ +#define HAVE__UNWIND_BACKTRACE 1 + +/* Have host's __alloca */ +/* #undef HAVE___ALLOCA */ + +/* Have host's __ashldi3 */ +/* #undef HAVE___ASHLDI3 */ + +/* Have host's __ashrdi3 */ +/* #undef HAVE___ASHRDI3 */ + +/* Have host's __chkstk */ +/* #undef HAVE___CHKSTK */ + +/* Have host's __chkstk_ms */ +/* #undef HAVE___CHKSTK_MS */ + +/* Have host's __cmpdi2 */ +/* #undef HAVE___CMPDI2 */ + +/* Have host's __divdi3 */ +/* #undef HAVE___DIVDI3 */ + +/* Have host's __fixdfdi */ +/* #undef HAVE___FIXDFDI */ + +/* Have host's __fixsfdi */ +/* #undef HAVE___FIXSFDI */ + +/* Have host's __floatdidf */ +/* #undef HAVE___FLOATDIDF */ + +/* Have host's __lshrdi3 */ +/* #undef HAVE___LSHRDI3 */ + +/* Have host's __main */ +/* #undef HAVE___MAIN */ + +/* Have host's __moddi3 */ +/* #undef HAVE___MODDI3 */ + +/* Have host's __udivdi3 */ +/* #undef HAVE___UDIVDI3 */ + +/* Have host's __umoddi3 */ +/* #undef HAVE___UMODDI3 */ + +/* Have host's ___chkstk */ +/* #undef HAVE____CHKSTK */ + +/* Have host's ___chkstk_ms */ +/* #undef HAVE____CHKSTK_MS */ + +/* Linker version detected at compile time. */ +/* #undef HOST_LINK_VERSION */ + +/* Define if overriding target triple is enabled */ +/* #undef LLVM_TARGET_TRIPLE_ENV */ + +/* Whether tools show host and target info when invoked with --version */ +#define LLVM_VERSION_PRINTER_SHOW_HOST_TARGET_INFO 1 + +/* Define if libxml2 is supported on this platform. */ +/* #undef LLVM_ENABLE_LIBXML2 */ + +/* Define to the extension used for shared libraries, say, ".so". */ +#if defined(__APPLE__) +#define LTDL_SHLIB_EXT ".dylib" +#else +#define LTDL_SHLIB_EXT ".so" +#endif + +/* Define to the extension used for plugin libraries, say, ".so". */ +#if defined(__APPLE__) +#define LLVM_PLUGIN_EXT ".dylib" +#else +#define LLVM_PLUGIN_EXT ".so" +#endif + +/* Define to the address where bug reports for this package should be sent. */ +#define PACKAGE_BUGREPORT "https://bugs.freebsd.org/submit/" + +/* Define to the full name of this package. */ +#define PACKAGE_NAME "LLVM" + +/* Define to the full name and version of this package. */ - #define PACKAGE_STRING "LLVM 18.1.0rc" ++#define PACKAGE_STRING "LLVM 18.1.1" + +/* Define to the version of this package. */ - #define PACKAGE_VERSION "18.1.0rc" ++#define PACKAGE_VERSION "18.1.1" + +/* Define to the vendor of this package. */ +/* #undef PACKAGE_VENDOR */ + +/* Define to a function implementing stricmp */ +/* #undef stricmp */ + +/* Define to a function implementing strdup */ +/* #undef strdup */ + +/* Whether GlobalISel rule coverage is being collected */ +#define LLVM_GISEL_COV_ENABLED 0 + +/* Define to the default GlobalISel coverage file prefix */ +/* #undef LLVM_GISEL_COV_PREFIX */ + +/* Whether Timers signpost passes in Xcode Instruments */ +#if defined(__APPLE__) +#define LLVM_SUPPORT_XCODE_SIGNPOSTS 1 +#else +#define LLVM_SUPPORT_XCODE_SIGNPOSTS 0 +#endif + +/* #undef HAVE_PROC_PID_RUSAGE */ + +#define HAVE_BUILTIN_THREAD_POINTER 1 + +#endif diff --cc lib/clang/include/llvm/Config/llvm-config.h index 111e0a296ed5,000000000000..856bbf41d3a2 mode 100644,000000..100644 --- a/lib/clang/include/llvm/Config/llvm-config.h +++ b/lib/clang/include/llvm/Config/llvm-config.h @@@ -1,233 -1,0 +1,233 @@@ +/*===------- llvm/Config/llvm-config.h - llvm configuration -------*- C -*-===*/ +/* */ +/* Part of the LLVM Project, under the Apache License v2.0 with LLVM */ +/* Exceptions. */ +/* See https://llvm.org/LICENSE.txt for license information. */ +/* SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception */ +/* */ +/*===----------------------------------------------------------------------===*/ + +/* This file enumerates variables from the LLVM configuration so that they + can be in exported headers and won't override package specific directives. + This is a C header that can be included in the llvm-c headers. */ + +#ifndef LLVM_CONFIG_H +#define LLVM_CONFIG_H + +/* Define if LLVM_ENABLE_DUMP is enabled */ +/* #undef LLVM_ENABLE_DUMP */ + +/* Target triple LLVM will generate code for by default */ +/* Doesn't use `cmakedefine` because it is allowed to be empty. */ +/* #undef LLVM_DEFAULT_TARGET_TRIPLE */ + +/* Define if threads enabled */ +#define LLVM_ENABLE_THREADS 1 + +/* Has gcc/MSVC atomic intrinsics */ +#define LLVM_HAS_ATOMICS 1 + +/* Host triple LLVM will be executed on */ +/* #undef LLVM_HOST_TRIPLE */ + +/* LLVM architecture name for the native architecture, if available */ +/* #undef LLVM_NATIVE_ARCH */ + +/* LLVM name for the native AsmParser init function, if available */ +/* #undef LLVM_NATIVE_ASMPARSER */ + +/* LLVM name for the native AsmPrinter init function, if available */ +/* #undef LLVM_NATIVE_ASMPRINTER */ + +/* LLVM name for the native Disassembler init function, if available */ +/* #undef LLVM_NATIVE_DISASSEMBLER */ + +/* LLVM name for the native Target init function, if available */ +/* #undef LLVM_NATIVE_TARGET */ + +/* LLVM name for the native TargetInfo init function, if available */ +/* #undef LLVM_NATIVE_TARGETINFO */ + +/* LLVM name for the native target MC init function, if available */ +/* #undef LLVM_NATIVE_TARGETMC */ + +/* LLVM name for the native target MCA init function, if available */ +/* #undef LLVM_NATIVE_TARGETMCA */ + +/* Define if the AArch64 target is built in */ +#ifdef LLVM_TARGET_ENABLE_AARCH64 +#define LLVM_HAS_AARCH64_TARGET 1 +#else +#define LLVM_HAS_AARCH64_TARGET 0 +#endif + +/* Define if the AMDGPU target is built in */ +#define LLVM_HAS_AMDGPU_TARGET 0 + +/* Define if the ARC target is built in */ +#define LLVM_HAS_ARC_TARGET 0 + +/* Define if the ARM target is built in */ +#ifdef LLVM_TARGET_ENABLE_ARM +#define LLVM_HAS_ARM_TARGET 1 +#else +#define LLVM_HAS_ARM_TARGET 0 +#endif + +/* Define if the AVR target is built in */ +#define LLVM_HAS_AVR_TARGET 0 + +/* Define if the BPF target is built in */ +#ifdef LLVM_TARGET_ENABLE_BPF +#define LLVM_HAS_BPF_TARGET 1 +#else +#define LLVM_HAS_BPF_TARGET 0 +#endif + +/* Define if the CSKY target is built in */ +#define LLVM_HAS_CSKY_TARGET 0 + +/* Define if the DirectX target is built in */ +#define LLVM_HAS_DIRECTX_TARGET 0 + +/* Define if the Hexagon target is built in */ +#define LLVM_HAS_HEXAGON_TARGET 0 + +/* Define if the Lanai target is built in */ +#define LLVM_HAS_LANAI_TARGET 0 + +/* Define if the LoongArch target is built in */ +#define LLVM_HAS_LOONGARCH_TARGET 0 + +/* Define if the M68k target is built in */ +#define LLVM_HAS_M68K_TARGET 0 + +/* Define if the Mips target is built in */ +#ifdef LLVM_TARGET_ENABLE_MIPS +#define LLVM_HAS_MIPS_TARGET 1 +#else +#define LLVM_HAS_MIPS_TARGET 0 +#endif + +/* Define if the MSP430 target is built in */ +#define LLVM_HAS_MSP430_TARGET 0 + +/* Define if the NVPTX target is built in */ +#define LLVM_HAS_NVPTX_TARGET 0 + +/* Define if the PowerPC target is built in */ +#ifdef LLVM_TARGET_ENABLE_POWERPC +#define LLVM_HAS_POWERPC_TARGET 1 +#else +#define LLVM_HAS_POWERPC_TARGET 0 +#endif + +/* Define if the RISCV target is built in */ +#ifdef LLVM_TARGET_ENABLE_RISCV +#define LLVM_HAS_RISCV_TARGET 1 +#else +#define LLVM_HAS_RISCV_TARGET 0 +#endif + +/* Define if the Sparc target is built in */ +#ifdef LLVM_TARGET_ENABLE_SPARC +#define LLVM_HAS_SPARC_TARGET 1 +#else +#define LLVM_HAS_SPARC_TARGET 0 +#endif + +/* Define if the SPIRV target is built in */ +#define LLVM_HAS_SPIRV_TARGET 0 + +/* Define if the SystemZ target is built in */ +#define LLVM_HAS_SYSTEMZ_TARGET 0 + +/* Define if the VE target is built in */ +#define LLVM_HAS_VE_TARGET 0 + +/* Define if the WebAssembly target is built in */ +#define LLVM_HAS_WEBASSEMBLY_TARGET 0 + +/* Define if the X86 target is built in */ +#ifdef LLVM_TARGET_ENABLE_X86 +#define LLVM_HAS_X86_TARGET 1 +#else +#define LLVM_HAS_X86_TARGET 0 +#endif + +/* Define if the XCore target is built in */ +#define LLVM_HAS_XCORE_TARGET 0 + +/* Define if the Xtensa target is built in */ +#define LLVM_HAS_XTENSA_TARGET 0 + +/* Define if this is Unixish platform */ +#define LLVM_ON_UNIX 1 + +/* Define if we have the Intel JIT API runtime support library */ +#define LLVM_USE_INTEL_JITEVENTS 0 + +/* Define if we have the oprofile JIT-support library */ +#define LLVM_USE_OPROFILE 0 + +/* Define if we have the perf JIT-support library */ +#define LLVM_USE_PERF 0 + +/* Major version of the LLVM API */ +#define LLVM_VERSION_MAJOR 18 + +/* Minor version of the LLVM API */ +#define LLVM_VERSION_MINOR 1 + +/* Patch version of the LLVM API */ - #define LLVM_VERSION_PATCH 0 ++#define LLVM_VERSION_PATCH 1 + +/* LLVM version string */ - #define LLVM_VERSION_STRING "18.1.0rc" ++#define LLVM_VERSION_STRING "18.1.1" + +/* Whether LLVM records statistics for use with GetStatistics(), + * PrintStatistics() or PrintStatisticsJSON() + */ +#define LLVM_FORCE_ENABLE_STATS 0 + +/* Define if we have z3 and want to build it */ +/* #undef LLVM_WITH_Z3 */ + +/* Define if we have curl and want to use it */ +/* #undef LLVM_ENABLE_CURL */ + +/* Define if we have cpp-httplib and want to use it */ +/* #undef LLVM_ENABLE_HTTPLIB */ + +/* Define if zlib compression is available */ +#define LLVM_ENABLE_ZLIB 1 + +/* Define if zstd compression is available */ +#define LLVM_ENABLE_ZSTD 1 + +/* Define if LLVM is using tflite */ +/* #undef LLVM_HAVE_TFLITE */ + +/* Define to 1 if you have the header file. */ +#define HAVE_SYSEXITS_H 1 + +/* Define if building libLLVM shared library */ +/* #undef LLVM_BUILD_LLVM_DYLIB */ + +/* Define if building LLVM with BUILD_SHARED_LIBS */ +/* #undef LLVM_BUILD_SHARED_LIBS */ + +/* Define if building LLVM with LLVM_FORCE_USE_OLD_TOOLCHAIN_LIBS */ +/* #undef LLVM_FORCE_USE_OLD_TOOLCHAIN */ + +/* Define if llvm_unreachable should be optimized with undefined behavior + * in non assert builds */ +#define LLVM_UNREACHABLE_OPTIMIZE 1 + +/* Define to 1 if you have the DIA SDK installed, and to 0 if you don't. */ +#define LLVM_ENABLE_DIA_SDK 0 + +/* Define if plugins enabled */ +/* #undef LLVM_ENABLE_PLUGINS */ + +#endif diff --cc lib/clang/include/llvm/Support/VCSRevision.h index 6950d566ff2f,000000000000..b8e8d52e709d mode 100644,000000..100644 --- a/lib/clang/include/llvm/Support/VCSRevision.h +++ b/lib/clang/include/llvm/Support/VCSRevision.h @@@ -1,2 -1,0 +1,2 @@@ - #define LLVM_REVISION "llvmorg-18.1.0-rc3-0-g6c90f8dd5463" ++#define LLVM_REVISION "llvmorg-18.1.1-0-gdba2a75e9c7e" +#define LLVM_REPOSITORY "https://github.com/llvm/llvm-project.git" diff --cc lib/clang/liblldb/LLDBWrapLua.cpp index 0e4b4a448ef2,000000000000..837133bfd460 mode 100644,000000..100644 --- a/lib/clang/liblldb/LLDBWrapLua.cpp +++ b/lib/clang/liblldb/LLDBWrapLua.cpp @@@ -1,80109 -1,0 +1,80115 @@@ +/* ---------------------------------------------------------------------------- + * This file was automatically generated by SWIG (https://www.swig.org). + * Version 4.1.1 + * + * Do not make changes to this file unless you know what you are doing - modify + * the SWIG interface file instead. + * ----------------------------------------------------------------------------- */ + + +#define SWIG_VERSION 0x040101 +#define SWIGLUA +#define SWIG_LUA_TARGET SWIG_LUA_FLAVOR_LUA +#define SWIG_LUA_MODULE_GLOBAL + +/* ----------------------------------------------------------------------------- + * This section contains generic SWIG labels for method/variable + * declarations/attributes, and other compiler dependent labels. + * ----------------------------------------------------------------------------- */ + +/* template workaround for compilers that cannot correctly implement the C++ standard */ +#ifndef SWIGTEMPLATEDISAMBIGUATOR +# if defined(__SUNPRO_CC) && (__SUNPRO_CC <= 0x560) +# define SWIGTEMPLATEDISAMBIGUATOR template +# elif defined(__HP_aCC) +/* Needed even with `aCC -AA' when `aCC -V' reports HP ANSI C++ B3910B A.03.55 */ +/* If we find a maximum version that requires this, the test would be __HP_aCC <= 35500 for A.03.55 */ +# define SWIGTEMPLATEDISAMBIGUATOR template +# else +# define SWIGTEMPLATEDISAMBIGUATOR +# endif +#endif + +/* inline attribute */ +#ifndef SWIGINLINE +# if defined(__cplusplus) || (defined(__GNUC__) && !defined(__STRICT_ANSI__)) +# define SWIGINLINE inline +# else +# define SWIGINLINE +# endif +#endif + +/* attribute recognised by some compilers to avoid 'unused' warnings */ +#ifndef SWIGUNUSED +# if defined(__GNUC__) +# if !(defined(__cplusplus)) || (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4)) +# define SWIGUNUSED __attribute__ ((__unused__)) +# else +# define SWIGUNUSED +# endif +# elif defined(__ICC) +# define SWIGUNUSED __attribute__ ((__unused__)) +# else +# define SWIGUNUSED +# endif +#endif + +#ifndef SWIG_MSC_UNSUPPRESS_4505 +# if defined(_MSC_VER) +# pragma warning(disable : 4505) /* unreferenced local function has been removed */ +# endif +#endif + +#ifndef SWIGUNUSEDPARM +# ifdef __cplusplus +# define SWIGUNUSEDPARM(p) +# else +# define SWIGUNUSEDPARM(p) p SWIGUNUSED +# endif +#endif + +/* internal SWIG method */ +#ifndef SWIGINTERN +# define SWIGINTERN static SWIGUNUSED +#endif + +/* internal inline SWIG method */ +#ifndef SWIGINTERNINLINE +# define SWIGINTERNINLINE SWIGINTERN SWIGINLINE +#endif + +/* exporting methods */ +#if defined(__GNUC__) +# if (__GNUC__ >= 4) || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4) +# ifndef GCC_HASCLASSVISIBILITY +# define GCC_HASCLASSVISIBILITY +# endif +# endif +#endif + +#ifndef SWIGEXPORT +# if defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__) +# if defined(STATIC_LINKED) +# define SWIGEXPORT +# else +# define SWIGEXPORT __declspec(dllexport) +# endif +# else +# if defined(__GNUC__) && defined(GCC_HASCLASSVISIBILITY) +# define SWIGEXPORT __attribute__ ((visibility("default"))) +# else +# define SWIGEXPORT +# endif +# endif +#endif + +/* calling conventions for Windows */ +#ifndef SWIGSTDCALL +# if defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__) +# define SWIGSTDCALL __stdcall +# else +# define SWIGSTDCALL +# endif +#endif + +/* Deal with Microsoft's attempt at deprecating C standard runtime functions */ +#if !defined(SWIG_NO_CRT_SECURE_NO_DEPRECATE) && defined(_MSC_VER) && !defined(_CRT_SECURE_NO_DEPRECATE) +# define _CRT_SECURE_NO_DEPRECATE +#endif + +/* Deal with Microsoft's attempt at deprecating methods in the standard C++ library */ +#if !defined(SWIG_NO_SCL_SECURE_NO_DEPRECATE) && defined(_MSC_VER) && !defined(_SCL_SECURE_NO_DEPRECATE) +# define _SCL_SECURE_NO_DEPRECATE +#endif + +/* Deal with Apple's deprecated 'AssertMacros.h' from Carbon-framework */ +#if defined(__APPLE__) && !defined(__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES) +# define __ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES 0 +#endif + +/* Intel's compiler complains if a variable which was never initialised is + * cast to void, which is a common idiom which we use to indicate that we + * are aware a variable isn't used. So we just silence that warning. + * See: https://github.com/swig/swig/issues/192 for more discussion. + */ +#ifdef __INTEL_COMPILER +# pragma warning disable 592 +#endif + +/* ----------------------------------------------------------------------------- + * swigrun.swg + * + * This file contains generic C API SWIG runtime support for pointer + * type checking. + * ----------------------------------------------------------------------------- */ + +/* This should only be incremented when either the layout of swig_type_info changes, + or for whatever reason, the runtime changes incompatibly */ +#define SWIG_RUNTIME_VERSION "4" + +/* define SWIG_TYPE_TABLE_NAME as "SWIG_TYPE_TABLE" */ +#ifdef SWIG_TYPE_TABLE +# define SWIG_QUOTE_STRING(x) #x +# define SWIG_EXPAND_AND_QUOTE_STRING(x) SWIG_QUOTE_STRING(x) +# define SWIG_TYPE_TABLE_NAME SWIG_EXPAND_AND_QUOTE_STRING(SWIG_TYPE_TABLE) +#else +# define SWIG_TYPE_TABLE_NAME +#endif + +/* + You can use the SWIGRUNTIME and SWIGRUNTIMEINLINE macros for + creating a static or dynamic library from the SWIG runtime code. + In 99.9% of the cases, SWIG just needs to declare them as 'static'. + + But only do this if strictly necessary, ie, if you have problems + with your compiler or suchlike. +*/ + +#ifndef SWIGRUNTIME +# define SWIGRUNTIME SWIGINTERN +#endif + +#ifndef SWIGRUNTIMEINLINE +# define SWIGRUNTIMEINLINE SWIGRUNTIME SWIGINLINE +#endif + +/* Generic buffer size */ +#ifndef SWIG_BUFFER_SIZE +# define SWIG_BUFFER_SIZE 1024 +#endif + +/* Flags for pointer conversions */ +#define SWIG_POINTER_DISOWN 0x1 +#define SWIG_CAST_NEW_MEMORY 0x2 +#define SWIG_POINTER_NO_NULL 0x4 +#define SWIG_POINTER_CLEAR 0x8 +#define SWIG_POINTER_RELEASE (SWIG_POINTER_CLEAR | SWIG_POINTER_DISOWN) + +/* Flags for new pointer objects */ +#define SWIG_POINTER_OWN 0x1 + + +/* + Flags/methods for returning states. + + The SWIG conversion methods, as ConvertPtr, return an integer + that tells if the conversion was successful or not. And if not, + an error code can be returned (see swigerrors.swg for the codes). + + Use the following macros/flags to set or process the returning + states. + + In old versions of SWIG, code such as the following was usually written: + + if (SWIG_ConvertPtr(obj,vptr,ty.flags) != -1) { *** 79989 LINES SKIPPED *** From nobody Sat Apr 6 20:19:19 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VBmsh245Lz5HGlS; Sat, 6 Apr 2024 20:19:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VBmsh0njhz4MlP; Sat, 6 Apr 2024 20:19:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712434760; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Xe21eNBi01FK1559kapjD9RIIsjTHDh3Ck8U1UvKUGI=; b=EgU8XM81oBTmFqvMZ23VpsXnomAOCH6vt4TrT6rDztjzykv1s5EbOqXQCE3e25UCnEF8C4 9C3NOYVYZAmy3RpPunNwvyfu0767EytIEJ1mNtWNcYHFV3huYGxS/iqK2xBAn3DT8wnfmE vTuKpRXKzmLWib6XHrHKgLKxfrER0xtemm8o8tCbn+lfZGPDtVkGcD71sLsuxyEc4jYbl8 PjOeE/Nw1qPvjEQtTNURX81TvMn2ZCoBycnZ32GzS92BFpkeEgR3/p/dSDGxNTKXcDvgB5 G1Sgk0RFoCqIk1bbHlz0QrD4/maQtiwcf4fYKpawhbtiU/SQuWoZJsEDQIisKA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712434760; a=rsa-sha256; cv=none; b=i8I1Fq00XjIwuMUdH5dpWdF8Grijvq/NQp7K4OkURqlflvM5gLAKHiv7ywNQ+Qn0NPdE0s src2u6N/i/7SzWkJ3M6SvBWixrey5FPSB5nSq184hTVXwxB9F8i4zDpvydVF4YnbdAMm0K yqOX/XMTTxuiUhlDaQlBgUqpV7ylZ1/RvfFi1t+owKqXKJfSJyTz0rBHlvL6Wegqhlcm+Q OpK5mfOQMnlZ5pAzQQjMKet0D54fgYn0gB41wK0AoWD+43dwMxiFaTTgKkyl0h/LwWzJVQ Fx0+Q0nk8EBR4CDSbaiapzD74l+CW/pgF3JD4ifj+j/9niAM8LCLpER1zvxr7g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712434760; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Xe21eNBi01FK1559kapjD9RIIsjTHDh3Ck8U1UvKUGI=; b=MIT16E2hE3Q6YZ5wwostSeBLWJJUkwwW4Ifh+cOc826iaSFZ3O9kOybNQTUuO0mgLmpKks wYgdGQ3F7mtTEkWzWeeJ+67nVcI055AtzQIF/Zytw0HVegSXRoeqmHg4usKpNubkVpe6jW 8qmu12cNiAjSk2fPWTLScyX5FMesjGfzkccs0Z0mRH4Cw0EATxiW215SW2i6xvDIJzuqaU qG4DRICw1qbzHB+0M48J4Ms+xf9hXqq49jMfw8qaJWVezl2vkYaMS05XTqinqstW8pkoVj ODSrt9L+rnefXt6trMzU6QUI5kw2XjEWcbU+Jh6KY1+Ly6Uis3WhMwlPufUJaw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VBmsh0PsQzxgG; Sat, 6 Apr 2024 20:19:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 436KJJE6030354; Sat, 6 Apr 2024 20:19:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 436KJJ2g030351; Sat, 6 Apr 2024 20:19:19 GMT (envelope-from git) Date: Sat, 6 Apr 2024 20:19:19 GMT Message-Id: <202404062019.436KJJ2g030351@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dimitry Andric Subject: git: ce4f1f49e036 - main - Revert commit 6255157d24e2 from llvm-project (by Dimitry Andric): List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ce4f1f49e036fd806b534decfe38020dae32a384 Auto-Submitted: auto-generated The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=ce4f1f49e036fd806b534decfe38020dae32a384 commit ce4f1f49e036fd806b534decfe38020dae32a384 Author: Dimitry Andric AuthorDate: 2024-03-19 13:07:27 +0000 Commit: Dimitry Andric CommitDate: 2024-04-06 20:14:31 +0000 Revert commit 6255157d24e2 from llvm-project (by Dimitry Andric): [libc++] Re-enable std::pair trivial copy constructor for FreeBSD >= 14 After many years of using the really old std::pair ABI which did not yet have a trivial copy constructor, FreeBSD 14 and later will finally get rid of it. Only use the old ABI for FreeBSD 13 and earlier. Note: on the FreeBSD side, we will bump our libc++.so version for this, and keep an old compatibility library in a separate package. Differential Revision: https://reviews.llvm.org/D126462 This ABI change can cause crashes when binaries compiled against older libc++ versions are run against binaries compiled against this libc++ version. For example, lang/ldc uses a precompiled bootstrap ldc2 binary that was compiled against the old libc++, but also links against libLLVM-15.so. If libLLVM-15.so is compiled against the new libc++ version, the ABI mismatch results in segfaults or even stack overflows. Note: we can only re-enable the std::pair trivial copy constructors again when the official libc++ ABI version is bumped to 2. PR: 276104 MFC after: 1 month --- contrib/llvm-project/libcxx/include/__config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/llvm-project/libcxx/include/__config b/contrib/llvm-project/libcxx/include/__config index fa5535facb14..a5981984d37e 100644 --- a/contrib/llvm-project/libcxx/include/__config +++ b/contrib/llvm-project/libcxx/include/__config @@ -190,7 +190,7 @@ # endif // Feature macros for disabling pre ABI v1 features. All of these options // are deprecated. -# if defined(__FreeBSD__) && __FreeBSD__ < 14 +# if defined(__FreeBSD__) # define _LIBCPP_DEPRECATED_ABI_DISABLE_PAIR_TRIVIAL_COPY_CTOR # endif // For XCOFF linkers, we have problems if we see a weak hidden version of a symbol From nobody Sat Apr 6 20:19:21 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VBmsk1T74z5HH6R; Sat, 6 Apr 2024 20:19:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VBmsj1wBwz4Mtv; Sat, 6 Apr 2024 20:19:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712434761; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XySVvtFKv3DPXQLl4bQWXz47ab0wF1kZyHrdq2ODX9w=; b=sj6pefbglHVFTZmsGEOy9qhsKzWLyZCmBeS0kbAPdCHyp4qYNu/K2IL1Nro1Ns0cdeROMn g6hJ+lHjtgCV3qsGQ2ES3SOfltRTPAky2FDDZfSkQg3a7dHTT66EUT9HoYs4qRpEwxWIMp 8WV+lnsMFaM7ynMZDkMATFRGYep88M2gOWwL/y/LCoO9V7c/t0EYxptDthRjNxrM+SaD6K kwQtmAdqL26rIyEQ9/SmWZFR03yrmM0w8DTJkojwTywDVlBTQvckO/0VM5OUpSA3de+VNA mncXTA4k73gApf0/BT4BZNSjzpQHiZjVnFCfwejK3JuIILJyzU2kwqcWYRo2VA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712434761; a=rsa-sha256; cv=none; b=Vxh6n5zwXZq/6vweoGTPzsrVO92KbfdNxN3oykwutQbSjtJXaGaOH6oEfKS0kZiuhlsw46 EJXOKo+8mgbGneCzMtFdv7cLH2Z0ty3ywkoCKxVPwYM4g78Bhq+LZz1b8c6BQ2RZNx8CMJ yT23iSn8WrvpAIKkrQOj6hPgDZ4tOO1H7+4RuD1nBM1XA7hLCf8fnu/0RrTK0nNSmGVuWf Y1QvMthq7cAtiwFDgWuVlsfu5DhQRwU5LcUxCMz/gpdkTIAMSOaGUCMr1pLFDk3Q8F6WPz 6C4+uuMo1JOrx1fq0Yylk8W3owIwFA02Afumyc49oRoqlHjB74nQk8JcuRzY3Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712434761; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XySVvtFKv3DPXQLl4bQWXz47ab0wF1kZyHrdq2ODX9w=; b=OG63g/uEUSsMDh/6+qNP+R+KQZmc+OEZSA3krZSw/wLrmQOBwSoWynd4Sxz+q/etHStBNx 9dzJDX7B0TD2vbyYyRkOlCfBACuDRuk9/sOVeGIFzguYYS9St4cPbVYACl1kjEAJjzZ6c6 Dk3HdL/WQl/jE32LFGTR12OPPGEPYvu6dGrMEkorRYQQJ1hI5Ih67c6W42374GVh9AG7kG 1hwrZU1YeYNxdMKWWFpn6/JoWvrD0BPVgGdM/zjdB8SVNnK0YDscsT0h/CS4BTFaY4Yh9L D4wjnSw3jtkEiS3gmIhW21JAUZMDnIjWvYoZ5Sl188MsvX/aWO6tECOtXackpA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VBmsj1XdDzxtZ; Sat, 6 Apr 2024 20:19:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 436KJLqg030405; Sat, 6 Apr 2024 20:19:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 436KJLtt030402; Sat, 6 Apr 2024 20:19:21 GMT (envelope-from git) Date: Sat, 6 Apr 2024 20:19:21 GMT Message-Id: <202404062019.436KJLtt030402@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dimitry Andric Subject: git: 49a6e426df84 - main - Merge commit f5f3d5d6534f from llvm-project (by Qizhi Hu): List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 49a6e426df84eff1ae54905a02f66910a6a177d3 Auto-Submitted: auto-generated The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=49a6e426df84eff1ae54905a02f66910a6a177d3 commit 49a6e426df84eff1ae54905a02f66910a6a177d3 Author: Dimitry Andric AuthorDate: 2024-03-21 20:50:26 +0000 Commit: Dimitry Andric CommitDate: 2024-04-06 20:14:31 +0000 Merge commit f5f3d5d6534f from llvm-project (by Qizhi Hu): [Clang][Sema] Fix a crash in lambda instantiation (#85565) Fix https://github.com/llvm/llvm-project/issues/85343 When build lambda expression in lambda instantiation, `ThisType` is required in `Sema::CheckCXXThisCapture` to build `this` capture. Set `this` type by import `Sema::CXXThisScopeRAII` and it will be used later in lambda expression transformation. Co-authored-by: huqizhi <836744285@qq.com> This fixes 'Assertion failed: (!isNull() && "Cannot retrieve a NULL type pointer"), function getCommonPtr" when building the x11-wm/wayfire port. PR: 276104 MFC after: 1 month --- contrib/llvm-project/clang/lib/Sema/TreeTransform.h | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/contrib/llvm-project/clang/lib/Sema/TreeTransform.h b/contrib/llvm-project/clang/lib/Sema/TreeTransform.h index e55e752b9cc3..2f012cade6b9 100644 --- a/contrib/llvm-project/clang/lib/Sema/TreeTransform.h +++ b/contrib/llvm-project/clang/lib/Sema/TreeTransform.h @@ -13516,6 +13516,16 @@ TreeTransform::TransformLambdaExpr(LambdaExpr *E) { // Capturing 'this' is trivial. if (C->capturesThis()) { + // If this is a lambda that is part of a default member initialiser + // and which we're instantiating outside the class that 'this' is + // supposed to refer to, adjust the type of 'this' accordingly. + // + // Otherwise, leave the type of 'this' as-is. + Sema::CXXThisScopeRAII ThisScope( + getSema(), + dyn_cast_if_present( + getSema().getFunctionLevelDeclContext()), + Qualifiers()); getSema().CheckCXXThisCapture(C->getLocation(), C->isExplicit(), /*BuildAndDiagnose*/ true, nullptr, C->getCaptureKind() == LCK_StarThis); From nobody Sat Apr 6 20:19:27 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VBmsv4dsPz5HH3x; Sat, 6 Apr 2024 20:19:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VBmsv2f3Wz4MtD; Sat, 6 Apr 2024 20:19:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712434771; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zJ8BuEHb1PgshJXXtpzIKLUO/sbT6/lhyF2/rfr7bI4=; b=LeE/+A8l91pLyf0KRM5SU3HCCCAF3nxL3kb9wnCDJ9y/00hNcrZQvmadg3HrMCb0qseYd2 E5NrlwZygEAEGCUXeEXaQ48A94XmkumUJ0GrROnsJVZH1KUVtRFBRhp2+3gUU2wucb3Yft icm9fLNNK5W0VPnLzyXyAAJeBOiWp7iepDbE+ZeoQ4EgN5kEenaIShDID7oXKGIQ6FinZH GwK8/eUpsQrScCSbfDS9qSTMMoX4VkzpAbVwl61Ne6fUStHi7NNfNjMsBGYQgohOrhCqZ2 Ixzl5wEGWvbRlk7vxmEUl8Xj5kkN5lkEhFe7Xz9FErfU6GWGqkqGU9rFMSPC3g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712434771; a=rsa-sha256; cv=none; b=oZblsgqSa9W/0/e3cYjwSZhmluZ/2xWt8bYxmfLSoB034aVuEO+/QrksAVXxcfVuLZ6YPf J4jNhGe4eV8gz3uEsUkWP+Q6fC/eXAj79mCVdAN7+K+upH+o+YwH0PkMylzxtG7W/RHBsk bwiQ+ax4UgOpqDM58CDGCD0a9NV9snf2JVzrEIE6jfL4kwd9Sl5B6A989JDe8CYT6ZO4Ek MAgH4QlOOHuFGfo+1Hnj8hMaZgkZdLmh8fBEBE5HBMkA//sCm68Q4RGzuRQX4xRmMU9wds 07twLrD1Hd4WBa7PKm1uWaaKiFOwY+42CYM2cjSyQHbeSew3mnI9kcmbTRn/kA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712434771; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zJ8BuEHb1PgshJXXtpzIKLUO/sbT6/lhyF2/rfr7bI4=; b=KatjqYT7hI119h2x3Uo+01Pflec3AW0fISwKFvZu/Y4QH77+ZIKsB7gFBSXesoxg6dEpB7 iV9lxfT+mH41Jiq+j/t1quYj60RNUg+yT6V2qbYJQ6UNHl1S3gBWsrPEUBklQ841w9sPCI voXA4H/lMMlzWFES79+O19VXHmYw2tbuA8gbE6DWsFNIvGzAmM2I8zO3dlNjZTxHXIArcw 4tIqEbgv+RJH3IX2kLLf2IJxkN7TRQcwvpnIH8FMBwZ1N/rj2wgApOLlnSXp5JuzQ74RTf yDLcBs/6wBHPBqgY8+fL5Bl3nI0i6wI1XvQYC983WGKpxiGYE16bzFm4UlvIMg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VBmsv27WBzxwm; Sat, 6 Apr 2024 20:19:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 436KJVMX030464; Sat, 6 Apr 2024 20:19:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 436KJRdt030454; Sat, 6 Apr 2024 20:19:27 GMT (envelope-from git) Date: Sat, 6 Apr 2024 20:19:27 GMT Message-Id: <202404062019.436KJRdt030454@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dimitry Andric Subject: git: 439352ac8257 - main - Merge llvm-project release/18.x llvmorg-18.1.3-0-gc13b7485b879 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 439352ac8257c8419cb4a662abb7f260f31f9932 Auto-Submitted: auto-generated The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=439352ac8257c8419cb4a662abb7f260f31f9932 commit 439352ac8257c8419cb4a662abb7f260f31f9932 Merge: 49a6e426df84 05834cae71b9 Author: Dimitry Andric AuthorDate: 2024-04-05 22:02:56 +0000 Commit: Dimitry Andric CommitDate: 2024-04-06 20:14:34 +0000 Merge llvm-project release/18.x llvmorg-18.1.3-0-gc13b7485b879 This updates llvm, clang, compiler-rt, libc++, libunwind, lld, lldb and openmp to llvm-project release/18.x llvmorg-18.1.3-0-gc13b7485b879. PR: 276104 MFC after: 1 month .../clang/include/clang/AST/DeclBase.h | 10 ++ .../clang/include/clang/Sema/ScopeInfo.h | 4 +- .../clang/include/clang/Serialization/ASTReader.h | 7 -- contrib/llvm-project/clang/lib/AST/Decl.cpp | 2 +- contrib/llvm-project/clang/lib/AST/DeclBase.cpp | 5 + contrib/llvm-project/clang/lib/Basic/Module.cpp | 7 +- .../llvm-project/clang/lib/CodeGen/BackendUtil.cpp | 32 ++--- contrib/llvm-project/clang/lib/CodeGen/CGDecl.cpp | 43 ++++--- .../clang/lib/Driver/ToolChains/WebAssembly.cpp | 27 ++++- .../clang/lib/Driver/ToolChains/WebAssembly.h | 2 +- .../llvm-project/clang/lib/Headers/__stddef_null.h | 2 +- .../clang/lib/Headers/__stddef_nullptr_t.h | 7 +- .../clang/lib/Headers/__stddef_offsetof.h | 7 +- .../clang/lib/Headers/__stddef_ptrdiff_t.h | 7 +- .../clang/lib/Headers/__stddef_rsize_t.h | 7 +- .../clang/lib/Headers/__stddef_size_t.h | 7 +- .../clang/lib/Headers/__stddef_unreachable.h | 7 +- .../clang/lib/Headers/__stddef_wchar_t.h | 7 +- .../llvm-project/clang/lib/Headers/larchintrin.h | 2 +- .../clang/lib/Headers/module.modulemap | 20 ++-- contrib/llvm-project/clang/lib/Lex/ModuleMap.cpp | 9 +- contrib/llvm-project/clang/lib/Sema/SemaDecl.cpp | 73 +++++++----- .../llvm-project/clang/lib/Sema/SemaOverload.cpp | 22 +++- .../llvm-project/clang/lib/Sema/SemaTemplate.cpp | 22 +++- .../clang/lib/Serialization/ASTReader.cpp | 2 +- .../clang/lib/Serialization/ASTReaderDecl.cpp | 8 +- .../clang/lib/Serialization/ASTWriter.cpp | 2 +- .../clang/lib/Serialization/ASTWriterDecl.cpp | 8 +- .../clang/lib/StaticAnalyzer/Core/CallEvent.cpp | 2 +- .../llvm-project/compiler-rt/lib/builtins/divtc3.c | 2 +- .../llvm-project/compiler-rt/lib/builtins/fp_lib.h | 41 ++++--- .../compiler-rt/lib/builtins/int_types.h | 8 +- .../llvm-project/compiler-rt/lib/builtins/multc3.c | 2 +- contrib/llvm-project/compiler-rt/lib/msan/msan.cpp | 2 +- contrib/llvm-project/compiler-rt/lib/msan/msan.h | 35 ++++-- .../compiler-rt/lib/msan/msan_allocator.cpp | 3 + .../compiler-rt/lib/msan/msan_linux.cpp | 67 ++++++++--- .../lib/tsan/rtl/tsan_interceptors_posix.cpp | 43 +++---- contrib/llvm-project/libcxx/include/__availability | 7 +- .../llvm-project/libcxx/modules/modules.json.in | 2 +- contrib/llvm-project/lld/COFF/DLL.cpp | 2 +- contrib/llvm-project/lld/ELF/Arch/LoongArch.cpp | 22 ++++ contrib/llvm-project/lld/ELF/Arch/PPC64.cpp | 3 +- contrib/llvm-project/lld/ELF/Arch/RISCV.cpp | 2 + contrib/llvm-project/lld/ELF/Arch/X86_64.cpp | 7 +- contrib/llvm-project/lld/ELF/Writer.cpp | 3 + contrib/llvm-project/lld/docs/ReleaseNotes.rst | 5 + .../llvm/include/llvm/Analysis/VectorUtils.h | 5 + .../llvm/include/llvm/BinaryFormat/COFF.h | 5 +- .../llvm-project/llvm/include/llvm/Object/COFF.h | 41 +++++++ .../llvm/include/llvm/Object/COFFImportFile.h | 35 +++++- .../llvm/include/llvm/Support/FormattedStream.h | 51 ++++++-- .../llvm/include/llvm/Target/TargetSchedule.td | 2 +- .../llvm/lib/Analysis/ValueTracking.cpp | 2 + .../llvm-project/llvm/lib/Analysis/VectorUtils.cpp | 25 ++++ .../llvm/lib/MC/MCParser/AsmParser.cpp | 4 +- .../llvm-project/llvm/lib/Object/ArchiveWriter.cpp | 11 ++ .../llvm/lib/Object/COFFImportFile.cpp | 114 +++++++++++++----- .../llvm/lib/Support/FormattedStream.cpp | 3 + .../Target/AArch64/AArch64Arm64ECCallLowering.cpp | 57 ++++++--- .../lib/Target/AArch64/AArch64CallingConvention.td | 3 + .../lib/Target/AArch64/AArch64ISelLowering.cpp | 10 +- .../llvm/lib/Target/AArch64/AArch64MCInstLower.cpp | 2 + .../lib/Target/AArch64/Utils/AArch64BaseInfo.h | 28 ----- .../llvm/lib/Target/ARM/ARMFrameLowering.cpp | 11 +- .../llvm/lib/Target/ARM/ARMFrameLowering.h | 4 + .../llvm/lib/Target/ARM/ARMLoadStoreOptimizer.cpp | 23 ++-- .../llvm/lib/Target/AVR/AVRInstrInfo.td | 2 +- .../lib/Target/LoongArch/LoongArchISelLowering.cpp | 9 +- .../lib/Target/LoongArch/LoongArchISelLowering.h | 2 + .../lib/Target/LoongArch/LoongArchTargetMachine.h | 5 + .../Mips/MCTargetDesc/MipsTargetStreamer.cpp | 12 +- .../llvm/lib/Target/Mips/MipsExpandPseudo.cpp | 60 ++++++++-- .../llvm/lib/Target/PowerPC/PPCFrameLowering.cpp | 6 - .../llvm/lib/Target/PowerPC/PPCISelLowering.cpp | 1 + .../llvm/lib/Target/RISCV/RISCVISelLowering.cpp | 20 ++-- .../lib/Target/RISCV/RISCVTargetTransformInfo.cpp | 3 + .../lib/Target/SystemZ/SystemZISelLowering.cpp | 34 ++++++ .../llvm/lib/Target/X86/X86ISelLowering.cpp | 11 +- .../llvm/lib/Target/X86/X86InstrVecCompiler.td | 3 + .../llvm/lib/Target/X86/X86TargetTransformInfo.cpp | 4 + .../llvm/lib/Transforms/IPO/ArgumentPromotion.cpp | 6 +- .../Transforms/InstCombine/InstCombineCalls.cpp | 13 ++- .../Transforms/InstCombine/InstCombineCasts.cpp | 4 +- .../Transforms/InstCombine/InstCombineCompares.cpp | 7 ++ .../Transforms/InstCombine/InstCombineSelect.cpp | 9 +- .../InstCombine/InstructionCombining.cpp | 1 + .../Transforms/Instrumentation/ThreadSanitizer.cpp | 9 +- .../lib/Transforms/Scalar/DeadStoreElimination.cpp | 31 ++++- .../llvm/lib/Transforms/Scalar/SROA.cpp | 80 ++++++++----- .../llvm-project/llvm/tools/llvm-mc/llvm-mc.cpp | 5 - .../llvm/tools/llvm-objdump/llvm-objdump.cpp | 7 -- .../llvm/tools/llvm-readobj/COFFImportDumper.cpp | 6 + .../TableGen/MacroFusionPredicatorEmitter.cpp | 12 +- contrib/llvm-project/openmp/runtime/src/kmp.h | 8 +- .../openmp/runtime/src/kmp_affinity.cpp | 129 +++++++++++++++++++-- .../llvm-project/openmp/runtime/src/kmp_affinity.h | 73 +++++++++++- contrib/llvm-project/openmp/runtime/src/kmp_lock.h | 3 +- contrib/llvm-project/openmp/runtime/src/kmp_os.h | 3 +- .../openmp/runtime/src/z_Linux_util.cpp | 37 +++++- lib/clang/include/VCSVersion.inc | 6 +- lib/clang/include/clang/Basic/Version.inc | 6 +- lib/clang/include/lld/Common/Version.inc | 2 +- lib/clang/include/lldb/Version/Version.inc | 6 +- lib/clang/include/llvm/Config/config.h | 4 +- lib/clang/include/llvm/Config/llvm-config.h | 4 +- lib/clang/include/llvm/Support/VCSRevision.h | 2 +- 107 files changed, 1266 insertions(+), 431 deletions(-) diff --cc lib/clang/include/VCSVersion.inc index da180cecd0ca,000000000000..82f25ad621b6 mode 100644,000000..100644 --- a/lib/clang/include/VCSVersion.inc +++ b/lib/clang/include/VCSVersion.inc @@@ -1,8 -1,0 +1,8 @@@ - #define LLVM_REVISION "llvmorg-18.1.1-0-gdba2a75e9c7e" ++#define LLVM_REVISION "llvmorg-18.1.3-0-gc13b7485b879" +#define LLVM_REPOSITORY "https://github.com/llvm/llvm-project.git" + - #define CLANG_REVISION "llvmorg-18.1.1-0-gdba2a75e9c7e" ++#define CLANG_REVISION "llvmorg-18.1.3-0-gc13b7485b879" +#define CLANG_REPOSITORY "https://github.com/llvm/llvm-project.git" + - #define LLDB_REVISION "llvmorg-18.1.1-0-gdba2a75e9c7e" ++#define LLDB_REVISION "llvmorg-18.1.3-0-gc13b7485b879" +#define LLDB_REPOSITORY "https://github.com/llvm/llvm-project.git" diff --cc lib/clang/include/clang/Basic/Version.inc index 6e28151f8a06,000000000000..782f047618b5 mode 100644,000000..100644 --- a/lib/clang/include/clang/Basic/Version.inc +++ b/lib/clang/include/clang/Basic/Version.inc @@@ -1,8 -1,0 +1,8 @@@ - #define CLANG_VERSION 18.1.1 - #define CLANG_VERSION_STRING "18.1.1" ++#define CLANG_VERSION 18.1.3 ++#define CLANG_VERSION_STRING "18.1.3" +#define CLANG_VERSION_MAJOR 18 +#define CLANG_VERSION_MAJOR_STRING "18" +#define CLANG_VERSION_MINOR 1 - #define CLANG_VERSION_PATCHLEVEL 1 ++#define CLANG_VERSION_PATCHLEVEL 3 + +#define CLANG_VENDOR "FreeBSD " diff --cc lib/clang/include/lld/Common/Version.inc index e314863472f6,000000000000..4115121ebc92 mode 100644,000000..100644 --- a/lib/clang/include/lld/Common/Version.inc +++ b/lib/clang/include/lld/Common/Version.inc @@@ -1,4 -1,0 +1,4 @@@ +// Local identifier in __FreeBSD_version style +#define LLD_FREEBSD_VERSION 1500000 + - #define LLD_VERSION_STRING "18.1.1 (FreeBSD llvmorg-18.1.1-0-gdba2a75e9c7e-" __XSTRING(LLD_FREEBSD_VERSION) ")" ++#define LLD_VERSION_STRING "18.1.3 (FreeBSD llvmorg-18.1.3-0-gc13b7485b879-" __XSTRING(LLD_FREEBSD_VERSION) ")" diff --cc lib/clang/include/lldb/Version/Version.inc index 134bce0f32c8,000000000000..7cef82df9e4f mode 100644,000000..100644 --- a/lib/clang/include/lldb/Version/Version.inc +++ b/lib/clang/include/lldb/Version/Version.inc @@@ -1,6 -1,0 +1,6 @@@ - #define LLDB_VERSION 18.1.1 - #define LLDB_VERSION_STRING "18.1.1" ++#define LLDB_VERSION 18.1.3 ++#define LLDB_VERSION_STRING "18.1.3" +#define LLDB_VERSION_MAJOR 18 +#define LLDB_VERSION_MINOR 1 - #define LLDB_VERSION_PATCH 1 ++#define LLDB_VERSION_PATCH 3 +/* #undef LLDB_FULL_VERSION_STRING */ diff --cc lib/clang/include/llvm/Config/config.h index 3adaae16913f,000000000000..5cf49eceeced mode 100644,000000..100644 --- a/lib/clang/include/llvm/Config/config.h +++ b/lib/clang/include/llvm/Config/config.h @@@ -1,378 -1,0 +1,378 @@@ +#ifndef CONFIG_H +#define CONFIG_H + +// Include this header only under the llvm source tree. +// This is a private header. + +/* Exported configuration */ +#include "llvm/Config/llvm-config.h" + +/* Bug report URL. */ +#define BUG_REPORT_URL "https://bugs.freebsd.org/submit/" + +/* Define to 1 to enable backtraces, and to 0 otherwise. */ +#define ENABLE_BACKTRACES 1 + +/* Define to 1 to enable crash overrides, and to 0 otherwise. */ +#define ENABLE_CRASH_OVERRIDES 1 + +/* Define to 1 to enable crash memory dumps, and to 0 otherwise. */ +#define LLVM_ENABLE_CRASH_DUMPS 0 + +/* Define to 1 to prefer forward slashes on Windows, and to 0 prefer + backslashes. */ +#define LLVM_WINDOWS_PREFER_FORWARD_SLASH 0 + +/* Define to 1 if you have the `backtrace' function. */ +#define HAVE_BACKTRACE TRUE + +#define BACKTRACE_HEADER + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_CRASHREPORTERCLIENT_H */ + +/* can use __crashreporter_info__ */ +#if defined(__APPLE__) +#define HAVE_CRASHREPORTER_INFO 1 +#else +#define HAVE_CRASHREPORTER_INFO 0 +#endif + +/* Define to 1 if you have the declaration of `arc4random', and to 0 if you + don't. */ +#define HAVE_DECL_ARC4RANDOM 1 + +/* Define to 1 if you have the declaration of `FE_ALL_EXCEPT', and to 0 if you + don't. */ +#define HAVE_DECL_FE_ALL_EXCEPT 1 + +/* Define to 1 if you have the declaration of `FE_INEXACT', and to 0 if you + don't. */ +#define HAVE_DECL_FE_INEXACT 1 + +/* Define to 1 if you have the declaration of `strerror_s', and to 0 if you + don't. */ +#define HAVE_DECL_STRERROR_S 0 + +/* Define to 1 if you have the header file. */ +#define HAVE_DLFCN_H 1 + +/* Define if dlopen() is available on this platform. */ +#define HAVE_DLOPEN 1 + +/* Define if dladdr() is available on this platform. */ +#define HAVE_DLADDR 1 + +#if !defined(__arm__) || defined(__USING_SJLJ_EXCEPTIONS__) || defined(__ARM_DWARF_EH__) +/* Define to 1 if we can register EH frames on this platform. */ +#define HAVE_REGISTER_FRAME 1 + +/* Define to 1 if we can deregister EH frames on this platform. */ +#define HAVE_DEREGISTER_FRAME 1 +#endif // !arm || USING_SJLJ_EXCEPTIONS || ARM_DWARF_EH_ + +/* Define if __unw_add_dynamic_fde() is available on this platform. */ +/* #undef HAVE_UNW_ADD_DYNAMIC_FDE */ + +/* Define to 1 if you have the header file. */ +#define HAVE_ERRNO_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_FCNTL_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_FENV_H 1 + +/* Define if libffi is available on this platform. */ +/* #undef HAVE_FFI_CALL */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_FFI_FFI_H */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_FFI_H */ + +/* Define to 1 if you have the `futimens' function. */ +#define HAVE_FUTIMENS 1 + +/* Define to 1 if you have the `futimes' function. */ +#define HAVE_FUTIMES 1 + +/* Define to 1 if you have the `getpagesize' function. */ +#define HAVE_GETPAGESIZE 1 + +/* Define to 1 if you have the `getrlimit' function. */ +#define HAVE_GETRLIMIT 1 + +/* Define to 1 if you have the `getrusage' function. */ +#define HAVE_GETRUSAGE 1 + +/* Define to 1 if you have the `isatty' function. */ +#define HAVE_ISATTY 1 + +/* Define to 1 if you have the `edit' library (-ledit). */ +#define HAVE_LIBEDIT TRUE + +/* Define to 1 if you have the `pfm' library (-lpfm). */ +/* #undef HAVE_LIBPFM */ + +/* Define to 1 if the `perf_branch_entry' struct has field cycles. */ +/* #undef LIBPFM_HAS_FIELD_CYCLES */ + +/* Define to 1 if you have the `psapi' library (-lpsapi). */ +/* #undef HAVE_LIBPSAPI */ + +/* Define to 1 if you have the `pthread' library (-lpthread). */ +#define HAVE_LIBPTHREAD 1 + +/* Define to 1 if you have the `pthread_getname_np' function. */ +#define HAVE_PTHREAD_GETNAME_NP 1 + +/* Define to 1 if you have the `pthread_setname_np' function. */ +#define HAVE_PTHREAD_SETNAME_NP 1 + +/* Define to 1 if you have the header file. */ +#if __has_include() +#define HAVE_LINK_H 1 +#else +#define HAVE_LINK_H 0 +#endif + +/* Define to 1 if you have the header file. */ +#if __has_include() +#define HAVE_MACH_MACH_H 1 +#endif + +/* Define to 1 if you have the `mallctl' function. */ +#if defined(__FreeBSD__) +#define HAVE_MALLCTL 1 +#endif + +/* Define to 1 if you have the `mallinfo' function. */ +#if defined(__linux__) +#define HAVE_MALLINFO 1 +#endif + +/* Define to 1 if you have the `mallinfo2' function. */ +/* #undef HAVE_MALLINFO2 */ + +/* Define to 1 if you have the header file. */ +#if __has_include() +#define HAVE_MALLOC_MALLOC_H 1 +#endif + +/* Define to 1 if you have the `malloc_zone_statistics' function. */ +#if defined(__APPLE__) +#define HAVE_MALLOC_ZONE_STATISTICS 1 +#endif + +/* Define to 1 if you have the `posix_spawn' function. */ +#define HAVE_POSIX_SPAWN 1 + +/* Define to 1 if you have the `pread' function. */ +#define HAVE_PREAD 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_PTHREAD_H 1 + +/* Have pthread_mutex_lock */ +#define HAVE_PTHREAD_MUTEX_LOCK 1 + +/* Have pthread_rwlock_init */ +#define HAVE_PTHREAD_RWLOCK_INIT 1 + +/* Define to 1 if you have the `sbrk' function. */ +#define HAVE_SBRK 1 + +/* Define to 1 if you have the `setenv' function. */ +#define HAVE_SETENV 1 + +/* Define to 1 if you have the `setrlimit' function. */ +#define HAVE_SETRLIMIT 1 + +/* Define to 1 if you have the `sigaltstack' function. */ +#define HAVE_SIGALTSTACK 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SIGNAL_H 1 + +/* Define to 1 if you have the `strerror_r' function. */ +#define HAVE_STRERROR_R 1 + +/* Define to 1 if you have the `sysconf' function. */ +#define HAVE_SYSCONF 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_IOCTL_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_MMAN_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_PARAM_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_RESOURCE_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_STAT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_TIME_H 1 + +/* Define to 1 if stat struct has st_mtimespec member .*/ +#if !defined(__linux__) +#define HAVE_STRUCT_STAT_ST_MTIMESPEC_TV_NSEC 1 +#endif + +/* Define to 1 if stat struct has st_mtim member. */ +#if !defined(__APPLE__) +#define HAVE_STRUCT_STAT_ST_MTIM_TV_NSEC 1 +#endif + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_TYPES_H 1 + +/* Define if the setupterm() function is supported this platform. */ +#if defined(__FreeBSD__) +/* + * This is only needed for terminalHasColors(). When disabled LLVM falls back + * to checking a list of TERM prefixes which is sufficient for a bootstrap tool. + */ +#define LLVM_ENABLE_TERMINFO TRUE +#endif + +/* Define to 1 if you have the header file. */ +#define HAVE_TERMIOS_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_UNISTD_H 1 + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_VALGRIND_VALGRIND_H */ + +/* Have host's _alloca */ +/* #undef HAVE__ALLOCA */ + +/* Define to 1 if you have the `_chsize_s' function. */ +/* #undef HAVE__CHSIZE_S */ + +/* Define to 1 if you have the `_Unwind_Backtrace' function. */ +#define HAVE__UNWIND_BACKTRACE 1 + +/* Have host's __alloca */ +/* #undef HAVE___ALLOCA */ + +/* Have host's __ashldi3 */ +/* #undef HAVE___ASHLDI3 */ + +/* Have host's __ashrdi3 */ +/* #undef HAVE___ASHRDI3 */ + +/* Have host's __chkstk */ +/* #undef HAVE___CHKSTK */ + +/* Have host's __chkstk_ms */ +/* #undef HAVE___CHKSTK_MS */ + +/* Have host's __cmpdi2 */ +/* #undef HAVE___CMPDI2 */ + +/* Have host's __divdi3 */ +/* #undef HAVE___DIVDI3 */ + +/* Have host's __fixdfdi */ +/* #undef HAVE___FIXDFDI */ + +/* Have host's __fixsfdi */ +/* #undef HAVE___FIXSFDI */ + +/* Have host's __floatdidf */ +/* #undef HAVE___FLOATDIDF */ + +/* Have host's __lshrdi3 */ +/* #undef HAVE___LSHRDI3 */ + +/* Have host's __main */ +/* #undef HAVE___MAIN */ + +/* Have host's __moddi3 */ +/* #undef HAVE___MODDI3 */ + +/* Have host's __udivdi3 */ +/* #undef HAVE___UDIVDI3 */ + +/* Have host's __umoddi3 */ +/* #undef HAVE___UMODDI3 */ + +/* Have host's ___chkstk */ +/* #undef HAVE____CHKSTK */ + +/* Have host's ___chkstk_ms */ +/* #undef HAVE____CHKSTK_MS */ + +/* Linker version detected at compile time. */ +/* #undef HOST_LINK_VERSION */ + +/* Define if overriding target triple is enabled */ +/* #undef LLVM_TARGET_TRIPLE_ENV */ + +/* Whether tools show host and target info when invoked with --version */ +#define LLVM_VERSION_PRINTER_SHOW_HOST_TARGET_INFO 1 + +/* Define if libxml2 is supported on this platform. */ +/* #undef LLVM_ENABLE_LIBXML2 */ + +/* Define to the extension used for shared libraries, say, ".so". */ +#if defined(__APPLE__) +#define LTDL_SHLIB_EXT ".dylib" +#else +#define LTDL_SHLIB_EXT ".so" +#endif + +/* Define to the extension used for plugin libraries, say, ".so". */ +#if defined(__APPLE__) +#define LLVM_PLUGIN_EXT ".dylib" +#else +#define LLVM_PLUGIN_EXT ".so" +#endif + +/* Define to the address where bug reports for this package should be sent. */ +#define PACKAGE_BUGREPORT "https://bugs.freebsd.org/submit/" + +/* Define to the full name of this package. */ +#define PACKAGE_NAME "LLVM" + +/* Define to the full name and version of this package. */ - #define PACKAGE_STRING "LLVM 18.1.1" ++#define PACKAGE_STRING "LLVM 18.1.3" + +/* Define to the version of this package. */ - #define PACKAGE_VERSION "18.1.1" ++#define PACKAGE_VERSION "18.1.3" + +/* Define to the vendor of this package. */ +/* #undef PACKAGE_VENDOR */ + +/* Define to a function implementing stricmp */ +/* #undef stricmp */ + +/* Define to a function implementing strdup */ +/* #undef strdup */ + +/* Whether GlobalISel rule coverage is being collected */ +#define LLVM_GISEL_COV_ENABLED 0 + +/* Define to the default GlobalISel coverage file prefix */ +/* #undef LLVM_GISEL_COV_PREFIX */ + +/* Whether Timers signpost passes in Xcode Instruments */ +#if defined(__APPLE__) +#define LLVM_SUPPORT_XCODE_SIGNPOSTS 1 +#else +#define LLVM_SUPPORT_XCODE_SIGNPOSTS 0 +#endif + +/* #undef HAVE_PROC_PID_RUSAGE */ + +#define HAVE_BUILTIN_THREAD_POINTER 1 + +#endif diff --cc lib/clang/include/llvm/Config/llvm-config.h index 856bbf41d3a2,000000000000..2b7d5b3e9504 mode 100644,000000..100644 --- a/lib/clang/include/llvm/Config/llvm-config.h +++ b/lib/clang/include/llvm/Config/llvm-config.h @@@ -1,233 -1,0 +1,233 @@@ +/*===------- llvm/Config/llvm-config.h - llvm configuration -------*- C -*-===*/ +/* */ +/* Part of the LLVM Project, under the Apache License v2.0 with LLVM */ +/* Exceptions. */ +/* See https://llvm.org/LICENSE.txt for license information. */ +/* SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception */ +/* */ +/*===----------------------------------------------------------------------===*/ + +/* This file enumerates variables from the LLVM configuration so that they + can be in exported headers and won't override package specific directives. + This is a C header that can be included in the llvm-c headers. */ + +#ifndef LLVM_CONFIG_H +#define LLVM_CONFIG_H + +/* Define if LLVM_ENABLE_DUMP is enabled */ +/* #undef LLVM_ENABLE_DUMP */ + +/* Target triple LLVM will generate code for by default */ +/* Doesn't use `cmakedefine` because it is allowed to be empty. */ +/* #undef LLVM_DEFAULT_TARGET_TRIPLE */ + +/* Define if threads enabled */ +#define LLVM_ENABLE_THREADS 1 + +/* Has gcc/MSVC atomic intrinsics */ +#define LLVM_HAS_ATOMICS 1 + +/* Host triple LLVM will be executed on */ +/* #undef LLVM_HOST_TRIPLE */ + +/* LLVM architecture name for the native architecture, if available */ +/* #undef LLVM_NATIVE_ARCH */ + +/* LLVM name for the native AsmParser init function, if available */ +/* #undef LLVM_NATIVE_ASMPARSER */ + +/* LLVM name for the native AsmPrinter init function, if available */ +/* #undef LLVM_NATIVE_ASMPRINTER */ + +/* LLVM name for the native Disassembler init function, if available */ +/* #undef LLVM_NATIVE_DISASSEMBLER */ + +/* LLVM name for the native Target init function, if available */ +/* #undef LLVM_NATIVE_TARGET */ + +/* LLVM name for the native TargetInfo init function, if available */ +/* #undef LLVM_NATIVE_TARGETINFO */ + +/* LLVM name for the native target MC init function, if available */ +/* #undef LLVM_NATIVE_TARGETMC */ + +/* LLVM name for the native target MCA init function, if available */ +/* #undef LLVM_NATIVE_TARGETMCA */ + +/* Define if the AArch64 target is built in */ +#ifdef LLVM_TARGET_ENABLE_AARCH64 +#define LLVM_HAS_AARCH64_TARGET 1 +#else +#define LLVM_HAS_AARCH64_TARGET 0 +#endif + +/* Define if the AMDGPU target is built in */ +#define LLVM_HAS_AMDGPU_TARGET 0 + +/* Define if the ARC target is built in */ +#define LLVM_HAS_ARC_TARGET 0 + +/* Define if the ARM target is built in */ +#ifdef LLVM_TARGET_ENABLE_ARM +#define LLVM_HAS_ARM_TARGET 1 +#else +#define LLVM_HAS_ARM_TARGET 0 +#endif + +/* Define if the AVR target is built in */ +#define LLVM_HAS_AVR_TARGET 0 + +/* Define if the BPF target is built in */ +#ifdef LLVM_TARGET_ENABLE_BPF +#define LLVM_HAS_BPF_TARGET 1 +#else +#define LLVM_HAS_BPF_TARGET 0 +#endif + +/* Define if the CSKY target is built in */ +#define LLVM_HAS_CSKY_TARGET 0 + +/* Define if the DirectX target is built in */ +#define LLVM_HAS_DIRECTX_TARGET 0 + +/* Define if the Hexagon target is built in */ +#define LLVM_HAS_HEXAGON_TARGET 0 + +/* Define if the Lanai target is built in */ +#define LLVM_HAS_LANAI_TARGET 0 + +/* Define if the LoongArch target is built in */ +#define LLVM_HAS_LOONGARCH_TARGET 0 + +/* Define if the M68k target is built in */ +#define LLVM_HAS_M68K_TARGET 0 + +/* Define if the Mips target is built in */ +#ifdef LLVM_TARGET_ENABLE_MIPS +#define LLVM_HAS_MIPS_TARGET 1 +#else +#define LLVM_HAS_MIPS_TARGET 0 +#endif + +/* Define if the MSP430 target is built in */ +#define LLVM_HAS_MSP430_TARGET 0 + +/* Define if the NVPTX target is built in */ +#define LLVM_HAS_NVPTX_TARGET 0 + +/* Define if the PowerPC target is built in */ +#ifdef LLVM_TARGET_ENABLE_POWERPC +#define LLVM_HAS_POWERPC_TARGET 1 +#else +#define LLVM_HAS_POWERPC_TARGET 0 +#endif + +/* Define if the RISCV target is built in */ +#ifdef LLVM_TARGET_ENABLE_RISCV +#define LLVM_HAS_RISCV_TARGET 1 +#else +#define LLVM_HAS_RISCV_TARGET 0 +#endif + +/* Define if the Sparc target is built in */ +#ifdef LLVM_TARGET_ENABLE_SPARC +#define LLVM_HAS_SPARC_TARGET 1 +#else +#define LLVM_HAS_SPARC_TARGET 0 +#endif + +/* Define if the SPIRV target is built in */ +#define LLVM_HAS_SPIRV_TARGET 0 + +/* Define if the SystemZ target is built in */ +#define LLVM_HAS_SYSTEMZ_TARGET 0 + +/* Define if the VE target is built in */ +#define LLVM_HAS_VE_TARGET 0 + +/* Define if the WebAssembly target is built in */ +#define LLVM_HAS_WEBASSEMBLY_TARGET 0 + +/* Define if the X86 target is built in */ +#ifdef LLVM_TARGET_ENABLE_X86 +#define LLVM_HAS_X86_TARGET 1 +#else +#define LLVM_HAS_X86_TARGET 0 +#endif + +/* Define if the XCore target is built in */ +#define LLVM_HAS_XCORE_TARGET 0 + +/* Define if the Xtensa target is built in */ +#define LLVM_HAS_XTENSA_TARGET 0 + +/* Define if this is Unixish platform */ +#define LLVM_ON_UNIX 1 + +/* Define if we have the Intel JIT API runtime support library */ +#define LLVM_USE_INTEL_JITEVENTS 0 + +/* Define if we have the oprofile JIT-support library */ +#define LLVM_USE_OPROFILE 0 + +/* Define if we have the perf JIT-support library */ +#define LLVM_USE_PERF 0 + +/* Major version of the LLVM API */ +#define LLVM_VERSION_MAJOR 18 + +/* Minor version of the LLVM API */ +#define LLVM_VERSION_MINOR 1 + +/* Patch version of the LLVM API */ - #define LLVM_VERSION_PATCH 1 ++#define LLVM_VERSION_PATCH 3 + +/* LLVM version string */ - #define LLVM_VERSION_STRING "18.1.1" ++#define LLVM_VERSION_STRING "18.1.3" + +/* Whether LLVM records statistics for use with GetStatistics(), + * PrintStatistics() or PrintStatisticsJSON() + */ +#define LLVM_FORCE_ENABLE_STATS 0 + +/* Define if we have z3 and want to build it */ +/* #undef LLVM_WITH_Z3 */ + +/* Define if we have curl and want to use it */ +/* #undef LLVM_ENABLE_CURL */ + +/* Define if we have cpp-httplib and want to use it */ +/* #undef LLVM_ENABLE_HTTPLIB */ + +/* Define if zlib compression is available */ +#define LLVM_ENABLE_ZLIB 1 + +/* Define if zstd compression is available */ +#define LLVM_ENABLE_ZSTD 1 + +/* Define if LLVM is using tflite */ +/* #undef LLVM_HAVE_TFLITE */ + +/* Define to 1 if you have the header file. */ +#define HAVE_SYSEXITS_H 1 + +/* Define if building libLLVM shared library */ +/* #undef LLVM_BUILD_LLVM_DYLIB */ + +/* Define if building LLVM with BUILD_SHARED_LIBS */ +/* #undef LLVM_BUILD_SHARED_LIBS */ + +/* Define if building LLVM with LLVM_FORCE_USE_OLD_TOOLCHAIN_LIBS */ +/* #undef LLVM_FORCE_USE_OLD_TOOLCHAIN */ + +/* Define if llvm_unreachable should be optimized with undefined behavior + * in non assert builds */ +#define LLVM_UNREACHABLE_OPTIMIZE 1 + +/* Define to 1 if you have the DIA SDK installed, and to 0 if you don't. */ +#define LLVM_ENABLE_DIA_SDK 0 + +/* Define if plugins enabled */ +/* #undef LLVM_ENABLE_PLUGINS */ + +#endif diff --cc lib/clang/include/llvm/Support/VCSRevision.h index b8e8d52e709d,000000000000..b1a8aef7de29 mode 100644,000000..100644 --- a/lib/clang/include/llvm/Support/VCSRevision.h +++ b/lib/clang/include/llvm/Support/VCSRevision.h @@@ -1,2 -1,0 +1,2 @@@ - #define LLVM_REVISION "llvmorg-18.1.1-0-gdba2a75e9c7e" ++#define LLVM_REVISION "llvmorg-18.1.3-0-gc13b7485b879" +#define LLVM_REPOSITORY "https://github.com/llvm/llvm-project.git" From nobody Sat Apr 6 20:19:32 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VBmsw74qrz5HH3y; Sat, 6 Apr 2024 20:19: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 4VBmsw408Nz4MqY; Sat, 6 Apr 2024 20:19:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712434772; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Yc/KGaPeuCqm6PbL6ZsNKwxhk7Mtar7Zbl/+3BmlM6k=; b=gNUytcO1WSOvbXYxoAEnk5VvHtCvChk2C26qvFqEUvdabiyV1F9jPrFdyD/z6jH0xBOT8x WpKPbl3K0b/gRvxQqOtgV0Py4/DDfqoTUcN68qXAJmSG5x+K2HPt6FmyWpS7QvUADybNXJ aBW/Ky0BI90iYdoHuryNtQZ6RwQFwulfQxz7JM2tP18BhH6hvwNRikonvBeV5C059RIrj4 Uv9DK8SMcO20juld2D4/aWWctnM5Jh9x/oxgDuN8CbhBZY3BF2jixggtyqFyz3hq0Fhz2e SgE3FKVxhn1qjUM38+AzUqyBdscSDWn/oOcNcJxeAyqMDYRPteHEOhJxWYf+rg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712434772; a=rsa-sha256; cv=none; b=F8VNSR30c7JrkGibAQCdJa+c0tjoVp9lsSfH3PAxQB9X/ECkimyw0S95Nh4+NUy42d15Oi IjgpEKKdcutjdoIwiQpubEJ099jY4lZfYJiVA+Auo+dqFfo4aeb8uXLvUTy135m5wJEuqM mkHsrgyCBF/+ILZjVSYoZaiX6E4GDK05wiQ8yOUgdt7+TQFUXmj96B9LcODbFy96o38ryd gl9cj+j5uPftEH4sXbZ9SD6KiIYaIvqnX+rBwlreb3U3AUHxX0oVQ4EiK1JwXxkSauE2z8 BfZvZqxzgvj764LRUDI44RGZj+17Xdaf4w1kY7rc3gYg2K/X7MCNTOC3lb3NlQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712434772; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Yc/KGaPeuCqm6PbL6ZsNKwxhk7Mtar7Zbl/+3BmlM6k=; b=SegzdYB6h0kvKMoHREal+aQTxVjHoojQswSF/paOhChEBI69pjrZuYP/0AEaF1pVbVgBf4 lRriDK/OqslSZLKBatZZtQKD1HX1zk3MgfXFmQgyBX5wVRqrGGuFj5pCVYbM/vPokuTxtI Bd8Z8BIlbmKjzUW0I4dMNBvPm1gZEzMZ0oY/JU+au3HZAENHCaxY/N8gaJiDkIvoxH3hMR KBUGnWDGaclnKUBJksZaHhCPZRI5nAHE3aEl9ULVIzurQNNkR8d6IKKlDPEah7vV+qOP65 RSqiSuOS6yeVuE64LCYjiAa0KuC7a89MrQMLyfhHKa7uVU2HD5n8h4J+leeQqg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VBmsw3Bg4zxrS; Sat, 6 Apr 2024 20:19: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 436KJWl2030509; Sat, 6 Apr 2024 20:19:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 436KJWva030506; Sat, 6 Apr 2024 20:19:32 GMT (envelope-from git) Date: Sat, 6 Apr 2024 20:19:32 GMT Message-Id: <202404062019.436KJWva030506@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dimitry Andric Subject: git: 0192eda105b3 - main - Bump __FreeBSD_version for llvm 18.1.3 merge List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0192eda105b367d4670205547e8e830e3716bea3 Auto-Submitted: auto-generated The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=0192eda105b367d4670205547e8e830e3716bea3 commit 0192eda105b367d4670205547e8e830e3716bea3 Author: Dimitry Andric AuthorDate: 2024-04-06 20:15:21 +0000 Commit: Dimitry Andric CommitDate: 2024-04-06 20:15:21 +0000 Bump __FreeBSD_version for llvm 18.1.3 merge PR: 276104 MFC after: 1 month --- sys/sys/param.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/sys/param.h b/sys/sys/param.h index da48839fdd3b..7a091add62f3 100644 --- a/sys/sys/param.h +++ b/sys/sys/param.h @@ -73,7 +73,7 @@ * cannot include sys/param.h and should only be updated here. */ #undef __FreeBSD_version -#define __FreeBSD_version 1500017 +#define __FreeBSD_version 1500018 /* * __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD, From nobody Sun Apr 7 00:08:41 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VBsyK58yCz5FfnZ; Sun, 7 Apr 2024 00:08:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VBsyK4g8qz4tHd; Sun, 7 Apr 2024 00:08:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712448521; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pUMUFnfrYi3n+O3jlONwqgVoNEWaXLOgwZMk6PcjU5Y=; b=ADcQ9c8wSiqzxZi4qAhlxom+LOGWImVFWoKdr2FuulAR/nr0xttLVqlJEXxgj3EFs0+sbV oQpGXlAvc7ZCYDoeiI2/UY5g5MUmEiTqXWOyWTvS+Nk20T8Ep89IgDQKWKuDLSutxDf1i6 vAxuzVinZLVAA+n38qD10jul1ee6IQVlOZqa99DH2sPUtSSQklSou0cfyyck20MQ9JHkTQ 9GyiPKaKTHKzIto7wNxJeET2ZtUCytWv1k0EM0U1ctp6uGiGjZXj2ksZsrNVUxl3R3M514 bEIKDgv6dkaOXU0Xbgjt77pv+Y4vxwHG3wylT9Gwfg7O4O6aDgNGdrsniHuHig== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712448521; a=rsa-sha256; cv=none; b=ypcMhTK2B1Bt6ysK4kEuo/d6O0oBx+Eyo//Tb0t90dv1bmTaR1qlgsePKZ4nzgBYe0OHrY g3CzyjWdFwUUuADy6WNT38se0jzZQWgot5MIlHTGhi5i6dSYRU8uTvTkcWqetghUtnlo/U e0K5xoXGER6ke8nH6uQN0tOud9zn/V0oXpSiX6lSyCaAn5ybnDdffes+FzmJfUkcSrNQqb bGMOP/eec3UxB7FbK1tKmW0FH1DOQiKCNOlo8Uvc8ZILpjY7JY/CM9osMynQG2rXO2VRI4 YTQt3KFYa1HScFbA+ejuwEFjxWp/8bz4lSpmZfV8IuCz6MiIPO2e2q8l0ArkpQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712448521; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pUMUFnfrYi3n+O3jlONwqgVoNEWaXLOgwZMk6PcjU5Y=; b=KbDWaLYtIJcxM5WiIuWZiRewIc8iCTUmPh9S3WJOWu60dKDNFl9nVMEe9lEACYUDZGEbHB KSNzTD11dMeytez7b4tQcSDEtuWCxIe9yU9ReVYnikdgTgm6m8U4Gf3lLgHiSkUk21NDUw OiM5Gfl277uoHxmld8GbWeaiCNeyKOHl5lUEHti29KQpcIKlpHaCeN+oKL613OnSk1XEB5 EZLsuZQZit6AcM8ol3mruLtFC4bRccByrh40bRwcgMQXuBfZqd4n/Y89Kc6en2FwWFsqIw l3gCagF6sTlZUnfev0ecHGyOAcXezbiIDuk6ylHvZjlCCt11rv7LKbTmyCdCYw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VBsyK4GWJz14jH; Sun, 7 Apr 2024 00:08:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 43708fKo019850; Sun, 7 Apr 2024 00:08:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43708fw0019847; Sun, 7 Apr 2024 00:08:41 GMT (envelope-from git) Date: Sun, 7 Apr 2024 00:08:41 GMT Message-Id: <202404070008.43708fw0019847@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dimitry Andric Subject: git: f4d93b67611f - main - Fix arm64 build after llvm 18.1.3 upgrade List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f4d93b67611f6f8b19db7bac6b0973b2ef0cfcb6 Auto-Submitted: auto-generated The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=f4d93b67611f6f8b19db7bac6b0973b2ef0cfcb6 commit f4d93b67611f6f8b19db7bac6b0973b2ef0cfcb6 Author: Dimitry Andric AuthorDate: 2024-04-07 00:07:38 +0000 Commit: Dimitry Andric CommitDate: 2024-04-07 00:07:38 +0000 Fix arm64 build after llvm 18.1.3 upgrade Apparently clang 18 has become more strict about using floating point registers in inline assembly when -mgeneral-regs-only is used. This causes sys/arm64/arm64/vfp.c to fail to compile, with "error: instruction requires: fp-armv8", and "error: expected readable system register". To fix it, similar to other files compiled for arm64, disable -mgeneral-regs-only for this particular file. PR: 276104 MFC after: 1 month --- sys/conf/files.arm64 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/conf/files.arm64 b/sys/conf/files.arm64 index 293a0ae1c0f9..0dd097eb3e0d 100644 --- a/sys/conf/files.arm64 +++ b/sys/conf/files.arm64 @@ -82,7 +82,8 @@ arm64/arm64/uma_machdep.c standard arm64/arm64/undefined.c standard arm64/arm64/unwind.c optional ddb | kdtrace_hooks | stack \ compile-with "${NORMAL_C:N-fsanitize*:N-fno-sanitize*}" -arm64/arm64/vfp.c standard +arm64/arm64/vfp.c standard \ + compile-with "${NORMAL_C:N-mgeneral-regs-only}" arm64/arm64/vm_machdep.c standard arm64/coresight/coresight.c standard From nobody Sun Apr 7 00:31:35 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VBtSl4xVxz5Fhpm; Sun, 7 Apr 2024 00:31:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VBtSl4N3Yz3wb0; Sun, 7 Apr 2024 00:31:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712449895; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ikBrpbGaWqzshh950gcKgGRgS6Us3+vaNGgNjxj+Qu0=; b=ZhoLK2X28pnrM90klKFyj82s1AIDuMk0He328AZJkdm2n6QbDbCEXRcIjWKAOFMXGco31G TgkQFv5n3QycqtycdE1YndiHGB6l3or/aYodshlNZJg4uROTGSkkE2YsqwA9hUZaAmlwfl XdokzX3sbm/j+wUy74HCptd7ed8qSANum4YDY7b36m4iLLykcWPCLgNIXFDlWPditjyIgC c/6Ee4bsiLB5X/AxApceTlEHmXyZegobpxC35XXusdF2Pl5f6t76N9qChxTWn7JzHZe6za eKBWhXzuGqWY2sXeRn5+nTsX2dZ+uGFyEkesPgFlwYcVWEcmR+8ocuhPfNp1tw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712449895; a=rsa-sha256; cv=none; b=bc0d26mY34EwapcsIX/6/fF/aYzQIGkbJ2R/002d71l+Zc4HiTVNL22q3MHAjS8BRdj6fC Lvs5Ua4E7f1sC72X4/BYGms9rMti0UOqWsJoTqfMq5NzyYvH4HsnKOFzmb0bOK/0P0ZVqM Wn7uwUT0dalkQtLqJmxdn57JZJHAG+s1DTWXSs81CcYOMJBBxlDDBmzaa2UNdg+Ge/bbIU ni5GfbhcQZ0OQTAdhwYjlZPcumjRXnhNth47L4jdkl2IgjwK4vdRMJm1rHMTxHFZBee5k2 aVjJY5elCx0ppFXyaHO0qM5msPzNrVzpnGbx7p2oBvRaEjk4m56bed99qdfdWA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712449895; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ikBrpbGaWqzshh950gcKgGRgS6Us3+vaNGgNjxj+Qu0=; b=Ft/pK51MsLrtmQN8dOrfXjaej6dikuUTESe56XPd7hERihd5lLHDR+UyhC5tWxZJL1iWad QlWMXEQzOa9mtwfRvQ+Gjm6NG1BcPSP7hnSM7yAKu1V44EURpYATp3s+pAeWBUDO0VqzgD B2MEqqe8C8Ev1yI5AwxmNcN7jCc5B48nAxNJuAaCTwOh0ofwlC/VAQ5TRqFUEvJK9+TYy7 Mo6MziVyvnLjDsLDyxGQjv/H5rgH0sXdb7ZFurRBMF6hup9afqNZ/k+lHRuZ9ofGAIyIWw titinHInoNxvJR1gGvMIUUVLsyKme6MZXV7aNNNdtmqrFMmzHzEQRIy1eNTxSA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VBtSl3yyNz156Q; Sun, 7 Apr 2024 00:31:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 4370VZdu067882; Sun, 7 Apr 2024 00:31:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4370VZPV067879; Sun, 7 Apr 2024 00:31:35 GMT (envelope-from git) Date: Sun, 7 Apr 2024 00:31:35 GMT Message-Id: <202404070031.4370VZPV067879@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Jason A. Harmening" Subject: git: 7b86d14bfccb - stable/14 - unionfs: implement VOP_UNP_* and remove special VSOCK vnode handling List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jah X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 7b86d14bfccb589612cbc6b2e54b405da9839232 Auto-Submitted: auto-generated The branch stable/14 has been updated by jah: URL: https://cgit.FreeBSD.org/src/commit/?id=7b86d14bfccb589612cbc6b2e54b405da9839232 commit 7b86d14bfccb589612cbc6b2e54b405da9839232 Author: Jason A. Harmening AuthorDate: 2024-02-03 17:17:58 +0000 Commit: Jason A. Harmening CommitDate: 2024-04-07 00:27:00 +0000 unionfs: implement VOP_UNP_* and remove special VSOCK vnode handling unionfs has a bunch of clunky special-case code to avoid creating unionfs wrapper vnodes for AF_UNIX sockets. This was added in 2008 to address PR 118346, but in the intervening years the VOP_UNP_* operations have been added to provide a clean interface to allow sockets to work in the presence of stacked filesystems. PR: 275871 Reviewed by: kib (prior version), olce Tested by: Karlo Miličević Differential Revision: https://reviews.freebsd.org/D44288 (cherry picked from commit eee6217b40df5877674df1d9aec7d5bd04202876) --- sys/fs/unionfs/union_vnops.c | 173 +++++++++++++++++++++---------------------- 1 file changed, 84 insertions(+), 89 deletions(-) diff --git a/sys/fs/unionfs/union_vnops.c b/sys/fs/unionfs/union_vnops.c index d74d6736e580..5a2d4751ed4f 100644 --- a/sys/fs/unionfs/union_vnops.c +++ b/sys/fs/unionfs/union_vnops.c @@ -300,27 +300,8 @@ unionfs_lookup(struct vop_cachedlookup_args *ap) error = lerror; if (error != 0) goto unionfs_lookup_cleanup; - /* - * get socket vnode. - */ - if (uvp != NULLVP && uvp->v_type == VSOCK) { - vp = uvp; - vref(vp); - if (cnp->cn_lkflags & LK_TYPE_MASK) - vn_lock(vp, cnp->cn_lkflags | LK_RETRY); - } - else if (lvp != NULLVP && lvp->v_type == VSOCK) { - vp = lvp; - vref(vp); - if (cnp->cn_lkflags & LK_TYPE_MASK) - vn_lock(vp, cnp->cn_lkflags | LK_RETRY); - } - /* - * get unionfs vnode. - */ - else - error = unionfs_nodeget(dvp->v_mount, uvp, lvp, - dvp, &vp, cnp); + error = unionfs_nodeget(dvp->v_mount, uvp, lvp, + dvp, &vp, cnp); if (error != 0) { UNIONFSDEBUG( "unionfs_lookup: Unable to create unionfs vnode."); @@ -333,7 +314,7 @@ unionfs_lookup(struct vop_cachedlookup_args *ap) *(ap->a_vpp) = vp; - if ((cnflags & MAKEENTRY) && vp->v_type != VSOCK) + if (cnflags & MAKEENTRY) cache_enter(dvp, vp, cnp); unionfs_lookup_cleanup: @@ -381,9 +362,7 @@ unionfs_create(struct vop_create_args *ap) lkflags)) && error == 0) { error = ENOENT; } - if (error == 0 && vp->v_type == VSOCK) - *(ap->a_vpp) = vp; - else if (error == 0) { + if (error == 0) { VOP_UNLOCK(vp); error = unionfs_nodeget(ap->a_dvp->v_mount, vp, NULLVP, ap->a_dvp, ap->a_vpp, cnp); @@ -464,9 +443,7 @@ unionfs_mknod(struct vop_mknod_args *ap) lkflags)) && error == 0) { error = ENOENT; } - if (error == 0 && vp->v_type == VSOCK) - *(ap->a_vpp) = vp; - else if (error == 0) { + if (error == 0) { VOP_UNLOCK(vp); error = unionfs_nodeget(ap->a_dvp->v_mount, vp, NULLVP, ap->a_dvp, ap->a_vpp, cnp); @@ -1059,9 +1036,7 @@ unionfs_remove(struct vop_remove_args *ap) struct vnode *udvp; struct vnode *uvp; struct vnode *lvp; - struct vnode *vp; struct componentname *cnp; - struct componentname cn; struct thread *td; int error; int pathlen; @@ -1069,71 +1044,34 @@ unionfs_remove(struct vop_remove_args *ap) UNIONFS_INTERNAL_DEBUG("unionfs_remove: enter\n"); KASSERT_UNIONFS_VNODE(ap->a_dvp); + KASSERT_UNIONFS_VNODE(ap->a_vp); error = 0; dunp = VTOUNIONFS(ap->a_dvp); udvp = dunp->un_uppervp; cnp = ap->a_cnp; td = curthread; - unp = NULL; - - if (ap->a_vp->v_op != &unionfs_vnodeops) { - if (ap->a_vp->v_type != VSOCK) - return (EINVAL); - ump = NULL; - vp = uvp = lvp = NULLVP; - /* search vnode */ - VOP_UNLOCK(ap->a_vp); - error = unionfs_relookup(udvp, &vp, cnp, &cn, td, - cnp->cn_nameptr, cnp->cn_namelen, DELETE); - if (error != 0 && error != ENOENT) { - vn_lock(ap->a_vp, LK_EXCLUSIVE | LK_RETRY); - return (error); - } - if (error == 0 && vp == ap->a_vp) { - /* target vnode in upper */ - uvp = vp; - vrele(vp); - } else { - /* target vnode in lower */ - if (vp != NULLVP) { - if (udvp == vp) - vrele(vp); - else - vput(vp); - } - vn_lock(ap->a_vp, LK_EXCLUSIVE | LK_RETRY); - lvp = ap->a_vp; - } - path = cnp->cn_nameptr; - pathlen = cnp->cn_namelen; - } else { - ump = MOUNTTOUNIONFSMOUNT(ap->a_vp->v_mount); - unp = VTOUNIONFS(ap->a_vp); - uvp = unp->un_uppervp; - lvp = unp->un_lowervp; - path = unp->un_path; - pathlen = unp->un_pathlen; - } + ump = MOUNTTOUNIONFSMOUNT(ap->a_vp->v_mount); + unp = VTOUNIONFS(ap->a_vp); + uvp = unp->un_uppervp; + lvp = unp->un_lowervp; + path = unp->un_path; + pathlen = unp->un_pathlen; if (udvp == NULLVP) return (EROFS); if (uvp != NULLVP) { - /* - * XXX: if the vnode type is VSOCK, it will create whiteout - * after remove. - */ int udvp_lkflags, uvp_lkflags; if (ump == NULL || ump->um_whitemode == UNIONFS_WHITE_ALWAYS || lvp != NULLVP) cnp->cn_flags |= DOWHITEOUT; unionfs_forward_vop_start_pair(udvp, &udvp_lkflags, - ((unp == NULL) ? NULL : uvp), &uvp_lkflags); + uvp, &uvp_lkflags); error = VOP_REMOVE(udvp, uvp, cnp); unionfs_forward_vop_finish_pair(ap->a_dvp, udvp, udvp_lkflags, - ((unp == NULL) ? NULL : ap->a_vp), uvp, uvp_lkflags); + ap->a_vp, uvp, uvp_lkflags); } else if (lvp != NULLVP) error = unionfs_mkwhiteout(ap->a_dvp, udvp, cnp, td, path, pathlen); @@ -1171,22 +1109,18 @@ unionfs_link(struct vop_link_args *ap) if (udvp == NULLVP) return (EROFS); - if (ap->a_vp->v_op != &unionfs_vnodeops) - uvp = ap->a_vp; - else { - unp = VTOUNIONFS(ap->a_vp); + unp = VTOUNIONFS(ap->a_vp); - if (unp->un_uppervp == NULLVP) { - if (ap->a_vp->v_type != VREG) - return (EOPNOTSUPP); + if (unp->un_uppervp == NULLVP) { + if (ap->a_vp->v_type != VREG) + return (EOPNOTSUPP); - error = unionfs_copyfile(unp, 1, cnp->cn_cred, td); - if (error != 0) - return (error); - needrelookup = 1; - } - uvp = unp->un_uppervp; + error = unionfs_copyfile(unp, 1, cnp->cn_cred, td); + if (error != 0) + return (error); + needrelookup = 1; } + uvp = unp->un_uppervp; if (needrelookup != 0) error = unionfs_relookup_for_create(ap->a_tdvp, cnp, td); @@ -2835,6 +2769,64 @@ unionfs_unset_text(struct vop_unset_text_args *ap) return (0); } +static int +unionfs_unp_bind(struct vop_unp_bind_args *ap) +{ + struct vnode *tvp; + struct unionfs_node *unp; + + ASSERT_VOP_LOCKED(ap->a_vp, __func__); + unp = VTOUNIONFS(ap->a_vp); + tvp = unp->un_uppervp != NULL ? unp->un_uppervp : unp->un_lowervp; + VOP_UNP_BIND(tvp, ap->a_unpcb); + return (0); +} + +static int +unionfs_unp_connect(struct vop_unp_connect_args *ap) +{ + struct vnode *tvp; + struct unionfs_node *unp; + + ASSERT_VOP_LOCKED(ap->a_vp, __func__); + unp = VTOUNIONFS(ap->a_vp); + tvp = unp->un_uppervp != NULL ? unp->un_uppervp : unp->un_lowervp; + VOP_UNP_CONNECT(tvp, ap->a_unpcb); + return (0); +} + +static int +unionfs_unp_detach(struct vop_unp_detach_args *ap) +{ + struct vnode *tvp; + struct unionfs_node *unp; + + tvp = NULL; + /* + * VOP_UNP_DETACH() is not guaranteed to be called with the unionfs + * vnode locked, so we take the interlock to prevent a concurrent + * unmount from freeing the unionfs private data. + */ + VI_LOCK(ap->a_vp); + unp = VTOUNIONFS(ap->a_vp); + if (unp != NULL) { + tvp = unp->un_uppervp != NULL ? + unp->un_uppervp : unp->un_lowervp; + /* + * Hold the target vnode to prevent a concurrent unionfs + * unmount from causing it to be recycled once the interlock + * is dropped. + */ + vholdnz(tvp); + } + VI_UNLOCK(ap->a_vp); + if (tvp != NULL) { + VOP_UNP_DETACH(tvp); + vdrop(tvp); + } + return (0); +} + struct vop_vector unionfs_vnodeops = { .vop_default = &default_vnodeops, @@ -2888,5 +2880,8 @@ struct vop_vector unionfs_vnodeops = { .vop_vput_pair = unionfs_vput_pair, .vop_set_text = unionfs_set_text, .vop_unset_text = unionfs_unset_text, + .vop_unp_bind = unionfs_unp_bind, + .vop_unp_connect = unionfs_unp_connect, + .vop_unp_detach = unionfs_unp_detach, }; VFS_VOP_VECTOR_REGISTER(unionfs_vnodeops); From nobody Sun Apr 7 09:24:21 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VC6HV23WQz5Gf8M; Sun, 7 Apr 2024 09:24:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VC6HV0BZCz4n8v; Sun, 7 Apr 2024 09:24:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712481862; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hCbHa6IGQmfLAkC/gP04X9tjRdelceHxo/jvmL0hwmg=; b=ffbr0UIot0GGWVPgEbmhNgOOopCwwH733ah/Q015BsWnS9+gkFPnVnIl90+gD+kArsDS6E 9d7IdA9laYkuBNqgW6XbL0PTUhizqx20R2Ebkuid2yrI40X8m5v21jiPXx8QwoyIYbwfuF 0MouA7jtk4deCAe0tGsVUKvTJHXyfSfO63SZ7oWSKNjfN+zIDlMY6zTbY0rda4M4LZWpER VAI/0v57nAT46bCdKTZgCviePp0CkVwW8CFWg6CFbgZFKp8Ynv2oxSn//jeNpXmz79nKNr kdYWtLVANmjA4F9vfWIbWlJ1f6vPGWKB4+KDKt+QRMDGdzpkyFugVwiE045ZBQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712481862; a=rsa-sha256; cv=none; b=TlaZ/QHUNzyF8TPpO86jyONow008N7u2pUzvIVMHCeSnuvSb2jCFBPrJ3LyIit5EXmP1E/ 2w/55uKNR9y631E30Vq4CcFp2rEMwh3Cps/L0ewWJgSxJ88RI88M8KLoQi2hWUEng2IqFk 7d7NMXIxLW/v+K4QhhRwi3eLzVQyHhD4i1McZLijpohrWCMJRnVWm0tLlTmYtPu7RoFMTv 6VJT6k1/fLBtVURFD4u+gORqKkPsCqVr9g7VPk8/QI+cLS5ufVs0Be0HrVk5aUUSvotx3l m4DZlIiDyVeJpqr9e16XvFuoPIh42nI3/wGoBNgogrqclyOUXB76rinSLzD/lg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712481862; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hCbHa6IGQmfLAkC/gP04X9tjRdelceHxo/jvmL0hwmg=; b=nvO2gnyxuhR5OWPxWX2yLwf2zmuHpKpZ/80lsxv3abW5w7dGDEhIX3pGPwnIkymibr5g83 scrwr6i77VLKcTepaGyrn9aoDiqU1K1XRgx9WHG4ifCIgCzRVb+wnZfVCPbIhsbjZbztkG 3K+zew0iXt8AI3quwJ/F4uqVyQkqHWN3b2zlfwAoMaDNF1Vm71cd46QXqqPBcZUa5/O+f8 B4BKZd1hakQJqQJT8tzBBH44buIMHcCCuoD29PSuN8Xt8+U8zURWMf7hLouMycbH6RPF6l Z26jeuOsp7LgUS6nWZWiyNTxPo3WOt/Ydb+MRjcPZFF1mrEUQfdbNn8Xx+hsww== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VC6HT6wcWzMJL; Sun, 7 Apr 2024 09:24:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 4379OLC2064200; Sun, 7 Apr 2024 09:24:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4379OLG7064197; Sun, 7 Apr 2024 09:24:21 GMT (envelope-from git) Date: Sun, 7 Apr 2024 09:24:21 GMT Message-Id: <202404070924.4379OLG7064197@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dimitry Andric Subject: git: 61e482f2fcd5 - main - Fix arm64 build after llvm 18.1.3 upgrade (take 2) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 61e482f2fcd53bbc7fd3d4cc8b7df79d5d57d75c Auto-Submitted: auto-generated The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=61e482f2fcd53bbc7fd3d4cc8b7df79d5d57d75c commit 61e482f2fcd53bbc7fd3d4cc8b7df79d5d57d75c Author: Dimitry Andric AuthorDate: 2024-04-07 09:23:06 +0000 Commit: Dimitry Andric CommitDate: 2024-04-07 09:23:06 +0000 Fix arm64 build after llvm 18.1.3 upgrade (take 2) Instead of compiling the whole sys/arm64/arm64/vfp.c file without -mgeneral-regs-only, which might have unwanted side effects, add ".arch_extension fp" / ".arch_extension nofp" pairs to the inline assembly. PR: 276104 Suggested by: andrew MFC after: 1 month --- sys/arm64/arm64/vfp.c | 4 ++++ sys/conf/files.arm64 | 3 +-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sys/arm64/arm64/vfp.c b/sys/arm64/arm64/vfp.c index 749d5b81bfc8..f35cd960702b 100644 --- a/sys/arm64/arm64/vfp.c +++ b/sys/arm64/arm64/vfp.c @@ -110,6 +110,7 @@ vfp_store(struct vfpstate *state) vfp_state = state->vfp_regs; __asm __volatile( + ".arch_extension fp\n" "mrs %0, fpcr \n" "mrs %1, fpsr \n" "stp q0, q1, [%2, #16 * 0]\n" @@ -128,6 +129,7 @@ vfp_store(struct vfpstate *state) "stp q26, q27, [%2, #16 * 26]\n" "stp q28, q29, [%2, #16 * 28]\n" "stp q30, q31, [%2, #16 * 30]\n" + ".arch_extension nofp\n" : "=&r"(fpcr), "=&r"(fpsr) : "r"(vfp_state)); state->vfp_fpcr = fpcr; @@ -145,6 +147,7 @@ vfp_restore(struct vfpstate *state) fpsr = state->vfp_fpsr; __asm __volatile( + ".arch_extension fp\n" "ldp q0, q1, [%2, #16 * 0]\n" "ldp q2, q3, [%2, #16 * 2]\n" "ldp q4, q5, [%2, #16 * 4]\n" @@ -163,6 +166,7 @@ vfp_restore(struct vfpstate *state) "ldp q30, q31, [%2, #16 * 30]\n" "msr fpcr, %0 \n" "msr fpsr, %1 \n" + ".arch_extension nofp\n" : : "r"(fpcr), "r"(fpsr), "r"(vfp_state)); } diff --git a/sys/conf/files.arm64 b/sys/conf/files.arm64 index 0dd097eb3e0d..293a0ae1c0f9 100644 --- a/sys/conf/files.arm64 +++ b/sys/conf/files.arm64 @@ -82,8 +82,7 @@ arm64/arm64/uma_machdep.c standard arm64/arm64/undefined.c standard arm64/arm64/unwind.c optional ddb | kdtrace_hooks | stack \ compile-with "${NORMAL_C:N-fsanitize*:N-fno-sanitize*}" -arm64/arm64/vfp.c standard \ - compile-with "${NORMAL_C:N-mgeneral-regs-only}" +arm64/arm64/vfp.c standard arm64/arm64/vm_machdep.c standard arm64/coresight/coresight.c standard From nobody Sun Apr 7 16:34:38 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VCHqz07Syz5H6BQ; Sun, 7 Apr 2024 16:34:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VCHqy6dzDz4JNK; Sun, 7 Apr 2024 16:34:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712507678; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=viUMl0+MNrviHKMcCoXUH+x1ALc5yYOgO9N3mTzXN0Y=; b=n17XW0Tk4KgIlYKpiTuc1e1aXHWbmk9DPvoQomRqPbmXLP32X3gKQpQe+X+QHjfFt55ZRT 7oQBOXauXBkSRzkutAOX3RwQW3gn9+T7JS0e85F+aX1z/or8QD+Qi1EcA7w+z53OpN3rPL z5JepXAeSRnN3ASCchyToBQPn2JBUxPtSJ05gd/fjPqfHHMI73Z4rgzqdY+orUykib/536 TXRjnuNxhM3itZ+PJkfxExJ+eEwnKwNi+FJqZD1QtUULC0WSiSFuJcoYS2mRKkWiSSw7rg JfzX6VRj9H1bDRwB+Y/7lVBmi8P+w4+PHKRmTF+zx9bZXXWmfNmCNb6OwirbEw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712507678; a=rsa-sha256; cv=none; b=IRsnzxYYNAildPdOWgX/ZsHwUcT0Ryl1gcSHJvaUCLii4rYKjGp8vsCwESu3jbYhmOmBo5 A5qT4dLJC2cXVJjEuFVqDyVy/lWPOKjSiSsj95qns3vE67UIRKmAN3EtF1u0aBr62MqXON hlwdBKlqJnd1tHgYTZzk7BOstiKQMC5EvKazQNTuc+PUsXp3kGTu7WU0lsb3p9AwDPBXun iqm/r4b7du0kj2QcCweM0BeR8hAHTqrz6SxV53kxeG6GI+K+BQWEDPqtNMWP5DybQyKHOP GP4XIX76U709JE68jFRClqeBqWKDml4tsxUDNP5lZgyDmNRQC02Z9dDXitsBzw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712507678; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=viUMl0+MNrviHKMcCoXUH+x1ALc5yYOgO9N3mTzXN0Y=; b=CkNg2p+Lpe70QGVM6Z+WNV6Yl446zj+TZFl7+SAi0E/5V0vbQ6P4QtYD74ym2POLQktwvX WBIzpYF5k4swlT3rQuFe8r6sxviUrE+lMViQZ6xTBKlrx29y4FF1KFS6J4eAECBgjfensF UCx9nqf+UeUtvhmlN4pFUr7G0APXysK91KGQ9T7u65pizIMtvcKKh8o9iQv5YsgeHsNTaz egVl1Rnk31KY7xWbHpC+G8b9KZBZPTfn46VMxOf7S+V+5qr94VqtdLKza/sf5n4q0CwZo+ ecsGw7sOy4ZbIr2N1s7M73QMCmwVC2zCMyCG1t/Lse5XOV3RSZZHVE1Iyq0+zg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VCHqy6F6xzb3v; Sun, 7 Apr 2024 16:34: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 437GYcfV092006; Sun, 7 Apr 2024 16:34:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 437GYcKt092003; Sun, 7 Apr 2024 16:34:38 GMT (envelope-from git) Date: Sun, 7 Apr 2024 16:34:38 GMT Message-Id: <202404071634.437GYcKt092003@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: bedc8daace26 - stable/14 - dma.conf: Fix typo List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: bedc8daace2692efa9aad232c3eeff61f2c954c9 Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=bedc8daace2692efa9aad232c3eeff61f2c954c9 commit bedc8daace2692efa9aad232c3eeff61f2c954c9 Author: Mikael Urankar AuthorDate: 2024-03-27 09:36:33 +0000 Commit: Ed Maste CommitDate: 2024-04-07 16:34:04 +0000 dma.conf: Fix typo Pull Request: https://github.com/freebsd/freebsd-src/pull/1150 (cherry picked from commit c92400a6f690a82ab84eb0b97cc8bf169e44e4e8) --- libexec/dma/dmagent/dma.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libexec/dma/dmagent/dma.conf b/libexec/dma/dmagent/dma.conf index e11fd67cd254..bb28306e342e 100644 --- a/libexec/dma/dmagent/dma.conf +++ b/libexec/dma/dmagent/dma.conf @@ -15,7 +15,7 @@ # SMTP authentication #AUTHPATH /etc/dma/auth.conf -# Uncomment if yout want TLS/SSL support +# Uncomment if you want TLS/SSL support #SECURETRANSFER # Uncomment if you want STARTTLS support (only used in combination with From nobody Sun Apr 7 16:34:39 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VCHr032vGz5H6Wv; Sun, 7 Apr 2024 16:34:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VCHr02DlQz4JFh; Sun, 7 Apr 2024 16:34:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712507680; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rOp/jsdchqkfelgfhI5JFDWwP1/RqXnWhCEBhgjxxpc=; b=YJJdqNerlSVVuC3ZXnuy8fTybrEQRuhAIOJHJ9AGN0mVzGW4COrVmvC7dsGnEqZqQywUaA 61maXu/6eSEoieCOkSTjKMn7D3puIGK2J6jVzyVQW+89xVAllrqKbHV9jN+XnU9DzoU642 OjkdoXAl5BNcuqCFhReklgwk24spBHPc2R1oN91qyqP6LIsZK8pCsbMFk9urKvGxCZj02Y O3sGgY4lw0lH8qQiuuLh+GQxLHLBirKUv8vfhgXInO53/UXcvr/L9rmEi3cgdGChdRb31N Rd9MDYPyMqD0Yz8MvVIrSYqI5Smn6IBWZjcW0FMjpANwCu/mYIDO0Q963W9T0w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712507680; a=rsa-sha256; cv=none; b=fHnkZ7jaKxd81gYoPBpRbrIOD6K7+DeXydFl7M6nW9Q+dAJuZpVU5U6FgHxrKp1Uvsl3FB bJTzSsRSyS4XLk5V9aV8zYChwLVrfxA7nemhmO1yIopuX8ScSTr57lzak1bL6xMOhQRPkO 2nqV2dInIJ5U3FSbMki9itxqdHR09qUi/vZ9zkic8+8TyPm9VS0b6arPpBgvKeGzTLvBLY +NH+sFx4TAMFYT34r7HgEdkK8gsZPifHEym6GcnEhc1sL20emrYBSqqCq+A76jfyrYL+6u BcGfYqz2Wv5hXgXSDG+D43AGWcls1WH1B7qdv5u4H0sswX6NVmbS7gxkyFi6YA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712507680; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rOp/jsdchqkfelgfhI5JFDWwP1/RqXnWhCEBhgjxxpc=; b=k+fLbWewc++PXSabfH+xdpLwct+I3Q5jKi95q6C5kN7Cxvn+T+pIc/6BcTCBvyw7fk98oc Iu7OVeBHluX8hovzvcxivexvguXmNrzmRbmGQxSSPRmJp1Z26RLbCQG6VkOFi5oOQXfW4C Y/jcWVhiZyL6/WI3Ngiu8TNkfMnAeAl3CT21o928e37gUAthkPLkF4rb/V9PzcnQipzgaa UfwLXLo+AIrXwcS3ITHxQHKnE1Y00b60dRZFEhkt4/Z3WwaVWKnps7NUybRS/Uw4tOmZBW f4MVHg5pq+yTb9zIakbX55pSIk6Et1HzI2tbQ0wGpbjKMv0h8S7ow+qSReuH7g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VCHr007XJzb6k; Sun, 7 Apr 2024 16:34: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 437GYdxt092048; Sun, 7 Apr 2024 16:34:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 437GYdCO092045; Sun, 7 Apr 2024 16:34:39 GMT (envelope-from git) Date: Sun, 7 Apr 2024 16:34:39 GMT Message-Id: <202404071634.437GYdCO092045@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: 507e18dfc324 - stable/14 - freebsd-update: Fix typo in comment List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 507e18dfc32491d2617488b470c2208db88977e2 Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=507e18dfc32491d2617488b470c2208db88977e2 commit 507e18dfc32491d2617488b470c2208db88977e2 Author: a-biardi AuthorDate: 2024-04-02 12:28:52 +0000 Commit: Ed Maste CommitDate: 2024-04-07 16:34:04 +0000 freebsd-update: Fix typo in comment s/patchname expansion/pathname expansion/ Signed-off-by: a.biardi@tiscali.it Pull-request: https://github.com/freebsd/freebsd-src/pull/1152 (cherry picked from commit 91811711625482f3a5778939e9999f53a0bea22a) --- usr.sbin/freebsd-update/freebsd-update.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/freebsd-update/freebsd-update.sh b/usr.sbin/freebsd-update/freebsd-update.sh index 9af6e8d711ed..b6a8911e64b7 100644 --- a/usr.sbin/freebsd-update/freebsd-update.sh +++ b/usr.sbin/freebsd-update/freebsd-update.sh @@ -2895,7 +2895,7 @@ backup_kernel () { (cd ${BASEDIR}/${KERNELDIR} && find . -type f $FINDFILTER -exec \ cp -pl '{}' ${BASEDIR}/${BACKUPKERNELDIR}/'{}' \;) - # Re-enable patchname expansion. + # Re-enable pathname expansion. set +f } From nobody Sun Apr 7 16:34:41 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VCHr1409Tz5H6DN; Sun, 7 Apr 2024 16:34: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 4VCHr11XQzz4Jky; Sun, 7 Apr 2024 16:34:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712507681; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mC4BkJePOnETBZWT3Jpy1Opl820if8/+ue6YAupkGk0=; b=xE2fihupmg5RDwo/yIh0P9f+08YPxtp4T89N+rbX2+P/mjLK6PNGv5HKYDlGV4Gk1SXHC+ mVslwbt8Mq6I6KQqcGupZKhbdwovcuXrmG0P1cj9Rnc/vtIeXFVD0JbGlHQ7h/7TowBJuK df868bDyBcbzOAzNX721kP4oYhugbW1EcdttLIbKc9c2I3pU8ATJQ15JiwcZB1y8RnTOrt 6NDsFa3cnzR3xhiDOrWK/LSdoUlSJ0h5BI2W33/SEMkWj9FnxNSZoTiaAec2JaYq3oSNlQ HTgb9EA+UnKe/2UF5xUa3KTBhb2ukGWkIrHF7h46TloUWhMdOiegLA2UO6K76w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712507681; a=rsa-sha256; cv=none; b=ADMbLANkVJQP9yiUO/ViqavcWZnvCNwtmLm0EwUFLY5PLVdFUJpUNTHbEmMB+HjV6qctXD lgGQVh6gS8BudjtNp0S6nbzKhED96CpmuOAKScqnFWAf/J8Cf8RA7JN3H5b1tYmqa79JxY cEXniBM4viJUCvr5brtAJI06mhiY0PWkQSHrtXJj50yGhbfSVs/bSry3CEzi/7BoMZiasp OlBb0tYe5lldxDCOR53U2poQvtCBtj/+mqLFlR3f+P/uDaCW74r2/IIlMIeQtQceNTKRDf nbSU20OhoFfLJr+Xy/WGPCntnZptLZ4uTqguV28Y1PeeF+nAEUPKKCmkw983fQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712507681; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mC4BkJePOnETBZWT3Jpy1Opl820if8/+ue6YAupkGk0=; b=YW8sdR2bMXokJhQLGeBXjm7RoHGkU560qS2yc4fPDUWTNRPlL4NgxCgC19Nz9LUEiUtVeU acIWNAS2vKwi36AwIh+xqPdrv1wm/4HKFrTJUPCXkgK7yZuzZxuwCsXKrYLg1MYSgXcm3B 7JM7WSL8wVY3tHseJ2PYPL7YBlwShiC4bEKsfCZNBO3rcIBqgtcQ7Y6suySDBF7L36tTV7 3R5RDfbA4IlF2M8KDGZc2fIw9MU8PQxflt8OTaEQ3msbsRr/LXb74qdKQFW09djYYc1y3Q icW9wPi+ha40COKrOtaWrsrnzkXeHXoiqpAMLn/H9C5d/sb31zJxL8beY25Eag== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VCHr117w7zbGV; Sun, 7 Apr 2024 16:34:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 437GYf3p092109; Sun, 7 Apr 2024 16:34:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 437GYfas092106; Sun, 7 Apr 2024 16:34:41 GMT (envelope-from git) Date: Sun, 7 Apr 2024 16:34:41 GMT Message-Id: <202404071634.437GYfas092106@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: 6ac10e8a72a7 - stable/14 - rights.4: add note about rights not being simple bitmasks List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 6ac10e8a72a730e9078738e317f5c3e2475bd7bd Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=6ac10e8a72a730e9078738e317f5c3e2475bd7bd commit 6ac10e8a72a730e9078738e317f5c3e2475bd7bd Author: Ed Maste AuthorDate: 2024-03-22 13:47:57 +0000 Commit: Ed Maste CommitDate: 2024-04-07 16:34:04 +0000 rights.4: add note about rights not being simple bitmasks PR: 277057 Reviewed by: oshogbo, asomers Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D44473 (cherry picked from commit 537bdafbc25d39b4bb3dce124691913f86c08288) --- share/man/man4/rights.4 | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/share/man/man4/rights.4 b/share/man/man4/rights.4 index 770f9ea5c979..2d44a1060006 100644 --- a/share/man/man4/rights.4 +++ b/share/man/man4/rights.4 @@ -30,7 +30,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd February 28, 2019 +.Dd March 22, 2024 .Dt RIGHTS 4 .Os .Sh NAME @@ -68,6 +68,12 @@ The .Xr cap_rights_init 3 family of functions should be used to manage the structure. .Sh RIGHTS +Note that rights are not simple bitmasks (and cannot be bitwise-ORed together). +See +.Xr cap_rights_init 3 +for details. +.Pp +The following rights are available: .Bl -tag -width CAP_RENAMEAT_SOURCE .It Dv CAP_ACCEPT Permit From nobody Sun Apr 7 16:59:01 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VCJN52Tfgz5H8Bc; Sun, 7 Apr 2024 16:59: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 4VCJN51fNXz4Lyb; Sun, 7 Apr 2024 16:59:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712509141; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=79DjXCIoj87STZs9cdammnVM8APR4lXBq7sX3n3X8g0=; b=RgD3dURYqZaSn5686vzLnJtjUEAb06syQhcQXr0rc7OMfVSAvyrlKKRu/VEdiKHCkrHgAY bWMirZevbHmq02bcqHk3bntu/qmFNcumdpEbn0DWr4E45bI5Seldfu/dJ8vXRy6GsrMGuf rusSpL4UuS+tujPMmT682xbh4x8Y3l6/k4jirPMLWQw5TsgayKDjJMLkqBKAFwyyKLyIBa 9MTHxY4Rr2bRrzYoDSabHPFGufUUtfC/w01qYl/DXmjKHg9oWZLBqh3e/0xbcfWQL+oPEa QTWciL5mjXTY76UI4FGo9ngm8FZkL4CTGQJSoPVNYFoTNWWw2M5BcpOhs244cg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712509141; a=rsa-sha256; cv=none; b=shd5Tw/VHId7aTgmRJnzMWATEgsXam8DmCrYcyOAM3k47bd9uQ1EBDbzKps9Xr92CwxiE3 GwR3k+BED/svEGHFOKoZ7pnnBzEUc4HqUrJxBs+tLAV8O0Ctbjh8rwl7zOjN3bzwdTfAdD Y8hUO5A/OjvBQndRmt9XcL5+GZcNoiClei4CYHBuz1PXL6lkvUY6fpYTy+p6nFg46D9REZ 6+YobmkXW59W0q3AEHBMMlDq9GteBVhbaVbzu1vjJs9FmQBnolG9rt6rzdIxcWwNyLpNcv E+JR0iv8kqnJR3am1XQwZEJ/YVBYCp2ePlsFBjtGALcqWoPTD7tzAKuBaz0V3A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712509141; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=79DjXCIoj87STZs9cdammnVM8APR4lXBq7sX3n3X8g0=; b=L6ECGNaNmlzUF3IJMMrlbOAZ93wVzbzdnPjcqDq5S2jXKV/PdcDAz/9aCgFF28RyO3sbBB 1VDZJnkzRYA4YBl38etcyDa849hRnU6XXGUfqltqkkfhTIWPpvcQXT/L8/CpwBbyMRR7CO E/zejEYdypZoO3a2osBB1M3ZlXwH1mwa6WaXwctvQ+fgqZa4Hk6Ubg3P7WR3hS8krAWDwU yg0XLmKH/GPdtqvvX8BN1EgXgNPlB3Aqq+urmDfXGOFoC4IYwyOLAF80QoAT4J4+tMfXZ/ tkHE43FRkPEdEXX35pxrdyoVGdRV7Vze18fN0xrr7xuN3eTFn0cwNGMtYV5wKw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VCJN51FlczbnJ; Sun, 7 Apr 2024 16:59: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 437Gx1F5025948; Sun, 7 Apr 2024 16:59:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 437Gx18K025945; Sun, 7 Apr 2024 16:59:01 GMT (envelope-from git) Date: Sun, 7 Apr 2024 16:59:01 GMT Message-Id: <202404071659.437Gx18K025945@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: a2ce5a2dc95f - stable/13 - tar: make error reporting more robust and use correct errno List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: a2ce5a2dc95f7ce0de644abd963bd77edfb86fc3 Auto-Submitted: auto-generated The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=a2ce5a2dc95f7ce0de644abd963bd77edfb86fc3 commit a2ce5a2dc95f7ce0de644abd963bd77edfb86fc3 Author: Ed Maste AuthorDate: 2024-03-31 14:37:38 +0000 Commit: Ed Maste CommitDate: 2024-04-07 16:58:50 +0000 tar: make error reporting more robust and use correct errno Apply upstream pull request 2101. (cherry picked from commit d68c68693e110353f70b5c04f8de416cf5766eca) (cherry picked from commit bade279b8106e9d4166ef2430b4bdbcf17be9953) --- contrib/libarchive/tar/read.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/contrib/libarchive/tar/read.c b/contrib/libarchive/tar/read.c index 2a907518d7cb..94616f279e65 100644 --- a/contrib/libarchive/tar/read.c +++ b/contrib/libarchive/tar/read.c @@ -372,8 +372,9 @@ read_archive(struct bsdtar *bsdtar, char mode, struct archive *writer) if (r != ARCHIVE_OK) { if (!bsdtar->verbose) safe_fprintf(stderr, "%s", archive_entry_pathname(entry)); - fprintf(stderr, ": %s: ", archive_error_string(a)); - fprintf(stderr, "%s", strerror(errno)); + safe_fprintf(stderr, ": %s: %s", + archive_error_string(a), + strerror(archive_errno(a))); if (!bsdtar->verbose) fprintf(stderr, "\n"); bsdtar->return_value = 1; From nobody Sun Apr 7 16:59:02 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VCJN63HN3z5H862; Sun, 7 Apr 2024 16:59:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VCJN62g6qz4Lsl; Sun, 7 Apr 2024 16:59:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712509142; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CL/meVK3J9U4YXmK/yKJF5PjqzSj0Ot0FCuAyoXIiJc=; b=p4u6nQCRV3uzjSZ5qs4GrdsPJLdp7uteup9RkgbQhbxmbWAhBQfHy8xwYG3ea7aYB7QfZ/ w5hWY9vCpdXJsiCFiPJU/pDv/nTyT6S3odw5zQ490v2q12oOGpq3+4PpwA2XRE/NVEzOFt CT7FtdLvFYWYayAOy0/by43g76IusmIqBW/anLw+rYIZ9nbtCh0akpcdCulrXJzHdawgmY JUC+o4G9XBIIfagXZX0Wt7314gEq8V9f836YTOd4yTTgk6HxvN7po0cVpvLK4H1JWQjgLi XYIuqzcQANVRYBkTIdugENmCPRkHnWASLCMxGzUikPI5vwjMzHE9kuOgr00zEA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712509142; a=rsa-sha256; cv=none; b=T1wpH00qbW0emFx3O43wOSZl1oBxQRIl2JILGFZfwja6ryan2adPYsLuMwUy9cbsRxLj2z IHI/9WV599mqhiISgb7qNGlTvHnFl7PKrRXNAl1hgwWbbC0eAyF/etGHFU7QtJeLL2WmI1 DwbVw4qUforMcFvIEsYLJedUBCB4uI3CrIt/MS6SAOCaQUGZrtJoIS5G1iT+HMz672qCfh g0Nb2T3MRSv7bHIdMeWZ5YgmZpBMx4JZ3AdUuDk2HUotl1RQYbtJ6LLStnBMnLj93TmibG wDepLbdqQnL4fgrmoVm+/pWuRMHJRHFIBc55/N0Su1ynW5iP9iPpDT5UojgTyQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712509142; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CL/meVK3J9U4YXmK/yKJF5PjqzSj0Ot0FCuAyoXIiJc=; b=h09OkYEafoeMq3Vb2upxF+rvaPmN/FW+5jTdYh/e1QJA/tLxfIsJUL0nLpmi2VCT/CScLF v5BWuJmQzfPn5VvH+VYwiN+peCgeYZH3uNBuMAJVfE1VawKZ4lsQ3+oQ0cI5KoL/UhZvJe KsIalokQdGVjQNao7LoT9wzINX4GC25j5O5+IGCCIpw8DLniNLZcz9/QAkQgtrH4WyahqQ 4tH+BvkNYeu37Ym+81R0Ppv9jgW4Ipijo0RW6LaBtvhh7Pf+FL/NWfQeuzr0xpuoPfsFbL tm9wwFBHhyx5JQqZGpGl6nXpzf0rWAyEYLG55dtsvoIOpZbvJShjSo0v+BTSFw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VCJN62H5Zzc2X; Sun, 7 Apr 2024 16:59: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 437Gx2Ge026002; Sun, 7 Apr 2024 16:59:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 437Gx21m025999; Sun, 7 Apr 2024 16:59:02 GMT (envelope-from git) Date: Sun, 7 Apr 2024 16:59:02 GMT Message-Id: <202404071659.437Gx21m025999@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: 9031978083ce - stable/13 - rights.4: add note about rights not being simple bitmasks List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 9031978083ce158f54fb5dadc0e1c683bbad762b Auto-Submitted: auto-generated The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=9031978083ce158f54fb5dadc0e1c683bbad762b commit 9031978083ce158f54fb5dadc0e1c683bbad762b Author: Ed Maste AuthorDate: 2024-03-22 13:47:57 +0000 Commit: Ed Maste CommitDate: 2024-04-07 16:58:50 +0000 rights.4: add note about rights not being simple bitmasks PR: 277057 Reviewed by: oshogbo, asomers Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D44473 (cherry picked from commit 537bdafbc25d39b4bb3dce124691913f86c08288) (cherry picked from commit 6ac10e8a72a730e9078738e317f5c3e2475bd7bd) --- share/man/man4/rights.4 | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/share/man/man4/rights.4 b/share/man/man4/rights.4 index 770f9ea5c979..2d44a1060006 100644 --- a/share/man/man4/rights.4 +++ b/share/man/man4/rights.4 @@ -30,7 +30,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd February 28, 2019 +.Dd March 22, 2024 .Dt RIGHTS 4 .Os .Sh NAME @@ -68,6 +68,12 @@ The .Xr cap_rights_init 3 family of functions should be used to manage the structure. .Sh RIGHTS +Note that rights are not simple bitmasks (and cannot be bitwise-ORed together). +See +.Xr cap_rights_init 3 +for details. +.Pp +The following rights are available: .Bl -tag -width CAP_RENAMEAT_SOURCE .It Dv CAP_ACCEPT Permit From nobody Sun Apr 7 17:29:20 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VCK350KY7z5HCCQ; Sun, 7 Apr 2024 17:29:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VCK346vvYz4QDD; Sun, 7 Apr 2024 17:29:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712510961; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=A6aF0Ob5/Iodluq7Cc9PRIsFWt9o+C7H9JZk0Q1bKEU=; b=YTMrQA80Ik8eAwidOzXJ/BqV5PHd2Pfq0x8a6Pwy8WXPA4dK6wbgJD3lfPWoPcxRglilQm GWTWOlDe1L4a+LuhwylZtol9hyhzJpmKZExmMw1hSWP0/lGzNaoCCNkbQfFtkBiI+383da 9hiKUbFLxfHRfef4eB8UZpfvVEorOW35azifvLAxBG+LXC2kz66kUB3uvOGau0KCqayzU7 HFdjkwlpwFCOv2SAKpae/wbfJKIuGv5ikUXQSdkEJYpxJXHKfKf1uQWxi5WLpllF/8qt6m Ehf77u6LiaSPxLhnsbgkZebfXjth4Ztm6wVZX634lFwcOcVkvPwop7n9ILg4qA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712510961; a=rsa-sha256; cv=none; b=wA+tE7Rjcb/lkSJ46LgaeBr7XRi2GiYAzT5W5X638EbGeCkSYVkD+622btu/tR49n5V9mH LBbub3ap8Vmd9yledgOS9J3Wuaj8p0j0L/cJdbrGhYLI4ZibVIMS0l+QNJoliko2HSngBU 6jZuvxe+y64CCQagG1fkivfBEmdCDP9TSk93S6QKXznl8r+D3nvJUW1+Pcw9rHEJfWC1u8 kwwKSrcWHkZTZS8rpebbWlllNFWUdQBBD0CuF8uTHogAFOT72xJsTdLTZVb4Zg4Ix3H7DM 47stooKRsgV+85HDY5g1iS9856DOMK8Q50MZ2czojGZcUg82K7+y45g+zYb27w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712510961; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=A6aF0Ob5/Iodluq7Cc9PRIsFWt9o+C7H9JZk0Q1bKEU=; b=v5s2E3+9A3zGs3tRRE2j5Icx9ZAwFCf57jxUBBHmswlVXRwIQGJ3Iq3pTkWo6/RiTI/REc CrsL2K+hi/pw2pDYGBrFGyXnBCXoe+zr71bN0LfVnLxXReIcv9iAkhE24rpIsvHh40qvk2 4GSkhIaEgukj23a0rwOi5pvGHH6sQ7xFCQJN1DKEpu+E48zTHe4mRzIaKYRMJtgiLhTMoV A2fggW4XOOBoqWfia9BFmYT8n+qeIEsktxFueOGvV6mVDvZmMNDps0qTJ2PdjlOq6pqWbW s8ifiDgwJRx9lCswMyeiBYuX87g1Jtq1ICLTZ5yP7CGebBL5mLWKjmsKP9SLpA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VCK346WMKzcjJ; Sun, 7 Apr 2024 17:29:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 437HTKxv077462; Sun, 7 Apr 2024 17:29:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 437HTKXB077459; Sun, 7 Apr 2024 17:29:20 GMT (envelope-from git) Date: Sun, 7 Apr 2024 17:29:20 GMT Message-Id: <202404071729.437HTKXB077459@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Doug Moore Subject: git: 1526667bc6e2 - main - vm_reserv: Add vm_reserv_is_populated List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dougm X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1526667bc6e2c1042010de25e7a0226c0f1b44be Auto-Submitted: auto-generated The branch main has been updated by dougm: URL: https://cgit.FreeBSD.org/src/commit/?id=1526667bc6e2c1042010de25e7a0226c0f1b44be commit 1526667bc6e2c1042010de25e7a0226c0f1b44be Author: Doug Moore AuthorDate: 2024-04-07 17:19:41 +0000 Commit: Doug Moore CommitDate: 2024-04-07 17:28:52 +0000 vm_reserv: Add vm_reserv_is_populated Add a function to check whether an aligned block of vm pages are allocated, for use with impending changes to arm64 superpage managment. Reviewed by: alc Differential Revision: http://reviews.freebsd.org/D44575 --- sys/vm/vm_reserv.c | 21 +++++++++++++++++++++ sys/vm/vm_reserv.h | 1 + 2 files changed, 22 insertions(+) diff --git a/sys/vm/vm_reserv.c b/sys/vm/vm_reserv.c index 7b4a39a34906..b3b1dc62f14e 100644 --- a/sys/vm/vm_reserv.c +++ b/sys/vm/vm_reserv.c @@ -1058,6 +1058,27 @@ vm_reserv_is_page_free(vm_page_t m) return (!bit_test(rv->popmap, m - rv->pages)); } +/* + * Returns true if the given page is part of a block of npages, starting at a + * multiple of npages, that are all allocated. Otherwise, returns false. + */ +bool +vm_reserv_is_populated(vm_page_t m, int npages) +{ + vm_reserv_t rv; + int index; + + KASSERT(npages <= VM_LEVEL_0_NPAGES, + ("%s: npages %d exceeds VM_LEVEL_0_NPAGES", __func__, npages)); + KASSERT(powerof2(npages), + ("%s: npages %d is not a power of 2", __func__, npages)); + rv = vm_reserv_from_page(m); + if (rv->object == NULL) + return (false); + index = rounddown2(m - rv->pages, npages); + return (bit_ntest(rv->popmap, index, index + npages - 1, 1)); +} + /* * If the given page belongs to a reservation, returns the level of that * reservation. Otherwise, returns -1. diff --git a/sys/vm/vm_reserv.h b/sys/vm/vm_reserv.h index 44e8a939d165..98780efc9d37 100644 --- a/sys/vm/vm_reserv.h +++ b/sys/vm/vm_reserv.h @@ -55,6 +55,7 @@ void vm_reserv_break_all(vm_object_t object); boolean_t vm_reserv_free_page(vm_page_t m); void vm_reserv_init(void); bool vm_reserv_is_page_free(vm_page_t m); +bool vm_reserv_is_populated(vm_page_t m, int npages); int vm_reserv_level(vm_page_t m); int vm_reserv_level_iffullpop(vm_page_t m); vm_page_t vm_reserv_reclaim_contig(int domain, u_long npages, From nobody Sun Apr 7 18:00:21 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VCKks5X9wz5HFWG; Sun, 7 Apr 2024 18:00:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VCKks50Trz4SRF; Sun, 7 Apr 2024 18:00:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712512821; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kyh0i9VJlVDtGhyQro0bh54VS3qTsxGEuNii8d0K4UI=; b=H2JlPVTdaRWLs8/teKJ1dW70XUEGvaITbKO3HU42dl1c8hW4Fr8LmHKu55qgROdYDvywoB m2ms7D2a3FdTzFUup9GsfnQV9ASEegYOQrR5zhYu54C67QBRX5gUKUOAMGhHT/ZcBXFHdz zGPcF0tiCuiPBnb2MNw3q3g6lE4dQghyXsLng0eefR+0DUHjiSZNV0I2ZWlpQmBo8hjvgq XTNGnET3FKdrXeoC0+Yf2oMTwGEwJwKrNrEW/cne6g/ZQ6XcrUOioQ1vlmX8VrQsimCtAr Z5jHDW+Dsk7EOkE8/hh/rceOZjHDRqrvMV+iC0yeAM1Pom7a5dhPJs7p7G/nFQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712512821; a=rsa-sha256; cv=none; b=DJbd9y5oRUDqRavdO+rxJf+Yrh2xfJKaLqwWyFvrXQ6czXKSi9u7yV9GDm6GUO8tIJe+15 vqMPpj773H3HU0YJ4cCdxW0DtWTPGItbHe4dRgLIbcqfBgfesryvab03TDDuVPL0St3QgT ljagCvPso8+d2bBT4YCLAA/rglY7ej03kAWYxMBmjEapJuqZwDH2pQFitE7eGJ4CvA0QW2 yTI2U4Mc+TlwPknlffW8exfeFxg+xchSBpBd77A8XNDs8w9GtCSCxhXb6czQShlODr3v7+ bgFrWh3WSWFlpuH7FfDXZ+eeMVy2osa0gQ5XtthWE2bTyYP0M9DqqjEcAp2nyw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712512821; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kyh0i9VJlVDtGhyQro0bh54VS3qTsxGEuNii8d0K4UI=; b=fZZr/ApX5PsSUelIjfzoWpnzgJEntaOOvwMSpAC71vNylJD8qkiJoIrcwn3VzKv/T9ogNA g4t6pQmZfBSsaNYhamdcW6fH6nmITjKv377xMlc50YIVi2RNFjza7ebRM0mkHXsHCORe6e GaDhp0OXngvQOzk1MAQVUayiXa8QxlsHDlXYACdZzK+RszWCoGVx0lVPTwDT6wbW+EdpUl EnRtc/0Gp1H1v/0zI+G2bLTkbogDSgdvyEmBYjWUrLngprlYx90RA/m2jgvf7Xyc5Ipg1C ke/5z2463vpdwwbQ3OFovWCvZFAMSwJY+BNLoM7M5nNyU/k+9vBrJsytHleUUw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VCKks4bl2zdS8; Sun, 7 Apr 2024 18:00:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 437I0LOo037793; Sun, 7 Apr 2024 18:00:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 437I0L83037790; Sun, 7 Apr 2024 18:00:21 GMT (envelope-from git) Date: Sun, 7 Apr 2024 18:00:21 GMT Message-Id: <202404071800.437I0L83037790@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dimitry Andric Subject: git: b811dac2115a - main - Fix GENERIC-KASAN kernel build for amd64 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b811dac2115a6ada606c03d7d823a95d11c5f3c9 Auto-Submitted: auto-generated The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=b811dac2115a6ada606c03d7d823a95d11c5f3c9 commit b811dac2115a6ada606c03d7d823a95d11c5f3c9 Author: Dimitry Andric AuthorDate: 2024-04-07 17:56:03 +0000 Commit: Dimitry Andric CommitDate: 2024-04-07 17:58:52 +0000 Fix GENERIC-KASAN kernel build for amd64 Work around https://github.com/llvm/llvm-project/issues/87923, which leads to an assertion failure compiling several kernel source files with asan enabled. PR: 276104 MFC after: 1 month --- sys/conf/kern.pre.mk | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/sys/conf/kern.pre.mk b/sys/conf/kern.pre.mk index 6bf647f5c3ea..567c68e5887e 100644 --- a/sys/conf/kern.pre.mk +++ b/sys/conf/kern.pre.mk @@ -111,6 +111,11 @@ SAN_CFLAGS+= -DSAN_NEEDS_INTERCEPTORS -DSAN_INTERCEPTOR_PREFIX=kasan \ # upstreamed similar to: https://reviews.llvm.org/D98285 # SAN_CFLAGS+= -mllvm -asan-mapping-offset=0xdfff208000000000 +.elif ${MACHINE_CPUARCH} == "amd64" && \ + ${COMPILER_TYPE} == "clang" && ${COMPILER_VERSION} >= 180000 +# Work around https://github.com/llvm/llvm-project/issues/87923, which leads to +# an assertion failure compiling dtrace.c with asan enabled. +SAN_CFLAGS+= -mllvm -asan-use-stack-safety=0 .endif .endif From nobody Sun Apr 7 18:21:24 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VCLC84WwTz5HHqw; Sun, 7 Apr 2024 18:21: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 4VCLC83scFz4VNx; Sun, 7 Apr 2024 18:21:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712514084; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fWYJY2u/OH8tPFKY3veWut7VSzbfGtDyF53Y7OP+G4o=; b=VO3KerA4u058Aeq+DJ48sDSQYSXDR6qDlTztW+t2c/+VAYPhG6iU9RvAtvXwX5F7l6eaNd TCvEmen0qo/+YzzYECabxqUWEV4yanq/oXZN9iCLMuAe6FHBhnwZKo8kXKOC102So19wYK ju/R31FTvXvOUjy+LRC82eF1RaBrCpQmNkRfkP81WRzdheImE1lMPnVlaQ+E9O7CBSIDNx PhoDdyMZgAWWSZq5Brk+vu8c/96SM25dKGhpE0z92eZPKilXf8KRQOfls2M57N/Zj9mpVJ wNUWpM53OxV/voDqwfpK55ICvNIj5EwbOI1FPGctZHNSw8AiDmz2MbdOKN4g8A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712514084; a=rsa-sha256; cv=none; b=GRbPzuhkq/cx7JGu9RqCAdYyW3EVGyS+gae2K/whnxIFnFU1Q09ejp8AIYPhLQPgc3K/OF nPqZEbZ3jDkjy/Mg8d+KGSkI/8R04IDmLyQas2tQzzIlRdgncYBbfMR86O6QHF440kbuWW RdFZlKxo72AbaYpGq7pMfyP5wdhEJ4KllQF1721UPoTZsqUL5g8o7OUYlgLXfkRMeJEMnf F9RsyB+eKVNIugWZOyNQq/AOc5ho6cyMLKl5pvLHCy0hKsQEvbvIjsw8JXjkdEDDMKTn7n Omda1JZaG4qFv1VE1fZZwbn7d1WH37XHQDa1JTA0vqAivXmzzLXYwDxopapNYg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712514084; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fWYJY2u/OH8tPFKY3veWut7VSzbfGtDyF53Y7OP+G4o=; b=Em0LOzY/TEN9eNmGfb2g9RsiFrAh++KZoIgH+3ggdDLNQyhBuvZJNs4c6ipU2DNJtQIFAJ Q30vIlef95TGqwD4AVLPxdzi51pLWYAXy5tRHx7Y2JNJOOhEeegUsxibraVV9o69Cbywnl A46E1zaT0JVVQQd/1Iu1hsIxFRgbiYfwhpRsoKZC5OrsfG37DZNH9cpTshejPCfZGpKUZT kaJtmQOeUAmU3jV2SxIWtIETt/CsEh6PcGTaqX1gZyCoLRXv6/34PM27UuBjt4mA4nq6Jl /7uy305tLXgNRoZ2L0hs+Yeb20zslp45QMam1Sr8mCJfYnhj7JgUOBot72q5yQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VCLC83Sh4zdn1; Sun, 7 Apr 2024 18:21: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 437ILObh071961; Sun, 7 Apr 2024 18:21:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 437ILO6t071958; Sun, 7 Apr 2024 18:21:24 GMT (envelope-from git) Date: Sun, 7 Apr 2024 18:21:24 GMT Message-Id: <202404071821.437ILO6t071958@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dimitry Andric Subject: git: d00b9344bb10 - main - libcompiler_rt Makefile.inc: remove debugging messages List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d00b9344bb10a9a35b02df33475bec951dfccd78 Auto-Submitted: auto-generated The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=d00b9344bb10a9a35b02df33475bec951dfccd78 commit d00b9344bb10a9a35b02df33475bec951dfccd78 Author: Dimitry Andric AuthorDate: 2024-04-07 18:16:50 +0000 Commit: Dimitry Andric CommitDate: 2024-04-07 18:16:52 +0000 libcompiler_rt Makefile.inc: remove debugging messages PR: 276104 MFC after: 1 month --- lib/libcompiler_rt/Makefile.inc | 7 ------- 1 file changed, 7 deletions(-) diff --git a/lib/libcompiler_rt/Makefile.inc b/lib/libcompiler_rt/Makefile.inc index 76b66b19d910..d9fe3d8bc8f2 100644 --- a/lib/libcompiler_rt/Makefile.inc +++ b/lib/libcompiler_rt/Makefile.inc @@ -1,6 +1,5 @@ CRTARCH= ${MACHINE_CPUARCH:C/amd64/x86_64/:C/powerpc/ppc/} -.info DIMDBG: CRTARCH=${CRTARCH} CRTSRC= ${SRCTOP}/contrib/llvm-project/compiler-rt/lib/builtins @@ -131,7 +130,6 @@ SRCF+= floatundisf # 80-bit long double functions, only used on x86. # .if ${MACHINE_CPUARCH} == "amd64" || ${MACHINE_CPUARCH} == "i386" -.info DIMDBG: Enabling 80-bit long double SRCF+= divxc3 SRCF+= extendxftf2 SRCF+= fixxfdi @@ -153,8 +151,6 @@ SRCS+= floatundixf.c SRCF+= floatdixf SRCF+= floatundixf .endif -.else -.info DIMDBG: NOT enabling 80-bit long double .endif # __cpu_model support, only used on aarch64 and x86 @@ -178,7 +174,6 @@ SRCF+= fp_mode # .if ${MACHINE_CPUARCH} == "aarch64" || ${MACHINE_CPUARCH} == "amd64" || \ ${MACHINE_CPUARCH} == "riscv" -.info DIMDBG: Enabling 128-bit quad precision SRCF+= addtf3 SRCF+= comparetf2 SRCF+= divtc3 @@ -205,8 +200,6 @@ SRCF+= subtf3 SRCF+= trunctfdf2 SRCF+= trunctfhf2 SRCF+= trunctfsf2 -.else -.info DIMDBG: NOT enabling 128-bit quad precision .endif # These are already shipped by libc.a on some architectures. From nobody Sun Apr 7 18:21:25 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VCLC95V6Gz5HHfp; Sun, 7 Apr 2024 18:21:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VCLC94bchz4VNy; Sun, 7 Apr 2024 18:21:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712514085; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KgCHsdcq2zkZd6/CizMc2xfIH2lLZDrlJd0GX2WCxJw=; b=mlRkdLojfNACThXuI0eOmm0nNpD4Uj1zqkn0a0MiAhxdfzYJzda6OnlX0W62NrmgEeQbPq v3Ac9nmozudjv2aghRXO0DXf0YGM5QKlmD4mpHgnOOgvDmdAeu7CI5wnsFtK8320Og1oRE j4EbGzIlPQRLGnuhzcA2smN06SOutw1Dk85zydfypQVK6PKeip5dK+QjL7bqpHtTMD4++z hfHyvcp4XyNOCCBnA/a+XXKmxhBXUrwyafC+QUpOwji/PIJGTYAzJQDjHP6jLmAcSJnAOT 73+/OdNurwXfyd5amQtghaNT7iPjbKGkH0kfhKwE7RhKnueMC39kKjj+8oH3ig== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712514085; a=rsa-sha256; cv=none; b=MomeHhU65lnRoRtJbrZf+pM/kc3aQm79Y8Sde0+EusDqa4CwAqp0PdFzCsG0FCVaEVxlID WPioRr9utOcw3uoGVSy4YYipXyOWUv531+UvMI4YcGpnUkHjuYZayy1rjWYmyuIkpx+ck0 Md6v++cFB+1p5TzZR1ffsYDk8TPXAwLm6C9SzfY2sGjgasRxDu4zJd7VmHP6strn8LABWo 549BIEk83Lg8+4LZY3+Qh569zAfNSrrmAtr/hXHPrjIp3YxZa2CgOMjG1XeKO66XYwzqEk sZNRa3VUgEPTLTKJIyQ+VRXxruUteHsLVgpf7zLLOhWOVO0fL/1cwXyJzeLAFQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712514085; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KgCHsdcq2zkZd6/CizMc2xfIH2lLZDrlJd0GX2WCxJw=; b=ftFA0NaBjDwvB4HE9w+N4nGAGvgojUV2gHjTI3faeDZJYsE+Y37v1Y8Y945olNwwqPhEwh FKUO+9XicMeS7y11R1ELz/F1wGQDFCaF5FEBG69YhYf+YZFAsPZkCi8aPDRVKrqMp6slr9 niCJyEDq1J1fhbesrVmk+hCMPKnX3b0K0hKwwAlqwTeKQn+3u9iVXX6mBWyVFfgX8kNFxl XEMTRS63NWVpCUrnokDvj3FJDMwnWv8h2/dtetc8ibPYipgtbs2CcIypV5xJaG4cTryD4N xjGVEkw8CjHW5P4ihTgd66BxGeBOvmFQRYQjw7a9G6oITUrrRJSltT3nYikrRw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VCLC94Bz6zdTh; Sun, 7 Apr 2024 18:21: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 437ILPej072021; Sun, 7 Apr 2024 18:21:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 437ILPef072017; Sun, 7 Apr 2024 18:21:25 GMT (envelope-from git) Date: Sun, 7 Apr 2024 18:21:25 GMT Message-Id: <202404071821.437ILPef072017@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dimitry Andric Subject: git: 2e226748a961 - main - libcompiler_rt Makefile.inc: don't build bfloat16 support for gcc < 13 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2e226748a961329471f5b51483318b94c8735f34 Auto-Submitted: auto-generated The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=2e226748a961329471f5b51483318b94c8735f34 commit 2e226748a961329471f5b51483318b94c8735f34 Author: Dimitry Andric AuthorDate: 2024-04-07 18:21:01 +0000 Commit: Dimitry Andric CommitDate: 2024-04-07 18:21:01 +0000 libcompiler_rt Makefile.inc: don't build bfloat16 support for gcc < 13 Older versions of gcc produce "error: unknown type name '__bf16'". PR: 276104 MFC after: 1 month --- lib/libcompiler_rt/Makefile.inc | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/lib/libcompiler_rt/Makefile.inc b/lib/libcompiler_rt/Makefile.inc index d9fe3d8bc8f2..2c756f4ad21f 100644 --- a/lib/libcompiler_rt/Makefile.inc +++ b/lib/libcompiler_rt/Makefile.inc @@ -228,9 +228,10 @@ SRCF+= comparesf2 # # bfloat16 support, only used on some architectures. # -.if ${MACHINE_CPUARCH} == "aarch64" || ${MACHINE_CPUARCH} == "amd64" || \ - ${MACHINE_CPUARCH} == "arm" || (${MACHINE_CPUARCH} == "i386" && \ - !empty(MACHINE_CPU:Msse2)) || ${MACHINE_CPUARCH} == "riscv" +.if (${MACHINE_CPUARCH} == "aarch64" || ${MACHINE_CPUARCH} == "amd64" || \ + ${MACHINE_CPUARCH} == "arm" || (${MACHINE_CPUARCH} == "i386" && \ + !empty(MACHINE_CPU:Msse2)) || ${MACHINE_CPUARCH} == "riscv") && \ + !(${COMPILER_TYPE} == "gcc" && ${COMPILER_VERSION} < 130000) SRCF+= truncdfbf2 SRCF+= truncsfbf2 .endif From nobody Sun Apr 7 19:53:13 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VCNF61tZLz5HQn1; Sun, 7 Apr 2024 19:53:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VCNF56NWJz4fnx; Sun, 7 Apr 2024 19:53:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712519593; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eRLdvCedb4oG//GMIJUa/eZV3j3olqMycG8epiwV0bs=; b=uP0bVFbcD96zLwaQXNgE9Ma6IYw47KsxSB7e7Y2gFajHru1nQe++pFp0NvPtU/RRwv2FZL fIaitmJK2klWIXYzf0ROEkD+L6yNt31lUkGD2VORmakBLsHtlJ5k1uPGdAs1z/iD0lX/SV 1H+Lx0csbB3UGt1k3lK2XikiIrKNocfaKzNaMSx5bGksErcu5sbcHvHevw1ZwBa1vOW//M vO4HmKqOOmUWfGk/pN/QDRE3Nmzeq2nwV3/bdaNqyyYksvfhGGI5BH88WGu3vLGX0Rhk+m 8sZotPAegYJ47vAgl10QMmXem8UJIt6QsMr2pB4vbXWXuCC85uDqohUu7vp+SA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712519593; a=rsa-sha256; cv=none; b=w/J84LPuYstYDGNpZQQo7Q4delD092P5uD5Pp6vVj00UpxTP4GMsjJ0EGGcPpi92Xd6BEN EHnOBQQiI+2im0+s1v6DB5uhLWwveGyLe8EDHliHJuv4AKRvwp5IFPMDm4eMj7UpmQODzb hHrnbkK5OzxOx2wQpK0XfUvlZ9YWVATNVaryBD6dHDPO7UPtkz1CePrzOC9EbKH9io3iWH 0K2ybJm6nq1J1yDDAPIAFbhht8kbcqrZVVJgs7M2kBdWv6FQPGMLoonJuSluTJXzWv7nlc cfmTqIYDYkCdk5JPQplkbrDk6UurzHWr3SAiiKmkZ28LAWIgecO5EvaR8JGRvQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712519593; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eRLdvCedb4oG//GMIJUa/eZV3j3olqMycG8epiwV0bs=; b=ySaTZFOJXm3BrCawBPh1ZRLGc5G2WjsQ7A3GAw2M1VME91QVN93zddcIDawLZlOnAVx5xO n7BJFt8ZR9fq6tXkmN+rrBJActNJxTnQnjLv4XPScmsepzJVB5kyxV+OOJGi0ctfhQ7i1t l1LTUFI5gl6dyM82pr9OqazreVlE+BvZKiPYdSt6iWm4MLGSpYvdGJfME8DzAzpIG/x9Eb rxOteDxmxl0buH7469qlVubNVX6ZqKfqQpKKf594rM+97J6pym2QpKG6FEYnXzAcIPl9YK csUe3bSrTNCo3f9DDe3xYfUYugNflhSVRw1Le4HExNJyIjNjD6ljRhSl6Sqfew== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VCNF5610Czh2P; Sun, 7 Apr 2024 19:53:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 437JrDKD030590; Sun, 7 Apr 2024 19:53:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 437JrDhn030587; Sun, 7 Apr 2024 19:53:13 GMT (envelope-from git) Date: Sun, 7 Apr 2024 19:53:13 GMT Message-Id: <202404071953.437JrDhn030587@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dimitry Andric Subject: git: 4c983a288687 - main - libcompiler_rt Makefile.inc: include bsd.compiler.mk to fix build List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4c983a2886877a855ac3a2836b15d80356fbb8d4 Auto-Submitted: auto-generated The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=4c983a2886877a855ac3a2836b15d80356fbb8d4 commit 4c983a2886877a855ac3a2836b15d80356fbb8d4 Author: Dimitry Andric AuthorDate: 2024-04-07 19:45:51 +0000 Commit: Dimitry Andric CommitDate: 2024-04-07 19:45:51 +0000 libcompiler_rt Makefile.inc: include bsd.compiler.mk to fix build Apparently libgcc_s has always included libcompiler_rt's Makefile.inc without first including bsd.compiler.mk, even though Makefile.inc used COMPILER_TYPE already. It looks like we were just lucky that the expression was not malformed. PR: 276104 Reported by: Herbert J. Skuhra MFC after: 1 month --- lib/libcompiler_rt/Makefile.inc | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/libcompiler_rt/Makefile.inc b/lib/libcompiler_rt/Makefile.inc index 2c756f4ad21f..47d87b71ea77 100644 --- a/lib/libcompiler_rt/Makefile.inc +++ b/lib/libcompiler_rt/Makefile.inc @@ -1,3 +1,4 @@ +.include CRTARCH= ${MACHINE_CPUARCH:C/amd64/x86_64/:C/powerpc/ppc/} From nobody Sun Apr 7 20:45:57 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VCPPx57fyz5HVf9; Sun, 7 Apr 2024 20:45:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VCPPx4Syqz4mjH; Sun, 7 Apr 2024 20:45:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712522757; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BGx5v1uSj7aDJRV0zF23Z9jAdgsIsVwXZC69+whxh3E=; b=nFfi1mO6XXAeyPUR2H3MBqygOoBU3CjBEUvOwdpiWrtSX9wnbt3hilcfIqlpRdo8ffAkeD ddxWSmQsjeFdNB7slwbH52k5X3y4zC7/NWnEDlAMX75sMvdwN290R+wBLgvSdtUVzrsYGO TRabpOIyuR8xVqx+RsPSdnxs5vgtPolWVJky/z4qxRUnLE8DSCEVylK+8Hj0J9vWI49YDb nWA2Uh6ngmgrQRsMSdnfIjJ/1BJBNaGIZC6Rb8WUpsxsZ985AqitZEQcWLW/BDNlaEud+y 4i6aJU13Lvm48TBh0ce65M2Rp4XdoOemf8z3T8S4hrB/6PHmSCWDzs89X8rzjA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712522757; a=rsa-sha256; cv=none; b=iUHFHxcnS4ezprPmCRptMxdpUNt00KKaIqnwz5RF/IsEaMZa24dJi2/UBwjFc0ooNLO+rn V+nsQDZIzX8opNSChXronbi6/MOaKiOtAJw542Fvvl141yQ7csMemtrj3J3uVf6LUHW1yy Yqp3o1F8rhIyKrXzBdY/H8lxe3Q0qB7FZHUIUi1ul4NTaHAjrAJvYeXtUsumCVgZSi1XBH +1lsASWuENAtdr8RbCGNv7Uqy2oAyC94uj/GjahIKlswMaH/nCHOAwuFWAeAQVdKgd3Ua8 pgjiifS0FjqFLFPcMMbcB0Au2WYv0GuwZhQfCSUVuNyJfikIm5QM6cjiCJlNiQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712522757; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BGx5v1uSj7aDJRV0zF23Z9jAdgsIsVwXZC69+whxh3E=; b=QN3QQRcHoOul8VUM7Hm1km6zByq6uLcWr9NyibkkT9qDYTd0n9crDiL3Y98wvyuBEBLU23 NomSMdtk6/oLjFh/tVbOG+3ArdWBNpTa/f+GwU6ZZOVdZgLMP6AbBLwwoCsf9ZdK+MHhju s7QpyyXNsg35cZHhcw3jQaE3XFoqJK7rZnaC2peOo9DHV9ztolmCS3Ao2xtXXlArQ/dN5b v8ugvHMuv/zYTcmjq1l4FPXAB33hiUBtiQqLLjAv5VaPTSCIDuwIn+ousZ3iCyaLXK5UuB SX8EUstfxKAT5h8HWT69Q9Ds4+yn6Q4s5SsfvPvt1aQagFutZFUviiYzf3vApA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VCPPx43zgzjh5; Sun, 7 Apr 2024 20:45:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 437Kjvve015866; Sun, 7 Apr 2024 20:45:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 437Kjv3F015863; Sun, 7 Apr 2024 20:45:57 GMT (envelope-from git) Date: Sun, 7 Apr 2024 20:45:57 GMT Message-Id: <202404072045.437Kjv3F015863@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Tuexen Subject: git: e8c149ab85c7 - main - tcp: add some debug output List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e8c149ab85c7834f76325864f22ca89298e65f75 Auto-Submitted: auto-generated The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=e8c149ab85c7834f76325864f22ca89298e65f75 commit e8c149ab85c7834f76325864f22ca89298e65f75 Author: Michael Tuexen AuthorDate: 2024-04-07 20:41:24 +0000 Commit: Michael Tuexen CommitDate: 2024-04-07 20:41:24 +0000 tcp: add some debug output Also log, when dropping text or FIN after having received a FIN. This is the intended behavior described in RFC 9293. A follow-up patch will enforce this behavior for the base stack and the RACK stack. Reviewed by: rscheff MFC after: 3 days Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D44669 --- sys/netinet/tcp_input.c | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/sys/netinet/tcp_input.c b/sys/netinet/tcp_input.c index d27a79d1c3b1..1c6bdedc9368 100644 --- a/sys/netinet/tcp_input.c +++ b/sys/netinet/tcp_input.c @@ -3272,6 +3272,35 @@ dodata: /* XXX */ len = so->so_rcv.sb_hiwat; #endif } else { + if ((s = tcp_log_addrs(inc, th, NULL, NULL))) { + if (tlen > 0) { + if ((thflags & TH_FIN) != 0) { + log(LOG_DEBUG, "%s; %s: %s: " + "Received %d bytes of data and FIN " + "after having received a FIN, " + "just dropping both\n", + s, __func__, + tcpstates[tp->t_state], tlen); + } else { + log(LOG_DEBUG, "%s; %s: %s: " + "Received %d bytes of data " + "after having received a FIN, " + "just dropping it\n", + s, __func__, + tcpstates[tp->t_state], tlen); + } + } else { + if ((thflags & TH_FIN) != 0) { + log(LOG_DEBUG, "%s; %s: %s: " + "Received FIN " + "after having received a FIN, " + "just dropping it\n", + s, __func__, + tcpstates[tp->t_state]); + } + } + free(s, M_TCPLOG); + } m_freem(m); thflags &= ~TH_FIN; } From nobody Sun Apr 7 21:23:48 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VCQFc4gQKz5HZ2T; Sun, 7 Apr 2024 21:23:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VCQFc3yZ1z4vF0; Sun, 7 Apr 2024 21:23:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712525028; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=py+WJm3pyVmYiF7JJwTO8c1yLYIyfm4+00lkLCR3ZgQ=; b=aWlYPgP1c/6/MHWHbMVzNo6eo/vfaUEo1JhnW/QW/fLRyydMBpM/WUjsUDSb3M4sOwzd6e BhOlkt7PX8NNGB5rlxBCJsBygUIiQOTEgmQTcMZKDlF3tP5FKb2kLbK/q+CeAH9w3WOY7F PbSttPnmzkax9dV8pBWVF7P77QkcRc+kG2IWu4cK30vJzNz2yovonrHp07ixgTNSMlZFbv g2C1DNj4TLPZv+s2uQPzcp+JYa2MmSWWXwbV4xEmyhZvl/eW5yaE4eZgMGi3cIGzIuI+Qg DcOkXsYy3ZDNMABA9qmHW2JIyN3ztQ3AVxZq+G8ujMfAs+kgXXLpDz/CmQItuA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712525028; a=rsa-sha256; cv=none; b=o76kOSyeKeIQv4tB6HV9qLCPCb5epqnI0pWagJjbX8BObPKIsbcSEqj/dejD9KhuQokeoQ yOdwHbeBmfNlijhOrXLObUsKTTTpPlc06PxxgT6ChB227tzkX26cKP1JorNk2uJkUkQPkB cadMBL0u2e1SyJRFEvusOf7zisjMIBbaWSPVAdI+HE4oye68R/PL6tmPZYgD97aV1nLPIG Q+7BejXKuHYIQqotuT/bn4YxdECakAGxMaDXMGn3i3l3qJo48C4PgOyMukF92NIK+/idmR TjDG+AkKZ1x+HlcK2IWjV7hogCbnxsBWpi1XAkq9RoEb9yYy8Ey7149T01rYjA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712525028; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=py+WJm3pyVmYiF7JJwTO8c1yLYIyfm4+00lkLCR3ZgQ=; b=kX4OWZo945jtj6SJyB+Q8Nm0Yoax+wx8kLEWdy8SUjDDl01zemmj319jXVYCdRmT0Oqsf+ FzWFxw6Ly/7uRzl5RigzNqspwhlcm6VsBCs8PrpoNBW7rbevaenR3W+SWkNZGrXKKneiQP cUN5Y+3ZKE3cndu/cpCFGPC6jbyhw5y4LWOgzMygw+XMXv7zRhYezMZXVWVkQ7QgKl6NR7 YrEYWXml+LVN6Fwx0Gbg54dandCpoOM0thG9g94PgMfgO2c1H6V3xR2cb1b8vmFti27/VR lLRBqTaH0tuy+RkUiQmPHSxfM1ZOkhFXyoffTRKwjraeC9eNfJdxPXlbELN4yA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VCQFc3YGKzkCx; Sun, 7 Apr 2024 21:23:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 437LNmO9084011; Sun, 7 Apr 2024 21:23:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 437LNmRJ084009; Sun, 7 Apr 2024 21:23:48 GMT (envelope-from git) Date: Sun, 7 Apr 2024 21:23:48 GMT Message-Id: <202404072123.437LNmRJ084009@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: e8b7c78c1b38 - main - Cirrus-CI: switch to llvm18 by default List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e8b7c78c1b38d0486ff12993c0529a201030bd07 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=e8b7c78c1b38d0486ff12993c0529a201030bd07 commit e8b7c78c1b38d0486ff12993c0529a201030bd07 Author: Ed Maste AuthorDate: 2024-04-06 21:53:17 +0000 Commit: Ed Maste CommitDate: 2024-04-07 21:23:25 +0000 Cirrus-CI: switch to llvm18 by default As of commit 439352ac8257 Clang/LLVM 18 is the default in-tree compiler. Follow suit in with the external toolchain package used by Cirrus-CI. Sponsored by: The FreeBSD Foundation --- .cirrus.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index 90d031a919f2..13719a3e2058 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -23,15 +23,15 @@ task: TOOLCHAIN: llvm16 TOOLCHAIN_PKG: ${TOOLCHAIN}-lite - name: amd64-llvm17 World and kernel build and boot smoke test - only_if: $CIRRUS_REPO_FULL_NAME != 'freebsd/freebsd-src' || $CIRRUS_BRANCH =~ 'pull/.*' + only_if: $CIRRUS_REPO_FULL_NAME != 'freebsd/freebsd-src' + trigger_type: manual env: TARGET: amd64 TARGET_ARCH: amd64 TOOLCHAIN: llvm17 TOOLCHAIN_PKG: ${TOOLCHAIN}-lite - name: amd64-llvm18 World and kernel build and boot smoke test - only_if: $CIRRUS_REPO_FULL_NAME != 'freebsd/freebsd-src' - trigger_type: manual + only_if: $CIRRUS_REPO_FULL_NAME != 'freebsd/freebsd-src' || $CIRRUS_BRANCH =~ 'pull/.*' env: TARGET: amd64 TARGET_ARCH: amd64 From nobody Sun Apr 7 23:36:47 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VCTC40J1kz5FYJd; Sun, 7 Apr 2024 23:36:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VCTC36nMFz47F3; Sun, 7 Apr 2024 23:36:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712533008; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1BvOuVHjrKswQn+OjCC6APj38zDn+8irnjlz8fSXcTs=; b=DVG4rbWoKMVy2iKjPp6Lx5YuRz4zzTb3bX6sBFeHyMAC0YWtl1BYr2BPX8hh7jhFX5evYj GNiNTfMl+DiGICYcjm0Qlfq1T4705SD03Ejek2CWdXP/JSoWCnKSipciDnmfy/ZLzLxImy vnugG9mJM5bqdkgttz5G/Q/FZhgY2dAN15Hp5stQ6qXLAj+jBZzZlbI998rDkDS5uOhyen +BGoZSlTLykOhhXwvkXrYfO5uxPnZU8jWOZXTcJ9R5PnKqOCYfFscY97zDxq+th3J6mIiY y8Qs9zog1bMmgl14pRzACqALP7H55W8SH0bp2kEvMsshBFvE1FTeFHZvzdn26Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712533008; a=rsa-sha256; cv=none; b=cMFb7F6dbFGGF56MZBGMKJp8rIsbENNQNY812TlWg8KJKte73y4j1K8QlIMJpibcg5jLD6 JMJtDNLt9nIkTz1PSuBiFGDHJoxaAII6fdAp7HWSal8fLcKqAJGB52tk3RwRG4Ypi4cORW kv+JwQ338ooYhxJlNM2fDKcO3Ja5jQiU7whp20hEKrnYE81qgDr5u7fEpMxd5LRnc+rQ3c vkjzDcoHCJJjiRa+Z772Az9aEvjBB2F+p2r92wKDHCpWtUIkhLyHSmgKrEESikO2Zm3owN 0oprSKuKIRgNRdqiQEfBfv1WjmJle7pSrhugmQBPv7oPWM+MTC1aMjxFUU5F3g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712533007; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1BvOuVHjrKswQn+OjCC6APj38zDn+8irnjlz8fSXcTs=; b=jx8nyIbqgKAyeCXmmPd4XY5i3E05l4LUIwPEHFBdXELUOLBl094+767Cxh6pZYNcpTLLA7 pLzltsgQAZP7K2/AN/OrvsmIAKvIkcOOZIZ7SONtAGqlwq9eHJIe0m+cf281MJkxfTTowH 3VWOOaK6GbjqWRmOCoG2Dc4y2EN3l+hSP2Syjj7QV8udpLy7/jsofFJvk0kFQamyKEKAqC hUT3YnRviw3CfoPA1omDb0p1n/i7RbRcSioMGaK3xGRKQJ4M/Wy7pvsvUKQ7hG7/16ghNy e+AG2X4sgJkJ3WCjtHDnpTBodT5thWRKgKdz+Rqw4u8xqms/azglCDdAfAAJnw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VCTC36Cyrznmf; Sun, 7 Apr 2024 23:36: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 437Nalr3003987; Sun, 7 Apr 2024 23:36:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 437NalCU003984; Sun, 7 Apr 2024 23:36:47 GMT (envelope-from git) Date: Sun, 7 Apr 2024 23:36:47 GMT Message-Id: <202404072336.437NalCU003984@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Rick Macklem Subject: git: 401c0f8aa1ce - main - exports.5: Add RFC number for NFS over TLS List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rmacklem X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 401c0f8aa1ce5f15eaa546df1b44fd68c0f11928 Auto-Submitted: auto-generated The branch main has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=401c0f8aa1ce5f15eaa546df1b44fd68c0f11928 commit 401c0f8aa1ce5f15eaa546df1b44fd68c0f11928 Author: Rick Macklem AuthorDate: 2024-04-07 23:35:55 +0000 Commit: Rick Macklem CommitDate: 2024-04-07 23:35:55 +0000 exports.5: Add RFC number for NFS over TLS This is a content change. MFC after: 1 week --- usr.sbin/mountd/exports.5 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/usr.sbin/mountd/exports.5 b/usr.sbin/mountd/exports.5 index 8b55162cdcbb..33ab4f693978 100644 --- a/usr.sbin/mountd/exports.5 +++ b/usr.sbin/mountd/exports.5 @@ -25,7 +25,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd December 21, 2023 +.Dd April 7, 2024 .Dt EXPORTS 5 .Os .Sh NAME @@ -259,7 +259,7 @@ The and .Fl tlscertuser export options are used to require the client to use TLS for the mount(s) -per RFC NNNN. +per RFC 9289. For NFS mounts using TLS to work, .Xr rpc.tlsservd 8 must be running on the server. @@ -614,7 +614,7 @@ The implementation is based on the following documents: .Re .It .Rs -.%T "Towards Remote Procedure Call Encryption By Default, RFC nnnn" +.%T "Towards Remote Procedure Call Encryption by Default, RFC 9289" .Re .El .Sh BUGS From nobody Sun Apr 7 23:57:06 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VCTfV4Nj0z5FbM6; Sun, 7 Apr 2024 23:57: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 4VCTfV2ZkGz4CM7; Sun, 7 Apr 2024 23:57:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712534226; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=u+s0fNuABbD7jsqA8rTNN4BBT6v/HyJwgfOvSSRBQmw=; b=ks8wrZXX4EC4EKOLgG16GLKV4/4v5abjLapa1ugffrZvRCm7qKtA566I0SYm0887NRIATU VSfbb0QWSr2oisdwkOns+KTp6E+iJrvfjSCUkeE+uB35pAe9JSZkGx0dAu5CaclwXJ8Kr5 zCVe9iHAlNlWuEhO9RvTvpwWb4P5uhOFl0LmRVu1xu4NCGB8bmfLTehcebPbKo9ZEzIO4J UpxxahOvtzHw8WkhfVoyoC1Z7zd9QwQh/5GARLuk3FAg5T1hOSze2kqKpKEbyCtPLnP6LB Bh9GHyHdU72gcIfJa/CLnhWbmJHrTZTd9wc6y0ZOL491/vN4HXbNY0S6ZpG4cw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712534226; a=rsa-sha256; cv=none; b=UMVgdG0yRwuTyXIu8hWbLsP0mWC0W05Vm9ejw4cHvW+apA2k/LUwXr4TbCvRlVq2e6/irG ilaii81pERjDqL/9CjeaPKcdv9SQMIe9bumj037OjalTAtYR5g8pjO98QctF84KzeAXzY/ qAOWHFqWQ+InPjCrMRoeM+WRlU+Y8IHypIWaaxBnhl8ANr9PrOcs8Q3aokRUxtC0NAkkc9 Nrrz+nHZhYj9KwDSYRcP9QXtCpZcWubCi9h2AvUvZoDLZFXvPxKsYxmKdsEZkQsA5GSuBk nsr/Fj+wpQkRqw2MHet0Fntc9dHrLsN/x7S+6t8wDQ0bjnf6JSZSHaUkmdxy9Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712534226; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=u+s0fNuABbD7jsqA8rTNN4BBT6v/HyJwgfOvSSRBQmw=; b=XWylAF7/pfovzg9rMYRpOT/7LdKeC7ybwKhIQ1aFTW5hhl3cLlg6uRk2UtsrDP9DBwoi9z bRB27KAsQom/1bAeHvWYrXh2O8oyRpddgKmAKkcQgqHVJ++WWF0gK0t9E0w8e12wH37TeK jeOUI6UsEG0Wax4SGoReIMXWwx3bYES70Fsb+sM5J+Z+8IGsXRTcf44MaJ1z5zo0sl7U/E mZokOwQgtX5Qvjz9WFCVS+4QU39gbiRF4074BZf9x0mn+NcGqTJQqqu31oVj0NNjjp4lCI 6/nYyHyHqrcyJi2U8tHD7BtirSmO8slQMEP4+TRaemPHrfapz/jWn3Sg1BOUIQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VCTfV2BPMzp2h; Sun, 7 Apr 2024 23:57: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 437Nv6Qo037335; Sun, 7 Apr 2024 23:57:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 437Nv6p2037332; Sun, 7 Apr 2024 23:57:06 GMT (envelope-from git) Date: Sun, 7 Apr 2024 23:57:06 GMT Message-Id: <202404072357.437Nv6p2037332@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jake Freeland Subject: git: 9bec84131215 - main - ktrace: Record detailed ECAPMODE violations List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jfree X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9bec84131215ed554f435e208399f36e982246f1 Auto-Submitted: auto-generated The branch main has been updated by jfree: URL: https://cgit.FreeBSD.org/src/commit/?id=9bec84131215ed554f435e208399f36e982246f1 commit 9bec84131215ed554f435e208399f36e982246f1 Author: Jake Freeland AuthorDate: 2024-04-06 18:29:45 +0000 Commit: Jake Freeland CommitDate: 2024-04-07 23:52:51 +0000 ktrace: Record detailed ECAPMODE violations When a Capsicum violation occurs in the kernel, ktrace will now record detailed information pertaining to the violation. For example: - When a namei lookup violation occurs, ktrace will record the path. - When a signal violation occurs, ktrace will record the signal number. - When a sendto(2) violation occurs, ktrace will record the recipient sockaddr. For all violations, the syscall and ABI is recorded. kdump is also modified to display this new information to the user. Reviewed by: oshogbo, markj Approved by: markj (mentor) MFC after: 1 month Differential Revision: https://reviews.freebsd.org/D40676 --- sys/kern/kern_ktrace.c | 43 +++++++++++++++++++++++-------- sys/kern/sys_capability.c | 16 +++++------- sys/sys/capsicum.h | 7 +++++ sys/sys/ktrace.h | 32 +++++++++++++++++------ usr.bin/kdump/kdump.c | 65 +++++++++++++++++++++++++++++++++++++---------- 5 files changed, 122 insertions(+), 41 deletions(-) diff --git a/sys/kern/kern_ktrace.c b/sys/kern/kern_ktrace.c index 6ace3ea52c64..142aa790a908 100644 --- a/sys/kern/kern_ktrace.c +++ b/sys/kern/kern_ktrace.c @@ -923,14 +923,17 @@ ktrstructarray(const char *name, enum uio_seg seg, const void *data, } void -ktrcapfail(enum ktr_cap_fail_type type, const cap_rights_t *needed, - const cap_rights_t *held) +ktrcapfail(enum ktr_cap_violation type, const void *data) { struct thread *td = curthread; struct ktr_request *req; struct ktr_cap_fail *kcf; + union ktr_cap_data *kcd; - if (__predict_false(curthread->td_pflags & TDP_INKTRACE)) + if (__predict_false(td->td_pflags & TDP_INKTRACE)) + return; + if (type != CAPFAIL_SYSCALL && + (td->td_sa.callp->sy_flags & SYF_CAPENABLED) == 0) return; req = ktr_getrequest(KTR_CAPFAIL); @@ -938,14 +941,32 @@ ktrcapfail(enum ktr_cap_fail_type type, const cap_rights_t *needed, return; kcf = &req->ktr_data.ktr_cap_fail; kcf->cap_type = type; - if (needed != NULL) - kcf->cap_needed = *needed; - else - cap_rights_init(&kcf->cap_needed); - if (held != NULL) - kcf->cap_held = *held; - else - cap_rights_init(&kcf->cap_held); + kcf->cap_code = td->td_sa.code; + kcf->cap_svflags = td->td_proc->p_sysent->sv_flags; + if (data != NULL) { + kcd = &kcf->cap_data; + switch (type) { + case CAPFAIL_NOTCAPABLE: + case CAPFAIL_INCREASE: + kcd->cap_needed = *(const cap_rights_t *)data; + kcd->cap_held = *((const cap_rights_t *)data + 1); + break; + case CAPFAIL_SYSCALL: + case CAPFAIL_SIGNAL: + case CAPFAIL_PROTO: + kcd->cap_int = *(const int *)data; + break; + case CAPFAIL_SOCKADDR: + kcd->cap_sockaddr = *(const struct sockaddr *)data; + break; + case CAPFAIL_NAMEI: + strlcpy(kcd->cap_path, data, MAXPATHLEN); + break; + case CAPFAIL_CPUSET: + default: + break; + } + } ktr_enqueuerequest(td, req); ktrace_exit(td); } diff --git a/sys/kern/sys_capability.c b/sys/kern/sys_capability.c index fac264a78531..d59ad37f35ec 100644 --- a/sys/kern/sys_capability.c +++ b/sys/kern/sys_capability.c @@ -154,14 +154,13 @@ MALLOC_DECLARE(M_FILECAPS); static inline int _cap_check(const cap_rights_t *havep, const cap_rights_t *needp, - enum ktr_cap_fail_type type) + enum ktr_cap_violation type) { + const cap_rights_t rights[] = { *needp, *havep }; if (!cap_rights_contains(havep, needp)) { -#ifdef KTRACE - if (KTRPOINT(curthread, KTR_CAPFAIL)) - ktrcapfail(type, needp, havep); -#endif + if (CAP_TRACING(curthread)) + ktrcapfail(type, rights); return (ENOTCAPABLE); } return (0); @@ -180,11 +179,10 @@ cap_check(const cap_rights_t *havep, const cap_rights_t *needp) int cap_check_failed_notcapable(const cap_rights_t *havep, const cap_rights_t *needp) { + const cap_rights_t rights[] = { *needp, *havep }; -#ifdef KTRACE - if (KTRPOINT(curthread, KTR_CAPFAIL)) - ktrcapfail(CAPFAIL_NOTCAPABLE, needp, havep); -#endif + if (CAP_TRACING(curthread)) + ktrcapfail(CAPFAIL_NOTCAPABLE, rights); return (ENOTCAPABLE); } diff --git a/sys/sys/capsicum.h b/sys/sys/capsicum.h index 3979fd718909..e1113f590b85 100644 --- a/sys/sys/capsicum.h +++ b/sys/sys/capsicum.h @@ -44,6 +44,7 @@ #include #include #include +#include #ifndef _KERNEL #include @@ -419,6 +420,12 @@ __END_DECLS #include +#ifdef KTRACE +#define CAP_TRACING(td) KTRPOINT((td), KTR_CAPFAIL) +#else +#define CAP_TRACING(td) 0 +#endif + #define IN_CAPABILITY_MODE(td) (((td)->td_ucred->cr_flags & CRED_FLAG_CAPMODE) != 0) struct filedesc; diff --git a/sys/sys/ktrace.h b/sys/sys/ktrace.h index 710c78c2604d..263f25945bff 100644 --- a/sys/sys/ktrace.h +++ b/sys/sys/ktrace.h @@ -32,8 +32,10 @@ #ifndef _SYS_KTRACE_H_ #define _SYS_KTRACE_H_ +#include #include #include +#include #include /* @@ -205,16 +207,31 @@ struct ktr_proc_ctor { * KTR_CAPFAIL - trace capability check failures */ #define KTR_CAPFAIL 12 -enum ktr_cap_fail_type { +enum ktr_cap_violation { CAPFAIL_NOTCAPABLE, /* insufficient capabilities in cap_check() */ - CAPFAIL_INCREASE, /* attempt to increase capabilities */ + CAPFAIL_INCREASE, /* attempt to increase rights on a capability */ CAPFAIL_SYSCALL, /* disallowed system call */ - CAPFAIL_LOOKUP, /* disallowed VFS lookup */ + CAPFAIL_SIGNAL, /* sent signal to process other than self */ + CAPFAIL_PROTO, /* disallowed protocol */ + CAPFAIL_SOCKADDR, /* restricted address lookup */ + CAPFAIL_NAMEI, /* restricted namei lookup */ + CAPFAIL_CPUSET, /* restricted CPU set modification */ }; + +union ktr_cap_data { + cap_rights_t cap_rights[2]; +#define cap_needed cap_rights[0] +#define cap_held cap_rights[1] + int cap_int; + struct sockaddr cap_sockaddr; + char cap_path[MAXPATHLEN]; +}; + struct ktr_cap_fail { - enum ktr_cap_fail_type cap_type; - cap_rights_t cap_needed; - cap_rights_t cap_held; + enum ktr_cap_violation cap_type; + short cap_code; + u_int cap_svflags; + union ktr_cap_data cap_data; }; /* @@ -317,8 +334,7 @@ void ktruserret(struct thread *); void ktrstruct(const char *, const void *, size_t); void ktrstruct_error(const char *, const void *, size_t, int); void ktrstructarray(const char *, enum uio_seg, const void *, int, size_t); -void ktrcapfail(enum ktr_cap_fail_type, const cap_rights_t *, - const cap_rights_t *); +void ktrcapfail(enum ktr_cap_violation, const void *); #define ktrcaprights(s) \ ktrstruct("caprights", (s), sizeof(cap_rights_t)) #define ktritimerval(s) \ diff --git a/usr.bin/kdump/kdump.c b/usr.bin/kdump/kdump.c index f5bb4dcfea42..f7ac82c757fa 100644 --- a/usr.bin/kdump/kdump.c +++ b/usr.bin/kdump/kdump.c @@ -2125,35 +2125,74 @@ invalid: void ktrcapfail(struct ktr_cap_fail *ktr) { + union ktr_cap_data *kcd = &ktr->cap_data; + switch (ktr->cap_type) { case CAPFAIL_NOTCAPABLE: /* operation on fd with insufficient capabilities */ printf("operation requires "); - sysdecode_cap_rights(stdout, &ktr->cap_needed); + sysdecode_cap_rights(stdout, &kcd->cap_needed); printf(", descriptor holds "); - sysdecode_cap_rights(stdout, &ktr->cap_held); + sysdecode_cap_rights(stdout, &kcd->cap_held); break; case CAPFAIL_INCREASE: /* requested more capabilities than fd already has */ printf("attempt to increase capabilities from "); - sysdecode_cap_rights(stdout, &ktr->cap_held); + sysdecode_cap_rights(stdout, &kcd->cap_held); printf(" to "); - sysdecode_cap_rights(stdout, &ktr->cap_needed); + sysdecode_cap_rights(stdout, &kcd->cap_needed); break; case CAPFAIL_SYSCALL: /* called restricted syscall */ - printf("disallowed system call"); + printf("system call not allowed: "); + syscallname(ktr->cap_code, ktr->cap_svflags); + if (syscallabi(ktr->cap_svflags) == SYSDECODE_ABI_FREEBSD) { + switch (ktr->cap_code) { + case SYS_sysarch: + printf(", op: "); + print_integer_arg(sysdecode_sysarch_number, + kcd->cap_int); + break; + case SYS_fcntl: + printf(", cmd: "); + print_integer_arg(sysdecode_fcntl_cmd, + kcd->cap_int); + break; + } + } break; - case CAPFAIL_LOOKUP: - /* absolute or AT_FDCWD path, ".." path, etc. */ - printf("restricted VFS lookup"); + case CAPFAIL_SIGNAL: + /* sent signal to proc other than self */ + syscallname(ktr->cap_code, ktr->cap_svflags); + printf(": signal delivery not allowed: "); + print_integer_arg(sysdecode_signal, kcd->cap_int); break; - default: - printf("unknown capability failure: "); - sysdecode_cap_rights(stdout, &ktr->cap_needed); - printf(" "); - sysdecode_cap_rights(stdout, &ktr->cap_held); + case CAPFAIL_PROTO: + /* created socket with restricted protocol */ + syscallname(ktr->cap_code, ktr->cap_svflags); + printf(": protocol not allowed: "); + print_integer_arg(sysdecode_ipproto, kcd->cap_int); break; + case CAPFAIL_SOCKADDR: + /* unable to look up address */ + syscallname(ktr->cap_code, ktr->cap_svflags); + printf(": restricted address lookup: "); + ktrsockaddr(&kcd->cap_sockaddr); + return; + case CAPFAIL_NAMEI: + /* absolute or AT_FDCWD path, ".." path, etc. */ + syscallname(ktr->cap_code, ktr->cap_svflags); + printf(": restricted VFS lookup: %s\n", kcd->cap_path); + return; + case CAPFAIL_CPUSET: + /* modification of an external cpuset */ + syscallname(ktr->cap_code, ktr->cap_svflags); + printf(": restricted cpuset operation\n"); + return; + default: + syscallname(ktr->cap_code, ktr->cap_svflags); + printf(": unknown capability failure\n"); + return; } printf("\n"); } From nobody Sun Apr 7 23:57:07 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VCTfW3qq0z5FbWn; Sun, 7 Apr 2024 23:57: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 4VCTfW3KK2z4CM8; Sun, 7 Apr 2024 23:57:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712534227; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8jZYVYPropIxNeetFgu4damJcI4ZfVj09VpYBW6nXHU=; b=X5c2KAN9TIeAaWDE6b+OiH6L8N3FDA01E5tN20+AHAYYMaY13irKIuz50s4YRN0dR5Do4d h5rRMV0sCE8x/7sb5DNt7rTKftBOzqt8TPtqeUSoV+K7bT3y6KIce3HkQasKNwxOR4PuE4 W8etboXbF9m2vEMYX3CwP/lVRY4TF8aylyEwdqEaPRtjgouuV2DqXjy6SXr1N2lbj6dUqs YDsQsGRvs6inu0gkMduoz+oPBX6LUhQ5mNLNeDVzapIwYfbsh39IHj6H/J6lP+Z2uV0t6c e5YhZDYuHlCgoE0VovHKiWI0BCz3RdokttI20VL7QJZuyR7obNjBfG5CBFW5ZQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712534227; a=rsa-sha256; cv=none; b=jJZUuaSXYkPYmCbXjzIcuU4w9V5T0mNYqAv2VdCgCbJ9nHEo8NF47iLIbivdHdsVXGXV3W bD8NJfNeh4GVC52IihhR+0bsIUVSOrmreeM451/BSouUHlMNNE4rQ0bA1XpLhoorW7dBlb 7OMFA5CZzYnak60dYlDyfgH+ZubxsBnNVLpYnkWj7y/ez9Ptx49lszGF7n2lMa+d/fPbvE oTxHDN2mncARB4+8GwwGXvfoMNbTVUfHBr956/cnwr66x26AOUqKFlqeLeSydw2xDscggI l1fMBW7g24L7v7+puF+wUq2/TOkmqXDrAdzLKHc71Zhn6Qa6QUhdwW3EUOT0QA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712534227; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8jZYVYPropIxNeetFgu4damJcI4ZfVj09VpYBW6nXHU=; b=bF/mU/HLokFnJtB+EoXxKpXM/mP6CNYVLpuNvH4afcv4c1pgbVDl4tKeDAj+T5wS5lhTmr DanPVOeJDlBZNP3gqnik2QdeqRwpFv/ddnjDHa0K6YD9VhdnlBiFP1FDXtPwlg9qPwREZ3 1Yz6IyXMp10iF6O2C1YgnX+Uv89mp5JJXsmVHrxHWtuhPr+T7phDuyHhiSgqwR5/GVw0C7 C0WJAcOf/aPcWQoqQN9EvBTQbjaKZpFyKTHTjzvfOHkEpRzmM7IpLWN4lX2K4JYeGJOsAP 0uynTdbs5QU6odlgGvQFg1b/YhlgNaBoPG27iDNXrn0mznJFQwaNjMJerHrTjg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VCTfW2xN7zpPw; Sun, 7 Apr 2024 23:57: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 437Nv7M7037382; Sun, 7 Apr 2024 23:57:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 437Nv7Ol037379; Sun, 7 Apr 2024 23:57:07 GMT (envelope-from git) Date: Sun, 7 Apr 2024 23:57:07 GMT Message-Id: <202404072357.437Nv7Ol037379@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jake Freeland Subject: git: 96c8b3e50988 - main - ktrace: Record cpuset violations with KTR_CAPFAIL List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jfree X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 96c8b3e509882e5a51a5ae58d366b812be4d2773 Auto-Submitted: auto-generated The branch main has been updated by jfree: URL: https://cgit.FreeBSD.org/src/commit/?id=96c8b3e509882e5a51a5ae58d366b812be4d2773 commit 96c8b3e509882e5a51a5ae58d366b812be4d2773 Author: Jake Freeland AuthorDate: 2024-04-06 18:31:14 +0000 Commit: Jake Freeland CommitDate: 2024-04-07 23:52:51 +0000 ktrace: Record cpuset violations with KTR_CAPFAIL Report Capsicum violations in the cpuset namespace with CAPFAIL_CPUSET. Reviewed by: markj Approved by: markj (mentor) MFC after: 1 month Differential Revision: https://reviews.freebsd.org/D40677 --- sys/kern/kern_cpuset.c | 40 ++++++++++++++++++++++++++++------------ 1 file changed, 28 insertions(+), 12 deletions(-) diff --git a/sys/kern/kern_cpuset.c b/sys/kern/kern_cpuset.c index 17176afa6ad3..5d9e2f2f326b 100644 --- a/sys/kern/kern_cpuset.c +++ b/sys/kern/kern_cpuset.c @@ -1762,22 +1762,38 @@ cpuset_setproc_update_set(struct proc *p, struct cpuset *set) * In Capability mode, the only accesses that are permitted are to the current * thread and process' CPU and domain sets. */ +static bool +cpuset_capmode_allowed(struct thread *td, cpulevel_t level, cpuwhich_t which, + id_t id) +{ + if (level != CPU_LEVEL_WHICH) + return (false); + if (which != CPU_WHICH_TID && which != CPU_WHICH_PID && + which != CPU_WHICH_TIDPID) + return (false); + if (id != -1 && which == CPU_WHICH_TIDPID && + id != td->td_tid && id != td->td_proc->p_pid) + return (false); + if (id != -1 && + !(which == CPU_WHICH_TID && id == td->td_tid) && + !(which == CPU_WHICH_PID && id == td->td_proc->p_pid)) + return (false); + return (true); +} + +/* + * Check for capability violations and record them if ktrace(2) is active. + */ static int cpuset_check_capabilities(struct thread *td, cpulevel_t level, cpuwhich_t which, id_t id) { - if (IN_CAPABILITY_MODE(td)) { - if (level != CPU_LEVEL_WHICH) - return (ECAPMODE); - if (which != CPU_WHICH_TID && which != CPU_WHICH_PID && - which != CPU_WHICH_TIDPID) - return (ECAPMODE); - if (id != -1 && which == CPU_WHICH_TIDPID && - id != td->td_tid && id != td->td_proc->p_pid) - return (ECAPMODE); - if (id != -1 && - !(which == CPU_WHICH_TID && id == td->td_tid) && - !(which == CPU_WHICH_PID && id == td->td_proc->p_pid)) + if (IN_CAPABILITY_MODE(td) || CAP_TRACING(td)) { + if (cpuset_capmode_allowed(td, level, which, id)) + return (0); + if (CAP_TRACING(td)) + ktrcapfail(CAPFAIL_CPUSET, NULL); + if (IN_CAPABILITY_MODE(td)) return (ECAPMODE); } return (0); From nobody Sun Apr 7 23:57:08 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VCTfX59rmz5FbZT; Sun, 7 Apr 2024 23:57: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 4VCTfX3w40z4CRJ; Sun, 7 Apr 2024 23:57:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712534228; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bTnVLFr5w6+kzsCtMetmfcsjsW877+yxbmsgZcgZukU=; b=QWAzMEFyKATMMCV75AcXKT7aQPPnWOrZk3vAft7C7xTHyBfVozKXkhIqpD30PFTp7XUdtZ 4sv8mo/gZHtbBG5E0pyTs2jIiXhvINsxXDayLD57u5NZ4STaTYLd9ccO+7NFnKp/bpSHm0 96dhSg2gTWlhayWUU9Kk+l6AVg889eGy0ueXxeCNK5CIS1OYWt5pxBxdGOio46voB0kUY1 ji2GvcI28NsMcHYhacmBbT7rz/ThxL7nWa10JsD+AA/y5BbB9mpYXuMsgufkvG86nsA8Vj 20t2AyEfgmorueTXGu7hmyJ35a9yBwEnQKsvkrAGK5qY+yJbn9d5p6k6n+ER2Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712534228; a=rsa-sha256; cv=none; b=wEghMyECyIsS3O5aQGx7J/j3g4Nb1oJgSM/wppohysrt8hNL8LH9QmCETPdPJScTE4fxhN F7aD14EYH53b0la3aSrG4ltbJyzZLXvP994xeJXSMVhxe40vvDHvFzS14UreL5sp+TkhB7 Hdrrw37cXza7uVt+Cqv9Zi3ZLSff64HaTPlcWz8qX7iAQo2yAnX3a/xL5pUhVYIbA2VzK6 dgQ04SCF5RWQJvgnYhavwpS005DWTFgdMT56ZvpG6QyV0EcIusWRCiYuF79plpdZezWJYi 4pqH03D5v8A9QcEqwZDSO3Ke2rR3k6R1NqFxqwt8UKBE2mU7copSvmqqE5v1tg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712534228; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bTnVLFr5w6+kzsCtMetmfcsjsW877+yxbmsgZcgZukU=; b=L3a5KxAERDQwsGLlI4nHSo38wHubgIG99a9LAQpml04TvcND7HCJfJ7SpumAnUFg293QXv yKjBEd+oUBw0kEwCkSOARmbl6+iB59gJ4s35KcojSVqV2ZKHSuqCjdIr67y5Hd6Bg7vA3J vnM8VSnSr/D0o+AmH8u4LxsKWNsRQE/UTKYwN36o1vzpctSPqgYio7KAv3AtLeFDAsPMcm JyASmeRfqXyWr68iS3Dz7ZcI4Cy5hUiMSm7WIHlMWc82BZ5/DY6PCkR2wpg0XwLeISAZej /+DAkpmVZr3Mgxr/URjN+j+Izir4O8CAGFHcYYSLoL9NSkxB4MBD8vOLrZCeMw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VCTfX3XC7zpPx; Sun, 7 Apr 2024 23:57: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 437Nv8og037429; Sun, 7 Apr 2024 23:57:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 437Nv8Ge037426; Sun, 7 Apr 2024 23:57:08 GMT (envelope-from git) Date: Sun, 7 Apr 2024 23:57:08 GMT Message-Id: <202404072357.437Nv8Ge037426@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jake Freeland Subject: git: 05296a0ff615 - main - ktrace: Record syscall violations with KTR_CAPFAIL List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jfree X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 05296a0ff615566d25c77c5e6619b08724d2eecb Auto-Submitted: auto-generated The branch main has been updated by jfree: URL: https://cgit.FreeBSD.org/src/commit/?id=05296a0ff615566d25c77c5e6619b08724d2eecb commit 05296a0ff615566d25c77c5e6619b08724d2eecb Author: Jake Freeland AuthorDate: 2024-04-06 18:31:18 +0000 Commit: Jake Freeland CommitDate: 2024-04-07 23:52:51 +0000 ktrace: Record syscall violations with KTR_CAPFAIL Report syscalls that are not allowed in capability mode with CAPFAIL_SYSCALL. Reviewed by: markj Approved by: markj (mentor) MFC after: 1 month Differential Revision: https://reviews.freebsd.org/D40678 --- sys/amd64/amd64/sys_machdep.c | 52 +++++++++++++++++++++---------------------- sys/arm/arm/sys_machdep.c | 27 ++++++++++------------ sys/i386/i386/sys_machdep.c | 34 +++++++++++++--------------- sys/kern/kern_descrip.c | 2 ++ sys/kern/kern_sig.c | 12 +++++++--- sys/kern/subr_syscall.c | 11 +++++---- 6 files changed, 71 insertions(+), 67 deletions(-) diff --git a/sys/amd64/amd64/sys_machdep.c b/sys/amd64/amd64/sys_machdep.c index dd4eef610147..b626925e1ea1 100644 --- a/sys/amd64/amd64/sys_machdep.c +++ b/sys/amd64/amd64/sys_machdep.c @@ -187,35 +187,33 @@ sysarch(struct thread *td, struct sysarch_args *uap) * explicitly indicate whether or not the operation is safe to * perform in capability mode. */ - if (IN_CAPABILITY_MODE(td)) { - switch (uap->op) { - case I386_GET_LDT: - case I386_SET_LDT: - case I386_GET_IOPERM: - case I386_GET_FSBASE: - case I386_SET_FSBASE: - case I386_GET_GSBASE: - case I386_SET_GSBASE: - case I386_GET_XFPUSTATE: - case I386_SET_PKRU: - case I386_CLEAR_PKRU: - case AMD64_GET_FSBASE: - case AMD64_SET_FSBASE: - case AMD64_GET_GSBASE: - case AMD64_SET_GSBASE: - case AMD64_GET_XFPUSTATE: - case AMD64_SET_PKRU: - case AMD64_CLEAR_PKRU: - break; + switch (uap->op) { + case I386_GET_LDT: + case I386_SET_LDT: + case I386_GET_IOPERM: + case I386_GET_FSBASE: + case I386_SET_FSBASE: + case I386_GET_GSBASE: + case I386_SET_GSBASE: + case I386_GET_XFPUSTATE: + case I386_SET_PKRU: + case I386_CLEAR_PKRU: + case AMD64_GET_FSBASE: + case AMD64_SET_FSBASE: + case AMD64_GET_GSBASE: + case AMD64_SET_GSBASE: + case AMD64_GET_XFPUSTATE: + case AMD64_SET_PKRU: + case AMD64_CLEAR_PKRU: + break; - case I386_SET_IOPERM: - default: -#ifdef KTRACE - if (KTRPOINT(td, KTR_CAPFAIL)) - ktrcapfail(CAPFAIL_SYSCALL, NULL, NULL); -#endif + case I386_SET_IOPERM: + default: + if (CAP_TRACING(td)) + ktrcapfail(CAPFAIL_SYSCALL, &uap->op); + if (IN_CAPABILITY_MODE(td)) return (ECAPMODE); - } + break; } #endif diff --git a/sys/arm/arm/sys_machdep.c b/sys/arm/arm/sys_machdep.c index bf738ed77a67..50cdc4158517 100644 --- a/sys/arm/arm/sys_machdep.c +++ b/sys/arm/arm/sys_machdep.c @@ -175,22 +175,19 @@ sysarch(struct thread *td, struct sysarch_args *uap) * explicitly indicate whether or not the operation is safe to * perform in capability mode. */ - if (IN_CAPABILITY_MODE(td)) { - switch (uap->op) { - case ARM_SYNC_ICACHE: - case ARM_DRAIN_WRITEBUF: - case ARM_SET_TP: - case ARM_GET_TP: - case ARM_GET_VFPSTATE: - break; - - default: -#ifdef KTRACE - if (KTRPOINT(td, KTR_CAPFAIL)) - ktrcapfail(CAPFAIL_SYSCALL, NULL, NULL); -#endif + switch (uap->op) { + case ARM_SYNC_ICACHE: + case ARM_DRAIN_WRITEBUF: + case ARM_SET_TP: + case ARM_GET_TP: + case ARM_GET_VFPSTATE: + break; + + default: + if (CAP_TRACING(td)) + ktrcapfail(CAPFAIL_SYSCALL, &uap->op); + if (IN_CAPABILITY_MODE(td)) return (ECAPMODE); - } } #endif diff --git a/sys/i386/i386/sys_machdep.c b/sys/i386/i386/sys_machdep.c index 2da60bd438d1..e29d98a61cb9 100644 --- a/sys/i386/i386/sys_machdep.c +++ b/sys/i386/i386/sys_machdep.c @@ -152,26 +152,24 @@ sysarch(struct thread *td, struct sysarch_args *uap) * explicitly indicate whether or not the operation is safe to * perform in capability mode. */ - if (IN_CAPABILITY_MODE(td)) { - switch (uap->op) { - case I386_GET_LDT: - case I386_SET_LDT: - case I386_GET_IOPERM: - case I386_GET_FSBASE: - case I386_SET_FSBASE: - case I386_GET_GSBASE: - case I386_SET_GSBASE: - case I386_GET_XFPUSTATE: - break; + switch (uap->op) { + case I386_GET_LDT: + case I386_SET_LDT: + case I386_GET_IOPERM: + case I386_GET_FSBASE: + case I386_SET_FSBASE: + case I386_GET_GSBASE: + case I386_SET_GSBASE: + case I386_GET_XFPUSTATE: + break; - case I386_SET_IOPERM: - default: -#ifdef KTRACE - if (KTRPOINT(td, KTR_CAPFAIL)) - ktrcapfail(CAPFAIL_SYSCALL, NULL, NULL); -#endif + case I386_SET_IOPERM: + default: + if (CAP_TRACING(td)) + ktrcapfail(CAPFAIL_SYSCALL, &uap->op); + if (IN_CAPABILITY_MODE(td)) return (ECAPMODE); - } + break; } #endif diff --git a/sys/kern/kern_descrip.c b/sys/kern/kern_descrip.c index 7f9318a7ceda..f626f5a38ca8 100644 --- a/sys/kern/kern_descrip.c +++ b/sys/kern/kern_descrip.c @@ -875,6 +875,8 @@ revert_f_setfl: case F_KINFO: #ifdef CAPABILITY_MODE + if (CAP_TRACING(td)) + ktrcapfail(CAPFAIL_SYSCALL, &cmd); if (IN_CAPABILITY_MODE(td)) { error = ECAPMODE; break; diff --git a/sys/kern/kern_sig.c b/sys/kern/kern_sig.c index a2ca74ac9183..8fa0942a5496 100644 --- a/sys/kern/kern_sig.c +++ b/sys/kern/kern_sig.c @@ -2677,10 +2677,16 @@ ptrace_syscallreq(struct thread *td, struct proc *p, &td->td_proc->p_cowgen))) thread_cow_update(td); + td->td_sa = tsr->ts_sa; + #ifdef CAPABILITY_MODE - if (IN_CAPABILITY_MODE(td) && (se->sy_flags & SYF_CAPENABLED) == 0) { - tsr->ts_ret.sr_error = ECAPMODE; - return; + if ((se->sy_flags & SYF_CAPENABLED) == 0) { + if (CAP_TRACING(td)) + ktrcapfail(CAPFAIL_SYSCALL, NULL); + if (IN_CAPABILITY_MODE(td)) { + tsr->ts_ret.sr_error = ECAPMODE; + return; + } } #endif diff --git a/sys/kern/subr_syscall.c b/sys/kern/subr_syscall.c index 8948cc0517a5..22bc35774e70 100644 --- a/sys/kern/subr_syscall.c +++ b/sys/kern/subr_syscall.c @@ -118,10 +118,13 @@ syscallenter(struct thread *td) * In capability mode, we only allow access to system calls * flagged with SYF_CAPENABLED. */ - if (__predict_false(IN_CAPABILITY_MODE(td) && - (se->sy_flags & SYF_CAPENABLED) == 0)) { - td->td_errno = error = ECAPMODE; - goto retval; + if ((se->sy_flags & SYF_CAPENABLED) == 0) { + if (CAP_TRACING(td)) + ktrcapfail(CAPFAIL_SYSCALL, NULL); + if (IN_CAPABILITY_MODE(td)) { + td->td_errno = error = ECAPMODE; + goto retval; + } } #endif From nobody Sun Apr 7 23:57:09 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VCTfZ0HCJz5Fb9v; Sun, 7 Apr 2024 23:57: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 4VCTfY5Fcsz4CS8; Sun, 7 Apr 2024 23:57:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712534229; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+gwWJI06ToWwPA/vVtDxlOK4Vt6SxXj2tcT5ktoJ4Lc=; b=hpzruzK/xWzygRjhF8X3nAmhykiaAn1zNs3mLPLefHNsX1Qb7uyHYlmDKJKpXQODas2cLp qfOcSd95KtN1r3zD3alj118qH427Emic0D8Lgto2gceFA1vGOXn6UiUEDOycmmoXZfQq2q KVHlgWBmSZJqRUW7Ga187Eqh4YFGv3tc63kIJ/wThXmmjKU7mXlbdeqOot7yF1lTvjB00V DP79FgU3tgljovmJtmGC0RIBpDlAXL1y6t46SsCC9H1QQXx5VO8viE+ML+uVqmSAw9kjdN Lx7egWUdlgqkc71c+OhY5sX6AJbGSW6IXXkxCyGB6FAquGbGaoAnxDlAjVPMHA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712534229; a=rsa-sha256; cv=none; b=qlqpGdaiEDOheBxCbcrnKSkFRgjEMTfZIzVSocPi/iY/dbqzRBU4eQDAGsZbFr6bGeghAF GAIoeuWC1DlmA9+wZuRvYPW8AVHNXe6se08L42zKFfTXVUqOTb4DCzgUSlk85wQz6d6qp9 IExOhU8dGRI2v2jqpqzONYuxvnVsjuJfrrmhAjIboK1uO+pCp3w/OXdmurazaMT8r0YFrW ZqvTKGrDzFukxiEu22Ey0LTx0fr/bwX3PrUohcj/VQMf1Vx2f5MkLm2+/rdrTChYiLkvDN WvcnjL8fnEPCeQiIx9qPjoEVECa0pRKfCK28L0DyiecrdGdmRAc6OdeEktDwjA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712534229; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+gwWJI06ToWwPA/vVtDxlOK4Vt6SxXj2tcT5ktoJ4Lc=; b=IRa7Sryiz8DlX9jhGtQBhenFqDxdK/Mt3uBNZcP3hxc+5ya/dbJc7XYSlIpWVNue5FWsGe K7DdhhVHwvTV5tLiSPqyFIwzWpssvd/TSoiOe3u15I8KkZ2ZpsMZ7yIOG+0wTZP2920O5E kpL5xCQYxNHB241GhgGDvynhUviGw4PaQYCi6rh/OMlHz7h5LcX353L3IcSvOn4BCdlbLt 6uOa77xvs43Us2rj0PLBPgcxYp9ZhzP8rK82H7ZxGI4999kiSG4vriNmBG4sMLsFs2hAM2 9XorVBnML3uAbEEyvxg3QSA+cEhx6l0DQ2zbauPMy6qkLXltIIt7IKDjCypUpQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VCTfY4qv9znpH; Sun, 7 Apr 2024 23:57: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 437Nv9Io037479; Sun, 7 Apr 2024 23:57:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 437Nv93c037476; Sun, 7 Apr 2024 23:57:09 GMT (envelope-from git) Date: Sun, 7 Apr 2024 23:57:09 GMT Message-Id: <202404072357.437Nv93c037476@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jake Freeland Subject: git: 6a4616a529c1 - main - ktrace: Record signal violations with KTR_CAPFAIL List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jfree X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6a4616a529c1e387d87376e48ceb670eef8141e7 Auto-Submitted: auto-generated The branch main has been updated by jfree: URL: https://cgit.FreeBSD.org/src/commit/?id=6a4616a529c1e387d87376e48ceb670eef8141e7 commit 6a4616a529c1e387d87376e48ceb670eef8141e7 Author: Jake Freeland AuthorDate: 2024-04-06 18:31:21 +0000 Commit: Jake Freeland CommitDate: 2024-04-07 23:52:51 +0000 ktrace: Record signal violations with KTR_CAPFAIL Report the delivery of signals to processes other than self while Capsicum violation tracing with CAPFAIL_SIGNAL. Reviewed by: markj Approved by: markj (mentor) MFC after: 1 month Differential Revision: https://reviews.freebsd.org/D40679 --- sys/kern/kern_procctl.c | 4 ++++ sys/kern/kern_sig.c | 8 ++++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/sys/kern/kern_procctl.c b/sys/kern/kern_procctl.c index 4d145f9737a0..46ddfaf709bd 100644 --- a/sys/kern/kern_procctl.c +++ b/sys/kern/kern_procctl.c @@ -27,6 +27,8 @@ * SUCH DAMAGE. */ +#include "opt_ktrace.h" + #include #include #include @@ -542,6 +544,8 @@ reap_kill(struct thread *td, struct proc *p, void *data) rk = data; sx_assert(&proctree_lock, SX_LOCKED); + if (CAP_TRACING(td)) + ktrcapfail(CAPFAIL_SIGNAL, &rk->rk_sig); if (IN_CAPABILITY_MODE(td)) return (ECAPMODE); if (rk->rk_sig <= 0 || rk->rk_sig > _SIG_MAXSIG || diff --git a/sys/kern/kern_sig.c b/sys/kern/kern_sig.c index 8fa0942a5496..11b3a3374a4d 100644 --- a/sys/kern/kern_sig.c +++ b/sys/kern/kern_sig.c @@ -1906,8 +1906,12 @@ kern_kill(struct thread *td, pid_t pid, int signum) * The main rationale behind this is that abort(3) is implemented as * kill(getpid(), SIGABRT). */ - if (IN_CAPABILITY_MODE(td) && pid != td->td_proc->p_pid) - return (ECAPMODE); + if (pid != td->td_proc->p_pid) { + if (CAP_TRACING(td)) + ktrcapfail(CAPFAIL_SIGNAL, &signum); + if (IN_CAPABILITY_MODE(td)) + return (ECAPMODE); + } AUDIT_ARG_SIGNUM(signum); AUDIT_ARG_PID(pid); From nobody Sun Apr 7 23:57:10 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VCTfb0cL5z5Fbcl; Sun, 7 Apr 2024 23:57:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VCTfZ6DKCz4C8p; Sun, 7 Apr 2024 23:57:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712534230; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ML1MgU6nUr64iYiaGIRjd8yR0Ad59ng74job3pAKllY=; b=yKHIpSXRvuUCjqVKgd03ZTuNv/R6VtOXRk4kDKXhRth6ilztdZ6q7eiE0pc+yU/sZGbBhs shL+LnsIv2UrbHi9qJTqZt3+OTGFuxlDGctO7LxQSrpwkQSYr3EqQFdHoOd/Z+8dGg+m7v xXy+mWl5qbgtyDIrDtf1xOx7sMDUWPGxJG5ase3sVlVUB5SHRJEZdLNDSf70nUqc8YXGq7 F+NoWH2I1MtaHqP6XhNB828epB7UNQ8djwFCE1DNIEOZkYn5ZKZA3cAGtUDKfU5K2wtJAo RTd6BDhwd7ukvJJKlQaVwc1SlywxDqmqVLI8V5ufRbQr5aJaKdtDhN/iK4+Q6A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712534230; a=rsa-sha256; cv=none; b=RNAXTBzLdZLlQkUEfoROIjb4wz60FgHSz9hMVUT7WMvbMC01JmDN57weQUyJDkoVQK460w JptXG+qzLoCZwlPawDB+QA7SWOVVPSg4t6UnCOyfXSqdzShnWXg+3gxQEPgyuwBtNrs/p4 MdoKSzAPhj/EZ43WGyi+yIMQWdvgE9uFY37CJiLB5K+RHvhrqUu1dPi6jKTr4KwkokS9Kz GubwOMF9Jkmf8eX6xSiRHYOhyKcgvUmr3tVDVaCbSLU50XSRNo+1joXW0uyWiJRryh2INr gXvA8odCfQBMdYkKk8+X84q/C2v01ASLfpeZ+8aHIVKbMuMKO2mlMECg1A4c7Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712534230; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ML1MgU6nUr64iYiaGIRjd8yR0Ad59ng74job3pAKllY=; b=o76O4UuUnC/Zmds51JWsPTehiokklWayRpCYBk0g6KX0U2SHRYvA+rBcStQuQ1h+pfkH8u hOw5L/speQqsXEngcpafq1tw6E5hkl3FnQppY9s2AMLNALhYMQxP3gwLoLno+D94M4PeNN tZSfzDHMSTX0LJQ54w3SLiubRcwons9OmugRYP+wGdSxgynVY4mDdEYj/LzCn1c+rtk3Ty Ui2TkdR9BH2D9/4xalaY+dpf3NV9mG0rOdvxtRA4UL0cDMtffdQ8ryxjjx2SeTdkJNO94x i47hTIjA78AJtmv4bezEES4bZmkSYD+NmcTlZJE+fcrJIpwK+A3fRKV57nV8Sg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VCTfZ5Wr6zpPy; Sun, 7 Apr 2024 23:57: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 437NvAqU037524; Sun, 7 Apr 2024 23:57:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 437NvA5L037521; Sun, 7 Apr 2024 23:57:10 GMT (envelope-from git) Date: Sun, 7 Apr 2024 23:57:10 GMT Message-Id: <202404072357.437NvA5L037521@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jake Freeland Subject: git: 0cd9cde767c3 - main - ktrace: Record namei violations with KTR_CAPFAIL List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jfree X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0cd9cde767c32780df9abee7ba9d2a8a51536728 Auto-Submitted: auto-generated The branch main has been updated by jfree: URL: https://cgit.FreeBSD.org/src/commit/?id=0cd9cde767c32780df9abee7ba9d2a8a51536728 commit 0cd9cde767c32780df9abee7ba9d2a8a51536728 Author: Jake Freeland AuthorDate: 2024-04-06 18:31:25 +0000 Commit: Jake Freeland CommitDate: 2024-04-07 23:52:51 +0000 ktrace: Record namei violations with KTR_CAPFAIL Report namei path lookups while Capsicum violation tracing with CAPFAIL_NAMEI. vfs caching is also ignored when tracing to mimic capability mode behavior. Reviewed by: markj Approved by: markj (mentor) MFC after: 1 month Differential Revision: https://reviews.freebsd.org/D40680 --- sys/kern/kern_descrip.c | 4 +-- sys/kern/kern_exec.c | 2 ++ sys/kern/uipc_shm.c | 8 +++-- sys/kern/uipc_syscalls.c | 16 ++++++--- sys/kern/vfs_cache.c | 2 +- sys/kern/vfs_lookup.c | 90 ++++++++++++++++++++++++++---------------------- sys/sys/namei.h | 11 +++++- 7 files changed, 81 insertions(+), 52 deletions(-) diff --git a/sys/kern/kern_descrip.c b/sys/kern/kern_descrip.c index f626f5a38ca8..ef7aea82a609 100644 --- a/sys/kern/kern_descrip.c +++ b/sys/kern/kern_descrip.c @@ -3054,7 +3054,7 @@ fgetvp_lookup_smr(struct nameidata *ndp, struct vnode **vpp, bool *fsearch) ndp->ni_filecaps.fc_fcntls != CAP_FCNTL_ALL || ndp->ni_filecaps.fc_nioctls != -1) { #ifdef notyet - ndp->ni_lcf |= NI_LCF_STRICTRELATIVE; + ndp->ni_lcf |= NI_LCF_STRICTREL; #else return (EAGAIN); #endif @@ -3146,7 +3146,7 @@ fgetvp_lookup(struct nameidata *ndp, struct vnode **vpp) if (!cap_rights_contains(&ndp->ni_filecaps.fc_rights, &rights) || ndp->ni_filecaps.fc_fcntls != CAP_FCNTL_ALL || ndp->ni_filecaps.fc_nioctls != -1) { - ndp->ni_lcf |= NI_LCF_STRICTRELATIVE; + ndp->ni_lcf |= NI_LCF_STRICTREL; ndp->ni_resflags |= NIRES_STRICTREL; } #endif diff --git a/sys/kern/kern_exec.c b/sys/kern/kern_exec.c index ae2b624c2659..6727872b5b10 100644 --- a/sys/kern/kern_exec.c +++ b/sys/kern/kern_exec.c @@ -454,6 +454,8 @@ do_execve(struct thread *td, struct image_args *args, struct mac *mac_p, interpret: if (args->fname != NULL) { #ifdef CAPABILITY_MODE + if (CAP_TRACING(td)) + ktrcapfail(CAPFAIL_NAMEI, args->fname); /* * While capability mode can't reach this point via direct * path arguments to execve(), we also don't allow diff --git a/sys/kern/uipc_shm.c b/sys/kern/uipc_shm.c index 13fb0915cdaa..5347378c2b4d 100644 --- a/sys/kern/uipc_shm.c +++ b/sys/kern/uipc_shm.c @@ -1177,8 +1177,12 @@ kern_shm_open2(struct thread *td, const char *userpath, int flags, mode_t mode, /* * shm_open(2) is only allowed for anonymous objects. */ - if (IN_CAPABILITY_MODE(td) && (userpath != SHM_ANON)) - return (ECAPMODE); + if (userpath != SHM_ANON) { + if (CAP_TRACING(td)) + ktrcapfail(CAPFAIL_NAMEI, userpath); + if (IN_CAPABILITY_MODE(td)) + return (ECAPMODE); + } #endif AUDIT_ARG_FFLAGS(flags); diff --git a/sys/kern/uipc_syscalls.c b/sys/kern/uipc_syscalls.c index b2d03d932b99..58b993dea5f2 100644 --- a/sys/kern/uipc_syscalls.c +++ b/sys/kern/uipc_syscalls.c @@ -199,8 +199,12 @@ kern_bindat(struct thread *td, int dirfd, int fd, struct sockaddr *sa) int error; #ifdef CAPABILITY_MODE - if (IN_CAPABILITY_MODE(td) && (dirfd == AT_FDCWD)) - return (ECAPMODE); + if (dirfd == AT_FDCWD) { + if (CAP_TRACING(td)) + ktrcapfail(CAPFAIL_NAMEI, "AT_FDCWD"); + if (IN_CAPABILITY_MODE(td)) + return (ECAPMODE); + } #endif AUDIT_ARG_FD(fd); @@ -468,8 +472,12 @@ kern_connectat(struct thread *td, int dirfd, int fd, struct sockaddr *sa) int error; #ifdef CAPABILITY_MODE - if (IN_CAPABILITY_MODE(td) && (dirfd == AT_FDCWD)) - return (ECAPMODE); + if (dirfd == AT_FDCWD) { + if (CAP_TRACING(td)) + ktrcapfail(CAPFAIL_NAMEI, "AT_FDCWD"); + if (IN_CAPABILITY_MODE(td)) + return (ECAPMODE); + } #endif AUDIT_ARG_FD(fd); diff --git a/sys/kern/vfs_cache.c b/sys/kern/vfs_cache.c index f8626be7bda7..375b682e1f3a 100644 --- a/sys/kern/vfs_cache.c +++ b/sys/kern/vfs_cache.c @@ -4483,7 +4483,7 @@ cache_can_fplookup(struct cache_fpl *fpl) cache_fpl_aborted_early(fpl); return (false); } - if (IN_CAPABILITY_MODE(td)) { + if (IN_CAPABILITY_MODE(td) || CAP_TRACING(td)) { cache_fpl_aborted_early(fpl); return (false); } diff --git a/sys/kern/vfs_lookup.c b/sys/kern/vfs_lookup.c index 4104400d77bb..7d708bac607e 100644 --- a/sys/kern/vfs_lookup.c +++ b/sys/kern/vfs_lookup.c @@ -236,14 +236,17 @@ nameicap_check_dotdot(struct nameidata *ndp, struct vnode *dp) struct mount *mp; if (dp == NULL || dp->v_type != VDIR || (ndp->ni_lcf & - NI_LCF_STRICTRELATIVE) == 0) + NI_LCF_STRICTREL) == 0) return (0); + if (__predict_false((ndp->ni_lcf & (NI_LCF_STRICTREL_KTR | + NI_LCF_CAP_DOTDOT_KTR)) == NI_LCF_STRICTREL_KTR)) + NI_CAP_VIOLATION(ndp, ndp->ni_cnd.cn_pnbuf); if ((ndp->ni_lcf & NI_LCF_CAP_DOTDOT) == 0) return (ENOTCAPABLE); mp = dp->v_mount; if (lookup_cap_dotdot_nonlocal == 0 && mp != NULL && (mp->mnt_flag & MNT_LOCAL) == 0) - return (ENOTCAPABLE); + goto capfail; TAILQ_FOREACH_REVERSE(nt, &ndp->ni_cap_tracker, nameicap_tracker_head, nm_link) { if (dp == nt->dp) { @@ -253,6 +256,10 @@ nameicap_check_dotdot(struct nameidata *ndp, struct vnode *dp) return (0); } } + +capfail: + if (__predict_false((ndp->ni_lcf & NI_LCF_STRICTREL_KTR) != 0)) + NI_CAP_VIOLATION(ndp, ndp->ni_cnd.cn_pnbuf); return (ENOTCAPABLE); } @@ -271,12 +278,12 @@ namei_handle_root(struct nameidata *ndp, struct vnode **dpp) struct componentname *cnp; cnp = &ndp->ni_cnd; - if ((ndp->ni_lcf & NI_LCF_STRICTRELATIVE) != 0) { -#ifdef KTRACE - if (KTRPOINT(curthread, KTR_CAPFAIL)) - ktrcapfail(CAPFAIL_LOOKUP, NULL, NULL); -#endif - return (ENOTCAPABLE); + if (__predict_false((ndp->ni_lcf & (NI_LCF_STRICTREL | + NI_LCF_STRICTREL_KTR)) != 0)) { + if ((ndp->ni_lcf & NI_LCF_STRICTREL_KTR) != 0) + NI_CAP_VIOLATION(ndp, cnp->cn_pnbuf); + if ((ndp->ni_lcf & NI_LCF_STRICTREL) != 0) + return (ENOTCAPABLE); } while (*(cnp->cn_nameptr) == '/') { cnp->cn_nameptr++; @@ -317,15 +324,17 @@ namei_setup(struct nameidata *ndp, struct vnode **dpp, struct pwd **pwdp) * previously walked by us, which prevents an escape from * the relative root. */ - if (IN_CAPABILITY_MODE(td) && (cnp->cn_flags & NOCAPCHECK) == 0) { - ndp->ni_lcf |= NI_LCF_STRICTRELATIVE; - ndp->ni_resflags |= NIRES_STRICTREL; - if (ndp->ni_dirfd == AT_FDCWD) { -#ifdef KTRACE - if (KTRPOINT(td, KTR_CAPFAIL)) - ktrcapfail(CAPFAIL_LOOKUP, NULL, NULL); -#endif - return (ECAPMODE); + if ((cnp->cn_flags & NOCAPCHECK) == 0) { + if (CAP_TRACING(td)) { + ndp->ni_lcf |= NI_LCF_STRICTREL_KTR; + if (ndp->ni_dirfd == AT_FDCWD) + NI_CAP_VIOLATION(ndp, "AT_FDCWD"); + } + if (IN_CAPABILITY_MODE(td)) { + ndp->ni_lcf |= NI_LCF_STRICTREL; + ndp->ni_resflags |= NIRES_STRICTREL; + if (ndp->ni_dirfd == AT_FDCWD) + return (ECAPMODE); } } #endif @@ -368,8 +377,8 @@ namei_setup(struct nameidata *ndp, struct vnode **dpp, struct pwd **pwdp) if (error == 0 && (cnp->cn_flags & RBENEATH) != 0) { if (cnp->cn_pnbuf[0] == '/') { error = ENOTCAPABLE; - } else if ((ndp->ni_lcf & NI_LCF_STRICTRELATIVE) == 0) { - ndp->ni_lcf |= NI_LCF_STRICTRELATIVE | + } else if ((ndp->ni_lcf & NI_LCF_STRICTREL) == 0) { + ndp->ni_lcf |= NI_LCF_STRICTREL | NI_LCF_CAP_DOTDOT; } } @@ -391,9 +400,12 @@ namei_setup(struct nameidata *ndp, struct vnode **dpp, struct pwd **pwdp) pwd_drop(pwd); return (error); } - if ((ndp->ni_lcf & NI_LCF_STRICTRELATIVE) != 0 && - lookup_cap_dotdot != 0) - ndp->ni_lcf |= NI_LCF_CAP_DOTDOT; + if (lookup_cap_dotdot != 0) { + if ((ndp->ni_lcf & NI_LCF_STRICTREL_KTR) != 0) + ndp->ni_lcf |= NI_LCF_CAP_DOTDOT_KTR; + if ((ndp->ni_lcf & NI_LCF_STRICTREL) != 0) + ndp->ni_lcf |= NI_LCF_CAP_DOTDOT; + } SDT_PROBE4(vfs, namei, lookup, entry, *dpp, cnp->cn_pnbuf, cnp->cn_flags, false); *pwdp = pwd; @@ -1168,12 +1180,11 @@ dirloop: * result of dotdot lookup. */ if (cnp->cn_flags & ISDOTDOT) { - if ((ndp->ni_lcf & (NI_LCF_STRICTRELATIVE | NI_LCF_CAP_DOTDOT)) - == NI_LCF_STRICTRELATIVE) { -#ifdef KTRACE - if (KTRPOINT(curthread, KTR_CAPFAIL)) - ktrcapfail(CAPFAIL_LOOKUP, NULL, NULL); -#endif + if (__predict_false((ndp->ni_lcf & (NI_LCF_STRICTREL_KTR | + NI_LCF_CAP_DOTDOT_KTR)) == NI_LCF_STRICTREL_KTR)) + NI_CAP_VIOLATION(ndp, cnp->cn_pnbuf); + if (__predict_false((ndp->ni_lcf & (NI_LCF_STRICTREL | + NI_LCF_CAP_DOTDOT)) == NI_LCF_STRICTREL)) { error = ENOTCAPABLE; goto bad; } @@ -1190,10 +1201,14 @@ dirloop: bool isroot = dp == ndp->ni_rootdir || dp == ndp->ni_topdir || dp == rootvnode || pr != NULL; - if (isroot && (ndp->ni_lcf & - NI_LCF_STRICTRELATIVE) != 0) { - error = ENOTCAPABLE; - goto capdotdot; + if (__predict_false(isroot && (ndp->ni_lcf & + (NI_LCF_STRICTREL | NI_LCF_STRICTREL_KTR)) != 0)) { + if ((ndp->ni_lcf & NI_LCF_STRICTREL_KTR) != 0) + NI_CAP_VIOLATION(ndp, cnp->cn_pnbuf); + if ((ndp->ni_lcf & NI_LCF_STRICTREL) != 0) { + error = ENOTCAPABLE; + goto capdotdot; + } } if (isroot || ((dp->v_vflag & VV_ROOT) != 0 && (cnp->cn_flags & NOCROSSMOUNT) != 0)) { @@ -1218,10 +1233,6 @@ dirloop: error = nameicap_check_dotdot(ndp, dp); if (error != 0) { capdotdot: -#ifdef KTRACE - if (KTRPOINT(curthread, KTR_CAPFAIL)) - ktrcapfail(CAPFAIL_LOOKUP, NULL, NULL); -#endif goto bad; } } @@ -1374,13 +1385,8 @@ nextname: } if (cnp->cn_flags & ISDOTDOT) { error = nameicap_check_dotdot(ndp, ndp->ni_vp); - if (error != 0) { -#ifdef KTRACE - if (KTRPOINT(curthread, KTR_CAPFAIL)) - ktrcapfail(CAPFAIL_LOOKUP, NULL, NULL); -#endif + if (error != 0) goto bad2; - } } if (*ndp->ni_next == '/') { cnp->cn_nameptr = ndp->ni_next; diff --git a/sys/sys/namei.h b/sys/sys/namei.h index 1b84bc1df488..cb69fc96b112 100644 --- a/sys/sys/namei.h +++ b/sys/sys/namei.h @@ -196,8 +196,17 @@ int cache_fplookup(struct nameidata *ndp, enum cache_fpl_status *status, /* * Flags in ni_lcf, valid for the duration of the namei call. */ -#define NI_LCF_STRICTRELATIVE 0x0001 /* relative lookup only */ +#define NI_LCF_STRICTREL 0x0001 /* relative lookup only */ #define NI_LCF_CAP_DOTDOT 0x0002 /* ".." in strictrelative case */ +/* Track capability restrictions seperately for violation ktracing. */ +#define NI_LCF_STRICTREL_KTR 0x0004 /* trace relative lookups */ +#define NI_LCF_CAP_DOTDOT_KTR 0x0008 /* ".." in strictrelative case */ +#define NI_LCF_KTR_FLAGS (NI_LCF_STRICTREL_KTR | NI_LCF_CAP_DOTDOT_KTR) + +#define NI_CAP_VIOLATION(ndp, path) do { \ + ktrcapfail(CAPFAIL_NAMEI, (path)); \ + (ndp)->ni_lcf &= ~NI_LCF_KTR_FLAGS; \ +} while (0) /* * Initialization of a nameidata structure. From nobody Sun Apr 7 23:57:11 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VCTfc0g9zz5FbWt; Sun, 7 Apr 2024 23:57: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 4VCTfb6gQMz4CT6; Sun, 7 Apr 2024 23:57:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712534231; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iOOUVCKuwGzdQjDiZGxwJEOJ4t0mjLaxyIlbxsuuzWY=; b=PEHyJIksqd18u2uFKb0V8jncb6RwJPM37cbFiBOI8LwBK2VBHKBkdrVZ5uS30QFMhUsCyQ kplDukKxcLo+CekCPopWXkEHAqEWeWCpVm+a5WSWNPNtMxT0XXHV46g2q/GlUoFdw4VLu5 7EfTtaojS4EBBXuuEhAmZOwnf7GrRr4fHiG3Pj0W0sZrrmghYWaydCOXV4AUYBtnL487wM xCZasHW3pwY7GUjGj2KMLfgsXBpRRObud1+S19aFKIeOfU+3h7SXihY9Ce2eoEe/fNIN/7 fDiZ+zzUKohuxD+d2ECXrmV6wH7xW3jnzLySBXnL1XAUlUzRQXXRb/heNWynzQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712534231; a=rsa-sha256; cv=none; b=O4/9HLLICf4qoS/dmcZXeb8eKAI9pOB1IIebpj61jthUyA6mB9qtlh9oXW+CQRO5nmLAvl uqQDCp2u1e5meIXpVWPrUONJWQKpd4X1Z+J5moTiKFLcBOy79KPvl7rA3nnzwY4T9MsNHy wSYM2BT8cB/u7IU/IcRNkcHrRtLD74WE+7QQs2HFCPDGMD6GmfXtFAtY3xl3gUKPJWf2+E ricuvtBPFAeF7kp6/HNuOq1qgFcBYuCaTGvebqQg7f/rJbwEuse82slY7lmhOGX6TtGNP6 imb0iH1X3Kaq3KJTfBOtZcPRUfcV3HO/x82skPUzxZNJQN5cE7tzI1ptqdZZbg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712534231; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iOOUVCKuwGzdQjDiZGxwJEOJ4t0mjLaxyIlbxsuuzWY=; b=keeLb7n1lfdejNANcyqhKkMt6zzv2KNUx+9IyH/9/oEmtqCsoLprUdsz7N24OICQX9QAod klvz/X/S73Og1xVrUEyuqaAgsg4lySVvIZD97UNoPWuVbl26N0SPhu0fhgrg77fI1H56/g tj6p+qaM6Piz5aJS7Ael2rwJ0yPYmazXBmYawJwJV3mCrwkKVbscXlbT/SqWO8S3p/+QF+ UkM80/5SBUGkdoZ9XwcqrNXIyFcPtAkE3nklYd624+eDnqrFCH6irXZtw2a+/QCedo4Yld /AkBSGK7cGGrzyE+JKJyNajfvvaFKapP+5davQTu8The2tue2hdfv3BBPVypNQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VCTfb6GGPznpJ; Sun, 7 Apr 2024 23:57: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 437NvBGK037569; Sun, 7 Apr 2024 23:57:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 437NvB5W037566; Sun, 7 Apr 2024 23:57:11 GMT (envelope-from git) Date: Sun, 7 Apr 2024 23:57:11 GMT Message-Id: <202404072357.437NvB5W037566@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jake Freeland Subject: git: aa32d7cbc92c - main - ktrace: Record socket violations with KTR_CAPFAIL List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jfree X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: aa32d7cbc92c818622462635641d240ae4342eb2 Auto-Submitted: auto-generated The branch main has been updated by jfree: URL: https://cgit.FreeBSD.org/src/commit/?id=aa32d7cbc92c818622462635641d240ae4342eb2 commit aa32d7cbc92c818622462635641d240ae4342eb2 Author: Jake Freeland AuthorDate: 2024-04-06 18:31:28 +0000 Commit: Jake Freeland CommitDate: 2024-04-07 23:52:51 +0000 ktrace: Record socket violations with KTR_CAPFAIL Report restricted access to socket addresses and protocols while Capsicum violation tracing with CAPFAIL_ADDR and CAPFAIL_PROTO. Reviewed by: markj Approved by: markj (mentor) MFC after: 1 month Differential Revision: https://reviews.freebsd.org/D40681 --- sys/kern/uipc_socket.c | 9 +++++++-- sys/kern/uipc_syscalls.c | 13 ++++++++----- 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/sys/kern/uipc_socket.c b/sys/kern/uipc_socket.c index 82fbcd4a922d..ce618eeba3ba 100644 --- a/sys/kern/uipc_socket.c +++ b/sys/kern/uipc_socket.c @@ -104,6 +104,7 @@ #include "opt_inet.h" #include "opt_inet6.h" #include "opt_kern_tls.h" +#include "opt_ktrace.h" #include "opt_sctp.h" #include @@ -522,8 +523,12 @@ socreate(int dom, struct socket **aso, int type, int proto, MPASS(prp->pr_attach); - if (IN_CAPABILITY_MODE(td) && (prp->pr_flags & PR_CAPATTACH) == 0) - return (ECAPMODE); + if ((prp->pr_flags & PR_CAPATTACH) == 0) { + if (CAP_TRACING(td)) + ktrcapfail(CAPFAIL_PROTO, &proto); + if (IN_CAPABILITY_MODE(td)) + return (ECAPMODE); + } if (prison_check_af(cred, prp->pr_domain->dom_family) != 0) return (EPROTONOSUPPORT); diff --git a/sys/kern/uipc_syscalls.c b/sys/kern/uipc_syscalls.c index 58b993dea5f2..318415245ab7 100644 --- a/sys/kern/uipc_syscalls.c +++ b/sys/kern/uipc_syscalls.c @@ -654,11 +654,6 @@ sendit(struct thread *td, int s, struct msghdr *mp, int flags) struct sockaddr *to; int error; -#ifdef CAPABILITY_MODE - if (IN_CAPABILITY_MODE(td) && (mp->msg_name != NULL)) - return (ECAPMODE); -#endif - if (mp->msg_name != NULL) { error = getsockaddr(&to, mp->msg_name, mp->msg_namelen); if (error != 0) { @@ -666,6 +661,14 @@ sendit(struct thread *td, int s, struct msghdr *mp, int flags) goto bad; } mp->msg_name = to; +#ifdef CAPABILITY_MODE + if (CAP_TRACING(td)) + ktrcapfail(CAPFAIL_SOCKADDR, mp->msg_name); + if (IN_CAPABILITY_MODE(td)) { + error = ECAPMODE; + goto bad; + } +#endif } else { to = NULL; } From nobody Sun Apr 7 23:57:12 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VCTfd1GPFz5Fbcp; Sun, 7 Apr 2024 23:57: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 4VCTfd0XPNz4CX2; Sun, 7 Apr 2024 23:57:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712534233; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Jz/OoaBaghPE1fHKQplldAB761GFGFx5em8smC6eryU=; b=GOvg0n0Gxb/on815EHVrf+CTzcw/qq6FYJfy93p2eKudnBSV+46JF/iHP6bJGnktfnslae HteUMTdCq1pQdzBJoDeUbMPpTa5CuPG3MtuuIT3FOW0sOdLozoyBurfYRY3VtVJ4v3usZ+ XafhR5wbhFDwAc9nI2lgpDzO5PyB4oNbOH9PE5IVQ/12lgfJQAf72OlSRKuCrBzysKRhOr mCnoz8zbuRcvpvc8xI9L/M/FumCPci4390WD1XewazNZCMv4LVO/LngPfF5XOHugx87JjD p0ZmktjD909ncTD78m8Y+V4zeE/jk0FgqMDmCyI5QaQXDS9DsdOg6K9IerMOKA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712534233; a=rsa-sha256; cv=none; b=Tkk/UYIFs67gPTldrKhhI4EmaBCnT6lGu+K5MW1YBiDCwFhRj2BDcKo8AyoCVawaZOp7ch j6yUbqBEKBi3kEqWeHdDZkQx0jD3AZSRI9np+7wyuH0a4fy55CSeiEmx6/km2b/LubzIrl Bhih7TcO0kfzqWMGfzxwtGPgomxVE2Rmxii6cNG7/ywRDpSwh+mtFy/ND5lXfiu0I3vhag dONlsCOWwGc77MrJveMRHntCpPp/IUG/ALgc4V3RQVIp7guWrYxRyWzxJPO5gBDg7nuPc+ 3nMvEdQGJOxHHuOSKf8IV2ak43QJ23sf+CnfmGAoLlkRqNsMwKxMSSZvbJFdAQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712534233; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Jz/OoaBaghPE1fHKQplldAB761GFGFx5em8smC6eryU=; b=m1Y+D4DFfAfm7ajTstqXl2SXk2wOJORi9XssmQ8DY85pLy61BzskKgudQJmj0RIQTgGwIv yngp0D+N8RfrE3bTjMAZBy4Oh12sLSDLcJWwyN/7WGz/pK/s/q7d2LKQBOYcKgeCB9T7xG uA2gQAem4ngH1oxnFzWsQst6ur9qekDvs2fXmlVPV6UZaiCkVEpoPCFZBYDcVMVDIcgRhz qaVaf8JEVRoqT8rk9LceWx5Ff0hqbj5ogxvK+TeQLzG+S5Mt2Mo0ClomWPEA87+eJFpsGa LJ8ZfxLveHfnk2aXaewoALgKL+bNYhY1gTy/mSt479DxIi2ldES9Yfc1qBmrvg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VCTfd084SzpTJ; Sun, 7 Apr 2024 23:57:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 437NvCSp037617; Sun, 7 Apr 2024 23:57:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 437NvCKn037614; Sun, 7 Apr 2024 23:57:12 GMT (envelope-from git) Date: Sun, 7 Apr 2024 23:57:12 GMT Message-Id: <202404072357.437NvCKn037614@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jake Freeland Subject: git: 2f39a986641e - main - tests: Add ktrace capability violation test cases List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jfree X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2f39a986641ecebaa9080ca28118903bd9707a1f Auto-Submitted: auto-generated The branch main has been updated by jfree: URL: https://cgit.FreeBSD.org/src/commit/?id=2f39a986641ecebaa9080ca28118903bd9707a1f commit 2f39a986641ecebaa9080ca28118903bd9707a1f Author: Jake Freeland AuthorDate: 2024-04-06 18:31:30 +0000 Commit: Jake Freeland CommitDate: 2024-04-07 23:52:51 +0000 tests: Add ktrace capability violation test cases Introduce regression tests for ktrace(2) that target capability violations. These test cases ensure that ktrace(2) records these violations: - CAPFAIL_NOTCAPABLE - CAPFAIL_INCREASE - CAPFAIL_SYSCALL - CAPFAIL_SIGNAL - CAPFAIL_PROTO - CAPFAIL_SOCKADDR - CAPFAIL_NAMEI - CAPFAIL_CPUSET A portion of these test cases create processes that do NOT enter capability mode, but raise violations. This is intended behavior. Users may run `ktrace -t p` on non-Capsicumized programs to detect violations that would occur if the process were in capability mode. Reviewed by: markj Approved by: markj (mentor) MFC after: 1 month Differential Revision: https://reviews.freebsd.org/D40682 --- tests/sys/kern/Makefile | 2 + tests/sys/kern/ktrace_test.c | 488 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 490 insertions(+) diff --git a/tests/sys/kern/Makefile b/tests/sys/kern/Makefile index e54a43b5fd83..bc42f53a2849 100644 --- a/tests/sys/kern/Makefile +++ b/tests/sys/kern/Makefile @@ -21,6 +21,7 @@ ATF_TESTS_C+= kill_zombie .if ${MK_OPENSSL} != "no" ATF_TESTS_C+= ktls_test .endif +ATF_TESTS_C+= ktrace_test ATF_TESTS_C+= listener_wakeup ATF_TESTS_C+= module_test ATF_TESTS_C+= ptrace_test @@ -86,6 +87,7 @@ LIBADD.socket_msg_waitall+= pthread LIBADD.sendfile_helper+= pthread LIBADD.fdgrowtable_test+= util pthread kvm procstat LIBADD.sigwait+= rt +LIBADD.ktrace_test+= sysdecode NETBSD_ATF_TESTS_C+= lockf_test NETBSD_ATF_TESTS_C+= mqueue_test diff --git a/tests/sys/kern/ktrace_test.c b/tests/sys/kern/ktrace_test.c new file mode 100644 index 000000000000..49e2ed05fed9 --- /dev/null +++ b/tests/sys/kern/ktrace_test.c @@ -0,0 +1,488 @@ +/*- + * Copyright (c) 2015 John Baldwin + * Copyright (c) 2023 The FreeBSD Foundation + * + * This software was developed by Jake Freeland + * under sponsorship from the FreeBSD Foundation. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include + +#include +#include +#include +#include +#include +#include +#include + +/* + * A variant of ATF_REQUIRE that is suitable for use in child + * processes. This only works if the parent process is tripped up by + * the early exit and fails some requirement itself. + */ +#define CHILD_REQUIRE(exp) do { \ + if (!(exp)) \ + child_fail_require(__FILE__, __LINE__, \ + #exp " not met\n"); \ +} while (0) +#define CHILD_REQUIRE_EQ(actual, expected) do { \ + __typeof__(expected) _e = expected; \ + __typeof__(actual) _a = actual; \ + if (_e != _a) \ + child_fail_require(__FILE__, __LINE__, #actual \ + " (%jd) == " #expected " (%jd) not met\n", \ + (intmax_t)_a, (intmax_t)_e); \ +} while (0) + +static __dead2 void +child_fail_require(const char *file, int line, const char *fmt, ...) +{ + va_list ap; + char buf[1024]; + + /* Use write() not fprintf() to avoid possible duplicate output. */ + snprintf(buf, sizeof(buf), "%s:%d: ", file, line); + write(STDERR_FILENO, buf, strlen(buf)); + va_start(ap, fmt); + vsnprintf(buf, sizeof(buf), fmt, ap); + write(STDERR_FILENO, buf, strlen(buf)); + va_end(ap); + + _exit(32); +} + +/* + * Determine sysdecode ABI based on proc's ABI in sv_flags. + */ +static enum sysdecode_abi +syscallabi(u_int sv_flags) +{ + switch (sv_flags & SV_ABI_MASK) { + case SV_ABI_FREEBSD: + return (SYSDECODE_ABI_FREEBSD); + case SV_ABI_LINUX: +#ifdef __LP64__ + if ((sv_flags & SV_ILP32) != 0) + return (SYSDECODE_ABI_LINUX32); +#endif + return (SYSDECODE_ABI_LINUX); + } + return (SYSDECODE_ABI_UNKNOWN); +} + +/* + * Start tracing capability violations and notify child that it can execute. + * Return @numv capability violations from child in @v. + */ +static void +cap_trace_child(int cpid, struct ktr_cap_fail *v, int numv) +{ + struct ktr_header header; + int error, fd, i; + + ATF_REQUIRE((fd = open("ktrace.out", + O_RDONLY | O_CREAT | O_TRUNC)) != -1); + ATF_REQUIRE(ktrace("ktrace.out", KTROP_SET, + KTRFAC_CAPFAIL, cpid) != -1); + /* Notify child that we've starting tracing. */ + ATF_REQUIRE(kill(cpid, SIGUSR1) != -1); + /* Wait for child to raise violation and exit. */ + ATF_REQUIRE(waitpid(cpid, &error, 0) != -1); + ATF_REQUIRE(WIFEXITED(error)); + ATF_REQUIRE_EQ(WEXITSTATUS(error), 0); + /* Read ktrace header and ensure violation occurred. */ + for (i = 0; i < numv; ++i) { + ATF_REQUIRE((error = read(fd, &header, sizeof(header))) != -1); + ATF_REQUIRE_EQ(error, sizeof(header)); + ATF_REQUIRE_EQ(header.ktr_len, sizeof(*v)); + ATF_REQUIRE_EQ(header.ktr_pid, cpid); + /* Read the capability violation. */ + ATF_REQUIRE((error = read(fd, v + i, + sizeof(*v))) != -1); + ATF_REQUIRE_EQ(error, sizeof(*v)); + } + ATF_REQUIRE(close(fd) != -1); +} + +/* + * Test if ktrace will record an operation that is done with + * insufficient rights. + */ +ATF_TC_WITHOUT_HEAD(ktrace__cap_not_capable); +ATF_TC_BODY(ktrace__cap_not_capable, tc) +{ + struct ktr_cap_fail violation; + cap_rights_t rights; + sigset_t set = { }; + pid_t pid; + int error; + + /* Block SIGUSR1 so child does not terminate. */ + ATF_REQUIRE(sigaddset(&set, SIGUSR1) != -1); + ATF_REQUIRE(sigprocmask(SIG_BLOCK, &set, NULL) != -1); + + ATF_REQUIRE((pid = fork()) != -1); + if (pid == 0) { + /* Limit fd rights to CAP_READ. */ + cap_rights_init(&rights, CAP_READ); + CHILD_REQUIRE(caph_rights_limit(STDIN_FILENO, &rights) != -1); + CHILD_REQUIRE(caph_enter() != -1); + /* Wait until ktrace has started. */ + CHILD_REQUIRE(sigwait(&set, &error) != -1); + CHILD_REQUIRE_EQ(error, SIGUSR1); + /* Write without CAP_WRITE. */ + CHILD_REQUIRE(write(STDIN_FILENO, &pid, sizeof(pid)) == -1); + CHILD_REQUIRE_EQ(errno, ENOTCAPABLE); + exit(0); + } + + cap_trace_child(pid, &violation, 1); + ATF_REQUIRE_EQ(violation.cap_type, CAPFAIL_NOTCAPABLE); + ATF_REQUIRE(cap_rights_is_set(&violation.cap_data.cap_needed, + CAP_WRITE)); +} + +/* + * Test if ktrace will record an attempt to increase rights. + */ +ATF_TC_WITHOUT_HEAD(ktrace__cap_increase_rights); +ATF_TC_BODY(ktrace__cap_increase_rights, tc) +{ + struct ktr_cap_fail violation; + cap_rights_t rights; + sigset_t set = { }; + pid_t pid; + int error; + + /* Block SIGUSR1 so child does not terminate. */ + ATF_REQUIRE(sigaddset(&set, SIGUSR1) != -1); + ATF_REQUIRE(sigprocmask(SIG_BLOCK, &set, NULL) != -1); + + ATF_REQUIRE((pid = fork()) != -1); + if (pid == 0) { + /* Limit fd rights to CAP_READ. */ + cap_rights_init(&rights, CAP_READ); + CHILD_REQUIRE(caph_rights_limit(STDIN_FILENO, &rights) != -1); + CHILD_REQUIRE(caph_enter() != -1); + /* Wait until ktrace has started. */ + CHILD_REQUIRE(sigwait(&set, &error) != -1); + CHILD_REQUIRE_EQ(error, SIGUSR1); + /* Increase fd rights to include CAP_WRITE. */ + cap_rights_set(&rights, CAP_WRITE); + CHILD_REQUIRE(caph_rights_limit(STDIN_FILENO, &rights) == -1); + CHILD_REQUIRE_EQ(errno, ENOTCAPABLE); + exit(0); + } + + cap_trace_child(pid, &violation, 1); + ATF_REQUIRE_EQ(violation.cap_type, CAPFAIL_INCREASE); + ATF_REQUIRE(cap_rights_is_set(&violation.cap_data.cap_needed, + CAP_WRITE)); +} + +/* + * Test if disallowed syscalls are reported as capability violations. + */ +ATF_TC_WITHOUT_HEAD(ktrace__cap_syscall); +ATF_TC_BODY(ktrace__cap_syscall, tc) +{ + struct kinfo_file kinf; + struct ktr_cap_fail violation[2]; + sigset_t set = { }; + pid_t pid; + int error; + + /* Block SIGUSR1 so child does not terminate. */ + ATF_REQUIRE(sigaddset(&set, SIGUSR1) != -1); + ATF_REQUIRE(sigprocmask(SIG_BLOCK, &set, NULL) != -1); + + ATF_REQUIRE((pid = fork()) != -1); + if (pid == 0) { + /* Wait until ktrace has started. */ + CHILD_REQUIRE(sigwait(&set, &error) != -1); + CHILD_REQUIRE_EQ(error, SIGUSR1); + /* chdir() is not permitted in capability mode. */ + CHILD_REQUIRE(chdir(".") != -1); + kinf.kf_structsize = sizeof(struct kinfo_file); + /* + * fcntl() is permitted in capability mode, + * but the F_KINFO cmd is not. + */ + CHILD_REQUIRE(fcntl(STDIN_FILENO, F_KINFO, &kinf) != -1); + exit(0); + } + + cap_trace_child(pid, violation, 2); + ATF_REQUIRE_EQ(violation[0].cap_type, CAPFAIL_SYSCALL); + error = syscallabi(violation[0].cap_svflags); + ATF_REQUIRE_STREQ(sysdecode_syscallname(error, violation[0].cap_code), + "chdir"); + + ATF_REQUIRE_EQ(violation[1].cap_type, CAPFAIL_SYSCALL); + error = syscallabi(violation[1].cap_svflags); + ATF_REQUIRE_STREQ(sysdecode_syscallname(error, violation[1].cap_code), + "fcntl"); + ATF_REQUIRE_EQ(violation[1].cap_data.cap_int, F_KINFO); +} + +/* + * Test if sending a signal to another process is reported as + * a signal violation. + */ +ATF_TC_WITHOUT_HEAD(ktrace__cap_signal); +ATF_TC_BODY(ktrace__cap_signal, tc) +{ + struct ktr_cap_fail violation; + sigset_t set = { }; + pid_t pid; + int error; + + /* Block SIGUSR1 so child does not terminate. */ + ATF_REQUIRE(sigaddset(&set, SIGUSR1) != -1); + ATF_REQUIRE(sigprocmask(SIG_BLOCK, &set, NULL) != -1); + + ATF_REQUIRE((pid = fork()) != -1); + if (pid == 0) { + /* Wait until ktrace has started. */ + CHILD_REQUIRE(sigwait(&set, &error) != -1); + CHILD_REQUIRE_EQ(error, SIGUSR1); + /* + * Signals may only be sent to ourself. Sending signals + * to other processes is not allowed in capability mode. + */ + CHILD_REQUIRE(kill(getppid(), SIGCONT) != -1); + exit(0); + } + + cap_trace_child(pid, &violation, 1); + ATF_REQUIRE_EQ(violation.cap_type, CAPFAIL_SIGNAL); + error = syscallabi(violation.cap_svflags); + ATF_REQUIRE_STREQ(sysdecode_syscallname(error, violation.cap_code), + "kill"); + ATF_REQUIRE_EQ(violation.cap_data.cap_int, SIGCONT); +} + +/* + * Test if opening a socket with a restricted protocol is reported + * as a protocol violation. + */ +ATF_TC_WITHOUT_HEAD(ktrace__cap_proto); +ATF_TC_BODY(ktrace__cap_proto, tc) +{ + struct ktr_cap_fail violation; + sigset_t set = { }; + pid_t pid; + int error; + + /* Block SIGUSR1 so child does not terminate. */ + ATF_REQUIRE(sigaddset(&set, SIGUSR1) != -1); + ATF_REQUIRE(sigprocmask(SIG_BLOCK, &set, NULL) != -1); + + ATF_REQUIRE((pid = fork()) != -1); + if (pid == 0) { + /* Wait until ktrace has started. */ + CHILD_REQUIRE(sigwait(&set, &error) != -1); + CHILD_REQUIRE_EQ(error, SIGUSR1); + /* + * Certain protocols may not be used in capability mode. + * ICMP's raw-protocol interface is not allowed. + */ + CHILD_REQUIRE(close(socket(AF_INET, SOCK_RAW, + IPPROTO_ICMP)) != -1); + exit(0); + } + + cap_trace_child(pid, &violation, 1); + ATF_REQUIRE_EQ(violation.cap_type, CAPFAIL_PROTO); + error = syscallabi(violation.cap_svflags); + ATF_REQUIRE_STREQ(sysdecode_syscallname(error, violation.cap_code), + "socket"); + ATF_REQUIRE_EQ(violation.cap_data.cap_int, IPPROTO_ICMP); +} + +/* + * Test if sending data to an address using a socket is + * reported as a sockaddr violation. + */ +ATF_TC_WITHOUT_HEAD(ktrace__cap_sockaddr); +ATF_TC_BODY(ktrace__cap_sockaddr, tc) +{ + struct sockaddr_in addr = { }, *saddr; + struct ktr_cap_fail violation; + sigset_t set = { }; + pid_t pid; + int error, sfd; + + /* Block SIGUSR1 so child does not terminate. */ + ATF_REQUIRE(sigaddset(&set, SIGUSR1) != -1); + ATF_REQUIRE(sigprocmask(SIG_BLOCK, &set, NULL) != -1); + + CHILD_REQUIRE((sfd = socket(AF_INET, SOCK_DGRAM, + IPPROTO_UDP)) != -1); + addr.sin_family = AF_INET; + addr.sin_port = htons(5000); + addr.sin_addr.s_addr = INADDR_ANY; + CHILD_REQUIRE(bind(sfd, (const struct sockaddr *)&addr, + sizeof(addr)) != -1); + + ATF_REQUIRE((pid = fork()) != -1); + if (pid == 0) { + /* Wait until ktrace has started. */ + CHILD_REQUIRE(sigwait(&set, &error) != -1); + CHILD_REQUIRE_EQ(error, SIGUSR1); + /* + * Sending data to an address is not permitted. + * In this case, sending data to @addr causes a + * violation. + */ + CHILD_REQUIRE(sendto(sfd, NULL, 0, 0, + (const struct sockaddr *)&addr, sizeof(addr)) != -1); + exit(0); + } + + cap_trace_child(pid, &violation, 1); + ATF_REQUIRE_EQ(violation.cap_type, CAPFAIL_SOCKADDR); + error = syscallabi(violation.cap_svflags); + ATF_REQUIRE_STREQ(sysdecode_syscallname(error, violation.cap_code), + "sendto"); + saddr = (struct sockaddr_in *)&violation.cap_data.cap_sockaddr; + ATF_REQUIRE_EQ(saddr->sin_family, AF_INET); + ATF_REQUIRE_EQ(saddr->sin_port, htons(5000)); + ATF_REQUIRE_EQ(saddr->sin_addr.s_addr, INADDR_ANY); + close(sfd); +} + +/* + * Test if openat() with AT_FDCWD and absolute path are reported + * as namei violations. + */ +ATF_TC_WITHOUT_HEAD(ktrace__cap_namei); +ATF_TC_BODY(ktrace__cap_namei, tc) +{ + struct ktr_cap_fail violation[2]; + sigset_t set = { }; + pid_t pid; + int error; + + /* Block SIGUSR1 so child does not terminate. */ + ATF_REQUIRE(sigaddset(&set, SIGUSR1) != -1); + ATF_REQUIRE(sigprocmask(SIG_BLOCK, &set, NULL) != -1); + + ATF_REQUIRE((pid = fork()) != -1); + if (pid == 0) { + /* Wait until ktrace has started. */ + CHILD_REQUIRE(sigwait(&set, &error) != -1); + CHILD_REQUIRE_EQ(error, SIGUSR1); + /* + * The AT_FDCWD file descriptor has not been opened + * and will be inaccessible in capability mode. + */ + CHILD_REQUIRE(close(openat(AT_FDCWD, "ktrace.out", + O_RDONLY | O_CREAT)) != -1); + /* + * Absolute paths are inaccessible in capability mode. + */ + CHILD_REQUIRE(close(openat(-1, "/", O_RDONLY)) != -1); + exit(0); + } + + cap_trace_child(pid, violation, 2); + ATF_REQUIRE_EQ(violation[0].cap_type, CAPFAIL_NAMEI); + error = syscallabi(violation[0].cap_svflags); + ATF_REQUIRE_STREQ(sysdecode_syscallname(error, violation[0].cap_code), + "openat"); + ATF_REQUIRE_STREQ(violation[0].cap_data.cap_path, "AT_FDCWD"); + + ATF_REQUIRE_EQ(violation[1].cap_type, CAPFAIL_NAMEI); + error = syscallabi(violation[1].cap_svflags); + ATF_REQUIRE_STREQ(sysdecode_syscallname(error, violation[1].cap_code), + "openat"); + ATF_REQUIRE_STREQ(violation[1].cap_data.cap_path, "/"); +} + +/* + * Test if changing another process's cpu set is recorded as + * a cpuset violation. + */ +ATF_TC_WITHOUT_HEAD(ktrace__cap_cpuset); +ATF_TC_BODY(ktrace__cap_cpuset, tc) +{ + struct ktr_cap_fail violation; + cpuset_t cpuset_mask = { }; + sigset_t set = { }; + pid_t pid; + int error; + + /* Block SIGUSR1 so child does not terminate. */ + ATF_REQUIRE(sigaddset(&set, SIGUSR1) != -1); + ATF_REQUIRE(sigprocmask(SIG_BLOCK, &set, NULL) != -1); + + ATF_REQUIRE((pid = fork()) != -1); + if (pid == 0) { + /* Wait until ktrace has started. */ + CHILD_REQUIRE(sigwait(&set, &error) != -1); + CHILD_REQUIRE_EQ(error, SIGUSR1); + /* + * Set cpu 0 affinity for parent process. + * Other process's cpu sets are restricted in capability + * mode, so this will raise a violation. + */ + CPU_SET(0, &cpuset_mask); + CHILD_REQUIRE(cpuset_setaffinity(CPU_LEVEL_WHICH, CPU_WHICH_PID, + getppid(), sizeof(cpuset_mask), &cpuset_mask) != -1); + exit(0); + } + + cap_trace_child(pid, &violation, 1); + ATF_REQUIRE_EQ(violation.cap_type, CAPFAIL_CPUSET); + error = syscallabi(violation.cap_svflags); + ATF_REQUIRE_STREQ(sysdecode_syscallname(error, violation.cap_code), + "cpuset_setaffinity"); +} + +ATF_TP_ADD_TCS(tp) +{ + ATF_TP_ADD_TC(tp, ktrace__cap_not_capable); + ATF_TP_ADD_TC(tp, ktrace__cap_increase_rights); + ATF_TP_ADD_TC(tp, ktrace__cap_syscall); + ATF_TP_ADD_TC(tp, ktrace__cap_signal); + ATF_TP_ADD_TC(tp, ktrace__cap_proto); + ATF_TP_ADD_TC(tp, ktrace__cap_sockaddr); + ATF_TP_ADD_TC(tp, ktrace__cap_namei); + ATF_TP_ADD_TC(tp, ktrace__cap_cpuset); + return (atf_no_error()); +} From nobody Sun Apr 7 23:57:14 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VCTff41wvz5FbB2; Sun, 7 Apr 2024 23:57:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VCTff1b0Fz4CNC; Sun, 7 Apr 2024 23:57:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712534234; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rSQHj0YVIwP5K11jGE0AVViAj3jTfceVqXtO4/yuIJw=; b=hFe4lGlwAbKFsaw635aQDFAbsyEDVLnWdtoRofNX4ZDcmeblpbWQ/Bivbxhmm4O45alAd4 NPvi9d6orhd5bDBSx6tY/TTOiDwHBTcc7+R7jeeMaICAWgED5762nm8p7eCiyV83UjFIr6 rnPFvk+IbRQYgn9ffLs3hnwTKkiBkpWxPwQW60XdBKXjPHSYnhfQWLeaV3L2e1TWTCN/fe 19SEixz10MlATG9/CNcyEl681QBPQKgEBEEDX10wwYmcK2OQOsFcZPGaeCHj8tGorMmDiS YbBMu0S0iVBgFq6FDAUluLdcf5D1A9IYBz2WRf4m1KOASxCuFVNO1+d4dtfkGg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712534234; a=rsa-sha256; cv=none; b=TEjLe0bCl8TL/VyYZvdKz/2uOFrj0FZDsEBJ5QQ//zxE9coVHQLV33CRm+qfDTkn0Jl0ls EWTMj602xzcxFqxbRF1PwUNgWSZriYFmufy6FOsE9LZyUfzC+wyTLUAbKCd290FRMpVSBY OFYeSb59bw4TCCeVqBheW0VyCe4wSmLK+HmuLutmV7sZZLYajeUNtYrNVQVX/9Eev+N5x9 Savsg6ZK3T3I3bYu2nBevPq00GpjcWUapvTR4jbm7BDlgFb49BYNDTkNYm3bt0maWzdlCV 1BHaLF2e+LgECZpJKdbmd/3ToXv+V5JYbWj8Ne8vKe0LbcoxYlcQDw/JZ6prUw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712534234; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rSQHj0YVIwP5K11jGE0AVViAj3jTfceVqXtO4/yuIJw=; b=j3nJczRrUwFATlo3vukX1DNyYeXLbwuI2uqxaS4A9EXGyCtaI1jKxDRc1ETFEt5eyunKem 4Ehjm76XlfT/65jom2hDvzWVTX8SjtHSDPmh5kYyb107sWWXF9JYHTPxix63eo87X9avPb fgACW/8i0/N0BgWnroV0PDz9c7NK2qSpepzPW4GW1HmtIU9xwUmGhweezTvelWsPWkraM4 LFapZfKhGWpFRQEORsjtVTRJK0MV4ZMvx96Lp8/hEHx4ojbtWsYcbfmHfwrYyYc5h7CyS5 0/43Sig+QJPMaODtHdUEKk7mKPC4zpaRs4yqMAR46e/hXl5QOsbtQgBNXzRISg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VCTff18MHzp5J; Sun, 7 Apr 2024 23:57:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 437NvEex037665; Sun, 7 Apr 2024 23:57:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 437NvEAc037662; Sun, 7 Apr 2024 23:57:14 GMT (envelope-from git) Date: Sun, 7 Apr 2024 23:57:14 GMT Message-Id: <202404072357.437NvEAc037662@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jake Freeland Subject: git: 1ff4bc0f4909 - main - RELNOTES: Add entry for updates to ktrace(2) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jfree X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1ff4bc0f49095e89e6bf763ad972b3d17396d5c4 Auto-Submitted: auto-generated The branch main has been updated by jfree: URL: https://cgit.FreeBSD.org/src/commit/?id=1ff4bc0f49095e89e6bf763ad972b3d17396d5c4 commit 1ff4bc0f49095e89e6bf763ad972b3d17396d5c4 Author: Jake Freeland AuthorDate: 2024-04-06 18:39:42 +0000 Commit: Jake Freeland CommitDate: 2024-04-07 23:52:51 +0000 RELNOTES: Add entry for updates to ktrace(2) Approved by: markj (mentor) --- RELNOTES | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/RELNOTES b/RELNOTES index c6e7732582ae..59131dc70dac 100644 --- a/RELNOTES +++ b/RELNOTES @@ -10,6 +10,10 @@ newline. Entries should be separated by a newline. Changes to this file should not be MFCed. +aea973501b19: + ktrace(2) will now record detailed information about capability mode + violations. The kdump(1) utility has been updated to display such + information. f32a6403d346: One True Awk updated to 2nd Edition. See https://awk.dev for details on the additions. Unicode and CSVs (Comma Separated Values) are now