From nobody Mon May 27 01:34: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 4VndVL4Cb1z5L3Dc; Mon, 27 May 2024 01:34: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 4VndVL3jjCz4mbY; Mon, 27 May 2024 01:34:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716773674; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=meUPnDRu7SzyuzdqRvbMVT2oA28ptpwV3R6AqoWSNVc=; b=HPbMccnBvTo7NZMRFNzZ8rKXVgjSidYWdMrsrMbWlsKNedtvECXvXCismYKQf19V6CZq+m 6wJQCT+WbTeMyqLr0yVHGlO2oizeyMu3Quqh4Dz/qRrcOFiisMMwFxlNx6jscxQKY4d9hu 1sSPAZZ8IHfyqv8/otcT4KzpOTHsoq7QyFbg1u4Dwwwjth52yq9y+KKvhe+4LgyCHgQjzn E58InQptGhHMV9b3RF5WZ5osaLwPniVNfIjT1nNYM99G3Y9qRAcBiCLfkGmTffTeWOej9x NqY/U3ODHyp+88k2b7KepfDuc6Fxb3uI5Ailx9bm9/k4RacPvDQyaNJFSbD2lw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1716773674; a=rsa-sha256; cv=none; b=SOfmqqMHpcnsw5D0MFQj6KYjx8ttyA5e/tRmvTKQhkjjcEf9yMvVFzP26MjDRhxKZwKhUn NcUF45YA/9FNXjF9ShOS60PVmwgSI/HslEjgkmdsOZoRzjjowl/i9XKBhKpvPinZvIWF3S +s5P/EEgWoqLMoqX1Rt6j1x858hG/q6OMNc0q1ZYHHGKLV08rVgwpJ+rydiukqXXkteHEq JtNjeb0S2trKISF+abzoJOUse9z19qacWAPvWMy04xpTAORi/pa7wfLkh5BgA0+7azNx1P abwsEaePxm/zaXa7vi0nzGkNyLeeS8JWKnKwfFI2dg98Ji57IMPewb1zRzJgwQ== 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=1716773674; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=meUPnDRu7SzyuzdqRvbMVT2oA28ptpwV3R6AqoWSNVc=; b=wPuv1p2FL7AwwTtEvAfhBZkbOAl6ZJwPtUI1PvKaP+xYTFPdZDpyvcdWsntkmwNycnpEZ1 7oE102NG2xMRAZpe36/ru4K0XEdho07krYS2MEcLyX3zNS7iLXSlEkkyQTLd/VkjzlI7mS kSUZQlX4NV/SJ5f8glahXJWO72TN4i8X/nvLUI1sNBrjBYalhLA2SY3x5EZKMPFlpbKzLF mX7Fp1Qe6RtXR6lS8V+KRxwWUD7LRu1fOIECuUY7XjUD0YKrJSKKBjLJJh10yD3btZMyWB mVSrZU2hkcoUAsnzwZvNfm5DA1eQzjdk1bf8j7bm0Uju3xZbE5aZe8Eqn1jnHA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VndVL3K82zPkP; Mon, 27 May 2024 01:34: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 44R1YYDZ087738; Mon, 27 May 2024 01:34:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44R1YYiK087735; Mon, 27 May 2024 01:34:34 GMT (envelope-from git) Date: Mon, 27 May 2024 01:34:34 GMT Message-Id: <202405270134.44R1YYiK087735@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: a8f86ecd6104 - main - newsyslog: Fix case of the 'P' flag in newsyslog.conf(5) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: a8f86ecd6104b1f127b426be278a9031789b4413 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=a8f86ecd6104b1f127b426be278a9031789b4413 commit a8f86ecd6104b1f127b426be278a9031789b4413 Author: Joshua Kinard AuthorDate: 2024-05-25 20:52:11 +0000 Commit: Ed Maste CommitDate: 2024-05-27 01:34:14 +0000 newsyslog: Fix case of the 'P' flag in newsyslog.conf(5) PR: 279303 Reviewed-by: emaste Signed-off-by: Joshua Kinard --- usr.sbin/newsyslog/newsyslog.conf.5 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/newsyslog/newsyslog.conf.5 b/usr.sbin/newsyslog/newsyslog.conf.5 index 120c5a0cb7cc..9f229bc04402 100644 --- a/usr.sbin/newsyslog/newsyslog.conf.5 +++ b/usr.sbin/newsyslog/newsyslog.conf.5 @@ -330,7 +330,7 @@ to use .It Cm N indicates that there is no process which needs to be signaled when this log file is rotated. -.It Cm p +.It Cm P indicates that the zero-th rotated file should not be compressed. .It Cm R if this flag is set the From nobody Mon May 27 01:43: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 4Vndh94Hcjz5L4GN for ; Mon, 27 May 2024 01:43: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 4Vndh91720z4pMq; Mon, 27 May 2024 01:43:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716774185; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=x2hEpEVXka5k9rw9mS4YhTOQ9Kc/s2QslqsO40LWYM8=; b=GsxKe94toK4DKv5a3pk/FbohrPgeVLAWrcHhuywdlfJOLT1QfXVXW0Rks3k7drXUavteOU SKQl+6XR947Z2YRV0SyVUH78XltuoYlEczZOnVl6XwGZiB7VnQ+3U2dRityKIl2IhBhIzF wI9FKmdf+HOvZc13hKmdZtwj3+Yl8pju+5hpaBBcUjrHyK3px4l7JvRBlO6vt3sXzCUAas IeKyZaMftsEp/jPGuaWzINUV5qpudHJzVwu9Ry4J4ieFDmwBAy1wWG09rODVFH7OLHz07f szdsSskSZfGdFfQ9JQ6SaU6hIcaHNVeN7jroDp0gcx18t6YnFeeFCOLQp+2kEw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1716774185; a=rsa-sha256; cv=none; b=fbfaOCTsifgkowLwEL2fYDpCL3KzTa4fPQJYxaPrbx69WCzW+c2dtYaIOspocbLH/v9fVF YbkE/UuTBNq/wXAqbrJyGuok/DQeVWGpHMzNb19XI6CGmm0RY4PPUhokmS0POK9X3GYArL 8oY0825877pKNfYQDwYdudQJIT4xHhBuHNGpzUc+MnyuLPEIfQq0p0Ikkcnsb93T3qy+5x x9UrUu9wK4QhDSzXvtyi1TRO/1zH9egbGo3Ql4JJzpAYf4oH+AEOcMw/3biIveYTQD3wMj IX36BE2T1NDRuv54cZKmzOg/mPHDxqro5ltI8mcn3ynD2ao8z7yzqIy6qcJK0w== 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=1716774185; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=x2hEpEVXka5k9rw9mS4YhTOQ9Kc/s2QslqsO40LWYM8=; b=J+QhE3gwgtT15JtDKEKsJFkl12lXSiCCUzLXzc/JhRu0W2W/UXkDlG/PSjohts6jRAmLF3 TsYZmSP+nWb98m0EJGOnl/wcQY/wZSPS5btdJ9aI9SP3ED9jPKSepGsmJhXTKokYeyNZTP nBl0CIC518bRZ0QTXbXrTYq9QaLAs37FRLVcidFNqjt4zOiQYXVnxj/sfSeDWBhkqzFDA8 5bbe3DIdyqVs2O0EXzb9Gw9Ofk4tjE2+2/VYx5P6iJRkCMIi94g2oVZ+R4239OTVTH+uhG 1Ya9dUA0I8ZpndlyiYo593wHpcjXPBhapZj/OTcFutNmXat07p6gj4tGhIwkaA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Vndh90QSHzPtH; Mon, 27 May 2024 01:43: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 44R1h4pi004059; Mon, 27 May 2024 01:43:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44R1h4do004058; Mon, 27 May 2024 01:43:04 GMT (envelope-from git) Date: Mon, 27 May 2024 01:43:04 GMT Message-Id: <202405270143.44R1h4do004058@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: Cy Schubert Subject: git: ab1f1aa83333..1f833b3fc996 - vendor/ntp - vendor branch updated List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: src X-Git-Refname: refs/heads/vendor/ntp X-Git-Reftype: branch X-Git-Commit: 1f833b3fc9968c3dd7ed79ccf0525ebf16c891ad X-Git-Oldrev: ab1f1aa8333369a83ff284848fc3fc2e52d5f29f X-Git-Newrev: 1f833b3fc9968c3dd7ed79ccf0525ebf16c891ad Auto-Submitted: auto-generated The branch vendor/ntp has been updated by cy: URL: https://cgit.FreeBSD.org/src/log/?id=ab1f1aa83333..1f833b3fc996 1f833b3fc996 ntp: Vendor import of ntp-4.2.8p18 From nobody Mon May 27 02:02: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 4Vnf646nddz5L69c; Mon, 27 May 2024 02:02: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 4Vnf646X21z4r7p; Mon, 27 May 2024 02:02:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716775324; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=C9/wi8G/+B9yHwhVPu7VKdDo7Y8NMrmapfdHQ0Ub0/o=; b=q2jSzqqRZuEjXAcnMOSB9Y2K8Z2PoCXwqa+U+wygwy4hSJuK0+9pVwMpXp4WoHn7+SYSag t8BbTcecDNrAr2YXVH9OfiKgHroUa7ZWEyUc6sc31JWgUhUvdLWN6uH/a+EVqVRYD82wDU pFXAWIYPeXPU/4qaBB81I8eQ3OQnHUUuJcD2xe5CS0HuOCm54zDsXalHtlbbD8TxgK2apz /p3pIayBQ2OV1p4RtEQDjT9DgiqGpi9YfbTbvt+E5tixijnEDueyx92tr+2kybachvB+LD C2OcsDbvXvZkTMst1Q9NHtBj/uJXEF5szgou54hcf47SMvM3myhRQ5r41yUtXg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1716775324; a=rsa-sha256; cv=none; b=e6cAK5dZ6cxCDkkjond5TK446c2goXAUo5LGrlFYG4/tlkh1Ws/xGVB7CvtTbQUWXZ0Qjy j9YQjdHlIvov9kETwhXqXnHTAW7/USpg882U41Jc+jhGn4TfIuqZZ5HIARsD6vdS07CAzX lelpcrMAq3KewuWSMS4FCgPxSi1ePMPeGFlynGS6zG1NwGaCst46B2FDmNeVqX4VXTh5nb LrleS4oYa8n3cfN/yml4z97WR6IZjCCIQ1cWFVuqQ5wiuGL6YkaGsGDjI4QDLrXco5wi4f +yHLQ14wGFxfNwM/+6DCbA1C9+W1XV1eozNymPTEjDeXI2Np6Qq1l3Z8sZgFJQ== 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=1716775324; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=C9/wi8G/+B9yHwhVPu7VKdDo7Y8NMrmapfdHQ0Ub0/o=; b=E0xLyhZMBl0U6+GadQd98Q1qg2FuVb1Yw85y4Xf0Hn05+i/oX0iAT2J1v1LWa+CLJE0kxf 7aKqEAG77ux2qgyfXys1mq7S29hJBp/+295xynljOWjSRAn80pK7U84WzT+KFY/qmwZNgg U/mIiLlh/taPboB7DV5OnNDVvHISeeZNOQ3QsFD85QCKC/jHVS76+zZmknf2abGCLTIzW6 SOIbdrDrEgQsfW9cbTgZdXagv3Z7dNDObo+IuD8S6h3/f/JY2yj+guLVyJfu0gaMNL+Avk j68Vu8WuKxXcUIX2yMe4SOyu+31eq0s5hAM1ez5dm0VdkzVhxJKkmNuhu2C8mQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Vnf6466yNzQVx; Mon, 27 May 2024 02:02: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 44R2248S038324; Mon, 27 May 2024 02:02:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44R2243f038317; Mon, 27 May 2024 02:02:04 GMT (envelope-from git) Date: Mon, 27 May 2024 02:02:04 GMT Message-Id: <202405270202.44R2243f038317@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Cy Schubert Subject: git: f5f40dd63bc7 - main - ntp: Vendor import of ntp-4.2.8p18 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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/main X-Git-Reftype: branch X-Git-Commit: f5f40dd63bc7acbb5312b26ac1ea1103c12352a6 Auto-Submitted: auto-generated The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=f5f40dd63bc7acbb5312b26ac1ea1103c12352a6 commit f5f40dd63bc7acbb5312b26ac1ea1103c12352a6 Merge: a8f86ecd6104 1f833b3fc996 Author: Cy Schubert AuthorDate: 2024-05-27 01:41:22 +0000 Commit: Cy Schubert CommitDate: 2024-05-27 01:41:22 +0000 ntp: Vendor import of ntp-4.2.8p18 MFC: 3 days Merge commit '1f833b3fc9968c3dd7ed79ccf0525ebf16c891ad' into main contrib/ntp/COPYRIGHT | 4 +- contrib/ntp/ChangeLog | 120 +- contrib/ntp/CommitLog | 3221 ++++ contrib/ntp/Makefile.am | 6 +- contrib/ntp/Makefile.in | 7 +- contrib/ntp/NEWS | 3902 ++++ contrib/ntp/adjtimed/Makefile.in | 13 +- contrib/ntp/check-libntp.mf | 10 +- contrib/ntp/check-libntpd.mf | 13 +- contrib/ntp/check-libunity.mf | 4 +- contrib/ntp/check-scm-rev.mf | 6 +- contrib/ntp/clockstuff/Makefile.in | 13 +- contrib/ntp/config.h.in | 44 +- contrib/ntp/configure | 2726 +-- contrib/ntp/configure.ac | 81 +- contrib/ntp/flock-build | 22 +- contrib/ntp/html/.datecheck | 0 contrib/ntp/html/clockopt.html | 9 +- contrib/ntp/html/copyright.html | 4 +- contrib/ntp/html/release.html | 2 +- contrib/ntp/include/Makefile.am | 1 + contrib/ntp/include/Makefile.in | 2 + contrib/ntp/include/c99_snprintf.h | 28 + contrib/ntp/include/isc/Makefile.in | 1 + contrib/ntp/include/lib_strbuf.h | 30 +- contrib/ntp/include/ntp.h | 73 +- contrib/ntp/include/ntp_config.h | 13 +- contrib/ntp/include/ntp_control.h | 2 +- contrib/ntp/include/ntp_lists.h | 4 +- contrib/ntp/include/ntp_md5.h | 25 +- contrib/ntp/include/ntp_net.h | 13 +- contrib/ntp/include/ntp_psl.h | 11 +- contrib/ntp/include/ntp_stdlib.h | 20 +- contrib/ntp/include/ntp_tty.h | 5 + contrib/ntp/include/ntp_types.h | 10 - contrib/ntp/include/ntpd.h | 80 +- contrib/ntp/include/vint64ops.h | 2 +- contrib/ntp/kernel/Makefile.in | 1 + contrib/ntp/kernel/sys/Makefile.in | 1 + contrib/ntp/libntp/Makefile.am | 1 - contrib/ntp/libntp/Makefile.in | 76 +- contrib/ntp/libntp/a_md5encrypt.c | 169 +- contrib/ntp/libntp/adjtime.c | 2 +- contrib/ntp/libntp/audio.c | 2 +- contrib/ntp/libntp/authkeys.c | 4 + contrib/ntp/libntp/authreadkeys.c | 12 +- contrib/ntp/libntp/bsd_strerror.c | 2 +- contrib/ntp/libntp/clocktypes.c | 1 - contrib/ntp/libntp/dofptoa.c | 2 - contrib/ntp/libntp/dolfptoa.c | 2 - contrib/ntp/libntp/humandate.c | 1 - contrib/ntp/libntp/lib/isc/win32/strerror.c | 64 +- contrib/ntp/libntp/lib_strbuf.c | 51 +- contrib/ntp/libntp/machines.c | 60 +- contrib/ntp/libntp/modetoa.c | 1 - contrib/ntp/libntp/msyslog.c | 6 +- contrib/ntp/libntp/netof.c | 24 +- contrib/ntp/libntp/ntp_calendar.c | 1 - contrib/ntp/libntp/ntp_intres.c | 6 - contrib/ntp/libntp/ntp_realpath.c | 43 +- contrib/ntp/libntp/numtoa.c | 64 +- contrib/ntp/libntp/numtohost.c | 43 - contrib/ntp/libntp/prettydate.c | 1 - contrib/ntp/libntp/recvbuff.c | 39 +- contrib/ntp/libntp/refnumtoa.c | 1 - contrib/ntp/libntp/snprintf.c | 2 +- contrib/ntp/libntp/socket.c | 16 +- contrib/ntp/libntp/socktoa.c | 1 - contrib/ntp/libntp/socktohost.c | 1 - contrib/ntp/libntp/ssl_init.c | 74 +- contrib/ntp/libntp/statestr.c | 1 - contrib/ntp/libntp/systime.c | 1 - contrib/ntp/libntp/timexsup.c | 22 +- contrib/ntp/libntp/uglydate.c | 1 - contrib/ntp/libntp/vint64ops.c | 21 +- contrib/ntp/libntp/work_thread.c | 17 +- contrib/ntp/libparse/Makefile.am | 15 +- contrib/ntp/libparse/Makefile.in | 30 +- contrib/ntp/libparse/clk_computime.c | 2 +- contrib/ntp/libparse/clk_dcf7000.c | 2 +- contrib/ntp/libparse/clk_hopf6021.c | 2 +- contrib/ntp/libparse/clk_meinberg.c | 2 +- contrib/ntp/libparse/clk_rawdcf.c | 2 +- contrib/ntp/libparse/clk_rcc8000.c | 2 +- contrib/ntp/libparse/clk_schmid.c | 2 +- contrib/ntp/libparse/clk_sel240x.c | 2 +- contrib/ntp/libparse/clk_trimtaip.c | 2 +- contrib/ntp/libparse/clk_trimtsip.c | 2 +- contrib/ntp/libparse/clk_varitext.c | 2 +- contrib/ntp/libparse/clk_wharton.c | 2 +- contrib/ntp/libparse/ieee754io.c | 25 +- contrib/ntp/libparse/parse.c | 2 +- contrib/ntp/libparse/parse_conf.c | 2 +- contrib/ntp/ntpd/Makefile.in | 20 +- contrib/ntp/ntpd/cmd_args.c | 18 +- contrib/ntp/ntpd/complete.conf.in | 43 +- contrib/ntp/ntpd/invoke-ntp.conf.texi | 99 +- contrib/ntp/ntpd/invoke-ntp.keys.texi | 2 +- contrib/ntp/ntpd/invoke-ntpd.texi | 4 +- contrib/ntp/ntpd/keyword-gen-utd | 2 +- contrib/ntp/ntpd/keyword-gen.c | 2 +- contrib/ntp/ntpd/ntp.conf.5man | 106 +- contrib/ntp/ntpd/ntp.conf.5mdoc | 106 +- contrib/ntp/ntpd/ntp.conf.def | 100 +- contrib/ntp/ntpd/ntp.conf.html | 102 +- contrib/ntp/ntpd/ntp.conf.man.in | 106 +- contrib/ntp/ntpd/ntp.conf.mdoc.in | 106 +- contrib/ntp/ntpd/ntp.keys.5man | 6 +- contrib/ntp/ntpd/ntp.keys.5mdoc | 6 +- contrib/ntp/ntpd/ntp.keys.html | 2 +- contrib/ntp/ntpd/ntp.keys.man.in | 6 +- contrib/ntp/ntpd/ntp.keys.mdoc.in | 6 +- contrib/ntp/ntpd/ntp_config.c | 696 +- contrib/ntp/ntpd/ntp_control.c | 68 +- contrib/ntp/ntpd/ntp_crypto.c | 134 +- contrib/ntp/ntpd/ntp_io.c | 927 +- contrib/ntp/ntpd/ntp_keyword.h | 2078 +-- contrib/ntp/ntpd/ntp_leapsec.c | 78 +- contrib/ntp/ntpd/ntp_loopfilter.c | 16 + contrib/ntp/ntpd/ntp_monitor.c | 21 +- contrib/ntp/ntpd/ntp_parser.c | 3279 ++-- contrib/ntp/ntpd/ntp_parser.h | 752 +- contrib/ntp/ntpd/ntp_peer.c | 202 +- contrib/ntp/ntpd/ntp_proto.c | 334 +- contrib/ntp/ntpd/ntp_refclock.c | 58 +- contrib/ntp/ntpd/ntp_request.c | 15 +- contrib/ntp/ntpd/ntp_restrict.c | 725 +- contrib/ntp/ntpd/ntp_scanner.c | 22 +- contrib/ntp/ntpd/ntp_timer.c | 303 +- contrib/ntp/ntpd/ntp_util.c | 249 +- contrib/ntp/ntpd/ntpd-opts.c | 20 +- contrib/ntp/ntpd/ntpd-opts.h | 8 +- contrib/ntp/ntpd/ntpd.1ntpdman | 6 +- contrib/ntp/ntpd/ntpd.1ntpdmdoc | 6 +- contrib/ntp/ntpd/ntpd.c | 101 +- contrib/ntp/ntpd/ntpd.html | 4 +- contrib/ntp/ntpd/ntpd.man.in | 6 +- contrib/ntp/ntpd/ntpd.mdoc.in | 6 +- contrib/ntp/ntpd/refclock_acts.c | 2 +- contrib/ntp/ntpd/refclock_arbiter.c | 2 +- contrib/ntp/ntpd/refclock_arc.c | 13 +- contrib/ntp/ntpd/refclock_as2201.c | 2 +- contrib/ntp/ntpd/refclock_atom.c | 2 +- contrib/ntp/ntpd/refclock_bancomm.c | 2 +- contrib/ntp/ntpd/refclock_chronolog.c | 2 +- contrib/ntp/ntpd/refclock_conf.c | 2 +- contrib/ntp/ntpd/refclock_dumbclock.c | 2 +- contrib/ntp/ntpd/refclock_fg.c | 2 +- contrib/ntp/ntpd/refclock_gpsvme.c | 2 +- contrib/ntp/ntpd/refclock_heath.c | 2 +- contrib/ntp/ntpd/refclock_hopfpci.c | 2 +- contrib/ntp/ntpd/refclock_hopfser.c | 2 +- contrib/ntp/ntpd/refclock_hpgps.c | 2 +- contrib/ntp/ntpd/refclock_irig.c | 2 +- contrib/ntp/ntpd/refclock_jjy.c | 2 +- contrib/ntp/ntpd/refclock_jupiter.c | 2 +- contrib/ntp/ntpd/refclock_local.c | 2 +- contrib/ntp/ntpd/refclock_mx4200.c | 2 +- contrib/ntp/ntpd/refclock_neoclock4x.c | 2 +- contrib/ntp/ntpd/refclock_nmea.c | 2 + contrib/ntp/ntpd/refclock_oncore.c | 2 +- contrib/ntp/ntpd/refclock_palisade.c | 2 +- contrib/ntp/ntpd/refclock_pcf.c | 2 +- contrib/ntp/ntpd/refclock_pst.c | 2 +- contrib/ntp/ntpd/refclock_ripencc.c | 2 +- contrib/ntp/ntpd/refclock_tpro.c | 2 +- contrib/ntp/ntpd/refclock_true.c | 2 +- contrib/ntp/ntpd/refclock_tsyncpci.c | 2 +- contrib/ntp/ntpd/refclock_tt560.c | 2 +- contrib/ntp/ntpd/refclock_ulink.c | 2 +- contrib/ntp/ntpd/refclock_wwv.c | 2 +- contrib/ntp/ntpd/refclock_wwvb.c | 2 +- contrib/ntp/ntpd/refclock_zyfer.c | 2 +- contrib/ntp/ntpdate/Makefile.in | 18 +- contrib/ntp/ntpdc/Makefile.in | 18 +- contrib/ntp/ntpdc/invoke-ntpdc.texi | 4 +- contrib/ntp/ntpdc/nl.pl | 1 + contrib/ntp/ntpdc/nl.pl.in | 1 + contrib/ntp/ntpdc/ntpdc-opts.c | 20 +- contrib/ntp/ntpdc/ntpdc-opts.h | 8 +- contrib/ntp/ntpdc/ntpdc.1ntpdcman | 6 +- contrib/ntp/ntpdc/ntpdc.1ntpdcmdoc | 6 +- contrib/ntp/ntpdc/ntpdc.html | 4 +- contrib/ntp/ntpdc/ntpdc.man.in | 6 +- contrib/ntp/ntpdc/ntpdc.mdoc.in | 6 +- contrib/ntp/ntpq/Makefile.in | 18 +- contrib/ntp/ntpq/invoke-ntpq.texi | 4 +- contrib/ntp/ntpq/ntpq-opts.c | 20 +- contrib/ntp/ntpq/ntpq-opts.h | 8 +- contrib/ntp/ntpq/ntpq-subs.c | 41 +- contrib/ntp/ntpq/ntpq.1ntpqman | 6 +- contrib/ntp/ntpq/ntpq.1ntpqmdoc | 6 +- contrib/ntp/ntpq/ntpq.c | 25 +- contrib/ntp/ntpq/ntpq.h | 1 - contrib/ntp/ntpq/ntpq.html | 4 +- contrib/ntp/ntpq/ntpq.man.in | 6 +- contrib/ntp/ntpq/ntpq.mdoc.in | 6 +- contrib/ntp/ntpsnmpd/Makefile.am | 8 +- contrib/ntp/ntpsnmpd/Makefile.in | 22 +- contrib/ntp/ntpsnmpd/invoke-ntpsnmpd.texi | 4 +- contrib/ntp/ntpsnmpd/netsnmp_daemonize.c | 18 +- contrib/ntp/ntpsnmpd/ntpsnmpd-opts.c | 20 +- contrib/ntp/ntpsnmpd/ntpsnmpd-opts.h | 8 +- contrib/ntp/ntpsnmpd/ntpsnmpd.1ntpsnmpdman | 6 +- contrib/ntp/ntpsnmpd/ntpsnmpd.1ntpsnmpdmdoc | 6 +- contrib/ntp/ntpsnmpd/ntpsnmpd.html | 2 +- contrib/ntp/ntpsnmpd/ntpsnmpd.man.in | 6 +- contrib/ntp/ntpsnmpd/ntpsnmpd.mdoc.in | 6 +- contrib/ntp/packageinfo.sh | 4 +- contrib/ntp/parseutil/Makefile.in | 1 + contrib/ntp/scripts/Makefile.in | 1 + contrib/ntp/scripts/build/Makefile.in | 1 + contrib/ntp/scripts/build/checkHtmlFileDates | 24 +- contrib/ntp/scripts/build/genAuthors.in | 1 + contrib/ntp/scripts/build/mkver.in | 2 + contrib/ntp/scripts/calc_tickadj/Makefile.in | 1 + .../calc_tickadj/calc_tickadj.1calc_tickadjman | 4 +- .../calc_tickadj/calc_tickadj.1calc_tickadjmdoc | 4 +- contrib/ntp/scripts/calc_tickadj/calc_tickadj.html | 2 +- contrib/ntp/scripts/calc_tickadj/calc_tickadj.in | 1 + .../ntp/scripts/calc_tickadj/calc_tickadj.man.in | 4 +- .../ntp/scripts/calc_tickadj/calc_tickadj.mdoc.in | 4 +- .../scripts/calc_tickadj/invoke-calc_tickadj.texi | 2 +- contrib/ntp/scripts/invoke-plot_summary.texi | 4 +- contrib/ntp/scripts/invoke-summary.texi | 4 +- contrib/ntp/scripts/lib/Makefile.in | 1 + contrib/ntp/scripts/ntp-wait/Makefile.in | 1 + contrib/ntp/scripts/ntp-wait/invoke-ntp-wait.texi | 4 +- contrib/ntp/scripts/ntp-wait/ntp-wait-opts | 4 +- contrib/ntp/scripts/ntp-wait/ntp-wait.1ntp-waitman | 4 +- .../ntp/scripts/ntp-wait/ntp-wait.1ntp-waitmdoc | 4 +- contrib/ntp/scripts/ntp-wait/ntp-wait.html | 4 +- contrib/ntp/scripts/ntp-wait/ntp-wait.in | 1 + contrib/ntp/scripts/ntp-wait/ntp-wait.man.in | 4 +- contrib/ntp/scripts/ntp-wait/ntp-wait.mdoc.in | 4 +- contrib/ntp/scripts/ntpsweep/Makefile.in | 1 + contrib/ntp/scripts/ntpsweep/invoke-ntpsweep.texi | 4 +- contrib/ntp/scripts/ntpsweep/ntpsweep-opts | 4 +- contrib/ntp/scripts/ntpsweep/ntpsweep.1ntpsweepman | 4 +- .../ntp/scripts/ntpsweep/ntpsweep.1ntpsweepmdoc | 4 +- contrib/ntp/scripts/ntpsweep/ntpsweep.html | 4 +- contrib/ntp/scripts/ntpsweep/ntpsweep.in | 1 + contrib/ntp/scripts/ntpsweep/ntpsweep.man.in | 4 +- contrib/ntp/scripts/ntpsweep/ntpsweep.mdoc.in | 4 +- contrib/ntp/scripts/ntptrace/Makefile.in | 1 + contrib/ntp/scripts/ntptrace/invoke-ntptrace.texi | 4 +- contrib/ntp/scripts/ntptrace/ntptrace-opts | 4 +- contrib/ntp/scripts/ntptrace/ntptrace.1ntptraceman | 4 +- .../ntp/scripts/ntptrace/ntptrace.1ntptracemdoc | 4 +- contrib/ntp/scripts/ntptrace/ntptrace.html | 4 +- contrib/ntp/scripts/ntptrace/ntptrace.in | 11 + contrib/ntp/scripts/ntptrace/ntptrace.man.in | 4 +- contrib/ntp/scripts/ntptrace/ntptrace.mdoc.in | 4 +- contrib/ntp/scripts/ntpver.in | 3 +- contrib/ntp/scripts/plot_summary-opts | 4 +- contrib/ntp/scripts/plot_summary.1plot_summaryman | 4 +- contrib/ntp/scripts/plot_summary.1plot_summarymdoc | 4 +- contrib/ntp/scripts/plot_summary.html | 4 +- contrib/ntp/scripts/plot_summary.in | 1 + contrib/ntp/scripts/plot_summary.man.in | 4 +- contrib/ntp/scripts/plot_summary.mdoc.in | 4 +- contrib/ntp/scripts/summary-opts | 4 +- contrib/ntp/scripts/summary.1summaryman | 4 +- contrib/ntp/scripts/summary.1summarymdoc | 4 +- contrib/ntp/scripts/summary.html | 4 +- contrib/ntp/scripts/summary.in | 1 + contrib/ntp/scripts/summary.man.in | 4 +- contrib/ntp/scripts/summary.mdoc.in | 4 +- contrib/ntp/scripts/update-leap/Makefile.in | 1 + .../scripts/update-leap/invoke-update-leap.texi | 2 +- contrib/ntp/scripts/update-leap/update-leap-opts | 4 +- .../update-leap/update-leap.1update-leapman | 4 +- .../update-leap/update-leap.1update-leapmdoc | 4 +- contrib/ntp/scripts/update-leap/update-leap.html | 2 +- contrib/ntp/scripts/update-leap/update-leap.in | 1 + contrib/ntp/scripts/update-leap/update-leap.man.in | 4 +- .../ntp/scripts/update-leap/update-leap.mdoc.in | 4 +- contrib/ntp/sntp/COPYRIGHT | 4 +- contrib/ntp/sntp/Makefile.am | 3 +- contrib/ntp/sntp/Makefile.in | 17 +- contrib/ntp/sntp/aclocal.m4 | 1 + contrib/ntp/sntp/check-libntp.mf | 10 +- contrib/ntp/sntp/check-libsntp.mf | 8 +- contrib/ntp/sntp/check-libunity.mf | 3 +- contrib/ntp/sntp/config.h.in | 41 +- contrib/ntp/sntp/configure | 18356 ++++++++++--------- contrib/ntp/sntp/configure.ac | 8 +- contrib/ntp/sntp/crypto.c | 72 +- contrib/ntp/sntp/crypto.h | 15 +- contrib/ntp/sntp/include/Makefile.in | 2 + contrib/ntp/sntp/include/copyright.def | 2 +- contrib/ntp/sntp/include/version.def | 2 +- contrib/ntp/sntp/include/version.texi | 6 +- contrib/ntp/sntp/invoke-sntp.texi | 4 +- contrib/ntp/sntp/libevent/Makefile.in | 3 + contrib/ntp/sntp/libevent/configure | 8 +- contrib/ntp/sntp/libevent/configure.ac | 7 +- contrib/ntp/sntp/libevent/kqueue.c | 2 +- contrib/ntp/sntp/libevent/m4/acx_pthread.m4 | 2 +- contrib/ntp/sntp/libopts/Makefile.am | 4 +- contrib/ntp/sntp/libopts/Makefile.in | 23 +- contrib/ntp/sntp/m4/ntp_compiler.m4 | 68 +- contrib/ntp/sntp/m4/ntp_crypto_rand.m4 | 37 +- contrib/ntp/sntp/m4/ntp_facilitynames.m4 | 33 +- contrib/ntp/sntp/m4/ntp_libevent.m4 | 10 +- contrib/ntp/sntp/m4/ntp_libntp.m4 | 89 +- contrib/ntp/sntp/m4/ntp_openssl.m4 | 827 +- contrib/ntp/sntp/m4/version.m4 | 2 +- contrib/ntp/sntp/main.c | 20 +- contrib/ntp/sntp/scm-rev | 2 +- contrib/ntp/sntp/scripts/Makefile.in | 2 + contrib/ntp/sntp/scripts/cvo.sh | 8 +- contrib/ntp/sntp/sntp-opts.c | 20 +- contrib/ntp/sntp/sntp-opts.h | 8 +- contrib/ntp/sntp/sntp.1sntpman | 6 +- contrib/ntp/sntp/sntp.1sntpmdoc | 6 +- contrib/ntp/sntp/sntp.html | 4 +- contrib/ntp/sntp/sntp.man.in | 6 +- contrib/ntp/sntp/sntp.mdoc.in | 6 +- contrib/ntp/sntp/tests/Makefile.in | 23 +- contrib/ntp/sntp/tests/crypto.c | 235 +- contrib/ntp/sntp/tests/fileHandlingTest.h.in | 8 +- contrib/ntp/sntp/tests/packetHandling.c | 50 +- contrib/ntp/sntp/tests/packetProcessing.c | 168 +- contrib/ntp/sntp/tests/run-crypto.c | 20 +- contrib/ntp/sntp/tests/run-packetProcessing.c | 40 +- contrib/ntp/sntp/unity/Makefile.in | 2 + contrib/ntp/sntp/unity/unity_internals.h | 10 +- contrib/ntp/sntp/utilities.h | 1 - contrib/ntp/tests/libntp/data/ntp.keys | 23 +- contrib/ntp/tests/libntp/digests.c | 125 +- contrib/ntp/tests/libntp/run-digests.c | 6 + contrib/ntp/util/Makefile.am | 4 +- contrib/ntp/util/Makefile.in | 62 +- contrib/ntp/util/invoke-ntp-keygen.texi | 4 +- contrib/ntp/util/lsf-times.c | 220 + contrib/ntp/util/ntp-keygen-opts.c | 20 +- contrib/ntp/util/ntp-keygen-opts.h | 8 +- contrib/ntp/util/ntp-keygen.1ntp-keygenman | 6 +- contrib/ntp/util/ntp-keygen.1ntp-keygenmdoc | 6 +- contrib/ntp/util/ntp-keygen.c | 55 +- contrib/ntp/util/ntp-keygen.html | 4 +- contrib/ntp/util/ntp-keygen.man.in | 6 +- contrib/ntp/util/ntp-keygen.mdoc.in | 6 +- usr.sbin/ntp/config.h | 545 +- usr.sbin/ntp/libntp/Makefile | 2 +- usr.sbin/ntp/ntpd/Makefile | 4 +- usr.sbin/ntp/ntpdate/Makefile | 4 +- usr.sbin/ntp/ntpdc/Makefile | 4 +- usr.sbin/ntp/ntpq/Makefile | 4 +- usr.sbin/ntp/sntp/Makefile | 4 +- 351 files changed, 26986 insertions(+), 17542 deletions(-) diff --cc contrib/ntp/html/.datecheck index 000000000000,000000000000..e69de29bb2d1 new file mode 100644 --- /dev/null +++ b/contrib/ntp/html/.datecheck diff --cc contrib/ntp/include/c99_snprintf.h index 000000000000,f5c1bf0e117c..f5c1bf0e117c mode 000000,100644..100644 --- a/contrib/ntp/include/c99_snprintf.h +++ b/contrib/ntp/include/c99_snprintf.h diff --cc contrib/ntp/libntp/Makefile.in index 75d6b2abf8bc,000000000000..69805f7ddca2 mode 100644,000000..100644 --- a/contrib/ntp/libntp/Makefile.in +++ b/contrib/ntp/libntp/Makefile.in @@@ -1,1700 -1,0 +1,1696 @@@ +# Makefile.in generated by automake 1.16.5 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994-2021 Free Software Foundation, Inc. + +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ + + +VPATH = @srcdir@ +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) +pkgdatadir = $(datadir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ + +# ntp_crypto_rnd.c includes libevent headers for use when +# neither OpenSSL nor arc4random_buf are available. Those +# include event2/event-config.h which is built, so if we +# are building our libevent tearoff, build it before this. +@BUILD_LIBEVENT_TRUE@am__append_1 = libevent_first +@BUILD_LIBEVENT_TRUE@am__append_2 = libevent_first +@PTHREADS_TRUE@am__append_3 = \ +@PTHREADS_TRUE@ lib/isc/pthreads/condition.c \ +@PTHREADS_TRUE@ lib/isc/pthreads/mutex.c \ +@PTHREADS_TRUE@ lib/isc/pthreads/thread.c \ +@PTHREADS_TRUE@ $(NULL) + +@PTHREADS_FALSE@am__append_4 = \ +@PTHREADS_FALSE@ lib/isc/nothreads/condition.c \ +@PTHREADS_FALSE@ lib/isc/nothreads/thread.c \ +@PTHREADS_FALSE@ $(NULL) + +subdir = libntp +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/sntp/libopts/m4/libopts.m4 \ + $(top_srcdir)/sntp/libopts/m4/stdnoreturn.m4 \ + $(top_srcdir)/sntp/m4/ax_c99_struct_init.m4 \ + $(top_srcdir)/sntp/m4/define_dir.m4 \ + $(top_srcdir)/sntp/m4/hms_search_lib.m4 \ + $(top_srcdir)/sntp/m4/libtool.m4 \ + $(top_srcdir)/sntp/m4/ltoptions.m4 \ + $(top_srcdir)/sntp/m4/ltsugar.m4 \ + $(top_srcdir)/sntp/m4/ltversion.m4 \ + $(top_srcdir)/sntp/m4/lt~obsolete.m4 \ + $(top_srcdir)/sntp/m4/ntp_af_unspec.m4 \ + $(top_srcdir)/sntp/m4/ntp_cacheversion.m4 \ + $(top_srcdir)/sntp/m4/ntp_compiler.m4 \ + $(top_srcdir)/sntp/m4/ntp_crosscompile.m4 \ + $(top_srcdir)/sntp/m4/ntp_crypto_rand.m4 \ + $(top_srcdir)/sntp/m4/ntp_debug.m4 \ + $(top_srcdir)/sntp/m4/ntp_dir_sep.m4 \ + $(top_srcdir)/sntp/m4/ntp_facilitynames.m4 \ + $(top_srcdir)/sntp/m4/ntp_harden.m4 \ + $(top_srcdir)/sntp/m4/ntp_ipv6.m4 \ + $(top_srcdir)/sntp/m4/ntp_lib_m.m4 \ + $(top_srcdir)/sntp/m4/ntp_libevent.m4 \ + $(top_srcdir)/sntp/m4/ntp_libntp.m4 \ + $(top_srcdir)/sntp/m4/ntp_lineeditlibs.m4 \ + $(top_srcdir)/sntp/m4/ntp_locinfo.m4 \ + $(top_srcdir)/sntp/m4/ntp_openssl.m4 \ + $(top_srcdir)/sntp/m4/ntp_pkg_config.m4 \ + $(top_srcdir)/sntp/m4/ntp_problemtests.m4 \ + $(top_srcdir)/sntp/m4/ntp_prog_cc.m4 \ + $(top_srcdir)/sntp/m4/ntp_rlimit.m4 \ + $(top_srcdir)/sntp/m4/ntp_sntp.m4 \ + $(top_srcdir)/sntp/m4/ntp_unitytest.m4 \ + $(top_srcdir)/sntp/m4/ntp_ver_suffix.m4 \ + $(top_srcdir)/sntp/m4/ntp_vpathhack.m4 \ + $(top_srcdir)/sntp/m4/openldap-thread-check.m4 \ + $(top_srcdir)/sntp/m4/openldap.m4 \ + $(top_srcdir)/sntp/m4/os_cflags.m4 \ + $(top_srcdir)/sntp/m4/realpath.m4 \ + $(top_srcdir)/sntp/m4/snprintf.m4 \ + $(top_srcdir)/sntp/m4/version.m4 $(top_srcdir)/configure.ac +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(noinst_HEADERS) \ + $(am__DIST_COMMON) +mkinstalldirs = $(install_sh) -d +CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_FILES = +LIBRARIES = $(noinst_LIBRARIES) +ARFLAGS = @ARFLAGS@ +AM_V_AR = $(am__v_AR_@AM_V@) +am__v_AR_ = $(am__v_AR_@AM_DEFAULT_V@) +am__v_AR_0 = @echo " AR " $@; +am__v_AR_1 = +libntp_a_AR = $(AR) $(ARFLAGS) +libntp_a_LIBADD = +am__libntp_a_SOURCES_DIST = systime.c a_md5encrypt.c adjtime.c \ + atoint.c atolfp.c atouint.c audio.c authkeys.c authreadkeys.c \ + authusekey.c bsd_strerror.c buftvtots.c caljulian.c caltontp.c \ + calyearstart.c clocktime.c clocktypes.c decodenetnum.c \ + dofptoa.c dolfptoa.c emalloc.c findconfig.c getopt.c \ + hextoint.c hextolfp.c humandate.c icom.c iosignal.c \ + is_ip_address.c lib_strbuf.c libssl_compat.c machines.c \ + mktime.c modetoa.c mstolfp.c msyslog.c netof.c ntp_calendar.c \ + ntp_calgps.c ntp_crypto_rnd.c ntp_intres.c ntp_libopts.c \ + ntp_lineedit.c ntp_random.c ntp_realpath.c ntp_rfc2553.c \ - ntp_worker.c numtoa.c numtohost.c octtoint.c prettydate.c \ - refidsmear.c recvbuff.c refnumtoa.c snprintf.c socket.c \ - socktoa.c socktohost.c ssl_init.c statestr.c strdup.c \ - strl_obsd.c syssignal.c timespecops.c timetoa.c timevalops.c \ - timexsup.c uglydate.c vint64ops.c work_fork.c work_thread.c \ - xsbprintf.c ymd2yd.c lib/isc/assertions.c lib/isc/buffer.c \ ++ ntp_worker.c numtoa.c octtoint.c prettydate.c refidsmear.c \ ++ recvbuff.c refnumtoa.c snprintf.c socket.c socktoa.c \ ++ socktohost.c ssl_init.c statestr.c strdup.c strl_obsd.c \ ++ syssignal.c timespecops.c timetoa.c timevalops.c timexsup.c \ ++ uglydate.c vint64ops.c work_fork.c work_thread.c xsbprintf.c \ ++ ymd2yd.c lib/isc/assertions.c lib/isc/buffer.c \ + lib/isc/backtrace-emptytbl.c lib/isc/backtrace.c \ + lib/isc/unix/dir.c lib/isc/error.c lib/isc/unix/errno2result.c \ + lib/isc/event.c lib/isc/unix/file.c lib/isc/inet_ntop.c \ + lib/isc/inet_pton.c lib/isc/unix/interfaceiter.c lib/isc/lib.c \ + lib/isc/log.c lib/isc/md5.c lib/isc/nls/msgcat.c \ + lib/isc/unix/net.c lib/isc/netaddr.c lib/isc/netscope.c \ + lib/isc/ondestroy.c lib/isc/random.c lib/isc/result.c \ + lib/isc/unix/stdio.c lib/isc/unix/stdtime.c \ + lib/isc/unix/strerror.c lib/isc/task.c lib/isc/unix/time.c \ + lib/isc/sha1.c lib/isc/sockaddr.c lib/isc/tsmemcmp.c \ + lib/isc/pthreads/condition.c lib/isc/pthreads/mutex.c \ + lib/isc/pthreads/thread.c lib/isc/nothreads/condition.c \ + lib/isc/nothreads/thread.c +am__dirstamp = $(am__leading_dot)dirstamp +am__objects_1 = +@PTHREADS_TRUE@am__objects_2 = lib/isc/pthreads/condition.$(OBJEXT) \ +@PTHREADS_TRUE@ lib/isc/pthreads/mutex.$(OBJEXT) \ +@PTHREADS_TRUE@ lib/isc/pthreads/thread.$(OBJEXT) \ +@PTHREADS_TRUE@ $(am__objects_1) +@PTHREADS_FALSE@am__objects_3 = lib/isc/nothreads/condition.$(OBJEXT) \ +@PTHREADS_FALSE@ lib/isc/nothreads/thread.$(OBJEXT) \ +@PTHREADS_FALSE@ $(am__objects_1) +am__objects_4 = lib/isc/assertions.$(OBJEXT) lib/isc/buffer.$(OBJEXT) \ + lib/isc/backtrace-emptytbl.$(OBJEXT) \ + lib/isc/backtrace.$(OBJEXT) lib/isc/unix/dir.$(OBJEXT) \ + lib/isc/error.$(OBJEXT) lib/isc/unix/errno2result.$(OBJEXT) \ + lib/isc/event.$(OBJEXT) lib/isc/unix/file.$(OBJEXT) \ + lib/isc/inet_ntop.$(OBJEXT) lib/isc/inet_pton.$(OBJEXT) \ + lib/isc/unix/interfaceiter.$(OBJEXT) lib/isc/lib.$(OBJEXT) \ + lib/isc/log.$(OBJEXT) lib/isc/md5.$(OBJEXT) \ + lib/isc/nls/msgcat.$(OBJEXT) lib/isc/unix/net.$(OBJEXT) \ + lib/isc/netaddr.$(OBJEXT) lib/isc/netscope.$(OBJEXT) \ + lib/isc/ondestroy.$(OBJEXT) lib/isc/random.$(OBJEXT) \ + lib/isc/result.$(OBJEXT) lib/isc/unix/stdio.$(OBJEXT) \ + lib/isc/unix/stdtime.$(OBJEXT) lib/isc/unix/strerror.$(OBJEXT) \ + lib/isc/task.$(OBJEXT) lib/isc/unix/time.$(OBJEXT) \ + lib/isc/sha1.$(OBJEXT) lib/isc/sockaddr.$(OBJEXT) \ + lib/isc/tsmemcmp.$(OBJEXT) $(am__objects_1) $(am__objects_2) \ + $(am__objects_3) +am__objects_5 = a_md5encrypt.$(OBJEXT) adjtime.$(OBJEXT) \ + atoint.$(OBJEXT) atolfp.$(OBJEXT) atouint.$(OBJEXT) \ + audio.$(OBJEXT) authkeys.$(OBJEXT) authreadkeys.$(OBJEXT) \ + authusekey.$(OBJEXT) bsd_strerror.$(OBJEXT) \ + buftvtots.$(OBJEXT) caljulian.$(OBJEXT) caltontp.$(OBJEXT) \ + calyearstart.$(OBJEXT) clocktime.$(OBJEXT) \ + clocktypes.$(OBJEXT) decodenetnum.$(OBJEXT) dofptoa.$(OBJEXT) \ + dolfptoa.$(OBJEXT) emalloc.$(OBJEXT) findconfig.$(OBJEXT) \ + getopt.$(OBJEXT) hextoint.$(OBJEXT) hextolfp.$(OBJEXT) \ + humandate.$(OBJEXT) icom.$(OBJEXT) iosignal.$(OBJEXT) \ + is_ip_address.$(OBJEXT) lib_strbuf.$(OBJEXT) \ + libssl_compat.$(OBJEXT) machines.$(OBJEXT) mktime.$(OBJEXT) \ + modetoa.$(OBJEXT) mstolfp.$(OBJEXT) msyslog.$(OBJEXT) \ + netof.$(OBJEXT) ntp_calendar.$(OBJEXT) ntp_calgps.$(OBJEXT) \ + ntp_crypto_rnd.$(OBJEXT) ntp_intres.$(OBJEXT) \ + ntp_libopts.$(OBJEXT) ntp_lineedit.$(OBJEXT) \ + ntp_random.$(OBJEXT) ntp_realpath.$(OBJEXT) \ + ntp_rfc2553.$(OBJEXT) ntp_worker.$(OBJEXT) numtoa.$(OBJEXT) \ - numtohost.$(OBJEXT) octtoint.$(OBJEXT) prettydate.$(OBJEXT) \ - refidsmear.$(OBJEXT) recvbuff.$(OBJEXT) refnumtoa.$(OBJEXT) \ - snprintf.$(OBJEXT) socket.$(OBJEXT) socktoa.$(OBJEXT) \ - socktohost.$(OBJEXT) ssl_init.$(OBJEXT) statestr.$(OBJEXT) \ - strdup.$(OBJEXT) strl_obsd.$(OBJEXT) syssignal.$(OBJEXT) \ - timespecops.$(OBJEXT) timetoa.$(OBJEXT) timevalops.$(OBJEXT) \ - timexsup.$(OBJEXT) uglydate.$(OBJEXT) vint64ops.$(OBJEXT) \ - work_fork.$(OBJEXT) work_thread.$(OBJEXT) xsbprintf.$(OBJEXT) \ - ymd2yd.$(OBJEXT) $(am__objects_4) $(am__objects_1) ++ octtoint.$(OBJEXT) prettydate.$(OBJEXT) refidsmear.$(OBJEXT) \ ++ recvbuff.$(OBJEXT) refnumtoa.$(OBJEXT) snprintf.$(OBJEXT) \ ++ socket.$(OBJEXT) socktoa.$(OBJEXT) socktohost.$(OBJEXT) \ ++ ssl_init.$(OBJEXT) statestr.$(OBJEXT) strdup.$(OBJEXT) \ ++ strl_obsd.$(OBJEXT) syssignal.$(OBJEXT) timespecops.$(OBJEXT) \ ++ timetoa.$(OBJEXT) timevalops.$(OBJEXT) timexsup.$(OBJEXT) \ ++ uglydate.$(OBJEXT) vint64ops.$(OBJEXT) work_fork.$(OBJEXT) \ ++ work_thread.$(OBJEXT) xsbprintf.$(OBJEXT) ymd2yd.$(OBJEXT) \ ++ $(am__objects_4) $(am__objects_1) +am_libntp_a_OBJECTS = systime.$(OBJEXT) $(am__objects_5) +libntp_a_OBJECTS = $(am_libntp_a_OBJECTS) +libntpsim_a_AR = $(AR) $(ARFLAGS) +libntpsim_a_LIBADD = +am__libntpsim_a_SOURCES_DIST = systime_s.c a_md5encrypt.c adjtime.c \ + atoint.c atolfp.c atouint.c audio.c authkeys.c authreadkeys.c \ + authusekey.c bsd_strerror.c buftvtots.c caljulian.c caltontp.c \ + calyearstart.c clocktime.c clocktypes.c decodenetnum.c \ + dofptoa.c dolfptoa.c emalloc.c findconfig.c getopt.c \ + hextoint.c hextolfp.c humandate.c icom.c iosignal.c \ + is_ip_address.c lib_strbuf.c libssl_compat.c machines.c \ + mktime.c modetoa.c mstolfp.c msyslog.c netof.c ntp_calendar.c \ + ntp_calgps.c ntp_crypto_rnd.c ntp_intres.c ntp_libopts.c \ + ntp_lineedit.c ntp_random.c ntp_realpath.c ntp_rfc2553.c \ - ntp_worker.c numtoa.c numtohost.c octtoint.c prettydate.c \ - refidsmear.c recvbuff.c refnumtoa.c snprintf.c socket.c \ - socktoa.c socktohost.c ssl_init.c statestr.c strdup.c \ - strl_obsd.c syssignal.c timespecops.c timetoa.c timevalops.c \ - timexsup.c uglydate.c vint64ops.c work_fork.c work_thread.c \ - xsbprintf.c ymd2yd.c lib/isc/assertions.c lib/isc/buffer.c \ ++ ntp_worker.c numtoa.c octtoint.c prettydate.c refidsmear.c \ ++ recvbuff.c refnumtoa.c snprintf.c socket.c socktoa.c \ ++ socktohost.c ssl_init.c statestr.c strdup.c strl_obsd.c \ ++ syssignal.c timespecops.c timetoa.c timevalops.c timexsup.c \ ++ uglydate.c vint64ops.c work_fork.c work_thread.c xsbprintf.c \ ++ ymd2yd.c lib/isc/assertions.c lib/isc/buffer.c \ + lib/isc/backtrace-emptytbl.c lib/isc/backtrace.c \ + lib/isc/unix/dir.c lib/isc/error.c lib/isc/unix/errno2result.c \ + lib/isc/event.c lib/isc/unix/file.c lib/isc/inet_ntop.c \ + lib/isc/inet_pton.c lib/isc/unix/interfaceiter.c lib/isc/lib.c \ + lib/isc/log.c lib/isc/md5.c lib/isc/nls/msgcat.c \ + lib/isc/unix/net.c lib/isc/netaddr.c lib/isc/netscope.c \ + lib/isc/ondestroy.c lib/isc/random.c lib/isc/result.c \ + lib/isc/unix/stdio.c lib/isc/unix/stdtime.c \ + lib/isc/unix/strerror.c lib/isc/task.c lib/isc/unix/time.c \ + lib/isc/sha1.c lib/isc/sockaddr.c lib/isc/tsmemcmp.c \ + lib/isc/pthreads/condition.c lib/isc/pthreads/mutex.c \ + lib/isc/pthreads/thread.c lib/isc/nothreads/condition.c \ + lib/isc/nothreads/thread.c +am_libntpsim_a_OBJECTS = systime_s.$(OBJEXT) $(am__objects_5) +libntpsim_a_OBJECTS = $(am_libntpsim_a_OBJECTS) +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) +depcomp = $(SHELL) $(top_srcdir)/sntp/libevent/build-aux/depcomp +am__maybe_remake_depfiles = depfiles +am__depfiles_remade = ./$(DEPDIR)/a_md5encrypt.Po \ + ./$(DEPDIR)/adjtime.Po ./$(DEPDIR)/adjtimex.Po \ + ./$(DEPDIR)/atoint.Po ./$(DEPDIR)/atolfp.Po \ + ./$(DEPDIR)/atouint.Po ./$(DEPDIR)/audio.Po \ + ./$(DEPDIR)/authkeys.Po ./$(DEPDIR)/authreadkeys.Po \ + ./$(DEPDIR)/authusekey.Po ./$(DEPDIR)/bsd_strerror.Po \ + ./$(DEPDIR)/buftvtots.Po ./$(DEPDIR)/caljulian.Po \ + ./$(DEPDIR)/caltontp.Po ./$(DEPDIR)/calyearstart.Po \ + ./$(DEPDIR)/clocktime.Po ./$(DEPDIR)/clocktypes.Po \ + ./$(DEPDIR)/decodenetnum.Po ./$(DEPDIR)/dofptoa.Po \ + ./$(DEPDIR)/dolfptoa.Po ./$(DEPDIR)/emalloc.Po \ + ./$(DEPDIR)/findconfig.Po ./$(DEPDIR)/getopt.Po \ + ./$(DEPDIR)/hextoint.Po ./$(DEPDIR)/hextolfp.Po \ + ./$(DEPDIR)/humandate.Po ./$(DEPDIR)/icom.Po \ + ./$(DEPDIR)/iosignal.Po ./$(DEPDIR)/is_ip_address.Po \ + ./$(DEPDIR)/lib_strbuf.Po ./$(DEPDIR)/libssl_compat.Po \ + ./$(DEPDIR)/machines.Po ./$(DEPDIR)/mktime.Po \ + ./$(DEPDIR)/modetoa.Po ./$(DEPDIR)/mstolfp.Po \ + ./$(DEPDIR)/msyslog.Po ./$(DEPDIR)/netof.Po \ + ./$(DEPDIR)/ntp_calendar.Po ./$(DEPDIR)/ntp_calgps.Po \ + ./$(DEPDIR)/ntp_crypto_rnd.Po ./$(DEPDIR)/ntp_intres.Po \ + ./$(DEPDIR)/ntp_libopts.Po ./$(DEPDIR)/ntp_lineedit.Po \ + ./$(DEPDIR)/ntp_random.Po ./$(DEPDIR)/ntp_realpath.Po \ + ./$(DEPDIR)/ntp_rfc2553.Po ./$(DEPDIR)/ntp_worker.Po \ - ./$(DEPDIR)/numtoa.Po ./$(DEPDIR)/numtohost.Po \ - ./$(DEPDIR)/octtoint.Po ./$(DEPDIR)/prettydate.Po \ - ./$(DEPDIR)/recvbuff.Po ./$(DEPDIR)/refidsmear.Po \ - ./$(DEPDIR)/refnumtoa.Po ./$(DEPDIR)/snprintf.Po \ - ./$(DEPDIR)/socket.Po ./$(DEPDIR)/socktoa.Po \ - ./$(DEPDIR)/socktohost.Po ./$(DEPDIR)/ssl_init.Po \ - ./$(DEPDIR)/statestr.Po ./$(DEPDIR)/strdup.Po \ - ./$(DEPDIR)/strl_obsd.Po ./$(DEPDIR)/syssignal.Po \ - ./$(DEPDIR)/systime.Po ./$(DEPDIR)/systime_s.Po \ - ./$(DEPDIR)/timespecops.Po ./$(DEPDIR)/timetoa.Po \ - ./$(DEPDIR)/timevalops.Po ./$(DEPDIR)/timexsup.Po \ - ./$(DEPDIR)/uglydate.Po ./$(DEPDIR)/vint64ops.Po \ - ./$(DEPDIR)/work_fork.Po ./$(DEPDIR)/work_thread.Po \ - ./$(DEPDIR)/xsbprintf.Po ./$(DEPDIR)/ymd2yd.Po \ - lib/isc/$(DEPDIR)/assertions.Po \ ++ ./$(DEPDIR)/numtoa.Po ./$(DEPDIR)/octtoint.Po \ ++ ./$(DEPDIR)/prettydate.Po ./$(DEPDIR)/recvbuff.Po \ ++ ./$(DEPDIR)/refidsmear.Po ./$(DEPDIR)/refnumtoa.Po \ ++ ./$(DEPDIR)/snprintf.Po ./$(DEPDIR)/socket.Po \ ++ ./$(DEPDIR)/socktoa.Po ./$(DEPDIR)/socktohost.Po \ ++ ./$(DEPDIR)/ssl_init.Po ./$(DEPDIR)/statestr.Po \ ++ ./$(DEPDIR)/strdup.Po ./$(DEPDIR)/strl_obsd.Po \ ++ ./$(DEPDIR)/syssignal.Po ./$(DEPDIR)/systime.Po \ ++ ./$(DEPDIR)/systime_s.Po ./$(DEPDIR)/timespecops.Po \ ++ ./$(DEPDIR)/timetoa.Po ./$(DEPDIR)/timevalops.Po \ ++ ./$(DEPDIR)/timexsup.Po ./$(DEPDIR)/uglydate.Po \ ++ ./$(DEPDIR)/vint64ops.Po ./$(DEPDIR)/work_fork.Po \ ++ ./$(DEPDIR)/work_thread.Po ./$(DEPDIR)/xsbprintf.Po \ ++ ./$(DEPDIR)/ymd2yd.Po lib/isc/$(DEPDIR)/assertions.Po \ + lib/isc/$(DEPDIR)/backtrace-emptytbl.Po \ + lib/isc/$(DEPDIR)/backtrace.Po lib/isc/$(DEPDIR)/buffer.Po \ + lib/isc/$(DEPDIR)/error.Po lib/isc/$(DEPDIR)/event.Po \ + lib/isc/$(DEPDIR)/inet_ntop.Po lib/isc/$(DEPDIR)/inet_pton.Po \ + lib/isc/$(DEPDIR)/lib.Po lib/isc/$(DEPDIR)/log.Po \ + lib/isc/$(DEPDIR)/md5.Po lib/isc/$(DEPDIR)/netaddr.Po \ + lib/isc/$(DEPDIR)/netscope.Po lib/isc/$(DEPDIR)/ondestroy.Po \ + lib/isc/$(DEPDIR)/random.Po lib/isc/$(DEPDIR)/result.Po \ + lib/isc/$(DEPDIR)/sha1.Po lib/isc/$(DEPDIR)/sockaddr.Po \ + lib/isc/$(DEPDIR)/task.Po lib/isc/$(DEPDIR)/tsmemcmp.Po \ + lib/isc/nls/$(DEPDIR)/msgcat.Po \ + lib/isc/nothreads/$(DEPDIR)/condition.Po \ + lib/isc/nothreads/$(DEPDIR)/thread.Po \ + lib/isc/pthreads/$(DEPDIR)/condition.Po \ + lib/isc/pthreads/$(DEPDIR)/mutex.Po \ + lib/isc/pthreads/$(DEPDIR)/thread.Po \ + lib/isc/unix/$(DEPDIR)/dir.Po \ + lib/isc/unix/$(DEPDIR)/errno2result.Po \ + lib/isc/unix/$(DEPDIR)/file.Po \ + lib/isc/unix/$(DEPDIR)/interfaceiter.Po \ + lib/isc/unix/$(DEPDIR)/net.Po lib/isc/unix/$(DEPDIR)/stdio.Po \ + lib/isc/unix/$(DEPDIR)/stdtime.Po \ + lib/isc/unix/$(DEPDIR)/strerror.Po \ + lib/isc/unix/$(DEPDIR)/time.Po +am__mv = mv -f +COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +am__v_lt_1 = +LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = +CCLD = $(CC) +LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = +SOURCES = $(libntp_a_SOURCES) $(EXTRA_libntp_a_SOURCES) \ + $(libntpsim_a_SOURCES) +DIST_SOURCES = $(am__libntp_a_SOURCES_DIST) $(EXTRA_libntp_a_SOURCES) \ + $(am__libntpsim_a_SOURCES_DIST) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac +HEADERS = $(noinst_HEADERS) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` +am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depsver.mf \ + $(top_srcdir)/includes.mf \ + $(top_srcdir)/sntp/libevent/build-aux/depcomp README +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +ALLOCA = @ALLOCA@ +AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ +AR = @AR@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +BUILD_THREAD = @BUILD_THREAD@ +CALC_TICKADJ_DB = @CALC_TICKADJ_DB@ +CALC_TICKADJ_DL = @CALC_TICKADJ_DL@ +CALC_TICKADJ_DS = @CALC_TICKADJ_DS@ +CALC_TICKADJ_MS = @CALC_TICKADJ_MS@ +CALC_TICKADJ_NI = @CALC_TICKADJ_NI@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CC_NOFORMAT = @CC_NOFORMAT@ +CFLAGS = @CFLAGS@ +CFLAGS_LIBEVENT = @CFLAGS_LIBEVENT@ +CFLAGS_NTP = @CFLAGS_NTP@ +CHUTEST = @CHUTEST@ +CONFIG_SHELL = @CONFIG_SHELL@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CPPFLAGS_LIBEVENT = @CPPFLAGS_LIBEVENT@ +CPPFLAGS_NTP = @CPPFLAGS_NTP@ +CSCOPE = @CSCOPE@ +CTAGS = @CTAGS@ +CYGPATH_W = @CYGPATH_W@ +DCFD = @DCFD@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +DLLTOOL = @DLLTOOL@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EDITLINE_LIBS = @EDITLINE_LIBS@ +EGREP = @EGREP@ +ETAGS = @ETAGS@ +EXEEXT = @EXEEXT@ +FGREP = @FGREP@ +GREP = @GREP@ +HAVE_INLINE = @HAVE_INLINE@ +HAVE_LEAPSMEARINTERVAL = @HAVE_LEAPSMEARINTERVAL@ +HAVE_RLIMIT_MEMLOCK = @HAVE_RLIMIT_MEMLOCK@ +HAVE_RLIMIT_STACK = @HAVE_RLIMIT_STACK@ +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LD = @LD@ +LDADD_LIBEVENT = @LDADD_LIBEVENT@ +LDADD_LIBNTP = @LDADD_LIBNTP@ +LDADD_LIBUTIL = @LDADD_LIBUTIL@ +LDADD_NLIST = @LDADD_NLIST@ +LDADD_NTP = @LDADD_NTP@ +LDFLAGS = @LDFLAGS@ +LDFLAGS_NTP = @LDFLAGS_NTP@ +LIBISC_PTHREADS_NOTHREADS = @LIBISC_PTHREADS_NOTHREADS@ +LIBM = @LIBM@ +LIBOBJS = @LIBOBJS@ +LIBOPTS_CFLAGS = @LIBOPTS_CFLAGS@ +LIBOPTS_DIR = @LIBOPTS_DIR@ +LIBOPTS_LDADD = @LIBOPTS_LDADD@ +LIBPARSE = @LIBPARSE@ +LIBS = @LIBS@ +LIBTOOL = @LIBTOOL@ +LIBTOOL_DEPS = @LIBTOOL_DEPS@ +LIPO = @LIPO@ +LN_S = @LN_S@ +LSCF = @LSCF@ +LTHREAD_LIBS = @LTHREAD_LIBS@ +LTLIBOBJS = @LTLIBOBJS@ +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ +MAKEINFO = @MAKEINFO@ +MAKE_ADJTIMED = @MAKE_ADJTIMED@ +MAKE_CHECK_LAYOUT = @MAKE_CHECK_LAYOUT@ +MAKE_CHECK_Y2K = @MAKE_CHECK_Y2K@ +MAKE_LIBNTPSIM = @MAKE_LIBNTPSIM@ +MAKE_LIBPARSE = @MAKE_LIBPARSE@ +MAKE_LIBPARSE_KERNEL = @MAKE_LIBPARSE_KERNEL@ +MAKE_NTPDSIM = @MAKE_NTPDSIM@ +MAKE_NTPSNMPD = @MAKE_NTPSNMPD@ +MAKE_NTPTIME = @MAKE_NTPTIME@ +MAKE_PARSEKMODULE = @MAKE_PARSEKMODULE@ +MAKE_TICKADJ = @MAKE_TICKADJ@ +MAKE_TIMETRIM = @MAKE_TIMETRIM@ +MANIFEST_TOOL = @MANIFEST_TOOL@ +MANTAGFMT = @MANTAGFMT@ +MKDIR_P = @MKDIR_P@ +NM = @NM@ +NMEDIT = @NMEDIT@ +NTPDATE_DB = @NTPDATE_DB@ +NTPDATE_DL = @NTPDATE_DL@ +NTPDATE_DS = @NTPDATE_DS@ +NTPDATE_MS = @NTPDATE_MS@ +NTPDATE_NI = @NTPDATE_NI@ +NTPDC_DB = @NTPDC_DB@ +NTPDC_DL = @NTPDC_DL@ +NTPDC_DS = @NTPDC_DS@ +NTPDC_MS = @NTPDC_MS@ +NTPDC_NI = @NTPDC_NI@ +NTPDSIM_DB = @NTPDSIM_DB@ +NTPDSIM_DL = @NTPDSIM_DL@ +NTPDSIM_DS = @NTPDSIM_DS@ +NTPDSIM_MS = @NTPDSIM_MS@ +NTPDSIM_NI = @NTPDSIM_NI@ +NTPD_DB = @NTPD_DB@ +NTPD_DL = @NTPD_DL@ +NTPD_DS = @NTPD_DS@ +NTPD_MS = @NTPD_MS@ +NTPD_NI = @NTPD_NI@ +NTPQ_DB = @NTPQ_DB@ +NTPQ_DL = @NTPQ_DL@ +NTPQ_DS = @NTPQ_DS@ +NTPQ_MS = @NTPQ_MS@ +NTPQ_NI = @NTPQ_NI@ +NTPSNMPD_DB = @NTPSNMPD_DB@ +NTPSNMPD_DL = @NTPSNMPD_DL@ +NTPSNMPD_DS = @NTPSNMPD_DS@ +NTPSNMPD_MS = @NTPSNMPD_MS@ +NTPSNMPD_NI = @NTPSNMPD_NI@ +NTPSWEEP_DB = @NTPSWEEP_DB@ +NTPSWEEP_DL = @NTPSWEEP_DL@ +NTPSWEEP_DS = @NTPSWEEP_DS@ +NTPSWEEP_MS = @NTPSWEEP_MS@ +NTPSWEEP_NI = @NTPSWEEP_NI@ +NTPTIME_DB = @NTPTIME_DB@ +NTPTIME_DL = @NTPTIME_DL@ +NTPTIME_DS = @NTPTIME_DS@ +NTPTIME_MS = @NTPTIME_MS@ +NTPTIME_NI = @NTPTIME_NI@ +NTPTRACE_DB = @NTPTRACE_DB@ +NTPTRACE_DL = @NTPTRACE_DL@ +NTPTRACE_DS = @NTPTRACE_DS@ +NTPTRACE_MS = @NTPTRACE_MS@ +NTPTRACE_NI = @NTPTRACE_NI@ +NTP_HARD_CFLAGS = @NTP_HARD_CFLAGS@ +NTP_HARD_CPPFLAGS = @NTP_HARD_CPPFLAGS@ +NTP_HARD_LDFLAGS = @NTP_HARD_LDFLAGS@ +NTP_KEYGEN_DB = @NTP_KEYGEN_DB@ +NTP_KEYGEN_DL = @NTP_KEYGEN_DL@ +NTP_KEYGEN_DS = @NTP_KEYGEN_DS@ +NTP_KEYGEN_MS = @NTP_KEYGEN_MS@ +NTP_KEYGEN_NI = @NTP_KEYGEN_NI@ +NTP_KEYSDIR = @NTP_KEYSDIR@ *** 7236 LINES SKIPPED *** From nobody Mon May 27 06:33: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 4Vnm7G2WXhz5Lbwh; Mon, 27 May 2024 06:33: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 4Vnm7G1Ynhz4Kr4; Mon, 27 May 2024 06:33:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716791610; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3p7brPFkzfbKZ8ZuQjvaFXhf72uC6hiUsxn6ljaDO+Y=; b=nNKqu5sKyuWD9nS/bzwO2eKiR7TW2oIcbbLSGwA6unrgsvLpfTXr5LBkoboIP0GFJamh+z /HU24i3Ks4bzx/eVT7jSriHN8XBMmi2AMXcs8Nc00rl9t330o2scIMtd7P10ZjBKSvFqjP R97K/a+PotuUoXLB8BUZ84nYriBMqAefdWbIphV3kVPHN9Vrns+6Hy315d/ry7TLdQRq/E QV2n+y27qn/1ji6RgcjgXtPbTRtemYG7pPjJE40za0juAZGQe+bWd8FXLZr5OK4nZWYDMr u+HkTn0BYmWZyYQmjZ1EQxUObeK7wG457HPzm24H4isRDGFZ7BRvF3KekSJ/tQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1716791610; a=rsa-sha256; cv=none; b=F6IYNaCbzFFurSo1HqH0FiVpucPMB4T9GSLpWrBB2tfkUNx09CbL2Wp6SyuQEwcRILtvEu Ij9m1AQdO0Vpb+7yS73iXa+lOkDKF/VUQN5c2pP+oK7W26Q0k+W/dOnc6ZnXFRAn7zXIGC R0tj9m5kyx4fSgjg6VMF7xfgVBW5mji/h6OxfxnvGz8g3n3N7PDQOh8y+ZmPowd3RB/AJ4 vindxrMpzu7yYZuSpieVCPRya81M40cIfyY+MlKvLryTdIGLlSF4PFigO46JTIC9xNWNie GcgTOb0ZfVa3VQDcdimy3kjkOPkoUJCT/2cyMQGFueT6Z9WxpcZ7c9/KoHhVIg== 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=1716791610; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3p7brPFkzfbKZ8ZuQjvaFXhf72uC6hiUsxn6ljaDO+Y=; b=eYfxKO2zDh6i9Pq5eyMhMFoowLJB77STYvKtQTmxacA0JnxlFbGfi3qJooakikVDnETPGz emDGMwlF5O0NehODLzYafpqZILyX97Y7aKQ4cAdG/4PVdmZGFP4e+rUx7l9oFgIbx/DPTj lwSvfyfjxEENrZOuYrZRxW0zftJ7EGTDEHVs8b/6Du2uQQhPPMDo2I4DntTuLq4C/GaInx yFchIZlnXSrv/pGQD25H/eplH0izpLmOC4QwDngUJ0Oey3iHwAELKGgp1FnWqUdq02HUh2 6iSS0w0Dk0oNT52E4l2ph8HZIscw1j6lrDgEXdObJcHqIGeGpuRuuBrAxNwXqw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Vnm7G14phzZ35; Mon, 27 May 2024 06:33: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 44R6XUh1095978; Mon, 27 May 2024 06:33:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44R6XUQX095975; Mon, 27 May 2024 06:33:30 GMT (envelope-from git) Date: Mon, 27 May 2024 06:33:30 GMT Message-Id: <202405270633.44R6XUQX095975@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: cca0ce62f367 - main - pam_xdg: pam_get_item can return NULL List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: cca0ce62f367d03ed429bf99e41e6aca8cb7f2ac Auto-Submitted: auto-generated The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=cca0ce62f367d03ed429bf99e41e6aca8cb7f2ac commit cca0ce62f367d03ed429bf99e41e6aca8cb7f2ac Author: Andre Albsmeier AuthorDate: 2024-05-27 06:31:34 +0000 Commit: Emmanuel Vadot CommitDate: 2024-05-27 06:33:14 +0000 pam_xdg: pam_get_item can return NULL Fix pam_xdg as pam_get_item can return NULL, this happens when pressing control + C in xdm for example. MFC after: 1 week PR: 279268 --- lib/libpam/modules/pam_xdg/pam_xdg.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/libpam/modules/pam_xdg/pam_xdg.c b/lib/libpam/modules/pam_xdg/pam_xdg.c index 4d586a21566a..2c80f0a0332f 100644 --- a/lib/libpam/modules/pam_xdg/pam_xdg.c +++ b/lib/libpam/modules/pam_xdg/pam_xdg.c @@ -67,7 +67,7 @@ _pam_xdg_open(pam_handle_t *pamh, int flags __unused, /* Get user info */ rv = pam_get_item(pamh, PAM_USER, (const void **)&user); - if (rv != PAM_SUCCESS) { + if (rv != PAM_SUCCESS || user == NULL) { PAM_VERBOSE_ERROR("Can't get user information"); goto out; } @@ -221,7 +221,7 @@ _pam_xdg_close(pam_handle_t *pamh __unused, int flags __unused, /* Get user info */ rv = pam_get_item(pamh, PAM_USER, (const void **)&user); - if (rv != PAM_SUCCESS) { + if (rv != PAM_SUCCESS || user == NULL) { PAM_VERBOSE_ERROR("Can't get user information"); goto out; } From nobody Mon May 27 09:20: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 4VnqqV0lBKz5LvPM; Mon, 27 May 2024 09:20: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 4VnqqV0FTbz4Zm3; Mon, 27 May 2024 09:20:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716801606; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vA1jKA4K7YiK3n3BM6VU20qZTTGWy8bEDVXyEIK+WK8=; b=ZIuhq4PKVbVC55ZRzOgP0tL6OXq7KX7lnUnzxicHXgn9itpCsLj8wK/fTm4vhSoPmhKbdt yyYO1slAG6YkBSbPHppnXFH/mhkRsE43MOYeey/yYDiSBM15DG2cEYeGQmqt4gnnV0QZd1 QUQhducus9FXepnC7tj67gr4Fesk87dRZodLR0Tx1/JLnoRustXmUCd/+za3cFb3oyk4Fg FYji433KxDiahLK+KmpT40YnfcXoOjR3Pd94ZeJztyKALAigiwBKEBfhyz6OdeielSLVXe oNufHnpqhf5BhnNxA47TrCt7L2UbbFAd4ynv+FeefTdMD3zspJIaHSI05RgjBQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1716801606; a=rsa-sha256; cv=none; b=Vym7qJ3n2q91RXuCuDze2sjMHKTPiVksG5Ub1NO09IhFBMy3EDbbCt5qgFdnpCaPFtI7r2 sRsSTWQnMc4BXQ3Bs1SZnsOzG/cj7N8T1GH+Mz/jyA3FpaftQtKw5Tu8EfGOuIhcRYGQkF knpTlV5q4jd3lxOZwlSGVKwoM3KnqZWN0eJB5WLiNpMJqVzdubWImCnMBKnsKxFfGhn8R3 PdQyW7y/OzgsHhNbHQt4NpqLfGaUFvqEJ2IZtv90l8wUmeiIKW8IrlfMwfZ1KgRMuvKcGi 3kN124U8+JQ2P+WTtGH8WUm2NEHJYIBY/GsElcBLg3Y5RRJb+KKG/Iy1VNJTLA== 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=1716801606; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vA1jKA4K7YiK3n3BM6VU20qZTTGWy8bEDVXyEIK+WK8=; b=eX7hI/5+HynglQUw4r9Mdd9bGtClIZKd59XuW7Hky4huGAnoyd3/YM6mTHuyaC5fDtXcIw 2/0qHAZXOiap+t3hVi+Ect/Z7H/vK1wg+ocjkbOEG6Zm/79MTc/UrA/1EhLkkKUQX6HH06 G0Vty5d5UEhBAs2nMnOrTeIQXtii7MJw+UezaDE9ZAQjb+SbVLwubjaykBmDPZ8zGdUBFS u3t03TGFG6N+u23/zsJ88RUQb9pBuNjKbRc2p0RA/lVDx5hlCgQUmYBT+Q5lmvG/Z7Huz3 Dm2/1Gcm9AX1kZWUbjIPLjBgOUgRWilqNbQSIK8iRgP9ooJmFEl0rp50jgffGg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VnqqT6ycWzdgC; Mon, 27 May 2024 09:20: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 44R9K5CE069756; Mon, 27 May 2024 09:20:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44R9K53l069751; Mon, 27 May 2024 09:20:05 GMT (envelope-from git) Date: Mon, 27 May 2024 09:20:05 GMT Message-Id: <202405270920.44R9K53l069751@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Cy Schubert Subject: git: 018a4ab7b04d - main - ntp: Update version strings List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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/main X-Git-Reftype: branch X-Git-Commit: 018a4ab7b04deb0710743533f2b799d68b406f85 Auto-Submitted: auto-generated The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=018a4ab7b04deb0710743533f2b799d68b406f85 commit 018a4ab7b04deb0710743533f2b799d68b406f85 Author: Cy Schubert AuthorDate: 2024-05-27 09:12:49 +0000 Commit: Cy Schubert CommitDate: 2024-05-27 09:19:51 +0000 ntp: Update version strings Reported by: "Herbert J. Skuhra" MFC after: 3 days Fixes: f5f40dd63bc7 --- usr.sbin/ntp/config.h | 4 ++-- usr.sbin/ntp/scripts/mkver | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/usr.sbin/ntp/config.h b/usr.sbin/ntp/config.h index 2e5eea82ff29..3d6a1364dd10 100644 --- a/usr.sbin/ntp/config.h +++ b/usr.sbin/ntp/config.h @@ -1494,7 +1494,7 @@ #define PACKAGE_NAME "ntp" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "ntp 4.2.8p18-RC1" +#define PACKAGE_STRING "ntp 4.2.8p18" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "ntp" @@ -1768,7 +1768,7 @@ typedef unsigned int uintptr_t; /* #undef USE_UDP_SIGPOLL */ /* Version number of package */ -#define VERSION "4.2.8p18-RC1" +#define VERSION "4.2.8p18" /* vsnprintf expands "%m" to strerror(errno) */ #define VSNPRINTF_PERCENT_M 1 diff --git a/usr.sbin/ntp/scripts/mkver b/usr.sbin/ntp/scripts/mkver index 279468a1af1c..2336dd71bacb 100755 --- a/usr.sbin/ntp/scripts/mkver +++ b/usr.sbin/ntp/scripts/mkver @@ -7,7 +7,7 @@ PROG=${1-UNKNOWN} ConfStr="$PROG" -ConfStr="$ConfStr 4.2.8p16" +ConfStr="$ConfStr 4.2.8p18" case "$CSET" in '') ;; From nobody Mon May 27 11:18: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 4VntS43n4Kz5M6cq; Mon, 27 May 2024 11:18:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VntS439nZz4mNj; Mon, 27 May 2024 11:18:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716808708; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gIo5m7xgAwuAj1TVLtZSUZAynKIJk3K5WTcgBh2YCBY=; b=ga5MY9eioE9BHi4WGBVLHls0nl5x+E9Q1ovHBBM0MB6pA1TJimMq8BPY52ow8jKZCCV4wd q2YVOVx8in7McwU2IaT0dZ+JBTB+gtctozPDFAU+HequbvKnL8btj61KT6j1mgJop0GS8+ e4ofEccL2vGkX15BVWjxaneYOaKDYy9Qpi6vm4ZXnrVdo7d97c/bVeFbRE5VQALzk8q2mv s4qTXLl7a49fELEJIzQcCC9mH8PuAOa9i5PiAifDQL9ZqABSmgS+3+X3VHuDYWsq4PZDz2 1spGWnf3mLQAbAY9hCnYelIy8qW5f65WSFhXvb0QLvdMwFbop8bysBUPe7vhEg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1716808708; a=rsa-sha256; cv=none; b=gb4fXDskKOSXCTeIqy0gFs/hzIbdDcpl+4wHBdPJRmDgzXKVUQKhX3p9iCh0zIqQ5+73GL Gw2OewmogK3JPeMfvFZI95jW5N56bcgCVpr0Q0qYRbSc1LUgnPkFV8ScxiXWiVo/VYL4+6 mElqjDunSEvw+vYA8Nx2reh1kAgzcOGSX2vJYNwVOLrOsW43uA9C8AznPt11H2EOYZxH44 PttuQXN4REgjxTC3xlDNDg96XPdGfebOnSEEdyOffuNx0M3qblBQzxyIrarma9vRufq44V yI48idG6fgncAsYxOveRY36k7uocVwVxfelzsugBXZySvUtvnddw9hzcwc8VrQ== 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=1716808708; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gIo5m7xgAwuAj1TVLtZSUZAynKIJk3K5WTcgBh2YCBY=; b=FdHUjJ5+KgRvcPQLuuq0Peu61wK//pqOtqDEVVy/bRY/XFyNydE64/VScCK5yNnFQd1FYe Bk5vDrBZR48bDPOeg/iAn81pg6mFsqx19Xjn7KjbidWBVEQH3NwCrw2oGK8FK+fAwPcA5c D+8PtQPlz6rPe2gHlRfWsYoonSnXcCvr+Eb4Demj19dn5FCpEkV3GZ2fVp/bvIXRY8rjTN OZ/QHziqOwdu08/cMegK37kw11/9a6MQRkxBcTO59poOdi935lvHF+nNLaXgCQe39O6zt5 s/YZ+9p5dLwWyfAlZmFXEoTYt8X2SrmvlZSBdCpoyGnjEmW7ysS5Hbjq2fXMPg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VntS42n9xzj5j; Mon, 27 May 2024 11:18:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44RBIS6C068665; Mon, 27 May 2024 11:18:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44RBISU3068662; Mon, 27 May 2024 11:18:28 GMT (envelope-from git) Date: Mon, 27 May 2024 11:18:28 GMT Message-Id: <202405271118.44RBISU3068662@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mariusz Zaborski Subject: git: e24ff5c99be0 - main - libcapsicum: cache more time zone information List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: oshogbo X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e24ff5c99be080007ff9086398fbe3ef56cd94dc Auto-Submitted: auto-generated The branch main has been updated by oshogbo: URL: https://cgit.FreeBSD.org/src/commit/?id=e24ff5c99be080007ff9086398fbe3ef56cd94dc commit e24ff5c99be080007ff9086398fbe3ef56cd94dc Author: Mariusz Zaborski AuthorDate: 2024-05-27 11:17:03 +0000 Commit: Mariusz Zaborski CommitDate: 2024-05-27 11:17:34 +0000 libcapsicum: cache more time zone information The functions like gmtime(3) expect to cache a GMT time zone. Some sandboxed programs (like last(1)) use the gmtime(3) function. In case of last(1), this function fails to load a proper time zone because it is called after entering the capability mode. _open () at _open.S:4 0x00000008011bc5a8 in tzloadbody (name=0x8018b9580 "/usr/share/zoneinfo/Etc/UTC", sp=0x801870140, tzload (name=, sp=0x801870140, doextend=true) 0x00000008011bb8ba in gmtload (sp=0x801870140) at /usr/src/contrib/tzcode/localtime.c:1456 gmtcheck () at /usr/src/contrib/tzcode/localtime.c:1581 0x000000080111f85a in _libc_once (once_control=0x80127c550, init_routine=0x0) _once (once_control=0x80127c550, init_routine=0x0) at /usr/src/lib/libc/gen/_once_stub.c:63 0x00000008011bb9d0 in gmtime_r (timep=0x7fffffffe3a8, tmp=0x80127c568) gmtime (timep=timep@entry=0x7fffffffe3a8) at /usr/src/contrib/tzcode/localtime.c:1865 0x0000000001024cd4 in printentry (bp=bp@entry=0x8018b4800, tt=tt@entry=0x80186a0a0) 0x00000000010245ae in doentry (bp=0x8018b4800) 0x00000000010243a7 in main (argc=1, argv=) This time zone is not loaded by the tzset(3) function. Because of that, extend the caph_cache_tzdata(3) function to also include the GMT time zone. There is no other way to cache this data than calling gmtime(3) once. MFC after: 5 days Reviewed by: emaste, markj Differential Revision: https://reviews.freebsd.org/D45297 --- lib/libcapsicum/capsicum_helpers.h | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/lib/libcapsicum/capsicum_helpers.h b/lib/libcapsicum/capsicum_helpers.h index f137ec1806f9..a6c696aa9a8e 100644 --- a/lib/libcapsicum/capsicum_helpers.h +++ b/lib/libcapsicum/capsicum_helpers.h @@ -133,8 +133,17 @@ caph_limit_stdio(void) static __inline void caph_cache_tzdata(void) { + time_t delta; tzset(); + + /* + * The tzset() function does not cache all time zones. + * Some functions, such as gmtime(), require a GMT time zone. + * The only way to cache them is to call the function directly. + */ + delta = 0; + (void)gmtime(&delta); } static __inline void From nobody Mon May 27 11:30:40 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Vntk85dvFz5M7jH; Mon, 27 May 2024 11:30:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Vntk850hdz4nY3; Mon, 27 May 2024 11:30:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716809440; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CiOLyfvKVIuBFqw+yqnVuv/inF/kNGMpIBi4dkcekoU=; b=LGLm1EoedINGIzB82gV0wCbA693FFxK7q/aPV4X36lUOQtXsito6onUpFRFOBxD3ckdSDq bQqXZGFNKQUUKtckzTW9nQPYePurOyPG2Ac2EHsMqJE+x39rXUBpQ2umx6eyctNYc5QMrs 5Q4EfLO/l8JzLF86W7eqn7ysCPa0QxVuO3d+KtsC12rlW9b1BF/7Fj097quQjibJWEDgpG bXa0C2ppe6LJLGlKryX55l/UTKcqirMIz6h9oc7uHYobKCS6jEzjTYw01U5kXYK+WHKyTn fNrIbqyfggOSGRCYN7vMcLPI3dcd2igPffyfrda7JI3XJcxzGm57UW3u4FsC8A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1716809440; a=rsa-sha256; cv=none; b=GY7G+NC4Zi3Qw+01Awwvv4ZdP0kRPKSFrOUAJU3qA09rfeRODMIJ6dId6w+TJQEF8KOxxq HsPWc9UTBP4dvEAKs7kNCfVoophuvVRUc+vOIEN0vLng4s1KisQ0C7HBd0ofDqM+oJw0Wf tylK3PyVOMI6p+OJcqHcPeclrzKlW0Tcm7hW+ooLPpSETc9rKI4EVv3TwJ1N96mxtmKxB1 U8A/5/Xx/HHQMPnP9RGu1dAIXNAHXZT1aAQZwqCyVgUZZM0EWkoVCCYjxk55ch1c6tn/gz TCjcvn3cPVQHK3N+lNSLKDRU4ReP3FPgSjw3RDCI6Om6t1GoFGVI7aYj7Ipa7Q== 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=1716809440; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CiOLyfvKVIuBFqw+yqnVuv/inF/kNGMpIBi4dkcekoU=; b=ho390K2MNplyx1m/kaAMzacaA6VxPDYelXSA10h7BtpqRTTfjEG9nlAVvzSKF6PZFcoliU ZjN/uFbp5f7h345LTB4fhH0qcbIV5EYWHLo5UvJzzEa5/ey74cy5vHCcJ3YPCB0QDgbg+H 9BVb7Bla/7LYBxUdVCtrQ0qOPMD4PobHdl8qIoNiY9omUr/Pd4f5GexkhkeLOOJk0pPGbx /qJhbSV/hVkBXlPo8wYH9ZJYCxt09KgL1/lVJcuRymGUY4G4mlPzy+jTuBArQ8ytmmAnx2 qQbbD1c3LCraYavhPgw/Tph4yxHsOoyYZ8PwYCTl+0VWh4xwVfEeLupbSYDqww== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Vntk84WHLzj2P; Mon, 27 May 2024 11:30: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 44RBUeX0094704; Mon, 27 May 2024 11:30:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44RBUeIC094701; Mon, 27 May 2024 11:30:40 GMT (envelope-from git) Date: Mon, 27 May 2024 11:30:40 GMT Message-Id: <202405271130.44RBUeIC094701@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mariusz Zaborski Subject: git: 3f9359a5aa87 - stable/14 - syscalls.master: allow vfork(2) in capsicum(4) capability mode List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: oshogbo X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 3f9359a5aa87acc38942cb0b61c366c0f9ce8aa9 Auto-Submitted: auto-generated The branch stable/14 has been updated by oshogbo: URL: https://cgit.FreeBSD.org/src/commit/?id=3f9359a5aa87acc38942cb0b61c366c0f9ce8aa9 commit 3f9359a5aa87acc38942cb0b61c366c0f9ce8aa9 Author: Edward Tomasz Napierala AuthorDate: 2024-05-13 14:10:01 +0000 Commit: Mariusz Zaborski CommitDate: 2024-05-27 11:29:38 +0000 syscalls.master: allow vfork(2) in capsicum(4) capability mode There is no reason not do do this, we already allow fork(2), and I need vfork(2) for CHERI process colocation. Reviewed by: brooks, emaste, oshogbo MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D39829 (cherry picked from commit 050555e129789fa2e20eba565f1320936b3d66e4) --- sys/kern/syscalls.master | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/kern/syscalls.master b/sys/kern/syscalls.master index a50d7723378c..4b8973c4b882 100644 --- a/sys/kern/syscalls.master +++ b/sys/kern/syscalls.master @@ -498,7 +498,7 @@ int flags ); } -66 AUE_VFORK STD { +66 AUE_VFORK STD|CAPENABLED { int vfork(void); } 67 AUE_NULL OBSOL vread From nobody Mon May 27 11:30:41 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Vntk965yXz5M7ZV; Mon, 27 May 2024 11:30:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Vntk95VYJz4mxj; Mon, 27 May 2024 11:30:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716809441; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jztDZi//A0Qlatza3W9GIgo312DaUrd7gfuAUAEbzfs=; b=LHF1qkJw2jnwicmsk7hPZHQb+O7rzNys9vjOHRSh9BZIuDSgIPudMWMin2uP9AAmPLs6/M 0gfhX9o3HbkASXuks15nvcuMQGXSx+cNhctT9jpLlDOAzo7W+ZNKNMhLldOLWf/TNcS/Ls sVnNr7U8+AmvV4J0Yhe1nmQq6C8ERVYLxZuwJCnRO1J/M8sHIIbMN/pteIPWv8njqHKENO iHZ7qnPekIZPmopPlHr56Mpefg9AmDE4pVQ1W3+paUf9ThHgrKsUw7+0XMkzPXp5j9CdUp OOPnyUunvEu3cV8pZgb/Oqp0JGZmPoC9txRGJrlmhPo2T14o0iybO9gvDKoK6Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1716809441; a=rsa-sha256; cv=none; b=ZJ2ViPgagz2ojIhVkXG28GtUWvQ/40N6YGzorYZSglN5LBzz0ddka7PIlZx+CrT4fSENso AxnGbYp2tdb2p6a/d+ARkCSp4r6CVl8FI/KIp/JqWF5e3DY4+moZavdUzp1oreW+pw9XVf nMq2xor9I+mrq3vCGO0YPQ8w+F8vLd4NyYGj2OtWYC7XqSl4peU0JW3BZjQdn5C57JTBLd wOOxvBjcCJ2JqSnPzFUh1CYf9h/J7O7gAuVWOJvG+DaL8/KWLn8bETFunoqrNkTnA7R0nk drQUl+uk4ZYzsTsFEKdu4iU9NSMHZnEpUPwgO7cHx0xDxJhsafGI61EO3TnMDQ== 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=1716809441; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jztDZi//A0Qlatza3W9GIgo312DaUrd7gfuAUAEbzfs=; b=RYeoIH/o6Ubvqj72CzPsptrgWH+IN1Yfw+h6p4T3NQzfiY6O6MNvtlOGahnNmDfQzsqP1s PB3Te4WazogJMdzXLW12C83lsb2I2esFetIG020C2UP8kxggOInN9PJeXERLnIpfANbTqw tTsQ2esQazDJer3dXJ2CgTO6+dRcvyzqs1F8OJX8STMcvIr4T9W9CWYeAg/Q81oAhJWXr7 gesOnVBl22bFX/ln9PEyUa4e6tcL/FIRD6KYoeRbW+b9FXrorPih5kw/zRRKnwBcQbdVeA Cjw8tqlsgbtZe0vsctddwg5kgAK1hDMw8NTDPye5CicsnFHKCDkL3bIuEtpjfw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Vntk956STzjS8; Mon, 27 May 2024 11:30: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 44RBUfe8094737; Mon, 27 May 2024 11:30:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44RBUflq094734; Mon, 27 May 2024 11:30:41 GMT (envelope-from git) Date: Mon, 27 May 2024 11:30:41 GMT Message-Id: <202405271130.44RBUflq094734@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mariusz Zaborski Subject: git: f4962dca5699 - stable/14 - sysent: regen List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: oshogbo X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: f4962dca56995a4c5b8b41323c44d3ebcda80d0b Auto-Submitted: auto-generated The branch stable/14 has been updated by oshogbo: URL: https://cgit.FreeBSD.org/src/commit/?id=f4962dca56995a4c5b8b41323c44d3ebcda80d0b commit f4962dca56995a4c5b8b41323c44d3ebcda80d0b Author: Mariusz Zaborski AuthorDate: 2024-05-27 11:30:53 +0000 Commit: Mariusz Zaborski CommitDate: 2024-05-27 11:30:53 +0000 sysent: regen --- sys/compat/freebsd32/freebsd32_sysent.c | 2 +- sys/kern/init_sysent.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/compat/freebsd32/freebsd32_sysent.c b/sys/compat/freebsd32/freebsd32_sysent.c index ecde86d07965..84ab05d24cee 100644 --- a/sys/compat/freebsd32/freebsd32_sysent.c +++ b/sys/compat/freebsd32/freebsd32_sysent.c @@ -127,7 +127,7 @@ struct sysent freebsd32_sysent[] = { { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 63 = obsolete ogetkerninfo */ { compat(0,getpagesize), .sy_auevent = AUE_NULL, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 64 = old getpagesize */ { .sy_narg = AS(msync_args), .sy_call = (sy_call_t *)sys_msync, .sy_auevent = AUE_MSYNC, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 65 = msync */ - { .sy_narg = 0, .sy_call = (sy_call_t *)sys_vfork, .sy_auevent = AUE_VFORK, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 66 = vfork */ + { .sy_narg = 0, .sy_call = (sy_call_t *)sys_vfork, .sy_auevent = AUE_VFORK, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 66 = vfork */ { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 67 = obsolete vread */ { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 68 = obsolete vwrite */ { .sy_narg = AS(sbrk_args), .sy_call = (sy_call_t *)sys_sbrk, .sy_auevent = AUE_SBRK, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 69 = sbrk */ diff --git a/sys/kern/init_sysent.c b/sys/kern/init_sysent.c index a893deb73d9b..20295641e5d1 100644 --- a/sys/kern/init_sysent.c +++ b/sys/kern/init_sysent.c @@ -126,7 +126,7 @@ struct sysent sysent[] = { { compat(AS(ogetkerninfo_args),getkerninfo), .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 63 = old getkerninfo */ { compat(0,getpagesize), .sy_auevent = AUE_NULL, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 64 = old getpagesize */ { .sy_narg = AS(msync_args), .sy_call = (sy_call_t *)sys_msync, .sy_auevent = AUE_MSYNC, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 65 = msync */ - { .sy_narg = 0, .sy_call = (sy_call_t *)sys_vfork, .sy_auevent = AUE_VFORK, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 66 = vfork */ + { .sy_narg = 0, .sy_call = (sy_call_t *)sys_vfork, .sy_auevent = AUE_VFORK, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 66 = vfork */ { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 67 = obsolete vread */ { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 68 = obsolete vwrite */ { .sy_narg = AS(sbrk_args), .sy_call = (sy_call_t *)sys_sbrk, .sy_auevent = AUE_SBRK, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 69 = sbrk */ From nobody Mon May 27 11:31: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 4Vntl53QkQz5M7df; Mon, 27 May 2024 11:31: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 4Vntl52zq7z4p2j; Mon, 27 May 2024 11:31:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716809489; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uXm7WufOhPbmGqPKqZxpXJBn5BLf0KoDgz4yUqehgY0=; b=FD6Sf3d0nzhb1IrF2cuquYDvDODvhIWQO/ePQIa8XH5m/5jL628o9FztNkG6AxDP2xtxog QummAaQJYCRyQgHob8Uy48/efYuaEoZMwMCNFieSQ/awmwvnWdT05O+t9I5aF0xODF80DQ ZCHnwVM6HVrCj9qkiMga0MpLYdpRQ6gH0+ZnSYOL5V0lpozAVs159EM3D7FUfnBSHq4HpO kb4o0D4BEE7ltG8IS5ou3xTQQQWsO4cwNyPYcqVGWkfhrDSple9yG+yvAExfQf2t/rn1HE ACOoN4uqNp0g4TrJv0XOPyJvstC2oppFuo6V4BS8HNyg6xU7/q3CaMi+8Qeg8g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1716809489; a=rsa-sha256; cv=none; b=mTKKx8nT0aSSh4eqIxpjGxx10JynKoObDurKW2lQIXljtktSER/yDredmnb5BNikLGAN1I DSDZggfvE1ciVPTL2cS/eDdrcloKUh2PtJQEU8d3O8/97tpIODt5H0kunhiErWVpx/4mLc LNC7rFeZcuZ3SPh45yIlmf4tSpv4POO+GfubJmJTeHf07M4g6PydTixzg/x7W5BJuW+L7z PZIpL8Q5gupYd5HpzC79PEnS1tL4B9G0J1QIM6mVBRuXj63Zzc97ZMEWR+lh6KPPQbyQ5O cmq3JnOGwEu6DChaQhQnsSaWkT6WQ747jIrjog0mSyhoB11RK0MTgEa09+3bhA== 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=1716809489; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uXm7WufOhPbmGqPKqZxpXJBn5BLf0KoDgz4yUqehgY0=; b=knMOV4bCChbSfDMofYBdGJvZpXHIE12To69lXMPPDwNeswCPPE1NgFr25KYUwet+BoGfqb ynbTpBbBrTv1O85FHvTBthNEPtK6VwlbKDxS0sVRdzZKPera4TaMFOaXP58q6X+bKPaCUn I8UY6jW17Klhf2QfILZ1ByVwOhiGEJ5cKN08er0haCEUSMODZoM0GGbSvYiG/IBz0Yuh6v U0eG72a1UO9FY3zykjGXsZ8XQ7r6k7+QcMP9em+nRUfjp6Mw4Mo6+hfEq2k8QTU484Ynqo zL/x69EZYsKod7XdBt4o3Dh4Cl0pPp30VX7hi1jXH6m1kpuMZz6edv34S4fW8g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Vntl52b4Bzjd5; Mon, 27 May 2024 11:31: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 44RBVTFZ099332; Mon, 27 May 2024 11:31:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44RBVTlq099329; Mon, 27 May 2024 11:31:29 GMT (envelope-from git) Date: Mon, 27 May 2024 11:31:29 GMT Message-Id: <202405271131.44RBVTlq099329@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mariusz Zaborski Subject: git: 44fb543ac92b - stable/14 - capsicum: allow rfork(2) in capability mode List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: oshogbo X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 44fb543ac92bc9ebedfbfe60225811e257c6daab Auto-Submitted: auto-generated The branch stable/14 has been updated by oshogbo: URL: https://cgit.FreeBSD.org/src/commit/?id=44fb543ac92bc9ebedfbfe60225811e257c6daab commit 44fb543ac92bc9ebedfbfe60225811e257c6daab Author: Edward Tomasz Napierala AuthorDate: 2024-05-21 19:55:09 +0000 Commit: Mariusz Zaborski CommitDate: 2024-05-27 11:32:11 +0000 capsicum: allow rfork(2) in capability mode Reviewed by: brooks, rwatson MFC after: 4 days Differential Revision: https://reviews.freebsd.org/D45040 (cherry picked from commit 6b7e4254a29e3228a7273622556b60416e300509) --- sys/kern/syscalls.master | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/kern/syscalls.master b/sys/kern/syscalls.master index 4b8973c4b882..47b67e4dbaa7 100644 --- a/sys/kern/syscalls.master +++ b/sys/kern/syscalls.master @@ -1465,7 +1465,7 @@ int inherit ); } -251 AUE_RFORK STD { +251 AUE_RFORK STD|CAPENABLED { int rfork( int flags ); From nobody Mon May 27 11:31: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 4Vntl66ZV8z5M7dl; Mon, 27 May 2024 11:31: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 4Vntl63y1pz4p2k; Mon, 27 May 2024 11:31:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716809490; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=70czMYcfn5bIei1VLQmiPTOF6BKcHrfURgG7/d3VBDw=; b=DyaWgSbWlwPv1pn3mlCok2qPRsq0FhZKk/BRViv/9vFIb3xQjEweUBCChxcb/Go0aTYcQ5 ZNMXrTCuNF6ja+hI7i6XVhfafMV+RZs0UzBzrnBAbgl0UliO0rNcfnBXXkZOk7GSP1Ejhu Tsbb1Vl4CfvQU0yl8PeIRhc45N2sJRoUvcYae3h9Ww44YHwZUCl7C7hXpBg/oilVWydZ3S u49NAtsTIhCsnr581WnqfIHTvZRKZGAeLCmUJwcvw08KP7205sb2UA2iVYEm3BBfQgQ0wL EFwefEe9GD9Lf/wYtt5jy6mfLA8Ogzz4+bxX+8ujq2TxckCnMOt4/IFWAXMKQA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1716809490; a=rsa-sha256; cv=none; b=oY/n6KFJFwPnYhxV7MEw6vt5t/lpZVAy2TX99YPgEUsRE9PKiav77PBu1tNzKwxQVfdcik HCn8KScytibKnL3UbvdbS32NsacGV6fhJ0rdZB2GlSCISg865RRD0XIqZ1K8T1syxVUxr4 2lFXdIkCbMJO3oHRAWdG0yfNjIq8MW/vk6ygCMVzyir6kfDF3IJKcqQAf6yBPl4P2hOY9H vcHxDs8IcIQRqStdsQGCl7XUCkS0dnqLDhKQOuvBm/BapnCMGDCUZy5ftHoyjxKyfODxJC YZ0QZg3VZj4s99dpk/JGHB0PvPys4CEz+5h1s+V/E3ouOCo/Zc6e0osoO9OBSQ== 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=1716809490; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=70czMYcfn5bIei1VLQmiPTOF6BKcHrfURgG7/d3VBDw=; b=GBVHoHZlUE5WrfSxVsUbi/9SECVRlJ6oA84cfkksGE7to6qsEkgc57c/9HJ+FEvNMc1LtA DuFOqhlO0By+jVtCKLjl329IRb7iXCXuq1aQHNG2H6ScoGmk7NZY53EorBajePPEXo6Uc4 eO2Nz/bZ+LqGlFlnayOuY15JJDC1gxb7SAhdg/BfZbJwSjVh1PJZaWyURPI78Idr9nUi+g i5bHEZiH79pnyZwafubhHL8Q81mTwIlmJV5/NTS2SXxLk/nAaNWXeMGN+krQQ7kdVSmBIE 6z6dmJ0p3JPqoa4L6kY3ET7ftITxrZtinGkcN5h9Y4lJSTjqD+8SPvh0wxZcOQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Vntl63Yxhzjd6; Mon, 27 May 2024 11:31: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 44RBVUrW099365; Mon, 27 May 2024 11:31:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44RBVUjv099362; Mon, 27 May 2024 11:31:30 GMT (envelope-from git) Date: Mon, 27 May 2024 11:31:30 GMT Message-Id: <202405271131.44RBVUjv099362@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mariusz Zaborski Subject: git: c6bb723c913d - stable/14 - sysent: regen List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: oshogbo X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: c6bb723c913d42a96c1aef5d10ffd96adb55bf15 Auto-Submitted: auto-generated The branch stable/14 has been updated by oshogbo: URL: https://cgit.FreeBSD.org/src/commit/?id=c6bb723c913d42a96c1aef5d10ffd96adb55bf15 commit c6bb723c913d42a96c1aef5d10ffd96adb55bf15 Author: Mariusz Zaborski AuthorDate: 2024-05-27 11:32:23 +0000 Commit: Mariusz Zaborski CommitDate: 2024-05-27 11:32:23 +0000 sysent: regen --- sys/compat/freebsd32/freebsd32_sysent.c | 2 +- sys/kern/init_sysent.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/compat/freebsd32/freebsd32_sysent.c b/sys/compat/freebsd32/freebsd32_sysent.c index 84ab05d24cee..df4ec684ccb1 100644 --- a/sys/compat/freebsd32/freebsd32_sysent.c +++ b/sys/compat/freebsd32/freebsd32_sysent.c @@ -312,7 +312,7 @@ struct sysent freebsd32_sysent[] = { { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 248 = ntp_gettime */ { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 249 = reserved for local use */ { .sy_narg = AS(minherit_args), .sy_call = (sy_call_t *)sys_minherit, .sy_auevent = AUE_MINHERIT, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 250 = minherit */ - { .sy_narg = AS(rfork_args), .sy_call = (sy_call_t *)sys_rfork, .sy_auevent = AUE_RFORK, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 251 = rfork */ + { .sy_narg = AS(rfork_args), .sy_call = (sy_call_t *)sys_rfork, .sy_auevent = AUE_RFORK, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 251 = rfork */ { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 252 = obsolete openbsd_poll */ { .sy_narg = 0, .sy_call = (sy_call_t *)sys_issetugid, .sy_auevent = AUE_ISSETUGID, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 253 = issetugid */ { .sy_narg = AS(lchown_args), .sy_call = (sy_call_t *)sys_lchown, .sy_auevent = AUE_LCHOWN, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 254 = lchown */ diff --git a/sys/kern/init_sysent.c b/sys/kern/init_sysent.c index 20295641e5d1..319ced33efbd 100644 --- a/sys/kern/init_sysent.c +++ b/sys/kern/init_sysent.c @@ -311,7 +311,7 @@ struct sysent sysent[] = { { .sy_narg = AS(ntp_gettime_args), .sy_call = (sy_call_t *)sys_ntp_gettime, .sy_auevent = AUE_NULL, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 248 = ntp_gettime */ { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 249 = reserved for local use */ { .sy_narg = AS(minherit_args), .sy_call = (sy_call_t *)sys_minherit, .sy_auevent = AUE_MINHERIT, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 250 = minherit */ - { .sy_narg = AS(rfork_args), .sy_call = (sy_call_t *)sys_rfork, .sy_auevent = AUE_RFORK, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 251 = rfork */ + { .sy_narg = AS(rfork_args), .sy_call = (sy_call_t *)sys_rfork, .sy_auevent = AUE_RFORK, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 251 = rfork */ { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 252 = obsolete openbsd_poll */ { .sy_narg = 0, .sy_call = (sy_call_t *)sys_issetugid, .sy_auevent = AUE_ISSETUGID, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 253 = issetugid */ { .sy_narg = AS(lchown_args), .sy_call = (sy_call_t *)sys_lchown, .sy_auevent = AUE_LCHOWN, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 254 = lchown */ From nobody Mon May 27 13:47:42 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VnxmG5TCmz5L8VH; Mon, 27 May 2024 13:47: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 4VnxmG4vR6z43j4; Mon, 27 May 2024 13:47:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716817662; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OdsV2oewqQtL/SqxvACKy/dCqH3UJ6pP7lxWaXTJBl4=; b=ibX/1IeOSnD1csD9ifbXDxtEPeGtBxiDr7S0ZyEa5kCCpCsuJ49PrVcHpFj5omFEg3MCDu hnrqnacSYMYohXby88DEItH1RwbIbDapEksV13Tc+MNcO9ApFhkjUojNBb60dfZpA/Wwhz acLIeDWWs0bUDMD76YEVkUNVIy8QCM1yWztoRUOUkSkbNgrLGatFuSNgzOoCCGeUhwyN2u bwvLFbnNzYTSoP8ByGef6fcUuuRWv+QXy0uoNh71N/pC22G3CqQBR7kqqhdavWKCwwIbLy lYdnhU8C5a+g8qsJPOPDnXUapbkfv5zAqe5yrLeZCDAK2fvL1KcqJJV8s+KTww== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1716817662; a=rsa-sha256; cv=none; b=awZENlSSfzaZYqYQt9f7DYPOqkkfe6Dp1wrAz7t1Uxr2W6AVNqidH3466eYNedftSoN89Y iH4WZPbjUwscikXBo6nbaNfT5dIaFFkiGh/lKNSQMysL82DMU4ge/7i1w+uSdQ07zx5kVw Qq2WFMkPIx2FCvhit4T/nAM/PLei8SE5Rjf70yeO0WRdTmspaRpnT5ITrrABtqCoSRJQdO hvcgsg7jnhYp6N/PYLNoK4hgtDA7DaxBEwgTaZZlLs48SpmhgjbkDPzy7PE7uoFL5EcrNt 6D/Q9zzO/lso5VrhIXg9DS0P4Ew5pAdOdqY1yndWM+skTRJ02olAZqikIL+z4g== 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=1716817662; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OdsV2oewqQtL/SqxvACKy/dCqH3UJ6pP7lxWaXTJBl4=; b=mATa33TPC3Skk071HaSoeUFDAeg85lU+9rPLOQtKHubBBsVk79TreaSpHF2R1NuCjgaqrD AhUeAoIm1cyZyFmK2pxktvN6e42tifpoqsfQdq1myq1RL4YguZolsXZNzHru9No5ZQgJzo eYgbKmoMRJDQBr1kMwL6BS1tlkIhDMZASu9qlOOM1b08CeDuFGjy4vZU2lOktJGx4WsjsJ IHfi6YcySmcI+wpN9OIWGBGe2lSzImVV2Xkq3qd3rSASO1jr6KdsrDP12wVrkJ1sHfn8hi lzCJLXQhzaou8fRi7WkWQ6P4eh5rpOAcKT2/6niK2r+R7MaOYkqliGKdpBEp2g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VnxmG4VnQzmPx; Mon, 27 May 2024 13:47:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44RDlgxQ022675; Mon, 27 May 2024 13:47:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44RDlgOD022672; Mon, 27 May 2024 13:47:42 GMT (envelope-from git) Date: Mon, 27 May 2024 13:47:42 GMT Message-Id: <202405271347.44RDlgOD022672@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: 4c053c17f2c8 - main - zfs: Update use of UMA-related symbols in arc_available_memory List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: 4c053c17f2c8a715988f215d16284879857ca376 Auto-Submitted: auto-generated The branch main has been updated by bnovkov: URL: https://cgit.FreeBSD.org/src/commit/?id=4c053c17f2c8a715988f215d16284879857ca376 commit 4c053c17f2c8a715988f215d16284879857ca376 Author: Bojan Novković AuthorDate: 2024-05-27 13:28:03 +0000 Commit: Bojan Novković CommitDate: 2024-05-27 13:47:17 +0000 zfs: Update use of UMA-related symbols in arc_available_memory da76d34 repurposed the use of UMA_MD_SMALL_ALLOC in a way that breaks arc_available_memory on -CURRENT. This change ensures that arc_available_memory uses the new symbol while maintaining compatibility with older FreeBSD releases. This change was submitted to upstream as well. Approved by: markj (mentor) Fixes: da76d34 --- sys/contrib/openzfs/module/os/freebsd/zfs/arc_os.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/contrib/openzfs/module/os/freebsd/zfs/arc_os.c b/sys/contrib/openzfs/module/os/freebsd/zfs/arc_os.c index 92696c0bf1ae..478b74828c65 100644 --- a/sys/contrib/openzfs/module/os/freebsd/zfs/arc_os.c +++ b/sys/contrib/openzfs/module/os/freebsd/zfs/arc_os.c @@ -89,7 +89,7 @@ arc_available_memory(void) if (n < lowest) { lowest = n; } -#if defined(__i386) || !defined(UMA_MD_SMALL_ALLOC) +#if !defined(UMA_MD_SMALL_ALLOC) && !defined(UMA_USE_DMAP) /* * If we're on an i386 platform, it's possible that we'll exhaust the * kernel heap space before we ever run out of available physical From nobody Mon May 27 14:43: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 4Vnz0m271Cz5LFxK; Mon, 27 May 2024 14:43: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 4Vnz0m1Vg7z49dF; Mon, 27 May 2024 14:43:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716821016; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9dFzgjLilE87GlgPCT0Pw4JoPvtnsO5m1F3gagFVDVE=; b=jWzWEI2Yh853Vmqu6C1CFGGALnCJEQ/QxsQ81S7wg3DRvKO/jd9mruRaRxnZu6lfDvDy37 c/QRamh2BjM8jeBX5ShUa+ee4xTwi46g2+LhOFRc8HeBqzqXALYoIr9bmlPBjO2Ismki+5 Vn8oF7KTU1cTvHuwnKQYkwGnUZjyF0FvqQVGQKIiwINhmFYcVTzZ7y31sZsuJf+5aBY1zw BiBeGPKOR4ox/PugYjVQuAJfkNkJMDLDMsnBvglzlsHz5A3KE7deb/IAfnc5NffIhKmbvL yS34pTgCIg6Yr4YOY5Dtg5R8w7+Z6/IHE17RpAa65pQYZEK2ql8ndmFyoiwDyw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1716821016; a=rsa-sha256; cv=none; b=n6pMh21yGFklIdPuekiZqmn5k9mh8744/gZh6KHHwguevX/VcXs2rAaBvuVTc9hCHoejkE D3HQEE/3EFs26C0Mu14MieuUZlht0WPqJDn+TE6rp/nBGcAo5O71UiC68R0P+qqCw3z5tL kPhBv74wSpqnVNXAhQizamHcvlH1awxh/UdzqQQN1XVGLv4t01s52ebgICjecXziMGNRfv 5M6xICzj54iWByqi+HrlRba+9TsFfN3HzsoS7Nfw7jJvKqNU5g5FwuBopU00CFSVjvykzN 3Y+F8+qvvozj+5AkOmgtMUidaAdzXOlZodnyCTVjhdeehH5BLlL4T8pIf2VnGA== 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=1716821016; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9dFzgjLilE87GlgPCT0Pw4JoPvtnsO5m1F3gagFVDVE=; b=VWle3KyQRx2p1ajAqlHeSRempaK5is2y1FxLW5t35CKD10CGykTpOoDYbGL5elQa8vMho6 Uz/1nqEWO992GQM9ej5XbMewLCPSKHSY62k+gcZH/cNfB+lrriHsMH4CpbotO6vN2rriSr 3nHIpsQB7pt8zuTmFv25glaBy7Hc8DH2zoZBYdpAontUeJrzDt8YtvkUnouTlk3cJERirp QCeYnVYdLxw9fIzYzjmbtw+ScGepdoWENs5FOcKxcO8DoG2/QJAB4tq8U/KoPpuBMeO+IP VayiLW/QIxZXjfZ2ffcfLH/xAc3zFFl+BHvsXYSs2wX29Q8zY9G+lHLtFrkw+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 4Vnz0m13CQznpF; Mon, 27 May 2024 14:43: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 44REha2n023752; Mon, 27 May 2024 14:43:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44REhaQ2023749; Mon, 27 May 2024 14:43:36 GMT (envelope-from git) Date: Mon, 27 May 2024 14:43:36 GMT Message-Id: <202405271443.44REhaQ2023749@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mitchell Horne Subject: git: ed10a9398d05 - stable/14 - riscv: fix L0 PTE setup (Sv48) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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/stable/14 X-Git-Reftype: branch X-Git-Commit: ed10a9398d05738089ee31fed263854ba92884e2 Auto-Submitted: auto-generated The branch stable/14 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=ed10a9398d05738089ee31fed263854ba92884e2 commit ed10a9398d05738089ee31fed263854ba92884e2 Author: Mitchell Horne AuthorDate: 2024-05-15 17:07:33 +0000 Commit: Mitchell Horne CommitDate: 2024-05-27 14:41:49 +0000 riscv: fix L0 PTE setup (Sv48) Per the Privilege Spec, the Accessed (A) or Dirty (D) bits must only be set for a leaf PTE. It seems newer versions of QEMU have started to enforce this requirement, and without this change, pmap_bootstrap() hangs when switching to Sv48 mode. Reviewed by: jrtc27, markj MFC after: 3 days Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D45210 (cherry picked from commit d7adf3b47a058552270fb2603cc888f40eba3e17) --- sys/riscv/riscv/pmap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/riscv/riscv/pmap.c b/sys/riscv/riscv/pmap.c index 8ddc31bed81c..45245fe54a59 100644 --- a/sys/riscv/riscv/pmap.c +++ b/sys/riscv/riscv/pmap.c @@ -715,7 +715,7 @@ pmap_bootstrap(vm_offset_t l1pt, vm_paddr_t kernstart, vm_size_t kernlen) alloc_pages(l0pv, 1); l0p = (void *)l0pv; l1pa = pmap_early_vtophys(l1pt, l1pt); - l0p[pmap_l0_index(KERNBASE)] = PTE_V | PTE_A | PTE_D | + l0p[pmap_l0_index(KERNBASE)] = PTE_V | ((l1pa >> PAGE_SHIFT) << PTE_PPN0_S); l0pa = pmap_early_vtophys(l1pt, l0pv); From nobody Mon May 27 14:43: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 4Vnz0n30Ywz5LFyh; Mon, 27 May 2024 14:43: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 4Vnz0n2PkCz49yd; Mon, 27 May 2024 14:43:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716821017; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mtrbQv9OW8enuaqA5WRFYFam7yyfAwiIOW+nFgx21pk=; b=tJhH7U50QQjKztQwhkuD376Yt0Po54fnRINO2M41x/hq78g/wdShl568og38/MvXa9+M/e 5FTExUCW2HD0cwIC3lkCVhnJ+/+EwRU3hXEaTRs5oONAmONoOK+jiL6XSruR36CjDYGsY/ L2MMWToZWfGOr7jZH0fcxHY6bbqIARrRi2jxRDMDfsxXOHpW427eMvFaFaY54UsFK2fEue E7BoHVJbyiNnx7Y5DXNDgunk4/1XNac7Qfh9yaXZxq3SzEB1ILlv1241FnYHWhzvl+KCeW 3sw/UoHC+jI1ww83Y2kYXHiwEZKlJZlnkw0ew1MyptYBvr5RSDPvoHi6t3rPkA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1716821017; a=rsa-sha256; cv=none; b=Hkkct86O3/G0e5x14aWi+wLRLoFF8pH8rFCphOwuACdc9Y0B1uxX5lstawUNGGK0BlRzdK zgSvW6KDGl0vZW5wKPQ8CCDqL7djI8zaVXBb4sqSZ01vLsLUgkv+kyzstZV3CRGLG76urn GkX8mTF+tUMYMraMiIQq5DaMX9htwqJkNhyCNzE4UQwDSRCnXVy++gHwCGgr6N+ECQyFIx UJW7FX1iykjZxNtmDuEkZobbSUPZW9Vs1OXRXfQ7NrO5hKPxGGQarHW6RiTSzEBsm4wWIS mkk+vcXQSIojcGSH3Rtfd8h5cSyRUq9zVlmfKnKB6MvU/8TUWLvolIbuNmCi8Q== 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=1716821017; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mtrbQv9OW8enuaqA5WRFYFam7yyfAwiIOW+nFgx21pk=; b=CXQT8Crtmevf/x16IgfmCHPpyLkl6BotpuuNtDpDHwjprkIR+7u4rQYMiD9hu4lEgcU0hW 6vqAeNmsLFKPq/Ty1ufr7Be0yMR17qi4oLys2Kl4xYxxkx3i719hrrvpLoo4/kN54Xlj/D Hi2L0JIGNSihZbWeBIcZvIdEQHdmUjksCOgTKFOrLVwFxMShVkUeG+oW+poGVn3GpjTE2a /yCkVz3xbcVKtVK4Q3PaOhBIhc2aR1nVdoKN9oaSMFZv8h478wV0Y3+ozCMiee8pW86JFi ve9j5IO299NEfT7HA8q4iVnyAAzbk/AWqC7WLqkBjSPak0xryy2ozhNLBPB2mQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Vnz0n225rzp5v; Mon, 27 May 2024 14:43: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 44REhbdH023794; Mon, 27 May 2024 14:43:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44REhbOi023791; Mon, 27 May 2024 14:43:37 GMT (envelope-from git) Date: Mon, 27 May 2024 14:43:37 GMT Message-Id: <202405271443.44REhbOi023791@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mitchell Horne Subject: git: bdfd8f68faaa - stable/14 - arm64, riscv: remove unused declaration List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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/stable/14 X-Git-Reftype: branch X-Git-Commit: bdfd8f68faaaa1339b08afb438e217a26a6f7bdd Auto-Submitted: auto-generated The branch stable/14 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=bdfd8f68faaaa1339b08afb438e217a26a6f7bdd commit bdfd8f68faaaa1339b08afb438e217a26a6f7bdd Author: Mitchell Horne AuthorDate: 2024-05-24 13:53:43 +0000 Commit: Mitchell Horne CommitDate: 2024-05-27 14:41:49 +0000 arm64, riscv: remove unused declaration It is inherited from arm, where the global exists and is used. No functional change. Reviewed by: markj MFC after: 3 days Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D45323 (cherry picked from commit 1d3c23676de33762fd7fc2e3d890fd14738d3ee6) --- sys/arm64/include/vmparam.h | 1 - sys/riscv/include/vmparam.h | 1 - 2 files changed, 2 deletions(-) diff --git a/sys/arm64/include/vmparam.h b/sys/arm64/include/vmparam.h index fee8e01f72c4..b37bd823878d 100644 --- a/sys/arm64/include/vmparam.h +++ b/sys/arm64/include/vmparam.h @@ -273,7 +273,6 @@ extern vm_paddr_t dmap_phys_base; extern vm_paddr_t dmap_phys_max; extern vm_offset_t dmap_max_addr; -extern vm_offset_t vm_max_kernel_address; #endif diff --git a/sys/riscv/include/vmparam.h b/sys/riscv/include/vmparam.h index 9a710b667c78..2198245d5b20 100644 --- a/sys/riscv/include/vmparam.h +++ b/sys/riscv/include/vmparam.h @@ -242,7 +242,6 @@ extern vm_paddr_t dmap_phys_base; extern vm_paddr_t dmap_phys_max; extern vm_offset_t dmap_max_addr; -extern vm_offset_t vm_max_kernel_address; extern vm_offset_t init_pt_va; #endif From nobody Mon May 27 14:43: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 4Vnz0p6w3cz5LFWX; Mon, 27 May 2024 14:43: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 4Vnz0p4T1Gz49tG; Mon, 27 May 2024 14:43:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716821018; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2aEHtvOuJckiOkv73db5GfohijqhFeN8AxwpcFZyVg0=; b=jt8gTNiA1wyUcf+4gZ2gvQAzMacTQUrRk/ErLjdfde6gGHMzZpxRcZYb9OyeBxkqm9kKNS 3M9AWSWabG9s8FnMrkbtGbQq+MCkjOEyFMnw3LVJc82ybukuFH/xHKqslef7m+3gWJHTCc VVVcUvAhESNStPcR74HS8IO9L3/jyDG3OpHSCZ3fh1/dSe5Gwkn9SbmqM2N2nlKkTL9/I9 PgivjXnZBbqGA55hTVb2c/w8ou40E/bdksBlbcUTAK6NcNhDhX8CMWFMYba4dY41INPi7m nV0Rf7ixGJuy4tZIvBu9bNHgN79lf3V9UPJdQs7DRIjnplXDrVyyQzMREeeEGQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1716821018; a=rsa-sha256; cv=none; b=GybkwXNmrIO45BMfCmvn+2SdhNhhXZThqak3VbET35WtaI7pEz6qPVt5Foo6ZhNz5U9ffy 1XA9qhM7I4CSQ0EtofauCsT5KET1zoMsp2D9Graw3WFusnC2wVrjxvbjXXF3uDIxKwOrRb vjNDxn3DkhWgsr+7z8aTcL1yyb7wM86tPsdEWrMLxanYbbN2SXfrlcNVVETybCZ31KyGV5 s/zKbqr6ZlAZSSz8Q4qzIHMv332rcNs2uqu1n9LxZ9N9uj7lIBU+miwKeuXtxgkdg2sc4/ Aezhr+OvbE4dYBByx43TAAF6BCV5EnBDqdiCJxNC/fppOz2bstGNBvNjCGwQXw== 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=1716821018; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2aEHtvOuJckiOkv73db5GfohijqhFeN8AxwpcFZyVg0=; b=HA2f/NOAuXaAcQimBzUZg3dNN0BlgakCnj2Gqfm6uZykHMEZM/xi1GinPsyGIEpm+zPd5X OcgBXbiMKgMPMEoQxxQgDi0YCJ85AxMh3cGK2chGZiBW7ynVuG6g5Y+dmaz+VqWVItm46d HDof3ohUDtTmjupX5YjYvb4u/8q/lvH4UuY/O5Ttt/L4V0PEry1MGVlJvYpTx97A6fZwD6 lkQ2cqZwOOOwW4N7V6DLvQjBW0PuIcOCDMiOhyIEp8wQRPJIvGT/9ZISfqW981WeKfPu8Q VSydEIw9kRoYU4WV//FC91zt9G3VViDUPoTLuhbKkIOmSZmAl/Zf0FEKso5awA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Vnz0p34G9zp5w; Mon, 27 May 2024 14:43:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44REhcNr023839; Mon, 27 May 2024 14:43:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44REhcQT023836; Mon, 27 May 2024 14:43:38 GMT (envelope-from git) Date: Mon, 27 May 2024 14:43:38 GMT Message-Id: <202405271443.44REhcQT023836@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mitchell Horne Subject: git: 1b1c7e088c58 - stable/14 - arm64, riscv: removed unused struct pv_addr List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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/stable/14 X-Git-Reftype: branch X-Git-Commit: 1b1c7e088c58ed610a7bdc3d068ac41b532827fc Auto-Submitted: auto-generated The branch stable/14 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=1b1c7e088c58ed610a7bdc3d068ac41b532827fc commit 1b1c7e088c58ed610a7bdc3d068ac41b532827fc Author: Mitchell Horne AuthorDate: 2024-05-24 13:53:14 +0000 Commit: Mitchell Horne CommitDate: 2024-05-27 14:41:49 +0000 arm64, riscv: removed unused struct pv_addr No functional change. Reviewed by: markj MFC after: 3 days Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D45322 (cherry picked from commit b5e17840de65ff196b2398211b68ce96d6919f2c) --- sys/arm64/include/pmap.h | 10 ---------- sys/riscv/include/pmap.h | 10 ---------- 2 files changed, 20 deletions(-) diff --git a/sys/arm64/include/pmap.h b/sys/arm64/include/pmap.h index 4b4d47ccc7af..a250b5a20420 100644 --- a/sys/arm64/include/pmap.h +++ b/sys/arm64/include/pmap.h @@ -69,16 +69,6 @@ struct md_page { vm_memattr_t pv_memattr; }; -/* - * This structure is used to hold a virtual<->physical address - * association and is used mostly by bootstrap code - */ -struct pv_addr { - SLIST_ENTRY(pv_addr) pv_list; - vm_offset_t pv_va; - vm_paddr_t pv_pa; -}; - enum pmap_stage { PM_INVALID, PM_STAGE1, diff --git a/sys/riscv/include/pmap.h b/sys/riscv/include/pmap.h index d65935c4ce7f..e10cbacb6e1f 100644 --- a/sys/riscv/include/pmap.h +++ b/sys/riscv/include/pmap.h @@ -67,16 +67,6 @@ struct md_page { vm_memattr_t pv_memattr; }; -/* - * This structure is used to hold a virtual<->physical address - * association and is used mostly by bootstrap code - */ -struct pv_addr { - SLIST_ENTRY(pv_addr) pv_list; - vm_offset_t pv_va; - vm_paddr_t pv_pa; -}; - struct pmap { struct mtx pm_mtx; struct pmap_statistics pm_stats; /* pmap statictics */ From nobody Mon May 27 15:24: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 4VnzwJ5GRpz5LKvJ; Mon, 27 May 2024 15:24: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 4VnzwJ4TkWz4Gk8; Mon, 27 May 2024 15:24:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716823488; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=J7YfAwnx0WOHgC32GXSnOPPHRRfN+gDtSpRcHtxF438=; b=sNVArrE/822qpfCELCDce3jyB7hDTe6Rio908yWNO/Q4JCSb+OYxCKBEj1U4hL/FW+pehv 9RkMyLfTjtZVVzhG/WtPln3/SWtVkvDgPtkFZbOsTVVW/ZWJNbrX/P8qFxqQXrXJgc/CTs 6AayAqNNvLjto8XBy7a/1NYkImfSnNTGyqbsBl0BYb+R0B75OUBBbSBHjrAsfOcw6jF0IC Z3SeF/1W30EilS7jxiWpB+22prtqJclAeGMQMf/XUbkOJ/Tvl6GfvS5YLLbqSVpXvz8Tax 2GnbA8+sdERFSxgK38u6f2vYbs6S5+82bjUHKw9SGzKZt/t+OqO2MSXnqhEL3w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1716823488; a=rsa-sha256; cv=none; b=xnSUDvy0v1XmBTiHek6MSyVHg/z0FKDnXjEMhP43t1Zjoy3Bsqz+R4jRBUxwRp2LYb379W kKG9LdkQEWklMkbxhDStObgtmOaHIVN/5LFiqv8Yi2MwQrSJrWZjo7YbfvWGOfDyg2NPdA AQyz685ZYjJHXrF/bnKTV8h2q2If0+r9L5CbP6JVBmmhNaHt7D9tQqDeSciNPUA5NqJsX1 CpvivPuhYygqedQJeCx8A+FZZZB043pCNX7AZR998wLc5oiYYwDjhSGNZ5k3hoYUlQcUcY oUkQx+16FGV0Z1b0QbpQh++nOYtN0z6CpDyovbSFh6LFeuNCO4p9jwfXC/6U+g== 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=1716823488; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=J7YfAwnx0WOHgC32GXSnOPPHRRfN+gDtSpRcHtxF438=; b=Ci5usjkhnffhRdstEf0BqtbtsxFrlAyYnxJlI3KupLR5271dvcA5GrBXfC5jrGyOdhSgI6 a5YVkvU9we5/Hui1TuBR1Y2tN+MNGoduk8Yi0JL73e3obgwKP5f6ZBMqkJRvbSLYBCoekz zdg36vlbjHAeCEArRs+8rRAjhuEnaAh8uQve4RDePoG14lZXOQTQvDTRLEAkTCcGZYLROq IdCONldGoeGRJlmZYK4/YJAZ01zymhJWpDv8czxX/HUbawNBuEU2Jh3rbcUTFobjZk0tOe Cv569q0lq4qo7UBewVTnLSk+j8T0HwMw8O8bZeHs5hPCKKF0hrw/x8tiKJIA1Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VnzwJ40MBzqXf; Mon, 27 May 2024 15:24: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 44RFOmpL091867; Mon, 27 May 2024 15:24:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44RFOm1t091864; Mon, 27 May 2024 15:24:48 GMT (envelope-from git) Date: Mon, 27 May 2024 15:24:48 GMT Message-Id: <202405271524.44RFOm1t091864@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: 03d3230d5152 - stable/14 - vt(4): add note about sc/UEFI incompatibility List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: 03d3230d51529a38e0c90ff324145dbfe209307d Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=03d3230d51529a38e0c90ff324145dbfe209307d commit 03d3230d51529a38e0c90ff324145dbfe209307d Author: Ed Maste AuthorDate: 2024-05-24 21:45:14 +0000 Commit: Ed Maste CommitDate: 2024-05-27 15:24:13 +0000 vt(4): add note about sc/UEFI incompatibility syscons is not compatible with UEFI boot. This is noted in syscons(4), but not mentioned in vt(4) where the kern.vty tunable (used to select vt or sc) is documented. Add a note so that if someone reads vt(4) but not sc(4) they are not surprised by having no usable console. PR: 276206 Reviewed by: brooks Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D45357 (cherry picked from commit f52481f3b8a377e336ecba1b5150023a344ec189) --- share/man/man4/vt.4 | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/share/man/man4/vt.4 b/share/man/man4/vt.4 index 2876d1ca8d84..81eafb6fae6a 100644 --- a/share/man/man4/vt.4 +++ b/share/man/man4/vt.4 @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd May 8, 2023 +.Dd May 24, 2024 .Dt "VT" 4 .Os .Sh NAME @@ -219,6 +219,11 @@ The kernel uses .Nm when this value is not set. +Note that +.Ql sc +is not compatible with +.Xr UEFI 8 +boot. .It Va kern.vt.color. Ns Ar colornum Ns Va .rgb Set this value to override default palette entry for color .Pa colornum From nobody Mon May 27 15:26:51 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Vnzyg5hwkz5LL0P; Mon, 27 May 2024 15:26:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Vnzyg5FG1z4HBX; Mon, 27 May 2024 15:26:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716823611; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=07em0gaTmD97iVbG/h8itt9Z1M1hROSKmSPLkxCLPiM=; b=lrFY7GFab8+qghJIphRJsjTtUMTuL4o0ZPI9ZiDsj9pVZExiIk7ecGg32ylvmfWw0ZhosH OUadXLyZvc1JNQjjf7DTEQPHoxP3K445n9XItk66COWDDU6ERHmR4LmZwWFv15oo83TnAT fCT7m/vbpEUFKBt+/QBGCWhYBD5LlH1k6hB/SVLBOu20IutiVlRQn0Suu6V/aF1KyrmSgo xvm93dPrHhT14yxnTQp1lVDA0iiWoEYwXCH2sI2DJiBfX0TLVh/7vDUitcozGSkRR1isjW dosGizCOKHp/VL3VrizDyensJOnBjgEr/M6U1se6dldAdMjTNa+a0/ac2No/Yw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1716823611; a=rsa-sha256; cv=none; b=WLasWfYjfeWldg9huk/shM3rozA710rhOrHFD31xUVe474VblJXCiaoQOc/Aaiwq2UNIVG rnbsHqizCMpID+VeZOIBa7kXE5keyB26WOzk/Q3yUnyxHrmJyEj04hia4A2Y6ZSXuVBK7v Lpgob5i7fBT7x/pfi3WoKS5RMn6GRkBs2KHNYYvrwLwgFhtV6WlhBcysL+fvWRF43+guSa vJXG2uZdXvfvCRFm01+PejOhkUanG6uY30KQ3h8SLjJBWwRbiSzcoPoCmaAvOZPT2FeoUl hDUm0r0/aV07MGfhsRlaPI1DNVNCZVw/iHmT2o/mpK6wAuBMSDDm+8b57dxFoA== 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=1716823611; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=07em0gaTmD97iVbG/h8itt9Z1M1hROSKmSPLkxCLPiM=; b=N80hitL5tpbbcvvSu1UXUgb/YQZ8O7UZQg66vTjwGlacBjzTcbwpT+cd+LxpjcG9D+/F2w HH/dBKeNBsFfdbWt+/rJHLPUsKeB7ZXc2A/wkO6Tjxls95VL7ClR/7KIJFVpaQMNSU244r bRdtU8NTOMpgYXCKuDA5TTN1YW4schoowBBxm4PNC66Ctt7nuKlgcpdx84m2Anhj4Gc7wv BFHJX1XkpPqSk3gp9ZUNm3R1DrR2XhkVVKGz8nwJbxezFG7LXR0DOesPW9z3JNtbEgYduO 4MeYMKhvi+iM4bJXeOEm7S1V61nu0v0LJO2VAsSoJWxnBZE/ZEPFscOJVmX2Vw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Vnzyg4q4PzqGH; Mon, 27 May 2024 15:26: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 44RFQpYV092275; Mon, 27 May 2024 15:26:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44RFQph2092272; Mon, 27 May 2024 15:26:51 GMT (envelope-from git) Date: Mon, 27 May 2024 15:26:51 GMT Message-Id: <202405271526.44RFQph2092272@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: bbb6bfeaae46 - stable/13 - vt(4): add note about sc/UEFI incompatibility List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: bbb6bfeaae460ae1be5218d4456e47dfd86fa62d Auto-Submitted: auto-generated The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=bbb6bfeaae460ae1be5218d4456e47dfd86fa62d commit bbb6bfeaae460ae1be5218d4456e47dfd86fa62d Author: Ed Maste AuthorDate: 2024-05-24 21:45:14 +0000 Commit: Ed Maste CommitDate: 2024-05-27 15:25:28 +0000 vt(4): add note about sc/UEFI incompatibility syscons is not compatible with UEFI boot. This is noted in syscons(4), but not mentioned in vt(4) where the kern.vty tunable (used to select vt or sc) is documented. Add a note so that if someone reads vt(4) but not sc(4) they are not surprised by having no usable console. PR: 276206 Reviewed by: brooks Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D45357 (cherry picked from commit f52481f3b8a377e336ecba1b5150023a344ec189) (cherry picked from commit 03d3230d51529a38e0c90ff324145dbfe209307d) --- share/man/man4/vt.4 | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/share/man/man4/vt.4 b/share/man/man4/vt.4 index c75830bdd44f..3a8c64746882 100644 --- a/share/man/man4/vt.4 +++ b/share/man/man4/vt.4 @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd July 21, 2022 +.Dd May 24, 2024 .Dt "VT" 4 .Os .Sh NAME @@ -218,6 +218,11 @@ The kernel uses .Nm when this value is not set. +Note that +.Ql sc +is not compatible with +.Xr UEFI 8 +boot. .It Va kern.vt.color. Ns Ar colornum Ns Va .rgb Set this value to override default palette entry for color .Pa colornum From nobody Mon May 27 15:27: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 4VnzzB1Sg6z5LLLs; Mon, 27 May 2024 15:27: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 4VnzzB0wsxz4HG5; Mon, 27 May 2024 15:27:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716823638; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hw3wip7p9yOGZJb2L/s/YiWRGSgiakmdej7W8WUJv8M=; b=r2QBYRcSTj8a/KOCa9K219KDEFO4QeRuILUQHBIH4FmLpHRx2R2h5MPnrwNfxDWcO8b50n OtR7BfFp7CakyE2t7ylXzjlY4GC9w9XfuTPp7jfR0DTTM1BjQoTy7xqTXh89bsVtsGZ99u JSIVtigkKwmlkKRbWL0eN//6fLrb05H6S4bqQQIgACqSOYmdmxZ/FaJX1gAJrLedivIa/E AqK2QiJX0GpBXfLKXWNPoJp5nv1r93jjONJ8qsmkEC9i2ap16y0M1nWkyTd1IiynkVMvnw isZPYt7e5sO2wgvyYpN7RhqgxZIhBbctuEepC1BDpK/0Hfroz20YOxNgfjDffA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1716823638; a=rsa-sha256; cv=none; b=exeHQDpUqH4BcCt7YGtW6g0MaNmlBkDGfdRentTbiLuh2CcNVGuc+F0X4cL0Dn6MN0xElm 7ubh2xe4spQDegVXp03l9FA/wKkjB8zuwh5NQTxtZ3CcVroLmKLmaVQOjxm7RKPecTJnbw uy8xvCdN/XPVUrCNz70KzmUWdgNI56QfrWvqCcZBuQbXkXbdZy17KiTczvnaDyZOKBLo7R xk+ZJiTqKneSSzFGXnm3ie88Fvs2KrY9EX3wlN3ToRS/rQWm/uD+b3DlDjeVrmn+31n4A+ ZPCX3WiIPPovW1nAgGvOpAJrSWIVy55Cbf/sfFTvtd8GeEcD5lhrqsKMn6jwNg== 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=1716823638; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hw3wip7p9yOGZJb2L/s/YiWRGSgiakmdej7W8WUJv8M=; b=hry0RqKWMwUlyb7zih5PpUvGf6BrufK1XLJnUKNfY1RoouQGLShKffY8aOhlHPdJDg3TOX 2F8db0EaLV1w+HOPmdaOcnF8DOZbZDACFcQanJ+oEDnr2159b4UPPGzUWsE/HCQV4tt6ZJ mm5AYUotOtd+zLBY9ITIMkxNnIRrrHk1hMy2eOz7fJ38vsod+fydodwqocF/j7Ti2RSWTW JYt2CoVl8cZ5OVvUwOYvcajQBnNoY95vjBi/bYBya9ROZ7bZiUo4y7P4MxiXclw2MpN2Fg tOAkX5//CxzFUfKTIUxFJuehFtpoPjPaFBGrlprafOAY+/b4yMrFh8LffWLaEA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VnzzB0XHJzqVD; Mon, 27 May 2024 15:27: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 44RFRHuk092502; Mon, 27 May 2024 15:27:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44RFRHw7092499; Mon, 27 May 2024 15:27:17 GMT (envelope-from git) Date: Mon, 27 May 2024 15:27:17 GMT Message-Id: <202405271527.44RFRHw7092499@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: 568be71de3b4 - main - stress2: Use the proper type for the getopt(3) return value List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 568be71de3b44c8c4679e4c202a782a7302426ed Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=568be71de3b44c8c4679e4c202a782a7302426ed commit 568be71de3b44c8c4679e4c202a782a7302426ed Author: Mark Johnston AuthorDate: 2024-05-25 16:52:32 +0000 Commit: Mark Johnston CommitDate: 2024-05-27 15:26:47 +0000 stress2: Use the proper type for the getopt(3) return value On arm platforms "char" is typically unsigned, in which case the test "(c = getopt(...)) != -1" does not behave as desired. Reviewed by: pho MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D45365 --- tools/test/stress2/tools/flip.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/tools/test/stress2/tools/flip.c b/tools/test/stress2/tools/flip.c index cdc2742de59f..f2a4d86e115b 100644 --- a/tools/test/stress2/tools/flip.c +++ b/tools/test/stress2/tools/flip.c @@ -85,8 +85,7 @@ main(int argc, char *argv[]) struct stat st; off_t pos; size_t size; - int fd, i, times; - char c; + int c, fd, i, times; times = 1; size = 0; @@ -126,18 +125,20 @@ main(int argc, char *argv[]) } for (i = 0; i < times; i++) { + char ch; + pos = arc4random() % size; if (lseek(fd, pos, SEEK_SET) == -1) err(1, "lseek()"); - if (read(fd, &c, 1) != 1) + if (read(fd, &ch, 1) != 1) err(1, "read()"); if (arc4random() % 100 < 98) - flip(&c, 1); + flip(&ch, 1); else - trash(&c); + trash(&ch); if (lseek(fd, pos, SEEK_SET) == -1) err(1, "lseek()"); - if (write(fd, &c, 1) != 1) + if (write(fd, &ch, 1) != 1) err(1, "write()"); } From nobody Mon May 27 15:27: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 4VnzzC2XwNz5LL0R; Mon, 27 May 2024 15:27: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 4VnzzC1XhVz4HTT; Mon, 27 May 2024 15:27:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716823639; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hqLO8TICbW2FDQFwn+mgy2c3GF0n2yDK30i20vOSN/U=; b=PGWijkJWt/jPxQEHQ/icpAZT2e5eMhFcuoOU0hJkPdps+84K1IFow8U1DyYP2HsNwYJcIB 0jPyGcq9/74vEJx+tzp1h+FUaM7SAimW/FTsap0khwhqZbGhNxhPfb7GHP3o6ESYORp20l I9ql9WzlRAsAC/Rmqt+OHIPtgtz5MnTked4LNx1aluYgjoge7rqGpnOBOE7BQzLgvTNSTo p+UZGu3Ig9B5Ok/f9QUja54C3x7TmwSP0shGbJpTlA7oN+zYi0f2qv0k43FbuxAxviGKtU MztVDza2GVbPgSFybGYIomh5UQGPc+G5WMriR0T8c91+Bn3CgQ68RBADzcqUuA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1716823639; a=rsa-sha256; cv=none; b=PCqC8vAL3+WU27ATo+VylV+++pfQyiKx9Jlz2p8Wnbu5hUPiBb5gdofStP+mgWUscgTnIZ 0lg9vr7ZQrp6JDDdZ5sDMCZ4CeLooHmfwmK9B8rjGXjqJsI2J6r2MqCgnTCIEk7TRXzO3P k4rY5pfUvlihPEdHFYCHa9+pYBoO8U/HdqnzO6MHBs2CBApAatYbX6tlKjlwRt69mt14dm ohUf0bFtVnHfXhncfpyPxuna0xyGECrSiBihxxKb6h6I5/84/AblwPcmHGJsJZdLmMEfp7 E3b+U5CSeVaB++wVlY3VvIWJVSRFcdoVhio6gOcnco9Y4aSe5NADGJcTcZUdyg== 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=1716823639; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hqLO8TICbW2FDQFwn+mgy2c3GF0n2yDK30i20vOSN/U=; b=cfQZg7mwo0hRf+i+DCNqryln/oe0Kg1B1Qdu6RzC1cj6w//HiVL5OHI9/WhdDQtVyauBqW eAishQsHpgmkydWdytnLRa7VEbLAbzg4SF728c61jL2JDKeiB7jb97HhC0M3WI9KpVSAg2 gw7KV2k/NA9S6h8lMK9Wc4FAcTWNahW7xFWK+i1kRb50lsgtE/WezYguyIY72/FgNzp/Lt obcdqk1f+3KNgyr56/Sf+ZN2A88C9/InKyujgb1ZSbDzbUe0BhvgW3Tbtp/wLr6ZnblRd9 jSwzWraymyW3E6usVNeJsFwbobrs0BkVRzWUNqFDxJ4yzVD6ouTHRt/5r2QyDA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VnzzC18t8zqXk; Mon, 27 May 2024 15:27: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 44RFRJQs092550; Mon, 27 May 2024 15:27:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44RFRJI1092547; Mon, 27 May 2024 15:27:19 GMT (envelope-from git) Date: Mon, 27 May 2024 15:27:19 GMT Message-Id: <202405271527.44RFRJI1092547@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: c52ca7dd0906 - main - stress2: Don't run aesni.sh on non-x86 platforms List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: c52ca7dd09066648b1cc40f758289404d68ab886 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=c52ca7dd09066648b1cc40f758289404d68ab886 commit c52ca7dd09066648b1cc40f758289404d68ab886 Author: Mark Johnston AuthorDate: 2024-05-25 17:21:36 +0000 Commit: Mark Johnston CommitDate: 2024-05-27 15:26:47 +0000 stress2: Don't run aesni.sh on non-x86 platforms aesni.ko only exists on amd64 and i386, so on other platforms we are just running geli.sh twice. In fact, this test has little value anymore because aesni is included in GENERIC, so it's always going to be used in preference to cryptosoft. Reviewed by: pho MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D45366 --- tools/test/stress2/misc/aesni.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tools/test/stress2/misc/aesni.sh b/tools/test/stress2/misc/aesni.sh index a5160d82dd57..0fe7390d2fbd 100755 --- a/tools/test/stress2/misc/aesni.sh +++ b/tools/test/stress2/misc/aesni.sh @@ -29,6 +29,11 @@ # Simple AESNI(4) test. +if [ $(uname -m) != "amd64" -a $(uname -m) != "i386" ]; then + echo "This test requires an x86 system." + exit 0 +fi + kldstat -v | grep -qw aesni || { kldload aesni.ko; loaded=1; } ../misc/geli.sh From nobody Mon May 27 15:41: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 4Vp0HY46Dgz5LMTs; Mon, 27 May 2024 15:41: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 4Vp0HY3bzYz4K4p; Mon, 27 May 2024 15:41:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716824489; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6dJuxUTqNiSTJn23MuzklGxLOTTdIW54cRqQkIMSLSQ=; b=mvKbAa4LCk32xRSqTOJbK/QmKItBPVeFDmLwPG77cwvhO1FokL7iLx+c+EBroW+ymeMMwj TNrlbslBjh9HsPfkCcP7WJMiF7V2Pb4kAJvSN1gywA0ozhdqXud+YYSFbsyy+QB9RcwVtj Qmd/JghEgd+sFXrYNfxJsnBnylUPcNfglRW9Og7wLox1bknQ4R9zc//sxDGUhy7bul+KmO Qcm0aFo9L7Mazoo/DQz3HPcqtj4iUKEfiFctrxFc4twrF/wDyQKo3t1wIBZGxsqVsEcdI+ u1bnJLRRBRC9fhdyjJbleTlqtDtYx+Y8Mf16sp6x6u7+n4JvQixyv11D4Y4H4g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1716824489; a=rsa-sha256; cv=none; b=xjOSt6QSWI3l7O5nEjlgxt57o1ZnWJ2rwCXjEK6fY6wgSaag5HWk4YfpQB4yNEUA3A797B a5M2ndkc4OOPPiqH1uZ7Wx/jkPfepo40szYVUR7Hb1JjCgAINpxdTB99QcnJJiFMNOAeme qs7osqj+ucRyRxxqyi/A0OWkyaY0MayF+oa82FOfwLjkya1+1thXW1wR93jhtnBbZOB4Jl n6ikenWl8hPR4wKQekPZCQja/VGK8CzR3JRPgfo2x/bEtv0B3cUTZFnfZkQP4wDTcpnAk+ klNVKUMFkn+yODfdBaCkdbVLR2SX3jS9RHWh9wff7VrSwOtffGv/Dvgxw5aCjQ== 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=1716824489; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6dJuxUTqNiSTJn23MuzklGxLOTTdIW54cRqQkIMSLSQ=; b=ULP5OzOGBJ9DyYAcOrMKJLnqJKajnugwHIEaChifXqWw1GcWn/faRV1+/Ef99Al04E4wfx 6vVJFaKHWcMddenSHQaRJmtg2VXhkf/mtGV3IkAvQqJnoPrWXS5PrjAc+v14O1Xyj8eoIy zWEd7aRstvBi08wrkJtu4peL+uiCvkaakjFvTr2hAlgufpoFdo8upGyl/82yIcPOs+1doj ugOBtInQVZ6gA5QuwfnXfO5Hs5Lb6G+RZLMk5abZvGNnsCvlXTrP88Lq54eg+ViOzjJrFM ri9HkyknQ9/vsQ8zlSzHwN4bseGCVfaM+vSLILPBjoyV5zYMNOGjWMlbKATk5Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Vp0HY3C9wzqmQ; Mon, 27 May 2024 15:41: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 44RFfTVW025344; Mon, 27 May 2024 15:41:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44RFfThv025341; Mon, 27 May 2024 15:41:29 GMT (envelope-from git) Date: Mon, 27 May 2024 15:41:29 GMT Message-Id: <202405271541.44RFfThv025341@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: f952f27731ee - stable/13 - Increase IOAPIC_MAX_ID to 255 (from 254) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: f952f27731eea10bfa621bf8d19a1264a3244203 Auto-Submitted: auto-generated The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=f952f27731eea10bfa621bf8d19a1264a3244203 commit f952f27731eea10bfa621bf8d19a1264a3244203 Author: Ed Maste AuthorDate: 2024-05-10 17:40:59 +0000 Commit: Ed Maste CommitDate: 2024-05-27 15:25:28 +0000 Increase IOAPIC_MAX_ID to 255 (from 254) A test system provided by AMD panicked with "madt_parse_apics: I/O APIC ID 255 too high". I/O APIC ID 255 is acceptable, so increase the limit. Reviewed by: jhb, kib Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D45157 (cherry picked from commit 4e3286818327453efd8e4c133928ba26a169567a) (cherry picked from commit 18119e711f1c844bd6eacf5afc8d4cdec3ac8085) --- sys/x86/include/apicvar.h | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/sys/x86/include/apicvar.h b/sys/x86/include/apicvar.h index 0165d432be80..4d1bd4cc9cb0 100644 --- a/sys/x86/include/apicvar.h +++ b/sys/x86/include/apicvar.h @@ -78,7 +78,12 @@ #define MAX_APIC_ID 0x800 #define APIC_ID_ALL 0xffffffff -#define IOAPIC_MAX_ID xAPIC_MAX_APIC_ID +/* + * The 0xff ID is used for broadcast IPIs for local APICs when not using + * x2APIC. IPIs are not sent to I/O APICs so it's acceptable for an I/O APIC + * to use that ID. + */ +#define IOAPIC_MAX_ID 0xff /* I/O Interrupts are used for external devices such as ISA, PCI, etc. */ #define APIC_IO_INTS (IDT_IO_INTS + 16) From nobody Mon May 27 17:57: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 4Vp3Jq143wz5LcVg for ; Mon, 27 May 2024 17:57: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 4Vp3Jq0VbJz4XnZ; Mon, 27 May 2024 17:57:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716832667; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8yi1QH/GaVGV+N2BuQb1i4u6cmczX8EzvXsWOHH5tbY=; b=XhGZnfW5cH5RxRGrgvhvg3eVDAbJdPP9NzI/8T8o2Ek12zehAX2CyhDq3O15VYJ0pgcV51 87s6N0DOUf5TA+PGpIec3BUdUcfML1OpudiMv2MwWE+6xirND8QKljbaBy82D1rqeQXyZb QCtHUR4269BjdpjDgyyIVJCNzq+0g+hBqHGF74+8S7axVwAuySbF+hIjzoYcRIZnaG1mmr Gl7Rcei3B/ZVXlRoviit0+IwBixIx7b4LaidzjGUg6Zed0yPAVTyW4H46Gcd0kvP2+qYLT mY6QRCnHM05KEC4+Uc+qfIGdkdH2avheR4RYNpIIJhXG84h3pgGJwrPdlpY/xw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1716832667; a=rsa-sha256; cv=none; b=JMiS1ES0D1raeN51o9OIwChoa+yncWdm0efpvUcWSDMjrO/q8GET2XYoBOCW7waG/SMwha jb2+zYDIApq5S7hHytxvZ/QGhJChIyf1qf3YKremFPMDlleEqrx1sRr9rD8E8KApZBB7u7 7IAiO73+SvZqcNmTd7Y0WJvNYw5K1cNUz44cPY4rDYDK6MSZysmLw3NXt+ttYv+ZjBHyBN Mta6KKFKn4xOX3hd4g1idLZZI6e0hDiKsmaMG3MuRni5WXbDRlyeZl8WOSod9uQkszr5kU eZO96Hwz+d3EVg5f7AEA5sSJPUAAwd0blpxsYllA4n5qZk1D0qDjGmcj5fgFXQ== 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=1716832667; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8yi1QH/GaVGV+N2BuQb1i4u6cmczX8EzvXsWOHH5tbY=; b=wy/5688bRHrc53T9lzZURnCwxIEuUF6gQmQfvHWVyJRjo54GTl5wtW8QxmMq+pjKcRYKSH vfzyOtyjMpIkN55aSh8qVJq8XypdQRmv6euGC1VpjyS2za3CNP5Bshy0zQa3J46XPDtClE +NOXW5at4pmitjZwfwTWZHYJ/VP4kGos1Ycu31IvhOsKf/AytCgFhzKDKd1sOLEmdVisH2 goDMnMbgvFY3XzljL+KKgDlidbPx2V9eM7r8mgq5cCP84mvU6Eu5oJdP9icxIqAXyEto72 Y/ijDkkPwtCbwUk3dtGQSuXFKdw/eajpfkwD2DCHb5b1WxNILezAVFWdwEmfXQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Vp3Jq06h0zv6j; Mon, 27 May 2024 17:57: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 44RHvkgH046912; Mon, 27 May 2024 17:57:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44RHvkO5046911; Mon, 27 May 2024 17:57:46 GMT (envelope-from git) Date: Mon, 27 May 2024 17:57:46 GMT Message-Id: <202405271757.44RHvkO5046911@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: "Alfonso S. Siciliano" Subject: git: 15abc3a00b76 - Create tag vendor/bsddialog/1.0.3 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: asiciliano X-Git-Repository: src X-Git-Refname: refs/tags/vendor/bsddialog/1.0.3 X-Git-Reftype: annotated tag X-Git-Commit: 15abc3a00b76d51773d4cab8d988241011329424 Auto-Submitted: auto-generated The annotated tag vendor/bsddialog/1.0.3 has been created by asiciliano: URL: https://cgit.FreeBSD.org/src/tag/?h=vendor/bsddialog/1.0.3 tag vendor/bsddialog/1.0.3 Tagger: Alfonso S. Siciliano TaggerDate: 2024-05-27 17:53:02 +0000 contrib/bsddialog: Import version 1.0.3 Change --mixedform output to adapt to bsdinstall restoring dialog(1) behavior. Avoid to print the field value to output if is read-only (less than or equal to zero). This fixes passwords in wlanconfig, avoiding to print also SSID. To note --mixedform continues to print field value if is read-only. This avoids breaking netconfig and netconfig_ipv6. See /usr/src/contrib/bsddialog/CHANGELOG '2024-05-27 Version 1.0.3' for more detailed information. Reported by: garga -----BEGIN PGP SIGNATURE----- iQGTBAABCgB9FiEE3rLDBf8Ek2yJx9ZuP57vrP03HjcFAmZUyJtfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldERF QjJDMzA1RkYwNDkzNkM4OUM3RDY2RTNGOUVFRkFDRkQzNzFFMzcACgkQP57vrP03 Hjdrogf/UsI6keJIK7yLTPrZm+iYiQuwHc51yl5Gmqlq4LdmTb67zs2qO6yYMXS8 6902xoSouk524R3FBQLri+Ky6iVtGCRqo23m0NjNQdDFyYioFETEaaThIQKKmR3Z ZIQQK8SeWzkR2f8BZUqwFZMrneNFJrCjV9DAv7Qd8rgvWyNkMhwoJSs+4bA9HNGq HLEl2mEhSOg1Lt/HvF3TdvicULLuvhmMG+UgbKDECNqkZ4IiH8YrHk1Uiq0Fd8h2 AGtzlnGf45YQXZDk0ZATPVbijIt2eTs8Fyuy+F4nARCU3BxFwSDybpUpARN9foEc Y0+iOK74Na1DqFp+4gm8HEBNIRifAA== =L6wv -----END PGP SIGNATURE----- commit 813f3dc7b302324a361326c2583f37b002100968 Author: Alfonso S. Siciliano AuthorDate: 2024-05-27 17:51:37 +0000 Commit: Alfonso S. Siciliano CommitDate: 2024-05-27 17:51:37 +0000 contrib/bsddialog: Import version 1.0.3 Change --mixedform output to adapt to bsdinstall restoring dialog(1) behavior. Avoid to print the field value to output if is read-only (less than or equal to zero). This fixes passwords in wlanconfig, avoiding to print also SSID. To note --mixedform continues to print field value if is read-only. This avoids breaking netconfig and netconfig_ipv6. See /usr/src/contrib/bsddialog/CHANGELOG '2024-05-27 Version 1.0.3' for more detailed information. Reported by: garga From nobody Mon May 27 17:57: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 4Vp3Jq13zFz5Lchq for ; Mon, 27 May 2024 17:57: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 4Vp3Jq0M3Xz4Y3d; Mon, 27 May 2024 17:57:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716832667; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2lah/D/eoZqKudofwIRmZg0vt5LDpgQLGq2IVN332vE=; b=QfPF1sx7RKZ6HmCYVTZFvX8ljVHFKQEH0BhwLlW4a2a8s6KhYDqWY6Cwo1v7LZsRQsThaT OMbSZvE7pvt4+uPb17oq468q/x6VLaBqNcAawgxrdA0onjZMD2ea3wIRkln1zEdVe0qZHt jPz2zFIcNUW078hDZ9sBRHhAtZ1+onD4Qjf14oor30zmrEOnMi5gHFu5Il8BxzuNeqtKai htAHJGLb14MW1d1ilLi5ONcQtwBteEW3hL8CS1Oct8eUwZsqHbY7oP0MmnDW1acAzfqaqa ZZ88SetJuvVlBNiM2TUTBO2Ai5e9gz77PY+jtKyNfN3j+BZtMMtCPAbcwjq9xQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1716832667; a=rsa-sha256; cv=none; b=Xa6HJmtr5hbumTiwtkdXW28ZVdO4xgqgsydrAnhqsEyHuYOHADsHwaqFE3KbCvsJr+/rTU BINQ3A9mCD9jH7AT0Ry0EzDpd+bVbx9a6adtDH3wGhdgoEAYIdTI17q+XfC6FcJ7DmIX2r RxA7TUHravJTqy+39UNlT/tCQCIIPaj9yyw8CglomSN0hctq2Ee80e0bu1vfGN7DTCdhTJ Z7J6wVwfMND71g6Vxtcb0+GjCPssHpd9si5WFF0fx7omxoR8bRp6ewt7LbrX9CHo+dp8ma vxfkzU0Zg4IqSopi4+mnhwrMZ2IoWhzBirTiqz4FqMy6FrQkeIcRhtXTZrxIAg== 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=1716832667; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2lah/D/eoZqKudofwIRmZg0vt5LDpgQLGq2IVN332vE=; b=Aj+Cw42D3Sv+Bo44DIucDZ36ysJtJTauZ61hGGztyu7OGHs3XTyFjSMnnG2JXpl0c5ilQg nrMQPxAE2/46hG/wpXzQrcjWj8uoCfZq6xs+Gki6rPB0FUp0HHj8ZCACyTvj706ThZOeBc wMPB4iNgZIveffdGFdHpSGCvaRHTAkSZlNTdnwKCBhVrQMpRgv4n08voeyc6bDkgusYf4a GrhOSIn9pXClz11MdnDk+RZwEVmokG6eTmNYcAxQuDzGHUbL3+ZI4jyTnYEDxrOZU+e/rL nZw73fJZR8mEJCkjR9O8WL9RjPEbUGpCPsRKbQSxfbaa+WTsXpFvIeD3o8VkqQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Vp3Jp6mxMztjQ; Mon, 27 May 2024 17:57: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 44RHvkfB046893; Mon, 27 May 2024 17:57:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44RHvkc2046892; Mon, 27 May 2024 17:57:46 GMT (envelope-from git) Date: Mon, 27 May 2024 17:57:46 GMT Message-Id: <202405271757.44RHvkc2046892@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: "Alfonso S. Siciliano" Subject: git: be8846bd9e06..813f3dc7b302 - vendor/bsddialog - vendor branch updated List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: asiciliano X-Git-Repository: src X-Git-Refname: refs/heads/vendor/bsddialog X-Git-Reftype: branch X-Git-Commit: 813f3dc7b302324a361326c2583f37b002100968 X-Git-Oldrev: be8846bd9e069f4a6bea3d769005bea96cf43990 X-Git-Newrev: 813f3dc7b302324a361326c2583f37b002100968 Auto-Submitted: auto-generated The branch vendor/bsddialog has been updated by asiciliano: URL: https://cgit.FreeBSD.org/src/log/?id=be8846bd9e06..813f3dc7b302 813f3dc7b302 contrib/bsddialog: Import version 1.0.3 From nobody Mon May 27 19:36: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 4Vp5Vm2zxFz5Lnxv; Mon, 27 May 2024 19:36: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 4Vp5Vm0fm6z4j9x; Mon, 27 May 2024 19:36:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716838592; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Fz/+2YUF1TTvPb6Yj0q7VLuFupz5IdmUiWCaZYFZ70g=; b=oTQ+3OyF7aH6GOwqIsDOE7k8Nviuz47dUhXVNVRWeCyFRaH47rt8JwJBogQ5D7V8Rsq6MA oNAhcyUyuPCxKFILDA2ymWU1lwlSH+RvhP+Rmg1QMWtGACdaIEHp0HAthY6CsbbTcgYwHH yF90fI413yqPKYGfYupSP7Lv4BI/HjohE/2LZKEDDUFhTUohjf7Eb5TZ4NXJ1gyhoL2J23 VKL53XumAvR+SToFp5c6EFE3uFuahhlp3CaC9DpLE4gHjroW+ucGN9lRiiG6wt0psM2MUw w97hcUhOnwUsRi5hBmrDij6xSGTDH3K9Y4fKQ/jE2WjbZGFsQFtkhaazCvqhZw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1716838592; a=rsa-sha256; cv=none; b=Eu8x2Nii/bQ7cf81SlrXcqwJbbohdoFgdnhROJzH1TcVGHbkUnkpWCEjW2BF16xeE2LDCI ymY3I3/B0MKyeWpUTfxg/ifxrIYYLERqTZ01rHfr2JSysCUZQpT9THB4PW532ND3cP7O7F FeexW7N7GaK5jMowNOBfJFZ2JZ/nN9OSZcCot9PDV19wAO3yZAcaw3fAwoaLxYkRhFGzSn xJ9nvrf+ap2j7IUpURow5YC7R/YKH2uYs225Zu2NM9NbB9XAthck7PFNErML83JMx+Zp9A ciXyUh/mAo9AMwMj6g21buc+XV17vmMrx55adIyzFg9dlpHJD/GlJUvRs/t7jg== 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=1716838592; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Fz/+2YUF1TTvPb6Yj0q7VLuFupz5IdmUiWCaZYFZ70g=; b=OOAjg32pce9t458/DmEQp3C+5N9QYttI5aeSkH1d+fRmmTU8/hdcu5y7pj8svi7m5dzRF8 S9xqnis8zYgbUowxhreuoSp+4iyIZBEVIUiD+qzt28qVGcPnu2y3Xr4Q9VG/sfFJQqDX+r qDaPguw5XIcnGqarF9RXOz78/JDCz7OPITXozX8SyEJ3DUhH7ShSJJExjduJnoRx7Gp+mV +Iu0Xr3xFuWFpImyGrm4PzJPn1E7BuTU6AQe4rG655aJ64cOXnIQuobdVXf3T0IKCekf3I 1jtl6OSywtl5lh5p9hf2TqlkrWnT7jx4zXZhV4LMRTce3MDkLOyMbypc+CSg7Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Vp5Vl65Dbzxh9; Mon, 27 May 2024 19:36: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 44RJaV3F016664; Mon, 27 May 2024 19:36:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44RJaV8e016661; Mon, 27 May 2024 19:36:31 GMT (envelope-from git) Date: Mon, 27 May 2024 19:36:31 GMT Message-Id: <202405271936.44RJaV8e016661@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Alfonso S. Siciliano" Subject: git: 079f60541fdb - main - contrib/bsddialog: Import version 1.0.3 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: asiciliano X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 079f60541fdb363215beb98583e76f8c0729449d Auto-Submitted: auto-generated The branch main has been updated by asiciliano: URL: https://cgit.FreeBSD.org/src/commit/?id=079f60541fdb363215beb98583e76f8c0729449d commit 079f60541fdb363215beb98583e76f8c0729449d Merge: c52ca7dd0906 813f3dc7b302 Author: Alfonso S. Siciliano AuthorDate: 2024-05-27 19:32:01 +0000 Commit: Alfonso S. Siciliano CommitDate: 2024-05-27 19:32:01 +0000 contrib/bsddialog: Import version 1.0.3 Change --mixedform output to adapt to bsdinstall restoring dialog(1) behavior. Avoid to print the field value to output if is read-only (less than or equal to zero). This fixes passwords in wlanconfig, avoiding to print also SSID. To note --mixedform continues to print field value if is read-only. This avoids breaking netconfig and netconfig_ipv6. See /usr/src/contrib/bsddialog/CHANGELOG '2024-05-27 Version 1.0.3' for more detailed information. Reported by: garga (redo branch main moved forward) Merge commit '813f3dc7b302324a361326c2583f37b002100968' into redo-bsddialog-1.0.3 contrib/bsddialog/CHANGELOG | 9 +++++++++ contrib/bsddialog/Makefile | 2 +- contrib/bsddialog/README.md | 4 +++- contrib/bsddialog/lib/bsddialog.h | 2 +- contrib/bsddialog/utility/bsddialog.1 | 7 ++++++- contrib/bsddialog/utility/util_builders.c | 7 ++++++- 6 files changed, 26 insertions(+), 5 deletions(-) diff --cc contrib/bsddialog/Makefile index e6ec9988c59d,000000000000..f1b2da675f9e mode 100644,000000..100644 --- a/contrib/bsddialog/Makefile +++ b/contrib/bsddialog/Makefile @@@ -1,38 -1,0 +1,38 @@@ +# PUBLIC DOMAIN - NO WARRANTY, see: +# +# +# Written in 2023 by Alfonso Sabato Siciliano + +OUTPUT = bsddialog - export VERSION=1.0.2 ++export VERSION=1.0.3 +.CURDIR ?= ${CURDIR} +LIBPATH = ${.CURDIR}/lib +LIBBSDDIALOG = ${LIBPATH}/libbsddialog.so +UTILITYPATH = ${.CURDIR}/utility + +RM= rm -f +LN = ln -s -f + +### command-line options ### +# FreeBSD port Makefile: 'MAKE_ARGS = -DNORPATH' +NORPATH ?= +export DISABLERPATH=${NORPATH} +# Debug: `make -DDEBUG` or `gmake DEBUG=1` +DEBUG ?= +export ENABLEDEBUG=${DEBUG} +################### + +all : ${OUTPUT} + +${OUTPUT}: ${LIBBSDDIALOG} + ${MAKE} -C ${UTILITYPATH} LIBPATH=${LIBPATH} + ${LN} ${UTILITYPATH}/${OUTPUT} ${.CURDIR}/${OUTPUT} + +${LIBBSDDIALOG}: + ${MAKE} -C ${LIBPATH} + +clean: + ${MAKE} -C ${LIBPATH} clean + ${MAKE} -C ${UTILITYPATH} clean + ${RM} ${OUTPUT} *.core + diff --cc contrib/bsddialog/README.md index a902f7fada7a,000000000000..f984b488b232 mode 100644,000000..100644 --- a/contrib/bsddialog/README.md +++ b/contrib/bsddialog/README.md @@@ -1,140 -1,0 +1,142 @@@ - # BSDDialog 1.0.2 ++# BSDDialog 1.0.3 + +This project provides **bsddialog** and **libbsddialog**, an utility +and a library to build scripts and tools with TUI dialogs and widgets. + + +## Demo + +[Screenshots](https://www.flickr.com/photos/alfonsosiciliano/albums/72157720215006074). + + +## Getting Started + +FreeBSD and Linux: + +``` +% git clone https://gitlab.com/alfix/bsddialog.git +% cd bsddialog +% make +% ./bsddialog --msgbox "Hello World!" 8 20 +``` + +Output: + +![screenshot](screenshot.png) + + +## Utility + +**Dialogs:** + +--calendar, --checklist, --datebox, --form, --gauge, --infobox, --inputbox, +--menu, --mixedform, --mixedgauge, --msgbox, --passwordbox, --passwordform, +--pause, --radiolist, --rangebox, --textbox, --timebox, --treeview, --yesno. + +**Manual** + + - [bsddialog(1)](https://alfonsosiciliano.gitlab.io/posts/2022-01-26-manual-bsddialog.html) + + +**Examples**: + +``` +% ./bsddialog --backtitle "TITLE" --title msgbox --msgbox "Hello World!" 5 30 +% ./bsddialog --theme blackwhite --title msgbox --msgbox "Hello World!" 5 30 +% ./bsddialog --begin-y 2 --default-no --title yesno --yesno "Hello World!" 5 30 +% ./bsddialog --ascii-lines --pause "Hello World!" 8 50 10 +% ./bsddialog --checklist "Space to select" 0 0 0 Name1 Desc1 off Name2 Desc2 on +% ./bsddialog --title yesno --hline "bsddialog" --yesno "Hello World!" 5 25 +% ./bsddialog --extra-button --help-button --yesno "Hello World!" 0 0 +``` + +and [Examples](https://gitlab.com/alfix/bsddialog/-/tree/main/examples_utility) +in the _Public Domain_ to build new projects: +``` +% sh ./examples_utility/calendar.sh +% sh ./examples_utility/checklist.sh +% sh ./examples_utility/datebox.sh +% sh ./examples_utility/form.sh +% sh ./examples_utility/gauge.sh +% sh ./examples_utility/infobox.sh +% sh ./examples_utility/inputbox.sh +% sh ./examples_utility/menu.sh +% sh ./examples_utility/mixedform.sh +% sh ./examples_utility/mixedgauge.sh +% sh ./examples_utility/msgbox.sh +% sh ./examples_utility/passwordbox.sh +% sh ./examples_utility/passwordform.sh +% sh ./examples_utility/pause.sh +% sh ./examples_utility/radiolist.sh +% sh ./examples_utility/rangebox.sh +% sh ./examples_utility/timebox.sh +% sh ./examples_utility/yesno.sh +``` + +## Library + +**API** + + - [bsddialog.h](https://gitlab.com/alfix/bsddialog/-/blob/main/lib/bsddialog.h) + - [bsddialog\_theme.h](https://gitlab.com/alfix/bsddialog/-/blob/main/lib/bsddialog_theme.h) + + +**Manual** + + - [bsddialog(3)](https://alfonsosiciliano.gitlab.io/posts/2022-01-15-manual-libbsddialog.html) + + +**Examples**: + +[Examples](https://gitlab.com/alfix/bsddialog/-/tree/main/examples_library) +in the _Public Domain_ to build new projects: +``` +% cd examples_library +% sh compile +% ./calendar +% ./checklist +% ./datebox +% ./form +% ./gauge +% ./infobox +% ./menu +% ./mixedgauge +% ./mixedlist +% ./msgbox +% ./pause +% ./radiolist +% ./rangebox +% ./theme +% ./timebox +% ./yesno +``` + + +## TODO and Ideas + + - menubar feature. + - key callback. + - Right-To-Left text. + - some terminal does not hide the cursor, move it bottom-right before to getch. + - refactor backtitle: add WINDOW \*dialog.backtitle for multiline and fix expanding screen. + - refactor bottomdesc: add WINDOW \*dialog.bottomdesc to fix expandig screen. + - accessibility https://wiki.freebsd.org/Accessibility/Wishlist/Base. + - add bool conf.menu.depthlines. + - implement custom getopt\_long(). + - refactor/redesign gauge(). + - improve grey lines expanding terminal (maybe redrawwin() in hide\_dialog()). + - more restrictive strtol() and strtoul(). + - implement global buttons handler. + - doc: external tutorial, theming guide. + - implement menutype.min\_on. + - improve refresh at startup, avoid dialog refresh before drawing text. + - add debug API: bsddialog\_debug(y,x,refresh,"fmt",...). + - add mouse support. + - use alarm(2) for bsddialog\_pause. + - delete form fieldlen constraint, hide or truncate long field in little screens. + - improve --inputbox autosizing, consider also input length. + - fix --form "" 0 0 0 Label 1 0 Init 1 12 0 0 (with 0 editable field). + - fix --mixedform "" 0 0 0 Label 1 0 Init 1 12 0 0 2 (with 0 editable field). + - add *text* customization to --hmsg *help-message* ++ - check --passwordform *fieldlen* like --form and --mixedform. ++ From nobody Mon May 27 21: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 4Vp8D80pFCz5M1Qq; Mon, 27 May 2024 21:39:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Vp8D809B5z40mZ; Mon, 27 May 2024 21: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=1716845944; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Rsok/dyyq3Mul/mqj+6PFIbhqXgezyK+Dg7vNAzh64o=; b=Bz6cnP9sJoCp6WeVDtF/G7ig+GpIoVdQhVQ3e6W5Saf26CxbRW0yysp1FAI89GRKkcN5lK mc8Cb46izZAOP+mPGMbWPpg26Nq799bRjnuYxUB4GhKM4aEj032QSuffDIXK+OFw81vbu3 hTc8dgj7wzwdmeIA+xvCI/rOu6hQKuLtd6upk8NyRlyvY27/3gfpYl8AGMS1X61jIq1ptK AhGFSfpFRzaFEU31gdCrMYKSzZqj6r3YRuSsxXVXSC/uD3EUdar4MLDq5nY71EvlRFptdZ PUFK6mvtbyMfM8rJ0SDq1mWApTzlzRvHtZkdMhDH9MG/N+RGL3UsUvBUXx9mjw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1716845944; a=rsa-sha256; cv=none; b=aou9vCaMAEDARjNFmodzZ/jxT5QJE/XAx6DAJrrFszCWPryVpRkEC2Ydbig7twWi/bwKCK 5D0wIAlnWZ1u0Ps1xsHMAJPAepQCPG+WOvL3wufhDrO1Rd1Lz/AwPynbci2P1ycLGJcOxx rsWDl+CDdJD3M2msu+4sPjoTLh2WvWZU9n4AcjeDcMhTpdpUa3fUhwwmhfceiT0Ih4PHv8 hIfU2JmNBniUxURd6Sf8NQE9g3/qMXok8S+gCIlCJurggdzGAKDM+R8jM54956PJ8OwvPB hPEBK+wFeYlZrTP7eYDfMS2LLkyOKpMzs076GSII1cFcFgWWmtHSDI3x4xjPXQ== 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=1716845944; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Rsok/dyyq3Mul/mqj+6PFIbhqXgezyK+Dg7vNAzh64o=; b=RLTNsUU0cVVh2lg5JZG06cO0HXG1VvEqAeAmfnfCZNODRTuAU08im7QrajkJtjdEhJZ9wE YZMnTU6DvjqTP2hkNfwtzIQuUlrKxEdyieHvowmHFaMEkia+u6AUt7zBK9I5MNKMDwMG8M 9Gl3ft65HJf56c+2ijqhSkwqm+UNt/EjlR5fImib8srz1YOh46GgWElwOlcc1WFXZxUXAZ upG6NYBUe23wWRolcHwsalVqxVLUjp1OLbfny8YMzCT+9+AtTh6k9NpKECjmjQMw7JhvoX pEZFuai2kOtmnfaKBQHwSB6QX4itIG5EDnWRBF0pAooqYOPTZyO9J2mpODP4Eg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Vp8D76lqVz10wm; Mon, 27 May 2024 21: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 44RLd3dE021644; Mon, 27 May 2024 21: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 44RLd3DV021641; Mon, 27 May 2024 21:39:03 GMT (envelope-from git) Date: Mon, 27 May 2024 21:39:03 GMT Message-Id: <202405272139.44RLd3DV021641@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: deab57178f0b - main - Adjust comments referencing vm_mem_init() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: deab57178f0b06eab56d7811674176985a8ea98d Auto-Submitted: auto-generated The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=deab57178f0b06eab56d7811674176985a8ea98d commit deab57178f0b06eab56d7811674176985a8ea98d Author: Mitchell Horne AuthorDate: 2024-05-27 21:37:40 +0000 Commit: Mitchell Horne CommitDate: 2024-05-27 21:37:40 +0000 Adjust comments referencing vm_mem_init() I cannot find a time where the function was not named this. Reviewed by: kib, markj MFC after: 3 days Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D45383 --- sys/amd64/amd64/pmap.c | 7 ++++--- sys/arm/arm/pmap-v6.c | 5 +++-- sys/arm64/arm64/pmap.c | 3 ++- sys/i386/i386/pmap.c | 3 ++- sys/kern/kern_malloc.c | 3 ++- sys/powerpc/booke/pmap.c | 5 +++-- sys/riscv/riscv/pmap.c | 3 ++- sys/vm/vm_init.c | 2 +- 8 files changed, 19 insertions(+), 12 deletions(-) diff --git a/sys/amd64/amd64/pmap.c b/sys/amd64/amd64/pmap.c index ff702ed2dcfb..8105c9d92478 100644 --- a/sys/amd64/amd64/pmap.c +++ b/sys/amd64/amd64/pmap.c @@ -1609,8 +1609,8 @@ nkpt_init(vm_paddr_t addr) * Secondly, device memory mapped as part of setting up the low- * level console(s) is taken from KVA, starting at virtual_avail. * This is because cninit() is called after pmap_bootstrap() but - * before vm_init() and pmap_init(). 20MB for a frame buffer is - * not uncommon. + * before vm_mem_init() and pmap_init(). 20MB for a frame buffer + * is not uncommon. */ pt_pages += 32; /* 64MB additional slop. */ #endif @@ -2449,7 +2449,8 @@ pmap_init_pv_table(void) /* * Initialize the pmap module. - * Called by vm_init, to initialize any structures that the pmap + * + * Called by vm_mem_init(), to initialize any structures that the pmap * system needs to map virtual memory. */ void diff --git a/sys/arm/arm/pmap-v6.c b/sys/arm/arm/pmap-v6.c index a2e1e28f53e6..8d7292f7aa02 100644 --- a/sys/arm/arm/pmap-v6.c +++ b/sys/arm/arm/pmap-v6.c @@ -1705,8 +1705,9 @@ pmap_pt2pg_init(pmap_t pmap, vm_offset_t va, vm_page_t m) /* * Initialize the pmap module. - * Called by vm_init, to initialize any structures that the pmap - * system needs to map virtual memory. + * + * Called by vm_mem_init(), to initialize any structures that the pmap system + * needs to map virtual memory. */ void pmap_init(void) diff --git a/sys/arm64/arm64/pmap.c b/sys/arm64/arm64/pmap.c index 2ce313de36cf..cd7837e58380 100644 --- a/sys/arm64/arm64/pmap.c +++ b/sys/arm64/arm64/pmap.c @@ -1629,7 +1629,8 @@ pmap_init_pv_table(void) /* * Initialize the pmap module. - * Called by vm_init, to initialize any structures that the pmap + * + * Called by vm_mem_init(), to initialize any structures that the pmap * system needs to map virtual memory. */ void diff --git a/sys/i386/i386/pmap.c b/sys/i386/i386/pmap.c index 6552fbbca4d5..40d8ceaf42b9 100644 --- a/sys/i386/i386/pmap.c +++ b/sys/i386/i386/pmap.c @@ -952,7 +952,8 @@ pmap_ptelist_init(vm_offset_t *head, void *base, int npages) /* * Initialize the pmap module. - * Called by vm_init, to initialize any structures that the pmap + * + * Called by vm_mem_init(), to initialize any structures that the pmap * system needs to map virtual memory. */ static void diff --git a/sys/kern/kern_malloc.c b/sys/kern/kern_malloc.c index 9df747389e21..20c406a6abf5 100644 --- a/sys/kern/kern_malloc.c +++ b/sys/kern/kern_malloc.c @@ -1266,7 +1266,8 @@ malloc_init(void *data) struct malloc_type_internal *mtip; struct malloc_type *mtp; - KASSERT(vm_cnt.v_page_count != 0, ("malloc_register before vm_init")); + KASSERT(vm_cnt.v_page_count != 0, + ("malloc_init() called before vm_mem_init()")); mtp = data; if (mtp->ks_version != M_VERSION) diff --git a/sys/powerpc/booke/pmap.c b/sys/powerpc/booke/pmap.c index 69edb58ae235..fe84a2a3c213 100644 --- a/sys/powerpc/booke/pmap.c +++ b/sys/powerpc/booke/pmap.c @@ -1055,8 +1055,9 @@ mmu_booke_kextract(vm_offset_t va) /* * Initialize the pmap module. - * Called by vm_init, to initialize any structures that the pmap - * system needs to map virtual memory. + * + * Called by vm_mem_init(), to initialize any structures that the pmap system + * needs to map virtual memory. */ static void mmu_booke_init(void) diff --git a/sys/riscv/riscv/pmap.c b/sys/riscv/riscv/pmap.c index b571806bb2da..1e507f62696e 100644 --- a/sys/riscv/riscv/pmap.c +++ b/sys/riscv/riscv/pmap.c @@ -759,7 +759,8 @@ pmap_page_init(vm_page_t m) /* * Initialize the pmap module. - * Called by vm_init, to initialize any structures that the pmap + * + * Called by vm_mem_init(), to initialize any structures that the pmap * system needs to map virtual memory. */ void diff --git a/sys/vm/vm_init.c b/sys/vm/vm_init.c index 56c3695f2c87..0fd13f73a180 100644 --- a/sys/vm/vm_init.c +++ b/sys/vm/vm_init.c @@ -101,7 +101,7 @@ static void vm_mem_init(void *); SYSINIT(vm_mem, SI_SUB_VM, SI_ORDER_FIRST, vm_mem_init, NULL); /* - * vm_init initializes the virtual memory system. + * vm_mem_init() initializes the virtual memory system. * This is done only by the first cpu up. */ static void From nobody Tue May 28 02:23: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 4VpGXV1dj8z5LJNQ; Tue, 28 May 2024 02:23: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 4VpGXV0j8Yz4PvZ; Tue, 28 May 2024 02:23:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716863018; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lGKyUShqLkp6+zO+GQ6sxj5mJHqiWojxvCop1jRY3lM=; b=kdE13afAGobM7oLHMQmQrXiPqirswVFs5suolnDoLnoG/QHnN/R62bjXeN6iyhmPzALUrD QW8DYk5yCdzckAdGN5R/ewsge+0ulKeoRH5MiG6HmGx8oG4cv1h6W65DlZaP+mc3lYjM0q 8YBznMjDPoWl30PIxrrQ4a1WAUHEIwMvC1kL3Z5yDvwwmQleviYoZJQXfafGunMqSEAnfd eMJVM2Qkpp5BTYUZrTYnJ+jOd3uodrIl0MAxIOeOxrMWK8YK4uyC1MPV41BJKPrUFE0Gvt /UOnAAOZjOOl4zGuWBiJYvkx9MAYTAAuZ8ZGwD5kPrRyOxUKpejHY8RuLAopnw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1716863018; a=rsa-sha256; cv=none; b=l+H+Yiyn/LL3V7E6H+grxng56pAWSc+nfpMfSBRJvnNwTjXdFxB9leV80U0nPAXuIrSUzv Y5KSSHQmqGv46eSRDkmRvM4n6F7tSd9x5ER52tZeZpNdnHK5/EbTf2TWaAgRwFeUbaHrDu pzW4F7ZEnKUPO1BDaUcycJYbfDBkbd5N9cSd+dAAs6F8HoZNNND6o6Ldl7mkRyDeTl60T2 4bWkYoVTKlQZVbTOFzgtp+gLlxUF71d2GwTSonZSaGHSdxSjFte4i6kRJJy20ZPJXQANhj uKHf6b89ORUwNvflgllFvyZ0ygv0ZceAylL5/PGx65DYfWNG1u/MG6gJ8mkLew== 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=1716863018; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lGKyUShqLkp6+zO+GQ6sxj5mJHqiWojxvCop1jRY3lM=; b=mUk4vwURxT9PE2P+ymNPV9v5uSduymykrLoBMcOGGF+0xHNimsFL50jk0lpq22THBBMCOt G4uYZuHY2OsIbz3ClrBnaJ/E9G9e991VvwJxiKMIVXMoH0VVZSSTkdNYhrkoAlGappFEkj 3uCc6TTU/RDps7kVLKL+Beyv3Zz/cdRaSHgWr5CXBpR8TFfr1dWcCiuf19/Mgj0ua1o+t/ u3BztzFc0ODuiDjuTZ9gadIunlE3JU5Tk8hNW+UvbyS+yNIkIo8WhggzyuyIdTGBj0bQL4 rkDvQRrORhfMJLt9Csn4tMMpCjaFLxx6ILyzdrk/lBl7JASKvhCRlYxqbweuAg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VpGXV0JTgz18dw; Tue, 28 May 2024 02:23: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 44S2NbeY011261; Tue, 28 May 2024 02:23:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44S2Nbv3011258; Tue, 28 May 2024 02:23:37 GMT (envelope-from git) Date: Tue, 28 May 2024 02:23:37 GMT Message-Id: <202405280223.44S2Nbv3011258@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: 6c9170e0afc4 - main - svc.c: Check for a non-NULL xp_socket List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: 6c9170e0afc4ebec81ba88a6370ebf6cb55520ba Auto-Submitted: auto-generated The branch main has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=6c9170e0afc4ebec81ba88a6370ebf6cb55520ba commit 6c9170e0afc4ebec81ba88a6370ebf6cb55520ba Author: Rick Macklem AuthorDate: 2024-05-28 02:22:04 +0000 Commit: Rick Macklem CommitDate: 2024-05-28 02:22:04 +0000 svc.c: Check for a non-NULL xp_socket Commit a16ff32f04b5 added support to the kernel RPC to set TCP_USE_DDP. However, for the unusual case of a NFSv4.1/4.2 non-NULL callback, the xp_socket field of SVCXPRT is NULL, since it uses the same socket as the client->server connection. This patch adds the check for this to avoid crashes. This only affects NFSv4.1/4.2 mounts where either pNFS or delegations are in use. MFC after: 3 days --- sys/rpc/svc.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/rpc/svc.c b/sys/rpc/svc.c index 99678f693a3e..f94e744d40f4 100644 --- a/sys/rpc/svc.c +++ b/sys/rpc/svc.c @@ -996,6 +996,7 @@ svc_getreq(SVCXPRT *xprt, struct svc_req **rqstp_ret) * enable TLS offload first. */ if (xprt->xp_doneddp == 0 && r->rq_proc != NULLPROC && + xprt->xp_socket != NULL && atomic_cmpset_int(&xprt->xp_doneddp, 0, 1)) { if (xprt->xp_socket->so_proto->pr_protocol == IPPROTO_TCP) { From nobody Tue May 28 04:22: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 4VpK966MTRz5LXHw; Tue, 28 May 2024 04:22: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 4VpK965d0xz4YXG; Tue, 28 May 2024 04:22:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716870122; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UELdCtdDu3FOiWCSoQbIm/m1RP6cSXk6hcXNhK+o0Po=; b=IaDgmZTZ/D8EbMG2E7ErORgOlRUNRBW8uAuFj9OyE4fuKLWBkLjI5PuplXMpzlooVrfaHg ENHKAdddpqQqlP6nUgbcu+KZFzvGR4Ky8lhb8sQ0KhO5v+d1aGnZZXbZrqc7/FwwQgfTZu X+3FFKq65JWUO+PVnAMwB2o8nfndwvcver6ZMWAHznL2F8BnNRHYwlXYAFbxaoIEOZuloa 2uZSSzDtyyuoAsWXDJXwTa/GJhOy5EzIcUm6/hbZlBSR7TzELxzD6wsnMIFm71ewxjWsSj x5tulrm3D6c/DqArxhX3P7QDtlVktAeXcco7F0yZGPL3xF6djDEfd826yOUtLg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1716870122; a=rsa-sha256; cv=none; b=SluO/1pW3dLY3nol/jk9xi85i2O4UAVrVf0Wr/a0aB0NLkgahl/A96lbXCOM4ZHIoROB/Z qtQWzQ6GSaSSdZWmylHxeXk0Kdjw2bWxLvqGtweRR4F3AM/dnSBBcQOlXC+am9vDNXludg qL2OrMwoCnacp3QZrH7hlvnHrL0+s1XBypJdnCpypJ/dSmjC0gieANNo0oC91w90bp87KK lebxYdblhdCbes6uvV1rafvs+vDph5wRh7bEH4ehXeCw+dii/qhUIZTedFV+lhsDoel0OT EiH1gVGZHdJ8ULQx6VWZIuMFHIrNOYHx6B6Usbv5UumXuerp7WUmOIc/gYlenQ== 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=1716870122; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UELdCtdDu3FOiWCSoQbIm/m1RP6cSXk6hcXNhK+o0Po=; b=BWgXGz9/75Ner/yXwikQ8dqQnjA9JoFQHB6IRF5aM4Vly+9Fb8BfDE2tzRhT3yGewlZw+i ODyfotO2Kg19WPzFiIJ/ExHCQ58aSeRF+4D1MtbbmtWV0GPMsPKSVKiODjyJynI0nYAwLf /AtVXyinIZgAB0yI+7IKXUYVLGB9qJHJdY/sBK46aWKzbmuulFH2u48c8Xg6m3RI++bKZO DexawGrBit5ffmx2UL1se5oSgz2viWULiARI30VWMBNASTdxlBOqS0SaH9jdx8sHRQ/mZl WwjKBowpcrDl8Rdgo74ZIy+4VtM5nS2LptOJbVzr6bITX05cx7fY4JVfxOBq0Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VpK965Dscz1Cfy; Tue, 28 May 2024 04:22: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 44S4M2sc015183; Tue, 28 May 2024 04:22:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44S4M2CK015180; Tue, 28 May 2024 04:22:02 GMT (envelope-from git) Date: Tue, 28 May 2024 04:22:02 GMT Message-Id: <202405280422.44S4M2CK015180@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: 5fd1902b0c76 - stable/14 - compat_freebsd4: Add const qualifier to the local variable s inside function freebsd4_uname() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: 5fd1902b0c768fa43d3d7eebf7efd0957d5e144f Auto-Submitted: auto-generated The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=5fd1902b0c768fa43d3d7eebf7efd0957d5e144f commit 5fd1902b0c768fa43d3d7eebf7efd0957d5e144f Author: Zhenlei Huang AuthorDate: 2024-05-28 04:21:20 +0000 Commit: Zhenlei Huang CommitDate: 2024-05-28 04:21:20 +0000 compat_freebsd4: Add const qualifier to the local variable s inside function freebsd4_uname() This local variable s is for iterating characters of global variable `version`. The content of `version` is not going to be altered by function freebsd4_uname(). MFC after: 1 week (cherry picked from commit 92f2a4c820fea9efcb6ee6a7029495c8152958c1) --- sys/kern/kern_xxx.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/kern/kern_xxx.c b/sys/kern/kern_xxx.c index 66d99edb7da1..d6687fae0caf 100644 --- a/sys/kern/kern_xxx.c +++ b/sys/kern/kern_xxx.c @@ -318,7 +318,8 @@ freebsd4_uname(struct thread *td, struct freebsd4_uname_args *uap) { int name[2], error; size_t len; - char *s, *us; + const char *s; + char *us; name[0] = CTL_KERN; name[1] = KERN_OSTYPE; From nobody Tue May 28 04:22: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 4VpK981qqYz5LX4h; Tue, 28 May 2024 04:22: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 4VpK976fXFz4Yg6; Tue, 28 May 2024 04:22:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716870123; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zDoMOk7/J/5Y7WYf+YPB5lFvyL1gDf8b4h4WFAze5pA=; b=pgpHEQeqk4C7P+X3XkZ2+brdQWLnARud33K5GkOKx4/1gD5SQ6IYazlZnAQcyeYSq2lCc4 PqeqjWEoxxcHE4mqqrovQgf6wc5ANQmHxld/asoptBI1DHidYhSSR9j/n6w6wkjKX8qWcM yJBI1ajziorWwZK43GjtkCy2TVApglE9p05Dpvo1xN/db7NWGogSheYiMilIOJXXINMo/n pCwsgfyWNKt75KaeEhl+8kStPaYNhJ5wJ+Ag9EssZlyW1TZCI3XS9ANo6mZCDFExr5aHqe fcZyi3cCkRLWA2whEnYSEVHBUl3+OIgCNcku2XioQeUcmPwjcJd0fnIC9Dsg7w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1716870123; a=rsa-sha256; cv=none; b=biDkP62IYg55iAqq+4EJ8jfxu5ib58hpZuBBpQS/aUY+7eDCAxYswRf2ZtniOIDDUNMhgR wGwMKaXOqvf+0AtZs6vXgJ5PAsWt/nd1oYdv0HE6ZFklo3dp0m/ZYkIo02xMSPG9/jdIrD YnUl73O/CqHY4R3I/aGETh0B20likE+jkw7JDmd03ajrUelVHblSQL62Tj+oi4W9E9/u/U b1Hw0mLZKvaBGOZv9C/JUuBTC8iqlVlE8hG68pO5Oht8x09hoJoogjC6C/Uo4So91QoZ// ISMHbT064L8UQxgghke9Fsn7mCrN0sKxQPEOmUaUKZ9OLaM9bX77JRS05pNhtg== 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=1716870123; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zDoMOk7/J/5Y7WYf+YPB5lFvyL1gDf8b4h4WFAze5pA=; b=YiSxOqvqBplgN9s4BmMcz2/9mEy4sJONUh2Hh/SVbRSbrDNey0fRqkuM6uyR9wsKMAFDJH lBeehHWoXyQ0uTP7vkBewLfljS/xiBKs6aQ5Fh7qS6iwTCjYstE6n8jkEkRt6LQoESGgF3 +js9X7lPXJsT+yVmZTz7G5UOSpJbolKEg0vAP7pxWVb8NcvWouTmyqCNovNh4rbfb6oje9 nVCUFQKiNUysPoOTmnjzsRi421PX7RaJ+A69d6PhW7+ketBdw6x0zLEjPajpug+sojYD9h D1/k2xJNNtL/dehgf+TodqPD2772u1kMdRhQz+UZGJVNwnLAIVJpq2mCDXrShw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VpK976H0Pz1CYl; Tue, 28 May 2024 04:22: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 44S4M3ae015255; Tue, 28 May 2024 04:22:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44S4M3kG015252; Tue, 28 May 2024 04:22:03 GMT (envelope-from git) Date: Tue, 28 May 2024 04:22:03 GMT Message-Id: <202405280422.44S4M3kG015252@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: 1b3f88bc8095 - stable/14 - linux(4): Add const qualifier to the value parameter of function handle_string() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: 1b3f88bc809526cc7cd22c88b4fdaadf1a2e5e75 Auto-Submitted: auto-generated The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=1b3f88bc809526cc7cd22c88b4fdaadf1a2e5e75 commit 1b3f88bc809526cc7cd22c88b4fdaadf1a2e5e75 Author: Zhenlei Huang AuthorDate: 2024-05-28 04:21:20 +0000 Commit: Zhenlei Huang CommitDate: 2024-05-28 04:21:20 +0000 linux(4): Add const qualifier to the value parameter of function handle_string() The content that `value` point to is not going to be altered by function handle_string(). MFC after: 1 week (cherry picked from commit 68c890b4433d3655c7df91cc43f89f4d6a8b35e4) --- sys/compat/linux/linux_sysctl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/compat/linux/linux_sysctl.c b/sys/compat/linux/linux_sysctl.c index 65c64a7ba563..97341c051af7 100644 --- a/sys/compat/linux/linux_sysctl.c +++ b/sys/compat/linux/linux_sysctl.c @@ -74,7 +74,7 @@ LIN_SDT_PROBE_DEFINE1(sysctl, linux_sysctl, unsupported_sysctl, "char *"); #ifdef LINUX_LEGACY_SYSCALLS static int -handle_string(struct l___sysctl_args *la, char *value) +handle_string(struct l___sysctl_args *la, const char *value) { int error; From nobody Tue May 28 04:42: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 4VpKcL4kGdz5LZ2Q; Tue, 28 May 2024 04:42: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 4VpKcL4Hg2z4cH4; Tue, 28 May 2024 04:42:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716871330; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OUPapiRxCYezTbrSe+UI4HtGB5TSCzVsRgr1s3jss/M=; b=e6eUnmi1wUvPqwWoodRJVorG+zWNjGJCCpFkzT/dVo5AMyqXVFaA2YuBEkRCPuqf76uEKG 9e7A6n5rieLhajUxQ7sXkjdlskRV0ktuJPvDox4HeOgqmOLi18RQP4y1jbhWdrfxs/Ag6A dZJJUEyJzrJsd6OOIOvSCWl9YOUxiDmr9Mffnwwl+8WL8YqVokRBmG3oM2OAF8twDZ0VjX O5Amr5KnRcMYQiJ19pIbsQpGksfBEX/Cg4KXFAyeJOXUd555aptEbjKcGsvpewtV+FRRcg aRsA/aj5nuRzqpxiCe2wpLjVWKEY/LFSJHllO7YlwGkUOLM+yMpBxtQ7uWYsyA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1716871330; a=rsa-sha256; cv=none; b=tabZKG7Ggfns3PPpn9ANv5MflVmD2pYUyVDsshcSQvz4oo1ca9FJO5RJBAlu/6wqD4oB5/ 8FeUyW7j3NkAjqdS2bIrl/MTSXtPnbXsOuyE98G3ObNuDGhh146Wl4s7LmwFMxczX4c94v P/encJrlpTfq5aX197RLCA//kyt0kMIPsvx9DduwBxoBZzINdF3SZrjl48vimff4ou+iw0 rv1AbNId0NI4YXYuXPYJhQg+OYEk0e4oDovYA8hFy3PUiTcnd0r8cd2YKCaJ9KlByPn8dR 4d7i9+NFfm4xfdnPeRFGxr3TlFsdVAPz0Vf1S2J+DodjR4+DT5hzXGHzc/umRQ== 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=1716871330; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OUPapiRxCYezTbrSe+UI4HtGB5TSCzVsRgr1s3jss/M=; b=D9wvoNSg8PaopSb/ZL/mx//5G/CNK5ph5DnJCKujjaHNPJABpW61XA1Tv/BqcvoH/a5bAN 1jgFbRNBbC8saxh53qwD2TozppwhEy54Zqmq9vGdmWPEGBRKyztB/xBz7OA5q8bseeas65 K+hQcv9fQjIZBvLCgVddtHbxXWqGuG7T/oXvLTCxLkwPIV0zq67a4r9tK7imi2ZMgnCcCA GYBwvdMvZrW2udP/92DCSWHNeNeyyQX2puX7LKcm4w3eUhMnZFAJykbuFtKhNTGAL2uxOD zJ7ZrIS1LsTxqKdn9ZTOJkk+FWpWiBoS2lSh2gXm0NtrqOF7/s3ZL2IQ+552tQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VpKcL3vM2z1DRD; Tue, 28 May 2024 04:42: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 44S4gAgU049877; Tue, 28 May 2024 04:42:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44S4gAFb049874; Tue, 28 May 2024 04:42:10 GMT (envelope-from git) Date: Tue, 28 May 2024 04:42:10 GMT Message-Id: <202405280442.44S4gAFb049874@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: f183abd1286a - stable/13 - compat_freebsd4: Add const qualifier to the local variable s inside function freebsd4_uname() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: f183abd1286a961ee1bdd3faae4048df40c37906 Auto-Submitted: auto-generated The branch stable/13 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=f183abd1286a961ee1bdd3faae4048df40c37906 commit f183abd1286a961ee1bdd3faae4048df40c37906 Author: Zhenlei Huang AuthorDate: 2024-05-28 04:21:20 +0000 Commit: Zhenlei Huang CommitDate: 2024-05-28 04:37:42 +0000 compat_freebsd4: Add const qualifier to the local variable s inside function freebsd4_uname() This local variable s is for iterating characters of global variable `version`. The content of `version` is not going to be altered by function freebsd4_uname(). MFC after: 1 week (cherry picked from commit 92f2a4c820fea9efcb6ee6a7029495c8152958c1) (cherry picked from commit 5fd1902b0c768fa43d3d7eebf7efd0957d5e144f) --- sys/kern/kern_xxx.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/kern/kern_xxx.c b/sys/kern/kern_xxx.c index ae88fc90eb7c..b51a0edaac99 100644 --- a/sys/kern/kern_xxx.c +++ b/sys/kern/kern_xxx.c @@ -325,7 +325,8 @@ freebsd4_uname(struct thread *td, struct freebsd4_uname_args *uap) { int name[2], error; size_t len; - char *s, *us; + const char *s; + char *us; name[0] = CTL_KERN; name[1] = KERN_OSTYPE; From nobody Tue May 28 04:42: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 4VpKcM651Tz5LZGQ; Tue, 28 May 2024 04:42:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VpKcM5M5qz4chJ; Tue, 28 May 2024 04:42:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716871331; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YFNjRyM6jNR5/Z4Sb/nGMMvm1mESTtEwoHJo1KqzHMw=; b=lUP4EkiEto/SGxz/48uCoHBHdjIN/sw/kLSFecU9uHcNfc+BZJ+t2hzUfnDpa2RXNCZi/Z Ii2MCZFEwTNTZ84QKM8F51VUjuxsZywb9Pw1fUquQ3MR8ikDDO+03jCDVvziV5CToGMq67 zJicVRj+yn9JUPUEfHtV4BJ+ANUmvzyqr+EYZ/XA7CQnZeKTOQN9vCtrJRYYYJoTdgEQLV WOZsWUSoo72uft5Islj4NgPzBE7R+nLBWabn96nol6y56av0TbIR/f7RNzfgjCjMa6Ajb1 Zf5etW2K77GMw6z2mB2+uyh8Xns/ZLHs5JNHJkNHMfZN3tpMKYvV6boQu46p6A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1716871331; a=rsa-sha256; cv=none; b=TlOEsLnP+AAL0CQw5Kyczcr1MKq96Sg+ypLTQvKAVR2peqToxwcqCZ8+g7OG1DPIObbzCE uyg6/WmYsOQTGC1K6lF/97L5yGXL5xCjjdcobrZtzHuvdPllICxc2Zt6IeuoAAyElv71GU 3jMMVB5LJ8JKRc5K3QWoNaU/u4ixHfDH0ia//fChTvr6T6/6sN4CKcNwP3NsgJkFrQR8xn XEIasmVJDjJE5Xgem00ZbefLji0tIPZWzUNGr4KtS3onAFeDo2HC5dDK94Do3niBoSh2IX bn3V9tv6pT0G/J8KV0dcfA+v75qwN4thHtY1oNT9oH5FHthiiaEf+dCGbES5kA== 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=1716871331; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YFNjRyM6jNR5/Z4Sb/nGMMvm1mESTtEwoHJo1KqzHMw=; b=rijFeta3DreOqIFyx85gk6HjLMJc46cgoNT5X5T5Pxu8cnljses3ePEL8DjugnjplrBs0B xTtK9pMjkOGBtV0a/WHAZ+7HfDHF1m3QyXKuQlHUV9JhZu2SJOjaH67it689f3Y96BgRFJ /u+FMOxP80vfoQjr+xPLgmhUfBvJLwV6U6SpCIoBfSzf8wyECSzoraKs8/yky2VnYKIDl9 K5gOAL3PFXZKFOx11l5NvvLXaPnzvTuI+c5A2Dv4qTA0eBbNiAH7nBi/JyMlER+1cPQAgx aCp4BimkWRkt712Zgdobweq7bbdoA98dNC4hw5dYK7N/FEOBHGp40/26XHjK+g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VpKcM4yccz1Crt; Tue, 28 May 2024 04:42:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44S4gBZc049939; Tue, 28 May 2024 04:42:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44S4gBMo049936; Tue, 28 May 2024 04:42:11 GMT (envelope-from git) Date: Tue, 28 May 2024 04:42:11 GMT Message-Id: <202405280442.44S4gBMo049936@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: a29cc9eca779 - stable/13 - linux(4): Add const qualifier to the value parameter of function handle_string() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: a29cc9eca779394c2f285de5a6ddf648682bffa2 Auto-Submitted: auto-generated The branch stable/13 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=a29cc9eca779394c2f285de5a6ddf648682bffa2 commit a29cc9eca779394c2f285de5a6ddf648682bffa2 Author: Zhenlei Huang AuthorDate: 2024-05-28 04:21:20 +0000 Commit: Zhenlei Huang CommitDate: 2024-05-28 04:41:45 +0000 linux(4): Add const qualifier to the value parameter of function handle_string() The content that `value` point to is not going to be altered by function handle_string(). MFC after: 1 week (cherry picked from commit 68c890b4433d3655c7df91cc43f89f4d6a8b35e4) (cherry picked from commit 1b3f88bc809526cc7cd22c88b4fdaadf1a2e5e75) --- sys/compat/linux/linux_sysctl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/compat/linux/linux_sysctl.c b/sys/compat/linux/linux_sysctl.c index 6753941505b8..891ef6a7e6c5 100644 --- a/sys/compat/linux/linux_sysctl.c +++ b/sys/compat/linux/linux_sysctl.c @@ -75,7 +75,7 @@ LIN_SDT_PROBE_DEFINE1(sysctl, linux_sysctl, unsupported_sysctl, "char *"); #ifdef LINUX_LEGACY_SYSCALLS static int -handle_string(struct l___sysctl_args *la, char *value) +handle_string(struct l___sysctl_args *la, const char *value) { int error; From nobody Tue May 28 04: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 4VpKkT2FPfz5LZjS; Tue, 28 May 2024 04: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 4VpKkT1MTyz4d57; Tue, 28 May 2024 04: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=1716871649; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4gKSxgblMfhtfqlm42L1RDlEDB1iQF0bwu0oA/XSEho=; b=YaXH6JZajxbhDTBvMpd4IBGIYsqo7nZrqJY7TRBlo2ViChl2U1Yk8N4jc2pexF8bcBW0Gf RyCWQz32QbOw45IHk6KgN0aBb6kcAAKL96Jit7p+nlSz/94auZWUv8vANdDTqOU5Amf6i1 QxEtFdIY2NBVg7x2sBIjy2YXOFIQxxVtbCQ+PqWscLPj8iTu2u1rp5WnuBrBUTBw9M6f1k qIMelzzW2D1S3XfsaNhqniduOtOnp6WgLCoaG0zWJ/ByXY0WYe9NYX+PCEkozHEdxPaEFD Edrkd7mgZ6WjThUFA5sZH88Rz/4CbOcUHpDS/uMmIBaSvUhk+1xduEc+90fgpA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1716871649; a=rsa-sha256; cv=none; b=OkpIxVcVAas2t/WsndKl9XQA1VpxWoN2gBF6YHUzlUG3xIPx/t66r4BZ9IT0kAoD6baY0a a8RoHwf+dzp7PbTM4GRkdEdGIcAlMJEFCMuhQ219Zuw/x8YA9RkXgJKd80NndBrAwO1DBs elvzw66zNK6U3I6ZKkqeGUMpbcp0jMGsqklPciOmrMqRcBlvwfuLDQWCHsDidNDG6Psgbn kyKsi7FfZtc0bRxMCCfnZZK10mB1PWYWS9cvO1mnIcXv6yqNROb5EVionRTJGe68wrL7pW D24ky1hFRDOyY+/zbd46uOMAL89PVkt7t9lU3sboO2cFHtbQxtJWkePtYGKCHA== 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=1716871649; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4gKSxgblMfhtfqlm42L1RDlEDB1iQF0bwu0oA/XSEho=; b=fkn/xTNO5CpM6r1eac6WMNn47ecXPoJiRZDNqKP53GBHHgnlVhaqfwOhGMHJjcZlcgzkBq oUfKt1Te1jmUB5IkSqsVK32Pp7vxYS9VdAnOrnC2DTIubgZy2S3oQ/uhm6AXMnqQeNrg7Z QCnGu4FdWVZcV220l7bEm7V1s48n1tVb8W0n1guHuofXr+dBnXd8PzGtv1YwJ9GLIfvS67 nMtEHtaJrCvLmRWmdmSwGZG9zniX2MoCN3YDjQYamnOO6Ywdqe810wSf/1Xz8m+SUljS3R 0hmTf5b9i3RT6hbbyIH3S18zeXjg+LYJVZzRdKiJMiDgRTZLnXmFQtBNXTIT2A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VpKkT0p9Cz1DB7; Tue, 28 May 2024 04: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 44S4lS6a050818; Tue, 28 May 2024 04: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 44S4lSdt050815; Tue, 28 May 2024 04:47:28 GMT (envelope-from git) Date: Tue, 28 May 2024 04:47:28 GMT Message-Id: <202405280447.44S4lSdt050815@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: 2439ae948352 - main - mlx4, mlx5: Eliminate redundent NULL check for packet filter List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: 2439ae948352766f6b993c5103a4c516376bec28 Auto-Submitted: auto-generated The branch main has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=2439ae948352766f6b993c5103a4c516376bec28 commit 2439ae948352766f6b993c5103a4c516376bec28 Author: Zhenlei Huang AuthorDate: 2024-05-28 04:46:04 +0000 Commit: Zhenlei Huang CommitDate: 2024-05-28 04:46:04 +0000 mlx4, mlx5: Eliminate redundent NULL check for packet filter mlx4 and mlx5 are Ethernet devices and ether_ifattach() does an unconditional bpfattach(). From commit 16d878cc99ef [1] and on, we should not check ifp->if_bpf to tell us whether or not we have any bpf peers that might be interested in receiving packets. And since commit 2b9600b4497b [2], ifp->if_bpf can not be NULL even after the network interface has been detached. No functional change intended. 1. 16d878cc99ef Fix the following bpf(4) race condition which can result in a panic 2. 2b9600b4497b Add dead_bpf_if structure, that should be used as fake bpf_if during ifnet detach Reviewed by: kp, kib MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D45196 --- sys/dev/mlx4/mlx4_en/mlx4_en_tx.c | 2 +- sys/dev/mlx5/mlx5_en/mlx5_en_tx.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/dev/mlx4/mlx4_en/mlx4_en_tx.c b/sys/dev/mlx4/mlx4_en/mlx4_en_tx.c index 9a73c7571fd7..d45ccacd7499 100644 --- a/sys/dev/mlx4/mlx4_en/mlx4_en_tx.c +++ b/sys/dev/mlx4/mlx4_en/mlx4_en_tx.c @@ -688,7 +688,7 @@ int mlx4_en_xmit(struct mlx4_en_priv *priv, int tx_ind, struct mbuf **mbp) dseg = &tx_desc->data; /* send a copy of the frame to the BPF listener, if any */ - if (ifp != NULL && if_getbpf(ifp) != NULL) + if (ifp != NULL) ETHER_BPF_MTAP(ifp, mb); /* get default flags */ diff --git a/sys/dev/mlx5/mlx5_en/mlx5_en_tx.c b/sys/dev/mlx5/mlx5_en/mlx5_en_tx.c index 1f2820abc30e..3f70e8a818ea 100644 --- a/sys/dev/mlx5/mlx5_en/mlx5_en_tx.c +++ b/sys/dev/mlx5/mlx5_en/mlx5_en_tx.c @@ -745,7 +745,7 @@ top: mb = *mbp; /* Send a copy of the frame to the BPF listener, if any */ - if (ifp != NULL && if_getbpf(ifp) != NULL) + if (ifp != NULL) ETHER_BPF_MTAP(ifp, mb); if (mb->m_pkthdr.csum_flags & (CSUM_IP | CSUM_TSO)) { From nobody Tue May 28 05:20: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 4VpLSB4rK7z5LdVb; Tue, 28 May 2024 05:20: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 4VpLSB2ZC1z4gDc; Tue, 28 May 2024 05:20:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716873610; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rHgSjzj3Gt0eczHBOwHosOgvxrSYxbD+503o0dzLDTA=; b=f7f8jueykb8GjCSbBZE6zwvuYmmWr24vyFx6c0nPR2TJdMXSMB9FSVNEjPVbJcEM6udAjK vl3891L7mF5KAk/7NGemig+umalMd2NW1ygWdg/5VuldbbAjks1dcxSb5eJM5uCjHyXxCZ nK8BLvO1mI0pz+Vq+gP7nXlgvp1wtUzr6vLJaCdL5FVpTeiYq9RfqGIJ6M2afzzLnFd4Bs GFHptmVNnSUNvSyM+NrF6rRSXPZFgOnWNiDRqJF8WWW/nYgXFUcuptRx9Vf7QsJkeW9JFF WVpNc+u6Gd83Q5RcFljY1NTcuuzxq6pEaJ0sZlRw7nbx33Vczg60io+GVKa+UQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1716873610; a=rsa-sha256; cv=none; b=ZthO5ScGRv7tBLgMrAjUiqymjjBxim9jfjGKRh9ht7RIrEhvJgXGSdVZcCZY1+90/nAgAY Z4cTik95x/pjqj4nokiN99ikd2eY8QuZ3dsENlfkvcD2bMfoqYQjoK6N1YM2JaiexLkjqs FzSXtFfx04IKvqIlq0jT93YbyRqyAyzNg1vu+hXelPR5Qr3wDURNKvPEYejccgmGBvHP+M lIMin4EJAy12e93qpzDTDfQIjp8+XPwJkFoj3Gn2oh5AkEG/MDJaOFCOdzf9L6vC3U8qGF mYQ2QXaiG+pOS84aPsdrSdO7/5/QtGP9xSF9w0Aj435oZUfZCAWjnnEfSu8EZg== 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=1716873610; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rHgSjzj3Gt0eczHBOwHosOgvxrSYxbD+503o0dzLDTA=; b=sUwWO9Ojhmr2wPuacQWgKsk3fJqAgttpAVzu0idvJJgrzhu1kR9NmX+nvs21PMo72aPk2w +xBUS2SUeg/ACe97503/25s9JArQ0P7ulMX2+gE1PNrZrP91VjIPTWe+LG1aq7ScYyQLQK 8twodpbrfutK+lL1S4BFxyZ9ZuHjUzceVRACPUBe57PaCJ/ypLH9NU2hfERpO7QwnnZVB/ kjB8wUrHbwP1IxCoEd8kHwTGbDSXf07BqB0UD18EiKm0yoZ5GtV+knfox0FO9wSlh7lx7R 3vvCtR+g2kiABvQO5f/oR9UaZN+ZgvjuCxU5hiokBiHEO5bX+tLvVlMP304SDA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VpLSB23P1z1FCj; Tue, 28 May 2024 05:20: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 44S5KAxT006399; Tue, 28 May 2024 05:20:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44S5KA8L006390; Tue, 28 May 2024 05:20:10 GMT (envelope-from git) Date: Tue, 28 May 2024 05:20:10 GMT Message-Id: <202405280520.44S5KA8L006390@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kevin Bowling Subject: git: a58b4ee025fc - main - qlxgbe: Remove pointer printing in ql_ioctl.c PR: 238653 MFC after: 1 week List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kbowling X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a58b4ee025fcac480e44e1f56acffe2feacc5845 Auto-Submitted: auto-generated The branch main has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=a58b4ee025fcac480e44e1f56acffe2feacc5845 commit a58b4ee025fcac480e44e1f56acffe2feacc5845 Author: Fuqian AuthorDate: 2024-05-28 05:18:52 +0000 Commit: Kevin Bowling CommitDate: 2024-05-28 05:18:52 +0000 qlxgbe: Remove pointer printing in ql_ioctl.c PR: 238653 MFC after: 1 week --- sys/dev/qlxgbe/ql_ioctl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/dev/qlxgbe/ql_ioctl.c b/sys/dev/qlxgbe/ql_ioctl.c index b34a9cc508c0..c95cbd9df688 100644 --- a/sys/dev/qlxgbe/ql_ioctl.c +++ b/sys/dev/qlxgbe/ql_ioctl.c @@ -652,8 +652,8 @@ ql_slowpath_log(qla_host_t *ha, qla_sp_log_t *log) log->num_entries = ha->hw.sp_log_num_entries; } device_printf(ha->pci_dev, - "%s: exit [rval = %d][%p, next_idx = %d, %d entries, %d bytes]\n", - __func__, rval, log->buffer, log->next_idx, log->num_entries, size); + "%s: exit [rval = %d][next_idx = %d, %d entries, %d bytes]\n", + __func__, rval, log->next_idx, log->num_entries, size); mtx_unlock(&ha->sp_log_lock); return (rval); From nobody Tue May 28 05:27: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 4VpLcL4X04z5LfJK; Tue, 28 May 2024 05:27: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 4VpLcL3yLCz4hr9; Tue, 28 May 2024 05:27:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716874034; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=X97aczaJlO8WZwvqV44/5qRoBUVOCvG6hkSGHa981yA=; b=qDO7HgW3HZ5jo/nOSLeE73tOFBj7wpO34FVMPeuHNc4RFvHzwim7iYGAYYuBj6JZeaMArU gAkeFwtaVqKxHbnCWeiS4a9yBBweGa5bvCDxmnwYKVKqDW7kd7Qit3AHRvmmzLyvKN60IG 7eLRRz3PJTx82ZO+5IUGcgXHJaWMv3t7JoXMxC+nI0u0TPLHaFiCsXcWr1/ETgicDj29B2 1FBL4SrJgUDvEbic7LGfTAkzLaclij05iIXnzCZZrh2KjrDQkdAy48yFujocUKEv1fMeO7 RX5gw8oQWWKehz1s97M0cRXbjVXSaSL6/NOsdLozBUoZ4qmlI1GW9bAIXnDoyQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1716874034; a=rsa-sha256; cv=none; b=cusFPVrJKbem2t+KPrAgbTNCJukCyDUm1TFoeWBDg1iqWIhDoNjvoqWMvQ0F5pBSTTtLhV 94POANMF0fVySIQ0igFE7gBTgaUEy7brsLDyMOQBn40Pg+HEq+fkuSz0yxbtZYHAxk49Ot gkdtqQzk2Xs2HdISkdg+koyEu/+p3vraiKtoWvnieF3g5JA4i0K1TJ6IgEQyR3fpCW7mMz a9Sald1WJIsyfCa7XZ+0+kavZp8IbtrXdc9P/fe+T3Jg6PQE+F0VKepJboIWWOqZDFSxlN LBtSJAb1dkeoW2GVOLSohdl3RVgKIANFdu5LGt885094dH8qY7tUbKWU3Nrczg== 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=1716874034; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=X97aczaJlO8WZwvqV44/5qRoBUVOCvG6hkSGHa981yA=; b=MzO1FQtpXQ14I5Z/n/5/kuDs6PhspKTjAHfTiAsZiJV2M0w2AdWupvBA2YHISBam38z6nU 2sjPVn8TrRBl5OS0bi9bw6VnydgrJzd6QMK9kPhOLzxQ4cwYmsh9DD0f26WbGZp8fn74nA LI6yEGWTh6CN+4/pM0L9hnq7qTZmsdgzLEZkgyACGxWVRh+vWoJgJvFyMFTjgzB7irk9FE bcYHIV1Wq5TzPGszW5vWxOE6rrHpdiOdqJh4YvpijxSulnX/7KV1X/VjapNVc63LGAmnX1 J9Nfi9ErMYJKDLuDK11SRnrdKlLUMuNtGrSPxbb5fALutZWlu9lLlKsuWAxIMw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VpLcL3R6Zz1FL5; Tue, 28 May 2024 05:27: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 44S5REHl018507; Tue, 28 May 2024 05:27:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44S5REns018504; Tue, 28 May 2024 05:27:14 GMT (envelope-from git) Date: Tue, 28 May 2024 05:27:14 GMT Message-Id: <202405280527.44S5REns018504@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: f1e3279983d6 - stable/14 - Merge llvm-project release/18.x llvmorg-18.1.6-0-g1118c2e05e67 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: f1e3279983d6db1001af5fc9fb3a9821a1c353ef Auto-Submitted: auto-generated The branch stable/14 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=f1e3279983d6db1001af5fc9fb3a9821a1c353ef commit f1e3279983d6db1001af5fc9fb3a9821a1c353ef Author: Dimitry Andric AuthorDate: 2024-05-24 15:51:19 +0000 Commit: Dimitry Andric CommitDate: 2024-05-28 05:25:48 +0000 Merge llvm-project release/18.x llvmorg-18.1.6-0-g1118c2e05e67 This updates llvm, clang, compiler-rt, libc++, libunwind, lld, lldb and openmp to llvm-project release/18.x llvmorg-18.1.6-0-g1118c2e05e67. PR: 276104 MFC after: 3 days (cherry picked from commit 3a0793336edfc21cb6d4c8c5c5d7f1665f3e6c5a) --- .../clang/lib/CodeGen/CodeGenModule.cpp | 14 +++++ .../clang/lib/Driver/ToolChains/OpenBSD.cpp | 3 +- .../clang/lib/Format/UnwrappedLineParser.cpp | 7 ++- .../clang/lib/Format/WhitespaceManager.cpp | 2 +- .../clang/lib/Interpreter/IncrementalParser.cpp | 24 ++++++-- .../clang/lib/Interpreter/IncrementalParser.h | 5 ++ .../llvm-project/clang/lib/Sema/SemaTemplate.cpp | 25 +++++++-- contrib/llvm-project/libcxx/src/atomic.cpp | 16 +++++- contrib/llvm-project/libcxx/src/chrono.cpp | 4 +- contrib/llvm-project/lld/ELF/Relocations.cpp | 5 +- .../llvm/include/llvm/CodeGen/MachineFrameInfo.h | 7 +++ .../llvm/lib/Analysis/InstructionSimplify.cpp | 4 ++ .../lib/CodeGen/InterleavedLoadCombinePass.cpp | 3 + .../CodeGen/SelectionDAG/SelectionDAGBuilder.cpp | 3 +- .../Target/AArch64/AArch64Arm64ECCallLowering.cpp | 16 ++++-- .../lib/Target/AArch64/AArch64ISelLowering.cpp | 3 +- .../AArch64/GISel/AArch64GlobalISelUtils.cpp | 6 ++ .../Target/AArch64/GISel/AArch64LegalizerInfo.cpp | 1 + .../AArch64/GISel/AArch64RegisterBankInfo.cpp | 5 +- .../llvm/lib/Target/AMDGPU/SIInsertWaitcnts.cpp | 2 +- .../llvm/lib/Target/AMDGPU/SIInstrInfo.h | 11 ++++ .../llvm/lib/Target/AMDGPU/SOPInstructions.td | 2 +- .../llvm/lib/Target/PowerPC/PPCMergeStringPool.cpp | 57 ++++++------------- .../Target/RISCV/MCTargetDesc/RISCVELFStreamer.cpp | 8 +-- .../Target/RISCV/MCTargetDesc/RISCVELFStreamer.h | 1 - .../lib/Target/RISCV/MCTargetDesc/RISCVMCExpr.cpp | 2 - .../RISCV/MCTargetDesc/RISCVTargetStreamer.cpp | 5 ++ .../RISCV/MCTargetDesc/RISCVTargetStreamer.h | 5 ++ .../llvm/lib/Target/RISCV/RISCVAsmPrinter.cpp | 32 +++++++++-- .../lib/Target/RISCV/RISCVExpandPseudoInsts.cpp | 5 +- .../llvm/lib/Target/RISCV/RISCVFeatures.td | 5 ++ .../llvm/lib/Target/RISCV/RISCVISelLowering.cpp | 9 ++- .../llvm/lib/Target/SystemZ/SystemZInstrInfo.cpp | 65 +++++++++++++--------- .../llvm/lib/Target/X86/X86ISelLowering.cpp | 6 +- .../llvm/lib/Target/X86/X86InstrAVX512.td | 42 +++++++------- .../llvm/lib/Transforms/IPO/FunctionAttrs.cpp | 7 ++- .../llvm/lib/Transforms/IPO/GlobalOpt.cpp | 3 + .../Transforms/InstCombine/InstCombineSelect.cpp | 14 ++++- .../lib/Transforms/Vectorize/SLPVectorizer.cpp | 21 +------ 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 +- 46 files changed, 316 insertions(+), 169 deletions(-) diff --git a/contrib/llvm-project/clang/lib/CodeGen/CodeGenModule.cpp b/contrib/llvm-project/clang/lib/CodeGen/CodeGenModule.cpp index 1280bcd36de9..eb13cd40eb8a 100644 --- a/contrib/llvm-project/clang/lib/CodeGen/CodeGenModule.cpp +++ b/contrib/llvm-project/clang/lib/CodeGen/CodeGenModule.cpp @@ -67,6 +67,7 @@ #include "llvm/Support/CommandLine.h" #include "llvm/Support/ConvertUTF.h" #include "llvm/Support/ErrorHandling.h" +#include "llvm/Support/RISCVISAInfo.h" #include "llvm/Support/TimeProfiler.h" #include "llvm/Support/xxhash.h" #include "llvm/TargetParser/Triple.h" @@ -1059,6 +1060,19 @@ void CodeGenModule::Release() { llvm::LLVMContext &Ctx = TheModule.getContext(); getModule().addModuleFlag(llvm::Module::Error, "target-abi", llvm::MDString::get(Ctx, ABIStr)); + + // Add the canonical ISA string as metadata so the backend can set the ELF + // attributes correctly. We use AppendUnique so LTO will keep all of the + // unique ISA strings that were linked together. + const std::vector &Features = + getTarget().getTargetOpts().Features; + auto ParseResult = llvm::RISCVISAInfo::parseFeatures( + Arch == llvm::Triple::riscv64 ? 64 : 32, Features); + if (!errorToBool(ParseResult.takeError())) + getModule().addModuleFlag( + llvm::Module::AppendUnique, "riscv-isa", + llvm::MDNode::get( + Ctx, llvm::MDString::get(Ctx, (*ParseResult)->toString()))); } if (CodeGenOpts.SanitizeCfiCrossDso) { diff --git a/contrib/llvm-project/clang/lib/Driver/ToolChains/OpenBSD.cpp b/contrib/llvm-project/clang/lib/Driver/ToolChains/OpenBSD.cpp index fd6aa4d7e684..00b6c520fcdd 100644 --- a/contrib/llvm-project/clang/lib/Driver/ToolChains/OpenBSD.cpp +++ b/contrib/llvm-project/clang/lib/Driver/ToolChains/OpenBSD.cpp @@ -371,7 +371,8 @@ std::string OpenBSD::getCompilerRT(const ArgList &Args, StringRef Component, if (Component == "builtins") { SmallString<128> Path(getDriver().SysRoot); llvm::sys::path::append(Path, "/usr/lib/libcompiler_rt.a"); - return std::string(Path); + if (getVFS().exists(Path)) + return std::string(Path); } SmallString<128> P(getDriver().ResourceDir); std::string CRTBasename = diff --git a/contrib/llvm-project/clang/lib/Format/UnwrappedLineParser.cpp b/contrib/llvm-project/clang/lib/Format/UnwrappedLineParser.cpp index a6eb18bb2b32..f70affb732a0 100644 --- a/contrib/llvm-project/clang/lib/Format/UnwrappedLineParser.cpp +++ b/contrib/llvm-project/clang/lib/Format/UnwrappedLineParser.cpp @@ -2510,6 +2510,7 @@ bool UnwrappedLineParser::parseParens(TokenType AmpAmpTokenType) { assert(FormatTok->is(tok::l_paren) && "'(' expected."); auto *LeftParen = FormatTok; bool SeenEqual = false; + bool MightBeFoldExpr = false; const bool MightBeStmtExpr = Tokens->peekNextToken()->is(tok::l_brace); nextToken(); do { @@ -2521,7 +2522,7 @@ bool UnwrappedLineParser::parseParens(TokenType AmpAmpTokenType) { parseChildBlock(); break; case tok::r_paren: - if (!MightBeStmtExpr && !Line->InMacroBody && + if (!MightBeStmtExpr && !MightBeFoldExpr && !Line->InMacroBody && Style.RemoveParentheses > FormatStyle::RPS_Leave) { const auto *Prev = LeftParen->Previous; const auto *Next = Tokens->peekNextToken(); @@ -2564,6 +2565,10 @@ bool UnwrappedLineParser::parseParens(TokenType AmpAmpTokenType) { parseBracedList(); } break; + case tok::ellipsis: + MightBeFoldExpr = true; + nextToken(); + break; case tok::equal: SeenEqual = true; if (Style.isCSharp() && FormatTok->is(TT_FatArrow)) diff --git a/contrib/llvm-project/clang/lib/Format/WhitespaceManager.cpp b/contrib/llvm-project/clang/lib/Format/WhitespaceManager.cpp index df84f97a8e8a..7525e6ee650b 100644 --- a/contrib/llvm-project/clang/lib/Format/WhitespaceManager.cpp +++ b/contrib/llvm-project/clang/lib/Format/WhitespaceManager.cpp @@ -1466,7 +1466,7 @@ WhitespaceManager::CellDescriptions WhitespaceManager::getCells(unsigned Start, : Cell); // Go to the next non-comment and ensure there is a break in front const auto *NextNonComment = C.Tok->getNextNonComment(); - while (NextNonComment->is(tok::comma)) + while (NextNonComment && NextNonComment->is(tok::comma)) NextNonComment = NextNonComment->getNextNonComment(); auto j = i; while (Changes[j].Tok != NextNonComment && j < End) diff --git a/contrib/llvm-project/clang/lib/Interpreter/IncrementalParser.cpp b/contrib/llvm-project/clang/lib/Interpreter/IncrementalParser.cpp index 370bcbfee8b0..f5f32b9f3924 100644 --- a/contrib/llvm-project/clang/lib/Interpreter/IncrementalParser.cpp +++ b/contrib/llvm-project/clang/lib/Interpreter/IncrementalParser.cpp @@ -209,6 +209,10 @@ IncrementalParser::IncrementalParser(Interpreter &Interp, if (Err) return; CI->ExecuteAction(*Act); + + if (getCodeGen()) + CachedInCodeGenModule = GenModule(); + std::unique_ptr IncrConsumer = std::make_unique(Interp, CI->takeASTConsumer()); CI->setASTConsumer(std::move(IncrConsumer)); @@ -224,11 +228,8 @@ IncrementalParser::IncrementalParser(Interpreter &Interp, return; // PTU.takeError(); } - if (CodeGenerator *CG = getCodeGen()) { - std::unique_ptr M(CG->ReleaseModule()); - CG->StartModule("incr_module_" + std::to_string(PTUs.size()), - M->getContext()); - PTU->TheModule = std::move(M); + if (getCodeGen()) { + PTU->TheModule = GenModule(); assert(PTU->TheModule && "Failed to create initial PTU"); } } @@ -364,6 +365,19 @@ IncrementalParser::Parse(llvm::StringRef input) { std::unique_ptr IncrementalParser::GenModule() { static unsigned ID = 0; if (CodeGenerator *CG = getCodeGen()) { + // Clang's CodeGen is designed to work with a single llvm::Module. In many + // cases for convenience various CodeGen parts have a reference to the + // llvm::Module (TheModule or Module) which does not change when a new + // module is pushed. However, the execution engine wants to take ownership + // of the module which does not map well to CodeGen's design. To work this + // around we created an empty module to make CodeGen happy. We should make + // sure it always stays empty. + assert((!CachedInCodeGenModule || + (CachedInCodeGenModule->empty() && + CachedInCodeGenModule->global_empty() && + CachedInCodeGenModule->alias_empty() && + CachedInCodeGenModule->ifunc_empty())) && + "CodeGen wrote to a readonly module"); std::unique_ptr M(CG->ReleaseModule()); CG->StartModule("incr_module_" + std::to_string(ID++), M->getContext()); return M; diff --git a/contrib/llvm-project/clang/lib/Interpreter/IncrementalParser.h b/contrib/llvm-project/clang/lib/Interpreter/IncrementalParser.h index e13b74c7f659..f63bce50acd3 100644 --- a/contrib/llvm-project/clang/lib/Interpreter/IncrementalParser.h +++ b/contrib/llvm-project/clang/lib/Interpreter/IncrementalParser.h @@ -24,6 +24,7 @@ #include namespace llvm { class LLVMContext; +class Module; } // namespace llvm namespace clang { @@ -57,6 +58,10 @@ protected: /// of code. std::list PTUs; + /// When CodeGen is created the first llvm::Module gets cached in many places + /// and we must keep it alive. + std::unique_ptr CachedInCodeGenModule; + IncrementalParser(); public: diff --git a/contrib/llvm-project/clang/lib/Sema/SemaTemplate.cpp b/contrib/llvm-project/clang/lib/Sema/SemaTemplate.cpp index b619f5d729e8..a12a64939c46 100644 --- a/contrib/llvm-project/clang/lib/Sema/SemaTemplate.cpp +++ b/contrib/llvm-project/clang/lib/Sema/SemaTemplate.cpp @@ -2404,9 +2404,6 @@ struct ConvertConstructorToDeductionGuideTransform { Args.addOuterRetainedLevel(); } - if (NestedPattern) - Args.addOuterRetainedLevels(NestedPattern->getTemplateDepth()); - FunctionProtoTypeLoc FPTL = CD->getTypeSourceInfo()->getTypeLoc() .getAsAdjusted(); assert(FPTL && "no prototype for constructor declaration"); @@ -2526,11 +2523,27 @@ private: // -- The types of the function parameters are those of the constructor. for (auto *OldParam : TL.getParams()) { - ParmVarDecl *NewParam = - transformFunctionTypeParam(OldParam, Args, MaterializedTypedefs); - if (NestedPattern && NewParam) + ParmVarDecl *NewParam = OldParam; + // Given + // template struct C { + // template struct D { + // template D(U, V); + // }; + // }; + // First, transform all the references to template parameters that are + // defined outside of the surrounding class template. That is T in the + // above example. + if (NestedPattern) { NewParam = transformFunctionTypeParam(NewParam, OuterInstantiationArgs, MaterializedTypedefs); + if (!NewParam) + return QualType(); + } + // Then, transform all the references to template parameters that are + // defined at the class template and the constructor. In this example, + // they're U and V, respectively. + NewParam = + transformFunctionTypeParam(NewParam, Args, MaterializedTypedefs); if (!NewParam) return QualType(); ParamTypes.push_back(NewParam->getType()); diff --git a/contrib/llvm-project/libcxx/src/atomic.cpp b/contrib/llvm-project/libcxx/src/atomic.cpp index 2f0389ae6974..6b1f03c21bbc 100644 --- a/contrib/llvm-project/libcxx/src/atomic.cpp +++ b/contrib/llvm-project/libcxx/src/atomic.cpp @@ -25,16 +25,28 @@ # if !defined(SYS_futex) && defined(SYS_futex_time64) # define SYS_futex SYS_futex_time64 # endif +# define _LIBCPP_FUTEX(...) syscall(SYS_futex, __VA_ARGS__) #elif defined(__FreeBSD__) # include # include +# define _LIBCPP_FUTEX(...) syscall(SYS_futex, __VA_ARGS__) + +#elif defined(__OpenBSD__) + +# include + +// OpenBSD has no indirect syscalls +# define _LIBCPP_FUTEX(...) futex(__VA_ARGS__) + #else // <- Add other operating systems here // Baseline needs no new headers +# define _LIBCPP_FUTEX(...) syscall(SYS_futex, __VA_ARGS__) + #endif _LIBCPP_BEGIN_NAMESPACE_STD @@ -44,11 +56,11 @@ _LIBCPP_BEGIN_NAMESPACE_STD static void __libcpp_platform_wait_on_address(__cxx_atomic_contention_t const volatile* __ptr, __cxx_contention_t __val) { static constexpr timespec __timeout = {2, 0}; - syscall(SYS_futex, __ptr, FUTEX_WAIT_PRIVATE, __val, &__timeout, 0, 0); + _LIBCPP_FUTEX(__ptr, FUTEX_WAIT_PRIVATE, __val, &__timeout, 0, 0); } static void __libcpp_platform_wake_by_address(__cxx_atomic_contention_t const volatile* __ptr, bool __notify_one) { - syscall(SYS_futex, __ptr, FUTEX_WAKE_PRIVATE, __notify_one ? 1 : INT_MAX, 0, 0, 0); + _LIBCPP_FUTEX(__ptr, FUTEX_WAKE_PRIVATE, __notify_one ? 1 : INT_MAX, 0, 0, 0); } #elif defined(__APPLE__) && defined(_LIBCPP_USE_ULOCK) diff --git a/contrib/llvm-project/libcxx/src/chrono.cpp b/contrib/llvm-project/libcxx/src/chrono.cpp index c5e827c0cb59..e7d6dfbc2292 100644 --- a/contrib/llvm-project/libcxx/src/chrono.cpp +++ b/contrib/llvm-project/libcxx/src/chrono.cpp @@ -31,7 +31,9 @@ # include // for gettimeofday and timeval #endif -#if defined(__APPLE__) || defined(__gnu_hurd__) || (defined(_POSIX_TIMERS) && _POSIX_TIMERS > 0) +// OpenBSD does not have a fully conformant suite of POSIX timers, but +// it does have clock_gettime and CLOCK_MONOTONIC which is all we need. +#if defined(__APPLE__) || defined(__gnu_hurd__) || defined(__OpenBSD__) || (defined(_POSIX_TIMERS) && _POSIX_TIMERS > 0) # define _LIBCPP_HAS_CLOCK_GETTIME #endif diff --git a/contrib/llvm-project/lld/ELF/Relocations.cpp b/contrib/llvm-project/lld/ELF/Relocations.cpp index 619fbaf5dc54..92a1b9baaca3 100644 --- a/contrib/llvm-project/lld/ELF/Relocations.cpp +++ b/contrib/llvm-project/lld/ELF/Relocations.cpp @@ -1480,7 +1480,10 @@ template void RelocationScanner::scanOne(RelTy *&i) { // Process TLS relocations, including TLS optimizations. Note that // R_TPREL and R_TPREL_NEG relocations are resolved in processAux. - if (sym.isTls()) { + // + // Some RISCV TLSDESC relocations reference a local NOTYPE symbol, + // but we need to process them in handleTlsRelocation. + if (sym.isTls() || oneof(expr)) { if (unsigned processed = handleTlsRelocation(type, sym, *sec, offset, addend, expr)) { i += processed - 1; diff --git a/contrib/llvm-project/llvm/include/llvm/CodeGen/MachineFrameInfo.h b/contrib/llvm-project/llvm/include/llvm/CodeGen/MachineFrameInfo.h index 7d11d63d4066..c35faac09c4d 100644 --- a/contrib/llvm-project/llvm/include/llvm/CodeGen/MachineFrameInfo.h +++ b/contrib/llvm-project/llvm/include/llvm/CodeGen/MachineFrameInfo.h @@ -697,6 +697,13 @@ public: return Objects[ObjectIdx+NumFixedObjects].isAliased; } + /// Set "maybe pointed to by an LLVM IR value" for an object. + void setIsAliasedObjectIndex(int ObjectIdx, bool IsAliased) { + assert(unsigned(ObjectIdx+NumFixedObjects) < Objects.size() && + "Invalid Object Idx!"); + Objects[ObjectIdx+NumFixedObjects].isAliased = IsAliased; + } + /// Returns true if the specified index corresponds to an immutable object. bool isImmutableObjectIndex(int ObjectIdx) const { // Tail calling functions can clobber their function arguments. diff --git a/contrib/llvm-project/llvm/lib/Analysis/InstructionSimplify.cpp b/contrib/llvm-project/llvm/lib/Analysis/InstructionSimplify.cpp index 72b6dfa181e8..8dcffe45c644 100644 --- a/contrib/llvm-project/llvm/lib/Analysis/InstructionSimplify.cpp +++ b/contrib/llvm-project/llvm/lib/Analysis/InstructionSimplify.cpp @@ -4322,6 +4322,10 @@ static Value *simplifyWithOpReplaced(Value *V, Value *Op, Value *RepOp, if (match(I, m_Intrinsic())) return nullptr; + // Don't simplify freeze. + if (isa(I)) + return nullptr; + // Replace Op with RepOp in instruction operands. SmallVector NewOps; bool AnyReplaced = false; diff --git a/contrib/llvm-project/llvm/lib/CodeGen/InterleavedLoadCombinePass.cpp b/contrib/llvm-project/llvm/lib/CodeGen/InterleavedLoadCombinePass.cpp index f2d5c3c867c2..bbb0b654dc67 100644 --- a/contrib/llvm-project/llvm/lib/CodeGen/InterleavedLoadCombinePass.cpp +++ b/contrib/llvm-project/llvm/lib/CodeGen/InterleavedLoadCombinePass.cpp @@ -877,6 +877,9 @@ public: if (LI->isAtomic()) return false; + if (!DL.typeSizeEqualsStoreSize(Result.VTy->getElementType())) + return false; + // Get the base polynomial computePolynomialFromPointer(*LI->getPointerOperand(), Offset, BasePtr, DL); diff --git a/contrib/llvm-project/llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp b/contrib/llvm-project/llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp index 5ce1013f30fd..7406a8ac1611 100644 --- a/contrib/llvm-project/llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp +++ b/contrib/llvm-project/llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp @@ -10888,7 +10888,7 @@ static void tryToElideArgumentCopy( } // Perform the elision. Delete the old stack object and replace its only use - // in the variable info map. Mark the stack object as mutable. + // in the variable info map. Mark the stack object as mutable and aliased. LLVM_DEBUG({ dbgs() << "Eliding argument copy from " << Arg << " to " << *AI << '\n' << " Replacing frame index " << OldIndex << " with " << FixedIndex @@ -10896,6 +10896,7 @@ static void tryToElideArgumentCopy( }); MFI.RemoveStackObject(OldIndex); MFI.setIsImmutableObjectIndex(FixedIndex, false); + MFI.setIsAliasedObjectIndex(FixedIndex, true); AllocaIndex = FixedIndex; ArgCopyElisionFrameIndexMap.insert({OldIndex, FixedIndex}); for (SDValue ArgVal : ArgVals) diff --git a/contrib/llvm-project/llvm/lib/Target/AArch64/AArch64Arm64ECCallLowering.cpp b/contrib/llvm-project/llvm/lib/Target/AArch64/AArch64Arm64ECCallLowering.cpp index 55c5bbc66a3f..862aefe46193 100644 --- a/contrib/llvm-project/llvm/lib/Target/AArch64/AArch64Arm64ECCallLowering.cpp +++ b/contrib/llvm-project/llvm/lib/Target/AArch64/AArch64Arm64ECCallLowering.cpp @@ -181,13 +181,14 @@ void AArch64Arm64ECCallLowering::getThunkArgTypes( } for (unsigned E = FT->getNumParams(); I != E; ++I) { - Align ParamAlign = AttrList.getParamAlignment(I).valueOrOne(); #if 0 // FIXME: Need more information about argument size; see // https://reviews.llvm.org/D132926 uint64_t ArgSizeBytes = AttrList.getParamArm64ECArgSizeBytes(I); + Align ParamAlign = AttrList.getParamAlignment(I).valueOrOne(); #else uint64_t ArgSizeBytes = 0; + Align ParamAlign = Align(); #endif Type *Arm64Ty, *X64Ty; canonicalizeThunkType(FT->getParamType(I), ParamAlign, @@ -297,7 +298,7 @@ void AArch64Arm64ECCallLowering::canonicalizeThunkType( uint64_t TotalSizeBytes = ElementCnt * ElementSizePerBytes; if (ElementTy->isFloatTy() || ElementTy->isDoubleTy()) { Out << (ElementTy->isFloatTy() ? "F" : "D") << TotalSizeBytes; - if (Alignment.value() >= 8 && !T->isPointerTy()) + if (Alignment.value() >= 16 && !Ret) Out << "a" << Alignment.value(); Arm64Ty = T; if (TotalSizeBytes <= 8) { @@ -328,7 +329,7 @@ void AArch64Arm64ECCallLowering::canonicalizeThunkType( Out << "m"; if (TypeSize != 4) Out << TypeSize; - if (Alignment.value() >= 8 && !T->isPointerTy()) + if (Alignment.value() >= 16 && !Ret) Out << "a" << Alignment.value(); // FIXME: Try to canonicalize Arm64Ty more thoroughly? Arm64Ty = T; @@ -513,7 +514,14 @@ Function *AArch64Arm64ECCallLowering::buildEntryThunk(Function *F) { // Call the function passed to the thunk. Value *Callee = Thunk->getArg(0); Callee = IRB.CreateBitCast(Callee, PtrTy); - Value *Call = IRB.CreateCall(Arm64Ty, Callee, Args); + CallInst *Call = IRB.CreateCall(Arm64Ty, Callee, Args); + + auto SRetAttr = F->getAttributes().getParamAttr(0, Attribute::StructRet); + auto InRegAttr = F->getAttributes().getParamAttr(0, Attribute::InReg); + if (SRetAttr.isValid() && !InRegAttr.isValid()) { + Thunk->addParamAttr(1, SRetAttr); + Call->addParamAttr(0, SRetAttr); + } Value *RetVal = Call; if (TransformDirectToSRet) { diff --git a/contrib/llvm-project/llvm/lib/Target/AArch64/AArch64ISelLowering.cpp b/contrib/llvm-project/llvm/lib/Target/AArch64/AArch64ISelLowering.cpp index 95d8ab95b2c0..bcfd0253e73c 100644 --- a/contrib/llvm-project/llvm/lib/Target/AArch64/AArch64ISelLowering.cpp +++ b/contrib/llvm-project/llvm/lib/Target/AArch64/AArch64ISelLowering.cpp @@ -22122,7 +22122,8 @@ SDValue performCONDCombine(SDNode *N, SDNode *SubsNode = N->getOperand(CmpIndex).getNode(); unsigned CondOpcode = SubsNode->getOpcode(); - if (CondOpcode != AArch64ISD::SUBS || SubsNode->hasAnyUseOfValue(0)) + if (CondOpcode != AArch64ISD::SUBS || SubsNode->hasAnyUseOfValue(0) || + !SubsNode->hasOneUse()) return SDValue(); // There is a SUBS feeding this condition. Is it fed by a mask we can diff --git a/contrib/llvm-project/llvm/lib/Target/AArch64/GISel/AArch64GlobalISelUtils.cpp b/contrib/llvm-project/llvm/lib/Target/AArch64/GISel/AArch64GlobalISelUtils.cpp index 92db89cc0915..80fe4bcb8b58 100644 --- a/contrib/llvm-project/llvm/lib/Target/AArch64/GISel/AArch64GlobalISelUtils.cpp +++ b/contrib/llvm-project/llvm/lib/Target/AArch64/GISel/AArch64GlobalISelUtils.cpp @@ -147,6 +147,12 @@ void AArch64GISelUtils::changeFCMPPredToAArch64CC( case CmpInst::FCMP_UNE: CondCode = AArch64CC::NE; break; + case CmpInst::FCMP_TRUE: + CondCode = AArch64CC::AL; + break; + case CmpInst::FCMP_FALSE: + CondCode = AArch64CC::NV; + break; } } diff --git a/contrib/llvm-project/llvm/lib/Target/AArch64/GISel/AArch64LegalizerInfo.cpp b/contrib/llvm-project/llvm/lib/Target/AArch64/GISel/AArch64LegalizerInfo.cpp index 4b9d549e7911..de3c89e925a2 100644 --- a/contrib/llvm-project/llvm/lib/Target/AArch64/GISel/AArch64LegalizerInfo.cpp +++ b/contrib/llvm-project/llvm/lib/Target/AArch64/GISel/AArch64LegalizerInfo.cpp @@ -877,6 +877,7 @@ AArch64LegalizerInfo::AArch64LegalizerInfo(const AArch64Subtarget &ST) getActionDefinitionsBuilder(G_INSERT_VECTOR_ELT) .legalIf(typeInSet(0, {v16s8, v8s8, v8s16, v4s16, v4s32, v2s32, v2s64})) + .moreElementsToNextPow2(0) .widenVectorEltsToVectorMinSize(0, 64); getActionDefinitionsBuilder(G_BUILD_VECTOR) diff --git a/contrib/llvm-project/llvm/lib/Target/AArch64/GISel/AArch64RegisterBankInfo.cpp b/contrib/llvm-project/llvm/lib/Target/AArch64/GISel/AArch64RegisterBankInfo.cpp index b8e5e7bbdaba..06cdd7e4ef48 100644 --- a/contrib/llvm-project/llvm/lib/Target/AArch64/GISel/AArch64RegisterBankInfo.cpp +++ b/contrib/llvm-project/llvm/lib/Target/AArch64/GISel/AArch64RegisterBankInfo.cpp @@ -623,8 +623,11 @@ bool AArch64RegisterBankInfo::isLoadFromFPType(const MachineInstr &MI) const { EltTy = GV->getValueType(); // Look at the first element of the struct to determine the type we are // loading - while (StructType *StructEltTy = dyn_cast(EltTy)) + while (StructType *StructEltTy = dyn_cast(EltTy)) { + if (StructEltTy->getNumElements() == 0) + break; EltTy = StructEltTy->getTypeAtIndex(0U); + } // Look at the first element of the array to determine its type if (isa(EltTy)) EltTy = EltTy->getArrayElementType(); diff --git a/contrib/llvm-project/llvm/lib/Target/AMDGPU/SIInsertWaitcnts.cpp b/contrib/llvm-project/llvm/lib/Target/AMDGPU/SIInsertWaitcnts.cpp index 6ecb1c8bf6e1..7a3198612f86 100644 --- a/contrib/llvm-project/llvm/lib/Target/AMDGPU/SIInsertWaitcnts.cpp +++ b/contrib/llvm-project/llvm/lib/Target/AMDGPU/SIInsertWaitcnts.cpp @@ -1832,7 +1832,7 @@ bool SIInsertWaitcnts::generateWaitcntInstBefore(MachineInstr &MI, // not, we need to ensure the subtarget is capable of backing off barrier // instructions in case there are any outstanding memory operations that may // cause an exception. Otherwise, insert an explicit S_WAITCNT 0 here. - if (MI.getOpcode() == AMDGPU::S_BARRIER && + if (TII->isBarrierStart(MI.getOpcode()) && !ST->hasAutoWaitcntBeforeBarrier() && !ST->supportsBackOffBarrier()) { Wait = Wait.combined( AMDGPU::Waitcnt::allZero(ST->hasExtendedWaitCounts(), ST->hasVscnt())); diff --git a/contrib/llvm-project/llvm/lib/Target/AMDGPU/SIInstrInfo.h b/contrib/llvm-project/llvm/lib/Target/AMDGPU/SIInstrInfo.h index 1c9dacc09f81..626d903c0c69 100644 --- a/contrib/llvm-project/llvm/lib/Target/AMDGPU/SIInstrInfo.h +++ b/contrib/llvm-project/llvm/lib/Target/AMDGPU/SIInstrInfo.h @@ -908,6 +908,17 @@ public: return MI.getDesc().TSFlags & SIInstrFlags::IsNeverUniform; } + // Check to see if opcode is for a barrier start. Pre gfx12 this is just the + // S_BARRIER, but after support for S_BARRIER_SIGNAL* / S_BARRIER_WAIT we want + // to check for the barrier start (S_BARRIER_SIGNAL*) + bool isBarrierStart(unsigned Opcode) const { + return Opcode == AMDGPU::S_BARRIER || + Opcode == AMDGPU::S_BARRIER_SIGNAL_M0 || + Opcode == AMDGPU::S_BARRIER_SIGNAL_ISFIRST_M0 || + Opcode == AMDGPU::S_BARRIER_SIGNAL_IMM || + Opcode == AMDGPU::S_BARRIER_SIGNAL_ISFIRST_IMM; + } + static bool doesNotReadTiedSource(const MachineInstr &MI) { return MI.getDesc().TSFlags & SIInstrFlags::TiedSourceNotRead; } diff --git a/contrib/llvm-project/llvm/lib/Target/AMDGPU/SOPInstructions.td b/contrib/llvm-project/llvm/lib/Target/AMDGPU/SOPInstructions.td index ae5ef0541929..5762efde73f0 100644 --- a/contrib/llvm-project/llvm/lib/Target/AMDGPU/SOPInstructions.td +++ b/contrib/llvm-project/llvm/lib/Target/AMDGPU/SOPInstructions.td @@ -1786,7 +1786,7 @@ def : GCNPat< let SubtargetPredicate = isNotGFX12Plus in def : GCNPat <(int_amdgcn_s_wait_event_export_ready), (S_WAIT_EVENT (i16 0))>; let SubtargetPredicate = isGFX12Plus in - def : GCNPat <(int_amdgcn_s_wait_event_export_ready), (S_WAIT_EVENT (i16 1))>; + def : GCNPat <(int_amdgcn_s_wait_event_export_ready), (S_WAIT_EVENT (i16 2))>; // The first 10 bits of the mode register are the core FP mode on all // subtargets. diff --git a/contrib/llvm-project/llvm/lib/Target/PowerPC/PPCMergeStringPool.cpp b/contrib/llvm-project/llvm/lib/Target/PowerPC/PPCMergeStringPool.cpp index d9465e86d896..ebd876d50c44 100644 --- a/contrib/llvm-project/llvm/lib/Target/PowerPC/PPCMergeStringPool.cpp +++ b/contrib/llvm-project/llvm/lib/Target/PowerPC/PPCMergeStringPool.cpp @@ -23,6 +23,7 @@ #include "llvm/Analysis/ScalarEvolutionAliasAnalysis.h" #include "llvm/IR/Constants.h" #include "llvm/IR/Instructions.h" +#include "llvm/IR/IntrinsicInst.h" #include "llvm/IR/Module.h" #include "llvm/IR/ValueSymbolTable.h" #include "llvm/Pass.h" @@ -116,9 +117,20 @@ private: // sure that they can be replaced. static bool hasReplaceableUsers(GlobalVariable &GV) { for (User *CurrentUser : GV.users()) { - // Instruction users are always valid. - if (isa(CurrentUser)) + if (auto *I = dyn_cast(CurrentUser)) { + // Do not merge globals in exception pads. + if (I->isEHPad()) + return false; + + if (auto *II = dyn_cast(I)) { + // Some intrinsics require a plain global. + if (II->getIntrinsicID() == Intrinsic::eh_typeid_for) + return false; + } + + // Other instruction users are always valid. continue; + } // We cannot replace GlobalValue users because they are not just nodes // in IR. To replace a user like this we would need to create a new @@ -302,14 +314,6 @@ void PPCMergeStringPool::replaceUsesWithGEP(GlobalVariable *GlobalToReplace, Users.push_back(CurrentUser); for (User *CurrentUser : Users) { - Instruction *UserInstruction = dyn_cast(CurrentUser); - Constant *UserConstant = dyn_cast(CurrentUser); - - // At this point we expect that the user is either an instruction or a - // constant. - assert((UserConstant || UserInstruction) && - "Expected the user to be an instruction or a constant."); - // The user was not found so it must have been replaced earlier. if (!userHasOperand(CurrentUser, GlobalToReplace)) continue; @@ -318,38 +322,13 @@ void PPCMergeStringPool::replaceUsesWithGEP(GlobalVariable *GlobalToReplace, if (isa(CurrentUser)) continue; - if (!UserInstruction) { - // User is a constant type. - Constant *ConstGEP = ConstantExpr::getInBoundsGetElementPtr( - PooledStructType, GPool, Indices); - UserConstant->handleOperandChange(GlobalToReplace, ConstGEP); - continue; - } - - if (PHINode *UserPHI = dyn_cast(UserInstruction)) { - // GEP instructions cannot be added before PHI nodes. - // With getInBoundsGetElementPtr we create the GEP and then replace it - // inline into the PHI. - Constant *ConstGEP = ConstantExpr::getInBoundsGetElementPtr( - PooledStructType, GPool, Indices); - UserPHI->replaceUsesOfWith(GlobalToReplace, ConstGEP); - continue; - } - // The user is a valid instruction that is not a PHINode. - GetElementPtrInst *GEPInst = - GetElementPtrInst::Create(PooledStructType, GPool, Indices); - GEPInst->insertBefore(UserInstruction); - - LLVM_DEBUG(dbgs() << "Inserting GEP before:\n"); - LLVM_DEBUG(UserInstruction->dump()); - + Constant *ConstGEP = ConstantExpr::getInBoundsGetElementPtr( + PooledStructType, GPool, Indices); LLVM_DEBUG(dbgs() << "Replacing this global:\n"); LLVM_DEBUG(GlobalToReplace->dump()); LLVM_DEBUG(dbgs() << "with this:\n"); - LLVM_DEBUG(GEPInst->dump()); - - // After the GEP is inserted the GV can be replaced. - CurrentUser->replaceUsesOfWith(GlobalToReplace, GEPInst); + LLVM_DEBUG(ConstGEP->dump()); + GlobalToReplace->replaceAllUsesWith(ConstGEP); } } diff --git a/contrib/llvm-project/llvm/lib/Target/RISCV/MCTargetDesc/RISCVELFStreamer.cpp b/contrib/llvm-project/llvm/lib/Target/RISCV/MCTargetDesc/RISCVELFStreamer.cpp index 961b8f0afe22..cdf7c048a4bf 100644 --- a/contrib/llvm-project/llvm/lib/Target/RISCV/MCTargetDesc/RISCVELFStreamer.cpp +++ b/contrib/llvm-project/llvm/lib/Target/RISCV/MCTargetDesc/RISCVELFStreamer.cpp @@ -31,12 +31,13 @@ using namespace llvm; // This part is for ELF object output. RISCVTargetELFStreamer::RISCVTargetELFStreamer(MCStreamer &S, const MCSubtargetInfo &STI) - : RISCVTargetStreamer(S), CurrentVendor("riscv"), STI(STI) { + : RISCVTargetStreamer(S), CurrentVendor("riscv") { MCAssembler &MCA = getStreamer().getAssembler(); const FeatureBitset &Features = STI.getFeatureBits(); auto &MAB = static_cast(MCA.getBackend()); setTargetABI(RISCVABI::computeTargetABI(STI.getTargetTriple(), Features, MAB.getTargetOptions().getABIName())); + setFlagsFromFeatures(STI); // `j label` in `.option norelax; j label; .option relax; ...; label:` needs a // relocation to ensure the jump target is correct after linking. This is due // to a limitation that shouldForceRelocation has to make the decision upfront @@ -87,14 +88,13 @@ void RISCVTargetELFStreamer::finishAttributeSection() { void RISCVTargetELFStreamer::finish() { RISCVTargetStreamer::finish(); MCAssembler &MCA = getStreamer().getAssembler(); - const FeatureBitset &Features = STI.getFeatureBits(); RISCVABI::ABI ABI = getTargetABI(); unsigned EFlags = MCA.getELFHeaderEFlags(); - if (Features[RISCV::FeatureStdExtC]) + if (hasRVC()) EFlags |= ELF::EF_RISCV_RVC; - if (Features[RISCV::FeatureStdExtZtso]) + if (hasTSO()) EFlags |= ELF::EF_RISCV_TSO; switch (ABI) { diff --git a/contrib/llvm-project/llvm/lib/Target/RISCV/MCTargetDesc/RISCVELFStreamer.h b/contrib/llvm-project/llvm/lib/Target/RISCV/MCTargetDesc/RISCVELFStreamer.h index a6f54bf67b5d..e8f29cd8449b 100644 --- a/contrib/llvm-project/llvm/lib/Target/RISCV/MCTargetDesc/RISCVELFStreamer.h +++ b/contrib/llvm-project/llvm/lib/Target/RISCV/MCTargetDesc/RISCVELFStreamer.h @@ -46,7 +46,6 @@ private: StringRef CurrentVendor; MCSection *AttributeSection = nullptr; - const MCSubtargetInfo &STI; void emitAttribute(unsigned Attribute, unsigned Value) override; void emitTextAttribute(unsigned Attribute, StringRef String) override; diff --git a/contrib/llvm-project/llvm/lib/Target/RISCV/MCTargetDesc/RISCVMCExpr.cpp b/contrib/llvm-project/llvm/lib/Target/RISCV/MCTargetDesc/RISCVMCExpr.cpp index 254a9a4bc0ef..b8e0f3a867f4 100644 --- a/contrib/llvm-project/llvm/lib/Target/RISCV/MCTargetDesc/RISCVMCExpr.cpp +++ b/contrib/llvm-project/llvm/lib/Target/RISCV/MCTargetDesc/RISCVMCExpr.cpp @@ -207,8 +207,6 @@ void RISCVMCExpr::fixELFSymbolsInTLSFixups(MCAssembler &Asm) const { case VK_RISCV_TLS_GOT_HI: case VK_RISCV_TLS_GD_HI: case VK_RISCV_TLSDESC_HI: - case VK_RISCV_TLSDESC_ADD_LO: - case VK_RISCV_TLSDESC_LOAD_LO: break; } diff --git a/contrib/llvm-project/llvm/lib/Target/RISCV/MCTargetDesc/RISCVTargetStreamer.cpp b/contrib/llvm-project/llvm/lib/Target/RISCV/MCTargetDesc/RISCVTargetStreamer.cpp index ac4861bf113e..eee78a8c161f 100644 --- a/contrib/llvm-project/llvm/lib/Target/RISCV/MCTargetDesc/RISCVTargetStreamer.cpp +++ b/contrib/llvm-project/llvm/lib/Target/RISCV/MCTargetDesc/RISCVTargetStreamer.cpp @@ -48,6 +48,11 @@ void RISCVTargetStreamer::setTargetABI(RISCVABI::ABI ABI) { TargetABI = ABI; } +void RISCVTargetStreamer::setFlagsFromFeatures(const MCSubtargetInfo &STI) { + HasRVC = STI.hasFeature(RISCV::FeatureStdExtC); + HasTSO = STI.hasFeature(RISCV::FeatureStdExtZtso); +} + void RISCVTargetStreamer::emitTargetAttributes(const MCSubtargetInfo &STI, bool EmitStackAlign) { if (EmitStackAlign) { diff --git a/contrib/llvm-project/llvm/lib/Target/RISCV/MCTargetDesc/RISCVTargetStreamer.h b/contrib/llvm-project/llvm/lib/Target/RISCV/MCTargetDesc/RISCVTargetStreamer.h index 070e72fb157a..cb8bc21cb635 100644 --- a/contrib/llvm-project/llvm/lib/Target/RISCV/MCTargetDesc/RISCVTargetStreamer.h +++ b/contrib/llvm-project/llvm/lib/Target/RISCV/MCTargetDesc/RISCVTargetStreamer.h @@ -33,6 +33,8 @@ struct RISCVOptionArchArg { class RISCVTargetStreamer : public MCTargetStreamer { RISCVABI::ABI TargetABI = RISCVABI::ABI_Unknown; + bool HasRVC = false; + bool HasTSO = false; public: RISCVTargetStreamer(MCStreamer &S); @@ -58,6 +60,9 @@ public: void emitTargetAttributes(const MCSubtargetInfo &STI, bool EmitStackAlign); void setTargetABI(RISCVABI::ABI ABI); RISCVABI::ABI getTargetABI() const { return TargetABI; } + void setFlagsFromFeatures(const MCSubtargetInfo &STI); + bool hasRVC() const { return HasRVC; } + bool hasTSO() const { return HasTSO; } }; // This part is for ascii assembly output diff --git a/contrib/llvm-project/llvm/lib/Target/RISCV/RISCVAsmPrinter.cpp b/contrib/llvm-project/llvm/lib/Target/RISCV/RISCVAsmPrinter.cpp index b2e9cd87373b..87bd9b4048cd 100644 --- a/contrib/llvm-project/llvm/lib/Target/RISCV/RISCVAsmPrinter.cpp +++ b/contrib/llvm-project/llvm/lib/Target/RISCV/RISCVAsmPrinter.cpp @@ -100,7 +100,7 @@ public: bool emitDirectiveOptionArch(); private: - void emitAttributes(); + void emitAttributes(const MCSubtargetInfo &SubtargetInfo); void emitNTLHint(const MachineInstr *MI); @@ -385,8 +385,32 @@ void RISCVAsmPrinter::emitStartOfAsmFile(Module &M) { if (const MDString *ModuleTargetABI = dyn_cast_or_null(M.getModuleFlag("target-abi"))) RTS.setTargetABI(RISCVABI::getTargetABI(ModuleTargetABI->getString())); + + MCSubtargetInfo SubtargetInfo = *TM.getMCSubtargetInfo(); + + // Use module flag to update feature bits. + if (auto *MD = dyn_cast_or_null(M.getModuleFlag("riscv-isa"))) { + for (auto &ISA : MD->operands()) { + if (auto *ISAString = dyn_cast_or_null(ISA)) { + auto ParseResult = llvm::RISCVISAInfo::parseArchString( + ISAString->getString(), /*EnableExperimentalExtension=*/true, + /*ExperimentalExtensionVersionCheck=*/true); + if (!errorToBool(ParseResult.takeError())) { + auto &ISAInfo = *ParseResult; + for (const auto &Feature : RISCVFeatureKV) { + if (ISAInfo->hasExtension(Feature.Key) && + !SubtargetInfo.hasFeature(Feature.Value)) + SubtargetInfo.ToggleFeature(Feature.Key); + } + } + } + } + + RTS.setFlagsFromFeatures(SubtargetInfo); + } + if (TM.getTargetTriple().isOSBinFormatELF()) - emitAttributes(); + emitAttributes(SubtargetInfo); } void RISCVAsmPrinter::emitEndOfAsmFile(Module &M) { @@ -398,13 +422,13 @@ void RISCVAsmPrinter::emitEndOfAsmFile(Module &M) { EmitHwasanMemaccessSymbols(M); } -void RISCVAsmPrinter::emitAttributes() { +void RISCVAsmPrinter::emitAttributes(const MCSubtargetInfo &SubtargetInfo) { RISCVTargetStreamer &RTS = static_cast(*OutStreamer->getTargetStreamer()); // Use MCSubtargetInfo from TargetMachine. Individual functions may have // attributes that differ from other functions in the module and we have no // way to know which function is correct. - RTS.emitTargetAttributes(*TM.getMCSubtargetInfo(), /*EmitStackAlign*/ true); + RTS.emitTargetAttributes(SubtargetInfo, /*EmitStackAlign*/ true); } void RISCVAsmPrinter::emitFunctionEntryLabel() { diff --git a/contrib/llvm-project/llvm/lib/Target/RISCV/RISCVExpandPseudoInsts.cpp b/contrib/llvm-project/llvm/lib/Target/RISCV/RISCVExpandPseudoInsts.cpp index 0a314fdd41cb..89207640ee54 100644 --- a/contrib/llvm-project/llvm/lib/Target/RISCV/RISCVExpandPseudoInsts.cpp +++ b/contrib/llvm-project/llvm/lib/Target/RISCV/RISCVExpandPseudoInsts.cpp @@ -317,8 +317,9 @@ bool RISCVExpandPseudo::expandRV32ZdinxStore(MachineBasicBlock &MBB, .addReg(MBBI->getOperand(1).getReg()) .add(MBBI->getOperand(2)); if (MBBI->getOperand(2).isGlobal() || MBBI->getOperand(2).isCPI()) { - // FIXME: Zdinx RV32 can not work on unaligned memory. - assert(!STI->hasFastUnalignedAccess()); + // FIXME: Zdinx RV32 can not work on unaligned scalar memory. + assert(!STI->hasFastUnalignedAccess() && + !STI->enableUnalignedScalarMem()); assert(MBBI->getOperand(2).getOffset() % 8 == 0); MBBI->getOperand(2).setOffset(MBBI->getOperand(2).getOffset() + 4); diff --git a/contrib/llvm-project/llvm/lib/Target/RISCV/RISCVFeatures.td b/contrib/llvm-project/llvm/lib/Target/RISCV/RISCVFeatures.td index 26451c80f57b..1bb6b6a561f4 100644 --- a/contrib/llvm-project/llvm/lib/Target/RISCV/RISCVFeatures.td +++ b/contrib/llvm-project/llvm/lib/Target/RISCV/RISCVFeatures.td @@ -1025,6 +1025,11 @@ def FeatureFastUnalignedAccess "true", "Has reasonably performant unaligned " "loads and stores (both scalar and vector)">; +def FeatureUnalignedScalarMem + : SubtargetFeature<"unaligned-scalar-mem", "EnableUnalignedScalarMem", + "true", "Has reasonably performant unaligned scalar " + "loads and stores">; + def FeaturePostRAScheduler : SubtargetFeature<"use-postra-scheduler", "UsePostRAScheduler", "true", "Schedule again after register allocation">; diff --git a/contrib/llvm-project/llvm/lib/Target/RISCV/RISCVISelLowering.cpp b/contrib/llvm-project/llvm/lib/Target/RISCV/RISCVISelLowering.cpp index d46093b9e260..3fe7ddfdd427 100644 --- a/contrib/llvm-project/llvm/lib/Target/RISCV/RISCVISelLowering.cpp +++ b/contrib/llvm-project/llvm/lib/Target/RISCV/RISCVISelLowering.cpp @@ -1883,7 +1883,8 @@ bool RISCVTargetLowering::shouldConvertConstantLoadToIntImm(const APInt &Imm, // replace. If we don't support unaligned scalar mem, prefer the constant // pool. // TODO: Can the caller pass down the alignment? - if (!Subtarget.hasFastUnalignedAccess()) + if (!Subtarget.hasFastUnalignedAccess() && + !Subtarget.enableUnalignedScalarMem()) return true; // Prefer to keep the load if it would require many instructions. @@ -19772,8 +19773,10 @@ bool RISCVTargetLowering::allowsMisalignedMemoryAccesses( unsigned *Fast) const { if (!VT.isVector()) { if (Fast) - *Fast = Subtarget.hasFastUnalignedAccess(); - return Subtarget.hasFastUnalignedAccess(); + *Fast = Subtarget.hasFastUnalignedAccess() || + Subtarget.enableUnalignedScalarMem(); + return Subtarget.hasFastUnalignedAccess() || + Subtarget.enableUnalignedScalarMem(); } // All vector implementations must support element alignment diff --git a/contrib/llvm-project/llvm/lib/Target/SystemZ/SystemZInstrInfo.cpp b/contrib/llvm-project/llvm/lib/Target/SystemZ/SystemZInstrInfo.cpp index bf6547cc87ec..2f2dc6b80792 100644 --- a/contrib/llvm-project/llvm/lib/Target/SystemZ/SystemZInstrInfo.cpp +++ b/contrib/llvm-project/llvm/lib/Target/SystemZ/SystemZInstrInfo.cpp @@ -70,49 +70,62 @@ void SystemZInstrInfo::splitMove(MachineBasicBlock::iterator MI, MachineBasicBlock *MBB = MI->getParent(); MachineFunction &MF = *MBB->getParent(); - // Get two load or store instructions. Use the original instruction for one - // of them (arbitrarily the second here) and create a clone for the other. - MachineInstr *EarlierMI = MF.CloneMachineInstr(&*MI); - MBB->insert(MI, EarlierMI); + // Get two load or store instructions. Use the original instruction for + // one of them and create a clone for the other. + MachineInstr *HighPartMI = MF.CloneMachineInstr(&*MI); + MachineInstr *LowPartMI = &*MI; + MBB->insert(LowPartMI, HighPartMI); // Set up the two 64-bit registers and remember super reg and its flags. - MachineOperand &HighRegOp = EarlierMI->getOperand(0); - MachineOperand &LowRegOp = MI->getOperand(0); + MachineOperand &HighRegOp = HighPartMI->getOperand(0); + MachineOperand &LowRegOp = LowPartMI->getOperand(0); Register Reg128 = LowRegOp.getReg(); unsigned Reg128Killed = getKillRegState(LowRegOp.isKill()); unsigned Reg128Undef = getUndefRegState(LowRegOp.isUndef()); HighRegOp.setReg(RI.getSubReg(HighRegOp.getReg(), SystemZ::subreg_h64)); LowRegOp.setReg(RI.getSubReg(LowRegOp.getReg(), SystemZ::subreg_l64)); - if (MI->mayStore()) { - // Add implicit uses of the super register in case one of the subregs is - // undefined. We could track liveness and skip storing an undefined - // subreg, but this is hopefully rare (discovered with llvm-stress). - // If Reg128 was killed, set kill flag on MI. - unsigned Reg128UndefImpl = (Reg128Undef | RegState::Implicit); - MachineInstrBuilder(MF, EarlierMI).addReg(Reg128, Reg128UndefImpl); - MachineInstrBuilder(MF, MI).addReg(Reg128, (Reg128UndefImpl | Reg128Killed)); - } - // The address in the first (high) instruction is already correct. // Adjust the offset in the second (low) instruction. - MachineOperand &HighOffsetOp = EarlierMI->getOperand(2); - MachineOperand &LowOffsetOp = MI->getOperand(2); + MachineOperand &HighOffsetOp = HighPartMI->getOperand(2); + MachineOperand &LowOffsetOp = LowPartMI->getOperand(2); LowOffsetOp.setImm(LowOffsetOp.getImm() + 8); - // Clear the kill flags on the registers in the first instruction. - if (EarlierMI->getOperand(0).isReg() && EarlierMI->getOperand(0).isUse()) - EarlierMI->getOperand(0).setIsKill(false); - EarlierMI->getOperand(1).setIsKill(false); - EarlierMI->getOperand(3).setIsKill(false); - // Set the opcodes. unsigned HighOpcode = getOpcodeForOffset(NewOpcode, HighOffsetOp.getImm()); unsigned LowOpcode = getOpcodeForOffset(NewOpcode, LowOffsetOp.getImm()); assert(HighOpcode && LowOpcode && "Both offsets should be in range"); + HighPartMI->setDesc(get(HighOpcode)); + LowPartMI->setDesc(get(LowOpcode)); + + MachineInstr *FirstMI = HighPartMI; + if (MI->mayStore()) { + FirstMI->getOperand(0).setIsKill(false); + // Add implicit uses of the super register in case one of the subregs is + // undefined. We could track liveness and skip storing an undefined + // subreg, but this is hopefully rare (discovered with llvm-stress). + // If Reg128 was killed, set kill flag on MI. + unsigned Reg128UndefImpl = (Reg128Undef | RegState::Implicit); + MachineInstrBuilder(MF, HighPartMI).addReg(Reg128, Reg128UndefImpl); + MachineInstrBuilder(MF, LowPartMI).addReg(Reg128, (Reg128UndefImpl | Reg128Killed)); + } else { + // If HighPartMI clobbers any of the address registers, it needs to come + // after LowPartMI. + auto overlapsAddressReg = [&](Register Reg) -> bool { + return RI.regsOverlap(Reg, MI->getOperand(1).getReg()) || + RI.regsOverlap(Reg, MI->getOperand(3).getReg()); + }; + if (overlapsAddressReg(HighRegOp.getReg())) { + assert(!overlapsAddressReg(LowRegOp.getReg()) && + "Both loads clobber address!"); + MBB->splice(HighPartMI, MBB, LowPartMI); + FirstMI = LowPartMI; + } + } - EarlierMI->setDesc(get(HighOpcode)); - MI->setDesc(get(LowOpcode)); *** 421 LINES SKIPPED *** From nobody Tue May 28 05:27: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 4VpLcM5yzWz5LfPK; Tue, 28 May 2024 05:27: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 4VpLcM4YfYz4j51; Tue, 28 May 2024 05:27:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716874035; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=i3Ib0Qnf/uuCi60ofH0Dv1g603OB0sqj3/IB7mOdFJE=; b=FC8UUE2Bfdt6kCBoUttBCl1d94iNT4hQy1Cy2vF66fTMJjGIufbOykTrV9g9vfdeNAfT4A rmQkefujVYlHMoPR3+siV5WrJyexAJ/Uzp3K/0n2ttcf1SjZsRbO5x0RUh4T/RryOlT7+Q 6HnsUblyqLBAt3RC5c1NzY/51K7bQFZnCU4Tsw8cT0jCe39612uVAQ75CzpFsIeColHydt M4xnZYq7mP28Vw0/wBGmvOfA+5/Ny+EHIXeBteQr6JDSAO+oRM51UTTqN6YpF7mi+PaevU ziAnIFUqW/2Hezv/rQpdVLLbAgyq2M1N5BRf1Oay8q4vCCZn7RoDq2PF8MUT9g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1716874035; a=rsa-sha256; cv=none; b=oMaatJkZkhOTmpX/iKlrOW46l5Yg5gMJu+g1zhutqxuNtYSWbwm30i50VjwtJKaMXQqVtu 6jrJXarlJ7NK+aZzVY03LHDWA5nzYhADrD6ci17vwPfQ+repxIy/fRDcULazysrapnoBjX LihVk2IKT6fYggpLby09U3Y5vdl5MaHbVc8h8BLk77Fpc3GJWlzLygQtvBCEkuqpeMOqUL NDuGmf09WufEVdRTQxTF3EX+4fOCVA91a7n19lLKKzLf9QoT9byk6aSVHAUQ9kCQU3vMV5 lW5IuUV4HspnFRpsg4QcsfJtL/n+TwYxzylaVtRlSCGnqrwRnUjDmbLtF8nyAQ== 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=1716874035; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=i3Ib0Qnf/uuCi60ofH0Dv1g603OB0sqj3/IB7mOdFJE=; b=freyjD/BXFhT2Aa58K++cZE1FPu3oG/2DJqVfzZW3fhxCkxFZNd5OXyMEaX27zJnJUZy8b 4ciCjNtI80QwaXAlZmI/sEcuYpFqhtKenPi0FU6J5rEVpTADJOilGaAfe27bSHP/4YQBFT 2zJC8tP75qbuCwWzc8Ahj4RxmZpSKDCsxmD/Lo0cRfIXgXyIW5AUYSRh9/Glz7LvFKw8RN eHU7C125t7ZY+HzT3dOQZuqjPHlTgmzjSkpKU0PTW2rW3HnA/eJIMEq7AYl8PE0tH3Cyv5 lQ1Z+ZsDX9X1f57MWiYrUShwG2CpJbcRc29UpiI+KKOy0Xg2TyL2Lg+vl2G2gw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VpLcM49ndz1FDd; Tue, 28 May 2024 05:27: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 44S5RFZh018565; Tue, 28 May 2024 05:27:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44S5RFCQ018562; Tue, 28 May 2024 05:27:15 GMT (envelope-from git) Date: Tue, 28 May 2024 05:27:15 GMT Message-Id: <202405280527.44S5RFCQ018562@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: ec38746722a1 - stable/14 - Merge commit d0be944aa511 from llvm-project (by Simon Pilgrim): List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: ec38746722a15b4376bed274e96ff7b8c31804e1 Auto-Submitted: auto-generated The branch stable/14 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=ec38746722a15b4376bed274e96ff7b8c31804e1 commit ec38746722a15b4376bed274e96ff7b8c31804e1 Author: Dimitry Andric AuthorDate: 2024-05-25 17:52:15 +0000 Commit: Dimitry Andric CommitDate: 2024-05-28 05:25:49 +0000 Merge commit d0be944aa511 from llvm-project (by Simon Pilgrim): [X86] Add slow div64 tuning flag to Nehalem target (#91129) This appears to have been missed because later cpus don't inherit from Nehalem tuning much. Noticed while cleaning up for #90985 Merge commit 8b400de79eff from llvm-project (by Simon Pilgrim): [X86] Enable TuningSlowDivide64 on Barcelona/Bobcat/Bulldozer/Ryzen Families (#91277) Despite most AMD cpus having a lower latency for i64 divisions that converge early, we are still better off testing for values representable as i32 and performing a i32 division if possible. All AMD cpus appear to have been missed when we added the "idivq-to-divl" attribute - this patch now matches Intel cpu behaviour (and the x86-64/v2/3/4 levels). Unfortunately the difference in code scheduling means I've had to stop using the update_llc_test_checks script and just use old-fashioned CHECK-DAG checks for divl/divq pairs. Fixes #90985 This fixes possibly worse runtime performance on AMD Zen hardware, when using -march=znver4 (or any other znver), as opposed to -march=x86-64-v4 or the baseline -march=x86-64. A similar fix is applied for Nehalem. PR: 278908 MFC after: 3 days (cherry picked from commit cadd2ca21765ebcb95b77ec94977b4e74e1edc1b) --- contrib/llvm-project/llvm/lib/Target/X86/X86.td | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/contrib/llvm-project/llvm/lib/Target/X86/X86.td b/contrib/llvm-project/llvm/lib/Target/X86/X86.td index e89ddcc570c9..1aff5f9fad97 100644 --- a/contrib/llvm-project/llvm/lib/Target/X86/X86.td +++ b/contrib/llvm-project/llvm/lib/Target/X86/X86.td @@ -867,6 +867,7 @@ def ProcessorFeatures { // Nehalem list NHMFeatures = X86_64V2Features; list NHMTuning = [TuningMacroFusion, + TuningSlowDivide64, TuningInsertVZEROUPPER, TuningNoDomainDelayMov]; @@ -1336,6 +1337,7 @@ def ProcessorFeatures { FeatureCMOV, FeatureX86_64]; list BarcelonaTuning = [TuningFastScalarShiftMasks, + TuningSlowDivide64, TuningSlowSHLD, TuningSBBDepBreaking, TuningInsertVZEROUPPER]; @@ -1358,6 +1360,7 @@ def ProcessorFeatures { list BtVer1Tuning = [TuningFast15ByteNOP, TuningFastScalarShiftMasks, TuningFastVectorShiftMasks, + TuningSlowDivide64, TuningSlowSHLD, TuningSBBDepBreaking, TuningInsertVZEROUPPER]; @@ -1380,6 +1383,7 @@ def ProcessorFeatures { TuningFastVectorShiftMasks, TuningFastMOVBE, TuningSBBDepBreaking, + TuningSlowDivide64, TuningSlowSHLD]; list BtVer2Features = !listconcat(BtVer1Features, BtVer2AdditionalFeatures); @@ -1404,6 +1408,7 @@ def ProcessorFeatures { FeatureLWP, FeatureLAHFSAHF64]; list BdVer1Tuning = [TuningSlowSHLD, + TuningSlowDivide64, TuningFast11ByteNOP, TuningFastScalarShiftMasks, TuningBranchFusion, @@ -1483,6 +1488,7 @@ def ProcessorFeatures { TuningFastScalarShiftMasks, TuningFastVariablePerLaneShuffle, TuningFastMOVBE, + TuningSlowDivide64, TuningSlowSHLD, TuningSBBDepBreaking, TuningInsertVZEROUPPER, From nobody Tue May 28 05:28: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 4VpLdy0WkXz5LfJc; Tue, 28 May 2024 05:28:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VpLdx719dz4jbQ; Tue, 28 May 2024 05:28:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716874118; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=r/AteRTCcA57+eD9GIArfXWQDS5sAmVEijG2/9WgTV0=; b=VFx2ORr5b9dM6gd7mHQ8WM3nMYrt5rDp6Qc6CzqsbM5SqyJ7nmIvfbByTupTzDhOgpjqWl 9MA3yJC0YX0Fl+Th2viDMAsDeyVMm28O6JpzF+EkPlxM06WUY17TPYmqZvlLosvzJyAhTN k0f9ifSX8bKszB+0xg5UFZ42Ml4H3S10RxW0jKJtKqA8bomCXTWDT+VUaE+7PjJmpUwTy5 kDH1akPW0t3shdYFiw/rATfwK3pIqwiKDG8aWFqdBLk0BhAw5L17J6Jj+4ZB9FJ+pUlxka 8yLdvkryDW6e+jCNxhcRbWxkDw0KoSyUGZOjXcofvVTh+k49pBnR12wczjAE/Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1716874118; a=rsa-sha256; cv=none; b=th01rhr5PEdKgxB7oQGfv6FKbmWcs1shGnXHv6/yAqxlYIu3iael7OGEq3W8GVF8pZcpI2 rUnpWmxH4Rh2zTCpp+tDtG2Mb+mZLlg3MBg5x+3ylR4zQZhei73zsnh9FssXEpU2A+brvL Flt465zALC4UMFdP7CgeR5Xx7QeksTlmMVAJwgzH79FXklwPfhYNF0UQQo9Aw2opqnwhyi a5eyCdELIrchAeEDOG/tw1ucskl7LhQ2n9agSJ8CqBuYE2F3sp+lkpMf96sLCXnXeuukSf 1mWygOiijRZ4imiooaG351mej82v2E6Zj4mCfPrCTK4RkH9gUstDKMlL06VB2g== 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=1716874117; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=r/AteRTCcA57+eD9GIArfXWQDS5sAmVEijG2/9WgTV0=; b=nb/tb9nBm66Ao1O32D8GpZpKkNxqEIPuoy+yMpvpgNdpOXxWcxyTv+it//7vuyblon4s6b CWdVWqrPFWLR1p/XPTiEV3GEEMf8t5Xw/b9JUT4Hc+Qn0ihdiwxOJ93jAITwy5bMvN1Q6U TgmozgrHJ9RuxfWN/4msMae8qEToCEkrZHFi07tyQxO4SZtAboSTqMa9boOtyV2ZjV+fiZ Ef0CcjROCzpYQmnGhmdLX6DCPUPoJkpJucUq5a2rbc5NzJYYeDNJWOJyUINtjHE7BkaC3R eSr/rClQKVsTRNLv87DE5les5jrckLt1dt9MOWw5VCyUM2PYiaae7jKvQQSWEA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VpLdx6Zshz1FPd; Tue, 28 May 2024 05:28: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 44S5SbGa018896; Tue, 28 May 2024 05:28:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44S5SbJS018893; Tue, 28 May 2024 05:28:37 GMT (envelope-from git) Date: Tue, 28 May 2024 05:28:37 GMT Message-Id: <202405280528.44S5SbJS018893@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: 70be2f0deb0f - stable/13 - Merge llvm-project release/18.x llvmorg-18.1.6-0-g1118c2e05e67 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: 70be2f0deb0f49e1f454b6d8e80cf56a24322a54 Auto-Submitted: auto-generated The branch stable/13 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=70be2f0deb0f49e1f454b6d8e80cf56a24322a54 commit 70be2f0deb0f49e1f454b6d8e80cf56a24322a54 Author: Dimitry Andric AuthorDate: 2024-05-24 15:51:19 +0000 Commit: Dimitry Andric CommitDate: 2024-05-28 05:26:45 +0000 Merge llvm-project release/18.x llvmorg-18.1.6-0-g1118c2e05e67 This updates llvm, clang, compiler-rt, libc++, libunwind, lld, lldb and openmp to llvm-project release/18.x llvmorg-18.1.6-0-g1118c2e05e67. PR: 276104 MFC after: 3 days (cherry picked from commit 3a0793336edfc21cb6d4c8c5c5d7f1665f3e6c5a) --- .../clang/lib/CodeGen/CodeGenModule.cpp | 14 +++++ .../clang/lib/Driver/ToolChains/OpenBSD.cpp | 3 +- .../clang/lib/Format/UnwrappedLineParser.cpp | 7 ++- .../clang/lib/Format/WhitespaceManager.cpp | 2 +- .../clang/lib/Interpreter/IncrementalParser.cpp | 24 ++++++-- .../clang/lib/Interpreter/IncrementalParser.h | 5 ++ .../llvm-project/clang/lib/Sema/SemaTemplate.cpp | 25 +++++++-- contrib/llvm-project/libcxx/src/atomic.cpp | 16 +++++- contrib/llvm-project/libcxx/src/chrono.cpp | 4 +- contrib/llvm-project/lld/ELF/Relocations.cpp | 5 +- .../llvm/include/llvm/CodeGen/MachineFrameInfo.h | 7 +++ .../llvm/lib/Analysis/InstructionSimplify.cpp | 4 ++ .../lib/CodeGen/InterleavedLoadCombinePass.cpp | 3 + .../CodeGen/SelectionDAG/SelectionDAGBuilder.cpp | 3 +- .../Target/AArch64/AArch64Arm64ECCallLowering.cpp | 16 ++++-- .../lib/Target/AArch64/AArch64ISelLowering.cpp | 3 +- .../AArch64/GISel/AArch64GlobalISelUtils.cpp | 6 ++ .../Target/AArch64/GISel/AArch64LegalizerInfo.cpp | 1 + .../AArch64/GISel/AArch64RegisterBankInfo.cpp | 5 +- .../llvm/lib/Target/AMDGPU/SIInsertWaitcnts.cpp | 2 +- .../llvm/lib/Target/AMDGPU/SIInstrInfo.h | 11 ++++ .../llvm/lib/Target/AMDGPU/SOPInstructions.td | 2 +- .../llvm/lib/Target/PowerPC/PPCMergeStringPool.cpp | 57 ++++++------------- .../Target/RISCV/MCTargetDesc/RISCVELFStreamer.cpp | 8 +-- .../Target/RISCV/MCTargetDesc/RISCVELFStreamer.h | 1 - .../lib/Target/RISCV/MCTargetDesc/RISCVMCExpr.cpp | 2 - .../RISCV/MCTargetDesc/RISCVTargetStreamer.cpp | 5 ++ .../RISCV/MCTargetDesc/RISCVTargetStreamer.h | 5 ++ .../llvm/lib/Target/RISCV/RISCVAsmPrinter.cpp | 32 +++++++++-- .../lib/Target/RISCV/RISCVExpandPseudoInsts.cpp | 5 +- .../llvm/lib/Target/RISCV/RISCVFeatures.td | 5 ++ .../llvm/lib/Target/RISCV/RISCVISelLowering.cpp | 9 ++- .../llvm/lib/Target/SystemZ/SystemZInstrInfo.cpp | 65 +++++++++++++--------- .../llvm/lib/Target/X86/X86ISelLowering.cpp | 6 +- .../llvm/lib/Target/X86/X86InstrAVX512.td | 42 +++++++------- .../llvm/lib/Transforms/IPO/FunctionAttrs.cpp | 7 ++- .../llvm/lib/Transforms/IPO/GlobalOpt.cpp | 3 + .../Transforms/InstCombine/InstCombineSelect.cpp | 14 ++++- .../lib/Transforms/Vectorize/SLPVectorizer.cpp | 21 +------ 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 +- 46 files changed, 316 insertions(+), 169 deletions(-) diff --git a/contrib/llvm-project/clang/lib/CodeGen/CodeGenModule.cpp b/contrib/llvm-project/clang/lib/CodeGen/CodeGenModule.cpp index 1280bcd36de9..eb13cd40eb8a 100644 --- a/contrib/llvm-project/clang/lib/CodeGen/CodeGenModule.cpp +++ b/contrib/llvm-project/clang/lib/CodeGen/CodeGenModule.cpp @@ -67,6 +67,7 @@ #include "llvm/Support/CommandLine.h" #include "llvm/Support/ConvertUTF.h" #include "llvm/Support/ErrorHandling.h" +#include "llvm/Support/RISCVISAInfo.h" #include "llvm/Support/TimeProfiler.h" #include "llvm/Support/xxhash.h" #include "llvm/TargetParser/Triple.h" @@ -1059,6 +1060,19 @@ void CodeGenModule::Release() { llvm::LLVMContext &Ctx = TheModule.getContext(); getModule().addModuleFlag(llvm::Module::Error, "target-abi", llvm::MDString::get(Ctx, ABIStr)); + + // Add the canonical ISA string as metadata so the backend can set the ELF + // attributes correctly. We use AppendUnique so LTO will keep all of the + // unique ISA strings that were linked together. + const std::vector &Features = + getTarget().getTargetOpts().Features; + auto ParseResult = llvm::RISCVISAInfo::parseFeatures( + Arch == llvm::Triple::riscv64 ? 64 : 32, Features); + if (!errorToBool(ParseResult.takeError())) + getModule().addModuleFlag( + llvm::Module::AppendUnique, "riscv-isa", + llvm::MDNode::get( + Ctx, llvm::MDString::get(Ctx, (*ParseResult)->toString()))); } if (CodeGenOpts.SanitizeCfiCrossDso) { diff --git a/contrib/llvm-project/clang/lib/Driver/ToolChains/OpenBSD.cpp b/contrib/llvm-project/clang/lib/Driver/ToolChains/OpenBSD.cpp index fd6aa4d7e684..00b6c520fcdd 100644 --- a/contrib/llvm-project/clang/lib/Driver/ToolChains/OpenBSD.cpp +++ b/contrib/llvm-project/clang/lib/Driver/ToolChains/OpenBSD.cpp @@ -371,7 +371,8 @@ std::string OpenBSD::getCompilerRT(const ArgList &Args, StringRef Component, if (Component == "builtins") { SmallString<128> Path(getDriver().SysRoot); llvm::sys::path::append(Path, "/usr/lib/libcompiler_rt.a"); - return std::string(Path); + if (getVFS().exists(Path)) + return std::string(Path); } SmallString<128> P(getDriver().ResourceDir); std::string CRTBasename = diff --git a/contrib/llvm-project/clang/lib/Format/UnwrappedLineParser.cpp b/contrib/llvm-project/clang/lib/Format/UnwrappedLineParser.cpp index a6eb18bb2b32..f70affb732a0 100644 --- a/contrib/llvm-project/clang/lib/Format/UnwrappedLineParser.cpp +++ b/contrib/llvm-project/clang/lib/Format/UnwrappedLineParser.cpp @@ -2510,6 +2510,7 @@ bool UnwrappedLineParser::parseParens(TokenType AmpAmpTokenType) { assert(FormatTok->is(tok::l_paren) && "'(' expected."); auto *LeftParen = FormatTok; bool SeenEqual = false; + bool MightBeFoldExpr = false; const bool MightBeStmtExpr = Tokens->peekNextToken()->is(tok::l_brace); nextToken(); do { @@ -2521,7 +2522,7 @@ bool UnwrappedLineParser::parseParens(TokenType AmpAmpTokenType) { parseChildBlock(); break; case tok::r_paren: - if (!MightBeStmtExpr && !Line->InMacroBody && + if (!MightBeStmtExpr && !MightBeFoldExpr && !Line->InMacroBody && Style.RemoveParentheses > FormatStyle::RPS_Leave) { const auto *Prev = LeftParen->Previous; const auto *Next = Tokens->peekNextToken(); @@ -2564,6 +2565,10 @@ bool UnwrappedLineParser::parseParens(TokenType AmpAmpTokenType) { parseBracedList(); } break; + case tok::ellipsis: + MightBeFoldExpr = true; + nextToken(); + break; case tok::equal: SeenEqual = true; if (Style.isCSharp() && FormatTok->is(TT_FatArrow)) diff --git a/contrib/llvm-project/clang/lib/Format/WhitespaceManager.cpp b/contrib/llvm-project/clang/lib/Format/WhitespaceManager.cpp index df84f97a8e8a..7525e6ee650b 100644 --- a/contrib/llvm-project/clang/lib/Format/WhitespaceManager.cpp +++ b/contrib/llvm-project/clang/lib/Format/WhitespaceManager.cpp @@ -1466,7 +1466,7 @@ WhitespaceManager::CellDescriptions WhitespaceManager::getCells(unsigned Start, : Cell); // Go to the next non-comment and ensure there is a break in front const auto *NextNonComment = C.Tok->getNextNonComment(); - while (NextNonComment->is(tok::comma)) + while (NextNonComment && NextNonComment->is(tok::comma)) NextNonComment = NextNonComment->getNextNonComment(); auto j = i; while (Changes[j].Tok != NextNonComment && j < End) diff --git a/contrib/llvm-project/clang/lib/Interpreter/IncrementalParser.cpp b/contrib/llvm-project/clang/lib/Interpreter/IncrementalParser.cpp index 370bcbfee8b0..f5f32b9f3924 100644 --- a/contrib/llvm-project/clang/lib/Interpreter/IncrementalParser.cpp +++ b/contrib/llvm-project/clang/lib/Interpreter/IncrementalParser.cpp @@ -209,6 +209,10 @@ IncrementalParser::IncrementalParser(Interpreter &Interp, if (Err) return; CI->ExecuteAction(*Act); + + if (getCodeGen()) + CachedInCodeGenModule = GenModule(); + std::unique_ptr IncrConsumer = std::make_unique(Interp, CI->takeASTConsumer()); CI->setASTConsumer(std::move(IncrConsumer)); @@ -224,11 +228,8 @@ IncrementalParser::IncrementalParser(Interpreter &Interp, return; // PTU.takeError(); } - if (CodeGenerator *CG = getCodeGen()) { - std::unique_ptr M(CG->ReleaseModule()); - CG->StartModule("incr_module_" + std::to_string(PTUs.size()), - M->getContext()); - PTU->TheModule = std::move(M); + if (getCodeGen()) { + PTU->TheModule = GenModule(); assert(PTU->TheModule && "Failed to create initial PTU"); } } @@ -364,6 +365,19 @@ IncrementalParser::Parse(llvm::StringRef input) { std::unique_ptr IncrementalParser::GenModule() { static unsigned ID = 0; if (CodeGenerator *CG = getCodeGen()) { + // Clang's CodeGen is designed to work with a single llvm::Module. In many + // cases for convenience various CodeGen parts have a reference to the + // llvm::Module (TheModule or Module) which does not change when a new + // module is pushed. However, the execution engine wants to take ownership + // of the module which does not map well to CodeGen's design. To work this + // around we created an empty module to make CodeGen happy. We should make + // sure it always stays empty. + assert((!CachedInCodeGenModule || + (CachedInCodeGenModule->empty() && + CachedInCodeGenModule->global_empty() && + CachedInCodeGenModule->alias_empty() && + CachedInCodeGenModule->ifunc_empty())) && + "CodeGen wrote to a readonly module"); std::unique_ptr M(CG->ReleaseModule()); CG->StartModule("incr_module_" + std::to_string(ID++), M->getContext()); return M; diff --git a/contrib/llvm-project/clang/lib/Interpreter/IncrementalParser.h b/contrib/llvm-project/clang/lib/Interpreter/IncrementalParser.h index e13b74c7f659..f63bce50acd3 100644 --- a/contrib/llvm-project/clang/lib/Interpreter/IncrementalParser.h +++ b/contrib/llvm-project/clang/lib/Interpreter/IncrementalParser.h @@ -24,6 +24,7 @@ #include namespace llvm { class LLVMContext; +class Module; } // namespace llvm namespace clang { @@ -57,6 +58,10 @@ protected: /// of code. std::list PTUs; + /// When CodeGen is created the first llvm::Module gets cached in many places + /// and we must keep it alive. + std::unique_ptr CachedInCodeGenModule; + IncrementalParser(); public: diff --git a/contrib/llvm-project/clang/lib/Sema/SemaTemplate.cpp b/contrib/llvm-project/clang/lib/Sema/SemaTemplate.cpp index b619f5d729e8..a12a64939c46 100644 --- a/contrib/llvm-project/clang/lib/Sema/SemaTemplate.cpp +++ b/contrib/llvm-project/clang/lib/Sema/SemaTemplate.cpp @@ -2404,9 +2404,6 @@ struct ConvertConstructorToDeductionGuideTransform { Args.addOuterRetainedLevel(); } - if (NestedPattern) - Args.addOuterRetainedLevels(NestedPattern->getTemplateDepth()); - FunctionProtoTypeLoc FPTL = CD->getTypeSourceInfo()->getTypeLoc() .getAsAdjusted(); assert(FPTL && "no prototype for constructor declaration"); @@ -2526,11 +2523,27 @@ private: // -- The types of the function parameters are those of the constructor. for (auto *OldParam : TL.getParams()) { - ParmVarDecl *NewParam = - transformFunctionTypeParam(OldParam, Args, MaterializedTypedefs); - if (NestedPattern && NewParam) + ParmVarDecl *NewParam = OldParam; + // Given + // template struct C { + // template struct D { + // template D(U, V); + // }; + // }; + // First, transform all the references to template parameters that are + // defined outside of the surrounding class template. That is T in the + // above example. + if (NestedPattern) { NewParam = transformFunctionTypeParam(NewParam, OuterInstantiationArgs, MaterializedTypedefs); + if (!NewParam) + return QualType(); + } + // Then, transform all the references to template parameters that are + // defined at the class template and the constructor. In this example, + // they're U and V, respectively. + NewParam = + transformFunctionTypeParam(NewParam, Args, MaterializedTypedefs); if (!NewParam) return QualType(); ParamTypes.push_back(NewParam->getType()); diff --git a/contrib/llvm-project/libcxx/src/atomic.cpp b/contrib/llvm-project/libcxx/src/atomic.cpp index 6c7fa1206cf4..98b7f0372369 100644 --- a/contrib/llvm-project/libcxx/src/atomic.cpp +++ b/contrib/llvm-project/libcxx/src/atomic.cpp @@ -25,16 +25,28 @@ # if !defined(SYS_futex) && defined(SYS_futex_time64) # define SYS_futex SYS_futex_time64 # endif +# define _LIBCPP_FUTEX(...) syscall(SYS_futex, __VA_ARGS__) #elif defined(__FreeBSD__) # include # include +# define _LIBCPP_FUTEX(...) syscall(SYS_futex, __VA_ARGS__) + +#elif defined(__OpenBSD__) + +# include + +// OpenBSD has no indirect syscalls +# define _LIBCPP_FUTEX(...) futex(__VA_ARGS__) + #else // <- Add other operating systems here // Baseline needs no new headers +# define _LIBCPP_FUTEX(...) syscall(SYS_futex, __VA_ARGS__) + #endif _LIBCPP_BEGIN_NAMESPACE_STD @@ -44,11 +56,11 @@ _LIBCPP_BEGIN_NAMESPACE_STD static void __libcpp_platform_wait_on_address(__cxx_atomic_contention_t const volatile* __ptr, __cxx_contention_t __val) { static constexpr timespec __timeout = {2, 0}; - syscall(SYS_futex, __ptr, FUTEX_WAIT_PRIVATE, __val, &__timeout, 0, 0); + _LIBCPP_FUTEX(__ptr, FUTEX_WAIT_PRIVATE, __val, &__timeout, 0, 0); } static void __libcpp_platform_wake_by_address(__cxx_atomic_contention_t const volatile* __ptr, bool __notify_one) { - syscall(SYS_futex, __ptr, FUTEX_WAKE_PRIVATE, __notify_one ? 1 : INT_MAX, 0, 0, 0); + _LIBCPP_FUTEX(__ptr, FUTEX_WAKE_PRIVATE, __notify_one ? 1 : INT_MAX, 0, 0, 0); } #elif defined(__APPLE__) && defined(_LIBCPP_USE_ULOCK) diff --git a/contrib/llvm-project/libcxx/src/chrono.cpp b/contrib/llvm-project/libcxx/src/chrono.cpp index c5e827c0cb59..e7d6dfbc2292 100644 --- a/contrib/llvm-project/libcxx/src/chrono.cpp +++ b/contrib/llvm-project/libcxx/src/chrono.cpp @@ -31,7 +31,9 @@ # include // for gettimeofday and timeval #endif -#if defined(__APPLE__) || defined(__gnu_hurd__) || (defined(_POSIX_TIMERS) && _POSIX_TIMERS > 0) +// OpenBSD does not have a fully conformant suite of POSIX timers, but +// it does have clock_gettime and CLOCK_MONOTONIC which is all we need. +#if defined(__APPLE__) || defined(__gnu_hurd__) || defined(__OpenBSD__) || (defined(_POSIX_TIMERS) && _POSIX_TIMERS > 0) # define _LIBCPP_HAS_CLOCK_GETTIME #endif diff --git a/contrib/llvm-project/lld/ELF/Relocations.cpp b/contrib/llvm-project/lld/ELF/Relocations.cpp index 619fbaf5dc54..92a1b9baaca3 100644 --- a/contrib/llvm-project/lld/ELF/Relocations.cpp +++ b/contrib/llvm-project/lld/ELF/Relocations.cpp @@ -1480,7 +1480,10 @@ template void RelocationScanner::scanOne(RelTy *&i) { // Process TLS relocations, including TLS optimizations. Note that // R_TPREL and R_TPREL_NEG relocations are resolved in processAux. - if (sym.isTls()) { + // + // Some RISCV TLSDESC relocations reference a local NOTYPE symbol, + // but we need to process them in handleTlsRelocation. + if (sym.isTls() || oneof(expr)) { if (unsigned processed = handleTlsRelocation(type, sym, *sec, offset, addend, expr)) { i += processed - 1; diff --git a/contrib/llvm-project/llvm/include/llvm/CodeGen/MachineFrameInfo.h b/contrib/llvm-project/llvm/include/llvm/CodeGen/MachineFrameInfo.h index 7d11d63d4066..c35faac09c4d 100644 --- a/contrib/llvm-project/llvm/include/llvm/CodeGen/MachineFrameInfo.h +++ b/contrib/llvm-project/llvm/include/llvm/CodeGen/MachineFrameInfo.h @@ -697,6 +697,13 @@ public: return Objects[ObjectIdx+NumFixedObjects].isAliased; } + /// Set "maybe pointed to by an LLVM IR value" for an object. + void setIsAliasedObjectIndex(int ObjectIdx, bool IsAliased) { + assert(unsigned(ObjectIdx+NumFixedObjects) < Objects.size() && + "Invalid Object Idx!"); + Objects[ObjectIdx+NumFixedObjects].isAliased = IsAliased; + } + /// Returns true if the specified index corresponds to an immutable object. bool isImmutableObjectIndex(int ObjectIdx) const { // Tail calling functions can clobber their function arguments. diff --git a/contrib/llvm-project/llvm/lib/Analysis/InstructionSimplify.cpp b/contrib/llvm-project/llvm/lib/Analysis/InstructionSimplify.cpp index 72b6dfa181e8..8dcffe45c644 100644 --- a/contrib/llvm-project/llvm/lib/Analysis/InstructionSimplify.cpp +++ b/contrib/llvm-project/llvm/lib/Analysis/InstructionSimplify.cpp @@ -4322,6 +4322,10 @@ static Value *simplifyWithOpReplaced(Value *V, Value *Op, Value *RepOp, if (match(I, m_Intrinsic())) return nullptr; + // Don't simplify freeze. + if (isa(I)) + return nullptr; + // Replace Op with RepOp in instruction operands. SmallVector NewOps; bool AnyReplaced = false; diff --git a/contrib/llvm-project/llvm/lib/CodeGen/InterleavedLoadCombinePass.cpp b/contrib/llvm-project/llvm/lib/CodeGen/InterleavedLoadCombinePass.cpp index f2d5c3c867c2..bbb0b654dc67 100644 --- a/contrib/llvm-project/llvm/lib/CodeGen/InterleavedLoadCombinePass.cpp +++ b/contrib/llvm-project/llvm/lib/CodeGen/InterleavedLoadCombinePass.cpp @@ -877,6 +877,9 @@ public: if (LI->isAtomic()) return false; + if (!DL.typeSizeEqualsStoreSize(Result.VTy->getElementType())) + return false; + // Get the base polynomial computePolynomialFromPointer(*LI->getPointerOperand(), Offset, BasePtr, DL); diff --git a/contrib/llvm-project/llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp b/contrib/llvm-project/llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp index 5ce1013f30fd..7406a8ac1611 100644 --- a/contrib/llvm-project/llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp +++ b/contrib/llvm-project/llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp @@ -10888,7 +10888,7 @@ static void tryToElideArgumentCopy( } // Perform the elision. Delete the old stack object and replace its only use - // in the variable info map. Mark the stack object as mutable. + // in the variable info map. Mark the stack object as mutable and aliased. LLVM_DEBUG({ dbgs() << "Eliding argument copy from " << Arg << " to " << *AI << '\n' << " Replacing frame index " << OldIndex << " with " << FixedIndex @@ -10896,6 +10896,7 @@ static void tryToElideArgumentCopy( }); MFI.RemoveStackObject(OldIndex); MFI.setIsImmutableObjectIndex(FixedIndex, false); + MFI.setIsAliasedObjectIndex(FixedIndex, true); AllocaIndex = FixedIndex; ArgCopyElisionFrameIndexMap.insert({OldIndex, FixedIndex}); for (SDValue ArgVal : ArgVals) diff --git a/contrib/llvm-project/llvm/lib/Target/AArch64/AArch64Arm64ECCallLowering.cpp b/contrib/llvm-project/llvm/lib/Target/AArch64/AArch64Arm64ECCallLowering.cpp index 55c5bbc66a3f..862aefe46193 100644 --- a/contrib/llvm-project/llvm/lib/Target/AArch64/AArch64Arm64ECCallLowering.cpp +++ b/contrib/llvm-project/llvm/lib/Target/AArch64/AArch64Arm64ECCallLowering.cpp @@ -181,13 +181,14 @@ void AArch64Arm64ECCallLowering::getThunkArgTypes( } for (unsigned E = FT->getNumParams(); I != E; ++I) { - Align ParamAlign = AttrList.getParamAlignment(I).valueOrOne(); #if 0 // FIXME: Need more information about argument size; see // https://reviews.llvm.org/D132926 uint64_t ArgSizeBytes = AttrList.getParamArm64ECArgSizeBytes(I); + Align ParamAlign = AttrList.getParamAlignment(I).valueOrOne(); #else uint64_t ArgSizeBytes = 0; + Align ParamAlign = Align(); #endif Type *Arm64Ty, *X64Ty; canonicalizeThunkType(FT->getParamType(I), ParamAlign, @@ -297,7 +298,7 @@ void AArch64Arm64ECCallLowering::canonicalizeThunkType( uint64_t TotalSizeBytes = ElementCnt * ElementSizePerBytes; if (ElementTy->isFloatTy() || ElementTy->isDoubleTy()) { Out << (ElementTy->isFloatTy() ? "F" : "D") << TotalSizeBytes; - if (Alignment.value() >= 8 && !T->isPointerTy()) + if (Alignment.value() >= 16 && !Ret) Out << "a" << Alignment.value(); Arm64Ty = T; if (TotalSizeBytes <= 8) { @@ -328,7 +329,7 @@ void AArch64Arm64ECCallLowering::canonicalizeThunkType( Out << "m"; if (TypeSize != 4) Out << TypeSize; - if (Alignment.value() >= 8 && !T->isPointerTy()) + if (Alignment.value() >= 16 && !Ret) Out << "a" << Alignment.value(); // FIXME: Try to canonicalize Arm64Ty more thoroughly? Arm64Ty = T; @@ -513,7 +514,14 @@ Function *AArch64Arm64ECCallLowering::buildEntryThunk(Function *F) { // Call the function passed to the thunk. Value *Callee = Thunk->getArg(0); Callee = IRB.CreateBitCast(Callee, PtrTy); - Value *Call = IRB.CreateCall(Arm64Ty, Callee, Args); + CallInst *Call = IRB.CreateCall(Arm64Ty, Callee, Args); + + auto SRetAttr = F->getAttributes().getParamAttr(0, Attribute::StructRet); + auto InRegAttr = F->getAttributes().getParamAttr(0, Attribute::InReg); + if (SRetAttr.isValid() && !InRegAttr.isValid()) { + Thunk->addParamAttr(1, SRetAttr); + Call->addParamAttr(0, SRetAttr); + } Value *RetVal = Call; if (TransformDirectToSRet) { diff --git a/contrib/llvm-project/llvm/lib/Target/AArch64/AArch64ISelLowering.cpp b/contrib/llvm-project/llvm/lib/Target/AArch64/AArch64ISelLowering.cpp index 95d8ab95b2c0..bcfd0253e73c 100644 --- a/contrib/llvm-project/llvm/lib/Target/AArch64/AArch64ISelLowering.cpp +++ b/contrib/llvm-project/llvm/lib/Target/AArch64/AArch64ISelLowering.cpp @@ -22122,7 +22122,8 @@ SDValue performCONDCombine(SDNode *N, SDNode *SubsNode = N->getOperand(CmpIndex).getNode(); unsigned CondOpcode = SubsNode->getOpcode(); - if (CondOpcode != AArch64ISD::SUBS || SubsNode->hasAnyUseOfValue(0)) + if (CondOpcode != AArch64ISD::SUBS || SubsNode->hasAnyUseOfValue(0) || + !SubsNode->hasOneUse()) return SDValue(); // There is a SUBS feeding this condition. Is it fed by a mask we can diff --git a/contrib/llvm-project/llvm/lib/Target/AArch64/GISel/AArch64GlobalISelUtils.cpp b/contrib/llvm-project/llvm/lib/Target/AArch64/GISel/AArch64GlobalISelUtils.cpp index 92db89cc0915..80fe4bcb8b58 100644 --- a/contrib/llvm-project/llvm/lib/Target/AArch64/GISel/AArch64GlobalISelUtils.cpp +++ b/contrib/llvm-project/llvm/lib/Target/AArch64/GISel/AArch64GlobalISelUtils.cpp @@ -147,6 +147,12 @@ void AArch64GISelUtils::changeFCMPPredToAArch64CC( case CmpInst::FCMP_UNE: CondCode = AArch64CC::NE; break; + case CmpInst::FCMP_TRUE: + CondCode = AArch64CC::AL; + break; + case CmpInst::FCMP_FALSE: + CondCode = AArch64CC::NV; + break; } } diff --git a/contrib/llvm-project/llvm/lib/Target/AArch64/GISel/AArch64LegalizerInfo.cpp b/contrib/llvm-project/llvm/lib/Target/AArch64/GISel/AArch64LegalizerInfo.cpp index 4b9d549e7911..de3c89e925a2 100644 --- a/contrib/llvm-project/llvm/lib/Target/AArch64/GISel/AArch64LegalizerInfo.cpp +++ b/contrib/llvm-project/llvm/lib/Target/AArch64/GISel/AArch64LegalizerInfo.cpp @@ -877,6 +877,7 @@ AArch64LegalizerInfo::AArch64LegalizerInfo(const AArch64Subtarget &ST) getActionDefinitionsBuilder(G_INSERT_VECTOR_ELT) .legalIf(typeInSet(0, {v16s8, v8s8, v8s16, v4s16, v4s32, v2s32, v2s64})) + .moreElementsToNextPow2(0) .widenVectorEltsToVectorMinSize(0, 64); getActionDefinitionsBuilder(G_BUILD_VECTOR) diff --git a/contrib/llvm-project/llvm/lib/Target/AArch64/GISel/AArch64RegisterBankInfo.cpp b/contrib/llvm-project/llvm/lib/Target/AArch64/GISel/AArch64RegisterBankInfo.cpp index b8e5e7bbdaba..06cdd7e4ef48 100644 --- a/contrib/llvm-project/llvm/lib/Target/AArch64/GISel/AArch64RegisterBankInfo.cpp +++ b/contrib/llvm-project/llvm/lib/Target/AArch64/GISel/AArch64RegisterBankInfo.cpp @@ -623,8 +623,11 @@ bool AArch64RegisterBankInfo::isLoadFromFPType(const MachineInstr &MI) const { EltTy = GV->getValueType(); // Look at the first element of the struct to determine the type we are // loading - while (StructType *StructEltTy = dyn_cast(EltTy)) + while (StructType *StructEltTy = dyn_cast(EltTy)) { + if (StructEltTy->getNumElements() == 0) + break; EltTy = StructEltTy->getTypeAtIndex(0U); + } // Look at the first element of the array to determine its type if (isa(EltTy)) EltTy = EltTy->getArrayElementType(); diff --git a/contrib/llvm-project/llvm/lib/Target/AMDGPU/SIInsertWaitcnts.cpp b/contrib/llvm-project/llvm/lib/Target/AMDGPU/SIInsertWaitcnts.cpp index 6ecb1c8bf6e1..7a3198612f86 100644 --- a/contrib/llvm-project/llvm/lib/Target/AMDGPU/SIInsertWaitcnts.cpp +++ b/contrib/llvm-project/llvm/lib/Target/AMDGPU/SIInsertWaitcnts.cpp @@ -1832,7 +1832,7 @@ bool SIInsertWaitcnts::generateWaitcntInstBefore(MachineInstr &MI, // not, we need to ensure the subtarget is capable of backing off barrier // instructions in case there are any outstanding memory operations that may // cause an exception. Otherwise, insert an explicit S_WAITCNT 0 here. - if (MI.getOpcode() == AMDGPU::S_BARRIER && + if (TII->isBarrierStart(MI.getOpcode()) && !ST->hasAutoWaitcntBeforeBarrier() && !ST->supportsBackOffBarrier()) { Wait = Wait.combined( AMDGPU::Waitcnt::allZero(ST->hasExtendedWaitCounts(), ST->hasVscnt())); diff --git a/contrib/llvm-project/llvm/lib/Target/AMDGPU/SIInstrInfo.h b/contrib/llvm-project/llvm/lib/Target/AMDGPU/SIInstrInfo.h index 1c9dacc09f81..626d903c0c69 100644 --- a/contrib/llvm-project/llvm/lib/Target/AMDGPU/SIInstrInfo.h +++ b/contrib/llvm-project/llvm/lib/Target/AMDGPU/SIInstrInfo.h @@ -908,6 +908,17 @@ public: return MI.getDesc().TSFlags & SIInstrFlags::IsNeverUniform; } + // Check to see if opcode is for a barrier start. Pre gfx12 this is just the + // S_BARRIER, but after support for S_BARRIER_SIGNAL* / S_BARRIER_WAIT we want + // to check for the barrier start (S_BARRIER_SIGNAL*) + bool isBarrierStart(unsigned Opcode) const { + return Opcode == AMDGPU::S_BARRIER || + Opcode == AMDGPU::S_BARRIER_SIGNAL_M0 || + Opcode == AMDGPU::S_BARRIER_SIGNAL_ISFIRST_M0 || + Opcode == AMDGPU::S_BARRIER_SIGNAL_IMM || + Opcode == AMDGPU::S_BARRIER_SIGNAL_ISFIRST_IMM; + } + static bool doesNotReadTiedSource(const MachineInstr &MI) { return MI.getDesc().TSFlags & SIInstrFlags::TiedSourceNotRead; } diff --git a/contrib/llvm-project/llvm/lib/Target/AMDGPU/SOPInstructions.td b/contrib/llvm-project/llvm/lib/Target/AMDGPU/SOPInstructions.td index ae5ef0541929..5762efde73f0 100644 --- a/contrib/llvm-project/llvm/lib/Target/AMDGPU/SOPInstructions.td +++ b/contrib/llvm-project/llvm/lib/Target/AMDGPU/SOPInstructions.td @@ -1786,7 +1786,7 @@ def : GCNPat< let SubtargetPredicate = isNotGFX12Plus in def : GCNPat <(int_amdgcn_s_wait_event_export_ready), (S_WAIT_EVENT (i16 0))>; let SubtargetPredicate = isGFX12Plus in - def : GCNPat <(int_amdgcn_s_wait_event_export_ready), (S_WAIT_EVENT (i16 1))>; + def : GCNPat <(int_amdgcn_s_wait_event_export_ready), (S_WAIT_EVENT (i16 2))>; // The first 10 bits of the mode register are the core FP mode on all // subtargets. diff --git a/contrib/llvm-project/llvm/lib/Target/PowerPC/PPCMergeStringPool.cpp b/contrib/llvm-project/llvm/lib/Target/PowerPC/PPCMergeStringPool.cpp index d9465e86d896..ebd876d50c44 100644 --- a/contrib/llvm-project/llvm/lib/Target/PowerPC/PPCMergeStringPool.cpp +++ b/contrib/llvm-project/llvm/lib/Target/PowerPC/PPCMergeStringPool.cpp @@ -23,6 +23,7 @@ #include "llvm/Analysis/ScalarEvolutionAliasAnalysis.h" #include "llvm/IR/Constants.h" #include "llvm/IR/Instructions.h" +#include "llvm/IR/IntrinsicInst.h" #include "llvm/IR/Module.h" #include "llvm/IR/ValueSymbolTable.h" #include "llvm/Pass.h" @@ -116,9 +117,20 @@ private: // sure that they can be replaced. static bool hasReplaceableUsers(GlobalVariable &GV) { for (User *CurrentUser : GV.users()) { - // Instruction users are always valid. - if (isa(CurrentUser)) + if (auto *I = dyn_cast(CurrentUser)) { + // Do not merge globals in exception pads. + if (I->isEHPad()) + return false; + + if (auto *II = dyn_cast(I)) { + // Some intrinsics require a plain global. + if (II->getIntrinsicID() == Intrinsic::eh_typeid_for) + return false; + } + + // Other instruction users are always valid. continue; + } // We cannot replace GlobalValue users because they are not just nodes // in IR. To replace a user like this we would need to create a new @@ -302,14 +314,6 @@ void PPCMergeStringPool::replaceUsesWithGEP(GlobalVariable *GlobalToReplace, Users.push_back(CurrentUser); for (User *CurrentUser : Users) { - Instruction *UserInstruction = dyn_cast(CurrentUser); - Constant *UserConstant = dyn_cast(CurrentUser); - - // At this point we expect that the user is either an instruction or a - // constant. - assert((UserConstant || UserInstruction) && - "Expected the user to be an instruction or a constant."); - // The user was not found so it must have been replaced earlier. if (!userHasOperand(CurrentUser, GlobalToReplace)) continue; @@ -318,38 +322,13 @@ void PPCMergeStringPool::replaceUsesWithGEP(GlobalVariable *GlobalToReplace, if (isa(CurrentUser)) continue; - if (!UserInstruction) { - // User is a constant type. - Constant *ConstGEP = ConstantExpr::getInBoundsGetElementPtr( - PooledStructType, GPool, Indices); - UserConstant->handleOperandChange(GlobalToReplace, ConstGEP); - continue; - } - - if (PHINode *UserPHI = dyn_cast(UserInstruction)) { - // GEP instructions cannot be added before PHI nodes. - // With getInBoundsGetElementPtr we create the GEP and then replace it - // inline into the PHI. - Constant *ConstGEP = ConstantExpr::getInBoundsGetElementPtr( - PooledStructType, GPool, Indices); - UserPHI->replaceUsesOfWith(GlobalToReplace, ConstGEP); - continue; - } - // The user is a valid instruction that is not a PHINode. - GetElementPtrInst *GEPInst = - GetElementPtrInst::Create(PooledStructType, GPool, Indices); - GEPInst->insertBefore(UserInstruction); - - LLVM_DEBUG(dbgs() << "Inserting GEP before:\n"); - LLVM_DEBUG(UserInstruction->dump()); - + Constant *ConstGEP = ConstantExpr::getInBoundsGetElementPtr( + PooledStructType, GPool, Indices); LLVM_DEBUG(dbgs() << "Replacing this global:\n"); LLVM_DEBUG(GlobalToReplace->dump()); LLVM_DEBUG(dbgs() << "with this:\n"); - LLVM_DEBUG(GEPInst->dump()); - - // After the GEP is inserted the GV can be replaced. - CurrentUser->replaceUsesOfWith(GlobalToReplace, GEPInst); + LLVM_DEBUG(ConstGEP->dump()); + GlobalToReplace->replaceAllUsesWith(ConstGEP); } } diff --git a/contrib/llvm-project/llvm/lib/Target/RISCV/MCTargetDesc/RISCVELFStreamer.cpp b/contrib/llvm-project/llvm/lib/Target/RISCV/MCTargetDesc/RISCVELFStreamer.cpp index 961b8f0afe22..cdf7c048a4bf 100644 --- a/contrib/llvm-project/llvm/lib/Target/RISCV/MCTargetDesc/RISCVELFStreamer.cpp +++ b/contrib/llvm-project/llvm/lib/Target/RISCV/MCTargetDesc/RISCVELFStreamer.cpp @@ -31,12 +31,13 @@ using namespace llvm; // This part is for ELF object output. RISCVTargetELFStreamer::RISCVTargetELFStreamer(MCStreamer &S, const MCSubtargetInfo &STI) - : RISCVTargetStreamer(S), CurrentVendor("riscv"), STI(STI) { + : RISCVTargetStreamer(S), CurrentVendor("riscv") { MCAssembler &MCA = getStreamer().getAssembler(); const FeatureBitset &Features = STI.getFeatureBits(); auto &MAB = static_cast(MCA.getBackend()); setTargetABI(RISCVABI::computeTargetABI(STI.getTargetTriple(), Features, MAB.getTargetOptions().getABIName())); + setFlagsFromFeatures(STI); // `j label` in `.option norelax; j label; .option relax; ...; label:` needs a // relocation to ensure the jump target is correct after linking. This is due // to a limitation that shouldForceRelocation has to make the decision upfront @@ -87,14 +88,13 @@ void RISCVTargetELFStreamer::finishAttributeSection() { void RISCVTargetELFStreamer::finish() { RISCVTargetStreamer::finish(); MCAssembler &MCA = getStreamer().getAssembler(); - const FeatureBitset &Features = STI.getFeatureBits(); RISCVABI::ABI ABI = getTargetABI(); unsigned EFlags = MCA.getELFHeaderEFlags(); - if (Features[RISCV::FeatureStdExtC]) + if (hasRVC()) EFlags |= ELF::EF_RISCV_RVC; - if (Features[RISCV::FeatureStdExtZtso]) + if (hasTSO()) EFlags |= ELF::EF_RISCV_TSO; switch (ABI) { diff --git a/contrib/llvm-project/llvm/lib/Target/RISCV/MCTargetDesc/RISCVELFStreamer.h b/contrib/llvm-project/llvm/lib/Target/RISCV/MCTargetDesc/RISCVELFStreamer.h index a6f54bf67b5d..e8f29cd8449b 100644 --- a/contrib/llvm-project/llvm/lib/Target/RISCV/MCTargetDesc/RISCVELFStreamer.h +++ b/contrib/llvm-project/llvm/lib/Target/RISCV/MCTargetDesc/RISCVELFStreamer.h @@ -46,7 +46,6 @@ private: StringRef CurrentVendor; MCSection *AttributeSection = nullptr; - const MCSubtargetInfo &STI; void emitAttribute(unsigned Attribute, unsigned Value) override; void emitTextAttribute(unsigned Attribute, StringRef String) override; diff --git a/contrib/llvm-project/llvm/lib/Target/RISCV/MCTargetDesc/RISCVMCExpr.cpp b/contrib/llvm-project/llvm/lib/Target/RISCV/MCTargetDesc/RISCVMCExpr.cpp index 254a9a4bc0ef..b8e0f3a867f4 100644 --- a/contrib/llvm-project/llvm/lib/Target/RISCV/MCTargetDesc/RISCVMCExpr.cpp +++ b/contrib/llvm-project/llvm/lib/Target/RISCV/MCTargetDesc/RISCVMCExpr.cpp @@ -207,8 +207,6 @@ void RISCVMCExpr::fixELFSymbolsInTLSFixups(MCAssembler &Asm) const { case VK_RISCV_TLS_GOT_HI: case VK_RISCV_TLS_GD_HI: case VK_RISCV_TLSDESC_HI: - case VK_RISCV_TLSDESC_ADD_LO: - case VK_RISCV_TLSDESC_LOAD_LO: break; } diff --git a/contrib/llvm-project/llvm/lib/Target/RISCV/MCTargetDesc/RISCVTargetStreamer.cpp b/contrib/llvm-project/llvm/lib/Target/RISCV/MCTargetDesc/RISCVTargetStreamer.cpp index ac4861bf113e..eee78a8c161f 100644 --- a/contrib/llvm-project/llvm/lib/Target/RISCV/MCTargetDesc/RISCVTargetStreamer.cpp +++ b/contrib/llvm-project/llvm/lib/Target/RISCV/MCTargetDesc/RISCVTargetStreamer.cpp @@ -48,6 +48,11 @@ void RISCVTargetStreamer::setTargetABI(RISCVABI::ABI ABI) { TargetABI = ABI; } +void RISCVTargetStreamer::setFlagsFromFeatures(const MCSubtargetInfo &STI) { + HasRVC = STI.hasFeature(RISCV::FeatureStdExtC); + HasTSO = STI.hasFeature(RISCV::FeatureStdExtZtso); +} + void RISCVTargetStreamer::emitTargetAttributes(const MCSubtargetInfo &STI, bool EmitStackAlign) { if (EmitStackAlign) { diff --git a/contrib/llvm-project/llvm/lib/Target/RISCV/MCTargetDesc/RISCVTargetStreamer.h b/contrib/llvm-project/llvm/lib/Target/RISCV/MCTargetDesc/RISCVTargetStreamer.h index 070e72fb157a..cb8bc21cb635 100644 --- a/contrib/llvm-project/llvm/lib/Target/RISCV/MCTargetDesc/RISCVTargetStreamer.h +++ b/contrib/llvm-project/llvm/lib/Target/RISCV/MCTargetDesc/RISCVTargetStreamer.h @@ -33,6 +33,8 @@ struct RISCVOptionArchArg { class RISCVTargetStreamer : public MCTargetStreamer { RISCVABI::ABI TargetABI = RISCVABI::ABI_Unknown; + bool HasRVC = false; + bool HasTSO = false; public: RISCVTargetStreamer(MCStreamer &S); @@ -58,6 +60,9 @@ public: void emitTargetAttributes(const MCSubtargetInfo &STI, bool EmitStackAlign); void setTargetABI(RISCVABI::ABI ABI); RISCVABI::ABI getTargetABI() const { return TargetABI; } + void setFlagsFromFeatures(const MCSubtargetInfo &STI); + bool hasRVC() const { return HasRVC; } + bool hasTSO() const { return HasTSO; } }; // This part is for ascii assembly output diff --git a/contrib/llvm-project/llvm/lib/Target/RISCV/RISCVAsmPrinter.cpp b/contrib/llvm-project/llvm/lib/Target/RISCV/RISCVAsmPrinter.cpp index b2e9cd87373b..87bd9b4048cd 100644 --- a/contrib/llvm-project/llvm/lib/Target/RISCV/RISCVAsmPrinter.cpp +++ b/contrib/llvm-project/llvm/lib/Target/RISCV/RISCVAsmPrinter.cpp @@ -100,7 +100,7 @@ public: bool emitDirectiveOptionArch(); private: - void emitAttributes(); + void emitAttributes(const MCSubtargetInfo &SubtargetInfo); void emitNTLHint(const MachineInstr *MI); @@ -385,8 +385,32 @@ void RISCVAsmPrinter::emitStartOfAsmFile(Module &M) { if (const MDString *ModuleTargetABI = dyn_cast_or_null(M.getModuleFlag("target-abi"))) RTS.setTargetABI(RISCVABI::getTargetABI(ModuleTargetABI->getString())); + + MCSubtargetInfo SubtargetInfo = *TM.getMCSubtargetInfo(); + + // Use module flag to update feature bits. + if (auto *MD = dyn_cast_or_null(M.getModuleFlag("riscv-isa"))) { + for (auto &ISA : MD->operands()) { + if (auto *ISAString = dyn_cast_or_null(ISA)) { + auto ParseResult = llvm::RISCVISAInfo::parseArchString( + ISAString->getString(), /*EnableExperimentalExtension=*/true, + /*ExperimentalExtensionVersionCheck=*/true); + if (!errorToBool(ParseResult.takeError())) { + auto &ISAInfo = *ParseResult; + for (const auto &Feature : RISCVFeatureKV) { + if (ISAInfo->hasExtension(Feature.Key) && + !SubtargetInfo.hasFeature(Feature.Value)) + SubtargetInfo.ToggleFeature(Feature.Key); + } + } + } + } + + RTS.setFlagsFromFeatures(SubtargetInfo); + } + if (TM.getTargetTriple().isOSBinFormatELF()) - emitAttributes(); + emitAttributes(SubtargetInfo); } void RISCVAsmPrinter::emitEndOfAsmFile(Module &M) { @@ -398,13 +422,13 @@ void RISCVAsmPrinter::emitEndOfAsmFile(Module &M) { EmitHwasanMemaccessSymbols(M); } -void RISCVAsmPrinter::emitAttributes() { +void RISCVAsmPrinter::emitAttributes(const MCSubtargetInfo &SubtargetInfo) { RISCVTargetStreamer &RTS = static_cast(*OutStreamer->getTargetStreamer()); // Use MCSubtargetInfo from TargetMachine. Individual functions may have // attributes that differ from other functions in the module and we have no // way to know which function is correct. - RTS.emitTargetAttributes(*TM.getMCSubtargetInfo(), /*EmitStackAlign*/ true); + RTS.emitTargetAttributes(SubtargetInfo, /*EmitStackAlign*/ true); } void RISCVAsmPrinter::emitFunctionEntryLabel() { diff --git a/contrib/llvm-project/llvm/lib/Target/RISCV/RISCVExpandPseudoInsts.cpp b/contrib/llvm-project/llvm/lib/Target/RISCV/RISCVExpandPseudoInsts.cpp index 0a314fdd41cb..89207640ee54 100644 --- a/contrib/llvm-project/llvm/lib/Target/RISCV/RISCVExpandPseudoInsts.cpp +++ b/contrib/llvm-project/llvm/lib/Target/RISCV/RISCVExpandPseudoInsts.cpp @@ -317,8 +317,9 @@ bool RISCVExpandPseudo::expandRV32ZdinxStore(MachineBasicBlock &MBB, .addReg(MBBI->getOperand(1).getReg()) .add(MBBI->getOperand(2)); if (MBBI->getOperand(2).isGlobal() || MBBI->getOperand(2).isCPI()) { - // FIXME: Zdinx RV32 can not work on unaligned memory. - assert(!STI->hasFastUnalignedAccess()); + // FIXME: Zdinx RV32 can not work on unaligned scalar memory. + assert(!STI->hasFastUnalignedAccess() && + !STI->enableUnalignedScalarMem()); assert(MBBI->getOperand(2).getOffset() % 8 == 0); MBBI->getOperand(2).setOffset(MBBI->getOperand(2).getOffset() + 4); diff --git a/contrib/llvm-project/llvm/lib/Target/RISCV/RISCVFeatures.td b/contrib/llvm-project/llvm/lib/Target/RISCV/RISCVFeatures.td index 26451c80f57b..1bb6b6a561f4 100644 --- a/contrib/llvm-project/llvm/lib/Target/RISCV/RISCVFeatures.td +++ b/contrib/llvm-project/llvm/lib/Target/RISCV/RISCVFeatures.td @@ -1025,6 +1025,11 @@ def FeatureFastUnalignedAccess "true", "Has reasonably performant unaligned " "loads and stores (both scalar and vector)">; +def FeatureUnalignedScalarMem + : SubtargetFeature<"unaligned-scalar-mem", "EnableUnalignedScalarMem", + "true", "Has reasonably performant unaligned scalar " + "loads and stores">; + def FeaturePostRAScheduler : SubtargetFeature<"use-postra-scheduler", "UsePostRAScheduler", "true", "Schedule again after register allocation">; diff --git a/contrib/llvm-project/llvm/lib/Target/RISCV/RISCVISelLowering.cpp b/contrib/llvm-project/llvm/lib/Target/RISCV/RISCVISelLowering.cpp index d46093b9e260..3fe7ddfdd427 100644 --- a/contrib/llvm-project/llvm/lib/Target/RISCV/RISCVISelLowering.cpp +++ b/contrib/llvm-project/llvm/lib/Target/RISCV/RISCVISelLowering.cpp @@ -1883,7 +1883,8 @@ bool RISCVTargetLowering::shouldConvertConstantLoadToIntImm(const APInt &Imm, // replace. If we don't support unaligned scalar mem, prefer the constant // pool. // TODO: Can the caller pass down the alignment? - if (!Subtarget.hasFastUnalignedAccess()) + if (!Subtarget.hasFastUnalignedAccess() && + !Subtarget.enableUnalignedScalarMem()) return true; // Prefer to keep the load if it would require many instructions. @@ -19772,8 +19773,10 @@ bool RISCVTargetLowering::allowsMisalignedMemoryAccesses( unsigned *Fast) const { if (!VT.isVector()) { if (Fast) - *Fast = Subtarget.hasFastUnalignedAccess(); - return Subtarget.hasFastUnalignedAccess(); + *Fast = Subtarget.hasFastUnalignedAccess() || + Subtarget.enableUnalignedScalarMem(); + return Subtarget.hasFastUnalignedAccess() || + Subtarget.enableUnalignedScalarMem(); } // All vector implementations must support element alignment diff --git a/contrib/llvm-project/llvm/lib/Target/SystemZ/SystemZInstrInfo.cpp b/contrib/llvm-project/llvm/lib/Target/SystemZ/SystemZInstrInfo.cpp index bf6547cc87ec..2f2dc6b80792 100644 --- a/contrib/llvm-project/llvm/lib/Target/SystemZ/SystemZInstrInfo.cpp +++ b/contrib/llvm-project/llvm/lib/Target/SystemZ/SystemZInstrInfo.cpp @@ -70,49 +70,62 @@ void SystemZInstrInfo::splitMove(MachineBasicBlock::iterator MI, MachineBasicBlock *MBB = MI->getParent(); MachineFunction &MF = *MBB->getParent(); - // Get two load or store instructions. Use the original instruction for one - // of them (arbitrarily the second here) and create a clone for the other. - MachineInstr *EarlierMI = MF.CloneMachineInstr(&*MI); - MBB->insert(MI, EarlierMI); + // Get two load or store instructions. Use the original instruction for + // one of them and create a clone for the other. + MachineInstr *HighPartMI = MF.CloneMachineInstr(&*MI); + MachineInstr *LowPartMI = &*MI; + MBB->insert(LowPartMI, HighPartMI); // Set up the two 64-bit registers and remember super reg and its flags. - MachineOperand &HighRegOp = EarlierMI->getOperand(0); - MachineOperand &LowRegOp = MI->getOperand(0); + MachineOperand &HighRegOp = HighPartMI->getOperand(0); + MachineOperand &LowRegOp = LowPartMI->getOperand(0); Register Reg128 = LowRegOp.getReg(); unsigned Reg128Killed = getKillRegState(LowRegOp.isKill()); unsigned Reg128Undef = getUndefRegState(LowRegOp.isUndef()); HighRegOp.setReg(RI.getSubReg(HighRegOp.getReg(), SystemZ::subreg_h64)); LowRegOp.setReg(RI.getSubReg(LowRegOp.getReg(), SystemZ::subreg_l64)); - if (MI->mayStore()) { - // Add implicit uses of the super register in case one of the subregs is - // undefined. We could track liveness and skip storing an undefined - // subreg, but this is hopefully rare (discovered with llvm-stress). - // If Reg128 was killed, set kill flag on MI. - unsigned Reg128UndefImpl = (Reg128Undef | RegState::Implicit); - MachineInstrBuilder(MF, EarlierMI).addReg(Reg128, Reg128UndefImpl); - MachineInstrBuilder(MF, MI).addReg(Reg128, (Reg128UndefImpl | Reg128Killed)); - } - // The address in the first (high) instruction is already correct. // Adjust the offset in the second (low) instruction. - MachineOperand &HighOffsetOp = EarlierMI->getOperand(2); - MachineOperand &LowOffsetOp = MI->getOperand(2); + MachineOperand &HighOffsetOp = HighPartMI->getOperand(2); + MachineOperand &LowOffsetOp = LowPartMI->getOperand(2); LowOffsetOp.setImm(LowOffsetOp.getImm() + 8); - // Clear the kill flags on the registers in the first instruction. - if (EarlierMI->getOperand(0).isReg() && EarlierMI->getOperand(0).isUse()) - EarlierMI->getOperand(0).setIsKill(false); - EarlierMI->getOperand(1).setIsKill(false); - EarlierMI->getOperand(3).setIsKill(false); - // Set the opcodes. unsigned HighOpcode = getOpcodeForOffset(NewOpcode, HighOffsetOp.getImm()); unsigned LowOpcode = getOpcodeForOffset(NewOpcode, LowOffsetOp.getImm()); assert(HighOpcode && LowOpcode && "Both offsets should be in range"); + HighPartMI->setDesc(get(HighOpcode)); + LowPartMI->setDesc(get(LowOpcode)); + + MachineInstr *FirstMI = HighPartMI; + if (MI->mayStore()) { + FirstMI->getOperand(0).setIsKill(false); + // Add implicit uses of the super register in case one of the subregs is + // undefined. We could track liveness and skip storing an undefined + // subreg, but this is hopefully rare (discovered with llvm-stress). + // If Reg128 was killed, set kill flag on MI. + unsigned Reg128UndefImpl = (Reg128Undef | RegState::Implicit); + MachineInstrBuilder(MF, HighPartMI).addReg(Reg128, Reg128UndefImpl); + MachineInstrBuilder(MF, LowPartMI).addReg(Reg128, (Reg128UndefImpl | Reg128Killed)); + } else { + // If HighPartMI clobbers any of the address registers, it needs to come + // after LowPartMI. + auto overlapsAddressReg = [&](Register Reg) -> bool { + return RI.regsOverlap(Reg, MI->getOperand(1).getReg()) || + RI.regsOverlap(Reg, MI->getOperand(3).getReg()); + }; + if (overlapsAddressReg(HighRegOp.getReg())) { + assert(!overlapsAddressReg(LowRegOp.getReg()) && + "Both loads clobber address!"); + MBB->splice(HighPartMI, MBB, LowPartMI); + FirstMI = LowPartMI; + } + } - EarlierMI->setDesc(get(HighOpcode)); - MI->setDesc(get(LowOpcode)); *** 421 LINES SKIPPED *** From nobody Tue May 28 05:28: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 4VpLdz1hDWz5LfPS; Tue, 28 May 2024 05:28: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 4VpLdz0wy1z4jkD; Tue, 28 May 2024 05: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=1716874119; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sR4u9QyMrPdt/1xjt7gg1Szmgk1oUIDnge8qvolWBLk=; b=nogFvqBphqoxkkZaZeBRNjNqLkEw/vLl4m4IGSFBtu8n87IYnWPz3TYzsrTciKYInMJhmv kCKhFa7hZQ4K+zQ1srZqs0y5t79+j99ZeYDxNPQOUyQkycpsN3j1/4+9eE0KG/vtSa7Nxh UwzbI+v/NjUzJCNgx6rbfZhjBfvOGodG9dDuXl5j7xuBuARz0XJClk29YDQNh+5Y+7ZWNG Pv+ffYHpP5aWKVOc8KW+3F0ovfJ9s1Vb47XQMxskFNQIhSeNvGaINiLCCT4O5Fbg8oLx2I XbgGeWCGoG8Zm2t58WQBznjW8iaKfXT6km8TsBWT1R9uuJfUNWlQIlahYi/tdg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1716874119; a=rsa-sha256; cv=none; b=dhW34OB77u7l3lDErXYt9JIB9GOKK2AqC8HrCtKH2W0c7FBWPlsE0EtDgsHZ4MOlYw7jfV 8Y2oaF3VBmXw+WljnHBMM+yWPEuDb5dth9RhJGIK0XSyhfBd2gmMwmEoLDqsR8Ave5fj9X 9mDRlLSQOLS/3Y5Vb23/uFIvBs3HqbKAV0S8MQtBt2yIINvrUW8AhNu1E2MGndGsZPL9tx 82/YKVdWFNh/gXoMdlwP4GuJTv3uIXKRNI44M+pVMemis38YIaHqmtG405Wf1QbroF1MYM bcPy7xlcyzNn2bRYUrTxy042nSpBzd3eulzmvymnjZfAHQWJw36sRdCXx0UXuA== 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=1716874119; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sR4u9QyMrPdt/1xjt7gg1Szmgk1oUIDnge8qvolWBLk=; b=h9eT8eLkLlKJBhMuwElFAxneBLrUB90e1o3539Z4IaM5rcIvCeroLt6Ydg946NYouzCbPS oSeJDNsSXM5A9mZ7QXTi5+ie3J3SqJuCD7oI1GPlL3SdH52QiUZMZ1ZMwZWPnV+Oq51ME/ PobImV+JjfoF21fwJsOghjkOKb1HC3uEufvt1Yy+uQRhpHmCXZTBFhWW7QX3lqQZ39+nfW YAMuieBk9/8DqhN24sp8BrQ6F8adKqYYohfzdzqIZxY2MlxUh3swtQsxbs29w4F75Xh2Ue xcVNehe7MvYP22BaYB6NZDIO8uhpl0kKy94q/PzwaiDIGZY9CPQgnbi+aMR5QQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VpLdz0VGpz1F38; Tue, 28 May 2024 05: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 44S5ScYm018949; Tue, 28 May 2024 05:28:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44S5Sc3G018946; Tue, 28 May 2024 05:28:38 GMT (envelope-from git) Date: Tue, 28 May 2024 05:28:38 GMT Message-Id: <202405280528.44S5Sc3G018946@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: a3e6eda79813 - stable/13 - Merge commit d0be944aa511 from llvm-project (by Simon Pilgrim): List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: a3e6eda7981319113d39caedf79b94b44773970f Auto-Submitted: auto-generated The branch stable/13 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=a3e6eda7981319113d39caedf79b94b44773970f commit a3e6eda7981319113d39caedf79b94b44773970f Author: Dimitry Andric AuthorDate: 2024-05-25 17:52:15 +0000 Commit: Dimitry Andric CommitDate: 2024-05-28 05:26:46 +0000 Merge commit d0be944aa511 from llvm-project (by Simon Pilgrim): [X86] Add slow div64 tuning flag to Nehalem target (#91129) This appears to have been missed because later cpus don't inherit from Nehalem tuning much. Noticed while cleaning up for #90985 Merge commit 8b400de79eff from llvm-project (by Simon Pilgrim): [X86] Enable TuningSlowDivide64 on Barcelona/Bobcat/Bulldozer/Ryzen Families (#91277) Despite most AMD cpus having a lower latency for i64 divisions that converge early, we are still better off testing for values representable as i32 and performing a i32 division if possible. All AMD cpus appear to have been missed when we added the "idivq-to-divl" attribute - this patch now matches Intel cpu behaviour (and the x86-64/v2/3/4 levels). Unfortunately the difference in code scheduling means I've had to stop using the update_llc_test_checks script and just use old-fashioned CHECK-DAG checks for divl/divq pairs. Fixes #90985 This fixes possibly worse runtime performance on AMD Zen hardware, when using -march=znver4 (or any other znver), as opposed to -march=x86-64-v4 or the baseline -march=x86-64. A similar fix is applied for Nehalem. PR: 278908 MFC after: 3 days (cherry picked from commit cadd2ca21765ebcb95b77ec94977b4e74e1edc1b) --- contrib/llvm-project/llvm/lib/Target/X86/X86.td | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/contrib/llvm-project/llvm/lib/Target/X86/X86.td b/contrib/llvm-project/llvm/lib/Target/X86/X86.td index e89ddcc570c9..1aff5f9fad97 100644 --- a/contrib/llvm-project/llvm/lib/Target/X86/X86.td +++ b/contrib/llvm-project/llvm/lib/Target/X86/X86.td @@ -867,6 +867,7 @@ def ProcessorFeatures { // Nehalem list NHMFeatures = X86_64V2Features; list NHMTuning = [TuningMacroFusion, + TuningSlowDivide64, TuningInsertVZEROUPPER, TuningNoDomainDelayMov]; @@ -1336,6 +1337,7 @@ def ProcessorFeatures { FeatureCMOV, FeatureX86_64]; list BarcelonaTuning = [TuningFastScalarShiftMasks, + TuningSlowDivide64, TuningSlowSHLD, TuningSBBDepBreaking, TuningInsertVZEROUPPER]; @@ -1358,6 +1360,7 @@ def ProcessorFeatures { list BtVer1Tuning = [TuningFast15ByteNOP, TuningFastScalarShiftMasks, TuningFastVectorShiftMasks, + TuningSlowDivide64, TuningSlowSHLD, TuningSBBDepBreaking, TuningInsertVZEROUPPER]; @@ -1380,6 +1383,7 @@ def ProcessorFeatures { TuningFastVectorShiftMasks, TuningFastMOVBE, TuningSBBDepBreaking, + TuningSlowDivide64, TuningSlowSHLD]; list BtVer2Features = !listconcat(BtVer1Features, BtVer2AdditionalFeatures); @@ -1404,6 +1408,7 @@ def ProcessorFeatures { FeatureLWP, FeatureLAHFSAHF64]; list BdVer1Tuning = [TuningSlowSHLD, + TuningSlowDivide64, TuningFast11ByteNOP, TuningFastScalarShiftMasks, TuningBranchFusion, @@ -1483,6 +1488,7 @@ def ProcessorFeatures { TuningFastScalarShiftMasks, TuningFastVariablePerLaneShuffle, TuningFastMOVBE, + TuningSlowDivide64, TuningSlowSHLD, TuningSBBDepBreaking, TuningInsertVZEROUPPER, From nobody Tue May 28 05:32:52 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VpLkr6yM0z5Lflk; Tue, 28 May 2024 05:32:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VpLkr67glz4kdR; Tue, 28 May 2024 05:32:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716874372; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QHPDn68Ex9B6pV7YSGbk5DU20tJ4YIxoK2pF1vuuUW4=; b=ogfedscfiSudNQ1AY/W76Y+o1t9N6TwMcMjwlYf7PClKaX0sm9oZRrchoJ7a4Tg5eHW+IO EX1vCx1tPO9MJkohOsX7pOCWEqr15hjidNjMAtRbkDgcYZoaAXX6VaglmXGaZGb1I3RYEp c5lNx5ASi0uWtF+D0rDZUvd6jQfCTNVBPD7U8PlCeSwQ9y+Hx+PVix5OAticsaMjultyiJ lbGvzpzeHO63T8xLRCwX9+t1yLRQ4/Vj110OQ3fFuibZ1ympOyf1MLZCQLnhvg4pRTKsW+ SnyzK9oj1fttO16GozqD58LdLMMyBp2QOwMkbwned9opDnTFsZC6L9HsSyImpA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1716874372; a=rsa-sha256; cv=none; b=FZYBqBkNEzmtFFFzI5jUJhpr/7b67yJWwVcqb8/1dBNHPCV+hRlBD5BamMc3A/j7+xOTN2 OMx5g9gJrLaK9ONah6fXwMYt/g+D+b+OwrHc9breJ1z/o79U298ciQHMxrh0rIDKIVcg3q 6wfgHtoRi1kfTB2ncK6OtvBpVkqceWKHT2G0uRXGFuhepPwfBz5oERgjg1TGvLNm/90fNX 4wfQLLkKeCEQINNp0UyfwzMlFT+bypg5kvk6SXNy1p9l7F+6N4ETO8y1hqT5xKmdQSbDsF uNOwna8OBdJdsY8b+LKrIIy4cb/x9b4Ernm27B3gNMxvGlBsSYO8IZmHKNHqxA== 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=1716874372; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QHPDn68Ex9B6pV7YSGbk5DU20tJ4YIxoK2pF1vuuUW4=; b=eCoE7JGsotcgTHkgHA3TYFkf0phpp49stX43JcVA35qBZ/IsVkhYTaKeaUQoiacQkagtMT ARm6akyXP8xO9d0w08EgkA+eJh3mzNIaeVYVBFX+bsKjS8HQePkAhGGs1c3/9CBHVVReiy ssL0f3GQ97wmAlFC1HSzcEF6e5iEzchtQy3GesTFqmiG80SShp6iMt/t28cbGtMO5c3ozG wnGqSoByfaqNv70Alv/lXR642m3WV+nWhLNBz+QqYqXoccwzfAcnXzKTRynoNPmacgvNsg fkRD8dZ/02aAjZ1iMJ8mY4UVaRevMZaTemJ4VCUmWs4i29K20VvbT8SK/NrSOg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VpLkr5kykz1FXg; Tue, 28 May 2024 05:32:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44S5WqdP034964; Tue, 28 May 2024 05:32:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44S5WqtR034961; Tue, 28 May 2024 05:32:52 GMT (envelope-from git) Date: Tue, 28 May 2024 05:32:52 GMT Message-Id: <202405280532.44S5WqtR034961@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kevin Bowling Subject: git: 3d6c7ee87e9d - main - qlxgbe: fix debug prints in ql_os.c List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kbowling X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3d6c7ee87e9d7f3c8f617c3803af3effa8eb8a16 Auto-Submitted: auto-generated The branch main has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=3d6c7ee87e9d7f3c8f617c3803af3effa8eb8a16 commit 3d6c7ee87e9d7f3c8f617c3803af3effa8eb8a16 Author: Fuqian Huang AuthorDate: 2024-05-28 05:31:03 +0000 Commit: Kevin Bowling CommitDate: 2024-05-28 05:32:16 +0000 qlxgbe: fix debug prints in ql_os.c QL_DPRINT2 checks the debug level first and then prints. Replace device_printf with QL_DPRINT2 to check debug level first before printing out the kernel pointers. PR: 238655 MFC after: 1 week --- sys/dev/qlxgbe/ql_os.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/sys/dev/qlxgbe/ql_os.c b/sys/dev/qlxgbe/ql_os.c index d20e7a103d02..0b3b2ca7954f 100644 --- a/sys/dev/qlxgbe/ql_os.c +++ b/sys/dev/qlxgbe/ql_os.c @@ -322,7 +322,7 @@ static int qla_pci_attach(device_t dev) { qla_host_t *ha = NULL; - uint32_t rsrc_len; + uint32_t rsrc_len __unused; int i; uint32_t num_rcvq = 0; @@ -405,10 +405,10 @@ qla_pci_attach(device_t dev) __func__); goto qla_pci_attach_err; } - device_printf(dev, "%s: ha %p pci_func 0x%x rsrc_count 0x%08x" + QL_DPRINT2(ha, (dev, "%s: ha %p pci_func 0x%x rsrc_count 0x%08x" " msix_count 0x%x pci_reg %p pci_reg1 %p num_rcvq = %d\n", __func__, ha, ha->pci_func, rsrc_len, ha->msix_count, - ha->pci_reg, ha->pci_reg1, num_rcvq); + ha->pci_reg, ha->pci_reg1, num_rcvq)); if ((ha->msix_count < 64) || (num_rcvq != 32)) { if (ha->hw.num_sds_rings > 15) { @@ -1274,9 +1274,9 @@ qla_send(qla_host_t *ha, struct mbuf **m_headp, uint32_t txr_idx, "mbuf = %p\n", __func__, __LINE__, txr_idx, tx_idx,\ ha->tx_ring[txr_idx].tx_buf[tx_idx].m_head)); - device_printf(ha->pci_dev, "%s [%d]: txr_idx = %d tx_idx = %d " + QL_DPRINT2(ha, (ha->pci_dev, "%s [%d]: txr_idx = %d tx_idx = %d " "mbuf = %p\n", __func__, __LINE__, txr_idx, tx_idx, - ha->tx_ring[txr_idx].tx_buf[tx_idx].m_head); + ha->tx_ring[txr_idx].tx_buf[tx_idx].m_head)); if (m_head) m_freem(m_head); From nobody Tue May 28 05:41: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 4VpLwL0hN1z5Lgy1; Tue, 28 May 2024 05:41: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 4VpLwL0G7Vz4mJt; Tue, 28 May 2024 05:41:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716874866; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hIRMyWK5OkwR0dCciaTxUoGEEcM1MWdld02tPbpTVO8=; b=kgP2+PtXxmfJiH4LwQqTOGNNyopyt+e4pjI6SWQhzJHsvM89ODGLKaT+AwP5Y8OIuc+Rzr RkeGqaFh9nxpyz6nV63zx+YeGC/FVziYo37kCykoU8n0x4LhF9HW6GsPxGH+FmHG3jUIvi XmRxxvRWXLfy0XGopmAM14nfputI3/6ST2H7RPDREufBAuay8inv1ihqNtDazZIqFNktMl uf1SfuRnyHwJXtvLCB3r4blW678iZHpT+dmcR5Y9fFPqS/L+UrG1O6gdMf+VMCV6T65lnl z0Po6exr3dKQ7sPL+seNZknFR9a2gkuOVXon8kfu0p5mFt959voWe6j+Z7czZw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1716874866; a=rsa-sha256; cv=none; b=sxsOzmL64fCIK/U60mCRutFnbMjY6hQuohgvBeceZMV88+zzxO81ZjQEWbsC660dmMvIdf rxp62f2Ms0u1Hgy+lfkKFanmWGXmTh2gE4RKsUxT/1CkZxlOVmvX/7Cl2Y/hwcHpUrgT0k gFtS8fLQvT8fFT3/vHEgj4FWKzzDSCf6khpfHVfHYljVCQqaWPlde/xv2E9FVHAVFb+s/V 92Th848EaroGg9X7DMma52YVm7/EabAEc7JB1BzSlWcvFHHZL7ANzsAGbrDmx79T3y4B/y p/C+w+fxVxBQVpXDjo0qWJnyEcYT7opyATb6v5/SnPb42Npl18s4FogFuCexgQ== 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=1716874866; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hIRMyWK5OkwR0dCciaTxUoGEEcM1MWdld02tPbpTVO8=; b=sV1CBKhKhNoH94iyuM1IekmU7yNoNJ/8gNdhntwPy+0kLqBx2RWNPF1FubE6IxRDggBOCv VtodZTVsL5V2E9OVy5NpvQmh82ptSU7Zkj2TTyE0MpvcHp6zDALqOm4ZfrI+CG6ZtVjJ0Z oTvydtTqjhjOYjE8WWJ+OfInivLinR5aRjXtViEcxOEooMTXpauq7IF6sPolg4V2CxA32n XHZfd0/q2hU3YjCADqVyKK89cPRwXERg6GsP7z9fn6td6DgDUdj9BsJfz9e+fAKjyssOF3 UeMN2SKDVEdrElNyOb0SVAWFZ141fLGqL/S7xuJUEdQtWJP68rS7Ihbve6X1pg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VpLwK6xWXz1FNk; Tue, 28 May 2024 05:41: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 44S5f5IT046758; Tue, 28 May 2024 05:41:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44S5f58e046755; Tue, 28 May 2024 05:41:05 GMT (envelope-from git) Date: Tue, 28 May 2024 05:41:05 GMT Message-Id: <202405280541.44S5f58e046755@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kevin Bowling Subject: git: ae389777583d - main - qlxge: replace device_printf with QL_DPRINT2 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kbowling X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ae389777583dca0e354fdd43aca3413e209160f4 Auto-Submitted: auto-generated The branch main has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=ae389777583dca0e354fdd43aca3413e209160f4 commit ae389777583dca0e354fdd43aca3413e209160f4 Author: Fuqian Huang AuthorDate: 2024-05-28 05:40:12 +0000 Commit: Kevin Bowling CommitDate: 2024-05-28 05:40:12 +0000 qlxge: replace device_printf with QL_DPRINT2 QL_DPRINT2 checks the debug level first before printing. Replace device_printf with QL_DPRINT2 to check debug level first before printing out the kernel pointers. PR: 238656 MFC after: 1 week --- sys/dev/qlxge/qls_os.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/sys/dev/qlxge/qls_os.c b/sys/dev/qlxge/qls_os.c index 8c110540a042..a1ce1c637e1c 100644 --- a/sys/dev/qlxge/qls_os.c +++ b/sys/dev/qlxge/qls_os.c @@ -160,20 +160,20 @@ qls_sysctl_get_drvr_stats(SYSCTL_HANDLER_ARGS) ha = (qla_host_t *)arg1; for (i = 0; i < ha->num_tx_rings; i++) { - device_printf(ha->pci_dev, + QL_DPRINT2((ha->pci_dev, "%s: tx_ring[%d].tx_frames= %p\n", __func__, i, - (void *)ha->tx_ring[i].tx_frames); + (void *)ha->tx_ring[i].tx_frames)); - device_printf(ha->pci_dev, + QL_DPRINT2((ha->pci_dev, "%s: tx_ring[%d].tx_tso_frames= %p\n", __func__, i, - (void *)ha->tx_ring[i].tx_tso_frames); + (void *)ha->tx_ring[i].tx_tso_frames)); - device_printf(ha->pci_dev, + QL_DPRINT2((ha->pci_dev, "%s: tx_ring[%d].tx_vlan_frames= %p\n", __func__, i, - (void *)ha->tx_ring[i].tx_vlan_frames); + (void *)ha->tx_ring[i].tx_vlan_frames)); device_printf(ha->pci_dev, "%s: tx_ring[%d].txr_free= 0x%08x\n", @@ -197,15 +197,15 @@ qls_sysctl_get_drvr_stats(SYSCTL_HANDLER_ARGS) } for (i = 0; i < ha->num_rx_rings; i++) { - device_printf(ha->pci_dev, + QL_DPRINT2((ha->pci_dev, "%s: rx_ring[%d].rx_int= %p\n", __func__, i, - (void *)ha->rx_ring[i].rx_int); + (void *)ha->rx_ring[i].rx_int)); - device_printf(ha->pci_dev, + QL_DPRINT2((ha->pci_dev, "%s: rx_ring[%d].rss_int= %p\n", __func__, i, - (void *)ha->rx_ring[i].rss_int); + (void *)ha->rx_ring[i].rss_int)); device_printf(ha->pci_dev, "%s: rx_ring[%d].lbq_next= 0x%08x\n", @@ -383,9 +383,9 @@ qls_pci_attach(device_t dev) ha->msix_count = qls_get_msix_count(ha); - device_printf(dev, "\n%s: ha %p pci_func 0x%x msix_count 0x%x" + QL_DPRINT2((dev, "\n%s: ha %p pci_func 0x%x msix_count 0x%x" " pci_reg %p pci_reg1 %p\n", __func__, ha, - ha->pci_func, ha->msix_count, ha->pci_reg, ha->pci_reg1); + ha->pci_func, ha->msix_count, ha->pci_reg, ha->pci_reg1)); if (pci_alloc_msix(dev, &ha->msix_count)) { device_printf(dev, "%s: pci_alloc_msi[%d] failed\n", __func__, From nobody Tue May 28 05:46: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 4VpM2f5Fj3z5Lh3w for ; Tue, 28 May 2024 05:46:34 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Received: from mail-wr1-f41.google.com (mail-wr1-f41.google.com [209.85.221.41]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "WR4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VpM2f2lxxz4pCP for ; Tue, 28 May 2024 05:46:34 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-wr1-f41.google.com with SMTP id ffacd0b85a97d-354faf5f1b4so263317f8f.1 for ; Mon, 27 May 2024 22:46:34 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1716875192; x=1717479992; 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=TdWgE7RhkLDu50yCPmSo5EE8XQ59LT+eOgDT0QoSfDo=; b=G5GnnzQX2LJaTG+Him4OAt592GxnKI3hsjVGuO2nBk0k/pI0EoXvKn11VX27Mw8cDB R2SjNMow8hXC961Z11q4+Q1Z/CbwmKVQHmbkIS/grVGrNyBh1x3IKA87weVCjazt01wm ufK2yBipJxo00w7YsfdZSgY/yA3sivvSfKy2C6VPmK1F0iUvixVcHFpLJuTsdu4lNBd3 renLNDnnkIZ/DQ/H+GmCbOG2k11jwm1uWtPsa96KEOtcMcCi8TQKFjRJhuHxYZLvlGUL biXgxKQjvhOgXoRYBWj1XwaLQ8TJpAt6Kk7RqsIn6JYhVmOQwYrMAY37MJaOElHzLEEo V/eQ== X-Forwarded-Encrypted: i=1; AJvYcCWMiDSmDUfHAPi4K/dHCB621sXxQu6+sW81FFi1XxABltsLooLRrMNWs760bZ2/eruQMWKV4rmcEYLS+73jxv3FD8BcQ5zL0ingxMpzY7uh X-Gm-Message-State: AOJu0Yzjr0seaILc/70dPm/6Yl11Z0TmDLtPiXthvPDeTTOVnhecXl0d TUoMz2MQszT9W4cKLPAKMVMWa2UWeNTyeSz01lS3ptku5aCpL9z8nVWSQtuLaJiDzeK2BMOfand t X-Google-Smtp-Source: AGHT+IFnOVNfiqB9/b8DeKJRk/Jy6eJpx8OwZoqWhU5XlGlGNIjEgOKMzoCtpv+/6mIqK9amD3YhvQ== X-Received: by 2002:adf:e642:0:b0:354:f724:6419 with SMTP id ffacd0b85a97d-35527056967mr8664464f8f.8.1716875192137; Mon, 27 May 2024 22:46:32 -0700 (PDT) Received: from smtpclient.apple ([131.111.5.246]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3557a08a8bcsm10691684f8f.44.2024.05.27.22.46.31 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 27 May 2024 22:46:31 -0700 (PDT) Content-Type: text/plain; charset=us-ascii List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3774.500.171.1.1\)) Subject: Re: git: a58b4ee025fc - main - qlxgbe: Remove pointer printing in ql_ioctl.c PR: 238653 MFC after: 1 week From: Jessica Clarke In-Reply-To: <202405280520.44S5KA8L006390@gitrepo.freebsd.org> Date: Tue, 28 May 2024 06:46:21 +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: <78054BC5-05C4-414A-9CBD-1BBD522168BB@freebsd.org> References: <202405280520.44S5KA8L006390@gitrepo.freebsd.org> To: Kevin Bowling X-Mailer: Apple Mail (2.3774.500.171.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: 4VpM2f2lxxz4pCP On 28 May 2024, at 06:20, Kevin Bowling wrote: >=20 > The branch main has been updated by kbowling: >=20 > URL: = https://cgit.FreeBSD.org/src/commit/?id=3Da58b4ee025fcac480e44e1f56acffe2f= eacc5845 >=20 > commit a58b4ee025fcac480e44e1f56acffe2feacc5845 > Author: Fuqian > AuthorDate: 2024-05-28 05:18:52 +0000 > Commit: Kevin Bowling > CommitDate: 2024-05-28 05:18:52 +0000 >=20 > qlxgbe: Remove pointer printing in ql_ioctl.c > PR: 238653 > MFC after: 1 week Since when is a kernel address leak something FreeBSD cares about? sysctl kern.geom.conf* are kernel address leaks as a service, so why change a printf in a driver, or others seen in your later commits? Jess From nobody Tue May 28 05:46: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 4VpM2w4xZ7z5LhCC; Tue, 28 May 2024 05:46: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 4VpM2w4MKvz4pTW; Tue, 28 May 2024 05:46:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716875208; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Dkl8/5PL2RAA6SfH9/YfOEf3PcX3SbjvGO2lT5lYyg0=; b=g87UapG678f0VDgPAkIn2wiX2H8UuTaRBgceg2AUBfoRn0h/LnvdpOWOfYt38+3SjRC2nP S4xPVvMwMzhZY0GzCXYrh81Zc65CZBEVkz7x9HQrtL1BJdFSSoVQY1FAqsQJjTa7LdJdyV qQUs3LkvlId3kDUYadGe7fvrrUeGG8yh3Rq81eYC267IDTG2YOSB/iFObI5be97Z+wiVgM RxoCnmdpgvIJ+/B6lhUDfQIIaaDbA/1lP8W8cDpeN41ImQd6KIknwobhsIUDe0zxe0hgCr ywAYQseu4rSPPE/NG7TCPytSsQzXVeqfDH6JxJkd9AWhVoBVm2uThIUgYrOV9w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1716875208; a=rsa-sha256; cv=none; b=baYuUenmi2MRaCc8fo0nz/sGssjeodI90pnYQce6DD8/zVYh2ic4UsM1r5XhkIYA3apwRu uyty3ic336Ws3Fiqf3JJ08LXQi4XcJSSDHdP9SxjxkvlXPkyXZOUKsrRbvnG6wVgmejqCu AAXsVymC73vgjwutcPx2CeTcWUGyFWzbirPlwzfivXoK9QrSRoR41OZ0cyruYjaSEEBYjB s9It3mGbOREFpYOLXmBNT048EOPKwSUTCGFiHK0QzgfahhgbZhVoDCIOsoAxjHO6BuUzCk KyC4wvOQ98qaIi1lLn0V/ojJMZdrT01Gam5sjobHqAfqtPDE01/qITTHw1axng== 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=1716875208; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Dkl8/5PL2RAA6SfH9/YfOEf3PcX3SbjvGO2lT5lYyg0=; b=L4nkGCidy/X6tPbzBYt+nuJaqenxAGfo05AWLjE75KTxRUAWBE6LYKPXWd+fMdciCC/ubz n47Skdooxi+X8Mp3VzAtS8yQ1oaY2tTjBGoCYBsEauotb4PtgC+zknFhBxu3JVd56YkAqC Km+Cao7uZ7em3WSZlMYuvVWmbPlWccO5blb7P/89veVxvJL1SL1ctoCi5Xo9DyErGl/YSa THhC34V20nXW2NKwYMEIdJx07nI/9DAZ058vwAUB/c8E5riY4Qgg8vBhQqeHTexy29Bobs WE2GcIAaocBgIrup8h4P6gwI/1Elk0HNljUmgi+c1mpXsXg4YwkCK8BX1LGhdQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VpM2w3rMvz1Ftr; Tue, 28 May 2024 05:46: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 44S5kmv0052604; Tue, 28 May 2024 05:46:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44S5kmCC052599; Tue, 28 May 2024 05:46:48 GMT (envelope-from git) Date: Tue, 28 May 2024 05:46:48 GMT Message-Id: <202405280546.44S5kmCC052599@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kevin Bowling Subject: git: 9370f49ad1c4 - main - qlnx: qlnxe: Fix kernel address leakage List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kbowling X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9370f49ad1c4625cd73c4d84d3e42ed3e20fabbf Auto-Submitted: auto-generated The branch main has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=9370f49ad1c4625cd73c4d84d3e42ed3e20fabbf commit 9370f49ad1c4625cd73c4d84d3e42ed3e20fabbf Author: Fuqian Huang AuthorDate: 2024-05-28 05:45:52 +0000 Commit: Kevin Bowling CommitDate: 2024-05-28 05:45:52 +0000 qlnx: qlnxe: Fix kernel address leakage In function qlnx_rdma_deregister_if, the address of object rdma_if will be printed out. rdma_if is the address of a global variable qlnxr_drv, which is passed from dev/qlnx/qlnxr/qlnxr_os.c A kernel address leakage happens. Fix this by removing the printf statement. PR: 238646 MFC after: 1 week --- sys/dev/qlnx/qlnxe/qlnx_rdma.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/sys/dev/qlnx/qlnxe/qlnx_rdma.c b/sys/dev/qlnx/qlnxe/qlnx_rdma.c index 77b25a017ade..a69f0efd095a 100644 --- a/sys/dev/qlnx/qlnxe/qlnx_rdma.c +++ b/sys/dev/qlnx/qlnxe/qlnx_rdma.c @@ -253,8 +253,6 @@ qlnx_rdma_deregister_if(qlnx_rdma_if_t *rdma_if) int ret = 0; qlnx_host_t *ha; - printf("%s: enter rdma_if = %p\n", __func__, rdma_if); - if (mtx_initialized(&qlnx_rdma_dev_lock)) { mtx_lock(&qlnx_rdma_dev_lock); @@ -285,7 +283,6 @@ qlnx_rdma_deregister_if(qlnx_rdma_if_t *rdma_if) mtx_unlock(&qlnx_rdma_dev_lock); } - printf("%s: exit rdma_if = %p\n", __func__, rdma_if); return (ret); } From nobody Tue May 28 05:58:44 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VpMJj03Cgz5Lj2b; Tue, 28 May 2024 05:58: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 4VpMJh6QPKz4rfM; Tue, 28 May 2024 05:58:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716875924; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WyY1nMt/1lBam0AFEU70DKLv9uX5jWklKkFvdlJvVUU=; b=UgPLoJFrJHzeYxYXH/TevIZEFnl3XFwsDq73Bu+LPwBKoyKF0zmd+GyjqIMhtygg1+RQIG cTLMDVDrbS+x2HmayERUEZ5XAxzmBkq5jLhP+ax/Lu3mCtBcxq7M0MDvHssJBCH8zHtgH6 wSha9LD8S4y2IMDtHUiO3Ogh6VpEzh54RlbQr1KJpPIGCxxYHZV7CSugcZHEJStJgiVTPn d2i5nwMAAKrhyFhnJDhQ+GZcEc5XuEC0LsjeufdTmrhHKupqydVY9wMl/eMkOsVj85JwlO azhy5jWhGlNBMgr41+mXQdBkGqaURFlMEHHmF7DHP1HlQAGqFEjPshxgG/GQuA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1716875924; a=rsa-sha256; cv=none; b=t5y5rg8A8GsVFa4vMKgu5nraB7DicYOfP4AE5MLpRV45nKOdEQCZ8NuhTNAvBMtZRB7VoJ 5gW0H+RlUIUkJGtNKknF0Zky1ajr0iEyoSeLOw+o746CeSMnBj/mLXSpDWjzDlH+Tg6rJT Jj9Ifx2UxT/BkqAki09apQrPOCogqlf8pmwZKsWUWMEEsgjQlPH4/BDqDB/uHKfM2U1wxj 8RDjQSQzv+THJvAM+7lWaFesZ7GfBH/c5DgvNmUdJE8a/n9iDzt9omhFKSy9AThOApqBF9 eBExx+/r/b5wfAfvGqZszjm87A0o6Ty+aGVUMgEcc4LIyEZAF55gy+AmnD+pNg== 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=1716875924; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WyY1nMt/1lBam0AFEU70DKLv9uX5jWklKkFvdlJvVUU=; b=XWDj3pcd5Jx6x5w/rM0a+tRlkTYJiEpMOYsD4ZIhozrFV7AHPWwuCz5cOT9E+iXz1PyT1K 5W7BINnCR5s3lJ+T79Ap7fkzkiYsk9/jJmi4+ieG6XFlvYI4SjSl0Eeqi3zIAz1ARUnNiI 4KQd9nD4VEqw5fPycciBF9mepVsKx/44FpfVE4t+Ch4g27lNFsq59OdqvraAHgqDOMoF3M 0MzjuHTx0l41hMwTscGURVNvRnhwafhl28r+dpYLgM+iSxl22cs2gZ2WJ22WFG38TAit67 Ti+R+MUSuHzpJCEO/v5RzTTUs2l4aEV0lUXD5OHA5Ug/Q2HfFZPxUXaH5mtJHw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VpMJh5vs1z1FmJ; Tue, 28 May 2024 05:58: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 44S5wiXH069639; Tue, 28 May 2024 05:58:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44S5wi6V069635; Tue, 28 May 2024 05:58:44 GMT (envelope-from git) Date: Tue, 28 May 2024 05:58:44 GMT Message-Id: <202405280558.44S5wi6V069635@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kevin Bowling Subject: git: e3ec564ecb9c - main - qlnxe: Fix promiscuous and allmulti settings List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kbowling X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e3ec564ecb9c2daa96a8db36052e50ea554fe598 Auto-Submitted: auto-generated The branch main has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=e3ec564ecb9c2daa96a8db36052e50ea554fe598 commit e3ec564ecb9c2daa96a8db36052e50ea554fe598 Author: Keith Reynolds AuthorDate: 2024-05-28 05:57:44 +0000 Commit: Kevin Bowling CommitDate: 2024-05-28 05:57:44 +0000 qlnxe: Fix promiscuous and allmulti settings PR: 278087 MFC after: 1 week --- sys/dev/qlnx/qlnxe/qlnx_os.c | 33 ++++++++++++++++++++++----------- 1 file changed, 22 insertions(+), 11 deletions(-) diff --git a/sys/dev/qlnx/qlnxe/qlnx_os.c b/sys/dev/qlnx/qlnxe/qlnx_os.c index 0ef3c93580b6..de64aaef1b4c 100644 --- a/sys/dev/qlnx/qlnxe/qlnx_os.c +++ b/sys/dev/qlnx/qlnxe/qlnx_os.c @@ -90,8 +90,8 @@ static void qlnx_init_ifnet(device_t dev, qlnx_host_t *ha); static void qlnx_init(void *arg); static void qlnx_init_locked(qlnx_host_t *ha); static int qlnx_set_multi(qlnx_host_t *ha, uint32_t add_multi); -static int qlnx_set_promisc(qlnx_host_t *ha); -static int qlnx_set_allmulti(qlnx_host_t *ha); +static int qlnx_set_promisc(qlnx_host_t *ha, int enabled); +static int qlnx_set_allmulti(qlnx_host_t *ha, int enabled); static int qlnx_ioctl(if_t ifp, u_long cmd, caddr_t data); static int qlnx_media_change(if_t ifp); static void qlnx_media_status(if_t ifp, struct ifmediareq *ifmr); @@ -2595,7 +2595,7 @@ qlnx_set_multi(qlnx_host_t *ha, uint32_t add_multi) } static int -qlnx_set_promisc(qlnx_host_t *ha) +qlnx_set_promisc(qlnx_host_t *ha, int enabled) { int rc = 0; uint8_t filter; @@ -2604,15 +2604,20 @@ qlnx_set_promisc(qlnx_host_t *ha) return (0); filter = ha->filter; - filter |= ECORE_ACCEPT_MCAST_UNMATCHED; - filter |= ECORE_ACCEPT_UCAST_UNMATCHED; + if (enabled) { + filter |= ECORE_ACCEPT_MCAST_UNMATCHED; + filter |= ECORE_ACCEPT_UCAST_UNMATCHED; + } else { + filter &= ~ECORE_ACCEPT_MCAST_UNMATCHED; + filter &= ~ECORE_ACCEPT_UCAST_UNMATCHED; + } rc = qlnx_set_rx_accept_filter(ha, filter); return (rc); } static int -qlnx_set_allmulti(qlnx_host_t *ha) +qlnx_set_allmulti(qlnx_host_t *ha, int enabled) { int rc = 0; uint8_t filter; @@ -2621,7 +2626,11 @@ qlnx_set_allmulti(qlnx_host_t *ha) return (0); filter = ha->filter; - filter |= ECORE_ACCEPT_MCAST_UNMATCHED; + if (enabled) { + filter |= ECORE_ACCEPT_MCAST_UNMATCHED; + } else { + filter &= ~ECORE_ACCEPT_MCAST_UNMATCHED; + } rc = qlnx_set_rx_accept_filter(ha, filter); return (rc); @@ -2689,10 +2698,10 @@ qlnx_ioctl(if_t ifp, u_long cmd, caddr_t data) if (if_getdrvflags(ifp) & IFF_DRV_RUNNING) { if ((if_getflags(ifp) ^ ha->if_flags) & IFF_PROMISC) { - ret = qlnx_set_promisc(ha); + ret = qlnx_set_promisc(ha, ifp->if_flags & IFF_PROMISC); } else if ((if_getflags(ifp) ^ ha->if_flags) & IFF_ALLMULTI) { - ret = qlnx_set_allmulti(ha); + ret = qlnx_set_allmulti(ha, ifp->if_flags & IFF_ALLMULTI); } } else { ha->max_frame_size = if_getmtu(ifp) + @@ -2702,9 +2711,9 @@ qlnx_ioctl(if_t ifp, u_long cmd, caddr_t data) } else { if (if_getdrvflags(ifp) & IFF_DRV_RUNNING) qlnx_stop(ha); - ha->if_flags = if_getflags(ifp); } + ha->if_flags = if_getflags(ifp); QLNX_UNLOCK(ha); break; @@ -7075,9 +7084,11 @@ qlnx_set_rx_mode(qlnx_host_t *ha) ECORE_ACCEPT_MCAST_MATCHED | ECORE_ACCEPT_BCAST; - if (qlnx_vf_device(ha) == 0) { + if (qlnx_vf_device(ha) == 0 || (ha->ifp->if_flags & IFF_PROMISC)) { filter |= ECORE_ACCEPT_UCAST_UNMATCHED; filter |= ECORE_ACCEPT_MCAST_UNMATCHED; + } else if (ha->ifp->if_flags & IFF_ALLMULTI) { + filter |= ECORE_ACCEPT_MCAST_UNMATCHED; } ha->filter = filter; From nobody Tue May 28 06:15: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 4VpMh45W5Fz5LkHF; Tue, 28 May 2024 06:15: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 4VpMh44xLJz4vj5; Tue, 28 May 2024 06:15:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716876932; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LoNrt9IDTy8MhV2IB38uybyRvpl7DMYyrrM5LV0i4QA=; b=kjSaqYNrLnp6afIFzYpdBFFcVfm+20pD9YyK/fE/e01kv2+zfuoUwYf+ZLMEpZCmTbGtSY O61GwdPiq5EDINZgLziJxMverl99fek5hVooLW7QUF3bx63kA0JnnP7X4KbHCTMlTBMs3N 8B5NMvhZyqD6iFtqBJhGT7HnJeppWXXNl3yQAgkIVThe1rTlyQF7mNci/galamQuh+0xGH PdT3+pYReZNsZV4ZL2IBdQfbYKQ02nBHufPY1Ajb8AdZiwGfeWKJFYPoc82ebtXt4CRMEg 6vBmWaWGyTQSKeBoWqt7WFYfXVTBKfcYnC6s7gb86ghjGkI4BbedsBoIYyuR6Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1716876932; a=rsa-sha256; cv=none; b=pDB5AQy02tJgWZIOb3fxjOY7vbMz2Uk3UqPwfpjCxcbsYSVUAumzk6Wh5OZXrKHj4WCGVD ea1yK2zynAvesS9Q1uvFTZMfbwJkijSMbH8CORzxYfHeEm2CogkTWjvosFVVqGYOuR1LaI OucRuFEkJrOl4gcpM9LhODwQWyjK+zaTtU6rTQpB/zhxaby5PKXAPSLlSCeOYtMUt6zLQA GJa6ohqkMsgB4B3xDe8kM+GPZJlj47Eba1dUALL/bNZBggoxtGfED+Z8UBsS1WExs01oqb d+oQ+tP8bO1F9YW0G9xoaJyBK352BDMSA23skHfhyxQ3OeDlARY8BD3xqF+Jcg== 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=1716876932; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LoNrt9IDTy8MhV2IB38uybyRvpl7DMYyrrM5LV0i4QA=; b=abQcoWqVeMihrgnYN7JRWo5g7zV90GYzZxAnTbTofV05q9W1DG5tRNm26z0PP/ui8uBYdJ Ue9QCg1jT9Jt9gaIEZHZ5nOPGFKHV94Eh1gnqhOBKvzviS4FDEMrl1FzVhrKQafktfN+FO nFi8EUGsRp8Z3dwD826Op6B6RsIRDmUYH3VDZu+MM2gVJ0FFSkfD0mFgMu89h7mUfjdxRf 1HFfuhOhEP/CvOQxSvd+ou4RP5//ijalpN2Bf17KGwrNgJJDq4Ecd/Pmh6gE38p6UiJOdy LY9a+OPe7EgOVqqLMUaIDAl6OTpXkkNzINXyrtJDv9atsQ+az0p74HSNm1SiQA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VpMh44XRbz1GB3; Tue, 28 May 2024 06:15: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 44S6FWIY004112; Tue, 28 May 2024 06:15:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44S6FWBG004109; Tue, 28 May 2024 06:15:32 GMT (envelope-from git) Date: Tue, 28 May 2024 06:15:32 GMT Message-Id: <202405280615.44S6FWBG004109@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kevin Bowling Subject: git: 29684d08fa30 - main - qlnxe: Fix multiple locking issues List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kbowling X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 29684d08fa3010c2035b4eb1ce0b39091ad07723 Auto-Submitted: auto-generated The branch main has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=29684d08fa3010c2035b4eb1ce0b39091ad07723 commit 29684d08fa3010c2035b4eb1ce0b39091ad07723 Author: Keith Reynolds AuthorDate: 2024-05-28 06:13:10 +0000 Commit: Kevin Bowling CommitDate: 2024-05-28 06:13:10 +0000 qlnxe: Fix multiple locking issues Multiple issues are reported with WITNESS and code inspection of the locking and lock initialization. PR: 278084 MFC after: 1 week --- sys/dev/qlnx/qlnxe/bcm_osal.h | 8 ++++---- sys/dev/qlnx/qlnxe/ecore.h | 1 + sys/dev/qlnx/qlnxe/ecore_mcp.h | 6 +++--- sys/dev/qlnx/qlnxe/qlnx_def.h | 2 +- sys/dev/qlnx/qlnxe/qlnx_os.c | 9 +++++---- sys/dev/qlnx/qlnxe/qlnx_os.h | 4 ++-- 6 files changed, 16 insertions(+), 14 deletions(-) diff --git a/sys/dev/qlnx/qlnxe/bcm_osal.h b/sys/dev/qlnx/qlnxe/bcm_osal.h index 5d940d3272d6..c820532c9e0a 100644 --- a/sys/dev/qlnx/qlnxe/bcm_osal.h +++ b/sys/dev/qlnx/qlnxe/bcm_osal.h @@ -72,7 +72,7 @@ extern void qlnx_dma_free_coherent(void *ecore_dev, void *v_addr, bus_addr_t phys, uint32_t size); extern void qlnx_link_update(void *p_hwfn); -extern void qlnx_barrier(void *p_hwfn); +extern void qlnx_barrier(void *p_dev); extern void *qlnx_zalloc(uint32_t size); @@ -213,14 +213,14 @@ typedef struct osal_list_t #define OSAL_SPIN_LOCK_ALLOC(p_hwfn, mutex) #define OSAL_SPIN_LOCK_DEALLOC(mutex) mtx_destroy(mutex) #define OSAL_SPIN_LOCK_INIT(lock) {\ - mtx_init(lock, __func__, MTX_NETWORK_LOCK, MTX_SPIN); \ + mtx_init(lock, __func__, "OSAL spin lock", MTX_SPIN); \ } #define OSAL_SPIN_UNLOCK(lock) {\ - mtx_unlock(lock); \ + mtx_unlock_spin(lock); \ } #define OSAL_SPIN_LOCK(lock) {\ - mtx_lock(lock); \ + mtx_lock_spin(lock); \ } #define OSAL_MUTEX_ALLOC(p_hwfn, mutex) diff --git a/sys/dev/qlnx/qlnxe/ecore.h b/sys/dev/qlnx/qlnxe/ecore.h index 8fcbc1f8d8a0..eda7c260ba99 100644 --- a/sys/dev/qlnx/qlnxe/ecore.h +++ b/sys/dev/qlnx/qlnxe/ecore.h @@ -790,6 +790,7 @@ struct ecore_dev { u8 dp_level; char name[NAME_SIZE]; void *dp_ctx; + void *ha; enum ecore_dev_type type; /* Translate type/revision combo into the proper conditions */ diff --git a/sys/dev/qlnx/qlnxe/ecore_mcp.h b/sys/dev/qlnx/qlnxe/ecore_mcp.h index c94583cdfba3..edb1f9083467 100644 --- a/sys/dev/qlnx/qlnxe/ecore_mcp.h +++ b/sys/dev/qlnx/qlnxe/ecore_mcp.h @@ -51,10 +51,10 @@ struct ecore_mcp_info { /* List for mailbox commands which were sent and wait for a response */ osal_list_t cmd_list; - /* Spinlock used for protecting the access to the mailbox commands list + /* Lock used for protecting the access to the mailbox commands list * and the sending of the commands. */ - osal_spinlock_t cmd_lock; + osal_mutex_t cmd_lock; /* Flag to indicate whether sending a MFW mailbox command is blocked */ bool b_block_cmd; @@ -62,7 +62,7 @@ struct ecore_mcp_info { /* Spinlock used for syncing SW link-changes and link-changes * originating from attention context. */ - osal_spinlock_t link_lock; + osal_mutex_t link_lock; /* Address of the MCP public area */ u32 public_base; diff --git a/sys/dev/qlnx/qlnxe/qlnx_def.h b/sys/dev/qlnx/qlnxe/qlnx_def.h index 8ac403ab49dc..4342bba89587 100644 --- a/sys/dev/qlnx/qlnxe/qlnx_def.h +++ b/sys/dev/qlnx/qlnxe/qlnx_def.h @@ -391,7 +391,7 @@ struct qlnx_host { int msix_count; - struct mtx hw_lock; + struct sx hw_lock; /* debug */ diff --git a/sys/dev/qlnx/qlnxe/qlnx_os.c b/sys/dev/qlnx/qlnxe/qlnx_os.c index de64aaef1b4c..2b3732e748fd 100644 --- a/sys/dev/qlnx/qlnxe/qlnx_os.c +++ b/sys/dev/qlnx/qlnxe/qlnx_os.c @@ -763,7 +763,7 @@ qlnx_pci_attach(device_t dev) ha->pci_dev = dev; - mtx_init(&ha->hw_lock, "qlnx_hw_lock", MTX_NETWORK_LOCK, MTX_DEF); + sx_init(&ha->hw_lock, "qlnx_hw_lock"); ha->flags.lock_init = 1; @@ -1207,6 +1207,7 @@ qlnx_init_hw(qlnx_host_t *ha) int rval = 0; struct ecore_hw_prepare_params params; + ha->cdev.ha = ha; ecore_init_struct(&ha->cdev); /* ha->dp_module = ECORE_MSG_PROBE | @@ -1351,7 +1352,7 @@ qlnx_release(qlnx_host_t *ha) pci_release_msi(dev); if (ha->flags.lock_init) { - mtx_destroy(&ha->hw_lock); + sx_destroy(&ha->hw_lock); } if (ha->pci_reg) @@ -5396,11 +5397,11 @@ qlnx_zalloc(uint32_t size) } void -qlnx_barrier(void *p_hwfn) +qlnx_barrier(void *p_dev) { qlnx_host_t *ha; - ha = (qlnx_host_t *)((struct ecore_hwfn *)p_hwfn)->p_dev; + ha = ((struct ecore_dev *) p_dev)->ha; bus_barrier(ha->pci_reg, 0, 0, BUS_SPACE_BARRIER_WRITE); } diff --git a/sys/dev/qlnx/qlnxe/qlnx_os.h b/sys/dev/qlnx/qlnxe/qlnx_os.h index 261283fb6eaf..6d717d0e70bf 100644 --- a/sys/dev/qlnx/qlnxe/qlnx_os.h +++ b/sys/dev/qlnx/qlnxe/qlnx_os.h @@ -130,8 +130,8 @@ MALLOC_DECLARE(M_QLNXBUF); /* * Locks */ -#define QLNX_LOCK(ha) mtx_lock(&ha->hw_lock) -#define QLNX_UNLOCK(ha) mtx_unlock(&ha->hw_lock) +#define QLNX_LOCK(ha) sx_xlock(&ha->hw_lock) +#define QLNX_UNLOCK(ha) sx_xunlock(&ha->hw_lock) /* * structure encapsulating a DMA buffer From nobody Tue May 28 06:43: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 4VpNHy4hgDz5LnTB; Tue, 28 May 2024 06:43:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VpNHy2Vcjz51DK; Tue, 28 May 2024 06:43:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716878590; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ucMVJi2pe4Tg+re5wHyf4NWRbJCl/2hC0oRme3fzL+8=; b=mYbl+/p6Si7FwvyxrfIB96QMJWdCwSfZUHdqehPh7Gxgk05GhsS4oTHlkaNlaNmlh3TGYq QgmkcSdTwHeZv4TR481BKOIcUuH7XlMrfbbo0/KY2nt1MieMYkFt3/V8DX2FWHxR4/4pTQ krtk7bra/T7t1NCYmuBUKrWteR1xQKJXJTND9oJS5G28hpbAh/R/7iqsxhAQ3UpnJmpCwP PI6Ohyzxcyahnj6GrfsSHjgwh4ze1g7SzBfgyWB9TLfa2GvU2pcpm3t7vh4ZPCB3Y4LCd5 Eqw9HpQNANFVgpQGtJ3pr2PsuehWjzsaBP/dpnPgS13cTMus89ey9MdQWGr3Sw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1716878590; a=rsa-sha256; cv=none; b=gZz86xc8vr6at+0+0yi0f4n3SvShw35fk6DRuDM03H+ERHiYSADXLU297yxSVU4Hsx26oe ZgaTNjkSEdGECXMP3Qd/BnVWMvqgvdcUkc2bhizXGfHsK3KgTuuopm26Q/4nLV+kdp2pP9 wKIj+8b5BIPIk54EYr9Q2BJmXRoUJF9cmTgloH9yWmK5rqmJQgigj8PsSwm5DYrDLAHBg6 SC2yoD8K6U0aowzvgruJer8cK3THYwbU/I63TFPPi0hBF95QDtmDsdlOZ7ibSyNVlH/UF+ Ircu+OjT2IflTBVRZS1klqsuRrr8dyotztqFnMbgi4pkeXewnvuAp2f2fXtdTg== 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=1716878590; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ucMVJi2pe4Tg+re5wHyf4NWRbJCl/2hC0oRme3fzL+8=; b=Hgdqhm+wmjl0TmrTw1etuJ0OoJRDz2DbrUy3V2XFjkqEvK2kQx4ymuOx1bAbw/ziRrEO3T hvukCWryeNYS/zIUe7gdeFvSek+qIs3ZvapuZaHPC7te2XLwUaoKMDIirYhY2njzGiUepj aXo6urxd3g5Em5lKY5fjpveQRx1e+ueygz1LIF46c/OgaaBKWRjnNaDHFRIijwzQpGOFYe etmaXIObZ35cCYI0mCVk99DRb4e3z9E5bgZhuRS9vtVRoo5fQoPJGkVmkkF0NRhXOVUCM7 xxJgKwZbEW1jyWXKBL9c3mhOrUuL7iGo7ZX2gL5meoBvoOaV4/LLSeJmxL57WQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VpNHy25xqz1GTP; Tue, 28 May 2024 06:43: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 44S6hAP8054443; Tue, 28 May 2024 06:43:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44S6hAuL054440; Tue, 28 May 2024 06:43:10 GMT (envelope-from git) Date: Tue, 28 May 2024 06:43:10 GMT Message-Id: <202405280643.44S6hAuL054440@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kevin Bowling Subject: git: fb78e20b4e59 - main - Revert "qlnxe: Fix multiple locking issues" List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kbowling X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fb78e20b4e5989a8d5f81d5765e77b4eb883a448 Auto-Submitted: auto-generated The branch main has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=fb78e20b4e5989a8d5f81d5765e77b4eb883a448 commit fb78e20b4e5989a8d5f81d5765e77b4eb883a448 Author: Kevin Bowling AuthorDate: 2024-05-28 06:39:06 +0000 Commit: Kevin Bowling CommitDate: 2024-05-28 06:39:23 +0000 Revert "qlnxe: Fix multiple locking issues" This commit is missing a file, revert so I can do it correctly, atomically. This reverts commit 29684d08fa3010c2035b4eb1ce0b39091ad07723. --- sys/dev/qlnx/qlnxe/bcm_osal.h | 8 ++++---- sys/dev/qlnx/qlnxe/ecore.h | 1 - sys/dev/qlnx/qlnxe/ecore_mcp.h | 6 +++--- sys/dev/qlnx/qlnxe/qlnx_def.h | 2 +- sys/dev/qlnx/qlnxe/qlnx_os.c | 9 ++++----- sys/dev/qlnx/qlnxe/qlnx_os.h | 4 ++-- 6 files changed, 14 insertions(+), 16 deletions(-) diff --git a/sys/dev/qlnx/qlnxe/bcm_osal.h b/sys/dev/qlnx/qlnxe/bcm_osal.h index c820532c9e0a..5d940d3272d6 100644 --- a/sys/dev/qlnx/qlnxe/bcm_osal.h +++ b/sys/dev/qlnx/qlnxe/bcm_osal.h @@ -72,7 +72,7 @@ extern void qlnx_dma_free_coherent(void *ecore_dev, void *v_addr, bus_addr_t phys, uint32_t size); extern void qlnx_link_update(void *p_hwfn); -extern void qlnx_barrier(void *p_dev); +extern void qlnx_barrier(void *p_hwfn); extern void *qlnx_zalloc(uint32_t size); @@ -213,14 +213,14 @@ typedef struct osal_list_t #define OSAL_SPIN_LOCK_ALLOC(p_hwfn, mutex) #define OSAL_SPIN_LOCK_DEALLOC(mutex) mtx_destroy(mutex) #define OSAL_SPIN_LOCK_INIT(lock) {\ - mtx_init(lock, __func__, "OSAL spin lock", MTX_SPIN); \ + mtx_init(lock, __func__, MTX_NETWORK_LOCK, MTX_SPIN); \ } #define OSAL_SPIN_UNLOCK(lock) {\ - mtx_unlock_spin(lock); \ + mtx_unlock(lock); \ } #define OSAL_SPIN_LOCK(lock) {\ - mtx_lock_spin(lock); \ + mtx_lock(lock); \ } #define OSAL_MUTEX_ALLOC(p_hwfn, mutex) diff --git a/sys/dev/qlnx/qlnxe/ecore.h b/sys/dev/qlnx/qlnxe/ecore.h index eda7c260ba99..8fcbc1f8d8a0 100644 --- a/sys/dev/qlnx/qlnxe/ecore.h +++ b/sys/dev/qlnx/qlnxe/ecore.h @@ -790,7 +790,6 @@ struct ecore_dev { u8 dp_level; char name[NAME_SIZE]; void *dp_ctx; - void *ha; enum ecore_dev_type type; /* Translate type/revision combo into the proper conditions */ diff --git a/sys/dev/qlnx/qlnxe/ecore_mcp.h b/sys/dev/qlnx/qlnxe/ecore_mcp.h index edb1f9083467..c94583cdfba3 100644 --- a/sys/dev/qlnx/qlnxe/ecore_mcp.h +++ b/sys/dev/qlnx/qlnxe/ecore_mcp.h @@ -51,10 +51,10 @@ struct ecore_mcp_info { /* List for mailbox commands which were sent and wait for a response */ osal_list_t cmd_list; - /* Lock used for protecting the access to the mailbox commands list + /* Spinlock used for protecting the access to the mailbox commands list * and the sending of the commands. */ - osal_mutex_t cmd_lock; + osal_spinlock_t cmd_lock; /* Flag to indicate whether sending a MFW mailbox command is blocked */ bool b_block_cmd; @@ -62,7 +62,7 @@ struct ecore_mcp_info { /* Spinlock used for syncing SW link-changes and link-changes * originating from attention context. */ - osal_mutex_t link_lock; + osal_spinlock_t link_lock; /* Address of the MCP public area */ u32 public_base; diff --git a/sys/dev/qlnx/qlnxe/qlnx_def.h b/sys/dev/qlnx/qlnxe/qlnx_def.h index 4342bba89587..8ac403ab49dc 100644 --- a/sys/dev/qlnx/qlnxe/qlnx_def.h +++ b/sys/dev/qlnx/qlnxe/qlnx_def.h @@ -391,7 +391,7 @@ struct qlnx_host { int msix_count; - struct sx hw_lock; + struct mtx hw_lock; /* debug */ diff --git a/sys/dev/qlnx/qlnxe/qlnx_os.c b/sys/dev/qlnx/qlnxe/qlnx_os.c index 2b3732e748fd..de64aaef1b4c 100644 --- a/sys/dev/qlnx/qlnxe/qlnx_os.c +++ b/sys/dev/qlnx/qlnxe/qlnx_os.c @@ -763,7 +763,7 @@ qlnx_pci_attach(device_t dev) ha->pci_dev = dev; - sx_init(&ha->hw_lock, "qlnx_hw_lock"); + mtx_init(&ha->hw_lock, "qlnx_hw_lock", MTX_NETWORK_LOCK, MTX_DEF); ha->flags.lock_init = 1; @@ -1207,7 +1207,6 @@ qlnx_init_hw(qlnx_host_t *ha) int rval = 0; struct ecore_hw_prepare_params params; - ha->cdev.ha = ha; ecore_init_struct(&ha->cdev); /* ha->dp_module = ECORE_MSG_PROBE | @@ -1352,7 +1351,7 @@ qlnx_release(qlnx_host_t *ha) pci_release_msi(dev); if (ha->flags.lock_init) { - sx_destroy(&ha->hw_lock); + mtx_destroy(&ha->hw_lock); } if (ha->pci_reg) @@ -5397,11 +5396,11 @@ qlnx_zalloc(uint32_t size) } void -qlnx_barrier(void *p_dev) +qlnx_barrier(void *p_hwfn) { qlnx_host_t *ha; - ha = ((struct ecore_dev *) p_dev)->ha; + ha = (qlnx_host_t *)((struct ecore_hwfn *)p_hwfn)->p_dev; bus_barrier(ha->pci_reg, 0, 0, BUS_SPACE_BARRIER_WRITE); } diff --git a/sys/dev/qlnx/qlnxe/qlnx_os.h b/sys/dev/qlnx/qlnxe/qlnx_os.h index 6d717d0e70bf..261283fb6eaf 100644 --- a/sys/dev/qlnx/qlnxe/qlnx_os.h +++ b/sys/dev/qlnx/qlnxe/qlnx_os.h @@ -130,8 +130,8 @@ MALLOC_DECLARE(M_QLNXBUF); /* * Locks */ -#define QLNX_LOCK(ha) sx_xlock(&ha->hw_lock) -#define QLNX_UNLOCK(ha) sx_xunlock(&ha->hw_lock) +#define QLNX_LOCK(ha) mtx_lock(&ha->hw_lock) +#define QLNX_UNLOCK(ha) mtx_unlock(&ha->hw_lock) /* * structure encapsulating a DMA buffer From nobody Tue May 28 06:43: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 4VpNHz68tyz5Lnqx; Tue, 28 May 2024 06:43: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 4VpNHz3tNMz51jp; Tue, 28 May 2024 06:43:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716878591; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8utVrzQt7Mup66ptcBz8lWxrZrTLw9ISsilEXAA9TkY=; b=bl5n5bVCuSpRaUSWG3+5Xgt8xpD/CV4mQPho8//fT7yXihOitHmfhVTmnQEqPVnWvFmIv0 wiD+gtgEzPMMsUnleQmYgLZ0yVp2yGEKiDdJBbRcmwJ46aTuTo1ZSr2vmHHAOGoiAHIB0v S4aBx4EMv9mFTog4R+CvAwdGtpTS0RINC2j+gXJ/Qq4YVf+XJaw0MHg1rXNzwJbr6PHaxI 0XZc66eYOs9iWQHF/EabpJ2aMmkzX0uVIr5w1KlFICwi+1a6xekeYicA9IRmPid5KrXQ5+ yZ4H4JMBZN4U1wtV93T6JctQiH/gHWIhS1kY/m6HY371rY5VHy+N4CMjLD9Zig== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1716878591; a=rsa-sha256; cv=none; b=TdFmB3S9WF5+ZnfGzhNHK8e3b3s6Cc73gzZUmlik2bVt8BAfpA6qG+PO6aOBkZOkmu86/k HwEeB45YuQJ/MO3P7pzX1aCf8DTqV9o5nPSP1WxSEJ8Ap4+aOjMeBqixUQdy7e5c3GSxGD 937O0dWTM/MgolGphik9+erEHjKXoLCYtzlrNlyqPKq9rf3HS84gfaFablcQ5Bl4KeDFac 6atKF2fZq91kGpESBojwIZaIj6ce+4GDCNF1K/XCi6/rotnGuL+pNxSAjiPB4AujyhRmwx 40YtvETAmubI+qxW01xitQNZevBqjnCGrVH6iiuRHOCgtfaGvOPdu1NQEQ59Ug== 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=1716878591; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8utVrzQt7Mup66ptcBz8lWxrZrTLw9ISsilEXAA9TkY=; b=vdUpgXtbeLrk7nuzsXWb5jhX+JNAZRFrl53F8HUAkcWLteY6Ar4ulGR/kCvPlGeWrHL6/M z7eOgnlOj7QhH3aLDNCeWrx0z/hTOFDWTV1exM6Ku6e6Dr5NblVGuB5aNm1gOoRNs7Ttgj SV7K/ozAATG8QvPtWaEg7d3mVEr7HlnDS8r0S2d1dWQB6M2pgplIMp5RPiAR7pbdVzSJbi n1UJzpzmGSi9aaYdD0rQ/0bo+1+pJCCzTmuhj6zN1A97WvaTKC2Hyu0i7jpl+9IxDh8Ono eJspypqcBtstayZ7jfIJhB0Ulsl9KOzrZLZlj/zwLqDN55O52B6Pz5P6y3iUQg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VpNHz3Tsbz1GsV; Tue, 28 May 2024 06:43: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 44S6hBnt054485; Tue, 28 May 2024 06:43:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44S6hBkh054482; Tue, 28 May 2024 06:43:11 GMT (envelope-from git) Date: Tue, 28 May 2024 06:43:11 GMT Message-Id: <202405280643.44S6hBkh054482@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kevin Bowling Subject: git: 1c45a62a2f66 - main - qlnxe: Fix multiple locking issues List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kbowling X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1c45a62a2f667b45ec10a92ad58ff5a34e68b569 Auto-Submitted: auto-generated The branch main has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=1c45a62a2f667b45ec10a92ad58ff5a34e68b569 commit 1c45a62a2f667b45ec10a92ad58ff5a34e68b569 Author: Keith Reynolds AuthorDate: 2024-05-28 06:41:05 +0000 Commit: Kevin Bowling CommitDate: 2024-05-28 06:41:05 +0000 qlnxe: Fix multiple locking issues Multiple issues are reported with WITNESS and code inspection of the locking and lock initialization. PR: 278084 MFC after: 1 week --- sys/dev/qlnx/qlnxe/bcm_osal.h | 8 +++---- sys/dev/qlnx/qlnxe/ecore.h | 1 + sys/dev/qlnx/qlnxe/ecore_mcp.c | 48 +++++++++++++++++++++--------------------- sys/dev/qlnx/qlnxe/ecore_mcp.h | 6 +++--- sys/dev/qlnx/qlnxe/qlnx_def.h | 2 +- sys/dev/qlnx/qlnxe/qlnx_os.c | 9 ++++---- sys/dev/qlnx/qlnxe/qlnx_os.h | 4 ++-- 7 files changed, 40 insertions(+), 38 deletions(-) diff --git a/sys/dev/qlnx/qlnxe/bcm_osal.h b/sys/dev/qlnx/qlnxe/bcm_osal.h index 5d940d3272d6..c820532c9e0a 100644 --- a/sys/dev/qlnx/qlnxe/bcm_osal.h +++ b/sys/dev/qlnx/qlnxe/bcm_osal.h @@ -72,7 +72,7 @@ extern void qlnx_dma_free_coherent(void *ecore_dev, void *v_addr, bus_addr_t phys, uint32_t size); extern void qlnx_link_update(void *p_hwfn); -extern void qlnx_barrier(void *p_hwfn); +extern void qlnx_barrier(void *p_dev); extern void *qlnx_zalloc(uint32_t size); @@ -213,14 +213,14 @@ typedef struct osal_list_t #define OSAL_SPIN_LOCK_ALLOC(p_hwfn, mutex) #define OSAL_SPIN_LOCK_DEALLOC(mutex) mtx_destroy(mutex) #define OSAL_SPIN_LOCK_INIT(lock) {\ - mtx_init(lock, __func__, MTX_NETWORK_LOCK, MTX_SPIN); \ + mtx_init(lock, __func__, "OSAL spin lock", MTX_SPIN); \ } #define OSAL_SPIN_UNLOCK(lock) {\ - mtx_unlock(lock); \ + mtx_unlock_spin(lock); \ } #define OSAL_SPIN_LOCK(lock) {\ - mtx_lock(lock); \ + mtx_lock_spin(lock); \ } #define OSAL_MUTEX_ALLOC(p_hwfn, mutex) diff --git a/sys/dev/qlnx/qlnxe/ecore.h b/sys/dev/qlnx/qlnxe/ecore.h index 8fcbc1f8d8a0..eda7c260ba99 100644 --- a/sys/dev/qlnx/qlnxe/ecore.h +++ b/sys/dev/qlnx/qlnxe/ecore.h @@ -790,6 +790,7 @@ struct ecore_dev { u8 dp_level; char name[NAME_SIZE]; void *dp_ctx; + void *ha; enum ecore_dev_type type; /* Translate type/revision combo into the proper conditions */ diff --git a/sys/dev/qlnx/qlnxe/ecore_mcp.c b/sys/dev/qlnx/qlnxe/ecore_mcp.c index d94c7382edc5..ab14b1eb5186 100644 --- a/sys/dev/qlnx/qlnxe/ecore_mcp.c +++ b/sys/dev/qlnx/qlnxe/ecore_mcp.c @@ -191,17 +191,17 @@ enum _ecore_status_t ecore_mcp_free(struct ecore_hwfn *p_hwfn) OSAL_FREE(p_hwfn->p_dev, p_hwfn->mcp_info->mfw_mb_cur); OSAL_FREE(p_hwfn->p_dev, p_hwfn->mcp_info->mfw_mb_shadow); - OSAL_SPIN_LOCK(&p_hwfn->mcp_info->cmd_lock); + OSAL_MUTEX_ACQUIRE(&p_hwfn->mcp_info->cmd_lock); OSAL_LIST_FOR_EACH_ENTRY_SAFE(p_cmd_elem, p_tmp, &p_hwfn->mcp_info->cmd_list, list, struct ecore_mcp_cmd_elem) { ecore_mcp_cmd_del_elem(p_hwfn, p_cmd_elem); } - OSAL_SPIN_UNLOCK(&p_hwfn->mcp_info->cmd_lock); + OSAL_MUTEX_RELEASE(&p_hwfn->mcp_info->cmd_lock); #ifdef CONFIG_ECORE_LOCK_ALLOC - OSAL_SPIN_LOCK_DEALLOC(&p_hwfn->mcp_info->cmd_lock); - OSAL_SPIN_LOCK_DEALLOC(&p_hwfn->mcp_info->link_lock); + OSAL_MUTEX_DEALLOC(&p_hwfn->mcp_info->cmd_lock); + OSAL_MUTEX_DEALLOC(&p_hwfn->mcp_info->link_lock); #endif } @@ -308,18 +308,18 @@ enum _ecore_status_t ecore_mcp_cmd_init(struct ecore_hwfn *p_hwfn, /* Initialize the MFW spinlocks */ #ifdef CONFIG_ECORE_LOCK_ALLOC - if (OSAL_SPIN_LOCK_ALLOC(p_hwfn, &p_info->cmd_lock)) { + if (OSAL_MUTEX_LOCK_ALLOC(p_hwfn, &p_info->cmd_lock)) { OSAL_FREE(p_hwfn->p_dev, p_hwfn->mcp_info); return ECORE_NOMEM; } - if (OSAL_SPIN_LOCK_ALLOC(p_hwfn, &p_info->link_lock)) { - OSAL_SPIN_LOCK_DEALLOC(&p_info->cmd_lock); + if (OSAL_MUTEX_ALLOC(p_hwfn, &p_info->link_lock)) { + OSAL_MUTEX_DEALLOC(&p_info->cmd_lock); OSAL_FREE(p_hwfn->p_dev, p_hwfn->mcp_info); return ECORE_NOMEM; } #endif - OSAL_SPIN_LOCK_INIT(&p_info->cmd_lock); - OSAL_SPIN_LOCK_INIT(&p_info->link_lock); + OSAL_MUTEX_INIT(&p_info->cmd_lock); + OSAL_MUTEX_INIT(&p_info->link_lock); OSAL_LIST_INIT(&p_info->cmd_list); @@ -381,7 +381,7 @@ enum _ecore_status_t ecore_mcp_reset(struct ecore_hwfn *p_hwfn, } /* Ensure that only a single thread is accessing the mailbox */ - OSAL_SPIN_LOCK(&p_hwfn->mcp_info->cmd_lock); + OSAL_MUTEX_ACQUIRE(&p_hwfn->mcp_info->cmd_lock); org_mcp_reset_seq = ecore_rd(p_hwfn, p_ptt, MISCS_REG_GENERIC_POR_0); @@ -407,7 +407,7 @@ enum _ecore_status_t ecore_mcp_reset(struct ecore_hwfn *p_hwfn, rc = ECORE_AGAIN; } - OSAL_SPIN_UNLOCK(&p_hwfn->mcp_info->cmd_lock); + OSAL_MUTEX_RELEASE(&p_hwfn->mcp_info->cmd_lock); return rc; } @@ -551,7 +551,7 @@ _ecore_mcp_cmd_and_union(struct ecore_hwfn *p_hwfn, struct ecore_ptt *p_ptt, * The spinlock stays locked until the command is sent. */ - OSAL_SPIN_LOCK(&p_hwfn->mcp_info->cmd_lock); + OSAL_MUTEX_ACQUIRE(&p_hwfn->mcp_info->cmd_lock); if (!ecore_mcp_has_pending_cmd(p_hwfn)) break; @@ -562,7 +562,7 @@ _ecore_mcp_cmd_and_union(struct ecore_hwfn *p_hwfn, struct ecore_ptt *p_ptt, else if (rc != ECORE_AGAIN) goto err; - OSAL_SPIN_UNLOCK(&p_hwfn->mcp_info->cmd_lock); + OSAL_MUTEX_RELEASE(&p_hwfn->mcp_info->cmd_lock); if (ECORE_MB_FLAGS_IS_SET(p_mb_params, CAN_SLEEP)) { OSAL_MSLEEP(msecs); } else { @@ -588,7 +588,7 @@ _ecore_mcp_cmd_and_union(struct ecore_hwfn *p_hwfn, struct ecore_ptt *p_ptt, } __ecore_mcp_cmd_and_union(p_hwfn, p_ptt, p_mb_params, seq_num); - OSAL_SPIN_UNLOCK(&p_hwfn->mcp_info->cmd_lock); + OSAL_MUTEX_RELEASE(&p_hwfn->mcp_info->cmd_lock); /* Wait for the MFW response */ do { @@ -602,7 +602,7 @@ _ecore_mcp_cmd_and_union(struct ecore_hwfn *p_hwfn, struct ecore_ptt *p_ptt, } else { OSAL_UDELAY(usecs); } - OSAL_SPIN_LOCK(&p_hwfn->mcp_info->cmd_lock); + OSAL_MUTEX_ACQUIRE(&p_hwfn->mcp_info->cmd_lock); if (p_cmd_elem->b_is_completed) break; @@ -613,7 +613,7 @@ _ecore_mcp_cmd_and_union(struct ecore_hwfn *p_hwfn, struct ecore_ptt *p_ptt, else if (rc != ECORE_AGAIN) goto err; - OSAL_SPIN_UNLOCK(&p_hwfn->mcp_info->cmd_lock); + OSAL_MUTEX_RELEASE(&p_hwfn->mcp_info->cmd_lock); OSAL_MFW_CMD_PREEMPT(p_hwfn); } while (++cnt < max_retries); @@ -623,9 +623,9 @@ _ecore_mcp_cmd_and_union(struct ecore_hwfn *p_hwfn, struct ecore_ptt *p_ptt, p_mb_params->cmd, p_mb_params->param); ecore_mcp_print_cpu_info(p_hwfn, p_ptt); - OSAL_SPIN_LOCK(&p_hwfn->mcp_info->cmd_lock); + OSAL_MUTEX_ACQUIRE(&p_hwfn->mcp_info->cmd_lock); ecore_mcp_cmd_del_elem(p_hwfn, p_cmd_elem); - OSAL_SPIN_UNLOCK(&p_hwfn->mcp_info->cmd_lock); + OSAL_MUTEX_RELEASE(&p_hwfn->mcp_info->cmd_lock); if (!ECORE_MB_FLAGS_IS_SET(p_mb_params, AVOID_BLOCK)) ecore_mcp_cmd_set_blocking(p_hwfn, true); @@ -634,7 +634,7 @@ _ecore_mcp_cmd_and_union(struct ecore_hwfn *p_hwfn, struct ecore_ptt *p_ptt, } ecore_mcp_cmd_del_elem(p_hwfn, p_cmd_elem); - OSAL_SPIN_UNLOCK(&p_hwfn->mcp_info->cmd_lock); + OSAL_MUTEX_RELEASE(&p_hwfn->mcp_info->cmd_lock); DP_VERBOSE(p_hwfn, ECORE_MSG_SP, "MFW mailbox: response 0x%08x param 0x%08x [after %d.%03d ms]\n", @@ -647,7 +647,7 @@ _ecore_mcp_cmd_and_union(struct ecore_hwfn *p_hwfn, struct ecore_ptt *p_ptt, return ECORE_SUCCESS; err: - OSAL_SPIN_UNLOCK(&p_hwfn->mcp_info->cmd_lock); + OSAL_MUTEX_RELEASE(&p_hwfn->mcp_info->cmd_lock); return rc; } @@ -1439,7 +1439,7 @@ static void ecore_mcp_handle_link_change(struct ecore_hwfn *p_hwfn, u32 status = 0; /* Prevent SW/attentions from doing this at the same time */ - OSAL_SPIN_LOCK(&p_hwfn->mcp_info->link_lock); + OSAL_MUTEX_ACQUIRE(&p_hwfn->mcp_info->link_lock); p_link = &p_hwfn->mcp_info->link_output; OSAL_MEMSET(p_link, 0, sizeof(*p_link)); @@ -1585,7 +1585,7 @@ static void ecore_mcp_handle_link_change(struct ecore_hwfn *p_hwfn, OSAL_LINK_UPDATE(p_hwfn, p_ptt); out: - OSAL_SPIN_UNLOCK(&p_hwfn->mcp_info->link_lock); + OSAL_MUTEX_RELEASE(&p_hwfn->mcp_info->link_lock); } enum _ecore_status_t ecore_mcp_set_link(struct ecore_hwfn *p_hwfn, @@ -1774,7 +1774,7 @@ ecore_mcp_update_bw(struct ecore_hwfn *p_hwfn, struct ecore_ptt *p_ptt) struct public_func shmem_info; u32 resp = 0, param = 0; - OSAL_SPIN_LOCK(&p_hwfn->mcp_info->link_lock); + OSAL_MUTEX_ACQUIRE(&p_hwfn->mcp_info->link_lock); ecore_mcp_get_shmem_func(p_hwfn, p_ptt, &shmem_info, MCP_PF_ID(p_hwfn)); @@ -1787,7 +1787,7 @@ ecore_mcp_update_bw(struct ecore_hwfn *p_hwfn, struct ecore_ptt *p_ptt) ecore_configure_pf_max_bandwidth(p_hwfn->p_dev, p_info->bandwidth_max); - OSAL_SPIN_UNLOCK(&p_hwfn->mcp_info->link_lock); + OSAL_MUTEX_RELEASE(&p_hwfn->mcp_info->link_lock); /* Acknowledge the MFW */ ecore_mcp_cmd(p_hwfn, p_ptt, DRV_MSG_CODE_BW_UPDATE_ACK, 0, &resp, diff --git a/sys/dev/qlnx/qlnxe/ecore_mcp.h b/sys/dev/qlnx/qlnxe/ecore_mcp.h index c94583cdfba3..edb1f9083467 100644 --- a/sys/dev/qlnx/qlnxe/ecore_mcp.h +++ b/sys/dev/qlnx/qlnxe/ecore_mcp.h @@ -51,10 +51,10 @@ struct ecore_mcp_info { /* List for mailbox commands which were sent and wait for a response */ osal_list_t cmd_list; - /* Spinlock used for protecting the access to the mailbox commands list + /* Lock used for protecting the access to the mailbox commands list * and the sending of the commands. */ - osal_spinlock_t cmd_lock; + osal_mutex_t cmd_lock; /* Flag to indicate whether sending a MFW mailbox command is blocked */ bool b_block_cmd; @@ -62,7 +62,7 @@ struct ecore_mcp_info { /* Spinlock used for syncing SW link-changes and link-changes * originating from attention context. */ - osal_spinlock_t link_lock; + osal_mutex_t link_lock; /* Address of the MCP public area */ u32 public_base; diff --git a/sys/dev/qlnx/qlnxe/qlnx_def.h b/sys/dev/qlnx/qlnxe/qlnx_def.h index 8ac403ab49dc..4342bba89587 100644 --- a/sys/dev/qlnx/qlnxe/qlnx_def.h +++ b/sys/dev/qlnx/qlnxe/qlnx_def.h @@ -391,7 +391,7 @@ struct qlnx_host { int msix_count; - struct mtx hw_lock; + struct sx hw_lock; /* debug */ diff --git a/sys/dev/qlnx/qlnxe/qlnx_os.c b/sys/dev/qlnx/qlnxe/qlnx_os.c index de64aaef1b4c..2b3732e748fd 100644 --- a/sys/dev/qlnx/qlnxe/qlnx_os.c +++ b/sys/dev/qlnx/qlnxe/qlnx_os.c @@ -763,7 +763,7 @@ qlnx_pci_attach(device_t dev) ha->pci_dev = dev; - mtx_init(&ha->hw_lock, "qlnx_hw_lock", MTX_NETWORK_LOCK, MTX_DEF); + sx_init(&ha->hw_lock, "qlnx_hw_lock"); ha->flags.lock_init = 1; @@ -1207,6 +1207,7 @@ qlnx_init_hw(qlnx_host_t *ha) int rval = 0; struct ecore_hw_prepare_params params; + ha->cdev.ha = ha; ecore_init_struct(&ha->cdev); /* ha->dp_module = ECORE_MSG_PROBE | @@ -1351,7 +1352,7 @@ qlnx_release(qlnx_host_t *ha) pci_release_msi(dev); if (ha->flags.lock_init) { - mtx_destroy(&ha->hw_lock); + sx_destroy(&ha->hw_lock); } if (ha->pci_reg) @@ -5396,11 +5397,11 @@ qlnx_zalloc(uint32_t size) } void -qlnx_barrier(void *p_hwfn) +qlnx_barrier(void *p_dev) { qlnx_host_t *ha; - ha = (qlnx_host_t *)((struct ecore_hwfn *)p_hwfn)->p_dev; + ha = ((struct ecore_dev *) p_dev)->ha; bus_barrier(ha->pci_reg, 0, 0, BUS_SPACE_BARRIER_WRITE); } diff --git a/sys/dev/qlnx/qlnxe/qlnx_os.h b/sys/dev/qlnx/qlnxe/qlnx_os.h index 261283fb6eaf..6d717d0e70bf 100644 --- a/sys/dev/qlnx/qlnxe/qlnx_os.h +++ b/sys/dev/qlnx/qlnxe/qlnx_os.h @@ -130,8 +130,8 @@ MALLOC_DECLARE(M_QLNXBUF); /* * Locks */ -#define QLNX_LOCK(ha) mtx_lock(&ha->hw_lock) -#define QLNX_UNLOCK(ha) mtx_unlock(&ha->hw_lock) +#define QLNX_LOCK(ha) sx_xlock(&ha->hw_lock) +#define QLNX_UNLOCK(ha) sx_xunlock(&ha->hw_lock) /* * structure encapsulating a DMA buffer From nobody Tue May 28 10:17: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 4VpT3Y3txkz5LwPg; Tue, 28 May 2024 10:17:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VpT3Y3NZlz4FNq; Tue, 28 May 2024 10:17:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716891465; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gUfKZdn1ceTBxYxC9zlhavEGKZf9STPWij6Web6PQMY=; b=rwaaVpQN5FK2BqIECe1kIfCNDXEfL6u2AoSXntZNfXXQdofekInuXOcRSmT76KyVekvR9P x3lrL1j0Of3QBuATMWWHy0Hw0SmkkbhwXIf2cn9WmfRDhOhwnzNlgLdJSdylZP0kNRl8qk cmjQ2eNgJNHrUH5HaJcrZLNueDEBy0szulmF+9Qdd5LExyMgb9lkNPiNoRNE/W8TaSsop5 fA/P5HwNCKJwVTHpNWTvD+TXvqGcyhV3hIXwiamQqMzN0mW6ORkPDnbCYh+GTK0JE+jtvL fCSJDNkHH6wBr1ed+N3inx7npnWgN7OT9pPs05O0Arky2XZ49NYQvcYHoXyYrg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1716891465; a=rsa-sha256; cv=none; b=Ibg0ESIIUBxWc3ZvVPcEF/Yhc4PAcQiEF40zaAkkJpXL0DvjJTAiik+b7EfUi8rkUfOqEJ lZgPNFGVoWhzF4RlWHXLNO+QNalpfNO/3EWGtTuMUpIE1o29V8CkSg5DFaTit0KesWrpQ4 2bOnoj3XXLOeH8fEb+UjlG8HZZ8TsnM33uagdGq6iau4D/hBXrTLsuTnWgshhadsDVSpTX nrbi+M0LoPNuExOe7hjQqHcj8nKY4cUvYYKSrnoy/W3VstiNxclLMVbOv5CawoNzXYnbcR RSkQ/4A0za0AWPOHEhbtaf5OMj/4foGnZGY1lTeJoMoQG6zy1zRmroPVB1V8ZA== 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=1716891465; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gUfKZdn1ceTBxYxC9zlhavEGKZf9STPWij6Web6PQMY=; b=kpf0qnutP0Girxj2ryvDHPtO0pRpTGDaWj6jZMVJcTCOzgofYzfSgX4L52Q/9/au69IWPt 70cM+AGU09QYbImMiwS+SRv3C8EqjIUb+kef+U8foNqfPwjZzrWcAPhZtBUoKxFUOWkFTq 93GofTxt9NpHBRxGuLvQOlugpgv4WGnzmACOLFS4cs6elQCPtRssrsdnQX/ncvOsaoC8wc CCqZt09xjADyH1PYjfujKsHS2Lghg/jVqLuKeyNn3eHnWU499n45q0pLdTSpXYsgP/F7os B+ZoxN3jh3g4ldXFSvpHa0LZ6rQR1oR5zRBr9QiUw4XnPLPmCtacIkSdCGZ15Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VpT3Y2sRWz1N4S; Tue, 28 May 2024 10:17:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44SAHj3G010623; Tue, 28 May 2024 10:17:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44SAHjum010620; Tue, 28 May 2024 10:17:45 GMT (envelope-from git) Date: Tue, 28 May 2024 10:17:45 GMT Message-Id: <202405281017.44SAHjum010620@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Sumit Saxena Subject: git: 35b53f8c989f - main - bnxt_en: Add PFC, ETS & App TLVs protocols support List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ssaxena X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 35b53f8c989f62286aad075ef2e97bba358144f8 Auto-Submitted: auto-generated The branch main has been updated by ssaxena: URL: https://cgit.FreeBSD.org/src/commit/?id=35b53f8c989f62286aad075ef2e97bba358144f8 commit 35b53f8c989f62286aad075ef2e97bba358144f8 Author: Chandrakanth patil AuthorDate: 2024-04-28 09:24:30 +0000 Commit: Sumit Saxena CommitDate: 2024-05-28 10:15:29 +0000 bnxt_en: Add PFC, ETS & App TLVs protocols support Created new directory "bnxt_en" in /dev/bnxt and /modules/bnxt and moved source files and Makefile into respective directory. ETS support: - Added new files bnxt_dcb.c & bnxt_dcb.h - Added sysctl node 'dcb' and created handlers 'ets' and 'dcbx_cap' - Add logic to validate user input and configure ETS in the firmware - Updated makefile to include bnxt_dcb.c & bnxt_dcb.h PFC support: - Created sysctl handlers 'pfc' under node 'dcb' - Added logic to validate user input and configure PFC in the firmware. App TLV support: - Created 3 new sysctl handlers under node 'dcb' - set_apptlv (write only): Sets a specified TLV - del_apptlv (write only): Deletes a specified TLV - list_apptlv (read only): Lists all APP TLVs configured - Added logic to validate user input and configure APP TLVs in the firmware. Added Below DCB ops for management interface: - Set PFC, Get PFC, Set ETS, Get ETS, Add App_TLV, Del App_TLV Lst App_TLV Reviewed by: imp Approved by: imp Differential revision: https://reviews.freebsd.org/D45005 --- sys/dev/bnxt/{ => bnxt_en}/bnxt.h | 196 +++++-- sys/dev/bnxt/bnxt_en/bnxt_dcb.c | 861 ++++++++++++++++++++++++++++ sys/dev/bnxt/bnxt_en/bnxt_dcb.h | 127 ++++ sys/dev/bnxt/{ => bnxt_en}/bnxt_hwrm.c | 408 ++++++++----- sys/dev/bnxt/{ => bnxt_en}/bnxt_hwrm.h | 7 +- sys/dev/bnxt/{ => bnxt_en}/bnxt_ioctl.h | 0 sys/dev/bnxt/{ => bnxt_en}/bnxt_mgmt.c | 69 ++- sys/dev/bnxt/{ => bnxt_en}/bnxt_mgmt.h | 31 +- sys/dev/bnxt/{ => bnxt_en}/bnxt_sysctl.c | 429 +++++++++++++- sys/dev/bnxt/{ => bnxt_en}/bnxt_sysctl.h | 2 + sys/dev/bnxt/{ => bnxt_en}/bnxt_txrx.c | 0 sys/dev/bnxt/{ => bnxt_en}/convert_hsi.pl | 0 sys/dev/bnxt/{ => bnxt_en}/hsi_struct_def.h | 0 sys/dev/bnxt/{ => bnxt_en}/if_bnxt.c | 48 +- sys/modules/bnxt/{ => bnxt_en}/Makefile | 4 +- 15 files changed, 1978 insertions(+), 204 deletions(-) diff --git a/sys/dev/bnxt/bnxt.h b/sys/dev/bnxt/bnxt_en/bnxt.h similarity index 78% rename from sys/dev/bnxt/bnxt.h rename to sys/dev/bnxt/bnxt_en/bnxt.h index 0547bae91e09..e68943fd6286 100644 --- a/sys/dev/bnxt/bnxt.h +++ b/sys/dev/bnxt/bnxt_en/bnxt.h @@ -44,6 +44,7 @@ #include #include "hsi_struct_def.h" +#include "bnxt_dcb.h" /* PCI IDs */ #define BROADCOM_VENDOR_ID 0x14E4 @@ -359,9 +360,9 @@ enum bnxt_cp_type { BNXT_SHARED }; -struct bnxt_cos_queue { - uint8_t id; - uint8_t profile; +struct bnxt_queue_info { + uint8_t queue_id; + uint8_t queue_profile; }; struct bnxt_func_info { @@ -532,6 +533,13 @@ struct bnxt_ver_info { uint8_t hwrm_min_major; uint8_t hwrm_min_minor; uint8_t hwrm_min_update; + uint64_t fw_ver_code; +#define BNXT_FW_VER_CODE(maj, min, bld, rsv) \ + ((uint64_t)(maj) << 48 | (uint64_t)(min) << 32 | (uint64_t)(bld) << 16 | (rsv)) +#define BNXT_FW_MAJ(softc) ((softc)->ver_info->fw_ver_code >> 48) +#define BNXT_FW_MIN(softc) (((softc)->ver_info->fw_ver_code >> 32) & 0xffff) +#define BNXT_FW_BLD(softc) (((softc)->ver_info->fw_ver_code >> 16) & 0xffff) +#define BNXT_FW_RSV(softc) (((softc)->ver_info->fw_ver_code) & 0xffff) struct sysctl_ctx_list ver_ctx; struct sysctl_oid *ver_oid; @@ -644,38 +652,52 @@ struct bnxt_ctx_mem_info { }; struct bnxt_hw_resc { - uint16_t min_rsscos_ctxs; - uint16_t max_rsscos_ctxs; - uint16_t min_cp_rings; - uint16_t max_cp_rings; - uint16_t resv_cp_rings; - uint16_t min_tx_rings; - uint16_t max_tx_rings; - uint16_t resv_tx_rings; - uint16_t max_tx_sch_inputs; - uint16_t min_rx_rings; - uint16_t max_rx_rings; - uint16_t resv_rx_rings; - uint16_t min_hw_ring_grps; - uint16_t max_hw_ring_grps; - uint16_t resv_hw_ring_grps; - uint16_t min_l2_ctxs; - uint16_t max_l2_ctxs; - uint16_t min_vnics; - uint16_t max_vnics; - uint16_t resv_vnics; - uint16_t min_stat_ctxs; - uint16_t max_stat_ctxs; - uint16_t resv_stat_ctxs; - uint16_t max_nqs; - uint16_t max_irqs; - uint16_t resv_irqs; + uint16_t min_rsscos_ctxs; + uint16_t max_rsscos_ctxs; + uint16_t min_cp_rings; + uint16_t max_cp_rings; + uint16_t resv_cp_rings; + uint16_t min_tx_rings; + uint16_t max_tx_rings; + uint16_t resv_tx_rings; + uint16_t max_tx_sch_inputs; + uint16_t min_rx_rings; + uint16_t max_rx_rings; + uint16_t resv_rx_rings; + uint16_t min_hw_ring_grps; + uint16_t max_hw_ring_grps; + uint16_t resv_hw_ring_grps; + uint16_t min_l2_ctxs; + uint16_t max_l2_ctxs; + uint16_t min_vnics; + uint16_t max_vnics; + uint16_t resv_vnics; + uint16_t min_stat_ctxs; + uint16_t max_stat_ctxs; + uint16_t resv_stat_ctxs; + uint16_t max_nqs; + uint16_t max_irqs; + uint16_t resv_irqs; +} + +enum bnxt_type_ets { + BNXT_TYPE_ETS_TSA = 0, + BNXT_TYPE_ETS_PRI2TC, + BNXT_TYPE_ETS_TCBW, + BNXT_TYPE_ETS_MAX }; -#define BNXT_LLQ(q_profile) \ - ((q_profile) == HWRM_QUEUE_QPORTCFG_OUTPUT_QUEUE_ID0_SERVICE_PROFILE_LOSSLESS_ROCE) -#define BNXT_CNPQ(q_profile) \ - ((q_profile) == HWRM_QUEUE_QPORTCFG_OUTPUT_QUEUE_ID0_SERVICE_PROFILE_LOSSY_ROCE_CNP) +static const char *const BNXT_ETS_TYPE_STR[] = { + "tsa", + "pri2tc", + "tcbw", +}; + +static const char *const BNXT_ETS_HELP_STR[] = { + "X is 1 (strict), 0 (ets)", + "TC values for pri 0 to 7", + "TC BW values for pri 0 to 7, Sum should be 100", +}; #define BNXT_HWRM_MAX_REQ_LEN (softc->hwrm_max_req_len) @@ -684,6 +706,10 @@ struct bnxt_softc_list { struct bnxt_softc *softc; }; +#ifndef BIT_ULL +#define BIT_ULL(nr) (1ULL << (nr)) +#endif + struct bnxt_softc { device_t dev; if_ctx_t ctx; @@ -710,6 +736,8 @@ struct bnxt_softc { #define BNXT_FLAG_CHIP_P5 0x0020 #define BNXT_FLAG_TPA 0x0040 #define BNXT_FLAG_FW_CAP_EXT_STATS 0x0080 +#define BNXT_FLAG_MULTI_HOST 0x0100 +#define BNXT_FLAG_MULTI_ROOT 0x0200 uint32_t flags; #define BNXT_STATE_LINK_CHANGE (0) #define BNXT_STATE_MAX (BNXT_STATE_LINK_CHANGE + 1) @@ -732,13 +760,23 @@ struct bnxt_softc { uint16_t hwrm_max_ext_req_len; uint32_t hwrm_spec_code; -#define BNXT_MAX_COS_QUEUE 8 +#define BNXT_MAX_QUEUE 8 uint8_t max_tc; - uint8_t max_lltc; /* lossless TCs */ - struct bnxt_cos_queue q_info[BNXT_MAX_COS_QUEUE]; - uint8_t tc_to_qidx[BNXT_MAX_COS_QUEUE]; - uint8_t q_ids[BNXT_MAX_COS_QUEUE]; - uint8_t max_q; + uint8_t max_lltc; + struct bnxt_queue_info tx_q_info[BNXT_MAX_QUEUE]; + struct bnxt_queue_info rx_q_info[BNXT_MAX_QUEUE]; + uint8_t tc_to_qidx[BNXT_MAX_QUEUE]; + uint8_t tx_q_ids[BNXT_MAX_QUEUE]; + uint8_t rx_q_ids[BNXT_MAX_QUEUE]; + uint8_t tx_max_q; + uint8_t rx_max_q; + uint8_t is_asym_q; + + struct bnxt_ieee_ets *ieee_ets; + struct bnxt_ieee_pfc *ieee_pfc; + uint8_t dcbx_cap; + uint8_t default_pri; + uint8_t max_dscp_value; uint64_t admin_ticks; struct iflib_dma_info hw_rx_port_stats; @@ -782,6 +820,8 @@ struct bnxt_softc { struct sysctl_oid *hw_lro_oid; struct sysctl_ctx_list flow_ctrl_ctx; struct sysctl_oid *flow_ctrl_oid; + struct sysctl_ctx_list dcb_ctx; + struct sysctl_oid *dcb_oid; struct bnxt_ver_info *ver_info; struct bnxt_nvram_info *nvm_info; @@ -796,13 +836,78 @@ struct bnxt_softc { uint16_t tx_coal_usecs; uint16_t tx_coal_usecs_irq; uint16_t tx_coal_frames; - uint16_t tx_coal_frames_irq; + uint16_t tx_coal_frames_irq; #define BNXT_USEC_TO_COAL_TIMER(x) ((x) * 25 / 2) #define BNXT_DEF_STATS_COAL_TICKS 1000000 #define BNXT_MIN_STATS_COAL_TICKS 250000 #define BNXT_MAX_STATS_COAL_TICKS 1000000 + uint64_t fw_cap; + #define BNXT_FW_CAP_SHORT_CMD BIT_ULL(0) + #define BNXT_FW_CAP_LLDP_AGENT BIT_ULL(1) + #define BNXT_FW_CAP_DCBX_AGENT BIT_ULL(2) + #define BNXT_FW_CAP_NEW_RM BIT_ULL(3) + #define BNXT_FW_CAP_IF_CHANGE BIT_ULL(4) + #define BNXT_FW_CAP_LINK_ADMIN BIT_ULL(5) + #define BNXT_FW_CAP_VF_RES_MIN_GUARANTEED BIT_ULL(6) + #define BNXT_FW_CAP_KONG_MB_CHNL BIT_ULL(7) + #define BNXT_FW_CAP_ADMIN_MTU BIT_ULL(8) + #define BNXT_FW_CAP_ADMIN_PF BIT_ULL(9) + #define BNXT_FW_CAP_OVS_64BIT_HANDLE BIT_ULL(10) + #define BNXT_FW_CAP_TRUSTED_VF BIT_ULL(11) + #define BNXT_FW_CAP_VF_VNIC_NOTIFY BIT_ULL(12) + #define BNXT_FW_CAP_ERROR_RECOVERY BIT_ULL(13) + #define BNXT_FW_CAP_PKG_VER BIT_ULL(14) + #define BNXT_FW_CAP_CFA_ADV_FLOW BIT_ULL(15) + #define BNXT_FW_CAP_CFA_RFS_RING_TBL_IDX_V2 BIT_ULL(16) + #define BNXT_FW_CAP_PCIE_STATS_SUPPORTED BIT_ULL(17) + #define BNXT_FW_CAP_EXT_STATS_SUPPORTED BIT_ULL(18) + #define BNXT_FW_CAP_SECURE_MODE BIT_ULL(19) + #define BNXT_FW_CAP_ERR_RECOVER_RELOAD BIT_ULL(20) + #define BNXT_FW_CAP_HOT_RESET BIT_ULL(21) + #define BNXT_FW_CAP_CRASHDUMP BIT_ULL(23) + #define BNXT_FW_CAP_VLAN_RX_STRIP BIT_ULL(24) + #define BNXT_FW_CAP_VLAN_TX_INSERT BIT_ULL(25) + #define BNXT_FW_CAP_EXT_HW_STATS_SUPPORTED BIT_ULL(26) + #define BNXT_FW_CAP_CFA_EEM BIT_ULL(27) + #define BNXT_FW_CAP_DBG_QCAPS BIT_ULL(29) + #define BNXT_FW_CAP_RING_MONITOR BIT_ULL(30) + #define BNXT_FW_CAP_ECN_STATS BIT_ULL(31) + #define BNXT_FW_CAP_TRUFLOW BIT_ULL(32) + #define BNXT_FW_CAP_VF_CFG_FOR_PF BIT_ULL(33) + #define BNXT_FW_CAP_PTP_PPS BIT_ULL(34) + #define BNXT_FW_CAP_HOT_RESET_IF BIT_ULL(35) + #define BNXT_FW_CAP_LIVEPATCH BIT_ULL(36) + #define BNXT_FW_CAP_NPAR_1_2 BIT_ULL(37) + #define BNXT_FW_CAP_RSS_HASH_TYPE_DELTA BIT_ULL(38) + #define BNXT_FW_CAP_PTP_RTC BIT_ULL(39) + #define BNXT_FW_CAP_TRUFLOW_EN BIT_ULL(40) + #define BNXT_TRUFLOW_EN(bp) ((bp)->fw_cap & BNXT_FW_CAP_TRUFLOW_EN) + #define BNXT_FW_CAP_RX_ALL_PKT_TS BIT_ULL(41) + #define BNXT_FW_CAP_BACKING_STORE_V2 BIT_ULL(42) + #define BNXT_FW_CAP_DBR_SUPPORTED BIT_ULL(43) + #define BNXT_FW_CAP_GENERIC_STATS BIT_ULL(44) + #define BNXT_FW_CAP_DBR_PACING_SUPPORTED BIT_ULL(45) + #define BNXT_FW_CAP_PTP_PTM BIT_ULL(46) + #define BNXT_FW_CAP_CFA_NTUPLE_RX_EXT_IP_PROTO BIT_ULL(47) + #define BNXT_FW_CAP_ENABLE_RDMA_SRIOV BIT_ULL(48) + #define BNXT_FW_CAP_RSS_TCAM BIT_ULL(49) + uint32_t lpi_tmr_lo; + uint32_t lpi_tmr_hi; + /* copied from flags and flags2 in hwrm_port_phy_qcaps_output */ + uint16_t phy_flags; +#define BNXT_PHY_FL_EEE_CAP HWRM_PORT_PHY_QCAPS_OUTPUT_FLAGS_EEE_SUPPORTED +#define BNXT_PHY_FL_EXT_LPBK HWRM_PORT_PHY_QCAPS_OUTPUT_FLAGS_EXTERNAL_LPBK_SUPPORTED +#define BNXT_PHY_FL_AN_PHY_LPBK HWRM_PORT_PHY_QCAPS_OUTPUT_FLAGS_AUTONEG_LPBK_SUPPORTED +#define BNXT_PHY_FL_SHARED_PORT_CFG HWRM_PORT_PHY_QCAPS_OUTPUT_FLAGS_SHARED_PHY_CFG_SUPPORTED +#define BNXT_PHY_FL_PORT_STATS_NO_RESET HWRM_PORT_PHY_QCAPS_OUTPUT_FLAGS_CUMULATIVE_COUNTERS_ON_RESET +#define BNXT_PHY_FL_NO_PHY_LPBK HWRM_PORT_PHY_QCAPS_OUTPUT_FLAGS_LOCAL_LPBK_NOT_SUPPORTED +#define BNXT_PHY_FL_FW_MANAGED_LKDN HWRM_PORT_PHY_QCAPS_OUTPUT_FLAGS_FW_MANAGED_LINK_DOWN +#define BNXT_PHY_FL_NO_FCS HWRM_PORT_PHY_QCAPS_OUTPUT_FLAGS_NO_FCS +#define BNXT_PHY_FL_NO_PAUSE (HWRM_PORT_PHY_QCAPS_OUTPUT_FLAGS2_PAUSE_UNSUPPORTED << 8) +#define BNXT_PHY_FL_NO_PFC (HWRM_PORT_PHY_QCAPS_OUTPUT_FLAGS2_PFC_UNSUPPORTED << 8) +#define BNXT_PHY_FL_BANK_SEL (HWRM_PORT_PHY_QCAPS_OUTPUT_FLAGS2_BANK_ADDR_SUPPORTED << 8) }; struct bnxt_filter_info { @@ -843,6 +948,17 @@ struct bnxt_softc *bnxt_find_dev(uint32_t domain, uint32_t bus, uint32_t dev_fn, int bnxt_read_sfp_module_eeprom_info(struct bnxt_softc *bp, uint16_t i2c_addr, uint16_t page_number, uint8_t bank, bool bank_sel_en, uint16_t start_addr, uint16_t data_length, uint8_t *buf); +void bnxt_dcb_init(struct bnxt_softc *softc); +void bnxt_dcb_free(struct bnxt_softc *softc); +uint8_t bnxt_dcb_setdcbx(struct bnxt_softc *softc, uint8_t mode); +uint8_t bnxt_dcb_getdcbx(struct bnxt_softc *softc); +int bnxt_dcb_ieee_getets(struct bnxt_softc *softc, struct bnxt_ieee_ets *ets); +int bnxt_dcb_ieee_setets(struct bnxt_softc *softc, struct bnxt_ieee_ets *ets); uint8_t get_phy_type(struct bnxt_softc *softc); +int bnxt_dcb_ieee_getpfc(struct bnxt_softc *softc, struct bnxt_ieee_pfc *pfc); +int bnxt_dcb_ieee_setpfc(struct bnxt_softc *softc, struct bnxt_ieee_pfc *pfc); +int bnxt_dcb_ieee_setapp(struct bnxt_softc *softc, struct bnxt_dcb_app *app); +int bnxt_dcb_ieee_delapp(struct bnxt_softc *softc, struct bnxt_dcb_app *app); +int bnxt_dcb_ieee_listapp(struct bnxt_softc *softc, struct bnxt_dcb_app *app, int *num_inputs); #endif /* _BNXT_H */ diff --git a/sys/dev/bnxt/bnxt_en/bnxt_dcb.c b/sys/dev/bnxt/bnxt_en/bnxt_dcb.c new file mode 100644 index 000000000000..e1e0581d3c24 --- /dev/null +++ b/sys/dev/bnxt/bnxt_en/bnxt_dcb.c @@ -0,0 +1,861 @@ +/*- + * Broadcom NetXtreme-C/E network driver. + * + * Copyright (c) 2024 Broadcom, All Rights Reserved. + * The term Broadcom refers to Broadcom Limited and/or its subsidiaries + * + * 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 COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS' + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER 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 "bnxt.h" +#include "bnxt_hwrm.h" +#include "bnxt_dcb.h" +#include "hsi_struct_def.h" + +static int +bnxt_tx_queue_to_tc(struct bnxt_softc *softc, uint8_t queue_id) +{ + int i, j; + + for (i = 0; i < softc->max_tc; i++) { + if (softc->tx_q_info[i].queue_id == queue_id) { + for (j = 0; j < softc->max_tc; j++) { + if (softc->tc_to_qidx[j] == i) + return j; + } + } + } + return -EINVAL; +} + +static int +bnxt_hwrm_queue_pri2cos_cfg(struct bnxt_softc *softc, + struct bnxt_ieee_ets *ets, + uint32_t path_dir) +{ + struct hwrm_queue_pri2cos_cfg_input req = {0}; + struct bnxt_queue_info *q_info; + uint8_t *pri2cos; + int i; + + bnxt_hwrm_cmd_hdr_init(softc, &req, HWRM_QUEUE_PRI2COS_CFG); + + req.flags = htole32(path_dir | HWRM_QUEUE_PRI2COS_CFG_INPUT_FLAGS_IVLAN); + if (path_dir == HWRM_QUEUE_PRI2COS_CFG_INPUT_FLAGS_PATH_BIDIR || + path_dir == HWRM_QUEUE_PRI2COS_CFG_INPUT_FLAGS_PATH_TX) + q_info = softc->tx_q_info; + else + q_info = softc->rx_q_info; + pri2cos = &req.pri0_cos_queue_id; + for (i = 0; i < BNXT_IEEE_8021QAZ_MAX_TCS; i++) { + uint8_t qidx; + + req.enables |= htole32(HWRM_QUEUE_PRI2COS_CFG_INPUT_ENABLES_PRI0_COS_QUEUE_ID << i); + + qidx = softc->tc_to_qidx[ets->prio_tc[i]]; + pri2cos[i] = q_info[qidx].queue_id; + } + return _hwrm_send_message(softc, &req, sizeof(req)); +} + +static int +bnxt_hwrm_queue_pri2cos_qcfg(struct bnxt_softc *softc, struct bnxt_ieee_ets *ets) +{ + struct hwrm_queue_pri2cos_qcfg_output *resp = + (void *)softc->hwrm_cmd_resp.idi_vaddr; + struct hwrm_queue_pri2cos_qcfg_input req = {0}; + int rc; + + bnxt_hwrm_cmd_hdr_init(softc, &req, HWRM_QUEUE_PRI2COS_QCFG); + + req.flags = htole32(HWRM_QUEUE_PRI2COS_QCFG_INPUT_FLAGS_IVLAN); + rc = _hwrm_send_message(softc, &req, sizeof(req)); + if (!rc) { + uint8_t *pri2cos = &resp->pri0_cos_queue_id; + int i; + + for (i = 0; i < BNXT_IEEE_8021QAZ_MAX_TCS; i++) { + uint8_t queue_id = pri2cos[i]; + int tc; + + tc = bnxt_tx_queue_to_tc(softc, queue_id); + if (tc >= 0) + ets->prio_tc[i] = tc; + } + } + return rc; +} + +static int +bnxt_hwrm_queue_cos2bw_cfg(struct bnxt_softc *softc, struct bnxt_ieee_ets *ets, + uint8_t max_tc) +{ + struct hwrm_queue_cos2bw_cfg_input req = {0}; + struct bnxt_cos2bw_cfg cos2bw; + void *data; + int i; + + bnxt_hwrm_cmd_hdr_init(softc, &req, HWRM_QUEUE_COS2BW_CFG); + + for (i = 0; i < max_tc; i++) { + uint8_t qidx = softc->tc_to_qidx[i]; + + req.enables |= + htole32(HWRM_QUEUE_COS2BW_CFG_INPUT_ENABLES_COS_QUEUE_ID0_VALID << qidx); + + memset(&cos2bw, 0, sizeof(cos2bw)); + cos2bw.queue_id = softc->tx_q_info[qidx].queue_id; + if (ets->tc_tsa[i] == BNXT_IEEE_8021QAZ_TSA_STRICT) { + cos2bw.tsa = + HWRM_QUEUE_COS2BW_QCFG_OUTPUT_QUEUE_ID0_TSA_ASSIGN_SP; + cos2bw.pri_lvl = i; + } else { + cos2bw.tsa = + HWRM_QUEUE_COS2BW_QCFG_OUTPUT_QUEUE_ID0_TSA_ASSIGN_ETS; + cos2bw.bw_weight = ets->tc_tx_bw[i]; + /* older firmware requires min_bw to be set to the + * same weight value in percent. + */ + if (BNXT_FW_MAJ(softc) < 218) { + cos2bw.min_bw = + htole32((ets->tc_tx_bw[i] * 100) | + BW_VALUE_UNIT_PERCENT1_100); + } + } + data = &req.unused_0 + qidx * (sizeof(cos2bw) - 4); + memcpy(data, &cos2bw.queue_id, sizeof(cos2bw) - 4); + if (qidx == 0) { + req.queue_id0 = cos2bw.queue_id; + req.unused_0 = 0; + } + } + return _hwrm_send_message(softc, &req, sizeof(req)); +} + +static int +bnxt_hwrm_queue_cos2bw_qcfg(struct bnxt_softc *softc, struct bnxt_ieee_ets *ets) +{ + struct hwrm_queue_cos2bw_qcfg_output *resp = + (void *)softc->hwrm_cmd_resp.idi_vaddr; + struct hwrm_queue_cos2bw_qcfg_input req = {0}; + struct bnxt_cos2bw_cfg cos2bw; + uint8_t *data; + int rc, i; + + bnxt_hwrm_cmd_hdr_init(softc, &req, HWRM_QUEUE_COS2BW_QCFG); + + rc = _hwrm_send_message(softc, &req, sizeof(req)); + if (rc) { + return rc; + } + + data = &resp->queue_id0 + offsetof(struct bnxt_cos2bw_cfg, queue_id); + for (i = 0; i < softc->max_tc; i++, data += sizeof(cos2bw.cfg)) { + int tc; + + memcpy(&cos2bw.cfg, data, sizeof(cos2bw.cfg)); + if (i == 0) + cos2bw.queue_id = resp->queue_id0; + + tc = bnxt_tx_queue_to_tc(softc, cos2bw.queue_id); + if (tc < 0) + continue; + + if (cos2bw.tsa == HWRM_QUEUE_COS2BW_QCFG_OUTPUT_QUEUE_ID0_TSA_ASSIGN_SP) { + ets->tc_tsa[tc] = BNXT_IEEE_8021QAZ_TSA_STRICT; + } else { + ets->tc_tsa[tc] = BNXT_IEEE_8021QAZ_TSA_ETS; + ets->tc_tx_bw[tc] = cos2bw.bw_weight; + } + } + return 0; +} + +static int +bnxt_queue_remap(struct bnxt_softc *softc, unsigned int lltc_mask) +{ + unsigned long qmap = 0; + int max = softc->max_tc; + int i, j, rc; + + /* Assign lossless TCs first */ + for (i = 0, j = 0; i < max; ) { + if (lltc_mask & (1 << i)) { + if (BNXT_LLQ(softc->rx_q_info[j].queue_profile)) { + softc->tc_to_qidx[i] = j; + __set_bit(j, &qmap); + i++; + } + j++; + continue; + } + i++; + } + + for (i = 0, j = 0; i < max; i++) { + if (lltc_mask & (1 << i)) + continue; + j = find_next_zero_bit(&qmap, max, j); + softc->tc_to_qidx[i] = j; + __set_bit(j, &qmap); + j++; + } + + if (softc->ieee_ets) { + rc = bnxt_hwrm_queue_cos2bw_cfg(softc, softc->ieee_ets, softc->max_tc); + if (rc) { + device_printf(softc->dev, "failed to config BW, rc = %d\n", rc); + return rc; + } + rc = bnxt_hwrm_queue_pri2cos_cfg(softc, softc->ieee_ets, + HWRM_QUEUE_PRI2COS_CFG_INPUT_FLAGS_PATH_BIDIR); + if (rc) { + device_printf(softc->dev, "failed to config prio, rc = %d\n", rc); + return rc; + } + } + return 0; +} + +static int +bnxt_hwrm_queue_pfc_cfg(struct bnxt_softc *softc, struct bnxt_ieee_pfc *pfc) +{ + struct hwrm_queue_pfcenable_cfg_input req = {0}; + struct bnxt_ieee_ets *my_ets = softc->ieee_ets; + unsigned int tc_mask = 0, pri_mask = 0; + uint8_t i, pri, lltc_count = 0; + bool need_q_remap = false; + + if (!my_ets) + return -EINVAL; + + for (i = 0; i < softc->max_tc; i++) { + for (pri = 0; pri < BNXT_IEEE_8021QAZ_MAX_TCS; pri++) { + if ((pfc->pfc_en & (1 << pri)) && + (my_ets->prio_tc[pri] == i)) { + pri_mask |= 1 << pri; + tc_mask |= 1 << i; + } + } + if (tc_mask & (1 << i)) + lltc_count++; + } + + if (lltc_count > softc->max_lltc) { + device_printf(softc->dev, + "Hardware doesn't support %d lossless queues " + "to configure PFC (cap %d)\n", lltc_count, softc->max_lltc); + return -EINVAL; + } + + for (i = 0; i < softc->max_tc; i++) { + if (tc_mask & (1 << i)) { + uint8_t qidx = softc->tc_to_qidx[i]; + + if (!BNXT_LLQ(softc->rx_q_info[qidx].queue_profile)) { + need_q_remap = true; + break; + } + } + } + + if (need_q_remap) + bnxt_queue_remap(softc, tc_mask); + + bnxt_hwrm_cmd_hdr_init(softc, &req, HWRM_QUEUE_PFCENABLE_CFG); + + req.flags = htole32(pri_mask); + return _hwrm_send_message(softc, &req, sizeof(req)); +} + +static int +bnxt_hwrm_queue_pfc_qcfg(struct bnxt_softc *softc, struct bnxt_ieee_pfc *pfc) +{ + struct hwrm_queue_pfcenable_qcfg_output *resp = + (void *)softc->hwrm_cmd_resp.idi_vaddr; + struct hwrm_queue_pfcenable_qcfg_input req = {0}; + uint8_t pri_mask; + int rc; + + bnxt_hwrm_cmd_hdr_init(softc, &req, HWRM_QUEUE_PFCENABLE_QCFG); + + rc = _hwrm_send_message(softc, &req, sizeof(req)); + if (rc) { + return rc; + } + + pri_mask = le32toh(resp->flags); + pfc->pfc_en = pri_mask; + return 0; +} + +static int +bnxt_hwrm_get_dcbx_app(struct bnxt_softc *softc, struct bnxt_dcb_app *app, int *num_inputs) +{ + struct hwrm_fw_get_structured_data_input get = {0}; + struct hwrm_struct_data_dcbx_app *fw_app; + struct hwrm_struct_hdr *data; + struct iflib_dma_info dma_data; + size_t data_len; + int rc, n, i; + + if (softc->hwrm_spec_code < 0x10601) + return 0; + + bnxt_hwrm_cmd_hdr_init(softc, &get, HWRM_FW_GET_STRUCTURED_DATA); + + n = BNXT_IEEE_8021QAZ_MAX_TCS; + data_len = sizeof(*data) + sizeof(*fw_app) * n; + rc = iflib_dma_alloc(softc->ctx, data_len, &dma_data, + BUS_DMA_NOWAIT); + if (rc) + return ENOMEM; + get.dest_data_addr = htole64(dma_data.idi_paddr); + get.structure_id = htole16(HWRM_STRUCT_HDR_STRUCT_ID_DCBX_APP); + get.subtype = htole16(HWRM_STRUCT_DATA_SUBTYPE_HOST_OPERATIONAL); + get.count = 0; + rc = _hwrm_send_message(softc, &get, sizeof(get)); + if (rc) + goto set_app_exit; + + data = (void *)dma_data.idi_vaddr; + fw_app = (struct hwrm_struct_data_dcbx_app *)(data + 1); + + if (data->struct_id != htole16(HWRM_STRUCT_HDR_STRUCT_ID_DCBX_APP)) { + rc = -ENODEV; + goto set_app_exit; + } + + n = data->count; + for (i = 0; i < n; i++, fw_app++) { + app[*num_inputs].priority = fw_app->priority; + app[*num_inputs].protocol = htobe16(fw_app->protocol_id); + app[*num_inputs].selector = fw_app->protocol_selector; + (*num_inputs)++; + } + +set_app_exit: + iflib_dma_free(&dma_data); + return rc; +} + +static int +bnxt_hwrm_set_dcbx_app(struct bnxt_softc *softc, struct bnxt_dcb_app *app, + bool add) +{ + struct hwrm_fw_set_structured_data_input set = {0}; + struct hwrm_fw_get_structured_data_input get = {0}; + struct hwrm_struct_data_dcbx_app *fw_app; + struct hwrm_struct_hdr *data; + struct iflib_dma_info dma_data; + size_t data_len; + int rc, n, i; + + if (softc->hwrm_spec_code < 0x10601) + return 0; + + bnxt_hwrm_cmd_hdr_init(softc, &get, HWRM_FW_GET_STRUCTURED_DATA); + + n = BNXT_IEEE_8021QAZ_MAX_TCS; + data_len = sizeof(*data) + sizeof(*fw_app) * n; + rc = iflib_dma_alloc(softc->ctx, data_len, &dma_data, + BUS_DMA_NOWAIT); + if (rc) + return ENOMEM; + get.dest_data_addr = htole64(dma_data.idi_paddr); + get.structure_id = htole16(HWRM_STRUCT_HDR_STRUCT_ID_DCBX_APP); + get.subtype = htole16(HWRM_STRUCT_DATA_SUBTYPE_HOST_OPERATIONAL); + get.count = 0; + rc = _hwrm_send_message(softc, &get, sizeof(get)); + if (rc) + goto set_app_exit; + + data = (void *)dma_data.idi_vaddr; + fw_app = (struct hwrm_struct_data_dcbx_app *)(data + 1); + + if (data->struct_id != htole16(HWRM_STRUCT_HDR_STRUCT_ID_DCBX_APP)) { + rc = -ENODEV; + goto set_app_exit; + } + + n = data->count; + for (i = 0; i < n; i++, fw_app++) { + if (fw_app->protocol_id == htobe16(app->protocol) && + fw_app->protocol_selector == app->selector && + fw_app->priority == app->priority) { + if (add) + goto set_app_exit; + else + break; + } + } + if (add) { + /* append */ + n++; + fw_app->protocol_id = htobe16(app->protocol); + fw_app->protocol_selector = app->selector; + fw_app->priority = app->priority; + fw_app->valid = 1; + } else { + size_t len = 0; + + /* not found, nothing to delete */ + if (n == i) + goto set_app_exit; + + len = (n - 1 - i) * sizeof(*fw_app); + if (len) + memmove(fw_app, fw_app + 1, len); + n--; + memset(fw_app + n, 0, sizeof(*fw_app)); + } + data->count = n; + data->len = htole16(sizeof(*fw_app) * n); + data->subtype = htole16(HWRM_STRUCT_DATA_SUBTYPE_HOST_OPERATIONAL); + + bnxt_hwrm_cmd_hdr_init(softc, &set, HWRM_FW_SET_STRUCTURED_DATA); + + set.src_data_addr = htole64(dma_data.idi_paddr); + set.data_len = htole16(sizeof(*data) + sizeof(*fw_app) * n); + set.hdr_cnt = 1; + rc = _hwrm_send_message(softc, &set, sizeof(set)); + +set_app_exit: + iflib_dma_free(&dma_data); + return rc; +} + +static int +bnxt_hwrm_queue_dscp_qcaps(struct bnxt_softc *softc) +{ + struct hwrm_queue_dscp_qcaps_output *resp = + (void *)softc->hwrm_cmd_resp.idi_vaddr; + struct hwrm_queue_dscp_qcaps_input req = {0}; + int rc; + + softc->max_dscp_value = 0; + if (softc->hwrm_spec_code < 0x10800 || BNXT_VF(softc)) + return 0; + + bnxt_hwrm_cmd_hdr_init(softc, &req, HWRM_QUEUE_DSCP_QCAPS); + + rc = _hwrm_send_message(softc, &req, sizeof(req)); + if (!rc) { + softc->max_dscp_value = (1 << resp->num_dscp_bits) - 1; + if (softc->max_dscp_value < 0x3f) + softc->max_dscp_value = 0; + } + return rc; +} + +static int +bnxt_hwrm_queue_dscp2pri_qcfg(struct bnxt_softc *softc, struct bnxt_dcb_app *app, int *num_inputs) +{ + struct hwrm_queue_dscp2pri_qcfg_input req = {0}; + struct hwrm_queue_dscp2pri_qcfg_output *resp = + (void *)softc->hwrm_cmd_resp.idi_vaddr; + struct bnxt_dscp2pri_entry *dscp2pri; + struct iflib_dma_info dma_data; + int rc, entry_cnt; + int i; + + if (softc->hwrm_spec_code < 0x10800) + return 0; + + rc = iflib_dma_alloc(softc->ctx, sizeof(*dscp2pri) * 128, &dma_data, + BUS_DMA_NOWAIT); + if (rc) + return ENOMEM; + + dscp2pri = (void *)dma_data.idi_vaddr; + + bnxt_hwrm_cmd_hdr_init(softc, &req, HWRM_QUEUE_DSCP2PRI_QCFG); + + req.dest_data_addr = htole64(dma_data.idi_paddr); + req.dest_data_buffer_size = htole16(sizeof(*dscp2pri) * 64); + req.port_id = htole16(softc->pf.port_id); + rc = _hwrm_send_message(softc, &req, sizeof(req)); + + if (rc) + goto end; + + entry_cnt = le16toh(resp->entry_cnt); + for (i = 0; i < entry_cnt; i++) { + app[*num_inputs].priority = dscp2pri[i].pri; + app[*num_inputs].protocol = dscp2pri[i].dscp; + app[*num_inputs].selector = BNXT_IEEE_8021QAZ_APP_SEL_DSCP; + (*num_inputs)++; + } + +end: + iflib_dma_free(&dma_data); + return rc; +} + +static int +bnxt_hwrm_queue_dscp2pri_cfg(struct bnxt_softc *softc, struct bnxt_dcb_app *app, + bool add) +{ + struct hwrm_queue_dscp2pri_cfg_input req = {0}; + struct bnxt_dscp2pri_entry *dscp2pri; + struct iflib_dma_info dma_data; + int rc; + + if (softc->hwrm_spec_code < 0x10800) + return 0; + + rc = iflib_dma_alloc(softc->ctx, sizeof(*dscp2pri), &dma_data, + BUS_DMA_NOWAIT); + if (rc) + return ENOMEM; + + bnxt_hwrm_cmd_hdr_init(softc, &req, HWRM_QUEUE_DSCP2PRI_CFG); + + req.src_data_addr = htole64(dma_data.idi_paddr); + dscp2pri = (void *)dma_data.idi_vaddr; + dscp2pri->dscp = app->protocol; + if (add) + dscp2pri->mask = 0x3f; + else + dscp2pri->mask = 0; + dscp2pri->pri = app->priority; + req.entry_cnt = htole16(1); + req.port_id = htole16(softc->pf.port_id); + rc = _hwrm_send_message(softc, &req, sizeof(req)); + + iflib_dma_free(&dma_data); + return rc; +} + +static int +bnxt_ets_validate(struct bnxt_softc *softc, struct bnxt_ieee_ets *ets, uint8_t *tc) +{ + int total_ets_bw = 0; + bool zero = false; + uint8_t max_tc = 0; + int i; + + for (i = 0; i < BNXT_IEEE_8021QAZ_MAX_TCS; i++) { + if (ets->prio_tc[i] > softc->max_tc) { + device_printf(softc->dev, "priority to TC mapping exceeds TC count %d\n", + ets->prio_tc[i]); + return -EINVAL; + } + if (ets->prio_tc[i] > max_tc) + max_tc = ets->prio_tc[i]; + + if ((ets->tc_tx_bw[i] || ets->tc_tsa[i]) && i > softc->max_tc) + return -EINVAL; + + switch (ets->tc_tsa[i]) { + case BNXT_IEEE_8021QAZ_TSA_STRICT: + break; + case BNXT_IEEE_8021QAZ_TSA_ETS: + total_ets_bw += ets->tc_tx_bw[i]; + zero = zero || !ets->tc_tx_bw[i]; + break; + default: + return -ENOTSUPP; + } + } + if (total_ets_bw > 100) { + device_printf(softc->dev, "rejecting ETS config exceeding available bandwidth\n"); + return -EINVAL; + } + if (zero && total_ets_bw == 100) { + device_printf(softc->dev, "rejecting ETS config starving a TC\n"); + return -EINVAL; + } + + if (max_tc >= softc->max_tc) + *tc = softc->max_tc; + else + *tc = max_tc + 1; + return 0; +} + +int +bnxt_dcb_ieee_getets(struct bnxt_softc *softc, struct bnxt_ieee_ets *ets) +{ + struct bnxt_ieee_ets *my_ets = softc->ieee_ets; + int rc; + + if (!my_ets) + return 0; + + rc = bnxt_hwrm_queue_cos2bw_qcfg(softc, my_ets); + if (rc) + goto error; + rc = bnxt_hwrm_queue_pri2cos_qcfg(softc, my_ets); + if (rc) + goto error; + + if (ets) { + ets->cbs = my_ets->cbs; + ets->ets_cap = softc->max_tc; + memcpy(ets->tc_tx_bw, my_ets->tc_tx_bw, sizeof(ets->tc_tx_bw)); + memcpy(ets->tc_rx_bw, my_ets->tc_rx_bw, sizeof(ets->tc_rx_bw)); + memcpy(ets->tc_tsa, my_ets->tc_tsa, sizeof(ets->tc_tsa)); + memcpy(ets->prio_tc, my_ets->prio_tc, sizeof(ets->prio_tc)); + } + return 0; +error: + return rc; +} + +int +bnxt_dcb_ieee_setets(struct bnxt_softc *softc, struct bnxt_ieee_ets *ets) +{ + uint8_t max_tc = 0; + int rc; *** 1821 LINES SKIPPED *** From nobody Tue May 28 10:20: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 4VpT6t20cYz5Lx5T; Tue, 28 May 2024 10:20: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 4VpT6t1DtXz4GHg; Tue, 28 May 2024 10:20:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716891638; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=o83YnrGjtl11a4bV+pcZbhYfvoPK9awKt538m0f9uDw=; b=Pk7OLFEoq1ajhLgnKFwKsUNEnSo7johWb/7YGpgWxCcT6jYtmBwpUhSUcgvY40Qp2Pt6mG f36Pi71SYEEuqmTSPfsdnpq5Psds4KikhrEVp847eFaQY6XivUKdAedmEiO8+XDZo8lb17 TtnEar9Xse5LmIMjin7qHSK4MSoZxhLu8q2VqdgvC5ANa0+Uju1d7y+CeLdD7l8WsdGQQ5 4Q7yZo+zEPf4H1bR18mOJbBF/nfxcWHcxJnmDBSHjgTJVT80XN7Gu3+BR91AP8CCLrVO2B 1PMrz0emuFls09sAP+4FRcKZjv/qwTLXT+wsGAmnoY576ZeUADxdQgDuIS3b/Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1716891638; a=rsa-sha256; cv=none; b=LmUyADu1CJFu9Xos+zAtqQ8TIxzHt/E8Fx79zOSJsS/fQ1b7IeYU2cGTi8QJVSGZAZsEoT wGULugH7wWN1jr1OpIOhR1T7j1k8Fh006jyvK2L3pcPFZi7iM0GkaHJZpD+UW2JUYnKsex ybubrIlJj8HxiULCIvkYg40KyKPuMcPYrM/b7iFly2Fn38K+znS50zW2tdc+1zKQY8SwGB +p0cGguAMoR0KIWyfFsLDeBqeFuXGYYoCCjTYu8MUeszhuT5DysPLG7dWekPOXyaWETP4w W/HjMFegQreiiZm7MNdHUuS+rnJ4IBMM/Mhq4o8BOhESNF+Q7Q24DMTVYmfe6g== 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=1716891638; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=o83YnrGjtl11a4bV+pcZbhYfvoPK9awKt538m0f9uDw=; b=gpBoijXcz7qlNLFRZPEBHwRmG6JRmS2QhzzaQor0odw3lJMhPlcMMSUsJoWYxV+QZi+Gka /Ce3qN6+xGbqlWkmymw13F3VCAe6DmBzcNt3j9sV8ckZVmOnWecFJtgNxppA/HdUeH7dF4 V34SmaRF/owAXex3p7/vLsNfvVPgqre7yPLl7FGzGiu70AxQkPisJ9xzQp7NcGTdJyMQao ICArNxvE8vX2jBwuMLdpqWLGbdmopHNYhiMjXyYI0uTRepMELIe27yXysfi1nmFRHW/ouW 109l5+jPSH/lOpliwiHaA16eodA9PF5e0+7wWfOjJP8Tlk9iOtqtL2lScwjlOw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VpT6t0rTGz1NJW; Tue, 28 May 2024 10:20: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 44SAKcmA020811; Tue, 28 May 2024 10:20:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44SAKcPP020808; Tue, 28 May 2024 10:20:38 GMT (envelope-from git) Date: Tue, 28 May 2024 10:20:38 GMT Message-Id: <202405281020.44SAKcPP020808@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Matthew Seaman Subject: git: 4354163e5fe8 - main - Don't package /var/db/locate.database List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: matthew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4354163e5fe8e180f62b892cdc3e51e3d7e4706f Auto-Submitted: auto-generated The branch main has been updated by matthew: URL: https://cgit.FreeBSD.org/src/commit/?id=4354163e5fe8e180f62b892cdc3e51e3d7e4706f commit 4354163e5fe8e180f62b892cdc3e51e3d7e4706f Author: Matthew Seaman AuthorDate: 2024-05-27 08:14:15 +0000 Commit: Matthew Seaman CommitDate: 2024-05-28 10:20:07 +0000 Don't package /var/db/locate.database ... or install an empty file. The locate database is a mutable working file, and unsuitable to be managed by pkg(8). locate(1) copes gracefully with the absence of this file. Running /etc/periodic/weekly/310.locate will create the locate database with the correct ownership and permissions. Having the locate.database file as part of the FreeBSD-runtime package means it gets zeroed if ever that package gets updated, which is excessive, given that updating packages will typically only change a relatively small number of the _filenames_ on the system -- unlike the file contents. Plus it always causes it to flag as modified when verifying checksums, but /var/db/locate.database is expected to be modified by the user. MFC after: 1 week Reviewed by: manu Differential Revision: https://reviews.freebsd.org/D45384 --- etc/Makefile | 4 ---- 1 file changed, 4 deletions(-) diff --git a/etc/Makefile b/etc/Makefile index 848176fef914..f2b37fb02817 100644 --- a/etc/Makefile +++ b/etc/Makefile @@ -88,10 +88,6 @@ distribution: .if ${MK_SENDMAIL} != "no" cd ${.CURDIR}/mail; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \ -T "package=sendmail" ${ETCMAIL_SENDMAIL} ${DESTDIR}/etc/mail -.endif -.if ${MK_LOCATE} != "no" - ${INSTALL} -o nobody -g ${BINGRP} -m 644 -T "package=runtime"\ - /dev/null ${DESTDIR}/var/db/locate.database .endif cd ${.CURDIR}/..; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 \ -T "package=runtime" ${FREEBSD} ${DESTDIR}/ From nobody Tue May 28 10:36: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 4VpTT56DXJz5M06m; Tue, 28 May 2024 10:36: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 4VpTT55drhz4TP2; Tue, 28 May 2024 10:36:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716892585; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EpiL1E1+W9h95cD/O1+jb5eifDcwwoYEUlOxd3ifCns=; b=uQQfrNB+0Bsx21ecsdjPGWzIPZ/+u914z9OITmVcCHw6cAiLCWllleO7xHMIUibAin+VZ7 bs43xSP/CAo4Matt/HlXbECtDwBtNr9FdkOc3Su5Gjg/KhoxaIEsg/NPdLlOjldtepBkOk XRW8ATYa3b/NQISNTVvCNOU6QOicO8avey600xIZTSOdB8xHhqBTvZJ+gp9dEgsPPJONGO K4CAnZeOSpajxkoyRQpKp21v5H+UTfgepoH8NZk0iriC/zwnKX8njcvahubBF/994vtg14 rYwKvqKdGgi09dy8uWZs9M0NhY2vMO/tnDGiTWhqT9JXd8Aa5v2fw+K59OQtrQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1716892585; a=rsa-sha256; cv=none; b=fi6VSnBeYg9g7+m0pKG2h+tdo/XseC3cYrOromSvCjXdwNAHh/egEXQibdSE8xbhM+qyBf saL82vzF5+U/0VXVq9FZT3WpntsNnBSsH1BXZBf63IX+9fVA5Kn5wqJ4nEHf/MOXjxT5Hh KtnWvFi6xjXyOjyTIm+uFjjXAEgZo3sWnWHfKeqki5im97U/8QrFiQ9pQwaviHub0N7/TN t3kd7enwY/wOjQRcyHOi4SE2sQQ0ks5HF2fwomqViBAgaOL+0K+tzIuw427Jv4qtMVMwCV Tck1JgBnYJXo9wrFh5Y7j6MO4Is4OFU/tyMLLued6amoktycarvwdA+9lrPVmw== 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=1716892585; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EpiL1E1+W9h95cD/O1+jb5eifDcwwoYEUlOxd3ifCns=; b=Vx9Ng0fxAeA4AlBLqF7OkQvqpWPusQqN+dPGAu/jzuLDx4hqumRlOoSSRVJzxUjKylQcQq 0gOzPa76qg96pKT2zpNWmYoKgUWXiRgiDCbJWamMqvz6EMC/RUYSEYDwZb6HVVRLxAWCps PHJN0QnxzJgo7vkjRmkfihwqp7HPicZZf3DCaHXPTA3rlHH91mIVpoKa7vNakTXKe552ss aKdh9w1OenS9rYd9r2tgWfDN7NhRg2qRDpayHEdG08prZg6C12Xwq9FkZ1lH2XUDFjQobQ xR1fSuEf1h/ihQCx6uYNsaJlrK7e1huKV5f6iYk81Qu7RQeFXYyFgUGGlseGng== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VpTT54whVz1Nt8; Tue, 28 May 2024 10:36: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 44SAaP9E051804; Tue, 28 May 2024 10:36:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44SAaP3X051801; Tue, 28 May 2024 10:36:25 GMT (envelope-from git) Date: Tue, 28 May 2024 10:36:25 GMT Message-Id: <202405281036.44SAaP3X051801@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Sumit Saxena Subject: git: 050d28e13cde - main - bnxt_en: L2-RoCE driver communication interface List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ssaxena X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 050d28e13cdede7528944c0abf8d0455729c63fd Auto-Submitted: auto-generated The branch main has been updated by ssaxena: URL: https://cgit.FreeBSD.org/src/commit/?id=050d28e13cdede7528944c0abf8d0455729c63fd commit 050d28e13cdede7528944c0abf8d0455729c63fd Author: Chandrakanth patil AuthorDate: 2024-04-28 12:29:34 +0000 Commit: Sumit Saxena CommitDate: 2024-05-28 10:36:10 +0000 bnxt_en: L2-RoCE driver communication interface - Added Aux bus support for RoCE. - Implemented the ulp ops that are required by RoCE driver. - Restructure context memory data structures - DBR pacing support Reviewed by: imp Approved by: imp Differential revision: https://reviews.freebsd.org/D45006 --- sys/dev/bnxt/bnxt_en/bnxt.h | 252 +++++++++++--- sys/dev/bnxt/bnxt_en/bnxt_auxbus_compat.c | 194 +++++++++++ sys/dev/bnxt/bnxt_en/bnxt_auxbus_compat.h | 75 ++++ sys/dev/bnxt/bnxt_en/bnxt_hwrm.c | 488 +++++++++++++++++--------- sys/dev/bnxt/bnxt_en/bnxt_hwrm.h | 7 +- sys/dev/bnxt/bnxt_en/bnxt_sysctl.c | 3 - sys/dev/bnxt/bnxt_en/bnxt_ulp.c | 524 ++++++++++++++++++++++++++++ sys/dev/bnxt/bnxt_en/bnxt_ulp.h | 161 +++++++++ sys/dev/bnxt/bnxt_en/hsi_struct_def.h | 7 +- sys/dev/bnxt/bnxt_en/if_bnxt.c | 551 +++++++++++++++++++++++------- sys/modules/bnxt/bnxt_en/Makefile | 6 +- 11 files changed, 1928 insertions(+), 340 deletions(-) diff --git a/sys/dev/bnxt/bnxt_en/bnxt.h b/sys/dev/bnxt/bnxt_en/bnxt.h index e68943fd6286..ab60ddf74672 100644 --- a/sys/dev/bnxt/bnxt_en/bnxt.h +++ b/sys/dev/bnxt/bnxt_en/bnxt.h @@ -42,9 +42,13 @@ #include #include #include +#include #include "hsi_struct_def.h" #include "bnxt_dcb.h" +#include "bnxt_auxbus_compat.h" + +#define DFLT_HWRM_CMD_TIMEOUT 500 /* PCI IDs */ #define BROADCOM_VENDOR_ID 0x14E4 @@ -90,6 +94,58 @@ #define NETXTREME_E_VF2 0x16d3 #define NETXTREME_E_VF3 0x16dc +#define EVENT_DATA1_RESET_NOTIFY_FATAL(data1) \ + (((data1) & \ + HWRM_ASYNC_EVENT_CMPL_RESET_NOTIFY_EVENT_DATA1_REASON_CODE_MASK) ==\ + HWRM_ASYNC_EVENT_CMPL_RESET_NOTIFY_EVENT_DATA1_REASON_CODE_FW_EXCEPTION_FATAL) + +#define BNXT_EVENT_ERROR_REPORT_TYPE(data1) \ + (((data1) & \ + HWRM_ASYNC_EVENT_CMPL_ERROR_REPORT_BASE_EVENT_DATA1_ERROR_TYPE_MASK) >> \ + HWRM_ASYNC_EVENT_CMPL_ERROR_REPORT_BASE_EVENT_DATA1_ERROR_TYPE_SFT) + +#define BNXT_EVENT_INVALID_SIGNAL_DATA(data2) \ + (((data2) & \ + HWRM_ASYNC_EVENT_CMPL_ERROR_REPORT_INVALID_SIGNAL_EVENT_DATA2_PIN_ID_MASK) >> \ + HWRM_ASYNC_EVENT_CMPL_ERROR_REPORT_INVALID_SIGNAL_EVENT_DATA2_PIN_ID_SFT) + +#define BNXT_EVENT_DBR_EPOCH(data) \ + (((data) & HWRM_ASYNC_EVENT_CMPL_ERROR_REPORT_DOORBELL_DROP_THRESHOLD_EVENT_DATA1_EPOCH_MASK) >> \ + HWRM_ASYNC_EVENT_CMPL_ERROR_REPORT_DOORBELL_DROP_THRESHOLD_EVENT_DATA1_EPOCH_SFT) + +#define BNXT_EVENT_THERMAL_THRESHOLD_TEMP(data2) \ + (((data2) & \ + HWRM_ASYNC_EVENT_CMPL_ERROR_REPORT_THERMAL_EVENT_DATA2_THRESHOLD_TEMP_MASK) >> \ + HWRM_ASYNC_EVENT_CMPL_ERROR_REPORT_THERMAL_EVENT_DATA2_THRESHOLD_TEMP_SFT) + +#define EVENT_DATA2_NVM_ERR_ADDR(data2) \ + (((data2) & \ + HWRM_ASYNC_EVENT_CMPL_ERROR_REPORT_NVM_EVENT_DATA2_ERR_ADDR_MASK) >> \ + HWRM_ASYNC_EVENT_CMPL_ERROR_REPORT_NVM_EVENT_DATA2_ERR_ADDR_SFT) + +#define EVENT_DATA1_THERMAL_THRESHOLD_DIR_INCREASING(data1) \ + (((data1) & \ + HWRM_ASYNC_EVENT_CMPL_ERROR_REPORT_THERMAL_EVENT_DATA1_TRANSITION_DIR) == \ + HWRM_ASYNC_EVENT_CMPL_ERROR_REPORT_THERMAL_EVENT_DATA1_TRANSITION_DIR_INCREASING) + +#define EVENT_DATA1_NVM_ERR_TYPE_WRITE(data1) \ + (((data1) & \ + HWRM_ASYNC_EVENT_CMPL_ERROR_REPORT_NVM_EVENT_DATA1_NVM_ERR_TYPE_MASK) == \ + HWRM_ASYNC_EVENT_CMPL_ERROR_REPORT_NVM_EVENT_DATA1_NVM_ERR_TYPE_WRITE) + +#define EVENT_DATA1_NVM_ERR_TYPE_ERASE(data1) \ + (((data1) & \ + HWRM_ASYNC_EVENT_CMPL_ERROR_REPORT_NVM_EVENT_DATA1_NVM_ERR_TYPE_MASK) == \ + HWRM_ASYNC_EVENT_CMPL_ERROR_REPORT_NVM_EVENT_DATA1_NVM_ERR_TYPE_ERASE) + +#define EVENT_DATA1_THERMAL_THRESHOLD_TYPE(data1) \ + ((data1) & HWRM_ASYNC_EVENT_CMPL_ERROR_REPORT_THERMAL_EVENT_DATA1_THRESHOLD_TYPE_MASK) + +#define BNXT_EVENT_THERMAL_CURRENT_TEMP(data2) \ + ((data2) & HWRM_ASYNC_EVENT_CMPL_ERROR_REPORT_THERMAL_EVENT_DATA2_CURRENT_TEMP_MASK) + +#define INVALID_STATS_CTX_ID -1 + /* Maximum numbers of RX and TX descriptors. iflib requires this to be a power * of two. The hardware has no particular limitation. */ #define BNXT_MAX_RXD ((INT32_MAX >> 1) + 1) @@ -139,16 +195,20 @@ #define DBR_TYPE_PUSH_END (0xdULL << 60) #define DBR_TYPE_NULL (0xfULL << 60) -#define BNXT_MAX_NUM_QUEUES 32 +#define BNXT_MAX_L2_QUEUES 128 +#define BNXT_ROCE_IRQ_COUNT 9 + +#define BNXT_MAX_NUM_QUEUES (BNXT_MAX_L2_QUEUES + BNXT_ROCE_IRQ_COUNT) /* Completion related defines */ #define CMP_VALID(cmp, v_bit) \ ((!!(((struct cmpl_base *)(cmp))->info3_v & htole32(CMPL_BASE_V))) == !!(v_bit) ) /* Chip class phase 5 */ -#define BNXT_CHIP_P5(sc) ((softc->flags & BNXT_FLAG_CHIP_P5)) +#define BNXT_CHIP_P5(sc) ((sc->flags & BNXT_FLAG_CHIP_P5)) #define DB_PF_OFFSET_P5 0x10000 +#define DB_VF_OFFSET_P5 0x4000 #define NQ_VALID(cmp, v_bit) \ ((!!(((nq_cn_t *)(cmp))->v & htole32(NQ_CN_V))) == !!(v_bit) ) @@ -509,10 +569,9 @@ struct bnxt_ver_info { uint8_t hwrm_if_update; char hwrm_if_ver[BNXT_VERSTR_SIZE]; char driver_hwrm_if_ver[BNXT_VERSTR_SIZE]; - char hwrm_fw_ver[BNXT_VERSTR_SIZE]; - char mgmt_fw_ver[BNXT_VERSTR_SIZE]; - char netctrl_fw_ver[BNXT_VERSTR_SIZE]; - char roce_fw_ver[BNXT_VERSTR_SIZE]; + char mgmt_fw_ver[FW_VER_STR_LEN]; + char netctrl_fw_ver[FW_VER_STR_LEN]; + char roce_fw_ver[FW_VER_STR_LEN]; char fw_ver_str[FW_VER_STR_LEN]; char phy_ver[BNXT_VERSTR_SIZE]; char pkg_ver[64]; @@ -589,19 +648,22 @@ struct bnxt_hw_lro { #define MAX_CTX_PAGES (BNXT_PAGE_SIZE / 8) #define MAX_CTX_TOTAL_PAGES (MAX_CTX_PAGES * MAX_CTX_PAGES) + struct bnxt_ring_mem_info { - int nr_pages; - int page_size; - uint16_t flags; + int nr_pages; + int page_size; + uint16_t flags; #define BNXT_RMEM_VALID_PTE_FLAG 1 #define BNXT_RMEM_RING_PTE_FLAG 2 #define BNXT_RMEM_USE_FULL_PAGE_FLAG 4 - uint16_t depth; - uint8_t init_val; - struct iflib_dma_info *pg_arr; - struct iflib_dma_info pg_tbl; - int vmem_size; - void **vmem; + uint16_t depth; + struct bnxt_ctx_mem_type *ctx_mem; + + struct iflib_dma_info *pg_arr; + struct iflib_dma_info pg_tbl; + + int vmem_size; + void **vmem; }; struct bnxt_ctx_pg_info { @@ -612,43 +674,85 @@ struct bnxt_ctx_pg_info { struct bnxt_ctx_pg_info **ctx_pg_tbl; }; +#define BNXT_MAX_TQM_SP_RINGS 1 +#define BNXT_MAX_TQM_FP_LEGACY_RINGS 8 +#define BNXT_MAX_TQM_FP_RINGS 9 +#define BNXT_MAX_TQM_LEGACY_RINGS \ + (BNXT_MAX_TQM_SP_RINGS + BNXT_MAX_TQM_FP_LEGACY_RINGS) +#define BNXT_MAX_TQM_RINGS \ + (BNXT_MAX_TQM_SP_RINGS + BNXT_MAX_TQM_FP_RINGS) + +#define BNXT_BACKING_STORE_CFG_LEGACY_LEN 256 +#define BNXT_BACKING_STORE_CFG_LEN \ + sizeof(struct hwrm_func_backing_store_cfg_input) + +#define BNXT_SET_CTX_PAGE_ATTR(attr) \ +do { \ + if (BNXT_PAGE_SIZE == 0x2000) \ + attr = HWRM_FUNC_BACKING_STORE_CFG_V2_INPUT_SRQ_PG_SIZE_PG_8K; \ + else if (BNXT_PAGE_SIZE == 0x10000) \ + attr = HWRM_FUNC_BACKING_STORE_CFG_V2_INPUT_QPC_PG_SIZE_PG_64K; \ + else \ + attr = HWRM_FUNC_BACKING_STORE_CFG_V2_INPUT_QPC_PG_SIZE_PG_4K; \ +} while (0) + +struct bnxt_ctx_mem_type { + u16 type; + u16 entry_size; + u32 flags; +#define BNXT_CTX_MEM_TYPE_VALID HWRM_FUNC_BACKING_STORE_QCAPS_V2_OUTPUT_FLAGS_TYPE_VALID + u32 instance_bmap; + u8 init_value; + u8 entry_multiple; + u16 init_offset; +#define BNXT_CTX_INIT_INVALID_OFFSET 0xffff + u32 max_entries; + u32 min_entries; + u8 split_entry_cnt; +#define BNXT_MAX_SPLIT_ENTRY 4 + union { + struct { + u32 qp_l2_entries; + u32 qp_qp1_entries; + }; + u32 srq_l2_entries; + u32 cq_l2_entries; + u32 vnic_entries; + struct { + u32 mrav_av_entries; + u32 mrav_num_entries_units; + }; + u32 split[BNXT_MAX_SPLIT_ENTRY]; + }; + struct bnxt_ctx_pg_info *pg_info; +}; + +#define BNXT_CTX_QP HWRM_FUNC_BACKING_STORE_CFG_V2_INPUT_TYPE_QP +#define BNXT_CTX_SRQ HWRM_FUNC_BACKING_STORE_CFG_V2_INPUT_TYPE_SRQ +#define BNXT_CTX_CQ HWRM_FUNC_BACKING_STORE_CFG_V2_INPUT_TYPE_CQ +#define BNXT_CTX_VNIC HWRM_FUNC_BACKING_STORE_CFG_V2_INPUT_TYPE_VNIC +#define BNXT_CTX_STAT HWRM_FUNC_BACKING_STORE_CFG_V2_INPUT_TYPE_STAT +#define BNXT_CTX_STQM HWRM_FUNC_BACKING_STORE_CFG_V2_INPUT_TYPE_SP_TQM_RING +#define BNXT_CTX_FTQM HWRM_FUNC_BACKING_STORE_CFG_V2_INPUT_TYPE_FP_TQM_RING +#define BNXT_CTX_MRAV HWRM_FUNC_BACKING_STORE_CFG_V2_INPUT_TYPE_MRAV +#define BNXT_CTX_TIM HWRM_FUNC_BACKING_STORE_CFG_V2_INPUT_TYPE_TIM +#define BNXT_CTX_TKC HWRM_FUNC_BACKING_STORE_CFG_V2_INPUT_TYPE_TKC +#define BNXT_CTX_RKC HWRM_FUNC_BACKING_STORE_CFG_V2_INPUT_TYPE_RKC +#define BNXT_CTX_MTQM HWRM_FUNC_BACKING_STORE_CFG_V2_INPUT_TYPE_MP_TQM_RING +#define BNXT_CTX_SQDBS HWRM_FUNC_BACKING_STORE_CFG_V2_INPUT_TYPE_SQ_DB_SHADOW +#define BNXT_CTX_RQDBS HWRM_FUNC_BACKING_STORE_CFG_V2_INPUT_TYPE_RQ_DB_SHADOW +#define BNXT_CTX_SRQDBS HWRM_FUNC_BACKING_STORE_CFG_V2_INPUT_TYPE_SRQ_DB_SHADOW +#define BNXT_CTX_CQDBS HWRM_FUNC_BACKING_STORE_CFG_V2_INPUT_TYPE_CQ_DB_SHADOW +#define BNXT_CTX_QTKC HWRM_FUNC_BACKING_STORE_CFG_V2_INPUT_TYPE_QUIC_TKC +#define BNXT_CTX_QRKC HWRM_FUNC_BACKING_STORE_CFG_V2_INPUT_TYPE_QUIC_RKC +#define BNXT_CTX_MAX (BNXT_CTX_QRKC + 1) + struct bnxt_ctx_mem_info { - uint32_t qp_max_entries; - uint16_t qp_min_qp1_entries; - uint16_t qp_max_l2_entries; - uint16_t qp_entry_size; - uint16_t srq_max_l2_entries; - uint32_t srq_max_entries; - uint16_t srq_entry_size; - uint16_t cq_max_l2_entries; - uint32_t cq_max_entries; - uint16_t cq_entry_size; - uint16_t vnic_max_vnic_entries; - uint16_t vnic_max_ring_table_entries; - uint16_t vnic_entry_size; - uint32_t stat_max_entries; - uint16_t stat_entry_size; - uint16_t tqm_entry_size; - uint32_t tqm_min_entries_per_ring; - uint32_t tqm_max_entries_per_ring; - uint32_t mrav_max_entries; - uint16_t mrav_entry_size; - uint16_t tim_entry_size; - uint32_t tim_max_entries; - uint8_t tqm_entries_multiple; - uint8_t ctx_kind_initializer; + u8 tqm_fp_rings_count; - uint32_t flags; + u32 flags; #define BNXT_CTX_FLAG_INITED 0x01 - - struct bnxt_ctx_pg_info qp_mem; - struct bnxt_ctx_pg_info srq_mem; - struct bnxt_ctx_pg_info cq_mem; - struct bnxt_ctx_pg_info vnic_mem; - struct bnxt_ctx_pg_info stat_mem; - struct bnxt_ctx_pg_info mrav_mem; - struct bnxt_ctx_pg_info tim_mem; - struct bnxt_ctx_pg_info *tqm_mem[9]; + struct bnxt_ctx_mem_type ctx_arr[BNXT_CTX_MAX]; }; struct bnxt_hw_resc { @@ -678,7 +782,7 @@ struct bnxt_hw_resc { uint16_t max_nqs; uint16_t max_irqs; uint16_t resv_irqs; -} +}; enum bnxt_type_ets { BNXT_TYPE_ETS_TSA = 0, @@ -710,11 +814,23 @@ struct bnxt_softc_list { #define BIT_ULL(nr) (1ULL << (nr)) #endif +struct bnxt_aux_dev { + struct auxiliary_device aux_dev; + struct bnxt_en_dev *edev; + int id; +}; + +struct bnxt_msix_tbl { + uint32_t entry; + uint32_t vector; +}; + struct bnxt_softc { device_t dev; if_ctx_t ctx; if_softc_ctx_t scctx; if_shared_ctx_t sctx; + if_t ifp; uint32_t domain; uint32_t bus; uint32_t slot; @@ -738,11 +854,16 @@ struct bnxt_softc { #define BNXT_FLAG_FW_CAP_EXT_STATS 0x0080 #define BNXT_FLAG_MULTI_HOST 0x0100 #define BNXT_FLAG_MULTI_ROOT 0x0200 +#define BNXT_FLAG_ROCEV1_CAP 0x0400 +#define BNXT_FLAG_ROCEV2_CAP 0x0800 +#define BNXT_FLAG_ROCE_CAP (BNXT_FLAG_ROCEV1_CAP | BNXT_FLAG_ROCEV2_CAP) uint32_t flags; #define BNXT_STATE_LINK_CHANGE (0) #define BNXT_STATE_MAX (BNXT_STATE_LINK_CHANGE + 1) bitstr_t *state_bv; - uint32_t total_msix; + + uint32_t total_irqs; + struct bnxt_msix_tbl *irq_tbl; struct bnxt_func_info func; struct bnxt_func_qcfg fn_qcfg; @@ -812,6 +933,8 @@ struct bnxt_softc { struct iflib_dma_info def_cp_ring_mem; struct iflib_dma_info def_nq_ring_mem; struct grouptask def_cp_task; + int db_size; + int legacy_db_size; struct bnxt_doorbell_ops db_ops; struct sysctl_ctx_list hw_stats; @@ -908,6 +1031,33 @@ struct bnxt_softc { #define BNXT_PHY_FL_NO_PAUSE (HWRM_PORT_PHY_QCAPS_OUTPUT_FLAGS2_PAUSE_UNSUPPORTED << 8) #define BNXT_PHY_FL_NO_PFC (HWRM_PORT_PHY_QCAPS_OUTPUT_FLAGS2_PFC_UNSUPPORTED << 8) #define BNXT_PHY_FL_BANK_SEL (HWRM_PORT_PHY_QCAPS_OUTPUT_FLAGS2_BANK_ADDR_SUPPORTED << 8) + struct bnxt_aux_dev *aux_dev; + struct net_device *net_dev; + struct mtx en_ops_lock; + uint8_t port_partition_type; + struct bnxt_en_dev *edev; + unsigned long state; +#define BNXT_STATE_OPEN 0 +#define BNXT_STATE_IN_SP_TASK 1 +#define BNXT_STATE_READ_STATS 2 +#define BNXT_STATE_FW_RESET_DET 3 +#define BNXT_STATE_IN_FW_RESET 4 +#define BNXT_STATE_ABORT_ERR 5 +#define BNXT_STATE_FW_FATAL_COND 6 +#define BNXT_STATE_DRV_REGISTERED 7 +#define BNXT_STATE_PCI_CHANNEL_IO_FROZEN 8 +#define BNXT_STATE_NAPI_DISABLED 9 +#define BNXT_STATE_L2_FILTER_RETRY 10 +#define BNXT_STATE_FW_ACTIVATE 11 +#define BNXT_STATE_RECOVER 12 +#define BNXT_STATE_FW_NON_FATAL_COND 13 +#define BNXT_STATE_FW_ACTIVATE_RESET 14 +#define BNXT_STATE_HALF_OPEN 15 +#define BNXT_NO_FW_ACCESS(bp) \ + test_bit(BNXT_STATE_FW_FATAL_COND, &(bp)->state) + struct pci_dev *pdev; + + int fw_reset_state; }; struct bnxt_filter_info { diff --git a/sys/dev/bnxt/bnxt_en/bnxt_auxbus_compat.c b/sys/dev/bnxt/bnxt_en/bnxt_auxbus_compat.c new file mode 100644 index 000000000000..1014d360015a --- /dev/null +++ b/sys/dev/bnxt/bnxt_en/bnxt_auxbus_compat.c @@ -0,0 +1,194 @@ +/*- + * Broadcom NetXtreme-C/E network driver. + * + * Copyright (c) 2024 Broadcom, All Rights Reserved. + * The term Broadcom refers to Broadcom Limited and/or its subsidiaries + * + * 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 COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS' + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER 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 "bnxt_auxbus_compat.h" + +static struct list_head bnxt_aux_bus_dev_list = LINUX_LIST_HEAD_INIT(bnxt_aux_bus_dev_list); +static struct list_head bnxt_aux_bus_drv_list = LINUX_LIST_HEAD_INIT(bnxt_aux_bus_drv_list); +static DEFINE_MUTEX(bnxt_auxbus_lock); + +static const struct auxiliary_device_id *auxiliary_match_id(const struct auxiliary_device_id *id, + const struct auxiliary_device *auxdev) +{ + for (; id->name[0]; id++) { + const char *p = strrchr(dev_name(&auxdev->dev), '.'); + int match_size; + + if (!p) + continue; + match_size = p - dev_name(&auxdev->dev); + + if (strlen(id->name) == match_size && + !strncmp(dev_name(&auxdev->dev), id->name, match_size)) + return id; + } + return NULL; +} + +int auxiliary_device_init(struct auxiliary_device *auxdev) +{ + struct device *dev = &auxdev->dev; + char *modname = KBUILD_MODNAME; + int ret; + + if (!dev->parent) { + pr_err("auxiliary_device has a NULL dev->parent\n"); + return -EINVAL; + } + + if (!auxdev->name) { + pr_err("auxiliary_device has a NULL name\n"); + return -EINVAL; + } + + ret = dev_set_name(dev, "%s.%s.%d", modname, auxdev->name, auxdev->id); + if (ret) { + dev_err(dev, "auxiliary device dev_set_name failed: %d\n", ret); + return ret; + } + + return 0; +} + +int auxiliary_device_add(struct auxiliary_device *auxdev) +{ + const struct auxiliary_device_id *id; + struct auxiliary_driver *auxdrv = NULL; + bool found = true; + int ret = 0; + + mutex_lock(&bnxt_auxbus_lock); + list_for_each_entry(auxdrv, &bnxt_aux_bus_drv_list, list) { + if (auxdrv) { + msleep(2 * 1000); + + id = auxiliary_match_id(auxdrv->id_table, auxdev); + if (id) { + ret = auxdrv->probe(auxdev, id); + if (!ret) + auxdev->dev.driver = &auxdrv->driver; + else + found = false; + break; + } + } + } + + if (found) + list_add_tail(&auxdev->list, &bnxt_aux_bus_dev_list); + mutex_unlock(&bnxt_auxbus_lock); + + return ret; +} + +void auxiliary_device_uninit(struct auxiliary_device *auxdev) +{ + return; +} + +void auxiliary_device_delete(struct auxiliary_device *auxdev) +{ + struct auxiliary_driver *auxdrv; + + mutex_lock(&bnxt_auxbus_lock); + list_for_each_entry(auxdrv, &bnxt_aux_bus_drv_list, list) { + if (auxdev->dev.driver != &auxdrv->driver) + continue; + if (auxdrv->remove) + auxdrv->remove(auxdev); + auxdev->dev.driver = NULL; + } + list_del(&auxdev->list); + mutex_unlock(&bnxt_auxbus_lock); +} + +int auxiliary_driver_register(struct auxiliary_driver *auxdrv) +{ + const struct auxiliary_device_id *id; + struct auxiliary_device *auxdev; + int ret = 0; + + if (WARN_ON(!auxdrv->probe) || WARN_ON(!auxdrv->id_table)) + return -EINVAL; + + if (auxdrv->name) + auxdrv->driver.name = kasprintf(GFP_KERNEL, "%s.%s", KBUILD_MODNAME, + auxdrv->name); + else + auxdrv->driver.name = kasprintf(GFP_KERNEL, "%s", KBUILD_MODNAME); + if (!auxdrv->driver.name) + return -ENOMEM; + + mutex_lock(&bnxt_auxbus_lock); + list_for_each_entry(auxdev, &bnxt_aux_bus_dev_list, list) { + if (auxdev->dev.driver) + continue; + + id = auxiliary_match_id(auxdrv->id_table, auxdev); + if (id) { + ret = auxdrv->probe(auxdev, id); + if (ret) + continue; + auxdev->dev.driver = &auxdrv->driver; + } + } + list_add_tail(&auxdrv->list, &bnxt_aux_bus_drv_list); + mutex_unlock(&bnxt_auxbus_lock); + return 0; +} +EXPORT_SYMBOL(auxiliary_driver_register); + +void auxiliary_driver_unregister(struct auxiliary_driver *auxdrv) +{ + struct auxiliary_device *auxdev; + + /* PF auxiliary devices are added to the list first and then VF devices. + * If we remove PF aux device driver first, it causes failures while + * removing VF driver. + * We need to remove VF auxiliary drivers first, so walk backwards. + */ + mutex_lock(&bnxt_auxbus_lock); + list_for_each_entry_reverse(auxdev, &bnxt_aux_bus_dev_list, list) { + if (auxdev->dev.driver != &auxdrv->driver) + continue; + if (auxdrv->remove) + auxdrv->remove(auxdev); + auxdev->dev.driver = NULL; + } + kfree(auxdrv->driver.name); + list_del(&auxdrv->list); + mutex_unlock(&bnxt_auxbus_lock); +} +EXPORT_SYMBOL(auxiliary_driver_unregister); diff --git a/sys/dev/bnxt/bnxt_en/bnxt_auxbus_compat.h b/sys/dev/bnxt/bnxt_en/bnxt_auxbus_compat.h new file mode 100644 index 000000000000..1d844a67c928 --- /dev/null +++ b/sys/dev/bnxt/bnxt_en/bnxt_auxbus_compat.h @@ -0,0 +1,75 @@ +/*- + * Broadcom NetXtreme-C/E network driver. + * + * Copyright (c) 2024 Broadcom, All Rights Reserved. + * The term Broadcom refers to Broadcom Limited and/or its subsidiaries + * + * 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 COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS' + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER 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 _BNXT_AUXILIARY_COMPAT_H_ +#define _BNXT_AUXILIARY_COMPAT_H_ + +#include +#include + +#define KBUILD_MODNAME "if_bnxt" +#define AUXILIARY_NAME_SIZE 32 + +struct auxiliary_device_id { + char name[AUXILIARY_NAME_SIZE]; + uint64_t driver_data; +}; + +struct auxiliary_device { + struct device dev; + const char *name; + uint32_t id; + struct list_head list; +}; + +struct auxiliary_driver { + int (*probe)(struct auxiliary_device *auxdev, const struct auxiliary_device_id *id); + void (*remove)(struct auxiliary_device *auxdev); + const char *name; + struct device_driver driver; + const struct auxiliary_device_id *id_table; + struct list_head list; +}; + +int auxiliary_device_init(struct auxiliary_device *auxdev); +int auxiliary_device_add(struct auxiliary_device *auxdev); +void auxiliary_device_uninit(struct auxiliary_device *auxdev); +void auxiliary_device_delete(struct auxiliary_device *auxdev); +int auxiliary_driver_register(struct auxiliary_driver *auxdrv); +void auxiliary_driver_unregister(struct auxiliary_driver *auxdrv); + +static inline void *auxiliary_get_drvdata(struct auxiliary_device *auxdev) +{ + return dev_get_drvdata(&auxdev->dev); +} + +static inline void auxiliary_set_drvdata(struct auxiliary_device *auxdev, void *data) +{ + dev_set_drvdata(&auxdev->dev, data); +} +#endif /* _BNXT_AUXILIARY_COMPAT_H_ */ diff --git a/sys/dev/bnxt/bnxt_en/bnxt_hwrm.c b/sys/dev/bnxt/bnxt_en/bnxt_hwrm.c index 6bc56aeb69a0..07834aeca363 100644 --- a/sys/dev/bnxt/bnxt_en/bnxt_hwrm.c +++ b/sys/dev/bnxt/bnxt_en/bnxt_hwrm.c @@ -28,6 +28,7 @@ #include #include +#include #include "bnxt.h" #include "bnxt_hwrm.h" @@ -122,6 +123,10 @@ _hwrm_send_message(struct bnxt_softc *softc, void *msg, uint32_t msg_len) req->seq_id = htole16(softc->hwrm_cmd_seq++); memset(resp, 0, PAGE_SIZE); + if (BNXT_NO_FW_ACCESS(softc) && + (req->req_type != HWRM_FUNC_RESET && req->req_type != HWRM_VER_GET)) + return -EINVAL; + if ((softc->flags & BNXT_FLAG_SHORT_CMD) || msg_len > BNXT_HWRM_MAX_REQ_LEN) { void *short_cmd_req = softc->hwrm_short_cmd_req_addr.idi_vaddr; @@ -313,6 +318,39 @@ qportcfg_exit: return rc; } +static int bnxt_alloc_all_ctx_pg_info(struct bnxt_softc *softc) +{ + struct bnxt_ctx_mem_info *ctx = softc->ctx_mem; + u16 type; + + for (type = 0; type < BNXT_CTX_MAX; type++) { + struct bnxt_ctx_mem_type *ctxm = &ctx->ctx_arr[type]; + int n = 1; + + if (!ctxm->max_entries || ctxm->pg_info) + continue; + + if (ctxm->instance_bmap) + n = hweight32(ctxm->instance_bmap); + ctxm->pg_info = kcalloc(n, sizeof(*ctxm->pg_info), GFP_KERNEL); + if (!ctxm->pg_info) + return -ENOMEM; + } + return 0; +} + +static void bnxt_init_ctx_initializer(struct bnxt_ctx_mem_type *ctxm, + u8 init_val, u8 init_offset, + bool init_mask_set) +{ + ctxm->init_value = init_val; + ctxm->init_offset = BNXT_CTX_INIT_INVALID_OFFSET; + if (init_mask_set) + ctxm->init_offset = init_offset * 4; + else + ctxm->init_value = 0; +} + int bnxt_hwrm_func_backing_store_qcaps(struct bnxt_softc *softc) { struct hwrm_func_backing_store_qcaps_input req = {0}; @@ -320,63 +358,110 @@ int bnxt_hwrm_func_backing_store_qcaps(struct bnxt_softc *softc) (void *)softc->hwrm_cmd_resp.idi_vaddr; int rc; - if (softc->hwrm_spec_code < 0x10902 || BNXT_VF(softc) || softc->ctx_mem) + if (softc->hwrm_spec_code < 0x10902 || softc->ctx_mem) + return 0; + + if (BNXT_VF(softc)) return 0; bnxt_hwrm_cmd_hdr_init(softc, &req, HWRM_FUNC_BACKING_STORE_QCAPS); BNXT_HWRM_LOCK(softc); rc = _hwrm_send_message(softc, &req, sizeof(req)); if (!rc) { - struct bnxt_ctx_pg_info *ctx_pg; + struct bnxt_ctx_mem_type *ctxm; struct bnxt_ctx_mem_info *ctx; - int i; + u8 init_val, init_idx = 0; + u16 init_mask; - ctx = malloc(sizeof(*ctx), M_DEVBUF, M_NOWAIT | M_ZERO); + ctx = softc->ctx_mem; if (!ctx) { - rc = -ENOMEM; - goto ctx_err; + ctx = malloc(sizeof(*ctx), M_DEVBUF, M_NOWAIT | M_ZERO); + if (!ctx) { + rc = -ENOMEM; + goto ctx_err; + } + softc->ctx_mem = ctx; } - ctx_pg = malloc(sizeof(*ctx_pg) * (softc->rx_max_q + 1), - M_DEVBUF, M_NOWAIT | M_ZERO); - if (!ctx_pg) { - free(ctx, M_DEVBUF); - rc = -ENOMEM; - goto ctx_err; + init_val = resp->ctx_kind_initializer; + init_mask = le16_to_cpu(resp->ctx_init_mask); + + ctxm = &ctx->ctx_arr[BNXT_CTX_QP]; + ctxm->max_entries = le32_to_cpu(resp->qp_max_entries); + ctxm->qp_qp1_entries = le16_to_cpu(resp->qp_min_qp1_entries); + ctxm->qp_l2_entries = le16_to_cpu(resp->qp_max_l2_entries); + ctxm->entry_size = le16_to_cpu(resp->qp_entry_size); + bnxt_init_ctx_initializer(ctxm, init_val, resp->qp_init_offset, + (init_mask & (1 << init_idx++)) != 0); + + ctxm = &ctx->ctx_arr[BNXT_CTX_SRQ]; + ctxm->srq_l2_entries = le16_to_cpu(resp->srq_max_l2_entries); + ctxm->max_entries = le32_to_cpu(resp->srq_max_entries); + ctxm->entry_size = le16_to_cpu(resp->srq_entry_size); + bnxt_init_ctx_initializer(ctxm, init_val, resp->srq_init_offset, + (init_mask & (1 << init_idx++)) != 0); + + ctxm = &ctx->ctx_arr[BNXT_CTX_CQ]; + ctxm->cq_l2_entries = le16_to_cpu(resp->cq_max_l2_entries); + ctxm->max_entries = le32_to_cpu(resp->cq_max_entries); + ctxm->entry_size = le16_to_cpu(resp->cq_entry_size); + bnxt_init_ctx_initializer(ctxm, init_val, resp->cq_init_offset, + (init_mask & (1 << init_idx++)) != 0); + + ctxm = &ctx->ctx_arr[BNXT_CTX_VNIC]; + ctxm->vnic_entries = le32_to_cpu(resp->vnic_max_vnic_entries); + ctxm->max_entries = ctxm->vnic_entries + + le16_to_cpu(resp->vnic_max_ring_table_entries); + ctxm->entry_size = le16_to_cpu(resp->vnic_entry_size); + bnxt_init_ctx_initializer(ctxm, init_val, + resp->vnic_init_offset, + (init_mask & (1 << init_idx++)) != 0); + + ctxm = &ctx->ctx_arr[BNXT_CTX_STAT]; + ctxm->max_entries = le32_to_cpu(resp->stat_max_entries); + ctxm->entry_size = le16_to_cpu(resp->stat_entry_size); + bnxt_init_ctx_initializer(ctxm, init_val, + resp->stat_init_offset, + (init_mask & (1 << init_idx++)) != 0); + + ctxm = &ctx->ctx_arr[BNXT_CTX_STQM]; + ctxm->entry_size = le16_to_cpu(resp->tqm_entry_size); + ctxm->min_entries = le32_to_cpu(resp->tqm_min_entries_per_ring); + ctxm->max_entries = le32_to_cpu(resp->tqm_max_entries_per_ring); + ctxm->entry_multiple = resp->tqm_entries_multiple; + if (!ctxm->entry_multiple) + ctxm->entry_multiple = 1; + + memcpy(&ctx->ctx_arr[BNXT_CTX_FTQM], ctxm, sizeof(*ctxm)); + + ctxm = &ctx->ctx_arr[BNXT_CTX_MRAV]; + ctxm->max_entries = le32_to_cpu(resp->mrav_max_entries); + ctxm->entry_size = le16_to_cpu(resp->mrav_entry_size); + ctxm->mrav_num_entries_units = + le16_to_cpu(resp->mrav_num_entries_units); + bnxt_init_ctx_initializer(ctxm, init_val, + resp->mrav_init_offset, + (init_mask & (1 << init_idx++)) != 0); + + ctxm = &ctx->ctx_arr[BNXT_CTX_TIM]; + ctxm->entry_size = le16_to_cpu(resp->tim_entry_size); + ctxm->max_entries = le32_to_cpu(resp->tim_max_entries); + + ctx->tqm_fp_rings_count = resp->tqm_fp_rings_count; + if (!ctx->tqm_fp_rings_count) + ctx->tqm_fp_rings_count = softc->tx_max_q; + else if (ctx->tqm_fp_rings_count > BNXT_MAX_TQM_FP_LEGACY_RINGS) + ctx->tqm_fp_rings_count = BNXT_MAX_TQM_FP_LEGACY_RINGS; + if (ctx->tqm_fp_rings_count == BNXT_MAX_TQM_FP_LEGACY_RINGS && + softc->hwrm_max_ext_req_len >= BNXT_BACKING_STORE_CFG_LEN) { + ctx->tqm_fp_rings_count += resp->tqm_fp_rings_count_ext; + if (ctx->tqm_fp_rings_count > BNXT_MAX_TQM_FP_RINGS) + ctx->tqm_fp_rings_count = BNXT_MAX_TQM_FP_RINGS; } - for (i = 0; i < softc->rx_max_q + 1; i++, ctx_pg++) - ctx->tqm_mem[i] = ctx_pg; - - softc->ctx_mem = ctx; - ctx->qp_max_entries = le32toh(resp->qp_max_entries); - ctx->qp_min_qp1_entries = le16toh(resp->qp_min_qp1_entries); - ctx->qp_max_l2_entries = le16toh(resp->qp_max_l2_entries); - ctx->qp_entry_size = le16toh(resp->qp_entry_size); - ctx->srq_max_l2_entries = le16toh(resp->srq_max_l2_entries); - ctx->srq_max_entries = le32toh(resp->srq_max_entries); - ctx->srq_entry_size = le16toh(resp->srq_entry_size); - ctx->cq_max_l2_entries = le16toh(resp->cq_max_l2_entries); - ctx->cq_max_entries = le32toh(resp->cq_max_entries); - ctx->cq_entry_size = le16toh(resp->cq_entry_size); - ctx->vnic_max_vnic_entries = - le16toh(resp->vnic_max_vnic_entries); - ctx->vnic_max_ring_table_entries = - le16toh(resp->vnic_max_ring_table_entries); - ctx->vnic_entry_size = le16toh(resp->vnic_entry_size); - ctx->stat_max_entries = le32toh(resp->stat_max_entries); - ctx->stat_entry_size = le16toh(resp->stat_entry_size); - ctx->tqm_entry_size = le16toh(resp->tqm_entry_size); - ctx->tqm_min_entries_per_ring = - le32toh(resp->tqm_min_entries_per_ring); - ctx->tqm_max_entries_per_ring = - le32toh(resp->tqm_max_entries_per_ring); - ctx->tqm_entries_multiple = resp->tqm_entries_multiple; - if (!ctx->tqm_entries_multiple) - ctx->tqm_entries_multiple = 1; - ctx->mrav_max_entries = le32toh(resp->mrav_max_entries); - ctx->mrav_entry_size = le16toh(resp->mrav_entry_size); - ctx->tim_entry_size = le16toh(resp->tim_entry_size); - ctx->tim_max_entries = le32toh(resp->tim_max_entries); - ctx->ctx_kind_initializer = resp->ctx_kind_initializer; + ctxm = &ctx->ctx_arr[BNXT_CTX_FTQM]; + memcpy(ctxm, &ctx->ctx_arr[BNXT_CTX_STQM], sizeof(*ctxm)); + ctxm->instance_bmap = (1 << ctx->tqm_fp_rings_count) - 1; + + rc = bnxt_alloc_all_ctx_pg_info(softc); } else { rc = 0; } @@ -419,150 +504,213 @@ int bnxt_hwrm_func_backing_store_cfg(struct bnxt_softc *softc, uint32_t enables) struct hwrm_func_backing_store_cfg_input req = {0}; struct bnxt_ctx_mem_info *ctx = softc->ctx_mem; struct bnxt_ctx_pg_info *ctx_pg; - uint32_t *num_entries, req_len = sizeof(req); - uint64_t *pg_dir; - uint8_t *pg_attr; - int i, rc; - uint32_t ena; + struct bnxt_ctx_mem_type *ctxm; + u32 req_len = sizeof(req); + __le32 *num_entries; + u32 ena, flags = 0; + __le64 *pg_dir; + u8 *pg_attr; + int i; if (!ctx) return 0; + if (req_len > softc->hwrm_max_ext_req_len) + req_len = BNXT_BACKING_STORE_CFG_LEGACY_LEN; + bnxt_hwrm_cmd_hdr_init(softc, &req, HWRM_FUNC_BACKING_STORE_CFG); req.enables = htole32(enables); if (enables & HWRM_FUNC_BACKING_STORE_CFG_INPUT_ENABLES_QP) { - ctx_pg = &ctx->qp_mem; - req.qp_num_entries = htole32(ctx_pg->entries); - req.qp_num_qp1_entries = htole16(ctx->qp_min_qp1_entries); - req.qp_num_l2_entries = htole16(ctx->qp_max_l2_entries); - req.qp_entry_size = htole16(ctx->qp_entry_size); + ctxm = &ctx->ctx_arr[BNXT_CTX_QP]; + ctx_pg = ctxm->pg_info; + req.qp_num_entries = cpu_to_le32(ctx_pg->entries); + req.qp_num_qp1_entries = cpu_to_le16(ctxm->qp_qp1_entries); + req.qp_num_l2_entries = cpu_to_le16(ctxm->qp_l2_entries); + req.qp_entry_size = cpu_to_le16(ctxm->entry_size); bnxt_hwrm_set_pg_attr(&ctx_pg->ring_mem, &req.qpc_pg_size_qpc_lvl, &req.qpc_page_dir); } if (enables & HWRM_FUNC_BACKING_STORE_CFG_INPUT_ENABLES_SRQ) { - ctx_pg = &ctx->srq_mem; - req.srq_num_entries = htole32(ctx_pg->entries); - req.srq_num_l2_entries = htole16(ctx->srq_max_l2_entries); - req.srq_entry_size = htole16(ctx->srq_entry_size); + ctxm = &ctx->ctx_arr[BNXT_CTX_SRQ]; + ctx_pg = ctxm->pg_info; + req.srq_num_entries = cpu_to_le32(ctx_pg->entries); + req.srq_num_l2_entries = cpu_to_le16(ctxm->srq_l2_entries); + req.srq_entry_size = cpu_to_le16(ctxm->entry_size); bnxt_hwrm_set_pg_attr(&ctx_pg->ring_mem, &req.srq_pg_size_srq_lvl, &req.srq_page_dir); } if (enables & HWRM_FUNC_BACKING_STORE_CFG_INPUT_ENABLES_CQ) { - ctx_pg = &ctx->cq_mem; - req.cq_num_entries = htole32(ctx_pg->entries); - req.cq_num_l2_entries = htole16(ctx->cq_max_l2_entries); - req.cq_entry_size = htole16(ctx->cq_entry_size); - bnxt_hwrm_set_pg_attr(&ctx_pg->ring_mem, &req.cq_pg_size_cq_lvl, + ctxm = &ctx->ctx_arr[BNXT_CTX_CQ]; + ctx_pg = ctxm->pg_info; + req.cq_num_entries = cpu_to_le32(ctx_pg->entries); + req.cq_num_l2_entries = cpu_to_le16(ctxm->cq_l2_entries); + req.cq_entry_size = cpu_to_le16(ctxm->entry_size); + bnxt_hwrm_set_pg_attr(&ctx_pg->ring_mem, + &req.cq_pg_size_cq_lvl, &req.cq_page_dir); } if (enables & HWRM_FUNC_BACKING_STORE_CFG_INPUT_ENABLES_MRAV) { - ctx_pg = &ctx->mrav_mem; - req.mrav_num_entries = htole32(ctx_pg->entries); - req.mrav_entry_size = htole16(ctx->mrav_entry_size); + ctxm = &ctx->ctx_arr[BNXT_CTX_MRAV]; + ctx_pg = ctxm->pg_info; + req.mrav_num_entries = cpu_to_le32(ctx_pg->entries); + if (ctxm->mrav_num_entries_units) + flags |= + HWRM_FUNC_BACKING_STORE_CFG_INPUT_FLAGS_MRAV_RESERVATION_SPLIT; + req.mrav_entry_size = cpu_to_le16(ctxm->entry_size); bnxt_hwrm_set_pg_attr(&ctx_pg->ring_mem, &req.mrav_pg_size_mrav_lvl, &req.mrav_page_dir); } if (enables & HWRM_FUNC_BACKING_STORE_CFG_INPUT_ENABLES_TIM) { - ctx_pg = &ctx->tim_mem; - req.tim_num_entries = htole32(ctx_pg->entries); - req.tim_entry_size = htole16(ctx->tim_entry_size); + ctxm = &ctx->ctx_arr[BNXT_CTX_TIM]; *** 2038 LINES SKIPPED *** From nobody Tue May 28 10:36: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 4VpTT70L8Wz5Lyw1; Tue, 28 May 2024 10:36: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 4VpTT664rjz4Tfx; Tue, 28 May 2024 10:36:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716892586; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xI9+v0ARs47QbnN2vkX2FAYkgZesntEz4oHBjuDlIjU=; b=MpW81sU7GE9HNJfXMUNQ4R6bnUOJ2jx/Ugh6h6lRPqfxnkD6uRXev4oVEDmLvGZS1QWats YINqXegjGjXLM83UtRfjCS+7/Q9KWEjjP8GykJZkOgHyGOo3uTVmk6mGuUgOPMelgdJGQk T5vhZ52c12VkT0zg9b4QuXOHu284Sa+f/CYeSke9a0OVxlwQfGlZ2sijgw77SkYYiMAhWd MkKMbiSr//q0tCKeDbwcTt5zLnZwCPvhZqmOzJ2orE1YNrnqe2aAGF9YYgMyvbgpDXhCNy JBroJxOaF9DyrypXocV0HbDnnUIzVNN0UZZ1oPVd1MexmjEU1KkXrUK6K1iAMA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1716892586; a=rsa-sha256; cv=none; b=YZQUXf/6HqegTETbsg2wHmQgm3WirKEAx1EisyOylm+9miE0I0FaPubqQIyyvnRHwYAk6c Lk/+vTbYnKbTjlQPULAa0qNETyEvpEm5FPstqmROnMm9WP882rq0Jv8HK9qRpehCf3Z2h9 EuXyov7C6T+2xsB22Jb9sFJhbFXdziGx+PiUY4cB/PPUPj40i8Ghz4Yoe5WXntFVcEin+G 6+hd5KufIG/tgS8l+xiDg8iC0QRjyHilrYFMMbO+TKYLS+Ya3ggVUMGYggB0jS/Sc/PpGM 6t1KZPqo9mze9ou38mLCmsQJAMW2w4+un38WsQD60YgUloXI1u4NnzekDHtlEA== 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=1716892586; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xI9+v0ARs47QbnN2vkX2FAYkgZesntEz4oHBjuDlIjU=; b=Rb4IUS4piuZhomGzpMBE+QvzIT3y6WlQzbihAM2usGuA+3sL0buHOV3yv94DuGKKKPZcQg gPTC50eHIo61yjtKk3EhsOY1syi8Y0LnvfH3uAr0XmnM4SJ7gRfaUyoGU6Z8vKLZn3PNEz op5HhxmQL7EGMIzdBRMlppTs8WJAgGW+KSxRZVre43H8vBCJYFeZ4QDYH/4RPy1PT0HtTo JXyx/Oz1JR1YA8DcuDVgIQfTLTzQ3cqEYiaPTFkt/PInql//of6lihfspBdA0zwFMreAFM O6FTbY0sZwjxrwltXDhp1p2m+IKzFwZ3bBcRdP/Fibpgrm/42hbvWbM7ApEmCQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VpTT65hB9z1Nqf; Tue, 28 May 2024 10:36: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 44SAaQ0G051861; Tue, 28 May 2024 10:36:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44SAaQcv051858; Tue, 28 May 2024 10:36:26 GMT (envelope-from git) Date: Tue, 28 May 2024 10:36:26 GMT Message-Id: <202405281036.44SAaQcv051858@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Sumit Saxena Subject: git: 032899b59c25 - main - bnxt_en: Added support for priority queues extended stats List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ssaxena X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 032899b59c25389e60a0a092a0dad347102a6edc Auto-Submitted: auto-generated The branch main has been updated by ssaxena: URL: https://cgit.FreeBSD.org/src/commit/?id=032899b59c25389e60a0a092a0dad347102a6edc commit 032899b59c25389e60a0a092a0dad347102a6edc Author: Chandrakanth patil AuthorDate: 2024-04-27 16:26:35 +0000 Commit: Sumit Saxena CommitDate: 2024-05-28 10:36:11 +0000 bnxt_en: Added support for priority queues extended stats Below priority queues extended stats are exposed to sysctl: tx_bytes_pri{0-7} rx_bytes_pri{0-7} tx_packets_pri{0-7} rx_packets_pri{0-7} Reviewed by: imp Approved by: imp Differential revision: https://reviews.freebsd.org/D45007 --- sys/dev/bnxt/bnxt_en/bnxt.h | 23 ++++++ sys/dev/bnxt/bnxt_en/bnxt_hwrm.c | 161 +++++++++++++++++++++++++++++++++++-- sys/dev/bnxt/bnxt_en/bnxt_hwrm.h | 2 +- sys/dev/bnxt/bnxt_en/bnxt_sysctl.c | 98 ++++++++++++++++++++++ 4 files changed, 277 insertions(+), 7 deletions(-) diff --git a/sys/dev/bnxt/bnxt_en/bnxt.h b/sys/dev/bnxt/bnxt_en/bnxt.h index ab60ddf74672..d6fe2ce8ddb1 100644 --- a/sys/dev/bnxt/bnxt_en/bnxt.h +++ b/sys/dev/bnxt/bnxt_en/bnxt.h @@ -267,6 +267,15 @@ #define BNXT_MIN_FRAME_SIZE 52 /* Frames must be padded to this size for some A0 chips */ +#define BNXT_RX_STATS_EXT_OFFSET(counter) \ + (offsetof(struct rx_port_stats_ext, counter) / 8) + +#define BNXT_RX_STATS_EXT_NUM_LEGACY \ + BNXT_RX_STATS_EXT_OFFSET(rx_fec_corrected_blocks) + +#define BNXT_TX_STATS_EXT_OFFSET(counter) \ + (offsetof(struct tx_port_stats_ext, counter) / 8) + extern const char bnxt_driver_version[]; typedef void (*bnxt_doorbell_tx)(void *, uint16_t idx); typedef void (*bnxt_doorbell_rx)(void *, uint16_t idx); @@ -910,6 +919,20 @@ struct bnxt_softc { struct tx_port_stats_ext *tx_port_stats_ext; struct rx_port_stats_ext *rx_port_stats_ext; + uint16_t fw_rx_stats_ext_size; + uint16_t fw_tx_stats_ext_size; + uint16_t hw_ring_stats_size; + + uint8_t tx_pri2cos_idx[8]; + uint8_t rx_pri2cos_idx[8]; + bool pri2cos_valid; + + uint64_t tx_bytes_pri[8]; + uint64_t tx_packets_pri[8]; + uint64_t rx_bytes_pri[8]; + uint64_t rx_packets_pri[8]; + + uint8_t port_count; int num_cp_rings; struct bnxt_cp_ring *nq_rings; diff --git a/sys/dev/bnxt/bnxt_en/bnxt_hwrm.c b/sys/dev/bnxt/bnxt_en/bnxt_hwrm.c index 07834aeca363..677869484ace 100644 --- a/sys/dev/bnxt/bnxt_en/bnxt_hwrm.c +++ b/sys/dev/bnxt/bnxt_en/bnxt_hwrm.c @@ -47,6 +47,38 @@ static void bnxt_hwrm_set_eee(struct bnxt_softc *softc, /* NVRam stuff has a five minute timeout */ #define BNXT_NVM_TIMEO (5 * 60 * 1000) +#define BNXT_RX_STATS_PRI_ENTRY(counter, n) \ + BNXT_RX_STATS_EXT_OFFSET(counter##_cos0) + +#define BNXT_TX_STATS_PRI_ENTRY(counter, n) \ + BNXT_TX_STATS_EXT_OFFSET(counter##_cos0) + +#define BNXT_RX_STATS_PRI_ENTRIES(counter) \ + BNXT_RX_STATS_PRI_ENTRY(counter, 0), \ + BNXT_RX_STATS_PRI_ENTRY(counter, 1), \ + BNXT_RX_STATS_PRI_ENTRY(counter, 2), \ + BNXT_RX_STATS_PRI_ENTRY(counter, 3), \ + BNXT_RX_STATS_PRI_ENTRY(counter, 4), \ + BNXT_RX_STATS_PRI_ENTRY(counter, 5), \ + BNXT_RX_STATS_PRI_ENTRY(counter, 6), \ + BNXT_RX_STATS_PRI_ENTRY(counter, 7) + +#define BNXT_TX_STATS_PRI_ENTRIES(counter) \ + BNXT_TX_STATS_PRI_ENTRY(counter, 0), \ + BNXT_TX_STATS_PRI_ENTRY(counter, 1), \ + BNXT_TX_STATS_PRI_ENTRY(counter, 2), \ + BNXT_TX_STATS_PRI_ENTRY(counter, 3), \ + BNXT_TX_STATS_PRI_ENTRY(counter, 4), \ + BNXT_TX_STATS_PRI_ENTRY(counter, 5), \ + BNXT_TX_STATS_PRI_ENTRY(counter, 6), \ + BNXT_TX_STATS_PRI_ENTRY(counter, 7) + + +long bnxt_rx_bytes_pri_arr_base_off[] = {BNXT_RX_STATS_PRI_ENTRIES(rx_bytes)}; +long bnxt_rx_pkts_pri_arr_base_off[] = {BNXT_RX_STATS_PRI_ENTRIES(rx_packets)}; +long bnxt_tx_bytes_pri_arr_base_off[] = {BNXT_TX_STATS_PRI_ENTRIES(tx_bytes)}; +long bnxt_tx_pkts_pri_arr_base_off[] = {BNXT_TX_STATS_PRI_ENTRIES(tx_packets)}; + static int bnxt_hwrm_err_map(uint16_t err) { @@ -1734,25 +1766,142 @@ bnxt_hwrm_port_qstats(struct bnxt_softc *softc) return rc; } +static int bnxt_hwrm_pri2cos_idx(struct bnxt_softc *softc, uint32_t path_dir) +{ + struct hwrm_queue_pri2cos_qcfg_input req = {0}; + struct hwrm_queue_pri2cos_qcfg_output *resp; + uint8_t *pri2cos_idx, *q_ids, max_q; + int rc, i, j; + uint8_t *pri2cos; -void + bnxt_hwrm_cmd_hdr_init(softc, &req, HWRM_QUEUE_PRI2COS_QCFG); + resp = (void *)softc->hwrm_cmd_resp.idi_vaddr; + + req.flags = htole32(HWRM_QUEUE_PRI2COS_QCFG_INPUT_FLAGS_IVLAN | + path_dir); + rc = hwrm_send_message(softc, &req, sizeof(req)); + + if (rc) + return rc; + + if (path_dir == HWRM_QUEUE_PRI2COS_QCFG_INPUT_FLAGS_PATH_TX) { + pri2cos_idx = softc->tx_pri2cos_idx; + q_ids = softc->tx_q_ids; + max_q = softc->tx_max_q; + } else { + pri2cos_idx = softc->rx_pri2cos_idx; + q_ids = softc->rx_q_ids; + max_q = softc->rx_max_q; + } + + pri2cos = &resp->pri0_cos_queue_id; + + for (i = 0; i < BNXT_MAX_QUEUE; i++) { + uint8_t queue_id = pri2cos[i]; + uint8_t queue_idx; + + /* Per port queue IDs start from 0, 10, 20, etc */ + queue_idx = queue_id % 10; + if (queue_idx > BNXT_MAX_QUEUE) { + softc->pri2cos_valid = false; + rc = -EINVAL; + return rc; + } + + for (j = 0; j < max_q; j++) { + if (q_ids[j] == queue_id) + pri2cos_idx[i] = queue_idx; + } + } + + softc->pri2cos_valid = true; + + return rc; +} + +int bnxt_hwrm_port_qstats_ext(struct bnxt_softc *softc) { struct hwrm_port_qstats_ext_input req = {0}; + struct hwrm_port_qstats_ext_output *resp; + int rc = 0, i; + uint32_t tx_stat_size; bnxt_hwrm_cmd_hdr_init(softc, &req, HWRM_PORT_QSTATS_EXT); + resp = (void *)softc->hwrm_cmd_resp.idi_vaddr; + tx_stat_size = sizeof(struct tx_port_stats_ext); req.port_id = htole16(softc->pf.port_id); - req.tx_stat_size = htole16(sizeof(struct tx_port_stats_ext)); + req.tx_stat_size = htole16(tx_stat_size); req.rx_stat_size = htole16(sizeof(struct rx_port_stats_ext)); req.rx_stat_host_addr = htole64(softc->hw_rx_port_stats_ext.idi_paddr); req.tx_stat_host_addr = htole64(softc->hw_tx_port_stats_ext.idi_paddr); - BNXT_HWRM_LOCK(softc); - _hwrm_send_message(softc, &req, sizeof(req)); - BNXT_HWRM_UNLOCK(softc); + rc = hwrm_send_message(softc, &req, sizeof(req)); - return; + if (!rc) { + softc->fw_rx_stats_ext_size = + le16toh(resp->rx_stat_size) / 8; + if (BNXT_FW_MAJ(softc) < 220 && + softc->fw_rx_stats_ext_size > BNXT_RX_STATS_EXT_NUM_LEGACY) + softc->fw_rx_stats_ext_size = BNXT_RX_STATS_EXT_NUM_LEGACY; + + softc->fw_tx_stats_ext_size = tx_stat_size ? + le16toh(resp->tx_stat_size) / 8 : 0; + } else { + softc->fw_rx_stats_ext_size = 0; + softc->fw_tx_stats_ext_size = 0; + } + + if (softc->fw_tx_stats_ext_size <= + offsetof(struct tx_port_stats_ext, pfc_pri0_tx_duration_us) / 8) { + softc->pri2cos_valid = false; + return rc; + } + + rc = bnxt_hwrm_pri2cos_idx(softc, HWRM_QUEUE_PRI2COS_QCFG_INPUT_FLAGS_PATH_TX); + if (rc) + return rc; + + if (softc->is_asym_q) { + rc = bnxt_hwrm_pri2cos_idx(softc, HWRM_QUEUE_PRI2COS_QCFG_INPUT_FLAGS_PATH_RX); + if (rc) + return rc; + } else { + memcpy(softc->rx_pri2cos_idx, softc->tx_pri2cos_idx, sizeof(softc->rx_pri2cos_idx)); + } + + u64 *rx_port_stats_ext = (u64 *)softc->hw_rx_port_stats_ext.idi_vaddr; + u64 *tx_port_stats_ext = (u64 *)softc->hw_tx_port_stats_ext.idi_vaddr; + + if (softc->pri2cos_valid) { + for (i = 0; i < 8; i++) { + long n = bnxt_rx_bytes_pri_arr_base_off[i] + + softc->rx_pri2cos_idx[i]; + + softc->rx_bytes_pri[i] = *(rx_port_stats_ext + n); + } + for (i = 0; i < 8; i++) { + long n = bnxt_rx_pkts_pri_arr_base_off[i] + + softc->rx_pri2cos_idx[i]; + + softc->rx_packets_pri[i] = *(rx_port_stats_ext + n); + } + for (i = 0; i < 8; i++) { + long n = bnxt_tx_bytes_pri_arr_base_off[i] + + softc->tx_pri2cos_idx[i]; + + softc->tx_bytes_pri[i] = *(tx_port_stats_ext + n); + } + for (i = 0; i < 8; i++) { + long n = bnxt_tx_pkts_pri_arr_base_off[i] + + softc->tx_pri2cos_idx[i]; + + softc->tx_packets_pri[i] = *(tx_port_stats_ext + n); + } + } + + return rc; } int diff --git a/sys/dev/bnxt/bnxt_en/bnxt_hwrm.h b/sys/dev/bnxt/bnxt_en/bnxt_hwrm.h index 35a974fe3438..766556f9904c 100644 --- a/sys/dev/bnxt/bnxt_en/bnxt_hwrm.h +++ b/sys/dev/bnxt/bnxt_en/bnxt_hwrm.h @@ -66,7 +66,7 @@ int bnxt_hwrm_stat_ctx_alloc(struct bnxt_softc *softc, struct bnxt_cp_ring *cpr, uint64_t paddr); int bnxt_hwrm_stat_ctx_free(struct bnxt_softc *softc, struct bnxt_cp_ring *cpr); int bnxt_hwrm_port_qstats(struct bnxt_softc *softc); -void bnxt_hwrm_port_qstats_ext(struct bnxt_softc *softc); +int bnxt_hwrm_port_qstats_ext(struct bnxt_softc *softc); int bnxt_hwrm_ring_grp_alloc(struct bnxt_softc *softc, struct bnxt_grp_info *grp); int bnxt_hwrm_ring_grp_free(struct bnxt_softc *softc, struct bnxt_grp_info *gr); diff --git a/sys/dev/bnxt/bnxt_en/bnxt_sysctl.c b/sys/dev/bnxt/bnxt_en/bnxt_sysctl.c index e00cb225fd49..fdc54ab34511 100644 --- a/sys/dev/bnxt/bnxt_en/bnxt_sysctl.c +++ b/sys/dev/bnxt/bnxt_en/bnxt_sysctl.c @@ -598,6 +598,55 @@ bnxt_create_port_stats_sysctls(struct bnxt_softc *softc) "tx_packets_cos7", CTLFLAG_RD, &softc->tx_port_stats_ext->tx_packets_cos7, "Transmitted packets count cos7"); + SYSCTL_ADD_QUAD(&softc->hw_stats, SYSCTL_CHILDREN(oid), OID_AUTO, + "tx_bytes_pri0", CTLFLAG_RD, + &softc->tx_bytes_pri[0], "Transmitted bytes count pri0"); + SYSCTL_ADD_QUAD(&softc->hw_stats, SYSCTL_CHILDREN(oid), OID_AUTO, + "tx_packets_pri0", CTLFLAG_RD, + &softc->tx_packets_pri[0], "Transmitted packets count pri0"); + SYSCTL_ADD_QUAD(&softc->hw_stats, SYSCTL_CHILDREN(oid), OID_AUTO, + "tx_bytes_pri1", CTLFLAG_RD, + &softc->tx_bytes_pri[1], "Transmitted bytes count pri1"); + SYSCTL_ADD_QUAD(&softc->hw_stats, SYSCTL_CHILDREN(oid), OID_AUTO, + "tx_packets_pri1", CTLFLAG_RD, + &softc->tx_packets_pri[1], "Transmitted packets count pri1"); + SYSCTL_ADD_QUAD(&softc->hw_stats, SYSCTL_CHILDREN(oid), OID_AUTO, + "tx_bytes_pri2", CTLFLAG_RD, + &softc->tx_bytes_pri[2], "Transmitted bytes count pri2"); + SYSCTL_ADD_QUAD(&softc->hw_stats, SYSCTL_CHILDREN(oid), OID_AUTO, + "tx_packets_pri2", CTLFLAG_RD, + &softc->tx_packets_pri[2], "Transmitted packets count pri2"); + SYSCTL_ADD_QUAD(&softc->hw_stats, SYSCTL_CHILDREN(oid), OID_AUTO, + "tx_bytes_pri3", CTLFLAG_RD, + &softc->tx_bytes_pri[3], "Transmitted bytes count pri3"); + SYSCTL_ADD_QUAD(&softc->hw_stats, SYSCTL_CHILDREN(oid), OID_AUTO, + "tx_packets_pri3", CTLFLAG_RD, + &softc->tx_packets_pri[3], "Transmitted packets count pri3"); + SYSCTL_ADD_QUAD(&softc->hw_stats, SYSCTL_CHILDREN(oid), OID_AUTO, + "tx_bytes_pri4", CTLFLAG_RD, + &softc->tx_bytes_pri[4], "Transmitted bytes count pri4"); + SYSCTL_ADD_QUAD(&softc->hw_stats, SYSCTL_CHILDREN(oid), OID_AUTO, + "tx_packets_pri4", CTLFLAG_RD, + &softc->tx_packets_pri[4], "Transmitted packets count pri4"); + SYSCTL_ADD_QUAD(&softc->hw_stats, SYSCTL_CHILDREN(oid), OID_AUTO, + "tx_bytes_pri5", CTLFLAG_RD, + &softc->tx_bytes_pri[5], "Transmitted bytes count pri5"); + SYSCTL_ADD_QUAD(&softc->hw_stats, SYSCTL_CHILDREN(oid), OID_AUTO, + "tx_packets_pri5", CTLFLAG_RD, + &softc->tx_packets_pri[5], "Transmitted packets count pri5"); + SYSCTL_ADD_QUAD(&softc->hw_stats, SYSCTL_CHILDREN(oid), OID_AUTO, + "tx_bytes_pri6", CTLFLAG_RD, + &softc->tx_bytes_pri[6], "Transmitted bytes count pri6"); + SYSCTL_ADD_QUAD(&softc->hw_stats, SYSCTL_CHILDREN(oid), OID_AUTO, + "tx_packets_pri6", CTLFLAG_RD, + &softc->tx_packets_pri[6], "Transmitted packets count pri6"); + SYSCTL_ADD_QUAD(&softc->hw_stats, SYSCTL_CHILDREN(oid), OID_AUTO, + "tx_bytes_pri7", CTLFLAG_RD, + &softc->tx_bytes_pri[7], "Transmitted bytes count pri7"); + SYSCTL_ADD_QUAD(&softc->hw_stats, SYSCTL_CHILDREN(oid), OID_AUTO, + "tx_packets_pri7", CTLFLAG_RD, + &softc->tx_packets_pri[7], "Transmitted packets count pri7"); + SYSCTL_ADD_QUAD(&softc->hw_stats, SYSCTL_CHILDREN(oid), OID_AUTO, "pfc_pri0_tx_duration_us", CTLFLAG_RD, &softc->tx_port_stats_ext->pfc_pri0_tx_duration_us, "Time duration between" @@ -731,6 +780,55 @@ bnxt_create_port_stats_sysctls(struct bnxt_softc *softc) "rx_packets_cos7", CTLFLAG_RD, &softc->rx_port_stats_ext->rx_packets_cos7, "Received packets count cos7"); + SYSCTL_ADD_QUAD(&softc->hw_stats, SYSCTL_CHILDREN(oid), OID_AUTO, + "rx_bytes_pri0", CTLFLAG_RD, + &softc->rx_bytes_pri[0], "Received bytes count pri0"); + SYSCTL_ADD_QUAD(&softc->hw_stats, SYSCTL_CHILDREN(oid), OID_AUTO, + "rx_packets_pri0", CTLFLAG_RD, + &softc->rx_packets_pri[0], "Received packets count pri0"); + SYSCTL_ADD_QUAD(&softc->hw_stats, SYSCTL_CHILDREN(oid), OID_AUTO, + "rx_bytes_pri1", CTLFLAG_RD, + &softc->rx_bytes_pri[1], "Received bytes count pri1"); + SYSCTL_ADD_QUAD(&softc->hw_stats, SYSCTL_CHILDREN(oid), OID_AUTO, + "rx_packets_pri1", CTLFLAG_RD, + &softc->rx_packets_pri[1], "Received packets count pri1"); + SYSCTL_ADD_QUAD(&softc->hw_stats, SYSCTL_CHILDREN(oid), OID_AUTO, + "rx_bytes_pri2", CTLFLAG_RD, + &softc->rx_bytes_pri[2], "Received bytes count pri2"); + SYSCTL_ADD_QUAD(&softc->hw_stats, SYSCTL_CHILDREN(oid), OID_AUTO, + "rx_packets_pri2", CTLFLAG_RD, + &softc->rx_packets_pri[2], "Received packets count pri2"); + SYSCTL_ADD_QUAD(&softc->hw_stats, SYSCTL_CHILDREN(oid), OID_AUTO, + "rx_bytes_pri3", CTLFLAG_RD, + &softc->rx_bytes_pri[3], "Received bytes count pri3"); + SYSCTL_ADD_QUAD(&softc->hw_stats, SYSCTL_CHILDREN(oid), OID_AUTO, + "rx_packets_pri3", CTLFLAG_RD, + &softc->rx_packets_pri[3], "Received packets count pri3"); + SYSCTL_ADD_QUAD(&softc->hw_stats, SYSCTL_CHILDREN(oid), OID_AUTO, + "rx_bytes_pri4", CTLFLAG_RD, + &softc->rx_bytes_pri[4], "Received bytes count pri4"); + SYSCTL_ADD_QUAD(&softc->hw_stats, SYSCTL_CHILDREN(oid), OID_AUTO, + "rx_packets_pri4", CTLFLAG_RD, + &softc->rx_packets_pri[4], "Received packets count pri4"); + SYSCTL_ADD_QUAD(&softc->hw_stats, SYSCTL_CHILDREN(oid), OID_AUTO, + "rx_bytes_pri5", CTLFLAG_RD, + &softc->rx_bytes_pri[5], "Received bytes count pri5"); + SYSCTL_ADD_QUAD(&softc->hw_stats, SYSCTL_CHILDREN(oid), OID_AUTO, + "rx_packets_pri5", CTLFLAG_RD, + &softc->rx_packets_pri[5], "Received packets count pri5"); + SYSCTL_ADD_QUAD(&softc->hw_stats, SYSCTL_CHILDREN(oid), OID_AUTO, + "rx_bytes_pri6", CTLFLAG_RD, + &softc->rx_bytes_pri[6], "Received bytes count pri6"); + SYSCTL_ADD_QUAD(&softc->hw_stats, SYSCTL_CHILDREN(oid), OID_AUTO, + "rx_packets_pri6", CTLFLAG_RD, + &softc->rx_packets_pri[6], "Received packets count pri6"); + SYSCTL_ADD_QUAD(&softc->hw_stats, SYSCTL_CHILDREN(oid), OID_AUTO, + "rx_bytes_pri7", CTLFLAG_RD, + &softc->rx_bytes_pri[7], "Received bytes count pri7"); + SYSCTL_ADD_QUAD(&softc->hw_stats, SYSCTL_CHILDREN(oid), OID_AUTO, + "rx_packets_pri7", CTLFLAG_RD, + &softc->rx_packets_pri[7], "Received packets count pri7"); + SYSCTL_ADD_QUAD(&softc->hw_stats, SYSCTL_CHILDREN(oid), OID_AUTO, "pfc_pri0_rx_duration_us", CTLFLAG_RD, &softc->rx_port_stats_ext->pfc_pri0_rx_duration_us, "Time duration in receiving" From nobody Tue May 28 10:36: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 4VpTT81TbJz5M0Ds; Tue, 28 May 2024 10:36: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 4VpTT76zG8z4Tjp; Tue, 28 May 2024 10:36:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716892587; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pCFDKatwYPfU7Xg8iTCmeS5YsITJUz/0yFnQYC1W0dQ=; b=H1TqbOrgCVp+pGmQtVxaOn9UTA7jRoNgidX05j4eFEwfW8SgUdqUg77HDnrQEtrlXWZQ3Y Fu+O1ZZrXzuKEwhuGj2C1X+Xb+Yhe61Wo80XauyS3bxjLqrchNCU5egNwc9aHkbg2H+1pn Qfu9lreh9F70sipfK0VdhUQMmlKRC+bOd+2X7bwSBA1rKCaDfFL6L5dIYvl6IrT9Dc5raW u6eRQe/z4DteJZnK8wfJjRIuKgvZnJw+SzetOl0kWQkXfBYJABdodl1uHBbHHxbmsloDL4 pE565uAxKNDFjC+Kjr0gheBAHnGLbB0lfry4HYZlueMjAGhjHlQ8WFJm4/8b2g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1716892587; a=rsa-sha256; cv=none; b=J5odYZ4t3cyMMGkmLbDAysDQbzUGV5vETylE6eq8gg7kO9+6mnhMcOiL3JO/2Jhz8pW3Ai GD5DG/GMSMmlnVFWMTV3B2xTHDbrZTc8Ial2QUEncpmriMOMjK/pPDZX8zA5K/XRyGfBSz drE3lgXVT/tLPfbgiVuKc0neR5DHfEUhCDvWLPo35O4tby2vf6DP0zxpr2Yn3yEGoYA89t TkPo98glZG/mDo6XjGUphIAOcjQEwEBz6HBQjNyOtJPSbpA3pr/BVJ5BsMzv3W+N+3cvam Ms93Beufe1X2Fv4z72NzZr7hIvFOBjc4yKnb9iZihu+kkeK7EI1kU7Bz4wfo5Q== 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=1716892587; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pCFDKatwYPfU7Xg8iTCmeS5YsITJUz/0yFnQYC1W0dQ=; b=qKcrdGLBUaIa4TSqiHfyRWUzkjQQFN3LvO94FXyuuO0/490Y8cQTWLBaJ9s+9WXyYT8VvD /zS3EpOwXWvsYiimeCH8gZqyINJBiYitGOtrUdveR9XfPNLJwJ3RlI/UPGhhHfZvhVMMZk tX/INBG0Kjty9dki2F75wCQY3xArI/psFIHS0VF51xo4BU6UenOlPcdGIw4Lxn1IsZc+JM ywGXEbhfyx2rGtNf3gJ3FFgBTyfFo0Rsf5n/Z4KdZ4k+1XUoYLCxwRtPxYmnth1/HcFcgK UjtGGnxKC+JXFBsDUSCT02SjkcTsP4DOXbL/MEm45LLZL/6aMl3G7kFeUvFObQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VpTT7676Fz1P7P; Tue, 28 May 2024 10:36: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 44SAaRdu051908; Tue, 28 May 2024 10:36:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44SAaRcv051905; Tue, 28 May 2024 10:36:27 GMT (envelope-from git) Date: Tue, 28 May 2024 10:36:27 GMT Message-Id: <202405281036.44SAaRcv051905@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Sumit Saxena Subject: git: c9965974a52b - main - bnxt_en: Firmware error recovery support List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ssaxena X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c9965974a52b5dfad1737706b7f2623d999fb569 Auto-Submitted: auto-generated The branch main has been updated by ssaxena: URL: https://cgit.FreeBSD.org/src/commit/?id=c9965974a52b5dfad1737706b7f2623d999fb569 commit c9965974a52b5dfad1737706b7f2623d999fb569 Author: Chandrakanth patil AuthorDate: 2024-04-28 12:53:58 +0000 Commit: Sumit Saxena CommitDate: 2024-05-28 10:36:11 +0000 bnxt_en: Firmware error recovery support Implement firmware error recovery support for Thor adapters. This entails enabling the capability for the firmware to initiate error recovery. Specifically, the firmware will send the reset notify asynchronous event to notify the driver of an error and impending reset. Subsequently, the driver will queue a task to execute the following steps. 1. Deactivate the allocated resources. 2. Await completion of the firmware's recovery process. 3. Configure the resources and reactivate the network interface. Reviewed by: imp Approved by: imp Differential revision: https://reviews.freebsd.org/D45008 --- sys/dev/bnxt/bnxt_en/bnxt.h | 179 +++++++- sys/dev/bnxt/bnxt_en/bnxt_hwrm.c | 147 ++++--- sys/dev/bnxt/bnxt_en/bnxt_hwrm.h | 8 +- sys/dev/bnxt/bnxt_en/bnxt_sysctl.c | 50 +++ sys/dev/bnxt/bnxt_en/bnxt_ulp.c | 6 +- sys/dev/bnxt/bnxt_en/if_bnxt.c | 834 ++++++++++++++++++++++++++++++++++++- 6 files changed, 1141 insertions(+), 83 deletions(-) diff --git a/sys/dev/bnxt/bnxt_en/bnxt.h b/sys/dev/bnxt/bnxt_en/bnxt.h index d6fe2ce8ddb1..2faea00e4266 100644 --- a/sys/dev/bnxt/bnxt_en/bnxt.h +++ b/sys/dev/bnxt/bnxt_en/bnxt.h @@ -144,6 +144,23 @@ #define BNXT_EVENT_THERMAL_CURRENT_TEMP(data2) \ ((data2) & HWRM_ASYNC_EVENT_CMPL_ERROR_REPORT_THERMAL_EVENT_DATA2_CURRENT_TEMP_MASK) +#define EVENT_DATA1_RESET_NOTIFY_FW_ACTIVATION(data1) \ + (((data1) & \ + HWRM_ASYNC_EVENT_CMPL_RESET_NOTIFY_EVENT_DATA1_REASON_CODE_MASK) ==\ + HWRM_ASYNC_EVENT_CMPL_RESET_NOTIFY_EVENT_DATA1_REASON_CODE_FW_ACTIVATION) + +#define EVENT_DATA2_RESET_NOTIFY_FW_STATUS_CODE(data2) \ + ((data2) & \ + HWRM_ASYNC_EVENT_CMPL_RESET_NOTIFY_EVENT_DATA2_FW_STATUS_CODE_MASK) + +#define EVENT_DATA1_RECOVERY_ENABLED(data1) \ + !!((data1) & \ + HWRM_ASYNC_EVENT_CMPL_ERROR_RECOVERY_EVENT_DATA1_FLAGS_RECOVERY_ENABLED) + +#define EVENT_DATA1_RECOVERY_MASTER_FUNC(data1) \ + !!((data1) & \ + HWRM_ASYNC_EVENT_CMPL_ERROR_RECOVERY_EVENT_DATA1_FLAGS_MASTER_FUNC) + #define INVALID_STATS_CTX_ID -1 /* Maximum numbers of RX and TX descriptors. iflib requires this to be a power @@ -834,6 +851,124 @@ struct bnxt_msix_tbl { uint32_t vector; }; +enum bnxt_health_severity { + SEVERITY_NORMAL = 0, + SEVERITY_WARNING, + SEVERITY_RECOVERABLE, + SEVERITY_FATAL, +}; + +enum bnxt_health_remedy { + REMEDY_DEVLINK_RECOVER, + REMEDY_POWER_CYCLE_DEVICE, + REMEDY_POWER_CYCLE_HOST, + REMEDY_FW_UPDATE, + REMEDY_HW_REPLACE, +}; + +struct bnxt_fw_health { + u32 flags; + u32 polling_dsecs; + u32 master_func_wait_dsecs; + u32 normal_func_wait_dsecs; + u32 post_reset_wait_dsecs; + u32 post_reset_max_wait_dsecs; + u32 regs[4]; + u32 mapped_regs[4]; +#define BNXT_FW_HEALTH_REG 0 +#define BNXT_FW_HEARTBEAT_REG 1 +#define BNXT_FW_RESET_CNT_REG 2 +#define BNXT_FW_RESET_INPROG_REG 3 + u32 fw_reset_inprog_reg_mask; + u32 last_fw_heartbeat; + u32 last_fw_reset_cnt; + u8 enabled:1; + u8 primary:1; + u8 status_reliable:1; + u8 resets_reliable:1; + u8 tmr_multiplier; + u8 tmr_counter; + u8 fw_reset_seq_cnt; + u32 fw_reset_seq_regs[16]; + u32 fw_reset_seq_vals[16]; + u32 fw_reset_seq_delay_msec[16]; + u32 echo_req_data1; + u32 echo_req_data2; + struct devlink_health_reporter *fw_reporter; + struct mutex lock; + enum bnxt_health_severity severity; + enum bnxt_health_remedy remedy; + u32 arrests; + u32 discoveries; + u32 survivals; + u32 fatalities; + u32 diagnoses; +}; + +#define BNXT_FW_HEALTH_REG_TYPE_MASK 3 +#define BNXT_FW_HEALTH_REG_TYPE_CFG 0 +#define BNXT_FW_HEALTH_REG_TYPE_GRC 1 +#define BNXT_FW_HEALTH_REG_TYPE_BAR0 2 +#define BNXT_FW_HEALTH_REG_TYPE_BAR1 3 + +#define BNXT_FW_HEALTH_REG_TYPE(reg) ((reg) & BNXT_FW_HEALTH_REG_TYPE_MASK) +#define BNXT_FW_HEALTH_REG_OFF(reg) ((reg) & ~BNXT_FW_HEALTH_REG_TYPE_MASK) + +#define BNXT_FW_HEALTH_WIN_BASE 0x3000 +#define BNXT_FW_HEALTH_WIN_MAP_OFF 8 + +#define BNXT_FW_HEALTH_WIN_OFF(reg) (BNXT_FW_HEALTH_WIN_BASE + \ + ((reg) & BNXT_GRC_OFFSET_MASK)) + +#define BNXT_FW_STATUS_HEALTH_MSK 0xffff +#define BNXT_FW_STATUS_HEALTHY 0x8000 +#define BNXT_FW_STATUS_SHUTDOWN 0x100000 +#define BNXT_FW_STATUS_RECOVERING 0x400000 + +#define BNXT_FW_IS_HEALTHY(sts) (((sts) & BNXT_FW_STATUS_HEALTH_MSK) ==\ + BNXT_FW_STATUS_HEALTHY) + +#define BNXT_FW_IS_BOOTING(sts) (((sts) & BNXT_FW_STATUS_HEALTH_MSK) < \ + BNXT_FW_STATUS_HEALTHY) + +#define BNXT_FW_IS_ERR(sts) (((sts) & BNXT_FW_STATUS_HEALTH_MSK) > \ + BNXT_FW_STATUS_HEALTHY) + +#define BNXT_FW_IS_RECOVERING(sts) (BNXT_FW_IS_ERR(sts) && \ + ((sts) & BNXT_FW_STATUS_RECOVERING)) + +#define BNXT_FW_RETRY 5 +#define BNXT_FW_IF_RETRY 10 +#define BNXT_FW_SLOT_RESET_RETRY 4 + +#define BNXT_GRCPF_REG_CHIMP_COMM 0x0 +#define BNXT_GRCPF_REG_CHIMP_COMM_TRIGGER 0x100 +#define BNXT_GRCPF_REG_WINDOW_BASE_OUT 0x400 +#define BNXT_GRCPF_REG_SYNC_TIME 0x480 +#define BNXT_GRCPF_REG_SYNC_TIME_ADJ 0x488 +#define BNXT_GRCPF_REG_SYNC_TIME_ADJ_PER_MSK 0xffffffUL +#define BNXT_GRCPF_REG_SYNC_TIME_ADJ_PER_SFT 0 +#define BNXT_GRCPF_REG_SYNC_TIME_ADJ_VAL_MSK 0x1f000000UL +#define BNXT_GRCPF_REG_SYNC_TIME_ADJ_VAL_SFT 24 +#define BNXT_GRCPF_REG_SYNC_TIME_ADJ_SIGN_MSK 0x20000000UL +#define BNXT_GRCPF_REG_SYNC_TIME_ADJ_SIGN_SFT 29 + +#define BNXT_GRC_REG_STATUS_P5 0x520 + +#define BNXT_GRCPF_REG_KONG_COMM 0xA00 +#define BNXT_GRCPF_REG_KONG_COMM_TRIGGER 0xB00 + +#define BNXT_CAG_REG_LEGACY_INT_STATUS 0x4014 +#define BNXT_CAG_REG_BASE 0x300000 + +#define BNXT_GRC_REG_CHIP_NUM 0x48 +#define BNXT_GRC_REG_BASE 0x260000 + +#define BNXT_TS_REG_TIMESYNC_TS0_LOWER 0x640180c +#define BNXT_TS_REG_TIMESYNC_TS0_UPPER 0x6401810 + +#define BNXT_GRC_BASE_MASK 0xfffff000 +#define BNXT_GRC_OFFSET_MASK 0x00000ffc struct bnxt_softc { device_t dev; if_ctx_t ctx; @@ -1080,7 +1215,49 @@ struct bnxt_softc { test_bit(BNXT_STATE_FW_FATAL_COND, &(bp)->state) struct pci_dev *pdev; - int fw_reset_state; + struct work_struct sp_task; + unsigned long sp_event; +#define BNXT_RX_MASK_SP_EVENT 0 +#define BNXT_RX_NTP_FLTR_SP_EVENT 1 +#define BNXT_LINK_CHNG_SP_EVENT 2 +#define BNXT_HWRM_EXEC_FWD_REQ_SP_EVENT 3 +#define BNXT_VXLAN_ADD_PORT_SP_EVENT 4 +#define BNXT_VXLAN_DEL_PORT_SP_EVENT 5 +#define BNXT_RESET_TASK_SP_EVENT 6 +#define BNXT_RST_RING_SP_EVENT 7 +#define BNXT_HWRM_PF_UNLOAD_SP_EVENT 8 +#define BNXT_PERIODIC_STATS_SP_EVENT 9 +#define BNXT_HWRM_PORT_MODULE_SP_EVENT 10 +#define BNXT_RESET_TASK_SILENT_SP_EVENT 11 +#define BNXT_GENEVE_ADD_PORT_SP_EVENT 12 +#define BNXT_GENEVE_DEL_PORT_SP_EVENT 13 +#define BNXT_LINK_SPEED_CHNG_SP_EVENT 14 +#define BNXT_FLOW_STATS_SP_EVENT 15 +#define BNXT_UPDATE_PHY_SP_EVENT 16 +#define BNXT_RING_COAL_NOW_SP_EVENT 17 +#define BNXT_FW_RESET_NOTIFY_SP_EVENT 18 +#define BNXT_FW_EXCEPTION_SP_EVENT 19 +#define BNXT_VF_VNIC_CHANGE_SP_EVENT 20 +#define BNXT_LINK_CFG_CHANGE_SP_EVENT 21 +#define BNXT_PTP_CURRENT_TIME_EVENT 22 +#define BNXT_FW_ECHO_REQUEST_SP_EVENT 23 +#define BNXT_VF_CFG_CHNG_SP_EVENT 24 + + struct delayed_work fw_reset_task; + int fw_reset_state; +#define BNXT_FW_RESET_STATE_POLL_VF 1 +#define BNXT_FW_RESET_STATE_RESET_FW 2 +#define BNXT_FW_RESET_STATE_ENABLE_DEV 3 +#define BNXT_FW_RESET_STATE_POLL_FW 4 +#define BNXT_FW_RESET_STATE_OPENING 5 +#define BNXT_FW_RESET_STATE_POLL_FW_DOWN 6 + u16 fw_reset_min_dsecs; +#define BNXT_DFLT_FW_RST_MIN_DSECS 20 + u16 fw_reset_max_dsecs; +#define BNXT_DFLT_FW_RST_MAX_DSECS 60 + unsigned long fw_reset_timestamp; + + struct bnxt_fw_health *fw_health; }; struct bnxt_filter_info { diff --git a/sys/dev/bnxt/bnxt_en/bnxt_hwrm.c b/sys/dev/bnxt/bnxt_en/bnxt_hwrm.c index 677869484ace..9252964900ff 100644 --- a/sys/dev/bnxt/bnxt_en/bnxt_hwrm.c +++ b/sys/dev/bnxt/bnxt_en/bnxt_hwrm.c @@ -933,22 +933,99 @@ fail: return rc; } -int -bnxt_hwrm_func_drv_rgtr(struct bnxt_softc *softc) -{ +static const u16 bnxt_async_events_arr[] = { + HWRM_ASYNC_EVENT_CMPL_EVENT_ID_LINK_STATUS_CHANGE, + HWRM_ASYNC_EVENT_CMPL_EVENT_ID_LINK_SPEED_CHANGE, + HWRM_ASYNC_EVENT_CMPL_EVENT_ID_PF_DRVR_UNLOAD, + HWRM_ASYNC_EVENT_CMPL_EVENT_ID_PORT_CONN_NOT_ALLOWED, + HWRM_ASYNC_EVENT_CMPL_EVENT_ID_VF_CFG_CHANGE, + HWRM_ASYNC_EVENT_CMPL_EVENT_ID_LINK_SPEED_CFG_CHANGE, + HWRM_ASYNC_EVENT_CMPL_EVENT_ID_PORT_PHY_CFG_CHANGE, + HWRM_ASYNC_EVENT_CMPL_EVENT_ID_RESET_NOTIFY, + HWRM_ASYNC_EVENT_CMPL_EVENT_ID_ERROR_RECOVERY, + HWRM_ASYNC_EVENT_CMPL_EVENT_ID_RING_MONITOR_MSG, + HWRM_ASYNC_EVENT_CMPL_EVENT_ID_DEFAULT_VNIC_CHANGE, + HWRM_ASYNC_EVENT_CMPL_EVENT_ID_DEBUG_NOTIFICATION, + HWRM_ASYNC_EVENT_CMPL_EVENT_ID_DEFERRED_RESPONSE, + HWRM_ASYNC_EVENT_CMPL_EVENT_ID_ECHO_REQUEST, + HWRM_ASYNC_EVENT_CMPL_EVENT_ID_PPS_TIMESTAMP, + HWRM_ASYNC_EVENT_CMPL_EVENT_ID_ERROR_REPORT, + HWRM_ASYNC_EVENT_CMPL_EVENT_ID_PHC_UPDATE, +}; + +int bnxt_hwrm_func_drv_rgtr(struct bnxt_softc *bp, unsigned long *bmap, int bmap_size, + bool async_only) +{ + DECLARE_BITMAP(async_events_bmap, 256); + u32 *events = (u32 *)async_events_bmap; + struct hwrm_func_drv_rgtr_output *resp = + (void *)bp->hwrm_cmd_resp.idi_vaddr; struct hwrm_func_drv_rgtr_input req = {0}; + u32 flags = 0; + int rc; + int i; - bnxt_hwrm_cmd_hdr_init(softc, &req, HWRM_FUNC_DRV_RGTR); - - req.enables = htole32(HWRM_FUNC_DRV_RGTR_INPUT_ENABLES_VER | - HWRM_FUNC_DRV_RGTR_INPUT_ENABLES_OS_TYPE); - req.os_type = htole16(HWRM_FUNC_DRV_RGTR_INPUT_OS_TYPE_FREEBSD); - + bnxt_hwrm_cmd_hdr_init(bp, &req, HWRM_FUNC_DRV_RGTR); req.ver_maj = HWRM_VERSION_MAJOR; req.ver_min = HWRM_VERSION_MINOR; req.ver_upd = HWRM_VERSION_UPDATE; - return hwrm_send_message(softc, &req, sizeof(req)); + req.enables = htole32(HWRM_FUNC_DRV_RGTR_INPUT_ENABLES_OS_TYPE | + HWRM_FUNC_DRV_RGTR_INPUT_ENABLES_VER | + HWRM_FUNC_DRV_RGTR_INPUT_ENABLES_ASYNC_EVENT_FWD); + + if (bp->fw_cap & BNXT_FW_CAP_HOT_RESET) + flags |= HWRM_FUNC_DRV_RGTR_INPUT_FLAGS_HOT_RESET_SUPPORT; + if (bp->fw_cap & BNXT_FW_CAP_ERROR_RECOVERY) + flags |= HWRM_FUNC_DRV_RGTR_INPUT_FLAGS_ERROR_RECOVERY_SUPPORT | + HWRM_FUNC_DRV_RGTR_INPUT_FLAGS_MASTER_SUPPORT; + if (bp->fw_cap & BNXT_FW_CAP_NPAR_1_2) + flags |= HWRM_FUNC_DRV_RGTR_INPUT_FLAGS_NPAR_1_2_SUPPORT; + flags |= HWRM_FUNC_DRV_RGTR_INPUT_FLAGS_ASYM_QUEUE_CFG_SUPPORT; + req.flags = htole32(flags); + req.os_type = htole16(HWRM_FUNC_DRV_RGTR_INPUT_OS_TYPE_FREEBSD); + + if (BNXT_PF(bp)) { + req.enables |= + htole32(HWRM_FUNC_DRV_RGTR_INPUT_ENABLES_VF_REQ_FWD); + } + + if (bp->fw_cap & BNXT_FW_CAP_OVS_64BIT_HANDLE) + req.flags |= cpu_to_le32(HWRM_FUNC_DRV_RGTR_INPUT_FLAGS_FLOW_HANDLE_64BIT_MODE); + + memset(async_events_bmap, 0, sizeof(async_events_bmap)); + for (i = 0; i < ARRAY_SIZE(bnxt_async_events_arr); i++) { + u16 event_id = bnxt_async_events_arr[i]; + + if (event_id == HWRM_ASYNC_EVENT_CMPL_EVENT_ID_ERROR_RECOVERY && + !(bp->fw_cap & BNXT_FW_CAP_ERROR_RECOVERY)) { + continue; + } + __set_bit(bnxt_async_events_arr[i], async_events_bmap); + } + if (bmap && bmap_size) { + for (i = 0; i < bmap_size; i++) { + if (test_bit(i, bmap)) + __set_bit(i, async_events_bmap); + } + } + for (i = 0; i < 8; i++) + req.async_event_fwd[i] |= htole32(events[i]); + + if (async_only) + req.enables = + htole32(HWRM_FUNC_DRV_RGTR_INPUT_ENABLES_ASYNC_EVENT_FWD); + + rc = hwrm_send_message(bp, &req, sizeof(req)); + + if (!rc) { + if (resp->flags & + le32toh(HWRM_FUNC_DRV_RGTR_OUTPUT_FLAGS_IF_CHANGE_SUPPORTED)) + bp->fw_cap |= BNXT_FW_CAP_IF_CHANGE; + } + + + return rc; } int @@ -2994,56 +3071,6 @@ int bnxt_hwrm_set_coal(struct bnxt_softc *softc) return rc; } -int bnxt_hwrm_func_rgtr_async_events(struct bnxt_softc *softc, unsigned long *bmap, - int bmap_size) -{ - struct hwrm_func_drv_rgtr_input req = {0}; - struct hwrm_func_drv_rgtr_output *resp = - (void *)softc->hwrm_cmd_resp.idi_vaddr; - bitstr_t *async_events_bmap; - uint32_t *events; - int i, rc = 0; - -#define BNXT_MAX_NUM_ASYNC_EVENTS 256 - async_events_bmap = bit_alloc(BNXT_MAX_NUM_ASYNC_EVENTS, M_DEVBUF, - M_WAITOK|M_ZERO); - events = (uint32_t *)async_events_bmap; - - bnxt_hwrm_cmd_hdr_init(softc, &req, HWRM_FUNC_DRV_RGTR); - - req.enables = - htole32(HWRM_FUNC_DRV_RGTR_INPUT_ENABLES_ASYNC_EVENT_FWD); - - memset(async_events_bmap, 0, sizeof(BNXT_MAX_NUM_ASYNC_EVENTS / 8)); - - bit_set(async_events_bmap, HWRM_ASYNC_EVENT_CMPL_EVENT_ID_LINK_STATUS_CHANGE); - bit_set(async_events_bmap, HWRM_ASYNC_EVENT_CMPL_EVENT_ID_PF_DRVR_UNLOAD); - bit_set(async_events_bmap, HWRM_ASYNC_EVENT_CMPL_EVENT_ID_PORT_CONN_NOT_ALLOWED); - bit_set(async_events_bmap, HWRM_ASYNC_EVENT_CMPL_EVENT_ID_VF_CFG_CHANGE); - bit_set(async_events_bmap, HWRM_ASYNC_EVENT_CMPL_EVENT_ID_LINK_SPEED_CFG_CHANGE); - - if (bmap && bmap_size) { - for (i = 0; i < bmap_size; i++) { - if (bit_test(bmap, i)) - bit_set(async_events_bmap, i); - } - } - - for (i = 0; i < 8; i++) - req.async_event_fwd[i] |= htole32(events[i]); - - free(async_events_bmap, M_DEVBUF); - - rc = hwrm_send_message(softc, &req, sizeof(req)); - if (!rc) { - if (resp->flags & - le32toh(HWRM_FUNC_DRV_RGTR_OUTPUT_FLAGS_IF_CHANGE_SUPPORTED)) - softc->fw_cap |= BNXT_FW_CAP_IF_CHANGE; - } - - return rc; -} - void bnxt_hwrm_ring_info_get(struct bnxt_softc *softc, uint8_t ring_type, uint32_t ring_id, uint32_t *prod, uint32_t *cons) { diff --git a/sys/dev/bnxt/bnxt_en/bnxt_hwrm.h b/sys/dev/bnxt/bnxt_en/bnxt_hwrm.h index 766556f9904c..126cad977c82 100644 --- a/sys/dev/bnxt/bnxt_en/bnxt_hwrm.h +++ b/sys/dev/bnxt/bnxt_en/bnxt_hwrm.h @@ -32,10 +32,11 @@ #define BNXT_PAUSE_TX (HWRM_PORT_PHY_QCFG_OUTPUT_PAUSE_TX) #define BNXT_PAUSE_RX (HWRM_PORT_PHY_QCFG_OUTPUT_PAUSE_RX) -#define BNXT_AUTO_PAUSE_AUTONEG_PAUSE \ - (HWRM_PORT_PHY_QCFG_OUTPUT_AUTO_PAUSE_AUTONEG_PAUSE) +#define BNXT_AUTO_PAUSE_AUTONEG_PAUSE \ + (HWRM_PORT_PHY_QCFG_OUTPUT_AUTO_PAUSE_AUTONEG_PAUSE) #define BNXT_HWRM_SHORT_REQ_LEN sizeof(struct hwrm_short_input) #define BNXT_BACKING_STORE_CFG_LEGACY_LEN 256 +#define SHORT_HWRM_CMD_TIMEOUT 500 /* HWRM Function Prototypes */ int @@ -48,7 +49,8 @@ int bnxt_hwrm_ring_free(struct bnxt_softc *softc, uint32_t type, struct bnxt_ring *ring, int cmpl_ring_id); int bnxt_hwrm_ver_get(struct bnxt_softc *softc); int bnxt_hwrm_queue_qportcfg(struct bnxt_softc *softc, uint32_t path_dir); -int bnxt_hwrm_func_drv_rgtr(struct bnxt_softc *softc); +int bnxt_hwrm_func_drv_rgtr(struct bnxt_softc *bp, unsigned long *bmap, int bmap_size, + bool async_only); int bnxt_hwrm_func_drv_unrgtr(struct bnxt_softc *softc, bool shutdown); int bnxt_hwrm_func_qcaps(struct bnxt_softc *softc); int bnxt_hwrm_func_qcfg(struct bnxt_softc *softc); diff --git a/sys/dev/bnxt/bnxt_en/bnxt_sysctl.c b/sys/dev/bnxt/bnxt_en/bnxt_sysctl.c index fdc54ab34511..012903ce21b3 100644 --- a/sys/dev/bnxt/bnxt_en/bnxt_sysctl.c +++ b/sys/dev/bnxt/bnxt_en/bnxt_sysctl.c @@ -29,11 +29,17 @@ #include #include #include +#include #include "bnxt.h" #include "bnxt_hwrm.h" #include "bnxt_sysctl.h" +DEFINE_MUTEX(tmp_mutex); /* mutex lock for driver */ +extern void bnxt_fw_reset(struct bnxt_softc *bp); +extern void bnxt_queue_sp_work(struct bnxt_softc *bp); +extern void +process_nq(struct bnxt_softc *softc, uint16_t nqid); /* * We want to create: * dev.bnxt.0.hwstats.txq0 @@ -1549,6 +1555,46 @@ bnxt_set_coal_tx_frames_irq(SYSCTL_HANDLER_ARGS) { return rc; } +static +void simulate_reset(struct bnxt_softc *bp, char *fwcli_string) +{ + struct hwrm_dbg_fw_cli_input req = {0}; + int rc = 0; + + bnxt_hwrm_cmd_hdr_init(bp, &req, HWRM_DBG_FW_CLI); + req.cmpl_ring = -1; + req.target_id = -1; + req.cli_cmd_len = strlen(fwcli_string); + req.host_buf_len = 64 * 1024; + strcpy((char *)req.cli_cmd, fwcli_string); + + BNXT_HWRM_LOCK(bp); + rc = _hwrm_send_message(bp, &req, sizeof(req)); + if (rc) { + device_printf(bp->dev, " Manual FW fault failed, rc:%x\n", rc); + } + BNXT_HWRM_UNLOCK(bp); +} + +static int +bnxt_reset_ctrl(SYSCTL_HANDLER_ARGS) { + struct bnxt_softc *softc = arg1; + int rc = 0; + char buf[50] = {0}; + + if (softc == NULL) + return EBUSY; + + rc = sysctl_handle_string(oidp, buf, sizeof(buf), req); + if (rc || req->newptr == NULL) + return rc; + + if (BNXT_CHIP_P5(softc)) + simulate_reset(softc, buf); + + return rc; +} + int bnxt_create_config_sysctls_pre(struct bnxt_softc *softc) { @@ -1606,6 +1652,10 @@ bnxt_create_config_sysctls_pre(struct bnxt_softc *softc) SYSCTL_ADD_U64(ctx, children, OID_AUTO, "fw_cap", CTLFLAG_RD, &softc->fw_cap, 0, "FW caps"); + SYSCTL_ADD_PROC(ctx, children, OID_AUTO, + "reset_ctrl", CTLTYPE_STRING | CTLFLAG_RWTUN, softc, + 0, bnxt_reset_ctrl, "A", + "Issue controller reset: 0 / 1"); return 0; } diff --git a/sys/dev/bnxt/bnxt_en/bnxt_ulp.c b/sys/dev/bnxt/bnxt_en/bnxt_ulp.c index 90253b0f5e9f..17ae916052f4 100644 --- a/sys/dev/bnxt/bnxt_en/bnxt_ulp.c +++ b/sys/dev/bnxt/bnxt_en/bnxt_ulp.c @@ -49,6 +49,8 @@ #include "bnxt_hwrm.h" #include "bnxt_ulp.h" +void bnxt_destroy_irq(struct bnxt_softc *softc); + static int bnxt_register_dev(struct bnxt_en_dev *edev, int ulp_id, struct bnxt_ulp_ops *ulp_ops, void *handle) { @@ -379,12 +381,12 @@ static int bnxt_register_async_events(struct bnxt_en_dev *edev, int ulp_id, ulp->async_events_bmap = events_bmap; wmb(); ulp->max_async_event_id = max_id; - bnxt_hwrm_func_drv_rgtr(bp); + bnxt_hwrm_func_drv_rgtr(bp, events_bmap, max_id + 1, true); mtx_unlock(&bp->en_ops_lock); return 0; } -static void bnxt_destroy_irq(struct bnxt_softc *softc) +void bnxt_destroy_irq(struct bnxt_softc *softc) { kfree(softc->irq_tbl); } diff --git a/sys/dev/bnxt/bnxt_en/if_bnxt.c b/sys/dev/bnxt/bnxt_en/if_bnxt.c index f3f6bd83d0c3..b26997c8f197 100644 --- a/sys/dev/bnxt/bnxt_en/if_bnxt.c +++ b/sys/dev/bnxt/bnxt_en/if_bnxt.c @@ -169,6 +169,8 @@ static const pci_vendor_info_t bnxt_vendor_info_array[] = SLIST_HEAD(softc_list, bnxt_softc_list) pf_list; int bnxt_num_pfs = 0; +void +process_nq(struct bnxt_softc *softc, uint16_t nqid); static void *bnxt_register(device_t dev); /* Soft queue setup and teardown */ @@ -236,7 +238,10 @@ static int bnxt_i2c_req(if_ctx_t ctx, struct ifi2creq *i2c); static void bnxt_get_port_module_status(struct bnxt_softc *softc); static void bnxt_rdma_aux_device_init(struct bnxt_softc *softc); static void bnxt_rdma_aux_device_uninit(struct bnxt_softc *softc); +static void bnxt_queue_fw_reset_work(struct bnxt_softc *bp, unsigned long delay); +void bnxt_queue_sp_work(struct bnxt_softc *bp); +void bnxt_fw_reset(struct bnxt_softc *bp); /* * Device Interface Declaration */ @@ -268,6 +273,27 @@ MODULE_VERSION(if_bnxt, 1); IFLIB_PNP_INFO(pci, bnxt, bnxt_vendor_info_array); +void writel_fbsd(struct bnxt_softc *bp, u32, u8, u32); +u32 readl_fbsd(struct bnxt_softc *bp, u32, u8); + +u32 readl_fbsd(struct bnxt_softc *bp, u32 reg_off, u8 bar_idx) +{ + + if (!bar_idx) + return bus_space_read_4(bp->doorbell_bar.tag, bp->doorbell_bar.handle, reg_off); + else + return bus_space_read_4(bp->hwrm_bar.tag, bp->hwrm_bar.handle, reg_off); +} + +void writel_fbsd(struct bnxt_softc *bp, u32 reg_off, u8 bar_idx, u32 val) +{ + + if (!bar_idx) + bus_space_write_4(bp->doorbell_bar.tag, bp->doorbell_bar.handle, reg_off, htole32(val)); + else + bus_space_write_4(bp->hwrm_bar.tag, bp->hwrm_bar.handle, reg_off, htole32(val)); +} + static DEFINE_IDA(bnxt_aux_dev_ids); static device_method_t bnxt_iflib_methods[] = { @@ -356,6 +382,11 @@ static struct if_shared_ctx bnxt_sctx_init = { .isc_driver_version = bnxt_driver_version, }; +#define PCI_SUBSYSTEM_ID 0x2e +static struct workqueue_struct *bnxt_pf_wq; + +extern void bnxt_destroy_irq(struct bnxt_softc *softc); + /* * Device Methods */ @@ -665,7 +696,6 @@ bnxt_rx_queues_alloc(if_ctx_t ctx, caddr_t *vaddrs, "Unable to allocate space for TPA\n"); goto tpa_alloc_fail; } - /* Allocate the AG ring */ softc->ag_rings[i].phys_id = (uint16_t)HWRM_NA_SIGNATURE; softc->ag_rings[i].softc = softc; @@ -1040,7 +1070,7 @@ static void bnxt_free_ctx_mem(struct bnxt_softc *softc) ctx->flags &= ~BNXT_CTX_FLAG_INITED; kfree(ctx); - softc->ctx = NULL; + softc->ctx_mem = NULL; } static int bnxt_alloc_ctx_mem(struct bnxt_softc *softc) @@ -1351,6 +1381,685 @@ static void bnxt_verify_asym_queues(struct bnxt_softc *softc) softc->max_lltc = min(softc->max_lltc, lltc); } +static int bnxt_hwrm_poll(struct bnxt_softc *bp) +{ + struct hwrm_ver_get_output *resp = + (void *)bp->hwrm_cmd_resp.idi_vaddr; + struct hwrm_ver_get_input req = {0}; + int rc; + + bnxt_hwrm_cmd_hdr_init(bp, &req, HWRM_VER_GET); + + req.hwrm_intf_maj = HWRM_VERSION_MAJOR; + req.hwrm_intf_min = HWRM_VERSION_MINOR; + req.hwrm_intf_upd = HWRM_VERSION_UPDATE; + + rc = _hwrm_send_message(bp, &req, sizeof(req)); + if (rc) + return rc; + + if (resp->flags & HWRM_VER_GET_OUTPUT_FLAGS_DEV_NOT_RDY) + rc = -EAGAIN; + + return rc; +} + +static void bnxt_rtnl_lock_sp(struct bnxt_softc *bp) +{ + /* We are called from bnxt_sp_task which has BNXT_STATE_IN_SP_TASK + * set. If the device is being closed, bnxt_close() may be holding + * rtnl() and waiting for BNXT_STATE_IN_SP_TASK to clear. So we + * must clear BNXT_STATE_IN_SP_TASK before holding rtnl(). + */ + clear_bit(BNXT_STATE_IN_SP_TASK, &bp->state); + rtnl_lock(); +} + +static void bnxt_rtnl_unlock_sp(struct bnxt_softc *bp) +{ + set_bit(BNXT_STATE_IN_SP_TASK, &bp->state); + rtnl_unlock(); +} + +static void bnxt_fw_fatal_close(struct bnxt_softc *softc) +{ + bnxt_disable_intr(softc->ctx); + if (pci_is_enabled(softc->pdev)) + pci_disable_device(softc->pdev); +} + +static u32 bnxt_fw_health_readl(struct bnxt_softc *bp, int reg_idx) +{ + struct bnxt_fw_health *fw_health = bp->fw_health; + u32 reg = fw_health->regs[reg_idx]; + u32 reg_type, reg_off, val = 0; + + reg_type = BNXT_FW_HEALTH_REG_TYPE(reg); + reg_off = BNXT_FW_HEALTH_REG_OFF(reg); + switch (reg_type) { + case BNXT_FW_HEALTH_REG_TYPE_CFG: + pci_read_config_dword(bp->pdev, reg_off, &val); + break; + case BNXT_FW_HEALTH_REG_TYPE_GRC: + reg_off = fw_health->mapped_regs[reg_idx]; + fallthrough; + case BNXT_FW_HEALTH_REG_TYPE_BAR0: + val = readl_fbsd(bp, reg_off, 0); + break; + case BNXT_FW_HEALTH_REG_TYPE_BAR1: + val = readl_fbsd(bp, reg_off, 2); + break; + } + if (reg_idx == BNXT_FW_RESET_INPROG_REG) + val &= fw_health->fw_reset_inprog_reg_mask; + return val; +} + +static void bnxt_fw_reset_close(struct bnxt_softc *bp) +{ + int i; + bnxt_ulp_stop(bp); + /* When firmware is in fatal state, quiesce device and disable + * bus master to prevent any potential bad DMAs before freeing + * kernel memory. + */ + if (test_bit(BNXT_STATE_FW_FATAL_COND, &bp->state)) { + u16 val = 0; + + val = pci_read_config(bp->dev, PCI_SUBSYSTEM_ID, 2); + if (val == 0xffff) { + bp->fw_reset_min_dsecs = 0; + } + bnxt_fw_fatal_close(bp); + } + + iflib_request_reset(bp->ctx); + bnxt_stop(bp->ctx); + bnxt_hwrm_func_drv_unrgtr(bp, false); + + for (i = bp->nrxqsets-1; i>=0; i--) { + if (BNXT_CHIP_P5(bp)) + iflib_irq_free(bp->ctx, &bp->nq_rings[i].irq); + else + iflib_irq_free(bp->ctx, &bp->rx_cp_rings[i].irq); + + } + if (pci_is_enabled(bp->pdev)) + pci_disable_device(bp->pdev); + pci_disable_busmaster(bp->dev); + bnxt_free_ctx_mem(bp); +} + +static bool is_bnxt_fw_ok(struct bnxt_softc *bp) +{ + struct bnxt_fw_health *fw_health = bp->fw_health; + bool no_heartbeat = false, has_reset = false; + u32 val; + + val = bnxt_fw_health_readl(bp, BNXT_FW_HEARTBEAT_REG); + if (val == fw_health->last_fw_heartbeat) + no_heartbeat = true; + + val = bnxt_fw_health_readl(bp, BNXT_FW_RESET_CNT_REG); + if (val != fw_health->last_fw_reset_cnt) + has_reset = true; + + if (!no_heartbeat && has_reset) + return true; + + return false; +} + +void bnxt_fw_reset(struct bnxt_softc *bp) +{ + bnxt_rtnl_lock_sp(bp); + if (test_bit(BNXT_STATE_OPEN, &bp->state) && + !test_bit(BNXT_STATE_IN_FW_RESET, &bp->state)) { + int tmo; + set_bit(BNXT_STATE_IN_FW_RESET, &bp->state); + bnxt_fw_reset_close(bp); + + if ((bp->fw_cap & BNXT_FW_CAP_ERR_RECOVER_RELOAD)) { + bp->fw_reset_state = BNXT_FW_RESET_STATE_POLL_FW_DOWN; + tmo = HZ / 10; + } else { + bp->fw_reset_state = BNXT_FW_RESET_STATE_ENABLE_DEV; + tmo = bp->fw_reset_min_dsecs * HZ /10; + } + bnxt_queue_fw_reset_work(bp, tmo); + } + bnxt_rtnl_unlock_sp(bp); +} + +static void bnxt_queue_fw_reset_work(struct bnxt_softc *bp, unsigned long delay) +{ + if (!(test_bit(BNXT_STATE_IN_FW_RESET, &bp->state))) + return; + + if (BNXT_PF(bp)) + queue_delayed_work(bnxt_pf_wq, &bp->fw_reset_task, delay); + else + schedule_delayed_work(&bp->fw_reset_task, delay); +} + +void bnxt_queue_sp_work(struct bnxt_softc *bp) +{ + if (BNXT_PF(bp)) + queue_work(bnxt_pf_wq, &bp->sp_task); + else + schedule_work(&bp->sp_task); +} + +static void bnxt_fw_reset_writel(struct bnxt_softc *bp, int reg_idx) +{ + struct bnxt_fw_health *fw_health = bp->fw_health; + u32 reg = fw_health->fw_reset_seq_regs[reg_idx]; + u32 val = fw_health->fw_reset_seq_vals[reg_idx]; + u32 reg_type, reg_off, delay_msecs; + + delay_msecs = fw_health->fw_reset_seq_delay_msec[reg_idx]; + reg_type = BNXT_FW_HEALTH_REG_TYPE(reg); + reg_off = BNXT_FW_HEALTH_REG_OFF(reg); + switch (reg_type) { + case BNXT_FW_HEALTH_REG_TYPE_CFG: + pci_write_config_dword(bp->pdev, reg_off, val); + break; + case BNXT_FW_HEALTH_REG_TYPE_GRC: + writel_fbsd(bp, BNXT_GRCPF_REG_WINDOW_BASE_OUT + 4, 0, reg_off & BNXT_GRC_BASE_MASK); + reg_off = (reg_off & BNXT_GRC_OFFSET_MASK) + 0x2000; + fallthrough; + case BNXT_FW_HEALTH_REG_TYPE_BAR0: + writel_fbsd(bp, reg_off, 0, val); + break; + case BNXT_FW_HEALTH_REG_TYPE_BAR1: + writel_fbsd(bp, reg_off, 2, val); + break; + } + if (delay_msecs) { + pci_read_config_dword(bp->pdev, 0, &val); + msleep(delay_msecs); + } +} + +static void bnxt_reset_all(struct bnxt_softc *bp) +{ + struct bnxt_fw_health *fw_health = bp->fw_health; + int i, rc; + + if (bp->fw_cap & BNXT_FW_CAP_ERR_RECOVER_RELOAD) { + bp->fw_reset_timestamp = jiffies; + return; + } + + if (fw_health->flags & HWRM_ERROR_RECOVERY_QCFG_OUTPUT_FLAGS_HOST) { + for (i = 0; i < fw_health->fw_reset_seq_cnt; i++) + bnxt_fw_reset_writel(bp, i); + } else if (fw_health->flags & HWRM_ERROR_RECOVERY_QCFG_OUTPUT_FLAGS_CO_CPU) { + struct hwrm_fw_reset_input req = {0}; + + bnxt_hwrm_cmd_hdr_init(bp, &req, HWRM_FW_RESET); + req.target_id = htole16(HWRM_TARGET_ID_KONG); + req.embedded_proc_type = HWRM_FW_RESET_INPUT_EMBEDDED_PROC_TYPE_CHIP; + req.selfrst_status = HWRM_FW_RESET_INPUT_SELFRST_STATUS_SELFRSTASAP; + req.flags = HWRM_FW_RESET_INPUT_FLAGS_RESET_GRACEFUL; + rc = hwrm_send_message(bp, &req, sizeof(req)); + + if (rc != -ENODEV) + device_printf(bp->dev, "Unable to reset FW rc=%d\n", rc); + } + bp->fw_reset_timestamp = jiffies; +} + +static int __bnxt_alloc_fw_health(struct bnxt_softc *bp) +{ + if (bp->fw_health) + return 0; + + bp->fw_health = kzalloc(sizeof(*bp->fw_health), GFP_KERNEL); + if (!bp->fw_health) + return -ENOMEM; + + mutex_init(&bp->fw_health->lock); + return 0; +} + +static int bnxt_alloc_fw_health(struct bnxt_softc *bp) +{ + int rc; + + if (!(bp->fw_cap & BNXT_FW_CAP_HOT_RESET) && + !(bp->fw_cap & BNXT_FW_CAP_ERROR_RECOVERY)) + return 0; + + rc = __bnxt_alloc_fw_health(bp); + if (rc) { + bp->fw_cap &= ~BNXT_FW_CAP_HOT_RESET; + bp->fw_cap &= ~BNXT_FW_CAP_ERROR_RECOVERY; + return rc; + } + + return 0; +} + +static inline void __bnxt_map_fw_health_reg(struct bnxt_softc *bp, u32 reg) +{ + writel_fbsd(bp, BNXT_GRCPF_REG_WINDOW_BASE_OUT + BNXT_FW_HEALTH_WIN_MAP_OFF, 0, reg & BNXT_GRC_BASE_MASK); +} + +static int bnxt_map_fw_health_regs(struct bnxt_softc *bp) +{ + struct bnxt_fw_health *fw_health = bp->fw_health; + u32 reg_base = 0xffffffff; + int i; + + bp->fw_health->status_reliable = false; + bp->fw_health->resets_reliable = false; + /* Only pre-map the monitoring GRC registers using window 3 */ + for (i = 0; i < 4; i++) { + u32 reg = fw_health->regs[i]; + + if (BNXT_FW_HEALTH_REG_TYPE(reg) != BNXT_FW_HEALTH_REG_TYPE_GRC) + continue; + if (reg_base == 0xffffffff) + reg_base = reg & BNXT_GRC_BASE_MASK; + if ((reg & BNXT_GRC_BASE_MASK) != reg_base) + return -ERANGE; + fw_health->mapped_regs[i] = BNXT_FW_HEALTH_WIN_OFF(reg); + } + bp->fw_health->status_reliable = true; + bp->fw_health->resets_reliable = true; + if (reg_base == 0xffffffff) + return 0; + + __bnxt_map_fw_health_reg(bp, reg_base); + return 0; +} + +static void bnxt_inv_fw_health_reg(struct bnxt_softc *bp) +{ + struct bnxt_fw_health *fw_health = bp->fw_health; + u32 reg_type; + + if (!fw_health) + return; + + reg_type = BNXT_FW_HEALTH_REG_TYPE(fw_health->regs[BNXT_FW_HEALTH_REG]); + if (reg_type == BNXT_FW_HEALTH_REG_TYPE_GRC) + fw_health->status_reliable = false; + + reg_type = BNXT_FW_HEALTH_REG_TYPE(fw_health->regs[BNXT_FW_RESET_CNT_REG]); + if (reg_type == BNXT_FW_HEALTH_REG_TYPE_GRC) + fw_health->resets_reliable = false; +} + +static int bnxt_hwrm_error_recovery_qcfg(struct bnxt_softc *bp) +{ + struct bnxt_fw_health *fw_health = bp->fw_health; + struct hwrm_error_recovery_qcfg_output *resp = + (void *)bp->hwrm_cmd_resp.idi_vaddr; + struct hwrm_error_recovery_qcfg_input req = {0}; + int rc, i; + + if (!(bp->fw_cap & BNXT_FW_CAP_ERROR_RECOVERY)) + return 0; + + bnxt_hwrm_cmd_hdr_init(bp, &req, HWRM_ERROR_RECOVERY_QCFG); + rc = _hwrm_send_message(bp, &req, sizeof(req)); + + if (rc) + goto err_recovery_out; + fw_health->flags = le32toh(resp->flags); + if ((fw_health->flags & HWRM_ERROR_RECOVERY_QCFG_OUTPUT_FLAGS_CO_CPU) && + !(bp->fw_cap & BNXT_FW_CAP_KONG_MB_CHNL)) { + rc = -EINVAL; + goto err_recovery_out; + } + fw_health->polling_dsecs = le32toh(resp->driver_polling_freq); + fw_health->master_func_wait_dsecs = + le32toh(resp->master_func_wait_period); + fw_health->normal_func_wait_dsecs = + le32toh(resp->normal_func_wait_period); + fw_health->post_reset_wait_dsecs = + le32toh(resp->master_func_wait_period_after_reset); + fw_health->post_reset_max_wait_dsecs = + le32toh(resp->max_bailout_time_after_reset); + fw_health->regs[BNXT_FW_HEALTH_REG] = + le32toh(resp->fw_health_status_reg); + fw_health->regs[BNXT_FW_HEARTBEAT_REG] = + le32toh(resp->fw_heartbeat_reg); + fw_health->regs[BNXT_FW_RESET_CNT_REG] = + le32toh(resp->fw_reset_cnt_reg); + fw_health->regs[BNXT_FW_RESET_INPROG_REG] = + le32toh(resp->reset_inprogress_reg); + fw_health->fw_reset_inprog_reg_mask = + le32toh(resp->reset_inprogress_reg_mask); + fw_health->fw_reset_seq_cnt = resp->reg_array_cnt; + if (fw_health->fw_reset_seq_cnt >= 16) { + rc = -EINVAL; + goto err_recovery_out; *** 531 LINES SKIPPED *** From nobody Tue May 28 10:36: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 4VpTTB41R1z5M04s; Tue, 28 May 2024 10:36: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 4VpTTB1bRXz4Tdv; Tue, 28 May 2024 10:36:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716892590; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RujYFqccEx4Hj0CfXlof10k3uHfiT5XlT5J/+hTaD+I=; b=tX5lyWX0Ok+fcs9OOk8/skZnKsM4tJv6WPL7i5a+A5u8T2Glel2v3pk8hTpSbNG7KUk2pw H8y9mP4NzdBfqlILwlTy7UCvcs/BIxqDAosgZx+0TLXkeFj+tL/xoLoQ5up+8lyWXBmG03 11VdWy3l8sLNaA3F9gSHlAfZScp513PQy3KphCIjSkkwABVCTQ18ICvMVKnZH7g82MtqXs C8eG5aeZAPVFDE1LJbD+73uoL2voU2QaEVdKLBFTrbD/A/8wpGRrBQvQiaD50dj8RlqVd4 jPLwlWcb9Ncqc7NfuSWgNyP10QRcpBObqD22/XHVsaKGiUU0bEnOow/3c7CfHA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1716892590; a=rsa-sha256; cv=none; b=n7nsG+eO6cgdUMSqtxMwdQYEDXMVkJWpZ+vPWo2mPmpdoP39V3pLgdX4Ew7NADWoVpu7H1 Veydo3I4kSX3mr/7eid+OfrrHL697aIFfaMvz0kpgtG8MCcXBZeh1/sOZlKxJV/uRYIkki /H1fVnwMU/lOr+RdbiVrwSZ0sLRJIIJtA+YYFtbAXGcElSzUMW4nlK9EzeqnaeBD6hOOaq ryZeUASg5dKZiUmY+upm1D6ONhTVI9DVYs6vDuy1GTzQ28AVwoJJUCNEDwVR8GQTNzVo2+ Hp+Ta43I/Csi/wPvEpbWo2UZ8HPqx25GjBx4Eoy1Zxmdkn3SS/4xtVISd+DBuQ== 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=1716892590; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RujYFqccEx4Hj0CfXlof10k3uHfiT5XlT5J/+hTaD+I=; b=U+yFJMXQGkDO1IbDEcQVTBV+qnq0vpJXH/pGBa/FozV/zhgKByaAPZ1KFg6epTwbJ/ODzz pm3PGNg1EH/dV75fx1Zv7/mznQznM1ZE5rC1/vDwUVC1RKc44DY2d3TNODur7EsJyFmBE6 QGPLj7J7dmF0wcZbvb4mrMcybdAVqRtty41eUZmmAliFmMod4Gr63rGJIN4wLNxxWse/JJ ohGdx7TH4mHhaFWxmYYMJeZGCv3If4AZoPf63Zgk6ACmNCCvRzxJysLIEiIq/E2HKJqtg2 p/qt3D6PpyFatIMOUnp9o8ieWC/MylEm40baeJMSXSRa6qtpxjodbpWaNHrM0w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VpTTB0nMcz1P7Q; Tue, 28 May 2024 10:36: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 44SAaUVb051959; Tue, 28 May 2024 10:36:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44SAaSST051953; Tue, 28 May 2024 10:36:28 GMT (envelope-from git) Date: Tue, 28 May 2024 10:36:28 GMT Message-Id: <202405281036.44SAaSST051953@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Sumit Saxena Subject: git: 3d8bbe001115 - main - bnxt_en: Firmware header version update to 1.10.3.42 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ssaxena X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3d8bbe001115f3e9742c128716335e654729ce1a Auto-Submitted: auto-generated The branch main has been updated by ssaxena: URL: https://cgit.FreeBSD.org/src/commit/?id=3d8bbe001115f3e9742c128716335e654729ce1a commit 3d8bbe001115f3e9742c128716335e654729ce1a Author: Chandrakanth patil AuthorDate: 2024-04-27 18:23:05 +0000 Commit: Sumit Saxena CommitDate: 2024-05-28 10:36:11 +0000 bnxt_en: Firmware header version update to 1.10.3.42 This file is automatically generated from the firmware code to export the driver interfaces. Reviewed by: imp Approved by: imp Differential revision: https://reviews.freebsd.org/D45009 --- sys/dev/bnxt/bnxt_en/bnxt.h | 2 +- sys/dev/bnxt/bnxt_en/hsi_struct_def.h | 69997 +++++++++++++++++++------------- 2 files changed, 41564 insertions(+), 28435 deletions(-) diff --git a/sys/dev/bnxt/bnxt_en/bnxt.h b/sys/dev/bnxt/bnxt_en/bnxt.h index 2faea00e4266..cf4f99077b58 100644 --- a/sys/dev/bnxt/bnxt_en/bnxt.h +++ b/sys/dev/bnxt/bnxt_en/bnxt.h @@ -771,7 +771,7 @@ struct bnxt_ctx_mem_type { #define BNXT_CTX_CQDBS HWRM_FUNC_BACKING_STORE_CFG_V2_INPUT_TYPE_CQ_DB_SHADOW #define BNXT_CTX_QTKC HWRM_FUNC_BACKING_STORE_CFG_V2_INPUT_TYPE_QUIC_TKC #define BNXT_CTX_QRKC HWRM_FUNC_BACKING_STORE_CFG_V2_INPUT_TYPE_QUIC_RKC -#define BNXT_CTX_MAX (BNXT_CTX_QRKC + 1) +#define BNXT_CTX_MAX (BNXT_CTX_TIM + 1) struct bnxt_ctx_mem_info { u8 tqm_fp_rings_count; diff --git a/sys/dev/bnxt/bnxt_en/hsi_struct_def.h b/sys/dev/bnxt/bnxt_en/hsi_struct_def.h index 4aec765e1b26..baecfc8f659c 100644 --- a/sys/dev/bnxt/bnxt_en/hsi_struct_def.h +++ b/sys/dev/bnxt/bnxt_en/hsi_struct_def.h @@ -1,7 +1,7 @@ /*- * BSD LICENSE * - * Copyright (c) 2016 Broadcom, All Rights Reserved. + * Copyright (c) 2024 Broadcom, All Rights Reserved. * The term Broadcom refers to Broadcom Limited and/or its subsidiaries * * Redistribution and use in source and binary forms, with or without @@ -31,7 +31,7 @@ __FBSDID("$FreeBSD$"); /* - * Copyright(c) 2001-2023, Broadcom. All rights reserved. The + * Copyright(c) 2001-2024, Broadcom. All rights reserved. The * term Broadcom refers to Broadcom Inc. and/or its subsidiaries. * Proprietary and Confidential Information. * @@ -45,6 +45,10 @@ __FBSDID("$FreeBSD$"); #ifndef _HSI_STRUCT_DEF_H_ #define _HSI_STRUCT_DEF_H_ +#if defined(HAVE_STDINT_H) +#include +#endif + /* This is the HWRM command header. */ /* hwrm_cmd_hdr (size:128b/16B) */ @@ -76,7 +80,7 @@ typedef struct hwrm_cmd_hdr { * physical address (HPA) or a guest physical address (GPA) and must * point to a physically contiguous block of memory. */ - uint64_t resp_addr; + uint64_t resp_addr; } hwrm_cmd_hdr_t, *phwrm_cmd_hdr_t; /* This is the HWRM response header. */ @@ -111,6 +115,10 @@ typedef struct hwrm_resp_hdr { #define TLV_TYPE_QUERY_ROCE_CC_GEN1 UINT32_C(0x4) /* RoCE slow path command to modify CC Gen1 support. */ #define TLV_TYPE_MODIFY_ROCE_CC_GEN1 UINT32_C(0x5) +/* RoCE slow path command to query CC Gen2 support. */ +#define TLV_TYPE_QUERY_ROCE_CC_GEN2 UINT32_C(0x6) +/* RoCE slow path command to modify CC Gen2 support. */ +#define TLV_TYPE_MODIFY_ROCE_CC_GEN2 UINT32_C(0x7) /* Engine CKV - The Alias key EC curve and ECC public key information. */ #define TLV_TYPE_ENGINE_CKV_ALIAS_ECC_PUBLIC_KEY UINT32_C(0x8001) /* Engine CKV - Initialization vector. */ @@ -193,14 +201,14 @@ typedef struct tlv { typedef struct input { /* - * This value indicates what type of request this is. The format + * This value indicates what type of request this is. The format * for the rest of the command is determined by this field. */ uint16_t req_type; /* * This value indicates the what completion ring the request will - * be optionally completed on. If the value is -1, then no - * CR completion will be generated. Any other value must be a + * be optionally completed on. If the value is -1, then no + * CR completion will be generated. Any other value must be a * valid CR ring_id value for this function. */ uint16_t cmpl_ring; @@ -216,7 +224,7 @@ typedef struct input { uint16_t target_id; /* * This is the host address where the response will be written - * when the request is complete. This area must be 16B aligned + * when the request is complete. This area must be 16B aligned * and must be cleared to zero before the request is made. */ uint64_t resp_addr; @@ -238,7 +246,7 @@ typedef struct output { /* This field provides original sequence number of the command. */ uint16_t seq_id; /* - * This field is the length of the response in bytes. The + * This field is the length of the response in bytes. The * last byte of the response is a valid flag that will read * as '1' when the command has been completely written to * memory. @@ -374,6 +382,14 @@ typedef struct hwrm_short_input { ((x) == 0x85 ? "HWRM_QUEUE_VLANPRI2PRI_CFG": \ ((x) == 0x86 ? "HWRM_QUEUE_GLOBAL_CFG": \ ((x) == 0x87 ? "HWRM_QUEUE_GLOBAL_QCFG": \ + ((x) == 0x88 ? "HWRM_QUEUE_ADPTV_QOS_RX_FEATURE_QCFG": \ + ((x) == 0x89 ? "HWRM_QUEUE_ADPTV_QOS_RX_FEATURE_CFG": \ + ((x) == 0x8a ? "HWRM_QUEUE_ADPTV_QOS_TX_FEATURE_QCFG": \ + ((x) == 0x8b ? "HWRM_QUEUE_ADPTV_QOS_TX_FEATURE_CFG": \ + ((x) == 0x8c ? "HWRM_QUEUE_QCAPS": \ + ((x) == 0x8d ? "HWRM_QUEUE_ADPTV_QOS_RX_TUNING_QCFG": \ + ((x) == 0x8e ? "HWRM_QUEUE_ADPTV_QOS_RX_TUNING_CFG": \ + ((x) == 0x8f ? "HWRM_QUEUE_ADPTV_QOS_TX_TUNING_QCFG": \ ((x) == 0x90 ? "HWRM_CFA_L2_FILTER_ALLOC": \ ((x) == 0x91 ? "HWRM_CFA_L2_FILTER_FREE": \ ((x) == 0x92 ? "HWRM_CFA_L2_FILTER_CFG": \ @@ -392,6 +408,7 @@ typedef struct hwrm_short_input { ((x) == 0xa0 ? "HWRM_TUNNEL_DST_PORT_QUERY": \ ((x) == 0xa1 ? "HWRM_TUNNEL_DST_PORT_ALLOC": \ ((x) == 0xa2 ? "HWRM_TUNNEL_DST_PORT_FREE": \ + ((x) == 0xa3 ? "HWRM_QUEUE_ADPTV_QOS_TX_TUNING_CFG": \ ((x) == 0xaf ? "HWRM_STAT_CTX_ENG_QUERY": \ ((x) == 0xb0 ? "HWRM_STAT_CTX_ALLOC": \ ((x) == 0xb1 ? "HWRM_STAT_CTX_FREE": \ @@ -439,6 +456,7 @@ typedef struct hwrm_short_input { ((x) == 0xdb ? "HWRM_PORT_EP_TX_CFG": \ ((x) == 0xdc ? "HWRM_PORT_CFG": \ ((x) == 0xdd ? "HWRM_PORT_QCFG": \ + ((x) == 0xdf ? "HWRM_PORT_MAC_QCAPS": \ ((x) == 0xe0 ? "HWRM_TEMP_MONITOR_QUERY": \ ((x) == 0xe1 ? "HWRM_REG_POWER_QUERY": \ ((x) == 0xe2 ? "HWRM_CORE_FREQUENCY_QUERY": \ @@ -456,7 +474,7 @@ typedef struct hwrm_short_input { ((x) == 0xfa ? "HWRM_CFA_METER_INSTANCE_CFG": \ ((x) == 0xfd ? "HWRM_CFA_VFR_ALLOC": \ ((x) == 0xfe ? "HWRM_CFA_VFR_FREE": \ - "Unknown decode" )))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))) : \ + "Unknown decode" )))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))) : \ (((x) < 0x180) ? \ ((x) == 0x100 ? "HWRM_CFA_VF_PAIR_ALLOC": \ ((x) == 0x101 ? "HWRM_CFA_VF_PAIR_FREE": \ @@ -500,6 +518,7 @@ typedef struct hwrm_short_input { ((x) == 0x127 ? "HWRM_CFA_LAG_GROUP_MEMBER_UNRGTR": \ ((x) == 0x128 ? "HWRM_CFA_TLS_FILTER_ALLOC": \ ((x) == 0x129 ? "HWRM_CFA_TLS_FILTER_FREE": \ + ((x) == 0x12a ? "HWRM_CFA_RELEASE_AFM_FUNC": \ ((x) == 0x12e ? "HWRM_ENGINE_CKV_STATUS": \ ((x) == 0x12f ? "HWRM_ENGINE_CKV_CKEK_ADD": \ ((x) == 0x130 ? "HWRM_ENGINE_CKV_CKEK_DELETE": \ @@ -539,7 +558,7 @@ typedef struct hwrm_short_input { ((x) == 0x163 ? "HWRM_ENGINE_NQ_FREE": \ ((x) == 0x164 ? "HWRM_ENGINE_ON_DIE_RQE_CREDITS": \ ((x) == 0x165 ? "HWRM_ENGINE_FUNC_QCFG": \ - "Unknown decode" ))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))) : \ + "Unknown decode" )))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))) : \ (((x) < 0x200) ? \ ((x) == 0x190 ? "HWRM_FUNC_RESOURCE_QCAPS": \ ((x) == 0x191 ? "HWRM_FUNC_VF_RESOURCE_CFG": \ @@ -570,7 +589,14 @@ typedef struct hwrm_short_input { ((x) == 0x1aa ? "HWRM_FUNC_DBR_RECOVERY_COMPLETED": \ ((x) == 0x1ab ? "HWRM_FUNC_SYNCE_CFG": \ ((x) == 0x1ac ? "HWRM_FUNC_SYNCE_QCFG": \ - "Unknown decode" ))))))))))))))))))))))))))))) : \ + ((x) == 0x1ad ? "HWRM_FUNC_KEY_CTX_FREE": \ + ((x) == 0x1ae ? "HWRM_FUNC_LAG_MODE_CFG": \ + ((x) == 0x1af ? "HWRM_FUNC_LAG_MODE_QCFG": \ + ((x) == 0x1b0 ? "HWRM_FUNC_LAG_CREATE": \ + ((x) == 0x1b1 ? "HWRM_FUNC_LAG_UPDATE": \ + ((x) == 0x1b2 ? "HWRM_FUNC_LAG_FREE": \ + ((x) == 0x1b3 ? "HWRM_FUNC_LAG_QCFG": \ + "Unknown decode" )))))))))))))))))))))))))))))))))))) : \ (((x) < 0x280) ? \ ((x) == 0x200 ? "HWRM_SELFTEST_QLIST": \ ((x) == 0x201 ? "HWRM_SELFTEST_EXEC": \ @@ -586,9 +612,9 @@ typedef struct hwrm_short_input { ((x) == 0x20b ? "HWRM_MFG_FRU_EEPROM_READ": \ ((x) == 0x20c ? "HWRM_MFG_SOC_IMAGE": \ ((x) == 0x20d ? "HWRM_MFG_SOC_QSTATUS": \ - ((x) == 0x20e ? "HWRM_MFG_PARAM_SEEPROM_SYNC": \ - ((x) == 0x20f ? "HWRM_MFG_PARAM_SEEPROM_READ": \ - ((x) == 0x210 ? "HWRM_MFG_PARAM_SEEPROM_HEALTH": \ + ((x) == 0x20e ? "HWRM_MFG_PARAM_CRITICAL_DATA_FINALIZE": \ + ((x) == 0x20f ? "HWRM_MFG_PARAM_CRITICAL_DATA_READ": \ + ((x) == 0x210 ? "HWRM_MFG_PARAM_CRITICAL_DATA_HEALTH": \ ((x) == 0x211 ? "HWRM_MFG_PRVSN_EXPORT_CSR": \ ((x) == 0x212 ? "HWRM_MFG_PRVSN_IMPORT_CERT": \ ((x) == 0x213 ? "HWRM_MFG_PRVSN_GET_STATE": \ @@ -597,12 +623,22 @@ typedef struct hwrm_short_input { ((x) == 0x216 ? "HWRM_MFG_SELFTEST_QLIST": \ ((x) == 0x217 ? "HWRM_MFG_SELFTEST_EXEC": \ ((x) == 0x218 ? "HWRM_STAT_GENERIC_QSTATS": \ - "Unknown decode" ))))))))))))))))))))))))) : \ + ((x) == 0x219 ? "HWRM_MFG_PRVSN_EXPORT_CERT": \ + ((x) == 0x21a ? "HWRM_STAT_DB_ERROR_QSTATS": \ + ((x) == 0x258 ? "HWRM_UDCC_QCAPS": \ + ((x) == 0x259 ? "HWRM_UDCC_CFG": \ + ((x) == 0x25a ? "HWRM_UDCC_QCFG": \ + ((x) == 0x25b ? "HWRM_UDCC_SESSION_CFG": \ + ((x) == 0x25c ? "HWRM_UDCC_SESSION_QCFG": \ + ((x) == 0x25d ? "HWRM_UDCC_SESSION_QUERY": \ + ((x) == 0x25e ? "HWRM_UDCC_COMP_CFG": \ + ((x) == 0x25f ? "HWRM_UDCC_COMP_QCFG": \ + ((x) == 0x260 ? "HWRM_UDCC_COMP_QUERY": \ + "Unknown decode" )))))))))))))))))))))))))))))))))))) : \ (((x) < 0x300) ? \ ((x) == 0x2bc ? "HWRM_TF": \ ((x) == 0x2bd ? "HWRM_TF_VERSION_GET": \ ((x) == 0x2c6 ? "HWRM_TF_SESSION_OPEN": \ - ((x) == 0x2c7 ? "HWRM_TF_SESSION_ATTACH": \ ((x) == 0x2c8 ? "HWRM_TF_SESSION_REGISTER": \ ((x) == 0x2c9 ? "HWRM_TF_SESSION_UNREGISTER": \ ((x) == 0x2ca ? "HWRM_TF_SESSION_CLOSE": \ @@ -617,14 +653,6 @@ typedef struct hwrm_short_input { ((x) == 0x2da ? "HWRM_TF_TBL_TYPE_GET": \ ((x) == 0x2db ? "HWRM_TF_TBL_TYPE_SET": \ ((x) == 0x2dc ? "HWRM_TF_TBL_TYPE_BULK_GET": \ - ((x) == 0x2e2 ? "HWRM_TF_CTXT_MEM_ALLOC": \ - ((x) == 0x2e3 ? "HWRM_TF_CTXT_MEM_FREE": \ - ((x) == 0x2e4 ? "HWRM_TF_CTXT_MEM_RGTR": \ - ((x) == 0x2e5 ? "HWRM_TF_CTXT_MEM_UNRGTR": \ - ((x) == 0x2e6 ? "HWRM_TF_EXT_EM_QCAPS": \ - ((x) == 0x2e7 ? "HWRM_TF_EXT_EM_OP": \ - ((x) == 0x2e8 ? "HWRM_TF_EXT_EM_CFG": \ - ((x) == 0x2e9 ? "HWRM_TF_EXT_EM_QCFG": \ ((x) == 0x2ea ? "HWRM_TF_EM_INSERT": \ ((x) == 0x2eb ? "HWRM_TF_EM_DELETE": \ ((x) == 0x2ec ? "HWRM_TF_EM_HASH_INSERT": \ @@ -637,7 +665,13 @@ typedef struct hwrm_short_input { ((x) == 0x2fd ? "HWRM_TF_GLOBAL_CFG_GET": \ ((x) == 0x2fe ? "HWRM_TF_IF_TBL_SET": \ ((x) == 0x2ff ? "HWRM_TF_IF_TBL_GET": \ - "Unknown decode" )))))))))))))))))))))))))))))))))))))) : \ + "Unknown decode" ))))))))))))))))))))))))))))) : \ + (((x) < 0x380) ? \ + ((x) == 0x300 ? "HWRM_TF_RESC_USAGE_SET": \ + ((x) == 0x301 ? "HWRM_TF_RESC_USAGE_QUERY": \ + ((x) == 0x302 ? "HWRM_TF_TBL_TYPE_ALLOC": \ + ((x) == 0x303 ? "HWRM_TF_TBL_TYPE_FREE": \ + "Unknown decode" )))) : \ (((x) < 0x400) ? \ ((x) == 0x380 ? "HWRM_TFC_TBL_SCOPE_QCAPS": \ ((x) == 0x381 ? "HWRM_TFC_TBL_SCOPE_ID_ALLOC": \ @@ -663,11 +697,19 @@ typedef struct hwrm_short_input { ((x) == 0x395 ? "HWRM_TFC_TCAM_ALLOC": \ ((x) == 0x396 ? "HWRM_TFC_TCAM_ALLOC_SET": \ ((x) == 0x397 ? "HWRM_TFC_TCAM_FREE": \ - "Unknown decode" )))))))))))))))))))))))) : \ + ((x) == 0x398 ? "HWRM_TFC_IF_TBL_SET": \ + ((x) == 0x399 ? "HWRM_TFC_IF_TBL_GET": \ + ((x) == 0x39a ? "HWRM_TFC_TBL_SCOPE_CONFIG_GET": \ + ((x) == 0x39b ? "HWRM_TFC_RESC_USAGE_QUERY": \ + ((x) == 0x39c ? "HWRM_QUEUE_PFCWD_TIMEOUT_QCAPS": \ + ((x) == 0x39d ? "HWRM_QUEUE_PFCWD_TIMEOUT_CFG": \ + ((x) == 0x39e ? "HWRM_QUEUE_PFCWD_TIMEOUT_QCFG": \ + "Unknown decode" ))))))))))))))))))))))))))))))) : \ (((x) < 0x480) ? \ ((x) == 0x400 ? "HWRM_SV": \ "Unknown decode" ) : \ (((x) < 0xff80) ? \ + ((x) == 0xff0f ? "HWRM_DBG_LOG_BUFFER_FLUSH": \ ((x) == 0xff10 ? "HWRM_DBG_READ_DIRECT": \ ((x) == 0xff11 ? "HWRM_DBG_READ_INDIRECT": \ ((x) == 0xff12 ? "HWRM_DBG_WRITE_DIRECT": \ @@ -696,8 +738,10 @@ typedef struct hwrm_short_input { ((x) == 0xff29 ? "HWRM_DBG_USEQ_RUN": \ ((x) == 0xff2a ? "HWRM_DBG_USEQ_DELIVERY_REQ": \ ((x) == 0xff2b ? "HWRM_DBG_USEQ_RESP_HDR": \ - "Unknown decode" )))))))))))))))))))))))))))) : \ + "Unknown decode" ))))))))))))))))))))))))))))) : \ (((x) <= 0xffff) ? \ + ((x) == 0xffea ? "HWRM_NVM_GET_VPD_FIELD_INFO": \ + ((x) == 0xffeb ? "HWRM_NVM_SET_VPD_FIELD_INFO": \ ((x) == 0xffec ? "HWRM_NVM_DEFRAG": \ ((x) == 0xffed ? "HWRM_NVM_REQ_ARBITRATION": \ ((x) == 0xffee ? "HWRM_NVM_FACTORY_DEFAULTS": \ @@ -718,8 +762,8 @@ typedef struct hwrm_short_input { ((x) == 0xfffd ? "HWRM_NVM_READ": \ ((x) == 0xfffe ? "HWRM_NVM_WRITE": \ ((x) == 0xffff ? "HWRM_NVM_RAW_WRITE_BLK": \ - "Unknown decode" )))))))))))))))))))) : \ - "Unknown decode" )))))))))) + "Unknown decode" )))))))))))))))))))))) : \ + "Unknown decode" ))))))))))) /* @@ -800,7 +844,7 @@ typedef struct cmd_nums { #define HWRM_FUNC_VLAN_QCFG UINT32_C(0x34) #define HWRM_QUEUE_PFCENABLE_QCFG UINT32_C(0x35) #define HWRM_QUEUE_PFCENABLE_CFG UINT32_C(0x36) - #define HWRM_QUEUE_PRI2COS_QCFG UINT32_C(0x37) + #define HWRM_QUEUE_PRI2COS_QCFG UINT32_C(0x37) #define HWRM_QUEUE_PRI2COS_CFG UINT32_C(0x38) #define HWRM_QUEUE_COS2BW_QCFG UINT32_C(0x39) #define HWRM_QUEUE_COS2BW_CFG UINT32_C(0x3a) @@ -848,6 +892,14 @@ typedef struct cmd_nums { #define HWRM_QUEUE_VLANPRI2PRI_CFG UINT32_C(0x85) #define HWRM_QUEUE_GLOBAL_CFG UINT32_C(0x86) #define HWRM_QUEUE_GLOBAL_QCFG UINT32_C(0x87) + #define HWRM_QUEUE_ADPTV_QOS_RX_FEATURE_QCFG UINT32_C(0x88) + #define HWRM_QUEUE_ADPTV_QOS_RX_FEATURE_CFG UINT32_C(0x89) + #define HWRM_QUEUE_ADPTV_QOS_TX_FEATURE_QCFG UINT32_C(0x8a) + #define HWRM_QUEUE_ADPTV_QOS_TX_FEATURE_CFG UINT32_C(0x8b) + #define HWRM_QUEUE_QCAPS UINT32_C(0x8c) + #define HWRM_QUEUE_ADPTV_QOS_RX_TUNING_QCFG UINT32_C(0x8d) + #define HWRM_QUEUE_ADPTV_QOS_RX_TUNING_CFG UINT32_C(0x8e) + #define HWRM_QUEUE_ADPTV_QOS_TX_TUNING_QCFG UINT32_C(0x8f) #define HWRM_CFA_L2_FILTER_ALLOC UINT32_C(0x90) #define HWRM_CFA_L2_FILTER_FREE UINT32_C(0x91) #define HWRM_CFA_L2_FILTER_CFG UINT32_C(0x92) @@ -871,6 +923,7 @@ typedef struct cmd_nums { #define HWRM_TUNNEL_DST_PORT_QUERY UINT32_C(0xa0) #define HWRM_TUNNEL_DST_PORT_ALLOC UINT32_C(0xa1) #define HWRM_TUNNEL_DST_PORT_FREE UINT32_C(0xa2) + #define HWRM_QUEUE_ADPTV_QOS_TX_TUNING_CFG UINT32_C(0xa3) #define HWRM_STAT_CTX_ENG_QUERY UINT32_C(0xaf) #define HWRM_STAT_CTX_ALLOC UINT32_C(0xb0) #define HWRM_STAT_CTX_FREE UINT32_C(0xb1) @@ -926,6 +979,8 @@ typedef struct cmd_nums { #define HWRM_PORT_EP_TX_CFG UINT32_C(0xdb) #define HWRM_PORT_CFG UINT32_C(0xdc) #define HWRM_PORT_QCFG UINT32_C(0xdd) + /* Queries MAC capabilities for the specified port */ + #define HWRM_PORT_MAC_QCAPS UINT32_C(0xdf) #define HWRM_TEMP_MONITOR_QUERY UINT32_C(0xe0) #define HWRM_REG_POWER_QUERY UINT32_C(0xe1) #define HWRM_CORE_FREQUENCY_QUERY UINT32_C(0xe2) @@ -1029,7 +1084,12 @@ typedef struct cmd_nums { #define HWRM_CFA_TLS_FILTER_ALLOC UINT32_C(0x128) /* Experimental */ #define HWRM_CFA_TLS_FILTER_FREE UINT32_C(0x129) - /* Engine CKV - Get the current allocation status of keys provisioned in the key vault. */ + /* Release an AFM function for TF control */ + #define HWRM_CFA_RELEASE_AFM_FUNC UINT32_C(0x12a) + /* + * Engine CKV - Get the current allocation status of keys provisioned in + * the key vault. + */ #define HWRM_ENGINE_CKV_STATUS UINT32_C(0x12e) /* Engine CKV - Add a new CKEK used to encrypt keys. */ #define HWRM_ENGINE_CKV_CKEK_ADD UINT32_C(0x12f) @@ -1089,7 +1149,10 @@ typedef struct cmd_nums { #define HWRM_ENGINE_STATS_CLEAR UINT32_C(0x156) /* Engine - Query the statistics accumulator for an Engine. */ #define HWRM_ENGINE_STATS_QUERY UINT32_C(0x157) - /* Engine - Query statistics counters for continuous errors from all CDDIP Engines. */ + /* + * Engine - Query statistics counters for continuous errors from all CDDIP + * Engines. + */ #define HWRM_ENGINE_STATS_QUERY_CONTINUOUS_ERROR UINT32_C(0x158) /* Engine - Allocate an Engine RQ. */ #define HWRM_ENGINE_RQ_ALLOC UINT32_C(0x15e) @@ -1171,6 +1234,20 @@ typedef struct cmd_nums { #define HWRM_FUNC_SYNCE_CFG UINT32_C(0x1ab) /* Queries SyncE configurations. */ #define HWRM_FUNC_SYNCE_QCFG UINT32_C(0x1ac) + /* The command is used to deallocate KTLS or QUIC key contexts. */ + #define HWRM_FUNC_KEY_CTX_FREE UINT32_C(0x1ad) + /* The command is used to configure link aggr group mode. */ + #define HWRM_FUNC_LAG_MODE_CFG UINT32_C(0x1ae) + /* The command is used to query link aggr group mode. */ + #define HWRM_FUNC_LAG_MODE_QCFG UINT32_C(0x1af) + /* The command is used to create a link aggr group. */ + #define HWRM_FUNC_LAG_CREATE UINT32_C(0x1b0) + /* The command is used to update a link aggr group. */ + #define HWRM_FUNC_LAG_UPDATE UINT32_C(0x1b1) + /* The command is used to free a link aggr group. */ + #define HWRM_FUNC_LAG_FREE UINT32_C(0x1b2) + /* The command is used to query a link aggr group. */ + #define HWRM_FUNC_LAG_QCFG UINT32_C(0x1b3) /* Experimental */ #define HWRM_SELFTEST_QLIST UINT32_C(0x200) /* Experimental */ @@ -1202,12 +1279,12 @@ typedef struct cmd_nums { #define HWRM_MFG_SOC_IMAGE UINT32_C(0x20c) /* Retrieves the SoC status and image provisioning information */ #define HWRM_MFG_SOC_QSTATUS UINT32_C(0x20d) - /* Tells the fw to program the seeprom memory */ - #define HWRM_MFG_PARAM_SEEPROM_SYNC UINT32_C(0x20e) - /* Tells the fw to read the seeprom memory */ - #define HWRM_MFG_PARAM_SEEPROM_READ UINT32_C(0x20f) - /* Tells the fw to get the health of seeprom data */ - #define HWRM_MFG_PARAM_SEEPROM_HEALTH UINT32_C(0x210) + /* Tells the fw to finalize the critical data (store and lock it) */ + #define HWRM_MFG_PARAM_CRITICAL_DATA_FINALIZE UINT32_C(0x20e) + /* Tells the fw to read the critical data */ + #define HWRM_MFG_PARAM_CRITICAL_DATA_READ UINT32_C(0x20f) + /* Tells the fw to get the health of critical data */ + #define HWRM_MFG_PARAM_CRITICAL_DATA_HEALTH UINT32_C(0x210) /* * The command is used for certificate provisioning to export a * Certificate Signing Request (CSR) from the device. @@ -1242,6 +1319,37 @@ typedef struct cmd_nums { #define HWRM_MFG_SELFTEST_EXEC UINT32_C(0x217) /* Queries the generic stats */ #define HWRM_STAT_GENERIC_QSTATS UINT32_C(0x218) + /* + * The command is used for certificate provisioning to export a + * certificate chain from the device. + */ + #define HWRM_MFG_PRVSN_EXPORT_CERT UINT32_C(0x219) + /* Query the statistics for doorbell drops due to various error conditions. */ + #define HWRM_STAT_DB_ERROR_QSTATS UINT32_C(0x21a) + /* + * This command returns the capabilities related to User Defined + * Congestion Control on a function. + */ + #define HWRM_UDCC_QCAPS UINT32_C(0x258) + /* This command configures User Defined Congestion Control on a function. */ + #define HWRM_UDCC_CFG UINT32_C(0x259) + /* + * This command queries the configuration of User Defined Congestion + * Control on a function. + */ + #define HWRM_UDCC_QCFG UINT32_C(0x25a) + /* This command configures an existing UDCC session. */ + #define HWRM_UDCC_SESSION_CFG UINT32_C(0x25b) + /* This command queries the configuration of a UDCC session. */ + #define HWRM_UDCC_SESSION_QCFG UINT32_C(0x25c) + /* This command queries the UDCC session. */ + #define HWRM_UDCC_SESSION_QUERY UINT32_C(0x25d) + /* This command configures the computation unit. */ + #define HWRM_UDCC_COMP_CFG UINT32_C(0x25e) + /* This command queries the configuration of the computation unit. */ + #define HWRM_UDCC_COMP_QCFG UINT32_C(0x25f) + /* This command queries the status and statistics of the computation unit. */ + #define HWRM_UDCC_COMP_QUERY UINT32_C(0x260) /* Experimental */ #define HWRM_TF UINT32_C(0x2bc) /* Experimental */ @@ -1249,8 +1357,6 @@ typedef struct cmd_nums { /* Experimental */ #define HWRM_TF_SESSION_OPEN UINT32_C(0x2c6) /* Experimental */ - #define HWRM_TF_SESSION_ATTACH UINT32_C(0x2c7) - /* Experimental */ #define HWRM_TF_SESSION_REGISTER UINT32_C(0x2c8) /* Experimental */ #define HWRM_TF_SESSION_UNREGISTER UINT32_C(0x2c9) @@ -1279,22 +1385,6 @@ typedef struct cmd_nums { /* Experimental */ #define HWRM_TF_TBL_TYPE_BULK_GET UINT32_C(0x2dc) /* Experimental */ - #define HWRM_TF_CTXT_MEM_ALLOC UINT32_C(0x2e2) - /* Experimental */ - #define HWRM_TF_CTXT_MEM_FREE UINT32_C(0x2e3) - /* Experimental */ - #define HWRM_TF_CTXT_MEM_RGTR UINT32_C(0x2e4) - /* Experimental */ - #define HWRM_TF_CTXT_MEM_UNRGTR UINT32_C(0x2e5) - /* Experimental */ - #define HWRM_TF_EXT_EM_QCAPS UINT32_C(0x2e6) - /* Experimental */ - #define HWRM_TF_EXT_EM_OP UINT32_C(0x2e7) - /* Experimental */ - #define HWRM_TF_EXT_EM_CFG UINT32_C(0x2e8) - /* Experimental */ - #define HWRM_TF_EXT_EM_QCFG UINT32_C(0x2e9) - /* Experimental */ #define HWRM_TF_EM_INSERT UINT32_C(0x2ea) /* Experimental */ #define HWRM_TF_EM_DELETE UINT32_C(0x2eb) @@ -1318,6 +1408,14 @@ typedef struct cmd_nums { #define HWRM_TF_IF_TBL_SET UINT32_C(0x2fe) /* Experimental */ #define HWRM_TF_IF_TBL_GET UINT32_C(0x2ff) + /* Experimental */ + #define HWRM_TF_RESC_USAGE_SET UINT32_C(0x300) + /* Experimental */ + #define HWRM_TF_RESC_USAGE_QUERY UINT32_C(0x301) + /* Truflow command to allocate a table */ + #define HWRM_TF_TBL_TYPE_ALLOC UINT32_C(0x302) + /* Truflow command to free a table */ + #define HWRM_TF_TBL_TYPE_FREE UINT32_C(0x303) /* TruFlow command to check firmware table scope capabilities. */ #define HWRM_TFC_TBL_SCOPE_QCAPS UINT32_C(0x380) /* TruFlow command to allocate a table scope ID and create the pools. */ @@ -1330,9 +1428,9 @@ typedef struct cmd_nums { #define HWRM_TFC_TBL_SCOPE_FID_ADD UINT32_C(0x384) /* TruFlow command to remove a FID from a table scope. */ #define HWRM_TFC_TBL_SCOPE_FID_REM UINT32_C(0x385) - /* TruFlow command to allocate a table scope pool. */ + /* DEPRECATED */ #define HWRM_TFC_TBL_SCOPE_POOL_ALLOC UINT32_C(0x386) - /* TruFlow command to free a table scope pool. */ + /* DEPRECATED */ #define HWRM_TFC_TBL_SCOPE_POOL_FREE UINT32_C(0x387) /* Experimental */ #define HWRM_TFC_SESSION_ID_ALLOC UINT32_C(0x388) @@ -1366,8 +1464,30 @@ typedef struct cmd_nums { #define HWRM_TFC_TCAM_ALLOC_SET UINT32_C(0x396) /* TruFlow command to free a TCAM entry. */ #define HWRM_TFC_TCAM_FREE UINT32_C(0x397) + /* Truflow command to set an interface table entry */ + #define HWRM_TFC_IF_TBL_SET UINT32_C(0x398) + /* Truflow command to get an interface table entry */ + #define HWRM_TFC_IF_TBL_GET UINT32_C(0x399) + /* TruFlow command to get configured info about a table scope. */ + #define HWRM_TFC_TBL_SCOPE_CONFIG_GET UINT32_C(0x39a) + /* TruFlow command to query the resource usage state. */ + #define HWRM_TFC_RESC_USAGE_QUERY UINT32_C(0x39b) + /* + * This command is used to query the pfc watchdog max configurable + * timeout value. + */ + #define HWRM_QUEUE_PFCWD_TIMEOUT_QCAPS UINT32_C(0x39c) + /* This command is used to set the PFC watchdog timeout value. */ + #define HWRM_QUEUE_PFCWD_TIMEOUT_CFG UINT32_C(0x39d) + /* + * This command is used to query the current configured pfc watchdog + * timeout value. + */ + #define HWRM_QUEUE_PFCWD_TIMEOUT_QCFG UINT32_C(0x39e) /* Experimental */ #define HWRM_SV UINT32_C(0x400) + /* Flush any trace buffer data that has not been sent to the host. */ + #define HWRM_DBG_LOG_BUFFER_FLUSH UINT32_C(0xff0f) /* Experimental */ #define HWRM_DBG_READ_DIRECT UINT32_C(0xff10) /* Experimental */ @@ -1423,6 +1543,8 @@ typedef struct cmd_nums { #define HWRM_DBG_USEQ_DELIVERY_REQ UINT32_C(0xff2a) /* Experimental */ #define HWRM_DBG_USEQ_RESP_HDR UINT32_C(0xff2b) + #define HWRM_NVM_GET_VPD_FIELD_INFO UINT32_C(0xffea) + #define HWRM_NVM_SET_VPD_FIELD_INFO UINT32_C(0xffeb) #define HWRM_NVM_DEFRAG UINT32_C(0xffec) #define HWRM_NVM_REQ_ARBITRATION UINT32_C(0xffed) /* Experimental */ @@ -1518,14 +1640,14 @@ typedef struct ret_codes { #define HWRM_ERR_CODE_NO_FLOW_COUNTER_DURING_ALLOC UINT32_C(0xc) /* * This error code is only reported by firmware when the registered - * driver instances requested to offloaded a flow but was unable to because - * the requested key's hash collides with the installed keys. + * driver instances requested to offloaded a flow but was unable to + * because the requested key's hash collides with the installed keys. */ #define HWRM_ERR_CODE_KEY_HASH_COLLISION UINT32_C(0xd) /* * This error code is only reported by firmware when the registered - * driver instances requested to offloaded a flow but was unable to because - * the same key has already been installed. + * driver instances requested to offloaded a flow but was unable to + * because the same key has already been installed. */ #define HWRM_ERR_CODE_KEY_ALREADY_EXISTS UINT32_C(0xe) /* @@ -1534,8 +1656,8 @@ typedef struct ret_codes { */ #define HWRM_ERR_CODE_HWRM_ERROR UINT32_C(0xf) /* - * Firmware is unable to service the request at the present time. Caller - * may try again later. + * Firmware is unable to service the request at the present time. + * Caller may try again later. */ #define HWRM_ERR_CODE_BUSY UINT32_C(0x10) /* @@ -1550,6 +1672,11 @@ typedef struct ret_codes { * async completion ring or associated forwarding buffers configured. */ #define HWRM_ERR_CODE_PF_UNAVAILABLE UINT32_C(0x12) + /* + * This error code is reported by Firmware when the specific entity + * requested by the host is not present or does not exist. + */ + #define HWRM_ERR_CODE_ENTITY_NOT_PRESENT UINT32_C(0x13) /* * This value indicates that the HWRM response is in TLV format and * should be interpreted as one or more TLVs starting with the @@ -1587,7 +1714,8 @@ typedef struct ret_codes { ((x) == 0x10 ? "BUSY": \ ((x) == 0x11 ? "RESOURCE_LOCKED": \ ((x) == 0x12 ? "PF_UNAVAILABLE": \ - "Unknown decode" ))))))))))))))))))) : \ + ((x) == 0x13 ? "ENTITY_NOT_PRESENT": \ + "Unknown decode" )))))))))))))))))))) : \ (((x) < 0x8080) ? \ ((x) == 0x8000 ? "TLV_ENCAPSULATED_RESPONSE": \ "Unknown decode" ) : \ @@ -1614,7 +1742,7 @@ typedef struct hwrm_err_output { /* This field provides original sequence number of the command. */ uint16_t seq_id; /* - * This field is the length of the response in bytes. The + * This field is the length of the response in bytes. The * last byte of the response is a valid flag that will read * as '1' when the command has been completely written to * memory. @@ -1631,9 +1759,9 @@ typedef struct hwrm_err_output { uint8_t cmd_err; /* * This field is used in Output records to indicate that the output - * is completely written to RAM. This field should be read as '1' - * to indicate that the output has been completely written. - * When writing a command completion or response to an internal processor, + * is completely written to RAM. This field should be read as '1' + * to indicate that the output has been completely written. When + * writing a command completion or response to an internal processor, * the order of writes has to be such that this field is written last. */ uint8_t valid; @@ -1644,7 +1772,12 @@ typedef struct hwrm_err_output { * applicable (All F's). Need to cast it the size of the field if needed. */ #define HWRM_NA_SIGNATURE ((uint32_t)(-1)) -/* hwrm_func_buf_rgtr */ +/* + * This is reflecting the size of the PF mailbox and not the maximum + * command size for any of the HWRM command structures. To determine + * the maximum size of an HWRM command supported by the firmware, see + * the max_ext_req_len field in the response of the HWRM_VER_GET command. + */ #define HWRM_MAX_REQ_LEN 128 /* hwrm_cfa_flow_info */ #define HWRM_MAX_RESP_LEN 704 @@ -1668,10 +1801,10 @@ typedef struct hwrm_err_output { #define HWRM_TARGET_ID_TOOLS 0xFFFD #define HWRM_VERSION_MAJOR 1 #define HWRM_VERSION_MINOR 10 -#define HWRM_VERSION_UPDATE 2 +#define HWRM_VERSION_UPDATE 3 /* non-zero means beta version */ -#define HWRM_VERSION_RSVD 136 -#define HWRM_VERSION_STR "1.10.2.136" +#define HWRM_VERSION_RSVD 42 +#define HWRM_VERSION_STR "1.10.3.42" /**************** * hwrm_ver_get * @@ -1887,47 +2020,52 @@ typedef struct hwrm_ver_get_output { /* * If set to 1, then the KONG host mailbox channel is supported. * If set to 0, then the KONG host mailbox channel is not supported. - * By default, this flag should be 0 for older version of core firmware. + * By default, this flag should be 0 for older version of core + * firmware. */ #define HWRM_VER_GET_OUTPUT_DEV_CAPS_CFG_KONG_MB_CHNL_SUPPORTED UINT32_C(0x10) /* - * If set to 1, then the 64bit flow handle is supported in addition to the - * legacy 16bit flow handle. If set to 0, then the 64bit flow handle is not - * supported. By default, this flag should be 0 for older version of core firmware. + * If set to 1, then the 64bit flow handle is supported in addition + * to the legacy 16bit flow handle. If set to 0, then the 64bit flow + * handle is not supported. By default, this flag should be 0 for + * older version of core firmware. */ #define HWRM_VER_GET_OUTPUT_DEV_CAPS_CFG_FLOW_HANDLE_64BIT_SUPPORTED UINT32_C(0x20) /* - * If set to 1, then filter type can be provided in filter_alloc or filter_cfg - * filter types like L2 for l2 traffic and ROCE for roce & l2 traffic. - * If set to 0, then filter types not supported. - * By default, this flag should be 0 for older version of core firmware. + * If set to 1, then filter type can be provided in filter_alloc or + * filter_cfg filter types like L2 for l2 traffic and ROCE for roce & + * l2 traffic. If set to 0, then filter types not supported. By + * default, this flag should be 0 for older version of core firmware. */ #define HWRM_VER_GET_OUTPUT_DEV_CAPS_CFG_L2_FILTER_TYPES_ROCE_OR_L2_SUPPORTED UINT32_C(0x40) /* - * If set to 1, firmware is capable to support virtio vSwitch offload model. - * If set to 0, firmware can't supported virtio vSwitch offload model. - * By default, this flag should be 0 for older version of core firmware. + * If set to 1, firmware is capable to support virtio vSwitch offload + * model. If set to 0, firmware can't supported virtio vSwitch + * offload model. + * By default, this flag should be 0 for older version of core + * firmware. */ #define HWRM_VER_GET_OUTPUT_DEV_CAPS_CFG_VIRTIO_VSWITCH_OFFLOAD_SUPPORTED UINT32_C(0x80) /* * If set to 1, firmware is capable to support trusted VF. * If set to 0, firmware is not capable to support trusted VF. - * By default, this flag should be 0 for older version of core firmware. + * By default, this flag should be 0 for older version of core + * firmware. */ #define HWRM_VER_GET_OUTPUT_DEV_CAPS_CFG_TRUSTED_VF_SUPPORTED UINT32_C(0x100) /* * If set to 1, firmware is capable to support flow aging. * If set to 0, firmware is not capable to support flow aging. - * By default, this flag should be 0 for older version of core firmware. - * (deprecated) + * By default, this flag should be 0 for older version of core + * firmware. (deprecated) */ #define HWRM_VER_GET_OUTPUT_DEV_CAPS_CFG_FLOW_AGING_SUPPORTED UINT32_C(0x200) /* - * If set to 1, firmware is capable to support advanced flow counters like, - * Meter drop counters and EEM counters. - * If set to 0, firmware is not capable to support advanced flow counters. - * By default, this flag should be 0 for older version of core firmware. - * (deprecated) + * If set to 1, firmware is capable to support advanced flow counters + * like, Meter drop counters and EEM counters. + * If set to 0, firmware is not capable to support advanced flow + * counters. By default, this flag should be 0 for older version of + * core firmware. (deprecated) */ #define HWRM_VER_GET_OUTPUT_DEV_CAPS_CFG_ADV_FLOW_COUNTERS_SUPPORTED UINT32_C(0x400) /* @@ -1935,28 +2073,30 @@ typedef struct hwrm_ver_get_output { * Extended Exact Match(EEM) feature. * If set to 0, firmware is not capable to support the use of the * CFA EEM feature. - * By default, this flag should be 0 for older version of core firmware. - * (deprecated) + * By default, this flag should be 0 for older version of core + * firmware. (deprecated) */ #define HWRM_VER_GET_OUTPUT_DEV_CAPS_CFG_CFA_EEM_SUPPORTED UINT32_C(0x800) /* - * If set to 1, the firmware is able to support advance CFA flow management - * features reported in the HWRM_CFA_FLOW_MGNT_QCAPS. - * If set to 0, then the firmware doesn’t support the advance CFA flow management - * features. - * By default, this flag should be 0 for older version of core firmware. + * If set to 1, the firmware is able to support advance CFA flow + * management features reported in the HWRM_CFA_FLOW_MGNT_QCAPS. + * If set to 0, then the firmware doesn't support the advance CFA + * flow management features. + * By default, this flag should be 0 for older version of core + * firmware. */ #define HWRM_VER_GET_OUTPUT_DEV_CAPS_CFG_CFA_ADV_FLOW_MGNT_SUPPORTED UINT32_C(0x1000) /* * Deprecated and replaced with cfa_truflow_supported. * If set to 1, the firmware is able to support TFLIB features. - * If set to 0, then the firmware doesn’t support TFLIB features. - * By default, this flag should be 0 for older version of core firmware. + * If set to 0, then the firmware doesn't support TFLIB features. + * By default, this flag should be 0 for older version of core + * firmware. */ #define HWRM_VER_GET_OUTPUT_DEV_CAPS_CFG_CFA_TFLIB_SUPPORTED UINT32_C(0x2000) /* * If set to 1, the firmware is able to support TruFlow features. - * If set to 0, then the firmware doesn’t support TruFlow features. + * If set to 0, then the firmware doesn't support TruFlow features. * By default, this flag should be 0 for older version of * core firmware. */ @@ -1966,6 +2106,13 @@ typedef struct hwrm_ver_get_output { * If set to 0, then firmware doesn't support secure boot. */ #define HWRM_VER_GET_OUTPUT_DEV_CAPS_CFG_SECURE_BOOT_CAPABLE UINT32_C(0x8000) + /* + * If set to 1, then firmware is able to support the secure solution + * feature. + * If set to 0, then firmware does not support the secure solution + * feature. + */ + #define HWRM_VER_GET_OUTPUT_DEV_CAPS_CFG_SECURE_SOC_CAPABLE UINT32_C(0x10000) /* * This field represents the major version of RoCE firmware. * A change in major version represents a major release. @@ -2018,7 +2165,10 @@ typedef struct hwrm_ver_get_output { uint8_t chip_metal; /* This field returns the bond id of the chip. */ uint8_t chip_bond_id; - /* This value indicates the type of platform used for chip implementation. */ + /* + * This value indicates the type of platform used for chip + * implementation. + */ uint8_t chip_platform_type; /* ASIC */ #define HWRM_VER_GET_OUTPUT_CHIP_PLATFORM_TYPE_ASIC UINT32_C(0x0) @@ -2071,8 +2221,8 @@ typedef struct hwrm_ver_get_output { * host drivers that it has not completed resource initialization * required for data path operations. Host drivers should not send * any HWRM command that requires data path resources. Firmware will - * fail those commands with HWRM_ERR_CODE_BUSY. Host drivers can retry - * those commands once both the flags are cleared. + * fail those commands with HWRM_ERR_CODE_BUSY. Host drivers can + * retry those commands once both the flags are cleared. * If this flag and dev_not_rdy flag are set to 0, device is ready * to accept all HWRM commands. */ @@ -2232,9 +2382,9 @@ typedef struct hwrm_ver_get_output { uint8_t unused_1[3]; /* * This field is used in Output records to indicate that the output - * is completely written to RAM. This field should be read as '1' - * to indicate that the output has been completely written. - * When writing a command completion or response to an internal processor, + * is completely written to RAM. This field should be read as '1' + * to indicate that the output has been completely written. When + * writing a command completion or response to an internal processor, * the order of writes has to be such that this field is written last. */ uint8_t valid; @@ -2801,11 +2951,11 @@ typedef struct crypto_presync_bd_cmd { * Typically, presync BDs are used for packet retransmissions. Source * port sends all the packets in order over the network to destination * port and packets get dropped in the network. The destination port - * will request retranmission of dropped packets and source port driver - * will send presync BD to setup the transmitter appropriately. It will - * provide the start and end TCP sequence number of the data to be - * transmitted. HW keeps two sets of context variable, one for in order - * traffic and one for retransmission traffic. HW is designed to + * will request retransmission of dropped packets and source port + * driver will send presync BD to setup the transmitter appropriately. + * It will provide the start and end TCP sequence number of the data to + * be transmitted. HW keeps two sets of context variable, one for in + * order traffic and one for retransmission traffic. HW is designed to * transmit everything posted in the presync BD and return to in order * mode after that. No inorder context variables are updated in the * process. There is a special case where packets can be dropped @@ -2955,22 +3105,22 @@ typedef struct ce_bds_quic_add_data_msg { * exchanged as part of sessions setup between the two end * points for QUIC operations. */ - uint64_t quic_iv_lo; + uint8_t quic_iv_lo[8]; /* * Most-significant 32 bits (of 96) of additional IV that is * exchanged as part of sessions setup between the two end * points for QUIC operations. */ - uint32_t quic_iv_hi; + uint8_t quic_iv_hi[4]; uint32_t unused_1; /* * Key used for encrypting or decrypting records. The Key is exchanged * as part of sessions setup between the two end points through this * mid-path BD. */ - uint32_t session_key[8]; + uint8_t session_key[32]; /* Header protection key. */ - uint32_t hp_key[8]; + uint8_t hp_key[32]; /* Packet number associated with the QUIC connection. */ uint64_t pkt_number; } ce_bds_quic_add_data_msg_t, *pce_bds_quic_add_data_msg_t; @@ -3149,7 +3299,8 @@ typedef struct tx_bd_short { * * This value must be valid on all BDs of a packet. */ - uint64_t addr; + uint32_t addr_lo; + uint32_t addr_hi; } tx_bd_short_t, *ptx_bd_short_t; /* tx_bd_long (size:128b/16B) */ @@ -3359,7 +3510,7 @@ typedef struct tx_bd_long_hi { * 0xffff. * * If set to one when LSO is '1', then the IPID will be treated - * as a 15b number and will be wrapped if it exceeds a value 0f + * as a 15b number and will be wrapped if it exceeds a value of * 0x7fff. */ #define TX_BD_LONG_LFLAGS_IPID_FMT UINT32_C(0x40) @@ -3418,7 +3569,7 @@ typedef struct tx_bd_long_hi { * will be the following behavior for all cases independent of * settings of inner LSO and checksum offload BD flags. * If outer UDP checksum is 0, then do not update it. - * If outer UDP checksum is non zero, then the hardware should + * If outer UDP checksum is non zero, then the hardware should * compute and update it. */ #define TX_BD_LONG_LFLAGS_OT_IP_CHKSUM UINT32_C(0x2000) @@ -3554,7 +3705,7 @@ typedef struct tx_bd_long_hi { * - Wh+/SR - this option is not supported. * - Thor - cfa_meta[15:0] is used for metadata output if en_bd_meta * is set in the Lookup Table. - * - SR2 - {4’d0, cfa_meta[27:0]} is used for metadata output if + * - SR2 - {4'd0, cfa_meta[27:0]} is used for metadata output if * en_bd_meta is set in the Lookup Table. */ #define TX_BD_LONG_CFA_META_KEY_METADATA_TRANSFER (UINT32_C(0x2) << 28) @@ -3650,7 +3801,8 @@ typedef struct tx_bd_long_inline { * This field must be valid on the first BD of a packet. */ uint32_t opaque; - uint64_t unused1; + uint32_t unused1_lo; + uint32_t unused1_hi; /* * All bits in this field must be valid on the first BD of a packet. * Their value on other BDs of the packet is ignored. @@ -3859,7 +4011,7 @@ typedef struct tx_bd_long_inline { * - Wh+/SR - this option is not supported. * - Thor - cfa_meta[15:0] is used for metadata output if en_bd_meta * is set in the Lookup Table. - * - SR2 - {4’d0, cfa_meta[27:0]} is used for metadata output if + * - SR2 - {4'd0, cfa_meta[27:0]} is used for metadata output if * en_bd_meta is set in the Lookup Table. */ #define TX_BD_LONG_INLINE_CFA_META_KEY_METADATA_TRANSFER (UINT32_C(0x2) << 28) @@ -3927,7 +4079,8 @@ typedef struct tx_bd_mp_cmd { * Tx mid-path command. */ uint32_t opaque; - uint64_t unused1; + uint32_t unused1_lo; + uint32_t unused1_hi; } tx_bd_mp_cmd_t, *ptx_bd_mp_cmd_t; /* tx_bd_presync_cmd (size:128b/16B) */ @@ -3987,6 +4140,96 @@ typedef struct tx_bd_presync_cmd { uint32_t unused_1; } tx_bd_presync_cmd_t, *ptx_bd_presync_cmd_t; +/* + * This structure is used to send additional information for transmitting + * packets using timed transmit scheduling. It must only to be applied as + * the second BD of a BD chain that represents a packet. Any subsequent + * BDs will follow the timed transmit BD. + */ +/* tx_bd_timedtx (size:128b/16B) */ + +typedef struct tx_bd_timedtx { + uint16_t flags_type; + /* This value identifies the type of buffer descriptor. */ + #define TX_BD_TIMEDTX_TYPE_MASK UINT32_C(0x3f) + #define TX_BD_TIMEDTX_TYPE_SFT 0 + /* + * Indicates a timed transmit BD. This is a 16b BD that is inserted + * into a packet BD chain immediately after the first BD. It is used + * to control the flow in a timed transmit operation. + */ + #define TX_BD_TIMEDTX_TYPE_TX_BD_TIMEDTX UINT32_C(0xa) + #define TX_BD_TIMEDTX_TYPE_LAST TX_BD_TIMEDTX_TYPE_TX_BD_TIMEDTX + /* Unless otherwise stated, sub-fields of this field are always valid. */ + #define TX_BD_TIMEDTX_FLAGS_MASK UINT32_C(0xffc0) + #define TX_BD_TIMEDTX_FLAGS_SFT 6 + /* + * This value identifies the kind of buffer timed transmit mode that + * is to be enabled for the packet. + */ + #define TX_BD_TIMEDTX_FLAGS_KIND_MASK UINT32_C(0x1c0) + #define TX_BD_TIMEDTX_FLAGS_KIND_SFT 6 + /* + * This timed transmit mode indicates that the packet will be + * scheduled and send immediately (or as soon as possible), once + * it is scheduled in the transmitter. + * Note: This mode is similar to regular (non-timed transmit) + * operation. Its main purpose is to cancel pace mode timed + * transmit. + */ + #define TX_BD_TIMEDTX_FLAGS_KIND_ASAP (UINT32_C(0x0) << 6) + /* + * This timed transmit mode is used to schedule transmission of + * the packet no earlier than the time given in the tx_time + * field of the BD. + * Note: In case subsequent packets don't include a timed transmit + * BD, they will be scheduled subsequently for transmission + * without any timed transmit constraint. + */ + #define TX_BD_TIMEDTX_FLAGS_KIND_SO_TXTIME (UINT32_C(0x1) << 6) + /* + * This timed transmit mode is used to enable rate control for the + * flow (QP) at a rate as defined by the rate field of this BD. + * Note: In case subsequent, adjacent packets on the same flow + * don't include a timed transmit BD, they will continue to be + * paced by the transmitter at the same rate as given in this BD. *** 82440 LINES SKIPPED *** From nobody Tue May 28 10:36: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 4VpTTC4szwz5M0Dt; Tue, 28 May 2024 10:36: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 4VpTTC3N3wz4Tk9; Tue, 28 May 2024 10:36:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716892591; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cyA2l5WFUo8VJrh0Ti5v9z3bSeSaH2R29mb6gwkvPhs=; b=xIRUsU6QU7z38dsQvp4Wb0ZfASK0gPWiyzA5HWRs+AizPm+Z63K6IpQONxGsWiCqBt0AXu o44FzxkYQOHShZguigZ0axkev8bB8CJK+k0LcxX/moqK6zYqMd3FfofCjPoaIqaxcAgeyV 6yGOQmwHDsqEbIPNaHM2UMNhkkjifMbOaEo3m8XRBaVUul64ZC1wnjdMKAWDYF/tnA5Imn MmEh8fgpFpQZH+uqXbvuEMJu3SAFEX5chRH8SaqnrnMfgK5bMQdaIiMxaVwfUP8EMX1F5F 8oVKLcH3igPOJPpks7D91SVG7xU0iUY89azDMPAti4tqclEuFXeI5pRlPn6K7w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1716892591; a=rsa-sha256; cv=none; b=ddJ605WwCfaOaXgKCL/DnBipxVOFGtuUacioyFDWDmKcf3ZSAHcp5DtuCbzk85ZKHTKSfK 0FbrpRAmiFpvGiIQUVFR+xEWHk1OSMM27r6svcIwGv9BfoG38LRw3oA+81Dsgv4aWdqWCR a7+73Pr2y6sjcAb1gCtOI7sJjTcAVj3tvsmxohsNKGcGjicTTaXsM+pEpTaqLqsj5NkX7y LUH+uYiYKVYkBIN2pu+M2DackZkiOvRoPeZvF9ivkQ8mwZaeV30OeEXX6eFJX9CCfSt9cf 2nm608+70vwCseWhnyEZTxhXdrdxsG/13uJkYFTK0FY4isVWvjWyIXx05A1+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=1716892591; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cyA2l5WFUo8VJrh0Ti5v9z3bSeSaH2R29mb6gwkvPhs=; b=ZeBExOoJIjemw22H1C9USRZEcMIvweQCFnC3Rmo23NuS9ih8/MGy10tF2mMGZ3tNhZwopm SKLJcdDm/4iskEuXAcByOvgiv+1deE3SHwaOiv10HyUxk6wceHWGzeBZHMv793CWL4HHXs jxp3YlI+37alwPtnyEDPLOaoKldUrOanuBHEyRVVVfAKzw41q+XVOgy3NlXvaSQks5NVKV vSDmjJYZEbp8pfWhyR5fB4F7gOu6pOkjAtHCEu6O65z27rRXPvVjT7QwqN6oGHDJoTyZX2 AStpdXUXm4uioCSmWKQmbSObOmCjnmqicxCT3OF0n4gaqBMSpvB3C7wzu9nT5A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VpTTC1pKBz1Nls; Tue, 28 May 2024 10:36: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 44SAaVW8052004; Tue, 28 May 2024 10:36:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44SAaVik052001; Tue, 28 May 2024 10:36:31 GMT (envelope-from git) Date: Tue, 28 May 2024 10:36:31 GMT Message-Id: <202405281036.44SAaVik052001@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Sumit Saxena Subject: git: 862af86f4b7d - main - bnxt_en: Driver version update to 230.0.133.0 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ssaxena X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 862af86f4b7d2aec0623d19796e79cf96b4c7af6 Auto-Submitted: auto-generated The branch main has been updated by ssaxena: URL: https://cgit.FreeBSD.org/src/commit/?id=862af86f4b7d2aec0623d19796e79cf96b4c7af6 commit 862af86f4b7d2aec0623d19796e79cf96b4c7af6 Author: Chandrakanth patil AuthorDate: 2024-04-28 14:10:36 +0000 Commit: Sumit Saxena CommitDate: 2024-05-28 10:36:11 +0000 bnxt_en: Driver version update to 230.0.133.0 Reviewed by: imp Approved by: imp Differential revision: https://reviews.freebsd.org/D45010 --- sys/dev/bnxt/bnxt_en/if_bnxt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/bnxt/bnxt_en/if_bnxt.c b/sys/dev/bnxt/bnxt_en/if_bnxt.c index b26997c8f197..6c0ec892f2c6 100644 --- a/sys/dev/bnxt/bnxt_en/if_bnxt.c +++ b/sys/dev/bnxt/bnxt_en/if_bnxt.c @@ -345,7 +345,7 @@ static driver_t bnxt_iflib_driver = { * iflib shared context */ -#define BNXT_DRIVER_VERSION "2.20.0.1" +#define BNXT_DRIVER_VERSION "230.0.133.0" const char bnxt_driver_version[] = BNXT_DRIVER_VERSION; extern struct if_txrx bnxt_txrx; static struct if_shared_ctx bnxt_sctx_init = { From nobody Tue May 28 10:36: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 4VpTTD5mNhz5M0Hy; Tue, 28 May 2024 10:36: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 4VpTTD3xljz4TPb; Tue, 28 May 2024 10:36:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716892592; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BNpaYyYYZ6YTF+m3HWE14I2k/BPQYCKhasIU5DHOmVc=; b=HrYpVl9XORj7N8QKQI0K5QoYsku2gomqM0XNE/EZXcuf9qRThaV8RJloKgstHbQdzDiSZy nqi+OYL+WWjS5jTBcGAGj0WpoeJFWlscfk9kvK72v77HQIbO2q5Diaa+zUnm6JdVeMMJIe WqEEHVZeQtfr9Y+vuCY+THYJ3Ja/zkea2SQp6cgco8ZtlACbfrVhqWN3sJOsYpNVmHKIwT B/Ng4CuacSEpGLxJo99OMJEUrGspKrb9mpeEe1sswKxv8t2Q90wPeKGVOkfa8TaHCmWNsQ oLMDP7jyYV3/wVF2sR2WInLPg6Rju0LVRz74jygCI93wy4BL77SWBRe02TzpJA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1716892592; a=rsa-sha256; cv=none; b=f8a9q7HIL6L6eNKvSRKO3xQeXpaNioKLfWtPMryJFbhVUpkMk1xeVu99FnC/bkkWK8Lh9N EDrKJ9ZsICCqJ6WPYVdgzLjI3jgRDAHESB13pwq7iUEDBKG3Ljh+o+KGuhlybSY30BeHWp 134pcATT5ngi+srlKVa/2zi++nSLCCNmlr3cYC9oRHLL8aMFlN8Jb2FZoS7dhsPkojQlXl cQ8YUbxRwDKCym/tnrmBVgI/Ep2YdhkgLEZGfQj0dOS27NFFoJxBQSiogKpuJUcUDGZio+ V4j3XGk2l8Zf0VKaYAnzLE2DIUbRzEOi0kLPXEtp064HYg5knZ/4S3/3NgEuqA== 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=1716892592; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BNpaYyYYZ6YTF+m3HWE14I2k/BPQYCKhasIU5DHOmVc=; b=G5iWDu3+At8/KBx2wDfU/QseFzYeWc3EF3KRDM65FS87oXU8UT+YPtlEaxPaRpd6c45yCY IicSITARId2bxgdsnd1d5LeVSXBpdFLeegSbkzIl3C0InZ0LTjyJgSsz9yyBIfrXfayot2 sK54BK8aUiOagaS1C6q/f1NqKuyGO1pFahYXNye+SJwNXpmJOtaTkVvHZZUag63+nXXA7K LJTEtoWi17l8Tf8Q9hd9Iq0tJPvZpHQIknmPwb8N6AcRebSQIMaAIIHXOuIHpUTKDmdJ+W G3d7jIaAVOFwAdq8qv6aC7IMmnlmsEymPTq0D1wsDcTuBFC9Ulqjltxhh1q/wQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VpTTD3WZWz1Nt9; Tue, 28 May 2024 10:36: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 44SAaWfo052050; Tue, 28 May 2024 10:36:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44SAaW16052047; Tue, 28 May 2024 10:36:32 GMT (envelope-from git) Date: Tue, 28 May 2024 10:36:32 GMT Message-Id: <202405281036.44SAaW16052047@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Sumit Saxena Subject: git: acd884dec99a - main - RDMA/bnxt_re: Add bnxt_re RoCE driver List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ssaxena X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: acd884dec99adcf8c4cdd0aa8a50be79c216f8e8 Auto-Submitted: auto-generated The branch main has been updated by ssaxena: URL: https://cgit.FreeBSD.org/src/commit/?id=acd884dec99adcf8c4cdd0aa8a50be79c216f8e8 commit acd884dec99adcf8c4cdd0aa8a50be79c216f8e8 Author: Sumit Saxena AuthorDate: 2024-05-28 10:31:59 +0000 Commit: Sumit Saxena CommitDate: 2024-05-28 10:36:11 +0000 RDMA/bnxt_re: Add bnxt_re RoCE driver This patch introduces the RoCE driver for the Broadcom NetXtreme-E 10/25/50/100/200G RoCE HCAs. The RoCE driver is a two part driver that relies on the bnxt_en NIC driver to operate. The changes needed in the bnxt_en driver is included through another patch "L2-RoCE driver communication interface" in this set. Presently, There is no user space support, Hence recommendation to use the krping kernel module for testing. User space support will be incorporated in subsequent patch submissions. Reviewed by: imp Approved by: imp Differential revision: https://reviews.freebsd.org/D45011 --- sys/dev/bnxt/bnxt_re/bnxt_re-abi.h | 177 ++ sys/dev/bnxt/bnxt_re/bnxt_re.h | 1075 +++++++ sys/dev/bnxt/bnxt_re/ib_verbs.c | 5498 ++++++++++++++++++++++++++++++++++++ sys/dev/bnxt/bnxt_re/ib_verbs.h | 632 +++++ sys/dev/bnxt/bnxt_re/main.c | 4467 +++++++++++++++++++++++++++++ sys/dev/bnxt/bnxt_re/qplib_fp.c | 3544 +++++++++++++++++++++++ sys/dev/bnxt/bnxt_re/qplib_fp.h | 638 +++++ sys/dev/bnxt/bnxt_re/qplib_rcfw.c | 1338 +++++++++ sys/dev/bnxt/bnxt_re/qplib_rcfw.h | 354 +++ sys/dev/bnxt/bnxt_re/qplib_res.c | 1226 ++++++++ sys/dev/bnxt/bnxt_re/qplib_res.h | 840 ++++++ sys/dev/bnxt/bnxt_re/qplib_sp.c | 1234 ++++++++ sys/dev/bnxt/bnxt_re/qplib_sp.h | 432 +++ sys/dev/bnxt/bnxt_re/qplib_tlv.h | 187 ++ sys/dev/bnxt/bnxt_re/stats.c | 773 +++++ sys/dev/bnxt/bnxt_re/stats.h | 353 +++ sys/modules/bnxt/bnxt_re/Makefile | 22 + 17 files changed, 22790 insertions(+) diff --git a/sys/dev/bnxt/bnxt_re/bnxt_re-abi.h b/sys/dev/bnxt/bnxt_re/bnxt_re-abi.h new file mode 100644 index 000000000000..8f48609e7f6f --- /dev/null +++ b/sys/dev/bnxt/bnxt_re/bnxt_re-abi.h @@ -0,0 +1,177 @@ +/* + * Copyright (c) 2015-2024, Broadcom. All rights reserved. The term + * Broadcom refers to Broadcom Limited and/or its subsidiaries. + * + * 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. + * + * Description: Uverbs ABI header file + */ + +#ifndef __BNXT_RE_UVERBS_ABI_H__ +#define __BNXT_RE_UVERBS_ABI_H__ + +#include +#include + +#define BNXT_RE_ABI_VERSION 6 + +enum { + BNXT_RE_COMP_MASK_UCNTX_WC_DPI_ENABLED = 0x01, + BNXT_RE_COMP_MASK_UCNTX_POW2_DISABLED = 0x02, + BNXT_RE_COMP_MASK_UCNTX_RSVD_WQE_DISABLED = 0x04, + BNXT_RE_COMP_MASK_UCNTX_MQP_EX_SUPPORTED = 0x08, + BNXT_RE_COMP_MASK_UCNTX_DBR_PACING_ENABLED = 0x10, + BNXT_RE_COMP_MASK_UCNTX_DBR_RECOVERY_ENABLED = 0x20, + BNXT_RE_COMP_MASK_UCNTX_HW_RETX_ENABLED = 0x40 +}; + +enum { + BNXT_RE_COMP_MASK_REQ_UCNTX_POW2_SUPPORT = 0x01, + BNXT_RE_COMP_MASK_REQ_UCNTX_RSVD_WQE = 0x02 +}; + +struct bnxt_re_uctx_req { + __aligned_u64 comp_mask; +}; + +#define BNXT_RE_CHIP_ID0_CHIP_NUM_SFT 0x00 +#define BNXT_RE_CHIP_ID0_CHIP_REV_SFT 0x10 +#define BNXT_RE_CHIP_ID0_CHIP_MET_SFT 0x18 +struct bnxt_re_uctx_resp { + __u32 dev_id; + __u32 max_qp; + __u32 pg_size; + __u32 cqe_sz; + __u32 max_cqd; + __u32 chip_id0; + __u32 chip_id1; + __u32 modes; + __aligned_u64 comp_mask; +} __attribute__((packed)); + +enum { + BNXT_RE_COMP_MASK_PD_HAS_WC_DPI = 0x01, + BNXT_RE_COMP_MASK_PD_HAS_DBR_BAR_ADDR = 0x02, +}; + +struct bnxt_re_pd_resp { + __u32 pdid; + __u32 dpi; + __u64 dbr; + __u64 comp_mask; + __u32 wcdpi; + __u64 dbr_bar_addr; +} __attribute__((packed)); + +enum { + BNXT_RE_COMP_MASK_CQ_HAS_DB_INFO = 0x01, + BNXT_RE_COMP_MASK_CQ_HAS_WC_DPI = 0x02, + BNXT_RE_COMP_MASK_CQ_HAS_CQ_PAGE = 0x04, +}; + +enum { + BNXT_RE_COMP_MASK_CQ_REQ_HAS_CAP_MASK = 0x1 +}; + +enum { + BNXT_RE_COMP_MASK_CQ_REQ_CAP_DBR_RECOVERY = 0x1, + BNXT_RE_COMP_MASK_CQ_REQ_CAP_DBR_PACING_NOTIFY = 0x2 +}; + +#define BNXT_RE_IS_DBR_PACING_NOTIFY_CQ(_req) \ + (_req.comp_mask & BNXT_RE_COMP_MASK_CQ_REQ_HAS_CAP_MASK && \ + _req.cq_capability & BNXT_RE_COMP_MASK_CQ_REQ_CAP_DBR_PACING_NOTIFY) + +#define BNXT_RE_IS_DBR_RECOV_CQ(_req) \ + (_req.comp_mask & BNXT_RE_COMP_MASK_CQ_REQ_HAS_CAP_MASK && \ + _req.cq_capability & BNXT_RE_COMP_MASK_CQ_REQ_CAP_DBR_RECOVERY) + +struct bnxt_re_cq_req { + __u64 cq_va; + __u64 cq_handle; + __aligned_u64 comp_mask; + __u16 cq_capability; +} __attribute__((packed)); + +struct bnxt_re_cq_resp { + __u32 cqid; + __u32 tail; + __u32 phase; + __u32 rsvd; + __aligned_u64 comp_mask; + __u32 dpi; + __u64 dbr; + __u32 wcdpi; + __u64 uctx_cq_page; +} __attribute__((packed)); + +struct bnxt_re_resize_cq_req { + __u64 cq_va; +} __attribute__((packed)); + +struct bnxt_re_qp_req { + __u64 qpsva; + __u64 qprva; + __u64 qp_handle; +} __attribute__((packed)); + +struct bnxt_re_qp_resp { + __u32 qpid; +} __attribute__((packed)); + +struct bnxt_re_srq_req { + __u64 srqva; + __u64 srq_handle; +} __attribute__((packed)); + +struct bnxt_re_srq_resp { + __u32 srqid; +} __attribute__((packed)); + +/* Modify QP */ +enum { + BNXT_RE_COMP_MASK_MQP_EX_PPP_REQ_EN_MASK = 0x1, + BNXT_RE_COMP_MASK_MQP_EX_PPP_REQ_EN = 0x1, + BNXT_RE_COMP_MASK_MQP_EX_PATH_MTU_MASK = 0x2 +}; + +struct bnxt_re_modify_qp_ex_req { + __aligned_u64 comp_mask; + __u32 dpi; + __u32 rsvd; +} __packed; + +struct bnxt_re_modify_qp_ex_resp { + __aligned_u64 comp_mask; + __u32 ppp_st_idx; + __u32 path_mtu; +} __packed; + +enum bnxt_re_shpg_offt { + BNXT_RE_BEG_RESV_OFFT = 0x00, + BNXT_RE_AVID_OFFT = 0x10, + BNXT_RE_AVID_SIZE = 0x04, + BNXT_RE_END_RESV_OFFT = 0xFF0 +}; +#endif diff --git a/sys/dev/bnxt/bnxt_re/bnxt_re.h b/sys/dev/bnxt/bnxt_re/bnxt_re.h new file mode 100644 index 000000000000..3bf0bbeb1061 --- /dev/null +++ b/sys/dev/bnxt/bnxt_re/bnxt_re.h @@ -0,0 +1,1075 @@ +/* + * Copyright (c) 2015-2024, Broadcom. All rights reserved. The term + * Broadcom refers to Broadcom Limited and/or its subsidiaries. + * + * 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. + * + * Description: main (header) + */ + +#ifndef __BNXT_RE_H__ +#define __BNXT_RE_H__ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "bnxt.h" +#include "bnxt_ulp.h" +#include "hsi_struct_def.h" +#include "qplib_res.h" +#include "qplib_sp.h" +#include "qplib_fp.h" +#include "qplib_rcfw.h" +#include "ib_verbs.h" +#include "stats.h" + +#define ROCE_DRV_MODULE_NAME "bnxt_re" +#define ROCE_DRV_MODULE_VERSION "230.0.133.0" +#define ROCE_DRV_MODULE_RELDATE "April 22, 2024" + +#define BNXT_RE_REF_WAIT_COUNT 20 +#define BNXT_RE_ROCE_V1_ETH_TYPE 0x8915 +#define BNXT_RE_ROCE_V2_PORT_NO 4791 +#define BNXT_RE_RES_FREE_WAIT_COUNT 1000 + +#define BNXT_RE_PAGE_SHIFT_4K (12) +#define BNXT_RE_PAGE_SHIFT_8K (13) +#define BNXT_RE_PAGE_SHIFT_64K (16) +#define BNXT_RE_PAGE_SHIFT_2M (21) +#define BNXT_RE_PAGE_SHIFT_8M (23) +#define BNXT_RE_PAGE_SHIFT_1G (30) + +#define BNXT_RE_PAGE_SIZE_4K BIT(BNXT_RE_PAGE_SHIFT_4K) +#define BNXT_RE_PAGE_SIZE_8K BIT(BNXT_RE_PAGE_SHIFT_8K) +#define BNXT_RE_PAGE_SIZE_64K BIT(BNXT_RE_PAGE_SHIFT_64K) +#define BNXT_RE_PAGE_SIZE_2M BIT(BNXT_RE_PAGE_SHIFT_2M) +#define BNXT_RE_PAGE_SIZE_8M BIT(BNXT_RE_PAGE_SHIFT_8M) +#define BNXT_RE_PAGE_SIZE_1G BIT(BNXT_RE_PAGE_SHIFT_1G) + +#define BNXT_RE_MAX_MR_SIZE_LOW BIT(BNXT_RE_PAGE_SHIFT_1G) +#define BNXT_RE_MAX_MR_SIZE_HIGH BIT(39) +#define BNXT_RE_MAX_MR_SIZE BNXT_RE_MAX_MR_SIZE_HIGH + +/* Number of MRs to reserve for PF, leaving remainder for VFs */ +#define BNXT_RE_RESVD_MR_FOR_PF (32 * 1024) +#define BNXT_RE_MAX_GID_PER_VF 128 + +#define BNXT_RE_MAX_VF_QPS_PER_PF (6 * 1024) + +/** + * min_not_zero - return the minimum that is _not_ zero, unless both are zero + * @x: value1 + * @y: value2 + */ +#define min_not_zero(x, y) ({ \ + typeof(x) __x = (x); \ + typeof(y) __y = (y); \ + __x == 0 ? __y : ((__y == 0) ? __x : min(__x, __y)); }) + +struct ib_mr_init_attr { + int max_reg_descriptors; + u32 flags; +}; + +struct bnxt_re_dev; + +int bnxt_re_register_netdevice_notifier(struct notifier_block *nb); +int bnxt_re_unregister_netdevice_notifier(struct notifier_block *nb); +int ib_register_device_compat(struct bnxt_re_dev *rdev); + +#ifndef __struct_group +#define __struct_group(TAG, NAME, ATTRS, MEMBERS...) \ + union { \ + struct { MEMBERS } ATTRS; \ + struct TAG { MEMBERS } ATTRS NAME; \ + } +#endif /* __struct_group */ +#ifndef struct_group_attr +#define struct_group_attr(NAME, ATTRS, MEMBERS...) \ + __struct_group(/* no tag */, NAME, ATTRS, MEMBERS) +#endif /* struct_group_attr */ +/* + * Percentage of resources of each type reserved for PF. + * Remaining resources are divided equally among VFs. + * [0, 100] + */ + +#define BNXT_RE_RQ_WQE_THRESHOLD 32 +#define BNXT_RE_UD_QP_HW_STALL 0x400000 + +/* + * Setting the default ack delay value to 16, which means + * the default timeout is approx. 260ms(4 usec * 2 ^(timeout)) + */ + +#define BNXT_RE_DEFAULT_ACK_DELAY 16 +#define BNXT_RE_BOND_PF_MAX 2 + +#define BNXT_RE_STATS_CTX_UPDATE_TIMER 250 +#define BNXT_RE_30SEC_MSEC (30 * 1000) + +#define BNXT_RE_BOND_RESCHED_CNT 10 + +#define BNXT_RE_CHIP_NUM_57454 0xC454 +#define BNXT_RE_CHIP_NUM_57452 0xC452 + +#define BNXT_RE_CHIP_NUM_5745X(chip_num) \ + ((chip_num) == BNXT_RE_CHIP_NUM_57454 || \ + (chip_num) == BNXT_RE_CHIP_NUM_57452) + +#define BNXT_RE_MIN_KERNEL_QP_TX_DEPTH 4096 +#define BNXT_RE_STOP_QPS_BUDGET 200 + +#define BNXT_RE_HWRM_CMD_TIMEOUT(rdev) \ + ((rdev)->chip_ctx->hwrm_cmd_max_timeout * 1000) + +extern unsigned int min_tx_depth; +extern struct mutex bnxt_re_dev_lock; +extern struct mutex bnxt_re_mutex; +extern struct list_head bnxt_re_dev_list; + +struct bnxt_re_ring_attr { + dma_addr_t *dma_arr; + int pages; + int type; + u32 depth; + u32 lrid; /* Logical ring id */ + u16 flags; + u8 mode; + u8 rsvd; +}; + +#define BNXT_RE_MAX_DEVICES 256 +#define BNXT_RE_MSIX_FROM_MOD_PARAM -1 +#define BNXT_RE_MIN_MSIX 2 +#define BNXT_RE_MAX_MSIX_VF 2 +#define BNXT_RE_MAX_MSIX_PF 9 +#define BNXT_RE_MAX_MSIX_NPAR_PF 5 +#define BNXT_RE_MAX_MSIX 64 +#define BNXT_RE_MAX_MSIX_GEN_P5_PF BNXT_RE_MAX_MSIX +#define BNXT_RE_GEN_P5_MAX_VF 64 + +struct bnxt_re_nq_record { + struct bnxt_msix_entry msix_entries[BNXT_RE_MAX_MSIX]; + /* FP Notification Queue (CQ & SRQ) */ + struct bnxt_qplib_nq nq[BNXT_RE_MAX_MSIX]; + int num_msix; + int max_init; + struct mutex load_lock; +}; + +struct bnxt_re_work { + struct work_struct work; + unsigned long event; + struct bnxt_re_dev *rdev; + struct ifnet *vlan_dev; + bool do_lag; + + /* netdev where we received the event */ + struct ifnet *netdev; + struct auxiliary_device *adev; +}; + +/* + * Data structure and defines to handle + * recovery + */ +#define BNXT_RE_RECOVERY_IB_UNINIT_WAIT_RETRY 20 +#define BNXT_RE_RECOVERY_IB_UNINIT_WAIT_TIME_MS 30000 /* 30sec timeout */ +#define BNXT_RE_PRE_RECOVERY_REMOVE 0x1 +#define BNXT_RE_COMPLETE_REMOVE 0x2 +#define BNXT_RE_POST_RECOVERY_INIT 0x4 +#define BNXT_RE_COMPLETE_INIT 0x8 +#define BNXT_RE_COMPLETE_SHUTDOWN 0x10 + +/* QP1 SQ entry data strucutre */ +struct bnxt_re_sqp_entries { + u64 wrid; + struct bnxt_qplib_sge sge; + /* For storing the actual qp1 cqe */ + struct bnxt_qplib_cqe cqe; + struct bnxt_re_qp *qp1_qp; +}; + +/* GSI QP mode enum */ +enum bnxt_re_gsi_mode { + BNXT_RE_GSI_MODE_INVALID = 0, + BNXT_RE_GSI_MODE_ALL = 1, + BNXT_RE_GSI_MODE_ROCE_V1, + BNXT_RE_GSI_MODE_ROCE_V2_IPV4, + BNXT_RE_GSI_MODE_ROCE_V2_IPV6, + BNXT_RE_GSI_MODE_UD +}; + +enum bnxt_re_roce_cap { + BNXT_RE_FLAG_ROCEV1_CAP = 1, + BNXT_RE_FLAG_ROCEV2_CAP, + BNXT_RE_FLAG_ROCEV1_V2_CAP, +}; + +#define BNXT_RE_MAX_GSI_SQP_ENTRIES 1024 +struct bnxt_re_gsi_context { + u8 gsi_qp_mode; + bool first_cq_created; + /* Start: used only in gsi_mode_all */ + struct bnxt_re_qp *gsi_qp; + struct bnxt_re_qp *gsi_sqp; + struct bnxt_re_ah *gsi_sah; + struct bnxt_re_sqp_entries *sqp_tbl; + /* End: used only in gsi_mode_all */ +}; + +struct bnxt_re_tc_rec { + u8 cos_id_roce; + u8 tc_roce; + u8 cos_id_cnp; + u8 tc_cnp; + u8 tc_def; + u8 cos_id_def; + u8 max_tc; + u8 roce_prio; + u8 cnp_prio; + u8 roce_dscp; + u8 cnp_dscp; + u8 prio_valid; + u8 dscp_valid; + bool ecn_enabled; + bool serv_type_enabled; + u64 cnp_dscp_bv; + u64 roce_dscp_bv; +}; + +struct bnxt_re_dscp2pri { + u8 dscp; + u8 mask; + u8 pri; +}; + +struct bnxt_re_cos2bw_cfg { + u8 pad[3]; + struct_group_attr(cfg, __packed, + u8 queue_id; + __le32 min_bw; + __le32 max_bw; + u8 tsa; + u8 pri_lvl; + u8 bw_weight; + ); + u8 unused; +}; + +#define BNXT_RE_AEQ_IDX 0 +#define BNXT_RE_MAX_SGID_ENTRIES 256 + +#define BNXT_RE_DBGFS_FILE_MEM 65536 +enum { + BNXT_RE_STATS_QUERY = 1, + BNXT_RE_QP_QUERY = 2, + BNXT_RE_SERVICE_FN_QUERY = 3, +}; + +struct bnxt_re_dbg_file { + struct bnxt_re_dev *rdev; + u32 type; + union { + struct bnxt_qplib_query_stats_info sinfo; + struct bnxt_qplib_query_fn_info fninfo; + }params; + char dbg_buf[BNXT_RE_DBGFS_FILE_MEM]; +}; + +struct bnxt_re_debug_entries { + /* Dir entries */ + struct dentry *qpinfo_dir; + struct dentry *service_fn_dir; + /* file entries */ + struct dentry *stat_query; + struct bnxt_re_dbg_file stat_file; + struct dentry *qplist_query; + struct bnxt_re_dbg_file qp_file; + struct dentry *service_fn_query; + struct bnxt_re_dbg_file service_fn_file; +}; + +struct bnxt_re_en_dev_info { + struct list_head en_list; + struct bnxt_en_dev *en_dev; + struct bnxt_re_dev *rdev; + unsigned long flags; +#define BNXT_RE_FLAG_EN_DEV_NETDEV_REG 0 +#define BNXT_RE_FLAG_EN_DEV_PRIMARY_DEV 1 +#define BNXT_RE_FLAG_EN_DEV_SECONDARY_DEV 2 + u8 wqe_mode; + u8 gsi_mode; + bool te_bypass; + bool ib_uninit_done; + u32 num_msix_requested; + wait_queue_head_t waitq; +}; + +#define BNXT_RE_DB_FIFO_ROOM_MASK_P5 0x1FFF8000 +#define BNXT_RE_MAX_FIFO_DEPTH_P5 0x2c00 +#define BNXT_RE_DB_FIFO_ROOM_SHIFT 15 + +#define BNXT_RE_DB_FIFO_ROOM_MASK_P7 0x3FFF8000 +#define BNXT_RE_MAX_FIFO_DEPTH_P7 0x8000 + +#define BNXT_RE_DB_FIFO_ROOM_MASK(ctx) \ + (_is_chip_p7((ctx)) ? \ + BNXT_RE_DB_FIFO_ROOM_MASK_P7 :\ + BNXT_RE_DB_FIFO_ROOM_MASK_P5) +#define BNXT_RE_MAX_FIFO_DEPTH(ctx) \ + (_is_chip_p7((ctx)) ? \ + BNXT_RE_MAX_FIFO_DEPTH_P7 :\ + BNXT_RE_MAX_FIFO_DEPTH_P5) + +struct bnxt_dbq_nq_list { + int num_nql_entries; + u16 nq_id[16]; +}; + +#define BNXT_RE_ASYNC_ERR_REP_BASE(_type) \ + (ASYNC_EVENT_CMPL_ERROR_REPORT_BASE_EVENT_DATA1_ERROR_##_type) + +#define BNXT_RE_ASYNC_ERR_DBR_TRESH(_type) \ + (ASYNC_EVENT_CMPL_ERROR_REPORT_DOORBELL_DROP_THRESHOLD_##_type) + +#define BNXT_RE_EVENT_DBR_EPOCH(data) \ + (((data) & \ + BNXT_RE_ASYNC_ERR_DBR_TRESH(EVENT_DATA1_EPOCH_MASK)) >> \ + BNXT_RE_ASYNC_ERR_DBR_TRESH(EVENT_DATA1_EPOCH_SFT)) + +#define BNXT_RE_EVENT_ERROR_REPORT_TYPE(data1) \ + (((data1) & \ + BNXT_RE_ASYNC_ERR_REP_BASE(TYPE_MASK)) >> \ + BNXT_RE_ASYNC_ERR_REP_BASE(TYPE_SFT)) + +#define BNXT_RE_DBR_LIST_ADD(_rdev, _res, _type) \ +{ \ + spin_lock(&(_rdev)->res_list[_type].lock); \ + list_add_tail(&(_res)->dbr_list, \ + &(_rdev)->res_list[_type].head); \ + spin_unlock(&(_rdev)->res_list[_type].lock); \ +} + +#define BNXT_RE_DBR_LIST_DEL(_rdev, _res, _type) \ +{ \ + spin_lock(&(_rdev)->res_list[_type].lock); \ + list_del(&(_res)->dbr_list); \ + spin_unlock(&(_rdev)->res_list[_type].lock); \ +} + +#define BNXT_RE_CQ_PAGE_LIST_ADD(_uctx, _cq) \ +{ \ + mutex_lock(&(_uctx)->cq_lock); \ + list_add_tail(&(_cq)->cq_list, &(_uctx)->cq_list); \ + mutex_unlock(&(_uctx)->cq_lock); \ +} + +#define BNXT_RE_CQ_PAGE_LIST_DEL(_uctx, _cq) \ +{ \ + mutex_lock(&(_uctx)->cq_lock); \ + list_del(&(_cq)->cq_list); \ + mutex_unlock(&(_uctx)->cq_lock); \ +} + +#define BNXT_RE_NETDEV_EVENT(event, x) \ + do { \ + if ((event) == (x)) \ + return #x; \ + } while (0) + +/* Do not change the seq of this enum which is followed by dbr recov */ +enum { + BNXT_RE_RES_TYPE_CQ = 0, + BNXT_RE_RES_TYPE_UCTX, + BNXT_RE_RES_TYPE_QP, + BNXT_RE_RES_TYPE_SRQ, + BNXT_RE_RES_TYPE_MAX +}; + +struct bnxt_re_dbr_res_list { + struct list_head head; + spinlock_t lock; +}; + +struct bnxt_re_dbr_drop_recov_work { + struct work_struct work; + struct bnxt_re_dev *rdev; + u32 curr_epoch; +}; + +struct bnxt_re_aer_work { + struct work_struct work; + struct bnxt_re_dev *rdev; +}; + +struct bnxt_re_dbq_stats { + u64 fifo_occup_slab_1; + u64 fifo_occup_slab_2; + u64 fifo_occup_slab_3; + u64 fifo_occup_slab_4; + u64 fifo_occup_water_mark; + u64 do_pacing_slab_1; + u64 do_pacing_slab_2; + u64 do_pacing_slab_3; + u64 do_pacing_slab_4; + u64 do_pacing_slab_5; + u64 do_pacing_water_mark; +}; + +/* Device debug statistics */ +struct bnxt_re_drv_dbg_stats { + struct bnxt_re_dbq_stats dbq; +}; + +/* DB pacing counters */ +struct bnxt_re_dbr_sw_stats { + u64 dbq_int_recv; + u64 dbq_int_en; + u64 dbq_pacing_resched; + u64 dbq_pacing_complete; + u64 dbq_pacing_alerts; + u64 dbr_drop_recov_events; + u64 dbr_drop_recov_timeouts; + u64 dbr_drop_recov_timeout_users; + u64 dbr_drop_recov_event_skips; +}; + +struct bnxt_re_dev { + struct ib_device ibdev; + struct list_head list; + atomic_t ref_count; + atomic_t sched_count; + unsigned long flags; +#define BNXT_RE_FLAG_NETDEV_REGISTERED 0 +#define BNXT_RE_FLAG_IBDEV_REGISTERED 1 +#define BNXT_RE_FLAG_GOT_MSIX 2 +#define BNXT_RE_FLAG_HAVE_L2_REF 3 +#define BNXT_RE_FLAG_ALLOC_RCFW 4 +#define BNXT_RE_FLAG_NET_RING_ALLOC 5 +#define BNXT_RE_FLAG_RCFW_CHANNEL_EN 6 +#define BNXT_RE_FLAG_ALLOC_CTX 7 +#define BNXT_RE_FLAG_STATS_CTX_ALLOC 8 +#define BNXT_RE_FLAG_STATS_CTX2_ALLOC 9 +#define BNXT_RE_FLAG_RCFW_CHANNEL_INIT 10 +#define BNXT_RE_FLAG_WORKER_REG 11 +#define BNXT_RE_FLAG_TBLS_ALLOCINIT 12 +#define BNXT_RE_FLAG_SETUP_NQ 13 +#define BNXT_RE_FLAG_BOND_DEV_REGISTERED 14 +#define BNXT_RE_FLAG_PER_PORT_DEBUG_INFO 15 +#define BNXT_RE_FLAG_DEV_LIST_INITIALIZED 16 +#define BNXT_RE_FLAG_ERR_DEVICE_DETACHED 17 +#define BNXT_RE_FLAG_INIT_DCBX_CC_PARAM 18 +#define BNXT_RE_FLAG_STOP_IN_PROGRESS 20 +#define BNXT_RE_FLAG_ISSUE_ROCE_STATS 29 +#define BNXT_RE_FLAG_ISSUE_CFA_FLOW_STATS 30 + struct ifnet *netdev; + struct auxiliary_device *adev; + struct bnxt_qplib_chip_ctx *chip_ctx; + struct bnxt_en_dev *en_dev; + struct bnxt_re_nq_record nqr; + int id; + struct delayed_work worker; + u16 worker_30s; + struct bnxt_re_tc_rec tc_rec[2]; + u8 cur_prio_map; + /* RCFW Channel */ + struct bnxt_qplib_rcfw rcfw; + /* Device Resources */ + struct bnxt_qplib_dev_attr *dev_attr; + struct bnxt_qplib_res qplib_res; + struct bnxt_qplib_dpi dpi_privileged; + struct bnxt_qplib_cc_param cc_param; + struct mutex cc_lock; + struct mutex qp_lock; + struct list_head qp_list; + u8 roce_mode; + + /* Max of 2 lossless traffic class supported per port */ + u16 cosq[2]; + /* Start: QP for handling QP1 packets */ + struct bnxt_re_gsi_context gsi_ctx; + /* End: QP for handling QP1 packets */ + bool is_virtfn; + u32 num_vfs; + u32 espeed; + /* + * For storing the speed of slave interfaces. + * Same as espeed when bond is not configured + */ + u32 sl_espeed; + /* To be used for a workaround for ISER stack */ + u32 min_tx_depth; + /* To enable qp debug info. Disabled during driver load */ + u32 en_qp_dbg; + /* Array to handle gid mapping */ + char *gid_map; + + struct bnxt_re_device_stats stats; + struct bnxt_re_drv_dbg_stats *dbg_stats; + /* debugfs to expose per port information*/ + struct dentry *port_debug_dir; + struct dentry *info; + struct dentry *drv_dbg_stats; + struct dentry *sp_perf_stats; + struct dentry *pdev_debug_dir; + struct dentry *pdev_qpinfo_dir; + struct bnxt_re_debug_entries *dbg_ent; + struct workqueue_struct *resolve_wq; + struct list_head mac_wq_list; + struct workqueue_struct *dcb_wq; + struct workqueue_struct *aer_wq; + u32 event_bitmap[3]; + bool unreg_sched; + u64 dbr_throttling_reg_off; + u64 dbr_aeq_arm_reg_off; + u64 dbr_db_fifo_reg_off; + void *dbr_page; + u64 dbr_bar_addr; + u32 pacing_algo_th; + u32 pacing_en_int_th; + u32 do_pacing_save; + struct workqueue_struct *dbq_wq; + struct workqueue_struct *dbr_drop_recov_wq; + struct work_struct dbq_fifo_check_work; + struct delayed_work dbq_pacing_work; + /* protect DB pacing */ + struct mutex dbq_lock; + /* Control DBR pacing feature. Set if enabled */ + bool dbr_pacing; + /* Control DBR recovery feature. Set if enabled */ + bool dbr_drop_recov; + bool user_dbr_drop_recov; + /* DBR recovery feature. Set if running */ + bool dbr_recovery_on; + u32 user_dbr_drop_recov_timeout; + /* + * Value used for pacing algo when pacing is active + */ +#define BNXT_RE_MAX_DBR_DO_PACING 0xFFFF + u32 dbr_do_pacing; + u32 dbq_watermark; /* Current watermark set in HW registers */ + u32 dbq_nq_id; /* Current NQ ID for DBQ events */ + u32 dbq_pacing_time; /* ms */ + u32 dbr_def_do_pacing; /* do_pacing when no congestion */ + u32 dbr_evt_curr_epoch; + bool dbq_int_disable; + + bool mod_exit; + struct bnxt_re_dbr_sw_stats *dbr_sw_stats; + struct bnxt_re_dbr_res_list res_list[BNXT_RE_RES_TYPE_MAX]; + struct bnxt_dbq_nq_list nq_list; + char dev_name[IB_DEVICE_NAME_MAX]; + atomic_t dbq_intr_running; + u32 num_msix_requested; + unsigned char *dev_addr; /* For netdev->dev_addr */ +}; + +#define BNXT_RE_RESOLVE_RETRY_COUNT_US 5000000 /* 5 sec */ +struct bnxt_re_resolve_dmac_work{ + struct work_struct work; + struct list_head list; + struct bnxt_re_dev *rdev; + struct ib_ah_attr *ah_attr; + struct bnxt_re_ah_info *ah_info; + atomic_t status_wait; +}; + +static inline u8 bnxt_re_get_prio(u8 prio_map) +{ + u8 prio = 0xFF; + + for (prio = 0; prio < 8; prio++) + if (prio_map & (1UL << prio)) + break; + return prio; +} + +/* This should be called with bnxt_re_dev_lock mutex held */ +static inline bool __bnxt_re_is_rdev_valid(struct bnxt_re_dev *rdev) +{ + struct bnxt_re_dev *tmp_rdev; + + list_for_each_entry(tmp_rdev, &bnxt_re_dev_list, list) { + if (rdev == tmp_rdev) + return true; + } + return false; +} + +static inline bool bnxt_re_is_rdev_valid(struct bnxt_re_dev *rdev) +{ + struct bnxt_re_dev *tmp_rdev; + + mutex_lock(&bnxt_re_dev_lock); + list_for_each_entry(tmp_rdev, &bnxt_re_dev_list, list) { + if (rdev == tmp_rdev) { + mutex_unlock(&bnxt_re_dev_lock); + return true; + } + } + mutex_unlock(&bnxt_re_dev_lock); + + pr_debug("bnxt_re: %s : Invalid rdev received rdev = %p\n", + __func__, rdev); + return false; +} + +int bnxt_re_send_hwrm_cmd(struct bnxt_re_dev *rdev, void *cmd, + int cmdlen); +void bnxt_re_stopqps_and_ib_uninit(struct bnxt_re_dev *rdev); +int bnxt_re_set_hwrm_dscp2pri(struct bnxt_re_dev *rdev, + struct bnxt_re_dscp2pri *d2p, u16 count, + u16 target_id); +int bnxt_re_query_hwrm_dscp2pri(struct bnxt_re_dev *rdev, + struct bnxt_re_dscp2pri *d2p, u16 *count, + u16 target_id); +int bnxt_re_query_hwrm_qportcfg(struct bnxt_re_dev *rdev, + struct bnxt_re_tc_rec *cnprec, u16 tid); +int bnxt_re_hwrm_cos2bw_qcfg(struct bnxt_re_dev *rdev, u16 target_id, + struct bnxt_re_cos2bw_cfg *cfg); +int bnxt_re_hwrm_cos2bw_cfg(struct bnxt_re_dev *rdev, u16 target_id, + struct bnxt_re_cos2bw_cfg *cfg); +int bnxt_re_hwrm_pri2cos_cfg(struct bnxt_re_dev *rdev, + u16 target_id, u16 port_id, + u8 *cos_id_map, u8 pri_map); +int bnxt_re_prio_vlan_tx_update(struct bnxt_re_dev *rdev); +int bnxt_re_get_slot_pf_count(struct bnxt_re_dev *rdev); +struct bnxt_re_dev *bnxt_re_get_peer_pf(struct bnxt_re_dev *rdev); +struct bnxt_re_dev *bnxt_re_from_netdev(struct ifnet *netdev); +u8 bnxt_re_get_priority_mask(struct bnxt_re_dev *rdev, u8 selector); +struct bnxt_qplib_nq * bnxt_re_get_nq(struct bnxt_re_dev *rdev); +void bnxt_re_put_nq(struct bnxt_re_dev *rdev, struct bnxt_qplib_nq *nq); + +#define to_bnxt_re(ptr, type, member) \ + container_of(ptr, type, member) + +#define to_bnxt_re_dev(ptr, member) \ + container_of((ptr), struct bnxt_re_dev, member) + +/* Even number functions from port 0 and odd number from port 1 */ +#define BNXT_RE_IS_PORT0(rdev) (!(rdev->en_dev->pdev->devfn & 1)) + +#define BNXT_RE_ROCE_V1_PACKET 0 +#define BNXT_RE_ROCEV2_IPV4_PACKET 2 +#define BNXT_RE_ROCEV2_IPV6_PACKET 3 +#define BNXT_RE_ACTIVE_MAP_PORT1 0x1 /*port-1 active */ +#define BNXT_RE_ACTIVE_MAP_PORT2 0x2 /*port-2 active */ + +#define BNXT_RE_MEMBER_PORT_MAP (BNXT_RE_ACTIVE_MAP_PORT1 | \ + BNXT_RE_ACTIVE_MAP_PORT2) + +#define rdev_to_dev(rdev) ((rdev) ? (&(rdev)->ibdev.dev) : NULL) + +void bnxt_re_set_dma_device(struct ib_device *ibdev, struct bnxt_re_dev *rdev); +bool bnxt_re_is_rdev_valid(struct bnxt_re_dev *rdev); + +#define bnxt_re_rdev_ready(rdev) (bnxt_re_is_rdev_valid(rdev) && \ + (test_bit(BNXT_RE_FLAG_IBDEV_REGISTERED, &rdev->flags))) +#define BNXT_RE_SRIOV_CFG_TIMEOUT 6 + +int bnxt_re_get_device_stats(struct bnxt_re_dev *rdev); +void bnxt_re_remove_device(struct bnxt_re_dev *rdev, u8 removal_type, + struct auxiliary_device *aux_dev); +void bnxt_re_destroy_lag(struct bnxt_re_dev **rdev); +int bnxt_re_add_device(struct bnxt_re_dev **rdev, + struct ifnet *netdev, + u8 qp_mode, u8 op_type, u8 wqe_mode, u32 num_msix_requested, + struct auxiliary_device *aux_dev); +void bnxt_re_create_base_interface(bool primary); +int bnxt_re_schedule_work(struct bnxt_re_dev *rdev, unsigned long event, + struct ifnet *vlan_dev, + struct ifnet *netdev, + struct auxiliary_device *aux_dev); +void bnxt_re_get_link_speed(struct bnxt_re_dev *rdev); +int _bnxt_re_ib_init(struct bnxt_re_dev *rdev); +int _bnxt_re_ib_init2(struct bnxt_re_dev *rdev); +void bnxt_re_init_resolve_wq(struct bnxt_re_dev *rdev); +void bnxt_re_uninit_resolve_wq(struct bnxt_re_dev *rdev); + +/* The rdev ref_count is to protect immature removal of the device */ +static inline void bnxt_re_hold(struct bnxt_re_dev *rdev) +{ + atomic_inc(&rdev->ref_count); + dev_dbg(rdev_to_dev(rdev), + "Hold ref_count = 0x%x", atomic_read(&rdev->ref_count)); +} + +static inline void bnxt_re_put(struct bnxt_re_dev *rdev) +{ + atomic_dec(&rdev->ref_count); + dev_dbg(rdev_to_dev(rdev), + "Put ref_count = 0x%x", atomic_read(&rdev->ref_count)); +} + +/* +* Responder Error reason codes +* FIXME: Remove these when the defs +* are properly included in hsi header *** 21955 LINES SKIPPED *** From nobody Tue May 28 10:36: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 4VpTTF6Spbz5M09V; Tue, 28 May 2024 10:36: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 4VpTTF5CsGz4TxW; Tue, 28 May 2024 10:36:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716892593; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=slFCfXx0wTXxXNkPLSPA32zk7AA48O1IKYKz2430HTU=; b=vuxEFb1q7EY5v5e2geXJpZMonUV80Jst+8cGR+4ZC5yIj+f7/rNEmMYCUrSRmEt/RR5iZd CQsrpoRDJ9tY0H09RKLucj7LV05Vl0Jtpk5WyvplYLWHSZtJo/xZ/+pHCPo5jZw4H4U9vx uYWN2dPg8cA2+4KV9h3ifBZPRihzpqQKj7gZKgqQ3PDZR+QuYv5+8XpNj/KwBXeIiakqN4 N/6gkcE6eZrLICX78CHPR2UrkK4blZrpF9vkYh6oJv3FeJaBt0je8AbCwGkyZt+N3nIYrI PkPpmR6pQG6+qNjyHeBppSmcZohLPnxKPfFLEYXfn5C2TY/KG7v1qLbrIfNgog== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1716892593; a=rsa-sha256; cv=none; b=Cfqgy0frO+HCg/17TpwrGg1mJbfo3WZXEBFOHNPnwnLbcmcMdTasdM+jf1MA4HUAPaoVmG 9wlQ6LmfWyFcLGLl8zibaAv+UqYFqn+GHkC8OYG7tcUbmUmVd7WVAwo3Y0T/GyckyH8IhV xMJyDsUSaIskhbIpYtFcoWqNOTD755lnpi66nK9udjwJG3CWQbmwS0det6ziHrX8sBTxRT oSec66XdJZqBKEwEYsD0PaMRrtmc58eo2rLNc7wuVC05cK4b7RuPMXz4tgPnHsZTipX2OS mN/EyCbyoZ+8mzAlWUy6UBXoUIAgVlXk7KoyXKONArGQtONTy3mk2YggBLILxw== 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=1716892593; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=slFCfXx0wTXxXNkPLSPA32zk7AA48O1IKYKz2430HTU=; b=PzU0eChJ7ilk3SBt/+ltiOBVf14A2+lwtHL+F1JaXtC6/c3rTYFMObWYT3H8DihRAMJ0ih bQrqmAOamnPPdsP95gz1w7t/gwy647hAdFNFeQDKDu++FvMTXETe/Tlg+D0UqhkfJQ97yr R237bYhr3a5qShrsvRVApcLRPTJ8cTo4vE7HpkGAc3t/+Nw5+bFcse1jBEVG+ptY4/nu/6 Ap6JslfnXwq7mHwrvvR4dqtjn6qDLeDEX38dL3X0uEDKS31tSj2S7ECgK1udVsGHwIDqLp 8hUwg39rpa/K8lVl9cy9YKttDMUj7DzgbOEXesslLjOv8EJ9WBmpcUuy5lUvjA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VpTTF4r9Wz1NtB; Tue, 28 May 2024 10:36: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 44SAaXNo052103; Tue, 28 May 2024 10:36:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44SAaXBD052100; Tue, 28 May 2024 10:36:33 GMT (envelope-from git) Date: Tue, 28 May 2024 10:36:33 GMT Message-Id: <202405281036.44SAaXBD052100@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Sumit Saxena Subject: git: faeff3b851da - main - bnxt_{en/re}: Update bnxt_en and bnxt_re Makefile List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ssaxena X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: faeff3b851dae6e9eb836c59756476e162ea3c40 Auto-Submitted: auto-generated The branch main has been updated by ssaxena: URL: https://cgit.FreeBSD.org/src/commit/?id=faeff3b851dae6e9eb836c59756476e162ea3c40 commit faeff3b851dae6e9eb836c59756476e162ea3c40 Author: Chandrakanth patil AuthorDate: 2024-05-15 07:05:17 +0000 Commit: Sumit Saxena CommitDate: 2024-05-28 10:36:11 +0000 bnxt_{en/re}: Update bnxt_en and bnxt_re Makefile Reviewed by: imp Approved by: imp Differential revision: https://reviews.freebsd.org/D45202 --- sys/modules/bnxt/bnxt_en/Makefile | 2 +- sys/modules/bnxt/bnxt_re/Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/modules/bnxt/bnxt_en/Makefile b/sys/modules/bnxt/bnxt_en/Makefile index ebe9564fa22f..de08d7c500c4 100644 --- a/sys/modules/bnxt/bnxt_en/Makefile +++ b/sys/modules/bnxt/bnxt_en/Makefile @@ -3,7 +3,7 @@ KMOD = if_bnxt SRCS = device_if.h bus_if.h pci_if.h pci_iov_if.h ifdi_if.h -SRCS += opt_inet.h opt_inet6.h opt_rss.h opt_ratelimit.h +SRCS += opt_inet.h opt_inet6.h opt_rss.h SRCS += bnxt_txrx.c if_bnxt.c SRCS += bnxt_hwrm.c SRCS += bnxt_sysctl.c diff --git a/sys/modules/bnxt/bnxt_re/Makefile b/sys/modules/bnxt/bnxt_re/Makefile index d6aa701dbae6..2e1dbc048dfb 100644 --- a/sys/modules/bnxt/bnxt_re/Makefile +++ b/sys/modules/bnxt/bnxt_re/Makefile @@ -8,7 +8,7 @@ SRCS += qplib_res.c qplib_res.h SRCS += qplib_rcfw.c qplib_rcfw.h SRCS += stats.c stats.h SRCS += main.c bnxt_re.h -SRCS += opt_inet.h opt_inet6.h opt_ratelimit.h +SRCS += opt_inet.h opt_inet6.h SRCS += ${LINUXKPI_GENSRCS} CFLAGS+= -I${SRCTOP}/sys/dev/bnxt/bnxt_en From nobody Tue May 28 11:03: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 4VpV444PxJz5M27w; Tue, 28 May 2024 11:03:16 +0000 (UTC) (envelope-from tuexen@freebsd.org) Received: from drew.franken.de (mail-n.franken.de [193.175.24.27]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "*.franken.de", Issuer "Sectigo RSA Domain Validation Secure Server CA" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VpV441ns0z4YN4; Tue, 28 May 2024 11:03:16 +0000 (UTC) (envelope-from tuexen@freebsd.org) Authentication-Results: mx1.freebsd.org; none Received: from smtpclient.apple (unknown [IPv6:2003:a:e03:d412:cae:6ce3:eecf:4f14]) (Authenticated sender: micmac) by drew.franken.de (Postfix) with ESMTPSA id A9BC2721E2806; Tue, 28 May 2024 13:03:10 +0200 (CEST) Content-Type: text/plain; charset=us-ascii List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3774.600.62\)) Subject: Re: git: 35b53f8c989f - main - bnxt_en: Add PFC, ETS & App TLVs protocols support From: tuexen@freebsd.org In-Reply-To: <202405281017.44SAHjum010620@gitrepo.freebsd.org> Date: Tue, 28 May 2024 13:03:09 +0200 Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Content-Transfer-Encoding: quoted-printable Message-Id: References: <202405281017.44SAHjum010620@gitrepo.freebsd.org> To: Sumit Saxena X-Mailer: Apple Mail (2.3774.600.62) X-Spam-Status: No, score=-2.9 required=5.0 tests=ALL_TRUSTED,BAYES_00, T_SCC_BODY_TEXT_LINE autolearn=disabled version=3.4.1 X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on mail-n.franken.de X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:680, ipnet:193.174.0.0/15, country:DE] X-Rspamd-Queue-Id: 4VpV441ns0z4YN4 > On 28. May 2024, at 12:17, Sumit Saxena wrote: >=20 > The branch main has been updated by ssaxena: >=20 > URL: = https://cgit.FreeBSD.org/src/commit/?id=3D35b53f8c989f62286aad075ef2e97bba= 358144f8 >=20 > commit 35b53f8c989f62286aad075ef2e97bba358144f8 > Author: Chandrakanth patil > AuthorDate: 2024-04-28 09:24:30 +0000 > Commit: Sumit Saxena > CommitDate: 2024-05-28 10:15:29 +0000 >=20 > bnxt_en: Add PFC, ETS & App TLVs protocols support >=20 > Created new directory "bnxt_en" in /dev/bnxt and /modules/bnxt > and moved source files and Makefile into respective directory. >=20 > ETS support: >=20 > - Added new files bnxt_dcb.c & bnxt_dcb.h > - Added sysctl node 'dcb' and created handlers 'ets' and > 'dcbx_cap' > - Add logic to validate user input and configure ETS in > the firmware > - Updated makefile to include bnxt_dcb.c & bnxt_dcb.h >=20 > PFC support: >=20 > - Created sysctl handlers 'pfc' under node 'dcb' > - Added logic to validate user input and configure PFC in > the firmware. >=20 > App TLV support: >=20 > - Created 3 new sysctl handlers under node 'dcb' > - set_apptlv (write only): Sets a specified TLV > - del_apptlv (write only): Deletes a specified TLV > - list_apptlv (read only): Lists all APP TLVs configured > - Added logic to validate user input and configure APP TLVs > in the firmware. >=20 > Added Below DCB ops for management interface: >=20 > - Set PFC, Get PFC, Set ETS, Get ETS, Add App_TLV, Del App_TLV > Lst App_TLV >=20 > Reviewed by: imp > Approved by: imp > Differential revision: https://reviews.freebsd.org/D45005 > --- > sys/dev/bnxt/{ =3D> bnxt_en}/bnxt.h | 196 +++++-- > sys/dev/bnxt/bnxt_en/bnxt_dcb.c | 861 = ++++++++++++++++++++++++++++ > sys/dev/bnxt/bnxt_en/bnxt_dcb.h | 127 ++++ > sys/dev/bnxt/{ =3D> bnxt_en}/bnxt_hwrm.c | 408 ++++++++----- > sys/dev/bnxt/{ =3D> bnxt_en}/bnxt_hwrm.h | 7 +- > sys/dev/bnxt/{ =3D> bnxt_en}/bnxt_ioctl.h | 0 > sys/dev/bnxt/{ =3D> bnxt_en}/bnxt_mgmt.c | 69 ++- > sys/dev/bnxt/{ =3D> bnxt_en}/bnxt_mgmt.h | 31 +- > sys/dev/bnxt/{ =3D> bnxt_en}/bnxt_sysctl.c | 429 +++++++++++++- > sys/dev/bnxt/{ =3D> bnxt_en}/bnxt_sysctl.h | 2 + > sys/dev/bnxt/{ =3D> bnxt_en}/bnxt_txrx.c | 0 > sys/dev/bnxt/{ =3D> bnxt_en}/convert_hsi.pl | 0 > sys/dev/bnxt/{ =3D> bnxt_en}/hsi_struct_def.h | 0 > sys/dev/bnxt/{ =3D> bnxt_en}/if_bnxt.c | 48 +- > sys/modules/bnxt/{ =3D> bnxt_en}/Makefile | 4 +- Don't we need some Makefile in sys/modules/bnxt? For me this breaks the = build. Best regards Michael > 15 files changed, 1978 insertions(+), 204 deletions(-) >=20 > diff --git a/sys/dev/bnxt/bnxt.h b/sys/dev/bnxt/bnxt_en/bnxt.h > similarity index 78% > rename from sys/dev/bnxt/bnxt.h > rename to sys/dev/bnxt/bnxt_en/bnxt.h > index 0547bae91e09..e68943fd6286 100644 > --- a/sys/dev/bnxt/bnxt.h > +++ b/sys/dev/bnxt/bnxt_en/bnxt.h > @@ -44,6 +44,7 @@ > #include >=20 > #include "hsi_struct_def.h" > +#include "bnxt_dcb.h" >=20 > /* PCI IDs */ > #define BROADCOM_VENDOR_ID 0x14E4 > @@ -359,9 +360,9 @@ enum bnxt_cp_type { > BNXT_SHARED > }; >=20 > -struct bnxt_cos_queue { > - uint8_t id; > - uint8_t profile; > +struct bnxt_queue_info { > + uint8_t queue_id; > + uint8_t queue_profile; > }; >=20 > struct bnxt_func_info { > @@ -532,6 +533,13 @@ struct bnxt_ver_info { > uint8_t hwrm_min_major; > uint8_t hwrm_min_minor; > uint8_t hwrm_min_update; > + uint64_t fw_ver_code; > +#define BNXT_FW_VER_CODE(maj, min, bld, rsv) \ > + ((uint64_t)(maj) << 48 | (uint64_t)(min) << 32 | (uint64_t)(bld) << = 16 | (rsv)) > +#define BNXT_FW_MAJ(softc) ((softc)->ver_info->fw_ver_code >> 48) > +#define BNXT_FW_MIN(softc) (((softc)->ver_info->fw_ver_code >> 32) & = 0xffff) > +#define BNXT_FW_BLD(softc) (((softc)->ver_info->fw_ver_code >> 16) & = 0xffff) > +#define BNXT_FW_RSV(softc) (((softc)->ver_info->fw_ver_code) & = 0xffff) >=20 > struct sysctl_ctx_list ver_ctx; > struct sysctl_oid *ver_oid; > @@ -644,38 +652,52 @@ struct bnxt_ctx_mem_info { > }; >=20 > struct bnxt_hw_resc { > - uint16_t min_rsscos_ctxs; > - uint16_t max_rsscos_ctxs; > - uint16_t min_cp_rings; > - uint16_t max_cp_rings; > - uint16_t resv_cp_rings; > - uint16_t min_tx_rings; > - uint16_t max_tx_rings; > - uint16_t resv_tx_rings; > - uint16_t max_tx_sch_inputs; > - uint16_t min_rx_rings; > - uint16_t max_rx_rings; > - uint16_t resv_rx_rings; > - uint16_t min_hw_ring_grps; > - uint16_t max_hw_ring_grps; > - uint16_t resv_hw_ring_grps; > - uint16_t min_l2_ctxs; > - uint16_t max_l2_ctxs; > - uint16_t min_vnics; > - uint16_t max_vnics; > - uint16_t resv_vnics; > - uint16_t min_stat_ctxs; > - uint16_t max_stat_ctxs; > - uint16_t resv_stat_ctxs; > - uint16_t max_nqs; > - uint16_t max_irqs; > - uint16_t resv_irqs; > + uint16_t min_rsscos_ctxs; > + uint16_t max_rsscos_ctxs; > + uint16_t min_cp_rings; > + uint16_t max_cp_rings; > + uint16_t resv_cp_rings; > + uint16_t min_tx_rings; > + uint16_t max_tx_rings; > + uint16_t resv_tx_rings; > + uint16_t max_tx_sch_inputs; > + uint16_t min_rx_rings; > + uint16_t max_rx_rings; > + uint16_t resv_rx_rings; > + uint16_t min_hw_ring_grps; > + uint16_t max_hw_ring_grps; > + uint16_t resv_hw_ring_grps; > + uint16_t min_l2_ctxs; > + uint16_t max_l2_ctxs; > + uint16_t min_vnics; > + uint16_t max_vnics; > + uint16_t resv_vnics; > + uint16_t min_stat_ctxs; > + uint16_t max_stat_ctxs; > + uint16_t resv_stat_ctxs; > + uint16_t max_nqs; > + uint16_t max_irqs; > + uint16_t resv_irqs; > +} > + > +enum bnxt_type_ets { > + BNXT_TYPE_ETS_TSA =3D 0, > + BNXT_TYPE_ETS_PRI2TC, > + BNXT_TYPE_ETS_TCBW, > + BNXT_TYPE_ETS_MAX > }; >=20 > -#define BNXT_LLQ(q_profile) \ > - ((q_profile) =3D=3D = HWRM_QUEUE_QPORTCFG_OUTPUT_QUEUE_ID0_SERVICE_PROFILE_LOSSLESS_ROCE) > -#define BNXT_CNPQ(q_profile) \ > - ((q_profile) =3D=3D = HWRM_QUEUE_QPORTCFG_OUTPUT_QUEUE_ID0_SERVICE_PROFILE_LOSSY_ROCE_CNP) > +static const char *const BNXT_ETS_TYPE_STR[] =3D { > + "tsa", > + "pri2tc", > + "tcbw", > +}; > + > +static const char *const BNXT_ETS_HELP_STR[] =3D { > + "X is 1 (strict), 0 (ets)", > + "TC values for pri 0 to 7", > + "TC BW values for pri 0 to 7, Sum should be 100", > +}; >=20 > #define BNXT_HWRM_MAX_REQ_LEN (softc->hwrm_max_req_len) >=20 > @@ -684,6 +706,10 @@ struct bnxt_softc_list { > struct bnxt_softc *softc; > }; >=20 > +#ifndef BIT_ULL > +#define BIT_ULL(nr) (1ULL << (nr)) > +#endif > + > struct bnxt_softc { > device_t dev; > if_ctx_t ctx; > @@ -710,6 +736,8 @@ struct bnxt_softc { > #define BNXT_FLAG_CHIP_P5 0x0020 > #define BNXT_FLAG_TPA 0x0040 > #define BNXT_FLAG_FW_CAP_EXT_STATS 0x0080 > +#define BNXT_FLAG_MULTI_HOST 0x0100 > +#define BNXT_FLAG_MULTI_ROOT 0x0200 > uint32_t flags; > #define BNXT_STATE_LINK_CHANGE (0) > #define BNXT_STATE_MAX (BNXT_STATE_LINK_CHANGE + 1) > @@ -732,13 +760,23 @@ struct bnxt_softc { > uint16_t hwrm_max_ext_req_len; > uint32_t hwrm_spec_code; >=20 > -#define BNXT_MAX_COS_QUEUE 8 > +#define BNXT_MAX_QUEUE 8 > uint8_t max_tc; > - uint8_t max_lltc; /* lossless TCs */ > - struct bnxt_cos_queue q_info[BNXT_MAX_COS_QUEUE]; > - uint8_t tc_to_qidx[BNXT_MAX_COS_QUEUE]; > - uint8_t q_ids[BNXT_MAX_COS_QUEUE]; > - uint8_t max_q; > + uint8_t max_lltc; > + struct bnxt_queue_info tx_q_info[BNXT_MAX_QUEUE]; > + struct bnxt_queue_info rx_q_info[BNXT_MAX_QUEUE]; > + uint8_t tc_to_qidx[BNXT_MAX_QUEUE]; > + uint8_t tx_q_ids[BNXT_MAX_QUEUE]; > + uint8_t rx_q_ids[BNXT_MAX_QUEUE]; > + uint8_t tx_max_q; > + uint8_t rx_max_q; > + uint8_t is_asym_q; > + > + struct bnxt_ieee_ets *ieee_ets; > + struct bnxt_ieee_pfc *ieee_pfc; > + uint8_t dcbx_cap; > + uint8_t default_pri; > + uint8_t max_dscp_value; >=20 > uint64_t admin_ticks; > struct iflib_dma_info hw_rx_port_stats; > @@ -782,6 +820,8 @@ struct bnxt_softc { > struct sysctl_oid *hw_lro_oid; > struct sysctl_ctx_list flow_ctrl_ctx; > struct sysctl_oid *flow_ctrl_oid; > + struct sysctl_ctx_list dcb_ctx; > + struct sysctl_oid *dcb_oid; >=20 > struct bnxt_ver_info *ver_info; > struct bnxt_nvram_info *nvm_info; > @@ -796,13 +836,78 @@ struct bnxt_softc { > uint16_t tx_coal_usecs; > uint16_t tx_coal_usecs_irq; > uint16_t tx_coal_frames; > - uint16_t tx_coal_frames_irq; > + uint16_t tx_coal_frames_irq; >=20 > #define BNXT_USEC_TO_COAL_TIMER(x) ((x) * 25 / 2) > #define BNXT_DEF_STATS_COAL_TICKS 1000000 > #define BNXT_MIN_STATS_COAL_TICKS 250000 > #define BNXT_MAX_STATS_COAL_TICKS 1000000 >=20 > + uint64_t fw_cap; > + #define BNXT_FW_CAP_SHORT_CMD BIT_ULL(0) > + #define BNXT_FW_CAP_LLDP_AGENT BIT_ULL(1) > + #define BNXT_FW_CAP_DCBX_AGENT BIT_ULL(2) > + #define BNXT_FW_CAP_NEW_RM BIT_ULL(3) > + #define BNXT_FW_CAP_IF_CHANGE BIT_ULL(4) > + #define BNXT_FW_CAP_LINK_ADMIN BIT_ULL(5) > + #define BNXT_FW_CAP_VF_RES_MIN_GUARANTEED BIT_ULL(6) > + #define BNXT_FW_CAP_KONG_MB_CHNL BIT_ULL(7) > + #define BNXT_FW_CAP_ADMIN_MTU BIT_ULL(8) > + #define BNXT_FW_CAP_ADMIN_PF BIT_ULL(9) > + #define BNXT_FW_CAP_OVS_64BIT_HANDLE BIT_ULL(10) > + #define BNXT_FW_CAP_TRUSTED_VF BIT_ULL(11) > + #define BNXT_FW_CAP_VF_VNIC_NOTIFY BIT_ULL(12) > + #define BNXT_FW_CAP_ERROR_RECOVERY BIT_ULL(13) > + #define BNXT_FW_CAP_PKG_VER BIT_ULL(14) > + #define BNXT_FW_CAP_CFA_ADV_FLOW BIT_ULL(15) > + #define BNXT_FW_CAP_CFA_RFS_RING_TBL_IDX_V2 BIT_ULL(16) > + #define BNXT_FW_CAP_PCIE_STATS_SUPPORTED BIT_ULL(17) > + #define BNXT_FW_CAP_EXT_STATS_SUPPORTED BIT_ULL(18) > + #define BNXT_FW_CAP_SECURE_MODE BIT_ULL(19) > + #define BNXT_FW_CAP_ERR_RECOVER_RELOAD BIT_ULL(20) > + #define BNXT_FW_CAP_HOT_RESET BIT_ULL(21) > + #define BNXT_FW_CAP_CRASHDUMP BIT_ULL(23) > + #define BNXT_FW_CAP_VLAN_RX_STRIP BIT_ULL(24) > + #define BNXT_FW_CAP_VLAN_TX_INSERT BIT_ULL(25) > + #define BNXT_FW_CAP_EXT_HW_STATS_SUPPORTED BIT_ULL(26) > + #define BNXT_FW_CAP_CFA_EEM BIT_ULL(27) > + #define BNXT_FW_CAP_DBG_QCAPS BIT_ULL(29) > + #define BNXT_FW_CAP_RING_MONITOR BIT_ULL(30) > + #define BNXT_FW_CAP_ECN_STATS BIT_ULL(31) > + #define BNXT_FW_CAP_TRUFLOW BIT_ULL(32) > + #define BNXT_FW_CAP_VF_CFG_FOR_PF BIT_ULL(33) > + #define BNXT_FW_CAP_PTP_PPS BIT_ULL(34) > + #define BNXT_FW_CAP_HOT_RESET_IF BIT_ULL(35) > + #define BNXT_FW_CAP_LIVEPATCH BIT_ULL(36) > + #define BNXT_FW_CAP_NPAR_1_2 BIT_ULL(37) > + #define BNXT_FW_CAP_RSS_HASH_TYPE_DELTA BIT_ULL(38) > + #define BNXT_FW_CAP_PTP_RTC BIT_ULL(39) > + #define BNXT_FW_CAP_TRUFLOW_EN BIT_ULL(40) > + #define BNXT_TRUFLOW_EN(bp) ((bp)->fw_cap & BNXT_FW_CAP_TRUFLOW_EN) > + #define BNXT_FW_CAP_RX_ALL_PKT_TS BIT_ULL(41) > + #define BNXT_FW_CAP_BACKING_STORE_V2 BIT_ULL(42) > + #define BNXT_FW_CAP_DBR_SUPPORTED BIT_ULL(43) > + #define BNXT_FW_CAP_GENERIC_STATS BIT_ULL(44) > + #define BNXT_FW_CAP_DBR_PACING_SUPPORTED BIT_ULL(45) > + #define BNXT_FW_CAP_PTP_PTM BIT_ULL(46) > + #define BNXT_FW_CAP_CFA_NTUPLE_RX_EXT_IP_PROTO BIT_ULL(47) > + #define BNXT_FW_CAP_ENABLE_RDMA_SRIOV BIT_ULL(48) > + #define BNXT_FW_CAP_RSS_TCAM BIT_ULL(49) > + uint32_t lpi_tmr_lo; > + uint32_t lpi_tmr_hi; > + /* copied from flags and flags2 in hwrm_port_phy_qcaps_output */ > + uint16_t phy_flags; > +#define BNXT_PHY_FL_EEE_CAP = HWRM_PORT_PHY_QCAPS_OUTPUT_FLAGS_EEE_SUPPORTED > +#define BNXT_PHY_FL_EXT_LPBK = HWRM_PORT_PHY_QCAPS_OUTPUT_FLAGS_EXTERNAL_LPBK_SUPPORTED > +#define BNXT_PHY_FL_AN_PHY_LPBK = HWRM_PORT_PHY_QCAPS_OUTPUT_FLAGS_AUTONEG_LPBK_SUPPORTED > +#define BNXT_PHY_FL_SHARED_PORT_CFG = HWRM_PORT_PHY_QCAPS_OUTPUT_FLAGS_SHARED_PHY_CFG_SUPPORTED > +#define BNXT_PHY_FL_PORT_STATS_NO_RESET = HWRM_PORT_PHY_QCAPS_OUTPUT_FLAGS_CUMULATIVE_COUNTERS_ON_RESET > +#define BNXT_PHY_FL_NO_PHY_LPBK = HWRM_PORT_PHY_QCAPS_OUTPUT_FLAGS_LOCAL_LPBK_NOT_SUPPORTED > +#define BNXT_PHY_FL_FW_MANAGED_LKDN = HWRM_PORT_PHY_QCAPS_OUTPUT_FLAGS_FW_MANAGED_LINK_DOWN > +#define BNXT_PHY_FL_NO_FCS = HWRM_PORT_PHY_QCAPS_OUTPUT_FLAGS_NO_FCS > +#define BNXT_PHY_FL_NO_PAUSE = (HWRM_PORT_PHY_QCAPS_OUTPUT_FLAGS2_PAUSE_UNSUPPORTED << 8) > +#define BNXT_PHY_FL_NO_PFC = (HWRM_PORT_PHY_QCAPS_OUTPUT_FLAGS2_PFC_UNSUPPORTED << 8) > +#define BNXT_PHY_FL_BANK_SEL = (HWRM_PORT_PHY_QCAPS_OUTPUT_FLAGS2_BANK_ADDR_SUPPORTED << 8) > }; >=20 > struct bnxt_filter_info { > @@ -843,6 +948,17 @@ struct bnxt_softc *bnxt_find_dev(uint32_t domain, = uint32_t bus, uint32_t dev_fn, > int bnxt_read_sfp_module_eeprom_info(struct bnxt_softc *bp, uint16_t = i2c_addr, > uint16_t page_number, uint8_t bank, bool bank_sel_en, uint16_t = start_addr, > uint16_t data_length, uint8_t *buf); > +void bnxt_dcb_init(struct bnxt_softc *softc); > +void bnxt_dcb_free(struct bnxt_softc *softc); > +uint8_t bnxt_dcb_setdcbx(struct bnxt_softc *softc, uint8_t mode); > +uint8_t bnxt_dcb_getdcbx(struct bnxt_softc *softc); > +int bnxt_dcb_ieee_getets(struct bnxt_softc *softc, struct = bnxt_ieee_ets *ets); > +int bnxt_dcb_ieee_setets(struct bnxt_softc *softc, struct = bnxt_ieee_ets *ets); > uint8_t get_phy_type(struct bnxt_softc *softc); > +int bnxt_dcb_ieee_getpfc(struct bnxt_softc *softc, struct = bnxt_ieee_pfc *pfc); > +int bnxt_dcb_ieee_setpfc(struct bnxt_softc *softc, struct = bnxt_ieee_pfc *pfc); > +int bnxt_dcb_ieee_setapp(struct bnxt_softc *softc, struct = bnxt_dcb_app *app); > +int bnxt_dcb_ieee_delapp(struct bnxt_softc *softc, struct = bnxt_dcb_app *app); > +int bnxt_dcb_ieee_listapp(struct bnxt_softc *softc, struct = bnxt_dcb_app *app, int *num_inputs); >=20 > #endif /* _BNXT_H */ > diff --git a/sys/dev/bnxt/bnxt_en/bnxt_dcb.c = b/sys/dev/bnxt/bnxt_en/bnxt_dcb.c > new file mode 100644 > index 000000000000..e1e0581d3c24 > --- /dev/null > +++ b/sys/dev/bnxt/bnxt_en/bnxt_dcb.c > @@ -0,0 +1,861 @@ > +/*- > + * Broadcom NetXtreme-C/E network driver. > + * > + * Copyright (c) 2024 Broadcom, All Rights Reserved. > + * The term Broadcom refers to Broadcom Limited and/or its = subsidiaries > + * > + * 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 COPYRIGHT HOLDERS AND = CONTRIBUTORS "AS IS' > + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED = TO, THE > + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR = PURPOSE > + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER 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 "bnxt.h" > +#include "bnxt_hwrm.h" > +#include "bnxt_dcb.h" > +#include "hsi_struct_def.h" > + > +static int > +bnxt_tx_queue_to_tc(struct bnxt_softc *softc, uint8_t queue_id) > +{ > + int i, j; > + > + for (i =3D 0; i < softc->max_tc; i++) { > + if (softc->tx_q_info[i].queue_id =3D=3D queue_id) { > + for (j =3D 0; j < softc->max_tc; j++) { > + if (softc->tc_to_qidx[j] =3D=3D i) > + return j; > + } > + } > + } > + return -EINVAL; > +} > + > +static int > +bnxt_hwrm_queue_pri2cos_cfg(struct bnxt_softc *softc, > + struct bnxt_ieee_ets *ets, > + uint32_t path_dir) > +{ > + struct hwrm_queue_pri2cos_cfg_input req =3D {0}; > + struct bnxt_queue_info *q_info; > + uint8_t *pri2cos; > + int i; > + > + bnxt_hwrm_cmd_hdr_init(softc, &req, HWRM_QUEUE_PRI2COS_CFG); > + > + req.flags =3D htole32(path_dir | = HWRM_QUEUE_PRI2COS_CFG_INPUT_FLAGS_IVLAN); > + if (path_dir =3D=3D HWRM_QUEUE_PRI2COS_CFG_INPUT_FLAGS_PATH_BIDIR || > + path_dir =3D=3D HWRM_QUEUE_PRI2COS_CFG_INPUT_FLAGS_PATH_TX) > + q_info =3D softc->tx_q_info; > + else > + q_info =3D softc->rx_q_info; > + pri2cos =3D &req.pri0_cos_queue_id; > + for (i =3D 0; i < BNXT_IEEE_8021QAZ_MAX_TCS; i++) { > + uint8_t qidx; > + > + req.enables |=3D = htole32(HWRM_QUEUE_PRI2COS_CFG_INPUT_ENABLES_PRI0_COS_QUEUE_ID << i); > + > + qidx =3D softc->tc_to_qidx[ets->prio_tc[i]]; > + pri2cos[i] =3D q_info[qidx].queue_id; > + } > + return _hwrm_send_message(softc, &req, sizeof(req)); > +} > + > +static int > +bnxt_hwrm_queue_pri2cos_qcfg(struct bnxt_softc *softc, struct = bnxt_ieee_ets *ets) > +{ > + struct hwrm_queue_pri2cos_qcfg_output *resp =3D > + (void *)softc->hwrm_cmd_resp.idi_vaddr; > + struct hwrm_queue_pri2cos_qcfg_input req =3D {0}; > + int rc; > + > + bnxt_hwrm_cmd_hdr_init(softc, &req, HWRM_QUEUE_PRI2COS_QCFG); > + > + req.flags =3D htole32(HWRM_QUEUE_PRI2COS_QCFG_INPUT_FLAGS_IVLAN); > + rc =3D _hwrm_send_message(softc, &req, sizeof(req)); > + if (!rc) { > + uint8_t *pri2cos =3D &resp->pri0_cos_queue_id; > + int i; > + > + for (i =3D 0; i < BNXT_IEEE_8021QAZ_MAX_TCS; i++) { > + uint8_t queue_id =3D pri2cos[i]; > + int tc; > + > + tc =3D bnxt_tx_queue_to_tc(softc, queue_id); > + if (tc >=3D 0) > + ets->prio_tc[i] =3D tc; > + } > + } > + return rc; > +} > + > +static int > +bnxt_hwrm_queue_cos2bw_cfg(struct bnxt_softc *softc, struct = bnxt_ieee_ets *ets, > + uint8_t max_tc) > +{ > + struct hwrm_queue_cos2bw_cfg_input req =3D {0}; > + struct bnxt_cos2bw_cfg cos2bw; > + void *data; > + int i; > + > + bnxt_hwrm_cmd_hdr_init(softc, &req, HWRM_QUEUE_COS2BW_CFG); > + > + for (i =3D 0; i < max_tc; i++) { > + uint8_t qidx =3D softc->tc_to_qidx[i]; > + > + req.enables |=3D > + htole32(HWRM_QUEUE_COS2BW_CFG_INPUT_ENABLES_COS_QUEUE_ID0_VALID << = qidx); > + > + memset(&cos2bw, 0, sizeof(cos2bw)); > + cos2bw.queue_id =3D softc->tx_q_info[qidx].queue_id; > + if (ets->tc_tsa[i] =3D=3D BNXT_IEEE_8021QAZ_TSA_STRICT) { > + cos2bw.tsa =3D > + HWRM_QUEUE_COS2BW_QCFG_OUTPUT_QUEUE_ID0_TSA_ASSIGN_SP; > + cos2bw.pri_lvl =3D i; > + } else { > + cos2bw.tsa =3D > + HWRM_QUEUE_COS2BW_QCFG_OUTPUT_QUEUE_ID0_TSA_ASSIGN_ETS; > + cos2bw.bw_weight =3D ets->tc_tx_bw[i]; > + /* older firmware requires min_bw to be set to the > + * same weight value in percent. > + */ > + if (BNXT_FW_MAJ(softc) < 218) { > + cos2bw.min_bw =3D > + htole32((ets->tc_tx_bw[i] * 100) | > + BW_VALUE_UNIT_PERCENT1_100); > + } > + } > + data =3D &req.unused_0 + qidx * (sizeof(cos2bw) - 4); > + memcpy(data, &cos2bw.queue_id, sizeof(cos2bw) - 4); > + if (qidx =3D=3D 0) { > + req.queue_id0 =3D cos2bw.queue_id; > + req.unused_0 =3D 0; > + } > + } > + return _hwrm_send_message(softc, &req, sizeof(req)); > +} > + > +static int > +bnxt_hwrm_queue_cos2bw_qcfg(struct bnxt_softc *softc, struct = bnxt_ieee_ets *ets) > +{ > + struct hwrm_queue_cos2bw_qcfg_output *resp =3D > + (void *)softc->hwrm_cmd_resp.idi_vaddr; > + struct hwrm_queue_cos2bw_qcfg_input req =3D {0}; > + struct bnxt_cos2bw_cfg cos2bw; > + uint8_t *data; > + int rc, i; > + > + bnxt_hwrm_cmd_hdr_init(softc, &req, HWRM_QUEUE_COS2BW_QCFG); > + > + rc =3D _hwrm_send_message(softc, &req, sizeof(req)); > + if (rc) { > + return rc; > + } > + > + data =3D &resp->queue_id0 + offsetof(struct bnxt_cos2bw_cfg, = queue_id); > + for (i =3D 0; i < softc->max_tc; i++, data +=3D sizeof(cos2bw.cfg)) = { > + int tc; > + > + memcpy(&cos2bw.cfg, data, sizeof(cos2bw.cfg)); > + if (i =3D=3D 0) > + cos2bw.queue_id =3D resp->queue_id0; > + > + tc =3D bnxt_tx_queue_to_tc(softc, cos2bw.queue_id); > + if (tc < 0) > + continue; > + > + if (cos2bw.tsa =3D=3D = HWRM_QUEUE_COS2BW_QCFG_OUTPUT_QUEUE_ID0_TSA_ASSIGN_SP) { > + ets->tc_tsa[tc] =3D BNXT_IEEE_8021QAZ_TSA_STRICT; > + } else { > + ets->tc_tsa[tc] =3D BNXT_IEEE_8021QAZ_TSA_ETS; > + ets->tc_tx_bw[tc] =3D cos2bw.bw_weight; > + } > + } > + return 0; > +} > + > +static int > +bnxt_queue_remap(struct bnxt_softc *softc, unsigned int lltc_mask) > +{ > + unsigned long qmap =3D 0; > + int max =3D softc->max_tc; > + int i, j, rc; > + > + /* Assign lossless TCs first */ > + for (i =3D 0, j =3D 0; i < max; ) { > + if (lltc_mask & (1 << i)) { > + if (BNXT_LLQ(softc->rx_q_info[j].queue_profile)) { > + softc->tc_to_qidx[i] =3D j; > + __set_bit(j, &qmap); > + i++; > + } > + j++; > + continue; > + } > + i++; > + } > + > + for (i =3D 0, j =3D 0; i < max; i++) { > + if (lltc_mask & (1 << i)) > + continue; > + j =3D find_next_zero_bit(&qmap, max, j); > + softc->tc_to_qidx[i] =3D j; > + __set_bit(j, &qmap); > + j++; > + } > + > + if (softc->ieee_ets) { > + rc =3D bnxt_hwrm_queue_cos2bw_cfg(softc, softc->ieee_ets, = softc->max_tc); > + if (rc) { > + device_printf(softc->dev, "failed to config BW, rc =3D %d\n", rc); > + return rc; > + } > + rc =3D bnxt_hwrm_queue_pri2cos_cfg(softc, softc->ieee_ets, > + HWRM_QUEUE_PRI2COS_CFG_INPUT_FLAGS_PATH_BIDIR); > + if (rc) { > + device_printf(softc->dev, "failed to config prio, rc =3D %d\n", rc); > + return rc; > + } > + } > + return 0; > +} > + > +static int > +bnxt_hwrm_queue_pfc_cfg(struct bnxt_softc *softc, struct = bnxt_ieee_pfc *pfc) > +{ > + struct hwrm_queue_pfcenable_cfg_input req =3D {0}; > + struct bnxt_ieee_ets *my_ets =3D softc->ieee_ets; > + unsigned int tc_mask =3D 0, pri_mask =3D 0; > + uint8_t i, pri, lltc_count =3D 0; > + bool need_q_remap =3D false; > + > + if (!my_ets) > + return -EINVAL; > + > + for (i =3D 0; i < softc->max_tc; i++) { > + for (pri =3D 0; pri < BNXT_IEEE_8021QAZ_MAX_TCS; pri++) { > + if ((pfc->pfc_en & (1 << pri)) && > + (my_ets->prio_tc[pri] =3D=3D i)) { > + pri_mask |=3D 1 << pri; > + tc_mask |=3D 1 << i; > + } > + } > + if (tc_mask & (1 << i)) > + lltc_count++; > + } > + > + if (lltc_count > softc->max_lltc) { > + device_printf(softc->dev, > + "Hardware doesn't support %d lossless queues " > + "to configure PFC (cap %d)\n", lltc_count, softc->max_lltc); > + return -EINVAL; > + } > + > + for (i =3D 0; i < softc->max_tc; i++) { > + if (tc_mask & (1 << i)) { > + uint8_t qidx =3D softc->tc_to_qidx[i]; > + > + if (!BNXT_LLQ(softc->rx_q_info[qidx].queue_profile)) { > + need_q_remap =3D true; > + break; > + } > + } > + } > + > + if (need_q_remap) > + bnxt_queue_remap(softc, tc_mask); > + > + bnxt_hwrm_cmd_hdr_init(softc, &req, HWRM_QUEUE_PFCENABLE_CFG); > + > + req.flags =3D htole32(pri_mask); > + return _hwrm_send_message(softc, &req, sizeof(req)); > +} > + > +static int > +bnxt_hwrm_queue_pfc_qcfg(struct bnxt_softc *softc, struct = bnxt_ieee_pfc *pfc) > +{ > + struct hwrm_queue_pfcenable_qcfg_output *resp =3D > + (void *)softc->hwrm_cmd_resp.idi_vaddr; > + struct hwrm_queue_pfcenable_qcfg_input req =3D {0}; > + uint8_t pri_mask; > + int rc; > + > + bnxt_hwrm_cmd_hdr_init(softc, &req, HWRM_QUEUE_PFCENABLE_QCFG); > + > + rc =3D _hwrm_send_message(softc, &req, sizeof(req)); > + if (rc) { > + return rc; > + } > + > + pri_mask =3D le32toh(resp->flags); > + pfc->pfc_en =3D pri_mask; > + return 0; > +} > + > +static int > +bnxt_hwrm_get_dcbx_app(struct bnxt_softc *softc, struct bnxt_dcb_app = *app, int *num_inputs) > +{ > + struct hwrm_fw_get_structured_data_input get =3D {0}; > + struct hwrm_struct_data_dcbx_app *fw_app; > + struct hwrm_struct_hdr *data; > + struct iflib_dma_info dma_data; > + size_t data_len; > + int rc, n, i; > + > + if (softc->hwrm_spec_code < 0x10601) > + return 0; > + > + bnxt_hwrm_cmd_hdr_init(softc, &get, HWRM_FW_GET_STRUCTURED_DATA); > + > + n =3D BNXT_IEEE_8021QAZ_MAX_TCS; > + data_len =3D sizeof(*data) + sizeof(*fw_app) * n; > + rc =3D iflib_dma_alloc(softc->ctx, data_len, &dma_data, > + BUS_DMA_NOWAIT); > + if (rc) > + return ENOMEM; > + get.dest_data_addr =3D htole64(dma_data.idi_paddr); > + get.structure_id =3D htole16(HWRM_STRUCT_HDR_STRUCT_ID_DCBX_APP); > + get.subtype =3D htole16(HWRM_STRUCT_DATA_SUBTYPE_HOST_OPERATIONAL); > + get.count =3D 0; > + rc =3D _hwrm_send_message(softc, &get, sizeof(get)); > + if (rc) > + goto set_app_exit; > + > + data =3D (void *)dma_data.idi_vaddr; > + fw_app =3D (struct hwrm_struct_data_dcbx_app *)(data + 1); > + > + if (data->struct_id !=3D = htole16(HWRM_STRUCT_HDR_STRUCT_ID_DCBX_APP)) { > + rc =3D -ENODEV; > + goto set_app_exit; > + } > + > + n =3D data->count; > + for (i =3D 0; i < n; i++, fw_app++) { > + app[*num_inputs].priority =3D fw_app->priority; > + app[*num_inputs].protocol =3D htobe16(fw_app->protocol_id); > + app[*num_inputs].selector =3D fw_app->protocol_selector; > + (*num_inputs)++; > + } > + > +set_app_exit: > + iflib_dma_free(&dma_data); > + return rc; > +} > + > +static int > +bnxt_hwrm_set_dcbx_app(struct bnxt_softc *softc, struct bnxt_dcb_app = *app, > + bool add) > +{ > + struct hwrm_fw_set_structured_data_input set =3D {0}; > + struct hwrm_fw_get_structured_data_input get =3D {0}; > + struct hwrm_struct_data_dcbx_app *fw_app; > + struct hwrm_struct_hdr *data; > + struct iflib_dma_info dma_data; > + size_t data_len; > + int rc, n, i; > + > + if (softc->hwrm_spec_code < 0x10601) > + return 0; > + > + bnxt_hwrm_cmd_hdr_init(softc, &get, HWRM_FW_GET_STRUCTURED_DATA); > + > + n =3D BNXT_IEEE_8021QAZ_MAX_TCS; > + data_len =3D sizeof(*data) + sizeof(*fw_app) * n; > + rc =3D iflib_dma_alloc(softc->ctx, data_len, &dma_data, > + BUS_DMA_NOWAIT); > + if (rc) > + return ENOMEM; > + get.dest_data_addr =3D htole64(dma_data.idi_paddr); > + get.structure_id =3D htole16(HWRM_STRUCT_HDR_STRUCT_ID_DCBX_APP); > + get.subtype =3D htole16(HWRM_STRUCT_DATA_SUBTYPE_HOST_OPERATIONAL); > + get.count =3D 0; > + rc =3D _hwrm_send_message(softc, &get, sizeof(get)); > + if (rc) > + goto set_app_exit; > + > + data =3D (void *)dma_data.idi_vaddr; > + fw_app =3D (struct hwrm_struct_data_dcbx_app *)(data + 1); > + > + if (data->struct_id !=3D = htole16(HWRM_STRUCT_HDR_STRUCT_ID_DCBX_APP)) { > + rc =3D -ENODEV; > + goto set_app_exit; > + } > + > + n =3D data->count; > + for (i =3D 0; i < n; i++, fw_app++) { > + if (fw_app->protocol_id =3D=3D htobe16(app->protocol) && > + fw_app->protocol_selector =3D=3D app->selector && > + fw_app->priority =3D=3D app->priority) { > + if (add) > + goto set_app_exit; > + else > + break; > + } > + } > + if (add) { > + /* append */ > + n++; > + fw_app->protocol_id =3D htobe16(app->protocol); > + fw_app->protocol_selector =3D app->selector; > + fw_app->priority =3D app->priority; > + fw_app->valid =3D 1; > + } else { > + size_t len =3D 0; > + > + /* not found, nothing to delete */ > + if (n =3D=3D i) > + goto set_app_exit; > + > + len =3D (n - 1 - i) * sizeof(*fw_app); > + if (len) > + memmove(fw_app, fw_app + 1, len); > + n--; > + memset(fw_app + n, 0, sizeof(*fw_app)); > + } > + data->count =3D n; > + data->len =3D htole16(sizeof(*fw_app) * n); > + data->subtype =3D = htole16(HWRM_STRUCT_DATA_SUBTYPE_HOST_OPERATIONAL); > + > + bnxt_hwrm_cmd_hdr_init(softc, &set, HWRM_FW_SET_STRUCTURED_DATA); > + > + set.src_data_addr =3D htole64(dma_data.idi_paddr); > + set.data_len =3D htole16(sizeof(*data) + sizeof(*fw_app) * n); > + set.hdr_cnt =3D 1; > + rc =3D _hwrm_send_message(softc, &set, sizeof(set)); > + > +set_app_exit: > + iflib_dma_free(&dma_data); > + return rc; > +} > + > +static int > +bnxt_hwrm_queue_dscp_qcaps(struct bnxt_softc *softc) > +{ > + struct hwrm_queue_dscp_qcaps_output *resp =3D > + (void *)softc->hwrm_cmd_resp.idi_vaddr; > + struct hwrm_queue_dscp_qcaps_input req =3D {0}; > + int rc; > + > + softc->max_dscp_value =3D 0; > + if (softc->hwrm_spec_code < 0x10800 || BNXT_VF(softc)) > + return 0; > + > + bnxt_hwrm_cmd_hdr_init(softc, &req, HWRM_QUEUE_DSCP_QCAPS); > + > + rc =3D _hwrm_send_message(softc, &req, sizeof(req)); > + if (!rc) { > + softc->max_dscp_value =3D (1 << resp->num_dscp_bits) - 1; > + if (softc->max_dscp_value < 0x3f) > + softc->max_dscp_value =3D 0; > + } > + return rc; > +} > + > +static int > +bnxt_hwrm_queue_dscp2pri_qcfg(struct bnxt_softc *softc, struct = bnxt_dcb_app *app, int *num_inputs) > +{ > + struct hwrm_queue_dscp2pri_qcfg_input req =3D {0}; > + struct hwrm_queue_dscp2pri_qcfg_output *resp =3D > + (void *)softc->hwrm_cmd_resp.idi_vaddr; > + struct bnxt_dscp2pri_entry *dscp2pri; > + struct iflib_dma_info dma_data; > + int rc, entry_cnt; > + int i; > + > + if (softc->hwrm_spec_code < 0x10800) > + return 0; > + > + rc =3D iflib_dma_alloc(softc->ctx, sizeof(*dscp2pri) * 128, = &dma_data, > + BUS_DMA_NOWAIT); > + if (rc) > + return ENOMEM; > + > + dscp2pri =3D (void *)dma_data.idi_vaddr; > + > + bnxt_hwrm_cmd_hdr_init(softc, &req, HWRM_QUEUE_DSCP2PRI_QCFG); > + > + req.dest_data_addr =3D htole64(dma_data.idi_paddr); > + req.dest_data_buffer_size =3D htole16(sizeof(*dscp2pri) * 64); > + req.port_id =3D htole16(softc->pf.port_id); > + rc =3D _hwrm_send_message(softc, &req, sizeof(req)); > + > + if (rc) > + goto end; > + > + entry_cnt =3D le16toh(resp->entry_cnt); > + for (i =3D 0; i < entry_cnt; i++) { > + app[*num_inputs].priority =3D dscp2pri[i].pri; > + app[*num_inputs].protocol =3D dscp2pri[i].dscp; > + app[*num_inputs].selector =3D BNXT_IEEE_8021QAZ_APP_SEL_DSCP; > + (*num_inputs)++; > + } > + > +end: > + iflib_dma_free(&dma_data); > + return rc; > +} > + > +static int > +bnxt_hwrm_queue_dscp2pri_cfg(struct bnxt_softc *softc, struct = bnxt_dcb_app *app, > + bool add) > +{ > + struct hwrm_queue_dscp2pri_cfg_input req =3D {0}; > + struct bnxt_dscp2pri_entry *dscp2pri; > + struct iflib_dma_info dma_data; > + int rc; > + > + if (softc->hwrm_spec_code < 0x10800) > + return 0; > + > + rc =3D iflib_dma_alloc(softc->ctx, sizeof(*dscp2pri), &dma_data, > + BUS_DMA_NOWAIT); > + if (rc) > + return ENOMEM; > + > + bnxt_hwrm_cmd_hdr_init(softc, &req, HWRM_QUEUE_DSCP2PRI_CFG); > + > + req.src_data_addr =3D htole64(dma_data.idi_paddr); > + dscp2pri =3D (void *)dma_data.idi_vaddr; > + dscp2pri->dscp =3D app->protocol; > + if (add) > + dscp2pri->mask =3D 0x3f; > + else > + dscp2pri->mask =3D 0; > + dscp2pri->pri =3D app->priority; > + req.entry_cnt =3D htole16(1); > + req.port_id =3D htole16(softc->pf.port_id); > + rc =3D _hwrm_send_message(softc, &req, sizeof(req)); > + > + iflib_dma_free(&dma_data); > + return rc; > +} > + > +static int > +bnxt_ets_validate(struct bnxt_softc *softc, struct bnxt_ieee_ets = *ets, uint8_t *tc) > +{ > + int total_ets_bw =3D 0; > + bool zero =3D false; > + uint8_t max_tc =3D 0; > + int i; > + > + for (i =3D 0; i < BNXT_IEEE_8021QAZ_MAX_TCS; i++) { > + if (ets->prio_tc[i] > softc->max_tc) { > + device_printf(softc->dev, "priority to TC mapping exceeds TC count = %d\n", > + ets->prio_tc[i]); > + return -EINVAL; > + } > + if (ets->prio_tc[i] > max_tc) > + max_tc =3D ets->prio_tc[i]; > + > + if ((ets->tc_tx_bw[i] || ets->tc_tsa[i]) && i > softc->max_tc) > + return -EINVAL; > + > + switch (ets->tc_tsa[i]) { > + case BNXT_IEEE_8021QAZ_TSA_STRICT: > + break; > + case BNXT_IEEE_8021QAZ_TSA_ETS: > + total_ets_bw +=3D ets->tc_tx_bw[i]; > + zero =3D zero || !ets->tc_tx_bw[i]; > + break; > + default: > + return -ENOTSUPP; > + } > + } > + if (total_ets_bw > 100) { > + device_printf(softc->dev, "rejecting ETS config exceeding available = bandwidth\n"); > + return -EINVAL; > + } > + if (zero && total_ets_bw =3D=3D 100) { > + device_printf(softc->dev, "rejecting ETS config starving a TC\n"); > + return -EINVAL; > + } > + > + if (max_tc >=3D softc->max_tc) > + *tc =3D softc->max_tc; > + else > + *tc =3D max_tc + 1; > + return 0; > +} > + > +int > +bnxt_dcb_ieee_getets(struct bnxt_softc *softc, struct bnxt_ieee_ets = *ets) > +{ > + struct bnxt_ieee_ets *my_ets =3D softc->ieee_ets; > + int rc; > + > + if (!my_ets) > + return 0; > + > + rc =3D bnxt_hwrm_queue_cos2bw_qcfg(softc, my_ets); > + if (rc) > + goto error; > + rc =3D bnxt_hwrm_queue_pri2cos_qcfg(softc, my_ets); > + if (rc) > + goto error; > + > + if (ets) { > + ets->cbs =3D my_ets->cbs; > + ets->ets_cap =3D softc->max_tc; > + memcpy(ets->tc_tx_bw, my_ets->tc_tx_bw, sizeof(ets->tc_tx_bw)); > + memcpy(ets->tc_rx_bw, my_ets->tc_rx_bw, sizeof(ets->tc_rx_bw)); > + memcpy(ets->tc_tsa, my_ets->tc_tsa, sizeof(ets->tc_tsa)); > + memcpy(ets->prio_tc, my_ets->prio_tc, sizeof(ets->prio_tc)); > + } > + return 0; > +error: > + return rc; > +} > + > +int > +bnxt_dcb_ieee_setets(struct bnxt_softc *softc, struct bnxt_ieee_ets = *ets) > +{ > + uint8_t max_tc =3D 0; > + int rc; > *** 1821 LINES SKIPPED *** From nobody Tue May 28 12:03: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 4VpWQ822dNz5M7x6; Tue, 28 May 2024 12:04: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 4VpWQ80DBWz4f72; Tue, 28 May 2024 12:04:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716897840; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oH521pyn6ky8XuIJyeRNQld3ySmPFFEUlmy1c+pR9W8=; b=OQ/8raOkxjf4d96CrLLCzchwxNxp5nxLa0JUJgP6Ovyu+/lxOoP2OgeMDU8c1rtoIk0yk4 U9VMsWltjz4nybfGpCXdNqVKjkla4unTnHbOcZzIFWpB9DdJBzImi+7ZQ+Utk5qCkTn2P+ TFHvsz7ZwUHTvOA2v8u5fza/cpbEU+gHMi/kXvchztfv2SnR3lB3vBGefM2RRkRQz75IWn Gdg1EiNoWOgss/9FReVBF4GWxX2Z8Kq/Xy8QeboAH0t+Nuy3uuTf1Ahu3KbXUEmn7ehS30 fgNhZhwNroTi2GRBcaAUj+60FNtdgQwYLSqF6xr5VJFaxOvFH5fz2XYIipULqQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1716897840; a=rsa-sha256; cv=none; b=KKjCUJh1FOjdiXf10HCMLf5fXfX8/g+5Cohp0VpqtJRS3TEIGYamckgw5mhzOWTMu55ozL HhUmktiw/6JL3ipHspjXslLT1zM4h8YaboId4SwNLnHuzmKrfmx2Fq57ssvV99nNafInly is5IpT1LsXNKNsQZ0iLwc2n0rMEzdNQiBgih4f42WmZnhdKAzYxen2qw9nXzsvIZ5n0jFj EYrmqwbo91mtkeh9/dS1SmXlStFT5haKcuw/3T1Jc7RKjStIsSegXDLYcuLKxvZoSKJbxl MxgGusr9M7rqQnMoQxcAQwuYCynna4ch5PJN9AipNFcRz5V4taTgjDaz7fKokA== 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=1716897840; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oH521pyn6ky8XuIJyeRNQld3ySmPFFEUlmy1c+pR9W8=; b=iighO6qCS4OzTUCTyrw90I5cGA5PKP4g+SvkLmXqS5/J6wROHZp0P+QTFKk69oYOnkRczc zGJhSS5H6r1vKzN8ifrJe5gmRdTW6vW70SRJ4k7HQR1dUpg3dJQLsTPJlcu8dtweIJZrzC D2WhnkgffNa9mprqbVbxbWMPmWf1xBnJUEKSf/zoZSOG9FR8fWi/kNVXG42zCerzGl3LBq NoQMwol3X1k0+0jwej6DnEENyc9E1ifQJV5Jf2j7Uyfx5LTPVt/ErpUgdTzapQ2ulTzIab EOGV4effxJSNY0NBr+o0giXorEzZKS7exVcaGKi1vGC38T5cJ3DG+IKEeIRwQQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VpWQ76wkYz1R6G; Tue, 28 May 2024 12:03: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 44SC3xt3003824; Tue, 28 May 2024 12:03:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44SC3xOs003821; Tue, 28 May 2024 12:03:59 GMT (envelope-from git) Date: Tue, 28 May 2024 12:03:59 GMT Message-Id: <202405281203.44SC3xOs003821@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: bf56e8b9c863 - main - bnxt: Add a module makefile to fix the 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: bf56e8b9c8639ac4447d223b83cdc128107cc3cd Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=bf56e8b9c8639ac4447d223b83cdc128107cc3cd commit bf56e8b9c8639ac4447d223b83cdc128107cc3cd Author: Mark Johnston AuthorDate: 2024-05-28 12:02:19 +0000 Commit: Mark Johnston CommitDate: 2024-05-28 12:02:19 +0000 bnxt: Add a module makefile to fix the build Fixes: 35b53f8c989f ("bnxt_en: Add PFC, ETS & App TLVs protocols support") --- sys/modules/bnxt/Makefile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sys/modules/bnxt/Makefile b/sys/modules/bnxt/Makefile new file mode 100644 index 000000000000..32aec4806a2c --- /dev/null +++ b/sys/modules/bnxt/Makefile @@ -0,0 +1,4 @@ +SUBDIR= bnxt_en \ + bnxt_re + +.include From nobody Tue May 28 12:26: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 4VpWw90XXCz5M9hM; Tue, 28 May 2024 12:26: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 4VpWw86k6nz4hQl; Tue, 28 May 2024 12:26:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716899192; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=P2SMrd3ZSktZxivGfc0S7xhJ3pY2wHVnCCEc7zVBmVU=; b=LbnXdm0S5YDE+63IvZUUmW8kZAmTSxJcByAuuMQSDnk6/PcNrpN4UaRaDy+StjMd0YArxi V9zgKr6AprOC9e/bu7vjoMwjd/aw7K+Pv6pCVNI2036ZWooTV+Avjo/Pdm6/4saNZZadjr ga7X75lf+xqjuEBpVdjJcmu2yV6bXgqMc7QZTmtFt7kz2feNn/+ScP4tOiD9kIST4FOKju d33iPN409WHuExGO3qZSWwdlFAyp5WLUcHQQnDf3CdWyCQghXcDW6bjXEp7213yDOso7qK 2Pu8YiCg/wP7QiEPjBbGk/0jTW0haG9mnaKIuzWXb+Z0j10eAMQsXtcMPfVrgA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1716899192; a=rsa-sha256; cv=none; b=BXCaMEynW8o0KQ3EiLXJzeCqZIJTx37AA0l/SVw1Y2vNiB9Zqb/dxJYAJ6MjgcRZfDwdz+ Ca9sUjs0BLt/63ss5ACTrPs+JKPZZXpSQMxr5XMy+zMX2nUcADQpfQN1YLUdv4XdKTsr20 UVqbzLd6UKJniMPm5aw6Y2TwZNjrYFbiw8rt3cZhy9HBdoBXQfmqdVFSXoAMpLSHvwPEay zl7s8lIo0Ky7uluMh97DFte/UWs92AmRUZ+mcWiOheT8fFsIW1BP3j+Baou5lQSyKmjZgM UVXGPpl+btb/vR5pSygYLoU8o5I/G6pdqXyf8lLO0auS25CFdJclMbyt18Yl1g== 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=1716899192; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=P2SMrd3ZSktZxivGfc0S7xhJ3pY2wHVnCCEc7zVBmVU=; b=dy2pXoVQYng8jyNpsHHyPYpID1SqE9uCW4kdpokLJgQUVOn4r7rwy739TfWAnSiGaU8jts ReRnp2cwRjgfI/4tokUY19cJ9tKEpCwzDLhTt0Txy4uf67EC0JrYfMgvzai/NDiAI4yryV qbBVcdBJk7Ot5XKnxhh34RodHe9Kzs8xHLq2kBZnvB8goYjJWz5MibdQna280Tv69W6EVH WAynTvWChUsaT4/A7ZI7VG88+sNOlkEuP6fnBxx0JnwOuXzTK4s87fmorLaAOqoxIYw4F4 D0aHckTA0WsttpDhWXQsDm4h28r7HfdZqepgZA8Qhx8JIo6fqw7AX1Dmo78mtQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VpWw85qwZz1RWT; Tue, 28 May 2024 12:26: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 44SCQWEt037954; Tue, 28 May 2024 12:26:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44SCQW8o037951; Tue, 28 May 2024 12:26:32 GMT (envelope-from git) Date: Tue, 28 May 2024 12:26:32 GMT Message-Id: <202405281226.44SCQW8o037951@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: 8164d511d6a6 - main - libc/tests: Fix installation without 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: 8164d511d6a6053df82911e7d4ebb34fff3d765c Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=8164d511d6a6053df82911e7d4ebb34fff3d765c commit 8164d511d6a6053df82911e7d4ebb34fff3d765c Author: Mark Johnston AuthorDate: 2024-05-28 12:24:43 +0000 Commit: Mark Johnston CommitDate: 2024-05-28 12:24:43 +0000 libc/tests: Fix installation without MK_TOOLCHAIN There is some exotic conditional logic here to avoid building a particular test if a certain UBSAN library isn't present in the toolchain sysroot. This causes build failures for me when doing an "installworld WITHOUT_TOOLCHAIN=", which I do frequently during tests. I believe the problem is that SYSROOT is unset during installworld, so the build sees the host's copy of libclang_rt.ubsan_standalone.a and then tries to install a binary that wasn't built during buildworld. Try to make the check a bit less fragile. Reviewed by: dim MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D45035 --- lib/libc/tests/ssp/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/libc/tests/ssp/Makefile b/lib/libc/tests/ssp/Makefile index 22f48d7dfe54..2907d1a621bf 100644 --- a/lib/libc/tests/ssp/Makefile +++ b/lib/libc/tests/ssp/Makefile @@ -30,7 +30,7 @@ PROGS+= h_memset # now on amd64 when it trips the stack bounds specified in t_ssp.sh . This # probably needs to be fixed as it's currently hardcoded. .if ${COMPILER_TYPE} == "clang" && !defined(_SKIP_BUILD) && \ - (!defined(_RECURSING_PROGS) || ${PROG} == "h_raw") + (!defined(_RECURSING_PROGS) || ${PROG} == "h_raw") && ${MK_TOOLCHAIN} == "yes" .include "${SRCTOP}/lib/libclang_rt/compiler-rt-vars.mk" _libclang_rt_ubsan= ${SYSROOT}${SANITIZER_LIBDIR}/libclang_rt.ubsan_standalone-${CRTARCH}.a .if exists(${_libclang_rt_ubsan}) From nobody Tue May 28 13:13: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 4VpXxt40Cyz5MFvv; Tue, 28 May 2024 13:13: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 4VpXxt2vK9z4pCX; Tue, 28 May 2024 13:13:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716901986; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OvuMfswj2aGlFowAwveJR0moUQZ8bL4YOvtXdTKwPO4=; b=MkWekDpgt5xu8dFC45OPwrv0QIRF2zymg8qYz/rBKgxvJ8m5lARf1XpyJHfiN3ZvOvRlXf LhmXm+2eGoTxNAKIVjNBiBZDwIg9rgBvDP9PFkzj3i8F86MkfcHaXPsVbRbB+AZCOAS13w ZJq+Za308x15gioPF0DPzqBCQ2HIkPquwIHMJk0f72urok2oPn8CHNtrMcDGFo5MmyDtA3 tUPCY33d1oVX3v1PkpTtG8mJ52reUHFfVRRPDaXi/5GYJapv3HGxeCkWflXrljBkDnaIUx s+kEUJhVxoPQ3aLezLPr+eBAC+Ug3jTXgw2NuWjJGwk0LDgtlJIkm2p5ElH9LA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1716901986; a=rsa-sha256; cv=none; b=dThDmFqRsdmjmhPY0Vb+N+VgfcjMj8PEEhCoNQtDtvcqcH3EYjEm20LQra3Zk2NO4DROp0 u+6+60I3MR3jn/aBN/9W4I4P6p7yq1mGHdX4qjmFtXXm1Hpt6aA1ka4YDXd7a1Va7SO6cc yTHbEfzBHGD/BYgRrBZsiGECMlrgAjn2jXn00puxDeK6jHL4Y/lMXWsz0Dg06YRY+djqmu r7bjxVKIbxQzMT+1RQloRYwujeQ6867upUtN8NOF/n0sLJEWjDU+hGVFH4Q9sxc2+0jV8K YApa3fPxiOsCgo1IWR8FUZRUtPB79Cjpe5Sy2T4dRdkkU8jFcKHiG32nXE95rA== 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=1716901986; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OvuMfswj2aGlFowAwveJR0moUQZ8bL4YOvtXdTKwPO4=; b=x9YaDs1xwDVllT1yC3O9PwB0QOS/fvjcqTaFV9/WY3B2Msoi/BlBCDPAkhjpJRMjxtIVn3 dfEAOvnLdWMg+Nj5IBXmnZRlxwZ3EBDg0SGk7huaDf6a4TlAkdPYvXq0s2/A6FuDYFzvFT dLoyCwtMoCOIKn7vU0E7Fi/2HC8M1W+kywPqISlre4pxXr5pcmF1ViHA+tf9+01lLOsqWz gdhXVFWcRfFiQ82VnnA921JjXtuqZZ3HEA7GJSfRftKX0lHcF8bG6bSR2N7SKvkFP2QNCu bVvPH5LLhiN/JnOvYeJfDqRQZ2PrET8leEhO93FDZ7+wtThHu74wJgmqrT4+TA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VpXxt2TnVzDqH; Tue, 28 May 2024 13:13: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 44SDD6j8021834; Tue, 28 May 2024 13:13:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44SDD68Y021831; Tue, 28 May 2024 13:13:06 GMT (envelope-from git) Date: Tue, 28 May 2024 13:13:06 GMT Message-Id: <202405281313.44SDD68Y021831@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: bbe42332e5b2 - main - bnxt_re: Explicitly cast pointer-to-integer conversions List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: bbe42332e5b2cbe16a885360fad4462d13c7b357 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=bbe42332e5b2cbe16a885360fad4462d13c7b357 commit bbe42332e5b2cbe16a885360fad4462d13c7b357 Author: Mark Johnston AuthorDate: 2024-05-28 13:04:21 +0000 Commit: Mark Johnston CommitDate: 2024-05-28 13:12:42 +0000 bnxt_re: Explicitly cast pointer-to-integer conversions Reported by: Jenkins Fixes: acd884dec99a ("RDMA/bnxt_re: Add bnxt_re RoCE driver") --- sys/dev/bnxt/bnxt_re/qplib_fp.c | 2 +- sys/dev/bnxt/bnxt_re/qplib_sp.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/dev/bnxt/bnxt_re/qplib_fp.c b/sys/dev/bnxt/bnxt_re/qplib_fp.c index 438f7ddd468e..3f1b02406f7f 100644 --- a/sys/dev/bnxt/bnxt_re/qplib_fp.c +++ b/sys/dev/bnxt/bnxt_re/qplib_fp.c @@ -660,7 +660,7 @@ int bnxt_qplib_create_srq(struct bnxt_qplib_res *res, goto exit; /* Configure the request */ req.dpi = cpu_to_le32(srq->dpi->dpi); - req.srq_handle = cpu_to_le64(srq); + req.srq_handle = cpu_to_le64((uintptr_t)srq); srq_size = min_t(u32, srq->hwq.depth, U16_MAX); req.srq_size = cpu_to_le16(srq_size); pg_sz_lvl |= (_get_base_pg_size(&srq->hwq) << diff --git a/sys/dev/bnxt/bnxt_re/qplib_sp.c b/sys/dev/bnxt/bnxt_re/qplib_sp.c index 8faa3cd9390c..c414718a816f 100644 --- a/sys/dev/bnxt/bnxt_re/qplib_sp.c +++ b/sys/dev/bnxt/bnxt_re/qplib_sp.c @@ -582,7 +582,7 @@ int bnxt_qplib_alloc_mrw(struct bnxt_qplib_res *res, struct bnxt_qplib_mrw *mrw) mrw->type == CMDQ_ALLOCATE_MRW_MRW_FLAGS_MW_TYPE2A || mrw->type == CMDQ_ALLOCATE_MRW_MRW_FLAGS_MW_TYPE2B) req.access = CMDQ_ALLOCATE_MRW_ACCESS_CONSUMER_OWNED_KEY; - req.mrw_handle = cpu_to_le64(mrw); + req.mrw_handle = cpu_to_le64((uintptr_t)mrw); bnxt_qplib_fill_cmdqmsg(&msg, &req, &resp, NULL, sizeof(req), sizeof(resp), 0); From nobody Tue May 28 13:13: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 4VpXxv4qSPz5MFyJ; Tue, 28 May 2024 13:13: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 4VpXxv3vFSz4pJH; Tue, 28 May 2024 13:13:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716901987; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jbI2ODQUCpBF6xiRTpJPZkpRfsBU91RHDBucKRp2ckE=; b=DbD8vEwTW+5LEfJ5tjbAAuUE4/WDSGJhy+3M0Lj6rRGEwGR4nrqRhd4jMpY4VpUSp8a5uy TpLFDohIrGVhnjA81WShnfPK9qsE24vnKwONtL2Ih3cDzwNU+Vyy/VD8MFq0EiefrOLTL1 jG6RT5HHalIy/qo85tacK4/jeWBeUAZiPAphvH6iUM52e8WBbCaIafx+aHOH2gBe20lzlY yUHr+YByvTVGwbtFpQ9SMVl34xKNyeIhUDcUqN7OhaWmW6azfx7E68dHsLd8ZBETBI+ahj pFjv0Jl4VmChCHlTAN6MY2RoTMW+Q6M2jcyysqwKyL4tCIgNFlDmU8BQlg8W3w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1716901987; a=rsa-sha256; cv=none; b=rB6quJpXvkqQgt5F5pX5C82h8aZyuuqZiHujXOmAE8uMaWbA+D+pU4XAfYJtCRSFWqJpuk MzsuleJ1qz7Cu25P8JgAg487SedNVLWOX8YSO4nFxd89aC4l8C9VfAslmwjCpU9f4p8iMH ULmDD4RcWItNpiEg8a7ZF40npdA/CznduWy5NGq/Ua043iLf/DPh51Qq59e+qke52Gxpg4 QtOW6TI1ZR2gM7zW0/tnk5Kf7MkmDRTETCQZa0ZCovXA0dPzCZ6/UL9z78nvqDGvJR7nL6 jU/Yn5xEwK7Dvs1hVlw79sSej842NAXGAuRFbtD+cCweinThWE2np8JU3A5l+g== 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=1716901987; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jbI2ODQUCpBF6xiRTpJPZkpRfsBU91RHDBucKRp2ckE=; b=FUjmSfMNmn5pHxTtrWlms2rUndbdnIqWOuSiBokrxjw2pJqya7RgSiYbR5VJKOkhOfOmm4 IpU9HshS7TsmFAqVGlYKKY3/84YurWsAq7UN41WFv1xwX2q5fsPFqcYG30TwXtk6LH6nId eJ6puHGWw43bwgHufBRURQLQDc+cNvUHEoqn6uE6MCZHaDS75lrK8HN/ZSIH+FLVwaa1iE MV6apL4kamJNCXstGohud/jc1YtCHJflLAryksOToEK+iU72xxKvbK0qQLxMscPlsfNlFo UIdztoawoSOS+3/+p6si8tp0/FM0ONMuD5Y4ZBFM/jzNF86xs/XkF9N1TiUQJA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VpXxv3VftzDqJ; Tue, 28 May 2024 13:13: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 44SDD7S3021882; Tue, 28 May 2024 13:13:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44SDD7VM021879; Tue, 28 May 2024 13:13:07 GMT (envelope-from git) Date: Tue, 28 May 2024 13:13:07 GMT Message-Id: <202405281313.44SDD7VM021879@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: c867ba72889d - main - bnxt: Do not compile on 32-bit platforms List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: c867ba72889de51b0bd2c6a7049f539abaafd46e Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=c867ba72889de51b0bd2c6a7049f539abaafd46e commit c867ba72889de51b0bd2c6a7049f539abaafd46e Author: Mark Johnston AuthorDate: 2024-05-28 13:05:14 +0000 Commit: Mark Johnston CommitDate: 2024-05-28 13:12:52 +0000 bnxt: Do not compile on 32-bit platforms The new bnxt_re driver doesn't compile on any of them (it uses writeq() from the LinuxKPI, which isn't implemented there), and had already been disconnected from the build on i386. Reported by: Jenkins Fixes: acd884dec99a ("RDMA/bnxt_re: Add bnxt_re RoCE driver") --- sys/modules/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/modules/Makefile b/sys/modules/Makefile index 54108097fe1d..d3ef4c63a41c 100644 --- a/sys/modules/Makefile +++ b/sys/modules/Makefile @@ -442,8 +442,8 @@ SUBDIR+= dtrace SUBDIR+= opensolaris .endif -# Requires bus_space_read_8 -.if ${MACHINE_ARCH} != "i386" +.if ${MACHINE_ARCH} != "i386" && ${MACHINE_CPUARCH} != "arm" && \ + ${MACHINE_ARCH} != "powerpc" && ${MACHINE_ARCH} != "powerpcspe" _bnxt= bnxt .endif From nobody Tue May 28 16:41: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 4VpdZY5hpdz5MgwR for ; Tue, 28 May 2024 16:41:41 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Received: from mail-wr1-f45.google.com (mail-wr1-f45.google.com [209.85.221.45]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "WR4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VpdZY43xDz4FVl for ; Tue, 28 May 2024 16:41:41 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-wr1-f45.google.com with SMTP id ffacd0b85a97d-35507fc2600so948844f8f.0 for ; Tue, 28 May 2024 09:41:41 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1716914500; x=1717519300; 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=26UxQXah7OaYtFRQewsYmuBXzgpYXaRld7Zo3IWId34=; b=UxvgxpArF2ZpKAWLkEUEDF1/0Oo5XamwNmo+Bz+IPPPO6M0tUM+Z9Fi1AR0Q9xhhi7 vZ9XHTQDR1D69RL1U7YM7gb+n6mWhPeuCUfQjAFuPOZZThhd0QC985lj1WgRklEqQGpi Qf3gyfXA0miXtMQo/mVN5hFoPwfqpSi5gl8Zi6UbUr8HJMnHAtoaEDOL+w/4Sm0WDVkB Dh5RUox/6n7uOFr5W7UE13T1LGwmIkKmonzP5wziZMTBAggxANoHKfMJp6kfcdKhWwx7 qUEub6KIHWmpmvtuIoJjHpHbj8U/8ECYr140xuAEKwrnHEf0zpDpVs6k0qCxMTqOJXjC aTPQ== X-Forwarded-Encrypted: i=1; AJvYcCWCpYB/9EfPCog7Eg+fFC5Ti/ikAYmKc96AoDtOXYu3yroF2LsmOUVHfXkxLo1ZrdE2N208ZqQkLMxG7KS1CVcGLapOV7rhUt/FqqDui4s1 X-Gm-Message-State: AOJu0YwOHscZOvBkLZIeKIe+LfyGFFPAJA4i6sxKV3+gymtNvQ2IXXTh ZtVpNH11fQ+6Ww8YqZR2oVhH4iD/OfVI8KbPoM2I3+GAbiwg45jkHMvdLMV8wTrFxUJXjw1nV5O S X-Google-Smtp-Source: AGHT+IGEXPhR2VmNjC4XYm37VyOHRYHVfpGL2zX7GjYf3g7Sf97vJNVma2n3tbTvLN782Iex6X++Sg== X-Received: by 2002:a5d:558d:0:b0:355:49f:f25d with SMTP id ffacd0b85a97d-3552fe1746bmr9170127f8f.69.1716914499726; Tue, 28 May 2024 09:41:39 -0700 (PDT) Received: from smtpclient.apple ([131.111.5.246]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3557a1c93b0sm12150211f8f.89.2024.05.28.09.41.39 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 28 May 2024 09:41:39 -0700 (PDT) Content-Type: text/plain; charset=us-ascii List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3774.500.171.1.1\)) Subject: Re: git: c867ba72889d - main - bnxt: Do not compile on 32-bit platforms From: Jessica Clarke In-Reply-To: <202405281313.44SDD7VM021879@gitrepo.freebsd.org> Date: Tue, 28 May 2024 17:41:28 +0100 Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Content-Transfer-Encoding: quoted-printable Message-Id: References: <202405281313.44SDD7VM021879@gitrepo.freebsd.org> To: Mark Johnston X-Mailer: Apple Mail (2.3774.500.171.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: 4VpdZY43xDz4FVl On 28 May 2024, at 14:13, Mark Johnston wrote: >=20 > The branch main has been updated by markj: >=20 > URL: = https://cgit.FreeBSD.org/src/commit/?id=3Dc867ba72889de51b0bd2c6a7049f539a= baafd46e >=20 > commit c867ba72889de51b0bd2c6a7049f539abaafd46e > Author: Mark Johnston > AuthorDate: 2024-05-28 13:05:14 +0000 > Commit: Mark Johnston > CommitDate: 2024-05-28 13:12:52 +0000 >=20 > bnxt: Do not compile on 32-bit platforms >=20 > The new bnxt_re driver doesn't compile on any of them (it uses = writeq() > from the LinuxKPI, which isn't implemented there), and had already = been > disconnected from the build on i386. >=20 > Reported by: Jenkins > Fixes: acd884dec99a ("RDMA/bnxt_re: Add bnxt_re RoCE driver") > --- > sys/modules/Makefile | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) >=20 > diff --git a/sys/modules/Makefile b/sys/modules/Makefile > index 54108097fe1d..d3ef4c63a41c 100644 > --- a/sys/modules/Makefile > +++ b/sys/modules/Makefile > @@ -442,8 +442,8 @@ SUBDIR+=3D dtrace > SUBDIR+=3D opensolaris > .endif >=20 > -# Requires bus_space_read_8 > -.if ${MACHINE_ARCH} !=3D "i386" > +.if ${MACHINE_ARCH} !=3D "i386" && ${MACHINE_CPUARCH} !=3D "arm" && \ > + ${MACHINE_ARCH} !=3D "powerpc" && ${MACHINE_ARCH} !=3D = "powerpcspe" Check ${MACHINE_ABI:Mlong64} or !${MACHINE_ABI:Mlong32} instead? Jess From nobody Tue May 28 17:09: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 4VpgYn62sXz5MqD5 for ; Tue, 28 May 2024 18:11:09 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-ej1-x636.google.com (mail-ej1-x636.google.com [IPv6:2a00:1450:4864:20::636]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "WR4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VpgYn410Jz4Mqx for ; Tue, 28 May 2024 18:11:09 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-ej1-x636.google.com with SMTP id a640c23a62f3a-a630ff4ac84so131987466b.1 for ; Tue, 28 May 2024 11:11:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20230601.gappssmtp.com; s=20230601; t=1716919867; x=1717524667; darn=freebsd.org; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=Rr24ohchHu3mrib6h/amzE/OBV8gvhLDhoy1ViEQ6zY=; b=A9Esvc0O/8SSco32fRW8vlI7Ux0ZPXWvFpcCPJQ86mD4LcS0BqwNU5gVAEnxYfdWnP EL06v9ZlRvhyepYM6LxODkE3HO9LImIGVQUO4me1P3oh6LYjnZj7gIV0twE06jYxNBWp QPFibicI9y0ytZl9e0DsJjuV83a0ycWLAj1ilBMxBx9Y5b6bZkXNM3tYsdLxlhZj9cXf I9kY+VTOdM2D4x/q1sDDb4/ByWUTqdsgN5ZGBRy3qZDC9wBTCmb/FJF5vkpNpgicJAuC h8ZIrsu/4GY+F1YElSTrR7atMO/c0WTxk7/wUtollDRmS0JZ5/nmHebeuIh4rmIbzMdC pLcA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1716919867; x=1717524667; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=Rr24ohchHu3mrib6h/amzE/OBV8gvhLDhoy1ViEQ6zY=; b=PiGiNGptAcQeSIR9Zqr3MNlhPjekftZINMRUrCIBlSzLWx756lsfAzFm853JeM8IQe v9ojYpyURKLomSwyZh2jqsTRlY30zJWaP9ZbuJ0ASTYzvECrdtgAfNpEjTiW3wGiEkcr +JsyUCn8LyqjbX6S/g2BNjL/FVTnPT4GYcCERpnQszbcuRfS0HlwK+ZSedi50fKk4SND 4atcVIiyCeAHqsgw2H/GiBw1IsUKE3uiv0Jfku5L7XM+w+5BGdwzckIw7sCec0xTiOXr n0QwzOJRxvXitiGZ2FJTnSxwFHVFSsvpsHSoRQG35DDMsid9iAJiArqxrYn2Krel8luH OvlQ== X-Forwarded-Encrypted: i=1; AJvYcCWPGTQFJ4PDk7Be04+jaJX9+oava75/WHtSp3LEl4PflUwmB87+jKGcffP0oxfXizPTNW3mC0D8ZvpWvSik20LuLUv8k4QFNd/JVCp2WdEA X-Gm-Message-State: AOJu0YwFckMRFj0YpasqMmXgoZC7DgjLegDQ5/v/Cq2HbD27iENpjV/J bX7+iz2WOKRxSCjzCMDhfT/pAm+o4znU/Vd7WE8ipqL7+7PBJdajB/RPku2td6jt44AP+gGgdui iQKn/aOP/haMlioXT7GOMduMyek2Ormz+V+797g== X-Google-Smtp-Source: AGHT+IHhWHBRJGXKJDmvgqN6lKDBNuK8X7qibGNvUGDGYnAk5yX2Qn1VtpXwlwPt4rLtAPbdp3gW/4aSgpG3TAMhSSc= X-Received: by 2002:a17:906:c7c7:b0:a52:3583:b9d0 with SMTP id a640c23a62f3a-a62641aa1cdmr800943266b.3.1716919867125; Tue, 28 May 2024 11:11:07 -0700 (PDT) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 References: <202405281313.44SDD7VM021879@gitrepo.freebsd.org> In-Reply-To: From: Warner Losh Date: Tue, 28 May 2024 11:09:19 -0600 Message-ID: Subject: Re: git: c867ba72889d - main - bnxt: Do not compile on 32-bit platforms To: Jessica Clarke Cc: Mark Johnston , src-committers , "" , "" Content-Type: multipart/alternative; boundary="000000000000c9d08e0619878eb9" X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:2a00:1450::/32, country:US] X-Rspamd-Queue-Id: 4VpgYn410Jz4Mqx --000000000000c9d08e0619878eb9 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Tue, May 28, 2024, 10:41=E2=80=AFAM Jessica Clarke = wrote: > On 28 May 2024, at 14:13, Mark Johnston wrote: > > > > The branch main has been updated by markj: > > > > URL: > https://cgit.FreeBSD.org/src/commit/?id=3Dc867ba72889de51b0bd2c6a7049f539= abaafd46e > > > > commit c867ba72889de51b0bd2c6a7049f539abaafd46e > > Author: Mark Johnston > > AuthorDate: 2024-05-28 13:05:14 +0000 > > Commit: Mark Johnston > > CommitDate: 2024-05-28 13:12:52 +0000 > > > > bnxt: Do not compile on 32-bit platforms > > > > The new bnxt_re driver doesn't compile on any of them (it uses > writeq() > > from the LinuxKPI, which isn't implemented there), and had already > been > > disconnected from the build on i386. > > > > Reported by: Jenkins > > Fixes: acd884dec99a ("RDMA/bnxt_re: Add bnxt_re RoCE driver") > > --- > > sys/modules/Makefile | 4 ++-- > > 1 file changed, 2 insertions(+), 2 deletions(-) > > > > diff --git a/sys/modules/Makefile b/sys/modules/Makefile > > index 54108097fe1d..d3ef4c63a41c 100644 > > --- a/sys/modules/Makefile > > +++ b/sys/modules/Makefile > > @@ -442,8 +442,8 @@ SUBDIR+=3D dtrace > > SUBDIR+=3D opensolaris > > .endif > > > > -# Requires bus_space_read_8 > > -.if ${MACHINE_ARCH} !=3D "i386" > > +.if ${MACHINE_ARCH} !=3D "i386" && ${MACHINE_CPUARCH} !=3D "arm" && \ > > + ${MACHINE_ARCH} !=3D "powerpc" && ${MACHINE_ARCH} !=3D "powerpcspe= " > > Check ${MACHINE_ABI:Mlong64} or !${MACHINE_ABI:Mlong32} instead? > Read 8 can be orthogonal to either of these... i thought we had it for armv7 at least... For this driver, though, any of the above are fine. Warner > --000000000000c9d08e0619878eb9 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable


On Tue, May 28, 2024, 10:41=E2=80=AFAM Jessica Clarke = <jrtc27@freebsd.org> wrote:=
On 28 May 2024, at 14:13, Mark Joh= nston <markj@FreeBSD.org> wrote:
>
> The branch main has been updated by markj:
>
> URL: https://cgit.FreeBSD.org/src/commit/?id=3Dc867ba72889de51b0bd2c6a7049f53= 9abaafd46e
>
> commit c867ba72889de51b0bd2c6a7049f539abaafd46e
> Author:=C2=A0 =C2=A0 =C2=A0Mark Johnston <markj@FreeBSD.org>
> AuthorDate: 2024-05-28 13:05:14 +0000
> Commit:=C2=A0 =C2=A0 =C2=A0Mark Johnston <markj@FreeBSD.org>
> CommitDate: 2024-05-28 13:12:52 +0000
>
>=C2=A0 =C2=A0 bnxt: Do not compile on 32-bit platforms
>
>=C2=A0 =C2=A0 The new bnxt_re driver doesn't compile on any of them= (it uses writeq()
>=C2=A0 =C2=A0 from the LinuxKPI, which isn't implemented there), an= d had already been
>=C2=A0 =C2=A0 disconnected from the build on i386.
>
>=C2=A0 =C2=A0 Reported by:=C2=A0 =C2=A0 Jenkins
>=C2=A0 =C2=A0 Fixes:=C2=A0 acd884dec99a ("RDMA/bnxt_re: Add bnxt_r= e RoCE driver")
> ---
> sys/modules/Makefile | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/sys/modules/Makefile b/sys/modules/Makefile
> index 54108097fe1d..d3ef4c63a41c 100644
> --- a/sys/modules/Makefile
> +++ b/sys/modules/Makefile
> @@ -442,8 +442,8 @@ SUBDIR+=3D dtrace
> SUBDIR+=3D opensolaris
> .endif
>
> -# Requires bus_space_read_8
> -.if ${MACHINE_ARCH} !=3D "i386"
> +.if ${MACHINE_ARCH} !=3D "i386" && ${MACHINE_CPUARC= H} !=3D "arm" && \
> +=C2=A0 =C2=A0 ${MACHINE_ARCH} !=3D "powerpc" && ${M= ACHINE_ARCH} !=3D "powerpcspe"

Check ${MACHINE_ABI:Mlong64} or !${MACHINE_ABI:Mlong32} instead?

Read 8 can = be orthogonal to either of these... i thought we had it for armv7 at least.= ..

For this driver, thou= gh, any of the above are fine.

Warner
--000000000000c9d08e0619878eb9-- From nobody Tue May 28 18:52: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 4VphTt6Ygcz5MtBY; Tue, 28 May 2024 18:52: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 4VphTt5z7tz4Qwr; Tue, 28 May 2024 18:52:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716922370; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=s6oQl05nGXrGtFQpI/O7dbClXaINp2ZARMx73PLyLsI=; b=e44Bi/9X0EiQM/JQITyCBse6anMAnAPoqCJp4qD81d1WaBb+/tllwFn5RctzcY3hjUoU74 awUYGzIk0ioGoPW3HPyKB08yp/uZ+O4UHbwFFvI9d3oED6wxbKkwktExQF5zJbS6RgLniv 7d1IcCFX2kXnjInEWzdK3ggLUjDwtjjvJR4Akzdrq23Yo/vOwaKCbqlTYmrzWBBJ1yk4Jl s4CqmT6HEamNPVzgoELcBGR+kx7ih607gXZlqY/7+tWsW6/jLS3utH2OsaiKZaGk69CilG nBAECwQikywb1WrpojY1PYMQuKZcCPkv4C80iwVH87miGJJyXuuYmqk91+x/RQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1716922370; a=rsa-sha256; cv=none; b=tdvVKl3GlT8md8LyyAj5LDCFOoM99ViFSCaC/6kBtwktme9FmCwRTTmK6IOn9mOvng+3/w ZcCwPzQiAvuZ7+yfnwDvEgF80+WvvPEaOICob0KiuFy+p6FjM7pyjmnxx096x7tb6rRGaE 9nyBhxr7gIAnsl/baEJ5WawGtuFg7RLDMOMWCedGU8WLh8UauQvXxggGyUsVL+xdNs5wvz 3wWNC9Tnch9lMXZ7NgAMSNFCHSfiDRbx5hEwOCkJ0hLswGxdwK/bEUphjqpF3fVV4ZTvUb 3GfEwF1mvXtb+xo7xDVAHm2LO8YvDiaj04z7QJiFQW71YWcyJ4BlGm9unt4f6Q== 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=1716922370; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=s6oQl05nGXrGtFQpI/O7dbClXaINp2ZARMx73PLyLsI=; b=hx/wZ/FSFFlaf5ccOiW5hNQMAWvjYZiVdOp9WeNsFoacmmNHxOFCFUnTSjSQe0kvPiPIRu oqY+GeGsF3vuE1bRNbib95ebhV/ycMhUVxVKLRcKSld4cJUBIuBfEY1lzkhysQBJPV7M5U SVbG/5Ruza26REw0EsHAVYwghTPktuxT16p7ZEfu1H1iBlRUDssoureiPFj477pz6DGd+o b5nl2OZSksaHKcbDXTPxQn7Dcdji7yMPVYK3gR8VNKvaqdwbbO9zwo7sbJKkyTiqTZnVQV tbgsKogi7n8At7OWX/vfG3nbIUIj2i329EbdBDxinhJuu6uh7+iZD/w4ne2/Lg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VphTt5Zc4zNt9; Tue, 28 May 2024 18:52: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 44SIqoMN094997; Tue, 28 May 2024 18:52:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44SIqo71094994; Tue, 28 May 2024 18:52:50 GMT (envelope-from git) Date: Tue, 28 May 2024 18:52:50 GMT Message-Id: <202405281852.44SIqo71094994@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Simon J. Gerraty" Subject: git: 2b7c1402f96b - main - src.sys.obj.mk: Export OBJTOP List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: sjg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2b7c1402f96be2d2986738e32706dab7b5691ef0 Auto-Submitted: auto-generated The branch main has been updated by sjg: URL: https://cgit.FreeBSD.org/src/commit/?id=2b7c1402f96be2d2986738e32706dab7b5691ef0 commit 2b7c1402f96be2d2986738e32706dab7b5691ef0 Author: Simon J. Gerraty AuthorDate: 2024-05-28 18:51:31 +0000 Commit: Simon J. Gerraty CommitDate: 2024-05-28 18:51:31 +0000 src.sys.obj.mk: Export OBJTOP If we had to set OBJTOP we want to .export it (if .MAKE.LEVEL > 0) for the benefit of things like x!= ${.MAKE} -r ... and similar. Without OBJTOP, the default MAKEOBJDIR setting will result in attempting to use an objdir like /lib or /bin etc in some cases. This patch is based on D30990 with the addition of the check for level > 0. Reviewed by: jrtc27 Differential Revision: --- share/mk/src.sys.obj.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/share/mk/src.sys.obj.mk b/share/mk/src.sys.obj.mk index 708559edcdb8..e4c31f746f3d 100644 --- a/share/mk/src.sys.obj.mk +++ b/share/mk/src.sys.obj.mk @@ -94,6 +94,9 @@ OBJTOP:= ${OBJROOT}${MACHINE}.${MACHINE_ARCH} # TARGET.TARGET_ARCH handled in OBJROOT already. OBJTOP:= ${OBJROOT:H} .endif # ${MK_UNIFIED_OBJDIR} == "yes" +.if ${.MAKE.LEVEL} > 0 +.export OBJTOP +.endif .endif # empty(OBJTOP) # Fixup OBJROOT/OBJTOP if using MAKEOBJDIRPREFIX. From nobody Tue May 28 20:13: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 4VpkGk118Nz5L3rx; Tue, 28 May 2024 20:13: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 4VpkGk0SVHz4Xys; Tue, 28 May 2024 20:13:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716927198; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qif750Lq6BD0fwCFL3nRHnn0SrL+dba7YaPjmmfUKzw=; b=MPnFBlGyerC04y+9ZG+TDS/I7MKY5+Z2JjNxwMXT49REQDNv0dLJz28NedEsdes9oeH0l+ UKwn6Fb4Gc8uGTP4+QILBPzZwveWWYi3OdLBKWEXctj17lZHsybBN7QAeJYlTY1dkZHUY6 RLpXoEgQ2alynoFHPs9X650LDNUtkkVVOVuzYQwN1PTDQBtyMQWP3EvFoPnpSeMnpnhg1p GpTVEnnh26PIO85EK41eyOBg+tmn/jlJPx15X7wHEjYZJZZ6sZMp6UMMf0KHPTw0OF/Fsr ZYH/FB386CNbYbyUs+9+5mzCPaRqIwa1jfZLFSlf6T6ozDCM0nRT5Wj38ZAJ/A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1716927198; a=rsa-sha256; cv=none; b=SxdanQ3p5kVpVaGr1Fk7ZQu9h+/7C2/O7ILEsYt7g5DCSyD/np6vwrtEhLdowsFs6E1Vm9 47LPpklrniZHmmEJFr4Asua9tgkE8QQQU9IXO3RByb6fOQLl9WgqpHOsJDvUZtwnYogL9G F07sTvAYph3HQFHMh3Cxv+bU17Mwqlni77Foy+soIfjYAjejFfkvSnK4awo7NvSo8I5zV6 AIZMSqsjj0A9LGp0ZFDY3Jxbp4PJtFwXQxgTVxIck7AAV+IXEqQWDR71FMFDGf795smW9C SwlUDFRVQvyvHVBJcWMvBQKoiwBH09RXNAzyNGP6I0aQpd98KzOln9/PXfbPUw== 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=1716927198; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qif750Lq6BD0fwCFL3nRHnn0SrL+dba7YaPjmmfUKzw=; b=fKxrILbCEAuJ+D0SCQVld7FdsAF17YP2cAXgO1NSfaFD2EoHzOjw12D+fzTIQYNg2P17le 0sqF+whbnDIPE5OVNlSoWSsQC+8Wz82DeH3pkEKJTPu13gcPObvi0U7dFkExZ2Pqn7shus TH5j4dWdvo6chbZRYL/zJbRXahvP5aL4GqwOye1PZy0+CQyyM/3XacYjMPIPV2+cEZBpGI ET0R46VDJu5/Q+so76cc8EnuB5EzZk4n8a/h/R9kxvLneSKeCAU9eFrJR4rCVpeBgBiItG Y3PN366BLLKxA65hpwpYclsyqKZt/kW4N9Zawctm3mqFuWZiPn9Usb/6sqsuTw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VpkGk03gFzRKD; Tue, 28 May 2024 20:13: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 44SKDHWE031382; Tue, 28 May 2024 20:13:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44SKDHtp031379; Tue, 28 May 2024 20:13:17 GMT (envelope-from git) Date: Tue, 28 May 2024 20:13:17 GMT Message-Id: <202405282013.44SKDHtp031379@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: 2780e5f43d5b - main - linux: allow RTM_GETADDR without full ifaddrmsg argument List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2780e5f43d5b0e8b155472300ee63816a660780e Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=2780e5f43d5b0e8b155472300ee63816a660780e commit 2780e5f43d5b0e8b155472300ee63816a660780e Author: Gleb Smirnoff AuthorDate: 2024-05-28 20:13:08 +0000 Commit: Gleb Smirnoff CommitDate: 2024-05-28 20:13:08 +0000 linux: allow RTM_GETADDR without full ifaddrmsg argument Even modern glibc uses truncated argument for RTM_GETADDR when it wants to list all addresses in a system. See sysdeps/unix/sysv/linux/ifaddrs.c:__netlink_sendreq(). It sends a one char payload. Linux kernel allows that as long as given socket is not marked as a 'strict'. We have a similar flag in the general netlink code and it is checked in sys/netlink/netlink_message_parser.h:nl_parse_header(). If the flag is not present, parser will allocate a temporary zeroed buffer to make the message correct. The checks added in b977dd1ea5fb blocked such message before the parser. My reading of glibc says that there are two types of messages that are sent with __netlink_sendreq() - RTM_GETLINK and RTM_GETADDR. The RTM_GETLINK is binary compatible between Linux and FreeBSD and thus doesn't need any ABI handler. PR: 279012 Fixes: b977dd1ea5fbc2df3f1279330be4d089322eb2cf --- sys/compat/linux/linux_netlink.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/compat/linux/linux_netlink.c b/sys/compat/linux/linux_netlink.c index 8675f830b4ef..f51838ee00d7 100644 --- a/sys/compat/linux/linux_netlink.c +++ b/sys/compat/linux/linux_netlink.c @@ -94,7 +94,8 @@ rtnl_ifaddr_from_linux(struct nlmsghdr *hdr, struct nl_pstate *npt) struct ifaddrmsg *ifam = (struct ifaddrmsg *)(hdr + 1); sa_family_t f; - if (hdr->nlmsg_len < sizeof(struct nlmsghdr) + sizeof(struct ifaddrmsg)) + if (hdr->nlmsg_len < sizeof(struct nlmsghdr) + + offsetof(struct ifaddrmsg, ifa_family) + sizeof(ifam->ifa_family)) return (EBADMSG); if ((f = linux_to_bsd_domain(ifam->ifa_family)) == AF_UNKNOWN) return (EPFNOSUPPORT); From nobody Tue May 28 20:31: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 4Vpkgd1RW0z5L6Jd; Tue, 28 May 2024 20:31: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 4Vpkgd109bz4jl8; Tue, 28 May 2024 20:31:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716928285; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CgGv8rDyCpL2vKiYXYcWDQfHxFnPVXjKSzBCKoltmLQ=; b=tKPym1nAWu0/u6Lt9Ghr5XIDlBVbCTDT1LaWuZr2B2jmlWKGHbxrwhp4UjZl3yqKqF5w9E A0fRwA1N6BYsAsacH9RczSjPPn/BhIpooZ84tldNYIdHQTfFRuIWWR06DrOka6k2xAofJP NKlDR6dGQaSbgLfoEcCsS9IRFNsh6f9RqiC5vmjfQ17M4btNssj4TZE8cWbUy3Uj3EriZZ DOaqdewMnDjb0X/def/yF5n6Ht9Mtta8UUOQiJIIRBb3WPE0UpxZRiz450gzwTzK2LKjv8 D1D/HK1DljScLW/lDUqp4GFyqbkWcULsCu0JaV1QRW6ByzzhHgk6aTW0agcwrA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1716928285; a=rsa-sha256; cv=none; b=Xfokxrh+EaQrdv89qqEFaE8Xh1uAUcA8SfwzDpTq6hY90qjNhflLRgdRiJ/Ds23jsFXr0/ yWJe75gU/SO5MA2nTV4xCYNXXfYC8E9GZeSn5qdjOXmblwAona7jpUTkpf/Mpj5r+u2Lvt bX0gSGMiy8TbPNmbT/TwBKetvEdKMMZlsMd9O/zqwNKzc+LW60YOdZmI6+oOl6YO+fNYva AGF7I1RXg9JcnXNFQdznxTMJlF2Rl39P0TZpJeTHbEXsT75csiAtNUTYtRHYFJSFLgT/m/ /rUCiQXaLWNzI8p1lYAkvFEW2zw5FSeOlhFUKoHOuyHsb5flKa3KOst5646VsA== 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=1716928285; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CgGv8rDyCpL2vKiYXYcWDQfHxFnPVXjKSzBCKoltmLQ=; b=uc2E37IGu3VJYmGdDnaMZca6qpLqdgqnHS8G06T+C/Oo1D5jtFJW8ymI9Uq8RzUgjKLMrs g7/giDiuoUCuJgu4pao63R50o3awf7bhyyOse+gCTSo96ZjGnS0L8h+kT0bfYYhSnpgGv0 XAwdYQTj6J1atG8QtCRM2DAw5uW03mDeG9UwEEUfDLT4QOIAmMIj0hSpsNPGzPW5O7y0OB 7lLOIWu4JZn0k1Roo7LukHMivLscCR36gOy+bx0TFZZ7zSzxTsXCgWT0wv2zePWWr4pZ6G Nd0zAQ7d2SkWyNgC11TxBSeBxAU1FeMsw4nyYQyHvQN2uwK06zH/crWJTqWNlg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Vpkgd0bhGzRRv; Tue, 28 May 2024 20:31: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 44SKVOff068094; Tue, 28 May 2024 20:31:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44SKVOW9068091; Tue, 28 May 2024 20:31:24 GMT (envelope-from git) Date: Tue, 28 May 2024 20:31:24 GMT Message-Id: <202405282031.44SKVOW9068091@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: cd2054d48bc6 - main - libpfctl: add pfctl_get_rule_h() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: cd2054d48bc6d16edb0fdb84a7e4006620883c1e Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=cd2054d48bc6d16edb0fdb84a7e4006620883c1e commit cd2054d48bc6d16edb0fdb84a7e4006620883c1e Author: Kristof Provost AuthorDate: 2024-05-24 11:15:12 +0000 Commit: Kristof Provost CommitDate: 2024-05-28 20:27:22 +0000 libpfctl: add pfctl_get_rule_h() Add a handle variant of pfctl_get_rule(). This converts us from using the nvlist variant to the netlink variant, and also moves us closer to a world where all libpfctl functions take the handle. While here have pfctl use the new function. Sponsored by: Rubicon Communications, LLC ("Netgate") --- lib/libpfctl/libpfctl.c | 8 ++++++++ lib/libpfctl/libpfctl.h | 3 +++ sbin/pfctl/pfctl.c | 2 +- sbin/pfctl/pfctl_optimize.c | 2 +- usr.sbin/bsnmpd/modules/snmp_pf/pf_snmp.c | 2 +- 5 files changed, 14 insertions(+), 3 deletions(-) diff --git a/lib/libpfctl/libpfctl.c b/lib/libpfctl/libpfctl.c index 479b96123012..e833a23b269a 100644 --- a/lib/libpfctl/libpfctl.c +++ b/lib/libpfctl/libpfctl.c @@ -1388,6 +1388,14 @@ pfctl_get_rules_info(int dev __unused, struct pfctl_rules_info *rules, uint32_t return (error); } +int +pfctl_get_rule_h(struct pfctl_handle *h, uint32_t nr, uint32_t ticket, const char *anchor, + uint32_t ruleset, struct pfctl_rule *rule, char *anchor_call) +{ + return (pfctl_get_clear_rule_h(h, nr, ticket, anchor, ruleset, rule, + anchor_call, false)); +} + int pfctl_get_rule(int dev, uint32_t nr, uint32_t ticket, const char *anchor, uint32_t ruleset, struct pfctl_rule *rule, char *anchor_call) diff --git a/lib/libpfctl/libpfctl.h b/lib/libpfctl/libpfctl.h index 73282eb3cc3d..391e73b61e02 100644 --- a/lib/libpfctl/libpfctl.h +++ b/lib/libpfctl/libpfctl.h @@ -420,6 +420,9 @@ int pfctl_get_rules_info(int dev, struct pfctl_rules_info *rules, int pfctl_get_rule(int dev, uint32_t nr, uint32_t ticket, const char *anchor, uint32_t ruleset, struct pfctl_rule *rule, char *anchor_call); +int pfctl_get_rule_h(struct pfctl_handle *h, uint32_t nr, uint32_t ticket, + const char *anchor, uint32_t ruleset, struct pfctl_rule *rule, + char *anchor_call); int pfctl_get_clear_rule(int dev, uint32_t nr, uint32_t ticket, const char *anchor, uint32_t ruleset, struct pfctl_rule *rule, char *anchor_call, bool clear); diff --git a/sbin/pfctl/pfctl.c b/sbin/pfctl/pfctl.c index 1843ec5713d6..c89981075ea6 100644 --- a/sbin/pfctl/pfctl.c +++ b/sbin/pfctl/pfctl.c @@ -1444,7 +1444,7 @@ pfctl_show_nat(int dev, char *path, int opts, char *anchorname, int depth) brace = 0; INDENT(depth, !(opts & PF_OPT_VERBOSE)); - if (pfctl_get_rule(dev, nr, ri.ticket, path, + if (pfctl_get_rule_h(pfh, nr, ri.ticket, path, nattype[i], &rule, anchor_call)) { warn("DIOCGETRULE"); return (-1); diff --git a/sbin/pfctl/pfctl_optimize.c b/sbin/pfctl/pfctl_optimize.c index 9b43a840c06f..7440bf8a506d 100644 --- a/sbin/pfctl/pfctl_optimize.c +++ b/sbin/pfctl/pfctl_optimize.c @@ -903,7 +903,7 @@ load_feedback_profile(struct pfctl *pf, struct superblocks *superblocks) return (1); } - if (pfctl_get_rule(pf->dev, nr, rules.ticket, "", PF_PASS, + if (pfctl_get_rule_h(pf->h, nr, rules.ticket, "", PF_PASS, &rule, anchor_call)) { warn("DIOCGETRULENV"); return (1); diff --git a/usr.sbin/bsnmpd/modules/snmp_pf/pf_snmp.c b/usr.sbin/bsnmpd/modules/snmp_pf/pf_snmp.c index 1086aa7dcf82..f02329901f69 100644 --- a/usr.sbin/bsnmpd/modules/snmp_pf/pf_snmp.c +++ b/usr.sbin/bsnmpd/modules/snmp_pf/pf_snmp.c @@ -1526,7 +1526,7 @@ pfl_scan_ruleset(const char *path) } for (nr = rules.nr, i = 0; i < nr; i++) { - if (pfctl_get_rule(pfctl_fd(pfh), i, rules.ticket, path, + if (pfctl_get_rule_h(pfh, i, rules.ticket, path, PF_PASS, &rule, anchor_call)) { syslog(LOG_ERR, "pfl_scan_ruleset: ioctl(DIOCGETRULE):" " %s", strerror(errno)); From nobody Tue May 28 20: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 4Vpkgf3bcRz5L6B1; Tue, 28 May 2024 20: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 4Vpkgf214cz4jnM; Tue, 28 May 2024 20: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=1716928286; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mTWm56XuDhbA9C4ndx5TxMIezQfGHp6AyewdbLJ2OEs=; b=HQGL0Ri5Lz2bTvbj6erqwXxEvG3z9RM0klM4bdDznS6sYgBwtz821G6DH2cufLFpU7mLIb x815v7+np3250KOBKRCwModWnkDdg4Lxi8vIbkpPmSfc8IBFtSPdWtwRUUTNuCOXKO00gy V6vDB5f2ft2S3Fyf1VuanCyZfMBdxcrey0vXouVz8COXFGm5fNLEenl2kR97db9h/LAhAO udYULXNUfoh2cTWsQoNa8FmOi5Odi4/XnYrHSsGbcskkWCNx7HpZy1GHind8+hvJTcs+ep OFgBbsKNtxgkDAsBaP4IgZJEJqhgD1MIxnAwteR5ONViJhRAtk14doCa8WfkcQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1716928286; a=rsa-sha256; cv=none; b=BRNmWD3QONh3pESwmPInVaFz4XmfNXTmyJk3I+21ZDRtpPM2Z0Dno865kICf8iSFeSF+AF mqJnPkL7SW3jQtTirS0AInw+sKOgPrnZ6Oz+9gQKdzqaQNmbM1VOf1AE95FA1qph1Xxmr2 h9YirOTKP22yiRj3yDQVHgXEIst9igwF3jN3MzFgPg2DZ4EnK3I5G3AMPmY8c0VcwsG5k3 0dPT5PykUrKY3wkn9glRkczZiBVQfjZlsUty2NxStBfjW2dgvB0V1DeU5GmR3FTRNDTvjX m4tI7FY8pvaUee3IAqNZp3V4Z0G+ZFR5MG8WEZiuKEeicuXh+xgK2VKXZnjMIA== 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=1716928286; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mTWm56XuDhbA9C4ndx5TxMIezQfGHp6AyewdbLJ2OEs=; b=f3J/2wEQQPElZWDbMpCCBVowwii7jSamxU8Ire6nJ+h+1r7Hayfp/NucR+5IloQcm5ACa9 XgczNaf37LP7uZ8q2VZsKrV3tMrzqJod/LyuSlIJ1Pj3QRmJNO9A3cFnpFIM/J4PodyYJ5 7Or1W+Qok9LSIbGuDtYGUTNxCTebDOoOfF1vUeQu6kgCcBg1VFojo3Xmrf1Pr/x3knSnOA TaPRritjew3S3RCEU8hgBYyzW7I1c8bGJv4A6GnD9lqUFaQhsSfZXeswL2hbsxGBSw7BBr Gqnd7Pv651a83UhIPWDfYMvHqMAEZ0k7+aXoTOy/7sFrCF1CWU+AXmKYQxXKQw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Vpkgf1ccCzRcd; Tue, 28 May 2024 20: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 44SKVQX6068141; Tue, 28 May 2024 20: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 44SKVQTP068138; Tue, 28 May 2024 20:31:26 GMT (envelope-from git) Date: Tue, 28 May 2024 20:31:26 GMT Message-Id: <202405282031.44SKVQTP068138@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: 6ee3e376823f - main - pf: fix incorrect anchor_call to userspace List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: 6ee3e376823fc16b04ab45663661f27246e7b004 Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=6ee3e376823fc16b04ab45663661f27246e7b004 commit 6ee3e376823fc16b04ab45663661f27246e7b004 Author: Kristof Provost AuthorDate: 2024-05-24 11:20:12 +0000 Commit: Kristof Provost CommitDate: 2024-05-28 20:27:22 +0000 pf: fix incorrect anchor_call to userspace 777a4702c changed how we copy out the anchor_call string, and incorrectly limited it to 8 (4 on 32-bit systems) bytes. Fix that so we get the full anchor path, rather than just the first few characters. PR: 279225 Sponsored by: Rubicon Communications, LLC ("Netgate") --- sys/net/pfvar.h | 2 +- sys/netpfil/pf/pf_nl.c | 2 +- sys/netpfil/pf/pf_ruleset.c | 14 +++++++------- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/sys/net/pfvar.h b/sys/net/pfvar.h index 88fb99ead84e..d1aa57a941cc 100644 --- a/sys/net/pfvar.h +++ b/sys/net/pfvar.h @@ -2474,7 +2474,7 @@ void pf_init_keth(struct pf_keth_ruleset *); int pf_kanchor_setup(struct pf_krule *, const struct pf_kruleset *, const char *); int pf_kanchor_copyout(const struct pf_kruleset *, - const struct pf_krule *, char *); + const struct pf_krule *, char *, size_t); int pf_kanchor_nvcopyout(const struct pf_kruleset *, const struct pf_krule *, nvlist_t *); void pf_kanchor_remove(struct pf_krule *); diff --git a/sys/netpfil/pf/pf_nl.c b/sys/netpfil/pf/pf_nl.c index 307e1ca1689d..8f0349d6f121 100644 --- a/sys/netpfil/pf/pf_nl.c +++ b/sys/netpfil/pf/pf_nl.c @@ -982,7 +982,7 @@ pf_handle_getrule(struct nlmsghdr *hdr, struct nl_pstate *npt) nlattr_add_u64(nw, PF_RT_STATES_TOTAL, counter_u64_fetch(rule->states_tot)); nlattr_add_u64(nw, PF_RT_SRC_NODES, counter_u64_fetch(rule->src_nodes)); - error = pf_kanchor_copyout(ruleset, rule, anchor_call); + error = pf_kanchor_copyout(ruleset, rule, anchor_call, sizeof(anchor_call)); MPASS(error == 0); nlattr_add_string(nw, PF_RT_ANCHOR_CALL, anchor_call); diff --git a/sys/netpfil/pf/pf_ruleset.c b/sys/netpfil/pf/pf_ruleset.c index 38cc1eae419f..fc0651f8a0e8 100644 --- a/sys/netpfil/pf/pf_ruleset.c +++ b/sys/netpfil/pf/pf_ruleset.c @@ -368,16 +368,16 @@ pf_kanchor_setup(struct pf_krule *r, const struct pf_kruleset *s, int pf_kanchor_copyout(const struct pf_kruleset *rs, const struct pf_krule *r, - char *anchor_call) + char *anchor_call, size_t anchor_call_len) { anchor_call[0] = 0; if (r->anchor == NULL) goto done; if (!r->anchor_relative) { - strlcpy(anchor_call, "/", sizeof(anchor_call)); + strlcpy(anchor_call, "/", anchor_call_len); strlcat(anchor_call, r->anchor->path, - sizeof(anchor_call)); + anchor_call_len); } else { char a[MAXPATHLEN]; char *p; @@ -391,7 +391,7 @@ pf_kanchor_copyout(const struct pf_kruleset *rs, const struct pf_krule *r, p = a; *p = 0; strlcat(anchor_call, "../", - sizeof(anchor_call)); + anchor_call_len); } if (strncmp(a, r->anchor->path, strlen(a))) { printf("pf_anchor_copyout: '%s' '%s'\n", a, @@ -400,12 +400,12 @@ pf_kanchor_copyout(const struct pf_kruleset *rs, const struct pf_krule *r, } if (strlen(r->anchor->path) > strlen(a)) strlcat(anchor_call, r->anchor->path + (a[0] ? - strlen(a) + 1 : 0), sizeof(anchor_call)); + strlen(a) + 1 : 0), anchor_call_len); } if (r->anchor_wildcard) strlcat(anchor_call, anchor_call[0] ? "/*" : "*", - sizeof(anchor_call)); + anchor_call_len); done: @@ -419,7 +419,7 @@ pf_kanchor_nvcopyout(const struct pf_kruleset *rs, const struct pf_krule *r, char anchor_call[MAXPATHLEN] = { 0 }; int ret; - ret = pf_kanchor_copyout(rs, r, anchor_call); + ret = pf_kanchor_copyout(rs, r, anchor_call, sizeof(anchor_call)); MPASS(ret == 0); nvlist_add_string(nvl, "anchor_call", anchor_call); From nobody Tue May 28 20:31: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 4Vpkgg6RrPz5L6B3; Tue, 28 May 2024 20:31: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 4Vpkgg31h4z4jtc; Tue, 28 May 2024 20:31:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716928287; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HL8MHkv1Kkg6JmA+XnaxJCBXd9bCpykWt3jlj16qAcU=; b=cJG/cLv8c3UwvxEsyw6biC0eTbArLqpnw5QRNw8n4YxMgFOS2RlW30vYkShQu3g2nJbW7M +H1EJ6vC/S6gTNUyfvG1xQb9j8nIoKbMIkoeKj+CK944RdVqAcwZgL1k8u9FEVdJSLGoZQ dRpNyzSszZr3Gh3/eQeWg6lU1/mJ88l/y7bYIV1B2Loibs1lXN7jmECaCi0PyDFGnKi24P aH2Pd7h0HBUBRfxysQ+aaj+Xsz1zrsFlwyCaF+CvkTJxJg8jUz9tMgjow0gmG9N3LZp37c vQBMk0BvomNGwAQoQSe8p1OK/xSwn8sMkaMXIA3TUfBsA15oPXidW+eoLDgRIA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1716928287; a=rsa-sha256; cv=none; b=owVTDwFWXmcV7GtRBBP6xISoH8QEq3XOCuzVdLjkndjCad+6NbB4hP4Wj30DHbhGttcYtC +6MtcaO1dPc9WcNuPwmEy4Hd+O5ixaOJXw1M3ZOruyJtkIK2uVS63efx/JYvi9TQLXhcDj 0mwSdrDGIWN+9gToC8x6B952is3ROmrQhCyZ4J8YE+JdzTKekbcjAkG4Ajhor9Dx/8tHRH s7pVKZmrT128iuCbRSXvvmkXguSYvqjjBs1DEkr3eikJbwq54lWBGnDiUP8mSr1mnniKBH FHxrAkd798+RsYdLIgGnHV+TcNAg3tWteR9KbA9e/GXJolRn9h1DmzMZg1zO5g== 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=1716928287; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HL8MHkv1Kkg6JmA+XnaxJCBXd9bCpykWt3jlj16qAcU=; b=g+jDyQ/qr4y89cJ2LKiifcFOhjAK07C13VqSQySgWMzOlbX2BHxrbPMGQLSd1F2LssyLfu TGXfqyPyAkc+zhiK2bkEVofIclLaehwuecW4HyeQbEhurwWhiJcOWDJ/ADoF50lVT5quOL 7+xg4Uy/6zzxE7+Gbt+3Ud/Dqq8lv0Czx8hXiEi3LZe942d5fnj6UBcQ9dzKEuUoFd91dt QOYR2DyxWCUSKNDi0b6r2A0dNRHLYjxd/RXIIycznkN4ex6VBuyzK08hwFdrTy5uQqddl3 icMB8qHZSoBthd3GtYiHN6Hw0C62vIRRnifohfTxfFG6krMnqfdgSFxvGfcn2A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Vpkgg2cxQzRRw; Tue, 28 May 2024 20:31: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 44SKVRlH068189; Tue, 28 May 2024 20:31:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44SKVR2H068186; Tue, 28 May 2024 20:31:27 GMT (envelope-from git) Date: Tue, 28 May 2024 20:31:27 GMT Message-Id: <202405282031.44SKVR2H068186@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: 8ddd0359bca5 - main - pfctl: fix recursive printing of nat anchors List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: 8ddd0359bca5c5fc38189000a80a3180854a8a2e Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=8ddd0359bca5c5fc38189000a80a3180854a8a2e commit 8ddd0359bca5c5fc38189000a80a3180854a8a2e Author: Kristof Provost AuthorDate: 2024-05-28 14:26:28 +0000 Commit: Kristof Provost CommitDate: 2024-05-28 20:29:28 +0000 pfctl: fix recursive printing of nat anchors Similar to the preceding fix for rules, ensure that we recursively list wildcard anchors for nat rules. MFC after: 3 weeks Sponsored by: Rubicon Communications, LLC ("Netgate") --- sbin/pfctl/pfctl.c | 103 +++++++++++++++++++++++++++++++++++++---------------- 1 file changed, 72 insertions(+), 31 deletions(-) diff --git a/sbin/pfctl/pfctl.c b/sbin/pfctl/pfctl.c index c89981075ea6..c43d9e88dcbe 100644 --- a/sbin/pfctl/pfctl.c +++ b/sbin/pfctl/pfctl.c @@ -98,7 +98,7 @@ void pfctl_print_eth_rule_counters(struct pfctl_eth_rule *, int); void pfctl_print_rule_counters(struct pfctl_rule *, int); int pfctl_show_eth_rules(int, char *, int, enum pfctl_show, char *, int, int); int pfctl_show_rules(int, char *, int, enum pfctl_show, char *, int, int); -int pfctl_show_nat(int, char *, int, char *, int); +int pfctl_show_nat(int, char *, int, char *, int, int); int pfctl_show_src_nodes(int, int); int pfctl_show_states(int, const char *, int); int pfctl_show_status(int, int); @@ -1417,7 +1417,8 @@ pfctl_show_rules(int dev, char *path, int opts, enum pfctl_show format, } int -pfctl_show_nat(int dev, char *path, int opts, char *anchorname, int depth) +pfctl_show_nat(int dev, char *path, int opts, char *anchorname, int depth, + int wildcard) { struct pfctl_rules_info ri; struct pfctl_rule rule; @@ -1425,14 +1426,65 @@ pfctl_show_nat(int dev, char *path, int opts, char *anchorname, int depth) u_int32_t nr; static int nattype[3] = { PF_NAT, PF_RDR, PF_BINAT }; int i, dotitle = opts & PF_OPT_SHOWALL; - int brace, ret; + int ret; int len = strlen(path); - char *p; + char *npath, *p; - if (path[0]) - snprintf(&path[len], MAXPATHLEN - len, "/%s", anchorname); - else - snprintf(&path[len], MAXPATHLEN - len, "%s", anchorname); + /* + * Truncate a trailing / and * on an anchorname before searching for + * the ruleset, this is syntactic sugar that doesn't actually make it + * to the kernel. + */ + if ((p = strrchr(anchorname, '/')) != NULL && + p[1] == '*' && p[2] == '\0') { + p[0] = '\0'; + } + + if (anchorname[0] == '/') { + if ((npath = calloc(1, MAXPATHLEN)) == NULL) + errx(1, "pfctl_rules: calloc"); + snprintf(npath, MAXPATHLEN, "%s", anchorname); + } else { + if (path[0]) + snprintf(&path[len], MAXPATHLEN - len, "/%s", anchorname); + else + snprintf(&path[len], MAXPATHLEN - len, "%s", anchorname); + npath = path; + } + + /* + * If this anchor was called with a wildcard path, go through + * the rulesets in the anchor rather than the rules. + */ + if (wildcard && (opts & PF_OPT_RECURSE)) { + struct pfioc_ruleset prs; + u_int32_t mnr, nr; + memset(&prs, 0, sizeof(prs)); + memcpy(prs.path, npath, sizeof(prs.path)); + if (ioctl(dev, DIOCGETRULESETS, &prs)) { + if (errno == EINVAL) + fprintf(stderr, "NAT anchor '%s' " + "not found.\n", anchorname); + else + err(1, "DIOCGETRULESETS"); + } + mnr = prs.nr; + + pfctl_print_rule_counters(&rule, opts); + for (nr = 0; nr < mnr; ++nr) { + prs.nr = nr; + if (ioctl(dev, DIOCGETRULESET, &prs)) + err(1, "DIOCGETRULESET"); + INDENT(depth, !(opts & PF_OPT_VERBOSE)); + printf("nat-anchor \"%s\" all {\n", prs.name); + pfctl_show_nat(dev, npath, opts, + prs.name, depth + 1, 0); + INDENT(depth, !(opts & PF_OPT_VERBOSE)); + printf("}\n"); + } + path[len] = '\0'; + return (0); + } for (i = 0; i < 3; i++) { ret = pfctl_get_rules_info_h(pfh, &ri, nattype[i], path); @@ -1441,7 +1493,6 @@ pfctl_show_nat(int dev, char *path, int opts, char *anchorname, int depth) return (-1); } for (nr = 0; nr < ri.nr; ++nr) { - brace = 0; INDENT(depth, !(opts & PF_OPT_VERBOSE)); if (pfctl_get_rule_h(pfh, nr, ri.ticket, path, @@ -1453,35 +1504,25 @@ pfctl_show_nat(int dev, char *path, int opts, char *anchorname, int depth) ri.ticket, nattype[i], path) != 0) return (-1); - if (anchor_call[0] && - ((((p = strrchr(anchor_call, '_')) != NULL) && - (p == anchor_call || - *(--p) == '/')) || (opts & PF_OPT_RECURSE))) { - brace++; - if ((p = strrchr(anchor_call, '/')) != - NULL) - p++; - else - p = &anchor_call[0]; - } else - p = &anchor_call[0]; - if (dotitle) { pfctl_print_title("TRANSLATION RULES:"); dotitle = 0; } print_rule(&rule, anchor_call, opts & PF_OPT_VERBOSE2, opts & PF_OPT_NUMERIC); - if (brace) + if (anchor_call[0] && + (((p = strrchr(anchor_call, '/')) ? + p[1] == '_' : anchor_call[0] == '_') || + opts & PF_OPT_RECURSE)) { printf(" {\n"); - else - printf("\n"); - pfctl_print_rule_counters(&rule, opts); - pfctl_clear_pool(&rule.rpool); - if (brace) { - pfctl_show_nat(dev, path, opts, p, depth + 1); + pfctl_print_rule_counters(&rule, opts); + pfctl_show_nat(dev, npath, opts, anchor_call, + depth + 1, rule.anchor_wildcard); INDENT(depth, !(opts & PF_OPT_VERBOSE)); printf("}\n"); + } else { + printf("\n"); + pfctl_print_rule_counters(&rule, opts); } } } @@ -3101,7 +3142,7 @@ main(int argc, char *argv[]) break; case 'n': pfctl_load_fingerprints(dev, opts); - pfctl_show_nat(dev, path, opts, anchorname, 0); + pfctl_show_nat(dev, path, opts, anchorname, 0, 0); break; case 'q': pfctl_show_altq(dev, ifaceopt, opts, @@ -3136,7 +3177,7 @@ main(int argc, char *argv[]) pfctl_show_eth_rules(dev, path, opts, 0, anchorname, 0, 0); - pfctl_show_nat(dev, path, opts, anchorname, 0); + pfctl_show_nat(dev, path, opts, anchorname, 0, 0); pfctl_show_rules(dev, path, opts, 0, anchorname, 0, 0); pfctl_show_altq(dev, ifaceopt, opts, 0); pfctl_show_states(dev, ifaceopt, opts); From nobody Tue May 28 20:31: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 4Vpkgh6NCqz5L6Rh; Tue, 28 May 2024 20:31: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 4Vpkgh44w8z4jtw; Tue, 28 May 2024 20:31:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716928288; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qFlmcOX70rTnMTgtoS4RLvgHDJZoTp/wJcT7royvlu8=; b=XJxe4s9IQXRrv7+GOr1BfLt3tsQzGPvGFySFIN7ad3V46dWx5iL5rQn+WJh5Ng1cM40v03 J9wbK7CJQwPFrMlgt8I5V5HtVreqDa6gbDDABmH2RZiDkQU2HtYN7CXGYl610T2eS6d/gZ oqHGbua1kLHxmBMXxH1quf9m+pgZZXXIKi0MWpNGZoX1tn9hfWUTq095Vek6xoPkm/ut7u eZMZb1ysIrZe6yeNm2t9w3Ue3oqtGRYS/jkMxUT+gufxEaKSm299WCIFNqxCnVOS1ufwcJ qP+qI41sjLb5s+bXiupuCmnhAOFMtj+7dbXag20TJh27cLKQi3D762L0PtusCw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1716928288; a=rsa-sha256; cv=none; b=FX6D+/liy24VOkGYdpM0XfloF3vHA8CDJeoIrdK7RDVCmV6DVjnxj5B2RGu82MgEuTktMW d7xan+tystYq9I8HmSabyyLewLUzjYCeGMymrAnM9p6YTL2y8iB6hHMgev5xAVpQdOlc3H mIFb+ZyNqwTJftAn40viQjQ1JXT0C5o90AqN4QdpQhZt3sqDksKNlQFbFNfnazkHIg8l5s G/oSZ6I6PbQza06RhrRanltk7mPm0SeLCsT914N0VF1GX6BAmn2s4mE003PUeVrT5XOBBH SkMVbYJwVcCpQK1bQ1vF9+agArr7xVi5Wjppb9R8f2b38CMi2YgeB3FtIHqi6g== 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=1716928288; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qFlmcOX70rTnMTgtoS4RLvgHDJZoTp/wJcT7royvlu8=; b=KeQFcO3o3erN09Y25/rcjvFLLGqzDLKMLFB0P7zC1n5zPb9+fB1BiBhYp8lUJzq7UKidfs ZwfAuR6KyaKYmVvACMq75mRiM7VCHcRs9Zkp1yu5gsHylO8AlAflM6I3X1GucLcYUaU4ES 4jH/a6csW4+9D9kudXOr4x/0pK7C4CC/rmceeyqqwACfjjOHaKl2l2AMhrmYQG8mEAKpCj GCOs6MlJUcSCgGE3B40jJ7d7fwcZWBaUzguNAo2lCxqImNx9gX/N6f1gOFqzSjP+CE1XHv 4e1M1VBvtTP2CuD1FBzUcybQOwa0WB0NVMjPzEY28YUtNvjecqNltg+EMlQ14Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Vpkgh3fNYzRRy; Tue, 28 May 2024 20:31: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 44SKVS7f068236; Tue, 28 May 2024 20:31:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44SKVSqd068233; Tue, 28 May 2024 20:31:28 GMT (envelope-from git) Date: Tue, 28 May 2024 20:31:28 GMT Message-Id: <202405282031.44SKVSqd068233@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: 8b28ec3861d5 - main - pf tests: test longer anchor names List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8b28ec3861d5b3e9fd8a60dbfda13059a5301281 Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=8b28ec3861d5b3e9fd8a60dbfda13059a5301281 commit 8b28ec3861d5b3e9fd8a60dbfda13059a5301281 Author: Kristof Provost AuthorDate: 2024-05-24 12:50:53 +0000 Commit: Kristof Provost CommitDate: 2024-05-28 20:29:38 +0000 pf tests: test longer anchor names PR: 279225 MFC after: 3 weeks Sponsored by: Rubicon Communications, LLC ("Netgate") --- tests/sys/netpfil/pf/anchor.sh | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/tests/sys/netpfil/pf/anchor.sh b/tests/sys/netpfil/pf/anchor.sh index b1faa5f6c57e..311d6485e794 100644 --- a/tests/sys/netpfil/pf/anchor.sh +++ b/tests/sys/netpfil/pf/anchor.sh @@ -58,6 +58,37 @@ pr183198_cleanup() pft_cleanup } +atf_test_case "pr279225" "cleanup" +pr279225_head() +{ + atf_set descr "Test that we can retrieve longer anchor names, PR 279225" + atf_set require.user root +} + +pr279225_body() +{ + pft_init + + vnet_mkjail alcatraz + + pft_set_rules alcatraz \ + "nat-anchor \"appjail-nat/jail/*\" all" \ + "rdr-anchor \"appjail-rdr/*\" all" \ + "anchor \"appjail/jail/*\" all" + + atf_check -s exit:0 -o match:"nat-anchor \"appjail-nat/jail/\*\" all \{" \ + jexec alcatraz pfctl -sn -a "*" + atf_check -s exit:0 -o match:"rdr-anchor \"appjail-rdr/\*\" all \{" \ + jexec alcatraz pfctl -sn -a "*" + atf_check -s exit:0 -o match:"anchor \"appjail/jail/\*\" all \{" \ + jexec alcatraz pfctl -sr -a "*" +} + +pr279225_cleanup() +{ + pft_cleanup +} + atf_test_case "nested_anchor" "cleanup" nested_anchor_head() { @@ -167,6 +198,7 @@ nested_label_cleanup() atf_init_test_cases() { atf_add_test_case "pr183198" + atf_add_test_case "pr279225" atf_add_test_case "nested_anchor" atf_add_test_case "wildcard" atf_add_test_case "nested_label" From nobody Wed May 29 05:36: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 4Vpym23kG6z5LnTW; Wed, 29 May 2024 05:36: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 4Vpym22tQ9z4Zvj; Wed, 29 May 2024 05:36:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716960962; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qFNDVZn4rkjT8QkUS5Y5bOqbXx2V9MPiVdoYbZJzJSU=; b=NzchU0fS57wuIPkFV9AJZjQS0+8ODNJZSLDVHMuXt0YhhTZcjZ25F9etnJl34bJq3mtXOg 8AWlJqsckn+TPS7NLmqyDg2E2igMTzbtbLWd3wHRV1V+8f0200o2c9FaYfqjqRDaafX+SQ cinnWurKKp7R8d8IB/F5NgGA9e79BFQa9tmmAYZ3tL7wEvrs4Y5aD/643E9wDGoJE5SMQh 394z/UcMom8FUwX+pYJ2S3QT17WyRUF0c5jNXshblXap24faZ6/zdmvZ6UTKIE+k1OhWzc qObmB8oiPcxY26c5k806hp8Qg+T2ZgVvDxgGeEYdhavMt705xo2kI/IzkOTj1w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1716960962; a=rsa-sha256; cv=none; b=LVn9b0ZAqvwdQnRl6WVOdV6+MWWuQEEIqCwwYV7gtZFuL7RWTXIgX6MrPhsbUhJ3WJk9gI wDeqcTVp1mAOirs3fHCPziUzLbfIwCpVR3y9vIy71m7oc6a+i7xqi69Y2gm5iyepeGPiJI 4h5A3hsLSMvZRvlZGLocGAhoOl6sdMq4J5xcokghKMJN+1Zp7fXMdy90qtSvkW4+0S/+rh u0Z86NRk5nP7SmdTF/ncdE+YgdQS71d8sEF8zTI8inllPpVZELEtgXISBFSUaP8euxMcNP Lx+JtK8zsbJiMgw+RYmciGIQxQB0Bwj0fqZiC0jIAzpxoMt63yEz/iOu6OpXrA== 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=1716960962; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qFNDVZn4rkjT8QkUS5Y5bOqbXx2V9MPiVdoYbZJzJSU=; b=fYj6uTh3En/wJkTFM2SVTuI4A5h6LyzVZHK4y4Kz32IEZCzHC7G8BZg8ww14VyElcgaHu4 sxQt7X5aQH5rBOa8HVajqkDlxzD+s5VJWyDPBn5yh/lXPaX68ilqv8nQbvtxWRZV/Cw+pa WqIbMhr5nvetLFrVkBmyxsCpY1sKPW6QZGbrHjtYfvt7x2N9mfnGv4mOq+yI7ml2E6/6AH fvfl28a12Fh1B/0S5JgFhyUM/GIbYOTK5XOjs8PAzI7eKIavokJRX9ooNkIDidBxP12zV6 fxcSV7VvmJ1pHb5xcEoUVNwAv0cNGYNd6qNhnVRUeACP/comOiXEiLoqrvLhHw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Vpym22LDNzjyH; Wed, 29 May 2024 05:36: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 44T5a2vF085984; Wed, 29 May 2024 05:36:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44T5a29u085981; Wed, 29 May 2024 05:36:02 GMT (envelope-from git) Date: Wed, 29 May 2024 05:36:02 GMT Message-Id: <202405290536.44T5a29u085981@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: 94d574327018 - stable/14 - mqueuefs: minor style pass List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: 94d574327018ce6abfa34ed4e96ef104821d2889 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=94d574327018ce6abfa34ed4e96ef104821d2889 commit 94d574327018ce6abfa34ed4e96ef104821d2889 Author: Konstantin Belousov AuthorDate: 2024-05-22 02:52:47 +0000 Commit: Konstantin Belousov CommitDate: 2024-05-29 05:35:38 +0000 mqueuefs: minor style pass (cherry picked from commit 63f18b37e01ef214de762a091d3c98ae5028c8f4) --- sys/kern/uipc_mqueue.c | 47 +++++++++++++++++++++++------------------------ 1 file changed, 23 insertions(+), 24 deletions(-) diff --git a/sys/kern/uipc_mqueue.c b/sys/kern/uipc_mqueue.c index f7695945fcc4..bb2e2bab0ba7 100644 --- a/sys/kern/uipc_mqueue.c +++ b/sys/kern/uipc_mqueue.c @@ -50,7 +50,6 @@ * use the IPC facility without having to mount mqueue file system. */ -#include #include "opt_capsicum.h" #include @@ -379,7 +378,7 @@ mqfs_fileno_free(struct mqfs_info *mi, struct mqfs_node *mn) static __inline struct mqfs_node * mqnode_alloc(void) { - return uma_zalloc(mqnode_zone, M_WAITOK | M_ZERO); + return (uma_zalloc(mqnode_zone, M_WAITOK | M_ZERO)); } static __inline void @@ -451,8 +450,8 @@ mqfs_create_node(const char *name, int namelen, struct ucred *cred, int mode, node->mn_type = nodetype; node->mn_refcount = 1; vfs_timestamp(&node->mn_birth); - node->mn_ctime = node->mn_atime = node->mn_mtime - = node->mn_birth; + node->mn_ctime = node->mn_atime = node->mn_mtime = + node->mn_birth; node->mn_uid = cred->cr_uid; node->mn_gid = cred->cr_gid; node->mn_mode = mode; @@ -1017,8 +1016,8 @@ mqfs_create(struct vop_create_args *ap) /* * Remove an entry */ -static -int do_unlink(struct mqfs_node *pn, struct ucred *ucred) +static int +do_unlink(struct mqfs_node *pn, struct ucred *ucred) { struct mqfs_node *parent; struct mqfs_vdata *vd; @@ -1244,15 +1243,15 @@ mqfs_setattr(struct vop_setattr_args *ap) td = curthread; vap = ap->a_vap; vp = ap->a_vp; - if ((vap->va_type != VNON) || - (vap->va_nlink != VNOVAL) || - (vap->va_fsid != VNOVAL) || - (vap->va_fileid != VNOVAL) || - (vap->va_blocksize != VNOVAL) || + if (vap->va_type != VNON || + vap->va_nlink != VNOVAL || + vap->va_fsid != VNOVAL || + vap->va_fileid != VNOVAL || + vap->va_blocksize != VNOVAL || (vap->va_flags != VNOVAL && vap->va_flags != 0) || - (vap->va_rdev != VNOVAL) || - ((int)vap->va_bytes != VNOVAL) || - (vap->va_gen != VNOVAL)) { + vap->va_rdev != VNOVAL || + (int)vap->va_bytes != VNOVAL || + vap->va_gen != VNOVAL) { return (EINVAL); } @@ -1281,7 +1280,7 @@ mqfs_setattr(struct vop_setattr_args *ap) * check in VOP_ACCESS() be enough? Also, are the group bits * below definitely right? */ - if (((ap->a_cred->cr_uid != pn->mn_uid) || uid != pn->mn_uid || + if ((ap->a_cred->cr_uid != pn->mn_uid || uid != pn->mn_uid || (gid != pn->mn_gid && !groupmember(gid, ap->a_cred))) && (error = priv_check(td, PRIV_MQ_ADMIN)) != 0) return (error); @@ -1291,7 +1290,7 @@ mqfs_setattr(struct vop_setattr_args *ap) } if (vap->va_mode != (mode_t)VNOVAL) { - if ((ap->a_cred->cr_uid != pn->mn_uid) && + if (ap->a_cred->cr_uid != pn->mn_uid && (error = priv_check(td, PRIV_MQ_ADMIN))) return (error); pn->mn_mode = vap->va_mode; @@ -1345,11 +1344,11 @@ mqfs_read(struct vop_read_args *ap) mq = VTOMQ(vp); snprintf(buf, sizeof(buf), - "QSIZE:%-10ld MAXMSG:%-10ld CURMSG:%-10ld MSGSIZE:%-10ld\n", - mq->mq_totalbytes, - mq->mq_maxmsg, - mq->mq_curmsgs, - mq->mq_msgsize); + "QSIZE:%-10ld MAXMSG:%-10ld CURMSG:%-10ld MSGSIZE:%-10ld\n", + mq->mq_totalbytes, + mq->mq_maxmsg, + mq->mq_curmsgs, + mq->mq_msgsize); buf[sizeof(buf)-1] = '\0'; len = strlen(buf); error = uiomove_frombuf(buf, len, uio); @@ -2014,7 +2013,7 @@ kern_kmq_open(struct thread *td, const char *upath, int flags, mode_t mode, AUDIT_ARG_MODE(mode); pdp = td->td_proc->p_pd; - cmode = (((mode & ~pdp->pd_cmask) & ALLPERMS) & ~S_ISTXT); + cmode = ((mode & ~pdp->pd_cmask) & ALLPERMS) & ~S_ISTXT; mq = NULL; if ((flags & O_CREAT) != 0 && attr != NULL) { if (attr->mq_maxmsg <= 0 || attr->mq_maxmsg > maxmsg) @@ -2809,7 +2808,7 @@ freebsd32_kmq_timedsend(struct thread *td, abs_timeout = NULL; waitok = !(fp->f_flag & O_NONBLOCK); error = mqueue_send(mq, uap->msg_ptr, uap->msg_len, - uap->msg_prio, waitok, abs_timeout); + uap->msg_prio, waitok, abs_timeout); out: fdrop(fp, td); return (error); @@ -2840,7 +2839,7 @@ freebsd32_kmq_timedreceive(struct thread *td, abs_timeout = NULL; waitok = !(fp->f_flag & O_NONBLOCK); error = mqueue_receive(mq, uap->msg_ptr, uap->msg_len, - uap->msg_prio, waitok, abs_timeout); + uap->msg_prio, waitok, abs_timeout); out: fdrop(fp, td); return (error); From nobody Wed May 29 05:36: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 4Vpym35NXLz5LnJq; Wed, 29 May 2024 05:36: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 4Vpym34CxKz4ZlJ; Wed, 29 May 2024 05:36:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716960963; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Sa/xScNYPqY9ghMDDVSMzRkbSMOBqywnUsduorCXZDk=; b=K3JIoRj+CWJvYj9tgJqaigojOI2jif4TdKKYaKVZ0azViL3x6fiZb963T1/l0K5nTTtYC1 +ok5jC4tS6dEJ4u/Q+GxoaJkUyaqxY5OpbndcmVtQ2DAzifqHJTXHS6dEh8GY6e7bGZ8jc NlcEYZLry49mHs244Nmt2VCHVsXrkUpEwAs8l43IxIRDor3y+Z7NP6E4w8vjRGe453tY5K PFOzoJLXGqE4/VY79qHxe6Vn0nJlLjV/WJ/YOFb6PBRYcZc/KASXRcqm/pVlIWKnDSJ7Jq FP++U0kLf80r7JiMfg8CIVWzVXNTLujM60nwwxl6BpgVuc8IUUWrYgy1wo3qQg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1716960963; a=rsa-sha256; cv=none; b=pVEdKxTROs8ZQ4aN6JFEXNsJJw0gFUOckfkz9gyFpTAGkIFN6DbzqOzx7XszmH0TfjqH8y PnZiAsCQioVQvb+seFKWz0Qa3JksRbwJ0MnVdKsYa0lthG+/eT2M7nUWBo6rP1/B0LP3z4 +0a7czghsEp1tWqgPM2MdorSC2/muwc/D2vNm3jeURM+nvmx6WYrvzzpcxWI+YBHHvGVjv eB1Mj3YI+TyU5tjqdaGWc8GyyGg/DMlxGZMFy+QUir0kh17KB8k5sGxEGm7Z9LinQHJd+3 esUy2rfBaKsXsubKUIjTS2OsjkHPulPOL4PrYpVmHwsh5JwtsqVMJu68KATpLA== 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=1716960963; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Sa/xScNYPqY9ghMDDVSMzRkbSMOBqywnUsduorCXZDk=; b=olbkh7T0RquO23k/TKOkoLl57+/jvOP+RHxB2sMvUmIoWsoupD2YPShlvpmolBpFvSbEXP 08EduduyzGEe1XUOGRG7MSW24EVFESuvZXv8WjtwDSBvqH5b7Bv09BzjiCbYibaOzXRGNl ixxvgVTcKkxvoZsLsOFq/ZV/1jvPC84skbauHStnE/bRZVs+vMNKnAgbtgePi1nkGqvNfT ayExE8bNhYb3gEIc6IgImbzvBb018akv3aiwWiA0jW+6SFMdKK/FofCf97tYvLGM+d/N3H gWK+pteFCACNmdRgXDAB+y0t5GaS68JSIII8P5NuucUgjZ1KCG87BChhK2zdJQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Vpym33RY9zkQm; Wed, 29 May 2024 05:36: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 44T5a3rn086044; Wed, 29 May 2024 05:36:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44T5a3YQ086041; Wed, 29 May 2024 05:36:03 GMT (envelope-from git) Date: Wed, 29 May 2024 05:36:03 GMT Message-Id: <202405290536.44T5a3YQ086041@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: 5b4447e20280 - stable/14 - mqueuefs: uma_zfree() can be postponed until mqfs sx mi_lock is dropped List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: 5b4447e202804edd05ddd90a17130dc22a142af0 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=5b4447e202804edd05ddd90a17130dc22a142af0 commit 5b4447e202804edd05ddd90a17130dc22a142af0 Author: Konstantin Belousov AuthorDate: 2024-05-22 01:46:28 +0000 Commit: Konstantin Belousov CommitDate: 2024-05-29 05:35:38 +0000 mqueuefs: uma_zfree() can be postponed until mqfs sx mi_lock is dropped (cherry picked from commit b6f4a3fa75d24637b4d81035655fcb3d3ea187ad) --- sys/kern/uipc_mqueue.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/kern/uipc_mqueue.c b/sys/kern/uipc_mqueue.c index bb2e2bab0ba7..dd6bf3c4a0a9 100644 --- a/sys/kern/uipc_mqueue.c +++ b/sys/kern/uipc_mqueue.c @@ -1109,9 +1109,9 @@ mqfs_reclaim(struct vop_reclaim_args *ap) sx_xlock(&mqfs->mi_lock); vp->v_data = NULL; LIST_REMOVE(vd, mv_link); - uma_zfree(mvdata_zone, vd); mqnode_release(pn); sx_xunlock(&mqfs->mi_lock); + uma_zfree(mvdata_zone, vd); return (0); } From nobody Wed May 29 05:36: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 4Vpym46m5xz5LnJr; Wed, 29 May 2024 05:36: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 4Vpym45Nb6z4Zfn; Wed, 29 May 2024 05:36:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716960964; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+usgUr7kI0sbqgfKpTpVb1/jHRq7w/leyCM1mb0pbwg=; b=b2Qfw4GdvXSooYEn0vpBLF0EBdCdFKeu1a5LWWiSTmYzWIVC5ggr4nMjrsP35J6dBmIAGt GJaAXb8ERcXUlTodeqyslmKfAv7bBp4M69aTKd9jTradyfnVR0Kq0QoihjAvmYGpaZtvgC 90vP19CUqz9OC1ijVvJ7CiwuYJ83kJ6SW8rxZGJlEqCxjyMw3cFYRV2FEoQ/mAa9YkpOUw 7xHfVCWadbrUH0AOlOB3KPTjx4QJ77m0U4CqwH841DRVLuObTU45/uQRMZREGM0Gh1Jj7u 93rixKJX2o1CLYRjlpxvSUOZ4e0+Ta9Ho+Yo1co6fEg84Azcml61Yk4oWpNZpA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1716960964; a=rsa-sha256; cv=none; b=IsMhuaramYfFU/sxXyub2DCsOzusMlmql+LKXe63x6Oa0ycy+KffD/a8Z74cnhWJsjS8qQ sLcZFSqd+u5t+rDiza6p1RFcz7VORePSuouqjL5HZSEP5KYO9rtoax4cyR3kn6krLbujSL BGWbknFkbp/8CIXAgAUrHaJEKT8+lzAA9+YcgUKwwy4JrXMoX+2ncCRtNdUrHGQz5eTQ5y zev2jJnHFh+QqU0eIhKmCLpHGo2OfvqUmkL9LjjQ8SjK1Av9SxF/gXMM/zKJvp6uH2aFxB 9V1bN3u28V/Nm2q5RdyLyUbVPde5tSuxyDcHlcq2UHwn4T6cLKf/2t7dhsSZ2g== 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=1716960964; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+usgUr7kI0sbqgfKpTpVb1/jHRq7w/leyCM1mb0pbwg=; b=TTmU6Ed8YJAafKKQolMhT6iadi9C4XjMZyPZoLc8cNtb6yKDqbdXsuh2JVCYR8x4NWi9Xj zVk7hO0ATkZaRkGs1gTTLTRtx27RQmQw0DX61P2QI2sW+Ad7mjEIxmkVCzCcD8X5d5CBDk 0sjhLKzpu5pv20feOYYYYW5slXMSpu2QlXIt0f/bvasJI569BCFOVPSKkhqLi8hyLTCIEi +KD6fBCeKLuViWdqH++f9gDkajbJycXE2YbQrkVmGbi+2FBtORy1jMvzxs35wEv5LKlMs1 aRCu1j63/jT1SKx0gMND1/bYevyYCdtTRN/BmkwVAijCQrKZ6tr2cA/zf2t8Wg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Vpym44l4JzkLC; Wed, 29 May 2024 05:36: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 44T5a4GP086101; Wed, 29 May 2024 05:36:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44T5a4iI086099; Wed, 29 May 2024 05:36:04 GMT (envelope-from git) Date: Wed, 29 May 2024 05:36:04 GMT Message-Id: <202405290536.44T5a4iI086099@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: 5e77282d3a35 - stable/14 - mqueuefs: mark newly allocated vnode as constructed, under the lock List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: 5e77282d3a35f4bff0f15678b27a71aaac041762 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=5e77282d3a35f4bff0f15678b27a71aaac041762 commit 5e77282d3a35f4bff0f15678b27a71aaac041762 Author: Konstantin Belousov AuthorDate: 2024-05-22 02:39:59 +0000 Commit: Konstantin Belousov CommitDate: 2024-05-29 05:35:38 +0000 mqueuefs: mark newly allocated vnode as constructed, under the lock (cherry picked from commit f0a4dd6d46e99d47fde12aabdaa52e75b59e95f4) --- sys/kern/uipc_mqueue.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/kern/uipc_mqueue.c b/sys/kern/uipc_mqueue.c index dd6bf3c4a0a9..5fcabbac7923 100644 --- a/sys/kern/uipc_mqueue.c +++ b/sys/kern/uipc_mqueue.c @@ -811,6 +811,7 @@ found: panic("%s has unexpected type: %d", pn->mn_name, pn->mn_type); } sx_xunlock(&mqfs->mi_lock); + vn_set_state(*vpp, VSTATE_CONSTRUCTED); return (0); } From nobody Wed May 29 05:36: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 4VpymW5CMWz5LnRX; Wed, 29 May 2024 05:36: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 4VpymW2n2Hz4bK5; Wed, 29 May 2024 05:36:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716960987; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XObJ5DbzVa3tFi1YX0CgYPLUAdTrri0F2Jh+QF+jRNk=; b=bgoFjyy+XvfnfnqE2W2Ap86xOIbUgNqjefb9ZDwgLRAYpKbcmyDZ/qSSHBDQTI5HnuwpNC AAsC7iOYfwRfTxr/0nKFG5DvJPx31rArcJjphlDJbdeV/S8eLG/6X4ZtQaya+aXSfqPjhS eI6RnqRbMjdECTnU1cuTbRgKSQ39fzvvn3mDig5MbGsHbH1adGnANJTdy0LI5+Zn4XCQ3S U6QLNMplogP/9MN4Zfdz8JLKxx4PNwJn3p9q0TzDov8uZXglfThxXPuQhqaFYz1c8Wgkuz zXJ1uWf4iJBT6sgrvjmLHRkzTYCsv0Vgyn4Bf2/dePCAEAkpp4GAwXMrJ5aYRQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1716960987; a=rsa-sha256; cv=none; b=wMqbzxzwX0ePqSiKWZuq06DZ/PCZzn515EvaoW2ZzO+uWCZzuCd74pWDSyEnmAC/H892o/ pmmNHdN+mggBI13md1dANWaMlMr/YeakpNdQDm0cR3XTJtC9iFRBjfz9LhRecE1WKZcyb1 XXadMtgJW6suyTbGKrn443Hs2R1WUkueufcku4iSZk2sjyszlWd0PkbONc75T68iS750K5 mTshlMs9hndW5No5xAfgKMhKxOkq/rn8u8D2+56Y9oGCg6aboxsz7TMBLGZjVceyTix6aC p4NbmBmUjCtRyWmntavV+o2uLhN/RY/hhd+HLfb9ygxK4Ura3DdpNd31fLYcMg== 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=1716960987; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XObJ5DbzVa3tFi1YX0CgYPLUAdTrri0F2Jh+QF+jRNk=; b=yLSLWRfcnhlSGC7NMfJM872uhLRKKfqnil4qukGUcJiWaV9vPYE5yf9QT6c9jcWygrE/PL KoGRAml3bdDtTw/efCnVB5IcAGGq0EigaCTYdH6TUipMNNqOXQkY6PwMHd3UK7ZCm3jTZ5 vMS/iTlHUZaVaOG8KGL4bmvSfjHb/gtDyo6lIcfkjl6XceUWMjf09Wdz6PQ5GOTK3oR2fP 5rPFioz2LBFnTDvAV1KEPSU/1CQrTqKkr9eUE5K1lvwtJjB7BnXvBDMCeJni5SJsA8om3E TBO9W5LGOQJSA2DUjnh32l3kezXKIrHbNmw8ULuvnx86mZr7eY4GAzELn8d0vQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VpymW1vmfzkft; Wed, 29 May 2024 05:36: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 44T5aRfB086355; Wed, 29 May 2024 05:36:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44T5aRZ0086352; Wed, 29 May 2024 05:36:27 GMT (envelope-from git) Date: Wed, 29 May 2024 05:36:27 GMT Message-Id: <202405290536.44T5aRZ0086352@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: 6446348a4f37 - stable/13 - mqueuefs: uma_zfree() can be postponed until mqfs sx mi_lock is dropped List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: 6446348a4f37d49fe4c674ffe2d81a93b0dca0b5 Auto-Submitted: auto-generated The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=6446348a4f37d49fe4c674ffe2d81a93b0dca0b5 commit 6446348a4f37d49fe4c674ffe2d81a93b0dca0b5 Author: Konstantin Belousov AuthorDate: 2024-05-22 01:46:28 +0000 Commit: Konstantin Belousov CommitDate: 2024-05-29 05:36:13 +0000 mqueuefs: uma_zfree() can be postponed until mqfs sx mi_lock is dropped (cherry picked from commit b6f4a3fa75d24637b4d81035655fcb3d3ea187ad) --- sys/kern/uipc_mqueue.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/kern/uipc_mqueue.c b/sys/kern/uipc_mqueue.c index 5256a00cd831..be3e3fefa749 100644 --- a/sys/kern/uipc_mqueue.c +++ b/sys/kern/uipc_mqueue.c @@ -1112,9 +1112,9 @@ mqfs_reclaim(struct vop_reclaim_args *ap) sx_xlock(&mqfs->mi_lock); vp->v_data = NULL; LIST_REMOVE(vd, mv_link); - uma_zfree(mvdata_zone, vd); mqnode_release(pn); sx_xunlock(&mqfs->mi_lock); + uma_zfree(mvdata_zone, vd); return (0); } From nobody Wed May 29 07:57: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 4Vq1vP45yhz5M2BJ; Wed, 29 May 2024 07:57: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 4Vq1vP2SRKz4nBV; Wed, 29 May 2024 07:57:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716969457; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HNiHqohXBjAgpS5/BjV45FPF6avWVfsWBkK/u9VEuPM=; b=en62ikyfidpW4C4/LIZH4Kadv+E5GGP4p/9lXPOROQzEnvW+ycwgB/TfTgHYHY4iE6daJa VZo5wO0xAvnqyzUEAk6bZV0OqJ5qNF/eKqrEOEpLsd1CM9ygWSMtGwdqtN6qLqER3njcIU zXjoh/7L5FFPqBr8STDycVXDiz4noOdE7ivKAt9AyUfNTDyMkJeYkld+zd6vJ36fY4OF5I NAGx+7vJO0LHwLtv0AVzTQJKe1MUaVuWx1ReEWCBFs5Uup/RIBXIVaErG9DqOrlv5qjy+u 810DeEK7DpiRFNt3/eCvT8gwo03Cu2/QkgpdtQP2DKpfq4EoBL6cX2Cz5EYRPw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1716969457; a=rsa-sha256; cv=none; b=wyzed4SumlLKwb2DqvVXNOhS3cS2ECD+NUIB3V7w1SIiqwvYSLDD+ao74ezq95OZ0z7oHp oeG40ut0Wps9HU0LMT8XgQjMo+sOVgeHUg3yz8+jQzCVDjpHCxI0p9Si+t37j8sMbQwZ2W copqo7xsgnp5M9YGWaRsK3etBYxlzFt0iYFlXckVfY4LB7jI8CK0NsaOt5+2pNhmNhPBl5 SVOoTWXolQbV8QQG45L/6SBVErdH/KlhePvCa8/gloC3OmtMW5W9lpj/gO1ZV3GWI/HadQ K/05Uay0Dd/XCDuC9yf1ap1d3AEJ//AcYxQqFRHQZX/v87qH3wtK/HeR2zQ9SA== 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=1716969457; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HNiHqohXBjAgpS5/BjV45FPF6avWVfsWBkK/u9VEuPM=; b=le6QEBxkkEYrXgstNNnBQuuJe0HuYJX/nPa7O5iF3tDI9IPIitYvKdzNG7W5An/QHJBCiM JTqOXtFbn4NyvGCzUb5w6q25lPcmLcJc6mya+cQV285IsbwhOOy4aPhi7R9lYzGIXTKSZE sJr7SmLaWanTN2oX8W10S9N283KJOOAkhQiBj5sYG8EQ3/ljDSXC0x1c1zt9h6adk7fkyP 0fojcBPH/3N+GFk3BKEr13eqpTZd+qGNvkRuuWjhf8v0cjNHOK9AO5lMCdNPvcJ/y4zTXI VJXwtl5BB4wayuziorWxu9czYK9slKFIO5VMQFCnaS/5I9LOU+WvUhZJ2Rw5UQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Vq1vP244Zzp2S; Wed, 29 May 2024 07:57: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 44T7vbLQ021398; Wed, 29 May 2024 07:57:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44T7vbf4021395; Wed, 29 May 2024 07:57:37 GMT (envelope-from git) Date: Wed, 29 May 2024 07:57:37 GMT Message-Id: <202405290757.44T7vbf4021395@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: dcb65c5a94d4 - main - csh: Remove hardlink /.cshrc List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: dcb65c5a94d4c622b1d486847dc20488f59974e7 Auto-Submitted: auto-generated The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=dcb65c5a94d4c622b1d486847dc20488f59974e7 commit dcb65c5a94d4c622b1d486847dc20488f59974e7 Author: Emmanuel Vadot AuthorDate: 2024-05-27 13:12:18 +0000 Commit: Emmanuel Vadot CommitDate: 2024-05-29 07:56:58 +0000 csh: Remove hardlink /.cshrc Remove this historical artifact. csh will try to use /.csrch if the user has no home directory defined which is rather unlikely (To be exact if the concatenation of $HOME and "/.cshrc" fail which is the same thing). Also, with this change pkg will happily handle 3way merge for /root/.cshrc Differential Revision: https://reviews.freebsd.org/D45382 Reviewed by: emaste, imp Sponsored by: Beckhoff Automation GmbH & Co. KG --- ObsoleteFiles.inc | 3 +++ bin/csh/Makefile | 9 --------- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index 70e6dcec50b1..bacd17a57b30 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -51,6 +51,9 @@ # xargs -n1 | sort | uniq -d; # done +# 20240527: csh: Remove hardlink /.cshrc +OLD_FILES+=.cshrc + # 20240511: move file system driver manuals to section four OLD_FILES+=usr/share/man/man5/autofs.5.gz OLD_FILES+=usr/share/man/man5/cd9660.5.gz diff --git a/bin/csh/Makefile b/bin/csh/Makefile index d9f40f180343..6b05c01e0a61 100644 --- a/bin/csh/Makefile +++ b/bin/csh/Makefile @@ -159,13 +159,4 @@ tc.const.h: tc.const.c sh.char.h config.h config_f.h sh.types.h sh.err.h ${BUILD sort >> ${.TARGET} @echo '#endif /* _h_tc_const */' >> ${.TARGET} -beforeinstallconfig: - rm -f ${DESTDIR}/.cshrc - -afterinstallconfig: - # XXX Set link mode explicitly via -m. We cannot use LINKMODE for this - # link, as it would also apply to the tcsh link above. - ${INSTALL_LINK} ${TAG_ARGS} -m ${CONFMODE} ${DESTDIR}/root/.cshrc \ - ${DESTDIR}/.cshrc - .include From nobody Wed May 29 09:37:41 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Vq47C0Xkrz5MBX9; Wed, 29 May 2024 09:37:59 +0000 (UTC) (envelope-from manu@bidouilliste.com) Received: from mx.blih.net (mx.blih.net [212.83.155.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4Vq47B04krz3xfR; Wed, 29 May 2024 09:37:57 +0000 (UTC) (envelope-from manu@bidouilliste.com) Authentication-Results: mx1.freebsd.org; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bidouilliste.com; s=mx; t=1716975470; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=F5NnaHUd533LC56MWQqROyk1yNfvok/xhnLH1rMrWoE=; b=E/h7ZyYqK/Fem72ToHrNl/1jx7rJ5vJ7Hh+xcUYzTWzJqSQ1eb+eux/pbd/WQVLH9xMyTC Cz9RAs4xeePNZIsjpdxvFyb6H0CYZFjquFuhacabF+Sr1eeDwmFfL7CjCCzNd1BdK0mqHc AxV2B4jsHALsqPsJK1KxvcbsX4def08= Received: from skull.home.blih.net (lfbn-lyo-1-2174-135.w90-66.abo.wanadoo.fr [90.66.97.135]) by mx.blih.net (OpenSMTPD) with ESMTPSA id a72a05ab (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Wed, 29 May 2024 09:37:50 +0000 (UTC) Date: Wed, 29 May 2024 11:37:41 +0200 From: Emmanuel Vadot To: Sumit Saxena Cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: 35b53f8c989f - main - bnxt_en: Add PFC, ETS & App TLVs protocols support Message-Id: <20240529113741.34de72f3550774057c523f10@bidouilliste.com> In-Reply-To: <202405281017.44SAHjum010620@gitrepo.freebsd.org> References: <202405281017.44SAHjum010620@gitrepo.freebsd.org> X-Mailer: Sylpheed 3.7.0 (GTK+ 2.24.33; amd64-portbld-freebsd15.0) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit 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:12876, ipnet:212.83.128.0/19, country:FR] X-Rspamd-Queue-Id: 4Vq47B04krz3xfR On Tue, 28 May 2024 10:17:45 GMT Sumit Saxena wrote: > The branch main has been updated by ssaxena: > > URL: https://cgit.FreeBSD.org/src/commit/?id=35b53f8c989f62286aad075ef2e97bba358144f8 > > commit 35b53f8c989f62286aad075ef2e97bba358144f8 > Author: Chandrakanth patil > AuthorDate: 2024-04-28 09:24:30 +0000 > Commit: Sumit Saxena > CommitDate: 2024-05-28 10:15:29 +0000 > > bnxt_en: Add PFC, ETS & App TLVs protocols support > > Created new directory "bnxt_en" in /dev/bnxt and /modules/bnxt > and moved source files and Makefile into respective directory. > > ETS support: > > - Added new files bnxt_dcb.c & bnxt_dcb.h > - Added sysctl node 'dcb' and created handlers 'ets' and > 'dcbx_cap' > - Add logic to validate user input and configure ETS in > the firmware > - Updated makefile to include bnxt_dcb.c & bnxt_dcb.h > > PFC support: > > - Created sysctl handlers 'pfc' under node 'dcb' > - Added logic to validate user input and configure PFC in > the firmware. > > App TLV support: > > - Created 3 new sysctl handlers under node 'dcb' > - set_apptlv (write only): Sets a specified TLV > - del_apptlv (write only): Deletes a specified TLV > - list_apptlv (read only): Lists all APP TLVs configured > - Added logic to validate user input and configure APP TLVs > in the firmware. > > Added Below DCB ops for management interface: > > - Set PFC, Get PFC, Set ETS, Get ETS, Add App_TLV, Del App_TLV > Lst App_TLV > > Reviewed by: imp > Approved by: imp > Differential revision: https://reviews.freebsd.org/D45005 Don't know if this is this commit or one of the later but all LINT kernel seems to be broken on bnxt. -- Emmanuel Vadot From nobody Wed May 29 12:35: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 4Vq83W5C9lz5MRns; Wed, 29 May 2024 12:35: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 4Vq83W4ZMGz4D60; Wed, 29 May 2024 12:35:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716986103; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GlKi+u9b1BKqsRMWoqhHDKrRVrmH/475hnDN1Mcoowc=; b=OpnkRPjur1Fd50zfWhkctHspgw27Fx618xztAl9unbxBsFlaXPxBIIfIGw4O/HZhPq+hhe IgNvT5bEHHKjg/VwcOIazskwsLz54qY315u9oPLNguw51XoRK1rLLmLDHyatrJacxo+lN/ dKLyFZuHuGanZ116ax6GLWy4HCyCzksZSaYaAU3cbxQiXPwKwx2JJyKxLCTQ2dWFCsO6k7 0fR7pKKqpX6sErNvkBbmNez9EcLpncbN4h1SmuAADQgmCqS6x9BmED9tm1dxXzU2dpDkye UVafmHjK0OHgN5I5iBl6gkyE1B/qHXIr9v8KwIRC+kK04EeGYOdCHVQSfUtZvg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1716986103; a=rsa-sha256; cv=none; b=WHodN8l2CINXupBnexBOOgZiQJtufTywibZ5w0zsS+PySmYdt6Y5x/1yjxfOzABKRz4W8x GELCOWBcQ4iuKI59LYGqA79Q78XJioK2UA03jXdsZK9y6RgwJPR5TI5ut1QpTvJrCfqqGp GapN9M9GR8566MgymTAvDQqKjBsYVGCB9e3+nukeQoo6VnHJJRLTx41zvaXrLqeam7BoLd cqK6RGRxwzqQo+Kg8HSjmUGvCdgdQKeii2cesZUJxVkoJUjml0K9DPUhAgTY8oRPp1l7Mi TbAEK5xsYNa2VTQoXa5/ozXqT2RuHqYDOgngkPwFYMMjocqt4PSzhWcDN/c0lQ== 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=1716986103; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GlKi+u9b1BKqsRMWoqhHDKrRVrmH/475hnDN1Mcoowc=; b=fiRuWOzaxo2V8U/VMNYlkbUTfUy6ab0vgf/CxQjOsSHzFt+JWHE8v3vfSVnL4RfuPknAx3 27LuMnmGB9dNOcItdCj2HFlXFTIh3CB8tQQd3AEbZoP26AIRoR5/Y/KOFh8ih+V6EYF8QK oK4IpwvLEOTeNhwlwjEHaPf6qxQoINjhJ4aKwlGE8Nra9KQQruKgr9feYFPOYA5hKzyNF0 N906Y8GcZofWZtHblsxy+yLVUOk5lV6Q0DDfeTcMB1xEQZ7cHigBTYa66X3/s8c5cxbB7t LB03u3XgHGLjWj3sLvromFQhXre6dvbAM7acXyf6/X/EyuUAQEubgeaylqkDlA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Vq83W49Vbzw3g; Wed, 29 May 2024 12:35: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 44TCZ3ri093722; Wed, 29 May 2024 12:35:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44TCZ3WW093719; Wed, 29 May 2024 12:35:03 GMT (envelope-from git) Date: Wed, 29 May 2024 12:35:03 GMT Message-Id: <202405291235.44TCZ3WW093719@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mariusz Zaborski Subject: git: bb421be6c117 - main - libutil: move ftime to libutil List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: oshogbo X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bb421be6c1174fad837973acc5e4a7bade4489db Auto-Submitted: auto-generated The branch main has been updated by oshogbo: URL: https://cgit.FreeBSD.org/src/commit/?id=bb421be6c1174fad837973acc5e4a7bade4489db commit bb421be6c1174fad837973acc5e4a7bade4489db Author: Mariusz Zaborski AuthorDate: 2024-05-29 12:32:16 +0000 Commit: Mariusz Zaborski CommitDate: 2024-05-29 12:36:09 +0000 libutil: move ftime to libutil It seems that there are still some applications that use ftime(3) (for example, science/siconos and sysutils/lcdproc). The issue is that we don't build libcompat as a shared library anymore. The easiest solution is to move it to libutil, until we deprecate it for good. This solution was proposed by kib@ in https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=257789. PR: 257789 MFC after: 1 month Reviewed by: kib (ages ago) Differential Revision: https://reviews.freebsd.org/D39994 --- lib/libcompat/Makefile | 7 +------ lib/libutil/Makefile | 6 +++--- lib/{libcompat/4.1 => libutil}/ftime.3 | 4 ++-- lib/{libcompat/4.1 => libutil}/ftime.c | 2 ++ sys/sys/timeb.h | 2 +- 5 files changed, 9 insertions(+), 12 deletions(-) diff --git a/lib/libcompat/Makefile b/lib/libcompat/Makefile index c1be9243e27c..884941b3a139 100644 --- a/lib/libcompat/Makefile +++ b/lib/libcompat/Makefile @@ -6,12 +6,7 @@ NO_PIC= WARNS?= 0 -.PATH: ${.CURDIR}/4.1 ${.CURDIR}/4.3 ${.CURDIR}/4.4 - -# compat 4.1 sources -SRCS+= ftime.c - -MAN+= 4.1/ftime.3 +.PATH: ${.CURDIR}/4.3 ${.CURDIR}/4.4 # compat 4.3 sources SRCS+= re_comp.c rexec.c diff --git a/lib/libutil/Makefile b/lib/libutil/Makefile index a0a2bef8e2ce..eb5907ac183a 100644 --- a/lib/libutil/Makefile +++ b/lib/libutil/Makefile @@ -11,7 +11,7 @@ LIB= util SHLIB_MAJOR= 9 SRCS= _secure_path.c auth.c cpuset.c expand_number.c flopen.c fparseln.c \ - getlocalbase.c gr_util.c \ + ftime.c getlocalbase.c gr_util.c \ hexdump.c humanize_number.c kinfo_getfile.c \ kinfo_getallproc.c kinfo_getproc.c kinfo_getvmmap.c \ kinfo_getvmobject.c kld.c \ @@ -29,8 +29,8 @@ CFLAGS+= -DINET6 CFLAGS+= -I${.CURDIR} -I${SRCTOP}/lib/libc/gen/ -MAN+= cpuset.3 expand_number.3 flopen.3 fparseln.3 getlocalbase.3 hexdump.3 \ - humanize_number.3 kinfo_getallproc.3 kinfo_getfile.3 \ +MAN+= cpuset.3 expand_number.3 flopen.3 fparseln.3 ftime.3 getlocalbase.3 \ + hexdump.3 humanize_number.3 kinfo_getallproc.3 kinfo_getfile.3 \ kinfo_getproc.3 kinfo_getvmmap.3 kinfo_getvmobject.3 kld.3 \ login_auth.3 login_cap.3 \ login_class.3 login_ok.3 login_times.3 login_tty.3 pidfile.3 \ diff --git a/lib/libcompat/4.1/ftime.3 b/lib/libutil/ftime.3 similarity index 98% rename from lib/libcompat/4.1/ftime.3 rename to lib/libutil/ftime.3 index d0e3712701ff..043bbe2ed2c3 100644 --- a/lib/libcompat/4.1/ftime.3 +++ b/lib/libutil/ftime.3 @@ -25,14 +25,14 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd August 4, 2018 +.Dd May 28, 2024 .Dt FTIME 3 .Os .Sh NAME .Nm ftime .Nd get date and time .Sh LIBRARY -.Lb libcompat +.Lb libuitl .Sh SYNOPSIS .In sys/types.h .In sys/timeb.h diff --git a/lib/libcompat/4.1/ftime.c b/lib/libutil/ftime.c similarity index 98% rename from lib/libcompat/4.1/ftime.c rename to lib/libutil/ftime.c index cb832e6c2526..2e72b5ef30f3 100644 --- a/lib/libcompat/4.1/ftime.c +++ b/lib/libutil/ftime.c @@ -32,6 +32,8 @@ #include #include + +#define _IN_LIBUITL #include int diff --git a/sys/sys/timeb.h b/sys/sys/timeb.h index 09fe3a2584a5..d8aeeab83426 100644 --- a/sys/sys/timeb.h +++ b/sys/sys/timeb.h @@ -37,7 +37,7 @@ #ifndef _SYS_TIMEB_H_ #define _SYS_TIMEB_H_ -#ifdef __GNUC__ +#if defined(__GNUC__) && !defined(_IN_LIBUITL) #warning "this file includes which is deprecated" #endif From nobody Wed May 29 13:58: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 4Vq9vV2HzXz5MYwD; Wed, 29 May 2024 13:58: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 4Vq9vV1cbkz4NDm; Wed, 29 May 2024 13:58:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716991094; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zeaK9PsclLgMMGiyellYX4Nz7FpY9e3axED2Nf6LEi8=; b=u5GCryA3205U7G7u6DEQaFm22wqqqwMLZEChBxYmqbRcN5Vn4KzFacN4fxSGMdGtQQbrVt 5s7S2OrxJ26Mz+fYPpgNOdbwy9TAYJjj8O3Cn554Lngn8puMZWjeuipwES1ze3Ok1ND8YZ I+F40jhf1tPKUIJiKTs0QiPG6Pwtor5sRwHkSUaJXudcndh8FmtPMtKy1TVeKc+s+vXbD+ qPofJrl6aLdwwKrL3QMxz64bd7Hp5GwF+N67lNgEJx/V84sn1Fw821ULF3A5ugmX5TaZhD r+5jS9FHgQY452Mt3rX/CFrKUsqjB3z3wvgREjp9oDLb6UltiZg8x44sWgMwRQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1716991094; a=rsa-sha256; cv=none; b=emWGYMKQLuWmEjPXJ6bsZhLdUkVTJwiNeCuhODtpq/YlFGSwD+/uLKjJgl9QB6kmqvFYyh 60set0c4HxSAWMPi8NumXJabQOWM/LgLujTmnYkxA2XOaJ+B1pbwIk1eoKhMJvcHJzd9KW /nNsuPrvysjGO9JJg+HRbA7xbotrnor/Mwd/2vwdHud1i/TSX/+hlUvpSZ9zRBuJ1/3Nd5 VBs9sIpDeHVjvctiVlPOHnEnyLuu6A49Lg7ubyJtSFXEXsEFVfdlR9C/msEF5SClfGdRn7 QTWsxyBcBIbrKLvS3ymjGLS/aSyDMnAs1hnZGuUl0Ui5hLUCgagl0oEJbtJ7LQ== 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=1716991094; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zeaK9PsclLgMMGiyellYX4Nz7FpY9e3axED2Nf6LEi8=; b=N01KQrk2caMKU9Tgx7Y0QDKGTB44lMiLzAF0Ev6WAv24f75CdlYEcFQtgSc0lg7RnOFya2 HO5nUW1Ojt8COYsZBcGCnrnAshCqQ2HRe+R6st3mUtKqVMB1gcSoM0/T7lkOC3lL43kLRw t17v76YrHD+2ighZbru9Ij5eHCVHQqWF0r9dmAVro/zwYJPoTh/XoG+I3oZfXIUbJNLa4m u8P+RRq/BpNIjpwURq5BElAQw+P4BS+oKSeZ7/XGnOPQeHEuZ82WKwoOWKLpq2bskVpwdq Yk/gY82hpz6Ia9O7H1xxLExfOIw967AyR35pCgqEvgkDUvPzn4esC6bWwkWMFQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Vq9vV1F0Dzyf4; Wed, 29 May 2024 13:58: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 44TDwEvf029732; Wed, 29 May 2024 13:58:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44TDwEWY029729; Wed, 29 May 2024 13:58:14 GMT (envelope-from git) Date: Wed, 29 May 2024 13:58:14 GMT Message-Id: <202405291358.44TDwEWY029729@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: 6d849754b996 - main - linux: implement PR_CHILD_SET_SUBREAPER List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: 6d849754b996703093ca474604c4d8b596c22bf3 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=6d849754b996703093ca474604c4d8b596c22bf3 commit 6d849754b996703093ca474604c4d8b596c22bf3 Author: Son Phan Trung AuthorDate: 2024-05-28 09:51:16 +0000 Commit: Warner Losh CommitDate: 2024-05-29 13:56:23 +0000 linux: implement PR_CHILD_SET_SUBREAPER Reviewed by: imp, dchagin Pull Request: https://github.com/freebsd/freebsd-src/pull/1260 --- sys/compat/linux/linux_misc.c | 8 ++++++++ sys/compat/linux/linux_misc.h | 1 + 2 files changed, 9 insertions(+) diff --git a/sys/compat/linux/linux_misc.c b/sys/compat/linux/linux_misc.c index aa6c3923067f..73a4c49a1a6f 100644 --- a/sys/compat/linux/linux_misc.c +++ b/sys/compat/linux/linux_misc.c @@ -1819,6 +1819,14 @@ linux_prctl(struct thread *td, struct linux_prctl_args *args) #endif error = EINVAL; break; + case LINUX_PR_SET_CHILD_SUBREAPER: + if (args->arg2 == 0){ + return (kern_procctl(td, P_PID, 0, PROC_REAP_RELEASE, + NULL)); + } + + return (kern_procctl(td, P_PID, 0, PROC_REAP_ACQUIRE, + NULL)); case LINUX_PR_SET_NO_NEW_PRIVS: arg = args->arg2 == 1 ? PROC_NO_NEW_PRIVS_ENABLE : PROC_NO_NEW_PRIVS_DISABLE; diff --git a/sys/compat/linux/linux_misc.h b/sys/compat/linux/linux_misc.h index cc025f89d5ff..445110c598cc 100644 --- a/sys/compat/linux/linux_misc.h +++ b/sys/compat/linux/linux_misc.h @@ -57,6 +57,7 @@ #define LINUX_PR_GET_SECCOMP 21 #define LINUX_PR_SET_SECCOMP 22 #define LINUX_PR_CAPBSET_READ 23 +#define LINUX_PR_SET_CHILD_SUBREAPER 36 #define LINUX_PR_SET_NO_NEW_PRIVS 38 #define LINUX_PR_SET_PTRACER 1499557217 From nobody Wed May 29 14:29:50 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VqBbz1t8nz5McZN; Wed, 29 May 2024 14:29: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 4VqBbz0hW3z4RGr; Wed, 29 May 2024 14:29:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716992991; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Brh/24tM/SS8t4+qxNVsU97Hj9I1npfTiPU17JvRd0Y=; b=XA67MhWUleEOYRhJsiYF1yeN2oFaV6pYw3pxFIYU3fmfMUn6iUfZR/d9HlH6Wj7tVLuRKz LvfX5+S9TkQUF+yz5i/gzRlMPU44+e09/NjZPAu5nRjnWofsBrHPjt4dIlZz4TI/nbfzVD lQtmKqX2HvZH5s7QUg0cB4Bgt++vEWlTKL640gU8ePXf5ZSAmC0Ssg2gGJpC6Ma+0USoWX AOcobU18UQCgapHTi3sUCoVEg2Xoa+PVT8iq66CyYs1UnU+NWVwiHr9WwmHEimjjrTyiN+ sDLPtpNponPNZ6wYgQ4Csn4r30u1ZZzKH0Ju+2zgMB7mEUReXBitmdHd2mvJIQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1716992991; a=rsa-sha256; cv=none; b=TG3X0tDr65zJpRISkhT+xjK4yUwHXMDOyY+J5lcNYlB+t0MZKkeHKFCZC+3TxUOzcNGmig 3h0pAUnw+8MM0JVISKYZfXikIXoc1O6F6xfFCXD404TIgdsUfKdcvv7/E5vxmxRTzAp39I vGzZeRJfXwjATrZXofupXXxuKcbxoCwwezSdSPeIICSuambO96daydNVCGsjy53rb/P4H8 nJU4FZLC1uLAf8fDksl5T3w5ruQveYi/HMvOz+Q46T4/mkdSITNAZrA23uodBV2iQuQeEF 5dw8SdnVanqAHZsrRIKlJ4gqAIB8+eMpP28wBTsBbk5fzNqErlOnspyUuNgVHw== 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=1716992991; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Brh/24tM/SS8t4+qxNVsU97Hj9I1npfTiPU17JvRd0Y=; b=NMhxoVRdAweTlyUzU5/LctdxDgvE8Zzj5WrHgjbwFKA8NedK+qlJvIHpKKbfj2EAbVRnfW QIjGE55HBcZtK0d6vQxUsBrGTXk677oz5AmUWBvJgGM6+RQ+3z6tEVO5hTxWLL8xiTO1+l K+paHkBNyOTxz+hQlp2JieW4Bh0oYRdt4qDFcf+JfcMH+CNsCe2SzhiDaJuLqo+ufgtPKc m5ZkWFdwJsvAJ35oFo0NhkaGoLiYdtmCGxO9WKeyvL7LaB+/iZTEXfLe2f922x74ALoBiV k2hxX6s326Iu7rNDKUF6zxKuLMrJQocryw6XRN4Yey1D9HqkNlj/Ir4CB8VI5w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VqBbz0J6Cz10Hx; Wed, 29 May 2024 14:29: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 44TEToXx081011; Wed, 29 May 2024 14:29:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44TETowC081008; Wed, 29 May 2024 14:29:50 GMT (envelope-from git) Date: Wed, 29 May 2024 14:29:50 GMT Message-Id: <202405291429.44TETowC081008@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: dcc7b3698d03 - main - loader: Allow overriding NEWVERSWHAT List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: dcc7b3698d03b2aedc68e88b4e05a0b32b435429 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=dcc7b3698d03b2aedc68e88b4e05a0b32b435429 commit dcc7b3698d03b2aedc68e88b4e05a0b32b435429 Author: Ahmad Khalifa AuthorDate: 2024-05-29 14:28:13 +0000 Commit: Warner Losh CommitDate: 2024-05-29 14:29:30 +0000 loader: Allow overriding NEWVERSWHAT This can be useful when making alternate versions of the loader. Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/1098 --- stand/efi/loader/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stand/efi/loader/Makefile b/stand/efi/loader/Makefile index b3395bdfdf53..946ea0937de0 100644 --- a/stand/efi/loader/Makefile +++ b/stand/efi/loader/Makefile @@ -81,7 +81,7 @@ CFLAGS+= -DEFI_STAGING_SIZE=${EFI_STAGING_SIZE} CFLAGS+= -DEFI_SECUREBOOT .endif -NEWVERSWHAT= "EFI loader" ${MACHINE} +NEWVERSWHAT?= "EFI loader" ${MACHINE} VERSION_FILE= ${.CURDIR}/../loader/version HELP_FILENAME= loader.help.efi From nobody Wed May 29 14:39:11 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VqBpl5yylz5MdBL; Wed, 29 May 2024 14:39:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VqBpl50DQz4SGt; Wed, 29 May 2024 14:39:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716993551; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=l6z3VjUkNFz8QguAWSoz7omXZT/Je12/bZmymcs+pAw=; b=OUNbBZwP+0g29iCtPJPudTfkFrc6vFWIWx0rKlny5+BAOHYYesRliQgtW0BPQNUEePnYVv kbXGLP+iQX91JCTyyq9+ViI62OLJUBkwEBJojXZHzHgNKpvVk9vqWUzdGopRi5FkYdi+pZ J+wOEQBu8ZjaiKovva2G1ffHRDtZsHe+JRIXfZ++4edkQhGUch00UJjlZNOU79aPWt3Kmt JOYDLBN4S8iS1njnUBWA6RBruUd2XKfEo+7fibT9TAePh758RuVHJPqvRFge7SImm2yNrn wJQgFvs/Mm8Fi8ZayPOagkgDwMJAdv9WcCMXIa/l8ZFLkTee6sQyH7Dh05C34w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1716993551; a=rsa-sha256; cv=none; b=ULmvZtIikG+NmmWcQQ2KjXKItAp6Q4MGTfxQfb4jF/2sf9DlBs1Ue9PZpqcln/ZaZR3Zd0 e8bu2Iy+w4z57kQylGGnjBDoHoIkD4oTZWJHWq3W8P9ls9rNMNEcWvvEHnMbZQO+kWksVk KwgJBJCeNQCduHMW0dy4YQsLxUqWBlTzrCkEcY1qEWlIHzuUgrJkty3r+FaHhjZ0Z+1XCo x0HkMuqmegX8ShDTrxKh48CUlIJYkGdZGQq4lr8sSTPN7IfEqxusKyMU/fEoa2xyMycg9r HOM93nSfJdokG5WJeQurEcVdnodyETCY8eTSamtIk4urK/c36tf4q/sUgnMq1w== 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=1716993551; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=l6z3VjUkNFz8QguAWSoz7omXZT/Je12/bZmymcs+pAw=; b=MEuDX7D3HSOvkt46ZZsnNGuUUXf631p867FA5zLTb1ATD13fJ7YjsK1yecL3Rxti/IG5tT oZlZq9Kb/mKyc7OrS8cJAablR1LMT/JcxcEL9OM8szxFYWdx5Q3eQVsoXIGA295hMPtDps AvpYVj05iDjqrAlZSQZncicwyW9CUokzYKnpaR1EjqCLT7Fo3swCCiLDVGxyLAb8lvRoax 62jobteFX/0MpAM7Fz6jL9JwSiKVkJtYRXpUX7lP44kjJg5iauLJ64pOKFO3JKnzm92XGW GNtLy4KNniopeqOZPLBZK9NM/uCalXQtyB8TWIaqTUAcmavHZDjOOoMDBwk79Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VqBpl4bH5z113P; Wed, 29 May 2024 14:39: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 44TEdBXU097829; Wed, 29 May 2024 14:39:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44TEdBI9097826; Wed, 29 May 2024 14:39:11 GMT (envelope-from git) Date: Wed, 29 May 2024 14:39:11 GMT Message-Id: <202405291439.44TEdBI9097826@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: 5360d017be83 - main - loader: Fix G overflowing for G(4) on 32-bit builds List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: 5360d017be83d2502ba262f391ef45b07e0de680 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=5360d017be83d2502ba262f391ef45b07e0de680 commit 5360d017be83d2502ba262f391ef45b07e0de680 Author: Ahmad Khalifa AuthorDate: 2024-05-29 14:30:59 +0000 Commit: Warner Losh CommitDate: 2024-05-29 14:37:17 +0000 loader: Fix G overflowing for G(4) on 32-bit builds Prevent G(4) and over from overflowing for 32-bit builds. Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/1098 --- stand/efi/loader/copy.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stand/efi/loader/copy.c b/stand/efi/loader/copy.c index 3f2d1c6c20b0..a0aea9823632 100644 --- a/stand/efi/loader/copy.c +++ b/stand/efi/loader/copy.c @@ -36,7 +36,7 @@ #include "loader_efi.h" #define M(x) ((x) * 1024 * 1024) -#define G(x) (1UL * (x) * 1024 * 1024 * 1024) +#define G(x) (1ULL * (x) * 1024 * 1024 * 1024) #if defined(__amd64__) #include From nobody Wed May 29 15:40: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 4VqDB14n8Jz5MkQQ; Wed, 29 May 2024 15:40: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 4VqDB105Rfz4bBc; Wed, 29 May 2024 15:40:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716997257; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=l4lnXLTJQl9BPzzvW56Kc1+9Mz0brGqbuMetXnO64mY=; b=obkY8IqjtNBlbL6hByFKHFUWElFS1dGGSGF2ACDM3uJRq21PeegM2m+AvD20BxshKUQ6AV Wy6St4xp6bQM4GTgBZX7NncBVz8qzXkITYLna/RLv8Q/UZm9Pwpkv7/Ba+cq9w4AaPMMEL lR6vNMUlwrnjSMQtQlgwhunNmL/oLVvKPV/v6jbpwc19wo/cBJ122Rlyu2ESbZoh1Gmajc KvN21KRe4SW95K60mGVC69vXV4zhPBucikImqonXNfXwxHAem5NgAe7++PLwE8v8jBJBzc EucZYmIvQK1hxMqaNVfxHb3UWJ7W74VsBG97KPX4z7xic9MBruh8ufYwgPtbKg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1716997257; a=rsa-sha256; cv=none; b=m/b8bdEzaX2Lq7T/pVbUVuYbu/Ls398F3dVeU85IpHI4RUqE6/6Aa84l4G4XC6dbFr1oms 8D/QlxgV9I8PoaOt+TAUHazISlzb8dm9FdqF4zEvy0I4vak9m1VHByVyUNpRs5PdyUPWRF fVLAYmBQeRqeEGCvQn/OLenkPHJY8gwsaOYCbEo7MK+r3h+K2/1yuYF9s/XudCTLP0Gquv mwpYimmX4huxNrx9WYJushp1mLUyGdkKCoclELItRBiq2f4zMqVOLLW3wPM2lfTyld4d/T lf4ccgxAKbJFE9lBZfSYT8IfOK4K5LS5z3BOl4rSk0F6Y3DvxPz25c6jha6Kmg== 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=1716997257; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=l4lnXLTJQl9BPzzvW56Kc1+9Mz0brGqbuMetXnO64mY=; b=eigZdMAqJ4wee+gbu3hUDiyjsBLhTdtLwoLewFIw9EkuVrLCPfQe53+QQYaHyqeWKVTjUf 5lPZNmjYFAwtnIvuEEMbP8ZAgGbdCoqQw6c73eZ4CsHAxF1FBpieu52Z1MjySr0xxwEXfg 368CFKoc+eFNLsj4XxBV+ywEEejmmUydmUIQzCiMOD2VCYq7EgWizNclSFZvLsFKDO8T6P j7BI58INNq/1BoEqdRvX0lWM3NKL+kSzscOOFe9LRVCZuteT/wlQMm0IN1InBo2fLKQfS1 j1eViL06DXYC5m4eez66SeLutQ0/dDDc+lzj55ioBwz0fSnDJnDnqufL/rzGDA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VqDB06m3nz12CT; Wed, 29 May 2024 15:40: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 44TFeufK008293; Wed, 29 May 2024 15:40:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44TFeu0I008290; Wed, 29 May 2024 15:40:56 GMT (envelope-from git) Date: Wed, 29 May 2024 15:40:56 GMT Message-Id: <202405291540.44TFeu0I008290@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: 1e3dfe0c343c - stable/14 - libc: move NIS xdr_* symbols from rpc's to yp's Symbol.map List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: 1e3dfe0c343c74d4c7162e25378b221e5a797917 Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=1e3dfe0c343c74d4c7162e25378b221e5a797917 commit 1e3dfe0c343c74d4c7162e25378b221e5a797917 Author: Ed Maste AuthorDate: 2024-05-24 17:27:29 +0000 Commit: Ed Maste CommitDate: 2024-05-29 15:40:18 +0000 libc: move NIS xdr_* symbols from rpc's to yp's Symbol.map To fix WITHOUT_NIS build. Building yp_xdr.c is gated by MK_NIS. PR: 279270 Reported by: peterj Reported by: matteo Reported by: Michael Dexter's Build Option Survey run Reviewed by: brooks Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D45347 (cherry picked from commit 61639bb3fc5abe0bb7b096e643b51c30703ac432) --- lib/libc/rpc/Symbol.map | 31 ------------------------------- lib/libc/yp/Symbol.map | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 32 insertions(+), 31 deletions(-) diff --git a/lib/libc/rpc/Symbol.map b/lib/libc/rpc/Symbol.map index 5bf364f28d81..e4fecb83ec66 100644 --- a/lib/libc/rpc/Symbol.map +++ b/lib/libc/rpc/Symbol.map @@ -8,37 +8,6 @@ FBSD_1.0 { xdr_desargs; xdr_desresp; - /* From yp_xdr.c (generated by rpcgen - include/rpcsvc/yp.x) */ - xdr_domainname; - xdr_keydat; - xdr_mapname; - xdr_peername; - xdr_valdat; - xdr_ypbind_binding; - xdr_ypbind_resp; - xdr_ypbind_resptype; - xdr_ypbind_setdom; - xdr_ypmap_parms; - xdr_ypmaplist; - xdr_yppush_status; - xdr_yppushresp_xfr; - xdr_ypreq_key; - xdr_ypreq_nokey; - xdr_ypreq_xfr; - xdr_ypreqtype; - xdr_yprequest; - xdr_ypresp_all; - xdr_ypresp_key_val; - xdr_ypresp_maplist; - xdr_ypresp_master; - xdr_ypresp_order; - xdr_ypresp_val; - xdr_ypresp_xfr; - xdr_ypresponse; - xdr_ypresptype; - xdr_ypstat; - xdr_ypxfrstat; - authdes_seccreate; authdes_pk_seccreate; authnone_create; diff --git a/lib/libc/yp/Symbol.map b/lib/libc/yp/Symbol.map index fff2b2e60e39..f50beed7be31 100644 --- a/lib/libc/yp/Symbol.map +++ b/lib/libc/yp/Symbol.map @@ -18,4 +18,36 @@ FBSD_1.0 { yperr_string; ypprot_err; _yp_check; + + /* From yp_xdr.c (generated by rpcgen - include/rpcsvc/yp.x) */ + xdr_domainname; + xdr_keydat; + xdr_mapname; + xdr_peername; + xdr_valdat; + xdr_ypbind_binding; + xdr_ypbind_resp; + xdr_ypbind_resptype; + xdr_ypbind_setdom; + xdr_ypmap_parms; + xdr_ypmaplist; + xdr_yppush_status; + xdr_yppushresp_xfr; + xdr_ypreq_key; + xdr_ypreq_nokey; + xdr_ypreq_xfr; + xdr_ypreqtype; + xdr_yprequest; + xdr_ypresp_all; + xdr_ypresp_key_val; + xdr_ypresp_maplist; + xdr_ypresp_master; + xdr_ypresp_order; + xdr_ypresp_val; + xdr_ypresp_xfr; + xdr_ypresponse; + xdr_ypresptype; + xdr_ypstat; + xdr_ypxfrstat; + }; From nobody Wed May 29 15:50: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 4VqDP40jfVz5Ml0Y; Wed, 29 May 2024 15:50: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 4VqDP40CKmz4byq; Wed, 29 May 2024 15:50:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716997832; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eM/dvJK7E2Ir2ZQvdu4RMYh84Ps5ZHudtcPz6ayk+e8=; b=SFAZVa7KthFAcQs+N87KZMuHU6nt9S7Mz0GRCbUsrOqVWxaO8GN/M7OQZWe7d0TBiEeOG/ f9NCRkzLtg8K9BZ0vkuy5ezqiYNX+MBnKrM+6a8qPmflwYnnuS6nMeGeXgzUQYmPYx5VX/ fayJ3vRVN6u3qRHG+/uudnxO4i71Ngx2xESOmFQL58yczJLMq30CIHWCx/kAawfw9de1fJ tSnuiN2tnawLA13efYo0lWI4fr9Qntiiv5h0qqNpbTtcWsL8UGwuAkFpCZok844fmDhFkL Aeo4/Fatmk+j6XXgrsY3/01oDv6PCjbFPfDuzVUCduFZ0pB5X45TCXXfh1vUwQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1716997832; a=rsa-sha256; cv=none; b=ns2gObo8IH7kJtdhd7f12hbe3iDYpIPVHEJhviyL7nQmalyA5wA/ogEN7N3yfEBluDpjrY EHxUJVUtIgfdHH22TsQKF9NU51rTlcuONU/PgYZynYZZbWR/ezWfH0tZlg9QiD9PM5W1Li T7D5rnGM+Tly/anHjcyL5C3a7p8dltQ/oqk+yAwhM0G32cArz33C1vSS0xVtAmaDLFQif7 1KosD/uq0Gz4rkk9OFhcDG5L9eImGliwJvrR8z2V82ql21gs/3bCAsO1Sk6Z1c/UxGJzYx DuClxve22Hhyz6y3fCONeaAMUspLXT+oN0rhKPRagANmgV+fUtox7+nutUWcnA== 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=1716997832; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eM/dvJK7E2Ir2ZQvdu4RMYh84Ps5ZHudtcPz6ayk+e8=; b=qHdnaUb0acWyBWzW4DOwV5+kW4L0nNcUd3AavlUWyvxsUUzUeyvqDsb3MkIs1Kb1qOwSGl wuTaqBKn63L2xGsyjN/f4mXcsgd2YKCjJnQW4rT6DpYLI6lic7FxRTsUQaZmJrme2C0Y4+ xeLY1yygCw42csAcKSv52etNYCH8urZy7R1uKexKvM5qjc9T8OlMHeEOj6xuLDreDT1XYA HeVYS1Lt5ZfidzgH2fKnWU1syhclnuZ31YWWqMIFWjkPcok5wBtbBLtaGRnAhqLYyFqeA4 ALCzGYR0IR+BSY7fed+ha/9ZRuK9/kvAGRdjvrOViRsLKZ6tsxx2UDNJb/zfYQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VqDP36wf7z12S0; Wed, 29 May 2024 15:50: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 44TFoV08024937; Wed, 29 May 2024 15:50:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44TFoVkO024934; Wed, 29 May 2024 15:50:31 GMT (envelope-from git) Date: Wed, 29 May 2024 15:50:31 GMT Message-Id: <202405291550.44TFoVkO024934@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: 175b2c00a6bc - main - Fix bnxt build in LINT List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: 175b2c00a6bcb0c8c1f6b76b6da9bf4879a5848e Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=175b2c00a6bcb0c8c1f6b76b6da9bf4879a5848e commit 175b2c00a6bcb0c8c1f6b76b6da9bf4879a5848e Author: Warner Losh AuthorDate: 2024-05-29 15:45:47 +0000 Commit: Warner Losh CommitDate: 2024-05-29 15:49:53 +0000 Fix bnxt build in LINT LINT includes bnxt_re driver. Adjust the path in files, add missing files and add a new BNXT_C to build (which thinly wraps OFED version with bnxt specicif stuff). Sponsored by: Netflix Fixes: acd884dec99a ("RDMA/bnxt_re: Add bnxt_re RoCE driver") --- sys/conf/files | 13 ++++++++----- sys/conf/kern.pre.mk | 4 ++++ sys/modules/bnxt/bnxt_re/Makefile | 2 +- 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/sys/conf/files b/sys/conf/files index 56c92f51947f..fec92518c498 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -1327,11 +1327,14 @@ dev/bhnd/siba/siba_bhndb.c optional siba bhnd bhndb dev/bhnd/siba/siba_erom.c optional siba bhnd dev/bhnd/siba/siba_subr.c optional siba bhnd # -dev/bnxt/bnxt_hwrm.c optional bnxt iflib pci -dev/bnxt/bnxt_mgmt.c optional bnxt iflib pci -dev/bnxt/bnxt_sysctl.c optional bnxt iflib pci -dev/bnxt/bnxt_txrx.c optional bnxt iflib pci -dev/bnxt/if_bnxt.c optional bnxt iflib pci +dev/bnxt/bnxt_en/bnxt_auxbus_compat.c optional bnxt iflib pci compile-with "${BNXT_C}" +dev/bnxt/bnxt_en/bnxt_dcb.c optional bnxt iflib pci compile-with "${BNXT_C}" +dev/bnxt/bnxt_en/bnxt_hwrm.c optional bnxt iflib pci compile-with "${BNXT_C}" +dev/bnxt/bnxt_en/bnxt_mgmt.c optional bnxt iflib pci compile-with "${BNXT_C}" +dev/bnxt/bnxt_en/bnxt_sysctl.c optional bnxt iflib pci compile-with "${BNXT_C}" +dev/bnxt/bnxt_en/bnxt_txrx.c optional bnxt iflib pci compile-with "${BNXT_C}" +dev/bnxt/bnxt_en/bnxt_ulp.c optional bnxt iflib pci compile-with "${BNXT_C}" +dev/bnxt/bnxt_en/if_bnxt.c optional bnxt iflib pci compile-with "${BNXT_C}" dev/bwi/bwimac.c optional bwi dev/bwi/bwiphy.c optional bwi dev/bwi/bwirf.c optional bwi diff --git a/sys/conf/kern.pre.mk b/sys/conf/kern.pre.mk index 567c68e5887e..53b9862f2145 100644 --- a/sys/conf/kern.pre.mk +++ b/sys/conf/kern.pre.mk @@ -335,6 +335,10 @@ MLXFW_C= ${OFED_C_NOIMP} \ -I${SRCTOP}/sys/contrib/xz-embedded/freebsd \ -I${SRCTOP}/sys/contrib/xz-embedded/linux/lib/xz \ ${.IMPSRC} +# BNXT Driver +BNXT_CFLAGS= -I$S/dev/bnxt/bnxt_en ${OFEDCFLAGS} +BNXT_C_NOIMP= ${CC} -c -o ${.TARGET} ${BNXT_CFLAGS} ${WERROR} +BNXT_C= ${BNXT_C_NOIMP} ${.IMPSRC} GEN_CFILES= $S/$M/$M/genassym.c ${MFILES:T:S/.m$/.c/} SYSTEM_CFILES= config.c env.c hints.c vnode_if.c diff --git a/sys/modules/bnxt/bnxt_re/Makefile b/sys/modules/bnxt/bnxt_re/Makefile index 2e1dbc048dfb..d6aa701dbae6 100644 --- a/sys/modules/bnxt/bnxt_re/Makefile +++ b/sys/modules/bnxt/bnxt_re/Makefile @@ -8,7 +8,7 @@ SRCS += qplib_res.c qplib_res.h SRCS += qplib_rcfw.c qplib_rcfw.h SRCS += stats.c stats.h SRCS += main.c bnxt_re.h -SRCS += opt_inet.h opt_inet6.h +SRCS += opt_inet.h opt_inet6.h opt_ratelimit.h SRCS += ${LINUXKPI_GENSRCS} CFLAGS+= -I${SRCTOP}/sys/dev/bnxt/bnxt_en From nobody Wed May 29 15:54: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 4VqDTk2hZtz5Ml5W; Wed, 29 May 2024 15:54: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 4VqDTk0vWWz4cWv; Wed, 29 May 2024 15:54:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716998074; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EaVBbyCxlRv21kg/3PTkjuVsWNRMjISNNOzf9YihpQo=; b=H3/Rc7QLmR03EoqW1ZGGFJJcAVFMme7wGPq4FLgXv/aM4VTG9iiIwlygtRS1E+4RbX34Sl bZoF/Njq7JhXZqKrEpL0qCDW9IpOPxNB5HhDCFWJsdjuaDHhfiXAig/nO+tqkFABuT63rO /iZqqTvRqFu2RQjqnC8lxuY1664I58y6HRiuQiBlbzvVr35lU0BVJIE1EoduisFo69sGjn dnRS7HGCneh/D7hweAVNwUWJfrC2ty5FbnxcYDwlOvO54cGTiI34zhfMG0p9sxCq2Ta3Gs /Eg8C9XGsIspjOmZzvZFaSurUbrOaqP8yOzXNvHqJwCQ+y7S6SHGqE1sYGnQFw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1716998074; a=rsa-sha256; cv=none; b=krQmYQNWvm94VOgjpcFyI9lnXtpshXGIITmF0tEyDgrbKNUUXNfnCSxwtM59sY6IzmStE0 6ItVsfsRycS9ohpxwMvSoIQSTrO7yVU0Basm7lgxFDM14dasimpvH/6Zr5jzzIIE/Hy2St sUrHP7x+A+7T8mV7mnmB0g0Jfu3y7mE+LwEWvf/L7XSJKmhVHssndONcFlPWT9qbqnErnT Gd7a4/QLdLqsbnpPGvt6ztTl4wQpT0rwc4FxIOSKXPKof6nM2IYZvA3NpQYiiRUW802BTk Mg5PEYVYMKs5+fuJhqXI8naRql4VxaQGg9MCBXctn379VKpDlgoqdkQz33tb/g== 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=1716998074; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EaVBbyCxlRv21kg/3PTkjuVsWNRMjISNNOzf9YihpQo=; b=JjL2z+5LNUtskZJH4Q8LBWhkRZ2a3BnZJq1oHOesXDAG31enB5dwLVZM0XVDgdjEdQAMUA TUokRFTAadi9zaS9OVfVshWl3GPgj3QOI5cutew3EqRqQ8amWbsvghfeXJsGYwI9ljVCOn EsTfasaWwS3JELHjaonAL+g+2IMtuP/i+apIMikQ5Tr8+BV9Ibo9yNC163YpatfsRmm+c2 XuN1leLLhGApED2r/oPhj6cBzUMhr8x1wwNMAgh2BG51kKV7EJdeIkcQmQGv+vK9oeRmDo YrC3w6e+NrxRaOCSZqkwp/JfVFNummeaATIftBx0Jd0RDGEQkVTyiXMofEZNlQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VqDTk0W0Jz12DP; Wed, 29 May 2024 15:54: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 44TFsXoh032047; Wed, 29 May 2024 15:54:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44TFsX5Y032044; Wed, 29 May 2024 15:54:33 GMT (envelope-from git) Date: Wed, 29 May 2024 15:54:33 GMT Message-Id: <202405291554.44TFsX5Y032044@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: c48820a4487e - main - minor style tweak. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: c48820a4487e6cff34a77e4b0408a4ada55d7a34 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=c48820a4487e6cff34a77e4b0408a4ada55d7a34 commit c48820a4487e6cff34a77e4b0408a4ada55d7a34 Author: Warner Losh AuthorDate: 2024-05-29 15:53:20 +0000 Commit: Warner Losh CommitDate: 2024-05-29 15:53:20 +0000 minor style tweak. checkstyle9 doesn't check for this construct... Fixes: 6d849754b996 --- sys/compat/linux/linux_misc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/compat/linux/linux_misc.c b/sys/compat/linux/linux_misc.c index 73a4c49a1a6f..e789586160b6 100644 --- a/sys/compat/linux/linux_misc.c +++ b/sys/compat/linux/linux_misc.c @@ -1820,7 +1820,7 @@ linux_prctl(struct thread *td, struct linux_prctl_args *args) error = EINVAL; break; case LINUX_PR_SET_CHILD_SUBREAPER: - if (args->arg2 == 0){ + if (args->arg2 == 0) { return (kern_procctl(td, P_PID, 0, PROC_REAP_RELEASE, NULL)); } From nobody Wed May 29 16:00: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 4VqDcR6Bxpz5Mljk; Wed, 29 May 2024 16:00: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 4VqDcR5lk5z4dQk; Wed, 29 May 2024 16:00:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716998423; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OFqjIMyxgJrSTfOvy0iwIIjQrLd4GcmWGd2Cs0x0LGs=; b=BEeDGpA1XHAnVSOEk5Hba58fBhO4wxdpEg3nV8pj9ErqOzE8RNL4S25TqnfddJioDlIP4i TVucJyB6aKk/dcpUfSkWFJRj/zAd8YE+dGCOLXKMVNRsb+Rd76bUQ31aMHBEGyf2rI0AgG bCdBYP7CyPuNgSfHEptho/C6I6h5fQh+PX85h1sMtgQe25vYvFn5+IuMpwXdWsv2YIvK1N JEu0cvYo6JrWx9XEK9XOMJhjL/H9B8SXmXI2KksyTQx+/A+eV1U5NfTtA5GQynOtJ7YkGp p3JFrFI+Nzy297lxEu3L6fcynxc4utozLRDBS1sCSoS7uspHjRc1tEhN1zaQDQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1716998423; a=rsa-sha256; cv=none; b=EbV2oqvmVdhMsZ9FJonsqCKXSOfzWJaBADyjDAVmMF7hbVZLZXDt1vlzG+DwRNThFMPJ5y S180mZJjh6nRPzuERrigHbTl3X9uaXm6J4MTr5r388yJOJqsNcNIPwET/kSYnLqxuP6mkK MGFYGV/nSwnc3TNbK1NwDhVo+dCcktJkC2T8s63j12fWd/RWbWXQxVePx2bxKSxGWVOTfw 0eBsKcvoAuIRX71Fb/QwvUSzMnerH58vJYfah6scedgenwwarNxdlso1ur2k6SArexDqJk su5J+Wn7EsHuu8LxtYyuBzCIP76g0GBgihOAiSCx2m9GTMojAAA0HK/A6Dnofw== 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=1716998423; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OFqjIMyxgJrSTfOvy0iwIIjQrLd4GcmWGd2Cs0x0LGs=; b=xyk5PEhmXwIVaAtiyzzpAooZYBt3eow6czxTT5JeBhYOQady5sCQbrvUEzgicqToEUw7ZJ BGuXjOq9D6xtXM4uxKreXkeQI3tuLp93gv8uGX/BpaDgbgja2m9wLDIgC7DC+uLcuQEA+c M6GQtrneFBbdLCUdcxlZeNq6xpKjp0DLtgg5ZdrIgwzr8xFdZP/JHcqxXNwHQWYLhOW8zF yJ56A7YDrDLCMwzxOY3oKqYsuaouLUkzj5FvumOGi5HvYPIPfKmSgUhOIFQlNgvyqOpNqK 13cZOcfA2rPXh3nV9R+ZapiX9HVZSVI6gYlDRlCbbcomn9dYSZefALjtZqt0dA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VqDcR5Lscz12Jy; Wed, 29 May 2024 16:00: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 44TG0Ni6042855; Wed, 29 May 2024 16:00:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44TG0N8r042852; Wed, 29 May 2024 16:00:23 GMT (envelope-from git) Date: Wed, 29 May 2024 16:00:23 GMT Message-Id: <202405291600.44TG0N8r042852@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: 6bad7d2486b3 - main - checkstyle9.pl: Add check for missing space between ) { List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: 6bad7d2486b373015db5917d7a9641266861c607 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=6bad7d2486b373015db5917d7a9641266861c607 commit 6bad7d2486b373015db5917d7a9641266861c607 Author: Warner Losh AuthorDate: 2024-05-29 15:59:27 +0000 Commit: Warner Losh CommitDate: 2024-05-29 15:59:27 +0000 checkstyle9.pl: Add check for missing space between ) { Sponsored by: Netflix --- tools/build/checkstyle9.pl | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tools/build/checkstyle9.pl b/tools/build/checkstyle9.pl index 24e33712ceda..7c2b2c0f5b5b 100755 --- a/tools/build/checkstyle9.pl +++ b/tools/build/checkstyle9.pl @@ -1556,6 +1556,11 @@ sub process { } } +# Check for ){ + if ($rawline =~ /^.*\)\{\n/) { + ERROR("Missing space before brace\n". $herecurr); + } + # check for spaces before a quoted newline if ($rawline =~ /^.*\".*\s\\n/) { ERROR("unnecessary whitespace before a quoted newline\n" . $herecurr); From nobody Wed May 29 16:27: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 4VqFCJ6J0tz5Mnq8; Wed, 29 May 2024 16:27: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 4VqFCJ4J84z4hLK; Wed, 29 May 2024 16:27:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717000028; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QTL8ziMqUMOnYTsSqL/6lAPm2uyGYS19HHLXuKWWFAk=; b=aU6uJ4+F0MqInrjfzVcJRwT+TeeT/6h5k8z6+oAzonK8KNwQCuzl+dZUpoH5knqiLLNigI E8yPpfNhBIoub7zNIeWcZiKME09tb82nP6OfbVyJlZm204xAomLpLvRz1cefwIXp+hg5as FWtK1smAd9OWPDRSb/s283U2TcBCEv1qrETy9LgRrCSuvzVf5BjCgspkjV3UG9WLnxF+lp KZoUArHSCewUQVKs3sUu0SiW+ncp4UH8ZsZoyro2kf4nGZG1MCE9KZINVDwnWq9yPrYxVx 6YGw6GFKJMvRzwWnjjnnQ8sJRp+PCbb5A+7PpowjN9PSwvxafyXxfo4aGiyFcA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1717000028; a=rsa-sha256; cv=none; b=W+78tn7dJxhogrEG0fEI8HqJflQlHXpGH7leXlKmBHks+vlRT0pBGBCgkePJm5ulJqkJb8 m5iU2tiXFsoHs/yhSMwMGcz6TVNm3B1w9cepCOe1YMPYW6I7Bo2uEq3aU4ZklSvqvAInSj N7NF+juzWmwGDIbuBBa1p7j/osSOFxaoIr/XQJnM12Oo2CtndIRh0HPraW9QxEUcVLCmKJ MZtTr372WONwtYlj6c17kn3lMOWc+fUrzURlNh/8uxGOECfc+te2E5M7RRaptt70gqpXq6 QUc6f7OzNTB+QvfJSlrEKwrdkyb1oJuIPM0kY6qES+d6Ttom4gBJRJ0tUvvguA== 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=1717000028; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QTL8ziMqUMOnYTsSqL/6lAPm2uyGYS19HHLXuKWWFAk=; b=lxl9/I0yq52cxogobM5LJ81YCTAA8MSnb5AnA+Q80lHaQ9L52aoktObE+L40CV854zGWzM ZNDbJgn5KZbu1F6MZ1wWSy5CadXFWDFeB9qfW2RcOMp5z2r4CjK3lnLiVq0vgHa4U9ajMf i6Zi1kuYdKK+N/BykIHyXcV9YrWg3+qJULxbT8y3SxTLVaJPTj619wWBIJaDJV9BYV0fJu +iD5fXCfvVZ2Ic0EUnE6LfxMFKkjBV/sKTcKkcwGrudHSlCr35iLIgbE8d7iF9l5SBSnil r7NUgOE1YdRC2IwZ0ETL6jDCp4LWRoe30acpLWqk3UYmdJCiwY1OA0pK6z/S7A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VqFCJ3trkz13Lv; Wed, 29 May 2024 16:27: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 44TGR876084205; Wed, 29 May 2024 16:27:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44TGR899084201; Wed, 29 May 2024 16:27:08 GMT (envelope-from git) Date: Wed, 29 May 2024 16:27:08 GMT Message-Id: <202405291627.44TGR899084201@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: 4010c267a55c - stable/13 - libc: move NIS xdr_* symbols from rpc's to yp's Symbol.map List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: 4010c267a55c5bdb8f752f023d147de3021f9d75 Auto-Submitted: auto-generated The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=4010c267a55c5bdb8f752f023d147de3021f9d75 commit 4010c267a55c5bdb8f752f023d147de3021f9d75 Author: Ed Maste AuthorDate: 2024-05-24 17:27:29 +0000 Commit: Ed Maste CommitDate: 2024-05-29 15:42:17 +0000 libc: move NIS xdr_* symbols from rpc's to yp's Symbol.map To fix WITHOUT_NIS build. Building yp_xdr.c is gated by MK_NIS. PR: 279270 Reported by: peterj Reported by: matteo Reported by: Michael Dexter's Build Option Survey run Reviewed by: brooks Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D45347 (cherry picked from commit 61639bb3fc5abe0bb7b096e643b51c30703ac432) (cherry picked from commit 1e3dfe0c343c74d4c7162e25378b221e5a797917) --- lib/libc/rpc/Symbol.map | 31 ------------------------------- lib/libc/yp/Symbol.map | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 32 insertions(+), 31 deletions(-) diff --git a/lib/libc/rpc/Symbol.map b/lib/libc/rpc/Symbol.map index 89b434ce67db..cee6b26bc3d1 100644 --- a/lib/libc/rpc/Symbol.map +++ b/lib/libc/rpc/Symbol.map @@ -11,37 +11,6 @@ FBSD_1.0 { xdr_desargs; xdr_desresp; - /* From yp_xdr.c (generated by rpcgen - include/rpcsvc/yp.x) */ - xdr_domainname; - xdr_keydat; - xdr_mapname; - xdr_peername; - xdr_valdat; - xdr_ypbind_binding; - xdr_ypbind_resp; - xdr_ypbind_resptype; - xdr_ypbind_setdom; - xdr_ypmap_parms; - xdr_ypmaplist; - xdr_yppush_status; - xdr_yppushresp_xfr; - xdr_ypreq_key; - xdr_ypreq_nokey; - xdr_ypreq_xfr; - xdr_ypreqtype; - xdr_yprequest; - xdr_ypresp_all; - xdr_ypresp_key_val; - xdr_ypresp_maplist; - xdr_ypresp_master; - xdr_ypresp_order; - xdr_ypresp_val; - xdr_ypresp_xfr; - xdr_ypresponse; - xdr_ypresptype; - xdr_ypstat; - xdr_ypxfrstat; - authdes_seccreate; authdes_pk_seccreate; authnone_create; diff --git a/lib/libc/yp/Symbol.map b/lib/libc/yp/Symbol.map index ecd17af4a29a..71cccb3dfebe 100644 --- a/lib/libc/yp/Symbol.map +++ b/lib/libc/yp/Symbol.map @@ -21,4 +21,36 @@ FBSD_1.0 { yperr_string; ypprot_err; _yp_check; + + /* From yp_xdr.c (generated by rpcgen - include/rpcsvc/yp.x) */ + xdr_domainname; + xdr_keydat; + xdr_mapname; + xdr_peername; + xdr_valdat; + xdr_ypbind_binding; + xdr_ypbind_resp; + xdr_ypbind_resptype; + xdr_ypbind_setdom; + xdr_ypmap_parms; + xdr_ypmaplist; + xdr_yppush_status; + xdr_yppushresp_xfr; + xdr_ypreq_key; + xdr_ypreq_nokey; + xdr_ypreq_xfr; + xdr_ypreqtype; + xdr_yprequest; + xdr_ypresp_all; + xdr_ypresp_key_val; + xdr_ypresp_maplist; + xdr_ypresp_master; + xdr_ypresp_order; + xdr_ypresp_val; + xdr_ypresp_xfr; + xdr_ypresponse; + xdr_ypresptype; + xdr_ypstat; + xdr_ypxfrstat; + }; From nobody Wed May 29 16:52: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 4VqFmK28j3z5Mr7S; Wed, 29 May 2024 16:52:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VqFmK1Y50z4k4c; Wed, 29 May 2024 16:52:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717001537; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=q7C8gRVfpsJS6u+9NvEu8lcSPxdx7sy7tHwZje62Qcc=; b=TWMoiZFMfZyJRj5KeCPCuuTjiwWcvO/9590Kw9MJVSoHYXSxi5LzSPVhO9eBKdnEDz/dM0 DA8mLDtmCJBi6JIMFs3wQdbDGMf2rJ/3Dlcq2NPRZGyMvbAP41mX2+vRofWnWyuvy0Cf5i QhCpNpX2QDEDRHQ9lAMUJ/AGjo6xroXMsZNnCusfhJWK5WtR/FPj08XHmVtyrsb7ftb3PM 1cJObTwIpVTKu1xfXh5UsZkQt9gNkGgZQ+VE4lM/lUtMSDR83zm+4EuH8sNXNxJ10razag Hxbzp1vSKtPHgiLUu/zPD9pfHxEhwxNVUK6TcdtujKsU9rZKbgnVXq/fP1yqUQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1717001537; a=rsa-sha256; cv=none; b=dfXuSSWjWFS5DA6HtoFy23KvVTAuwY/LNqrZbK61wBXWug1RkaMk74XRQcahW7XcAogXYE o04WadGgrfq7vniA9JWpUodCxq0qWZK5FJpzGD4ZQejwYxMEt7MWtVjBmxfuVwvVZxLwuF 6fJmSJ3F4SUYB2bcMMMq9kRMo3NCyg5r9gCTf/1aTfSyBIb7Ep75/G+hzPGGPIM+CH+2DA FCVb8wpFt1csnOlh1S3F79vMhVXILGxxGiYD9Fvr9AL7JNgL01XN2dsVhL+Jg5JlsgxfSt kS4Qp6ngnv6+wsCjFkOIUx1EbujSOuOlKTeVGsAsO+MYGOmCTMk+5YEe0nKrFg== 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=1717001537; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=q7C8gRVfpsJS6u+9NvEu8lcSPxdx7sy7tHwZje62Qcc=; b=tovtVLWnW+a67vhDxq92sL0besOXubIf8tWItPD6MFb+3u7ZAhkytsJUvbZgYET7/EIdKT 1Blt9t2NclMH7ZYPqWCUb5VlqDNm53nWCTxo6dErvEmjxu+bQy8rDgqvfUJTX1YV5EElxF 1Wk6O5zoqnNXgL7siaZizUrP98Wg/Cw4K3CQloCNI7fhBD1yFejVxuBfqvphILxNWDaWtw sTQw2LePopXfccNUQgdklsnGEOENZmk7wzJipzonaI6fI4c3y8Tsjh+NyBSutyOXLAb4sP FCqbwLUKONdOhYeG0C/C0gul3vMmSIRmUEtALJkRHaIyPITfh0BdFtMaDn22/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 4VqFmK15fRz140v; Wed, 29 May 2024 16:52: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 44TGqHvB033697; Wed, 29 May 2024 16:52:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44TGqHAr033694; Wed, 29 May 2024 16:52:17 GMT (envelope-from git) Date: Wed, 29 May 2024 16:52:17 GMT Message-Id: <202405291652.44TGqHAr033694@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: b8a7548399ed - main - LINT: Don't build bnxt on 32-bit platforms List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: b8a7548399edb3015425dffb28fa34bb42fda33c Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=b8a7548399edb3015425dffb28fa34bb42fda33c commit b8a7548399edb3015425dffb28fa34bb42fda33c Author: Warner Losh AuthorDate: 2024-05-29 16:50:27 +0000 Commit: Warner Losh CommitDate: 2024-05-29 16:50:27 +0000 LINT: Don't build bnxt on 32-bit platforms Sponsored by: Netflix Fixes: acd884dec99a ("RDMA/bnxt_re: Add bnxt_re RoCE driver") --- sys/arm/conf/NOTES | 2 ++ sys/powerpc/conf/NOTES | 1 + 2 files changed, 3 insertions(+) diff --git a/sys/arm/conf/NOTES b/sys/arm/conf/NOTES index db7da3ff1ea6..920d721dc3ba 100644 --- a/sys/arm/conf/NOTES +++ b/sys/arm/conf/NOTES @@ -90,6 +90,8 @@ nodevice snd_cmi nodevice mpr nodevice mps +nodevice bnxt + # Build SOC-specific modules... makeoptions MODULES_EXTRA+="allwinner" diff --git a/sys/powerpc/conf/NOTES b/sys/powerpc/conf/NOTES index fa509e6ad137..fbe29c328e73 100644 --- a/sys/powerpc/conf/NOTES +++ b/sys/powerpc/conf/NOTES @@ -77,6 +77,7 @@ device backlight nodevice ccr nodevice cxgbe # XXX: builds on powerpc64 only. nodevice cxgbev +nodevice bnxt nodevice mpr # no 64-bit atomics nodevice mps # no 64-bit atomics nodevice ppc From nobody Wed May 29 17:09: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 4VqG8M1kYFz5Ms9D; Wed, 29 May 2024 17:09: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 4VqG8M12y4z4ljd; Wed, 29 May 2024 17:09:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717002579; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=35pSY8mEzPTadY5EZPMkdCjQ4Bvw4TT1//Sdr/TvD58=; b=gRqjBq4GN0VdqrUQWuIAjWkHrJ37XnKZrKYBe1s/GqH+P3+ughuXUBr6KX7chGmn5k0c0f ibBA2GRCo0owiDxfL/eQa5kSn3GRNOtEiIJmDlGMzkqYP+dAAZc+ZZ+0A0+LOS22XLjlPU zm/3KgmFsZ2h9GUURbnKMLFSXpwGHJl6z+LClZDxr/UikEKMQ7w5+iUrNFILOFHrtP/1PL nuRBOHteelRY9zX1LXZaLRxyaCtk11Oqc5dV7iiaMLqiswa0mm0Dny3g4UoQeCcposvFDZ rvFe8D/d3CJepHbp0mAhMvvn4W/BPGELOiUehcOMVlxVty4Kn+pljPY6p801tA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1717002579; a=rsa-sha256; cv=none; b=RYUreObN0bVAogjl+3Dn8SbXjK0ugv9SRjgzWdCLu4GcW6JtWmm4R558YyCRWCRyIV9l8v aSg/JXrkGWnx4JR4aOi54W5eEVRSqYw8ko45mwmRFgCA4pUQTwV9EdEbT+28N5GDWqIZri e9C0AyW+EGWDSrqo6getYPxOJ7In2VEdXdmfJ3O/aFRXtsoPNGEF3k9nXQATJ6h04Wj/G6 nNR3p34aKCZbeIg95qlCMOiV1Tq7FXq8SUihWQDZHWu5WwSMErDdx01VKSGXOxr9Ni6oiT cnJ673xMMq6aap9ZWLwhl1Aypzl+ClZTH/kNv4l1sx/832jdtX2z8h5f6SIX2Q== 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=1717002579; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=35pSY8mEzPTadY5EZPMkdCjQ4Bvw4TT1//Sdr/TvD58=; b=iEsVRBq4+KgEKJUcm3z9PLzGN/CVlYXviEPz6V5eJhGhJ+nmaVm2uRsg9RkypjxKx9hcc6 eI0EkmiCWgE+JStPAFQR37UrUBhsPsO+9N1WN68JHUbLcevb73G1ux1AmvCzy90lQD2i5l eecnK3CYhOnHzJruRToxhcDazou3Y7BM3F2dFBODBVnQ5GxbiGvMacwaC84/hB1Kk1fTUv H8C/rbs4Piax/71CJi2uge+8/CJcpb3oAkix3o9i6Ry8jBczxumDj0Ckfj/3d7lZBI1d2X ZOR1KdGKCUHDTLIg67x6n5ksZqfRIy9n8d2jYvqc0ndcB8sdzV6QrSiKYGQEVw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VqG8M0Y5Tz14kt; Wed, 29 May 2024 17:09: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 44TH9cHA052637; Wed, 29 May 2024 17:09:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44TH9cke052634; Wed, 29 May 2024 17:09:38 GMT (envelope-from git) Date: Wed, 29 May 2024 17:09:38 GMT Message-Id: <202405291709.44TH9cke052634@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: 70c2998c0ea3 - main - Revert "files: make uart_bus_puc.c not depend on puc" List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: 70c2998c0ea3fc5ab86c6f497abaf8f9b4d73334 Auto-Submitted: auto-generated The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=70c2998c0ea3fc5ab86c6f497abaf8f9b4d73334 commit 70c2998c0ea3fc5ab86c6f497abaf8f9b4d73334 Author: Emmanuel Vadot AuthorDate: 2024-05-29 17:06:41 +0000 Commit: Emmanuel Vadot CommitDate: 2024-05-29 17:06:41 +0000 Revert "files: make uart_bus_puc.c not depend on puc" This reverts commit 114ab149e23e11760a2a41a773a786b97980616a. This doesn't work, no idea how I tested this at the time but clearly the wrong way. --- sys/conf/files | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/conf/files b/sys/conf/files index fec92518c498..4685d7a63227 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -3215,7 +3215,7 @@ dev/uart/uart_bus_acpi.c optional uart acpi dev/uart/uart_bus_fdt.c optional uart fdt dev/uart/uart_bus_isa.c optional uart isa dev/uart/uart_bus_pci.c optional uart pci -dev/uart/uart_bus_puc.c optional uart pci +dev/uart/uart_bus_puc.c optional uart puc dev/uart/uart_bus_scc.c optional uart scc dev/uart/uart_core.c optional uart dev/uart/uart_cpu_acpi.c optional uart acpi From nobody Wed May 29 17:09: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 4VqG8N2Qswz5Ms71; Wed, 29 May 2024 17:09: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 4VqG8N1xXGz4lcV; Wed, 29 May 2024 17:09:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717002580; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/MeQ2R0t2M3DZOJ9en4+N1AD4lmINfKnYVnvpoqN9ok=; b=gkPTiqPK32V2p2ECtNg70HP651gm/6jO8X7rSpKHj0Zt9zpjbnz+fT6XkAa51N3khCs0NT bYhuHk/3cZ3rKRkrdL5WZ3alC78D0xHJOV6Yy/1l6unG4Kr6lZ3d3mZFKbd7qmp+v1eFJ7 XctOPWeMa9HWnEF3SvKubevFGWI+D9Kvk4PMPuQzpN0pz/osRA1nZ4rBLfsFC+69hdRnDc kJGVslefLkmy3PwJvF4bW4k3qtueIGq64+yQ50kLaM88jE16N/xogg/OnrRtjGR6lKQftn vfQLhSYf2yhyHtmimqs0IH1Q1FAuflEF2OiFm1HaWQaU3gkTq4LRKs7i1e566g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1717002580; a=rsa-sha256; cv=none; b=n9vN2UlJuYVQW2/3I84IMgzNgbU6uAp5GmMkzUfE/m8Z9iOBKsbj9CuW9AASGjJI/YDqIJ cIUqe1LPHvwRBYK5mxc1FfwbL+OdcUH435vxpCjvs7ac8jDU+aPS56c7CY+vFVV1pu7OL4 oo2RQLYC70oZqgbyDrfpSKWn2x56j8kwu+ezO4vkMxf5B8KOL2ahpH9HAmIDTreEapf63O QMPg2Y9B53TY0E6pmOxlK9Vgn5whwiNc8bFTSCMG7FxJ3VswfmS+2ulwYXPLRvYbqyMguj aVQ/cNg3l6gZRCQxbnW2UonOQFKaU+SV66mcJVv57M3O10WnsWJV/39tE7l9Wg== 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=1717002580; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/MeQ2R0t2M3DZOJ9en4+N1AD4lmINfKnYVnvpoqN9ok=; b=Q/TuQSt9LARbXzCcPr/0JRSxQuEmBIKMZMCON6xQlPxovr1RHPXS+fngsgv2aX1WG+IjVg 5O68ebvq5Cfu/+i3rCHkKjKfvifiwaTKRbIfX9YcpfzUzjMg3YCzUV2lwp2LNMrS8m9fDZ QOh9RCuFLgMdC5WjJ3Nxnfo1IT5uCsrjoFfNvczAsGFXH8HhhlTXCCXmi9Js8GJxE/joOu DkipCqRlaaNerbmUy9IfbK5vZFHcgODDmDwHae4a7vokdKOieJ0WecrEkyClgmGzWVEsii OAb6lmT43uXgHgwD84C2YPC1eWrBUirWZ29dTk+OwUFUhexi6YtbQ6OAuy5LMg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VqG8N1W7vz14pS; Wed, 29 May 2024 17:09: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 44TH9eee052683; Wed, 29 May 2024 17:09:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44TH9eC1052680; Wed, 29 May 2024 17:09:40 GMT (envelope-from git) Date: Wed, 29 May 2024 17:09:40 GMT Message-Id: <202405291709.44TH9eC1052680@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: 304ac69eca62 - main - puc: Make kernel module working List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: 304ac69eca623d63510aa61853adc1ea60593323 Auto-Submitted: auto-generated The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=304ac69eca623d63510aa61853adc1ea60593323 commit 304ac69eca623d63510aa61853adc1ea60593323 Author: Emmanuel Vadot AuthorDate: 2024-05-29 17:07:51 +0000 Commit: Emmanuel Vadot CommitDate: 2024-05-29 17:07:51 +0000 puc: Make kernel module working We need uart_bus_puc.c in the module for it to work. Sponsored by: Beckhoff Automation GmbH & Co. KG --- sys/modules/puc/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/modules/puc/Makefile b/sys/modules/puc/Makefile index 6e14ce0ed268..cfd48bee5ff9 100644 --- a/sys/modules/puc/Makefile +++ b/sys/modules/puc/Makefile @@ -1,8 +1,8 @@ -.PATH: ${SRCTOP}/sys/dev/puc +.PATH: ${SRCTOP}/sys/dev/puc ${SRCTOP}/sys/dev/uart/ KMOD= puc -SRCS= puc.c puc_cfg.c puc_pci.c +SRCS= puc.c puc_cfg.c puc_pci.c uart_bus_puc.c SRCS+= bus_if.h device_if.h serdev_if.c serdev_if.h pci_if.h .include From nobody Wed May 29 17:18: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 4VqGLP6llkz5Msgj; Wed, 29 May 2024 17:18: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 4VqGLP5vfhz4n1Y; Wed, 29 May 2024 17:18:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717003101; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uaUCyigTlVjgwEJywyeWd+pFo01mEycCKF8uLt+e4pE=; b=j18HAUQ4KevR2dv2bM/hWfF10cQyicWOGFK74qTcA6mbb9GS0oX1WL62z25RkW2Q1SxhTg /0/hpwQJg6eZOc+diP7TOMdiOP/+Ne0bAgH6bslB/mXUUgTPqaSTi6rvfkXALQTJWwQRtA K8pBQSMIO5Vtn9tahiKIHdcG5JCG9pQynFgjK6LcWqz53g/X0lN4Tjvy4hFSsAnpXXGjvt j172apX3Ew6XMc85fEMSTne/5Xh1c4nO+1J+w47Cm2S4+NtfPpP1Exisp+VaxzelY8jVpR udtZO7chtItv23wz3C+3xf2XyacdrE3qW72h9glFtiUAMiAbBUMCR83rj0AJMA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1717003101; a=rsa-sha256; cv=none; b=HR5/KxZbG86MG/MlT1vovCudcy6tJFNhOgLVp3pEPBj7xrOdQgOrTphoGIWOxmVaLB0u6W DUrl/ZUaCdFYf/c0lLYUnyPS9ISTeACY1vFLTiN0DYgyo0Rr02ClCvclaaSLA3k2Ecd2yE 4VDINaGKZGD6CnnRIDYMjsGZHd3ZNyyNagNByLBJkgr4jVHcyrWbKxHDnL4F9Nt5QhNopD mRsiKkGxurgn8SkWnAsIXIrCXhZYwJDl/lJ3+hgDLTX0car/Oe4g5n5/bGCfaYRRzwaorT JGiK5sidotJrgy+wn+A9lkONk5NqAKuOEx6IwE1dqwA6br21PWZoxi/tw/Z+HQ== 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=1717003101; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uaUCyigTlVjgwEJywyeWd+pFo01mEycCKF8uLt+e4pE=; b=LMb9RhvCquzt1UMRCUT1AoFA8nyOw2BAqPKnI5ZwYE89bz8AGxw+Z/938H1pxED182QDUU sZn3Y7T7QtiAr2M9h0ytSclTheU+KIfE0sxMYUNfCVIQCP9KYfYoC27Z4JGVVNL0N7xt+y 2n4iar3UYF/JaGCK+f3IASCDI8cJoiAoyomVJcH+TgMbj6HEBB+y2NVpMxrCY2gXAqpKH7 i3OSprzU8DGCV1/tvFMkAeGEyb6CUPAznA2v30o07cXIenSi2uliXFp7x6qXMOcLgrCejv Jjwqg4XscOK08Vwa0WiK6igHgt0TfPp/kmxp+PJRmTi2hZMa/Aw4w65ZPypa1Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VqGLP5Pp6z14ct; Wed, 29 May 2024 17:18: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 44THILS9069418; Wed, 29 May 2024 17:18:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44THILvt069415; Wed, 29 May 2024 17:18:21 GMT (envelope-from git) Date: Wed, 29 May 2024 17:18:21 GMT Message-Id: <202405291718.44THILvt069415@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: b661d9e64d73 - main - Revert "checkstyle9.pl: Add check for missing space between ) {" List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: b661d9e64d73a244873fb2aa6c97e95a988fb758 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=b661d9e64d73a244873fb2aa6c97e95a988fb758 commit b661d9e64d73a244873fb2aa6c97e95a988fb758 Author: Warner Losh AuthorDate: 2024-05-29 17:15:24 +0000 Commit: Warner Losh CommitDate: 2024-05-29 17:18:00 +0000 Revert "checkstyle9.pl: Add check for missing space between ) {" This reverts commit 6bad7d2486b373015db5917d7a9641266861c607. Turns out this special case wasn't necessary, and this was already detected and due to another error (running the script got dropped from my experimental scripts), I hadn't noticed. Sponsored by: Netflix --- tools/build/checkstyle9.pl | 5 ----- 1 file changed, 5 deletions(-) diff --git a/tools/build/checkstyle9.pl b/tools/build/checkstyle9.pl index 7c2b2c0f5b5b..24e33712ceda 100755 --- a/tools/build/checkstyle9.pl +++ b/tools/build/checkstyle9.pl @@ -1556,11 +1556,6 @@ sub process { } } -# Check for ){ - if ($rawline =~ /^.*\)\{\n/) { - ERROR("Missing space before brace\n". $herecurr); - } - # check for spaces before a quoted newline if ($rawline =~ /^.*\".*\s\\n/) { ERROR("unnecessary whitespace before a quoted newline\n" . $herecurr); From nobody Wed May 29 17:28: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 4VqGZ15LBPz5Mt5L; Wed, 29 May 2024 17:28: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 4VqGZ14mwbz4p1B; Wed, 29 May 2024 17:28:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717003705; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7t7o+ILjcXU+VOY7hdCxbzhYrRBDho5X9FBvM4PPEbA=; b=qFnopvnXFOwYDI0nk19E8h23RqI5DLNyFiJHCuB4G/szR3o2yvEZYHPY/q06CZllnneM2f F9bd3slzuWnkcHqaYQ/3JOhUIo9hYv2+dp2hX9VjgKYoa9/nvYxfjUnAvATuctZ4Hsjbpb rMVZi1txG5tsv83VBuoGv36/chSuRoIstUtAUBZh8o9dzh8scrVrMdEFk/5dxUC8FI1tpN PsoP87Ka17mIwEMIzsTlir6O2fp6Xl/F8Jar+cCJxEaAtnc8s1AoG+7Bq04kloGK3r//NY Zg5GggL/cpQJUknpm7SMhdaiUHtaH4vcU4g5dXYbqkvOHsFSyDnSJgy1cZ6ldw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1717003705; a=rsa-sha256; cv=none; b=D1CazFB6uymjX/QBo/eUF0oN4yi3a+eKlePzhV4LGIhoXOqlrXdJvnLmvBPTeF3naKWg8j OpfdIMezUgqTK3RSGODtFKvgElYyVMydu2SPm29q7wI6aOuFMjGOLYrN10WCfKpqnDDPNY t4QU+xV2OPmevhX0hNabA6XBfDQGonMJFdJW8n7xIaWqiITtW3GAbwBD3gM6b3Yph8VL/D kNKLHchTidpaFbQco8CZhVaeAwi4353gOWA0N61M1/2H+88WR35Un4tquS/g4kdNR+hXhi 6JJ+LD6xuyDL93BLow3VSxfnYKaIKZbrSJkbnrFCCs5LdhCXrQLsNXUMzfpQTw== 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=1717003705; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7t7o+ILjcXU+VOY7hdCxbzhYrRBDho5X9FBvM4PPEbA=; b=G6QfbccMWbtdFVrHIwymiKAXK2neU1/VVBfPJKku+PATNXw8bgYmrJL5idr6P8V2GfQoZb vRDesMHajcHEJAi1MgO4ctw2IVRCdxARu/ksgJBUzqVREnTY7lR0Su1uEyExf+/CfC56hW OP6Jsg9o8r8dFjz2dF1t03G8HV+kU5BQQkGocysYV3/uVBxYCDhhc+K97OC01YTeZbFKp9 67KxYDZK7UzlQVY+9xB63Pelr8tngU5uzIbNDDTfEKGbYiMLiVVYYXFq2M60C6KWWSommT unYS91PesCCxIWY3c+W/+u2Y5iBDGorNbs76zWdQIGosj6w2dLVDTocOzqL4tg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VqGZ14Mr1z15BT; Wed, 29 May 2024 17:28: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 44THSPSE086497; Wed, 29 May 2024 17:28:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44THSPmO086494; Wed, 29 May 2024 17:28:25 GMT (envelope-from git) Date: Wed, 29 May 2024 17:28:25 GMT Message-Id: <202405291728.44THSPmO086494@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: 11333dd580b7 - main - rc: improve NAME_setup handling List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 11333dd580b704fb4ff0836e1d1a0634099b0cf6 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=11333dd580b704fb4ff0836e1d1a0634099b0cf6 commit 11333dd580b704fb4ff0836e1d1a0634099b0cf6 Author: Franco Fichtner AuthorDate: 2024-05-24 16:38:56 +0000 Commit: Warner Losh CommitDate: 2024-05-29 17:23:46 +0000 rc: improve NAME_setup handling Reload is used for service reconfiguration as well and lacks a NAME_prepend-like mechanism so it makes sense to extend the NAME_reload hook into this action. precmd may use configuration checks and blocks setup from doing its designated work (e.g. nginx). In moving the invoke of the setup script in front allows us to provide custom scripts for config file generation and fixing prior to precmd checking configuration integrity. Also introduce _run_rc_setup to separate the launcher from the main one. Let it run correctly in the case of restart_precmd and block further execution as would be the case in start due to the internal plumbing of restart being split into calling stop and start afterwards. Differential-Revsiion: https://reviews.freebsd.org/D36259 Signed-off-by: Franco Fichtner Reviewed by: imp, oshogbo Pull Request: https://github.com/freebsd/freebsd-src/pull/1258 --- libexec/rc/rc.subr | 73 +++++++++++++++++++++++++++++++----------------- share/man/man8/rc.subr.8 | 13 +++++++-- 2 files changed, 58 insertions(+), 28 deletions(-) diff --git a/libexec/rc/rc.subr b/libexec/rc/rc.subr index 23651cbf8e58..1b0fdc837228 100644 --- a/libexec/rc/rc.subr +++ b/libexec/rc/rc.subr @@ -975,7 +975,8 @@ startmsg() # # ${name}_prepend n Command added before ${command}. # -# ${name}_setup n Command executed before ${command}. +# ${name}_setup n Command executed during start, restart and +# reload before ${rc_arg}_precmd is run. # # ${name}_login_class n Login class to use, else "daemon". # @@ -1287,9 +1288,9 @@ run_rc_command() return 1 fi - # if there's a custom ${XXX_cmd}, - # run that instead of the default - # + # if there's a custom ${XXX_cmd}, + # run that instead of the default + # eval _cmd=\$${rc_arg}_cmd \ _precmd=\$${rc_arg}_precmd \ _postcmd=\$${rc_arg}_postcmd @@ -1301,6 +1302,14 @@ run_rc_command() fi if [ "${_rc_svcj}" != jailing ]; then + # service can redefine all so + # check for valid setup target + if [ "$rc_arg" = 'start' -o \ + "$rc_arg" = 'restart' -o \ + "$rc_arg" = 'reload' ]; then + _run_rc_setup || \ + warn "failed to setup ${name}" + fi _run_rc_precmd || return 1 fi if ! checkyesno ${name}_svcj; then @@ -1400,6 +1409,8 @@ run_rc_command() fi if [ "${_rc_svcj}" != jailing ]; then + _run_rc_setup || warn "failed to setup ${name}" + if ! _run_rc_precmd; then warn "failed precmd routine for ${name}" return 1 @@ -1416,8 +1427,8 @@ run_rc_command() fi fi - # setup the full command to run - # + # setup the full command to run + # startmsg "Starting ${name}." if [ -n "$_chroot" ]; then _cd= @@ -1448,16 +1459,9 @@ $_cpusetcmd $command $rc_flags $command_args" fi fi - if [ -n "$_setup" ]; then - if ! _run_rc_doit "$_setup"; then - warn "failed to setup ${name}" - fi - fi - - # Prepend default limits + # Prepend default limits _doit="$_cd limits -C $_login_class $_limits $_doit" - local _really_run_it=true if checkyesno ${name}_svcj; then if [ "${_rc_svcj}" != jailing ]; then @@ -1466,8 +1470,8 @@ $_cpusetcmd $command $rc_flags $command_args" fi if [ "$_really_run_it" = true ]; then - # run the full command - # + # run the full command + # if ! _run_rc_doit "$_doit"; then warn "failed to start ${name}" return 1 @@ -1475,8 +1479,8 @@ $_cpusetcmd $command $rc_flags $command_args" fi if [ "${_rc_svcj}" != jailing ]; then - # finally, run postcmd - # + # finally, run postcmd + # _run_rc_postcmd fi ;; @@ -1490,14 +1494,14 @@ $_cpusetcmd $command $rc_flags $command_args" _run_rc_precmd || return 1 - # send the signal to stop - # + # send the signal to stop + # echo "Stopping ${name}." _doit=$(_run_rc_killcmd "${sig_stop:-TERM}") _run_rc_doit "$_doit" || return 1 - # wait for the command to exit, - # and run postcmd. + # wait for the command to exit, + # and run postcmd. wait_for_pids $rc_pid if checkyesno ${name}_svcj; then @@ -1514,6 +1518,8 @@ $_cpusetcmd $command $rc_flags $command_args" return 1 fi + _run_rc_setup || warn "failed to setup ${name}" + _run_rc_precmd || return 1 _doit=$(_run_rc_killcmd "${sig_reload:-HUP}") @@ -1523,9 +1529,11 @@ $_cpusetcmd $command $rc_flags $command_args" ;; restart) - # prevent restart being called more - # than once by any given script - # + _run_rc_setup || warn "failed to setup ${name}" + + # prevent restart being called more + # than once by any given script + # if ${_rc_restart_done:-false}; then return 0 fi @@ -1638,6 +1646,7 @@ $_cpusetcmd $command $rc_flags $command_args" # _precmd R # _postcmd R # _return W +# _setup R # _run_rc_precmd() { @@ -1669,6 +1678,20 @@ _run_rc_postcmd() return 0 } +_run_rc_setup() +{ + # prevent multiple execution on restart => stop/start split + if ! ${_rc_restart_done:-false} && [ -n "$_setup" ]; then + debug "run_rc_command: ${rc_arg}_setup: $_setup" + eval "$_setup" + _return=$? + if [ $_return -ne 0 ]; then + return 1 + fi + fi + return 0 +} + _run_rc_doit() { local _m diff --git a/share/man/man8/rc.subr.8 b/share/man/man8/rc.subr.8 index 0906ecb2e787..8f7b72e96dc5 100644 --- a/share/man/man8/rc.subr.8 +++ b/share/man/man8/rc.subr.8 @@ -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 February 10, 2024 +.Dd May 28, 2024 .Dt RC.SUBR 8 .Os .Sh NAME @@ -826,8 +826,15 @@ This is a generic version of or .Va ${name}_nice . .It Va ${name}_setup -Command to be run prior to -.Va command . +Optional command to be run during +.Cm start , +.Cm restart , +and +.Cm reload +prior to the respective +.Ar argument Ns Va _precmd . +If the command fails for any reason it will output a warning, +but execution will continue. .It Ar argument Ns Va _cmd Shell commands which override the default method for .Ar argument . From nobody Wed May 29 19:34: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 4VqKMQ266Vz5L8bx; Wed, 29 May 2024 19:34: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 4VqKMQ1Xg8z51FL; Wed, 29 May 2024 19:34:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717011266; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BvnK68/1fk7W/SIme4EIIvyJXN8xvcGy+RCHhmTzm1A=; b=D7MQur7n2+lr3dfGVNSP4djAaCRY8zJB0t/r3ysS2X8GIwXzjAAXEFb8w0aPhNdn9RGh6/ n2LC0W3X6fHrsnKc2Jo8PvcgMyX6ArAn2nT50sklHV4iD3E0jGrpWnKFVFhRWvLi/5N8yy JJRwlHjdrplK6Ybwv8Pw6DGgaLrfBbFl/5BK2TN3uBDSzoMfKnt+V5O3SnLqYrNUQgyQhe +mhq524B8AG5WiL3TtszdA//v2DcRDvOfpOZ2oR774WP6HTPjBttw/5mOFyqC/WFdpr2M9 ktDsbzJuSNelEKqX7QJjSnbh4R+XU0TpjFvRKb//zG6FOMFzlgqy4bzgV+BOGQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1717011266; a=rsa-sha256; cv=none; b=xRS73K/bk13s7w88N7BZeIoK/c5Ck1jvYvdDGF5qHoryGq5D0vbm9C0onlmrNJRyuZFxCF Ud6OmGR6gLIHHLMmj78+Cgs7bt5OTnXSt9xbQxLVyQbkb0+2vutMhtoquR0vT9v1nTcjQI ItrwVQT/94vkYAIo4dkeJXo2Pk1YYHapf60eAK0IzQhqQzML2RewQA2M4MAzbXrAnjKdB8 Fy6dpYbMvi9/tfZt1s/X0orCtaqmgCfpJ1c2Dl7FKXT2m69F1gcXXTaVJX84/kQl4kYeAv UCuWbUidv2sOGNV3o8u20ahGbUv18SwRNmFz0TMKO2w0kDtnxcFdVariY3ldBQ== 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=1717011266; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BvnK68/1fk7W/SIme4EIIvyJXN8xvcGy+RCHhmTzm1A=; b=sj0pRCpDGNjKfF0J96b6nHjBhS3FJAhqJinxWM445jCDLsebcssMiseyqmKD3bUhBMJ015 yiz0++peNj7mCjiL19OQw1aZ6u3kyoXQHnL/V4FEn9AaSlz1p4v7PnAlFjuJOKlYHURrdz oPxfgKz94/kLYf+gZFdQWApoqi5PIVTAJGf1S8R3BUq1730CKELpbGju06t8yYwmFMteu2 BhdDklQUFX/J6D9Mjasn0MZZY6o4UpLkwRRRyjORnfaH8pwfvag9o8UbliwZsh9NYBw131 jdxzqx5+/rrujvFwbQ4Yh7k8W9lgD9nqS71Whf+E3mpQXmd4IXwPhhoqdkxnyA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VqKMQ153Hz188V; Wed, 29 May 2024 19:34: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 44TJYQKI005563; Wed, 29 May 2024 19:34:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44TJYQvE005560; Wed, 29 May 2024 19:34:26 GMT (envelope-from git) Date: Wed, 29 May 2024 19:34:26 GMT Message-Id: <202405291934.44TJYQvE005560@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: f13275cf03ae - main - export $autoboot var when running from $boottrace_cmd List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f13275cf03ae3ce220efb7a323f73290276a731f Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=f13275cf03ae3ce220efb7a323f73290276a731f commit f13275cf03ae3ce220efb7a323f73290276a731f Author: Alex Samorukov AuthorDate: 2024-05-28 14:45:30 +0000 Commit: Warner Losh CommitDate: 2024-05-29 19:29:53 +0000 export $autoboot var when running from $boottrace_cmd At the moment, if bootrace profiling is enabled, autoboot is not exported to the rc scripts. This causes fsck to not check the root filesystem. To fix this, pass _boot, rc_fast and autoboot to the boottrace process to mimic what diretly sourcing the rc.d scripts. PR: 278993 Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/1261 --- libexec/rc/rc.subr | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libexec/rc/rc.subr b/libexec/rc/rc.subr index 1b0fdc837228..2fd4796b569f 100644 --- a/libexec/rc/rc.subr +++ b/libexec/rc/rc.subr @@ -1856,7 +1856,8 @@ boottrace_fn() set $_arg; . $_file boottrace_sysctl "$_file done" else - $boottrace_cmd "$_file" "$_arg" + _boot="${_boot}" rc_fast="${rc_fast}" autoboot="${autoboot}" \ + $boottrace_cmd "$_file" "$_arg" fi } From nobody Wed May 29 19:41: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 4VqKW23Np1z5L91t; Wed, 29 May 2024 19:41: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 4VqKW22vpXz52DD; Wed, 29 May 2024 19:41:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717011662; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GpHLPmbmPXQVizF+LAUMb01qCZLki+agTDgzbG9GKpU=; b=XOQ+l3cliPN/Bw6dop5NqfmiK61NV202rliMM6m+uAG28BpbIhFjq5Lo7N4qyk/wqjf1lD vsTlF9klTXcq6gdFe25G4998xy82AzZzO3tN7+BI6Pb8YoKxQm8ukMItromGlD7aicyQFm HBT44usMWPitBeS06Y8YsFyzEZh9cLC7wUzL3xZ9WvZ0weEg7gygfDq9CGvGwAgJRna097 BLe52JPxbYW7eo2g23sb8CUOLk4wCKxGXMSqVzEKgzhZhqIshA5I8bTcc8y1Qpbirj3oUl z9MimT9+cbeSJ/dB2K60x8GgzuD0htEup/5bnEU9fHpg3Y4iA/YI55MyqC/hGw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1717011662; a=rsa-sha256; cv=none; b=iQfNUDxQn7G8vRnMDlR3VH4p0j/DSjosI6MQG/7zsYvElpSEbp+hdzyF+bTmjpxKN3IWdl UyrS3vHdqJUr74TaMzUnozq2UNILtjadlbeZRaJdu5+O8hOGtYwm69IsJFwMpX9TCsN5Tr BP+biOPTMgCXeAEyXSTLrJgPfCF+JnLcSmoXQFOlmBoC9UbHLbl5qMbDBT8V/GXWNiji/3 WyVUWMcE+cj7IXY7XxeKuLy6VrLu/Wt/fssLgj1hBe6wWq2HFi0rkWw/bbbkKo1pSagbt/ QUAAVCAynQAtVVYuMyAsaLPpHaVRYhS2pjpBkBevJ4CXDSdQf6n+JCiJmFOpjg== 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=1717011662; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GpHLPmbmPXQVizF+LAUMb01qCZLki+agTDgzbG9GKpU=; b=EGDTHVGxDi/qKPnDWuCpLPkJJaPzzArwtfPdOPjztiig/xSM5ZXEYOi2fliER4rLVW2UdI Us99xTOMWpRMLsAOmJBlxfeSBxNjEZcBXwFYDvh5obA4qCW+OT95oQee3I0IdzI5ZbS7fU Upv5OFc8hdgzY4R2rWwBmM3S9LTu6umep4ToSqqDNGozFZlIzGrJApls8mv7gJrI5CEMbu MT7uU5iphw1uXta0ktPGYrAtQfYm3+hpA09xvbJabC548Oa09j5Mg3EzcvK7G4yTu+Nk0S sRXjk+9SGYCvymVh2Xl/W6J4hVAPb5Cd+o0cAIaalSryseGc6VlBB/ggFmh9nw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VqKW22TW1z188m; Wed, 29 May 2024 19:41: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 44TJf2p3015096; Wed, 29 May 2024 19:41:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44TJf2nU015093; Wed, 29 May 2024 19:41:02 GMT (envelope-from git) Date: Wed, 29 May 2024 19:41:02 GMT Message-Id: <202405291941.44TJf2nU015093@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: 19dbf72a2701 - main - bhyve: correctly remove a memory mapping List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: 19dbf72a270125621268e8b07ccc9ac99c67e7d0 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=19dbf72a270125621268e8b07ccc9ac99c67e7d0 commit 19dbf72a270125621268e8b07ccc9ac99c67e7d0 Author: Pierre Pronchery AuthorDate: 2024-05-29 18:00:02 +0000 Commit: Warner Losh CommitDate: 2024-05-29 19:39:29 +0000 bhyve: correctly remove a memory mapping In a normal code path while setting up GPU passthrough, the size parameter to munmap() is wrong and its operation not checked for errors, therefore leaking resources. Reported by: Coverity Scan CID: 1519830 Sponsored by: The FreeBSD Foundation Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/1262 --- usr.sbin/bhyve/amd64/pci_gvt-d.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/bhyve/amd64/pci_gvt-d.c b/usr.sbin/bhyve/amd64/pci_gvt-d.c index f64cc5984352..dfcd6a8f68c8 100644 --- a/usr.sbin/bhyve/amd64/pci_gvt-d.c +++ b/usr.sbin/bhyve/amd64/pci_gvt-d.c @@ -220,7 +220,7 @@ gvt_d_setup_opregion(struct pci_devinst *const pi) opregion->hpa = asls; opregion->len = header->size * KB; - munmap(header, sizeof(header)); + munmap(header, sizeof(*header)); opregion->hva = mmap(NULL, opregion->len * KB, PROT_READ, MAP_SHARED, memfd, opregion->hpa); From nobody Wed May 29 23:55: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 4VqR8j4fPvz5LZHM; Wed, 29 May 2024 23:55: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 4VqR8j44Brz485K; Wed, 29 May 2024 23:55:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717026933; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZzW2fw8Ef+Dml2qnJeKN5YPnH45FaqQNuqtdRRjWM58=; b=yT7zGA7+uU4oIdwT4t/IKMNCcqVhlQMSzaiRv1aMVlgK4MD7kNtmUg2ySumx4pJtA4DUo5 egJXoR5pjVuaOgr8MbVGCeH5tfp6wviKrJw12Af7zEti4J0txk8IE/4UnAVP/LHqhFGNc1 egqeMzAkJUVmdNso9TcC/OQ/sWoMHMz2bbbmsZ+40aXJL6VWogT35on85tZPIahrQrXjUz SjDhJXX4vWTh9Xl8+S5G5PaG4P49DKeIBAWH0Tb8PCoS3YumbWyx4G5d6u1z22VcBQlZqj XR8NDEY/02vgHCM2E5nvKAMFLINvAxusvDsIkQWJDKML/GaHGCE/MfVtlfYl7g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1717026933; a=rsa-sha256; cv=none; b=To6K4hXj5HF6wCEe/qoiKs8W/IibFkPTUQc+NF9ti8aqGn3n+0G5CKfiHzrlO1P87R3Dnp gY0hhMGilnEiiphkL00yf/ED464hBzFkx6AOA6omZ4K4TeMoy05pMP5Vf7EtPpaLAtE5eS ixPpJKxAT1Jj4U49L/8buUuwDH3pcPbxv9jvSkq58g2pOPPRZs9/N8VUkyAAwqMcFgEspA /2++Dlxuz7Toh6OBZXiq/R/NosUTyJOAUdfeYiCXDkEagfvtPgxnDTVlp6q9doA/SPe04P UbSqKL2cDxLZHcQms7hu9LyDnHOIsHutQZKFoTXgAqGq9h73cADzDAtu6/zipA== 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=1717026933; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZzW2fw8Ef+Dml2qnJeKN5YPnH45FaqQNuqtdRRjWM58=; b=EuvnLd8DWg5QlgJuxuzNADzLZ+Uic/4MuBZkAkj0tKMC0WA5X0xs8ySdu58u7PuCYqhRtk ca0G80NAGwdE6Gk+PJ3tHn96IoYLr1pRCVIZWXFo6E2g5S+HEZQM+0NscdHr27PX5B2dGA Mur3jS2+Uf2hdLBUphk8obt33lPIbyUpNmn6xdjtO/VMeDWpF/Lni3mcnGU7Tz7eiZ4jdB ZUrWuTMpOm6ulaqOugEDgtcGPlFaKDmABkSwFQb0BvfI3Xi582yY0dtsjDWcpFjFmfVKDA mj2owXjY6kKRyMwWYMFpJXaO+isBWNb7J34d1VjOjb11+Y8xydi2n9FtwaZEJw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VqR8j3YgXzH74; Wed, 29 May 2024 23:55: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 44TNtXPf043712; Wed, 29 May 2024 23:55:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44TNtXlc043709; Wed, 29 May 2024 23:55:33 GMT (envelope-from git) Date: Wed, 29 May 2024 23:55:33 GMT Message-Id: <202405292355.44TNtXlc043709@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mike Karels Subject: git: d2f1f71ec8c6 - main - pw userdel: destroy home dataset if empty List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: karels X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d2f1f71ec8c62dd26d6169d0d671a5aa5a933c1a Auto-Submitted: auto-generated The branch main has been updated by karels: URL: https://cgit.FreeBSD.org/src/commit/?id=d2f1f71ec8c62dd26d6169d0d671a5aa5a933c1a commit d2f1f71ec8c62dd26d6169d0d671a5aa5a933c1a Author: Mike Karels AuthorDate: 2024-05-29 23:55:14 +0000 Commit: Mike Karels CommitDate: 2024-05-29 23:55:14 +0000 pw userdel: destroy home dataset if empty When removing a user's home directory, if the directory is a ZFS dataset, it cannot be removed. If the directory has been emptied, use "zfs destroy" to destroy it. This complements the automatic dataset creation in adduser. Note that datasets within the directory and snapshots are not handled, as the complete path is not constructed. While here, add waitpid() calls to rmat() and pw_user_del(). Reviewed by: des Differential Revision: https://reviews.freebsd.org/D45348 --- usr.sbin/pw/pw.8 | 6 ++- usr.sbin/pw/pw_user.c | 15 ++++--- usr.sbin/pw/pwupd.h | 2 +- usr.sbin/pw/rm_r.c | 113 +++++++++++++++++++++++++++++++++++++++++++++----- 4 files changed, 118 insertions(+), 18 deletions(-) diff --git a/usr.sbin/pw/pw.8 b/usr.sbin/pw/pw.8 index 5d461fc6464e..5ba35c193811 100644 --- a/usr.sbin/pw/pw.8 +++ b/usr.sbin/pw/pw.8 @@ -741,6 +741,9 @@ Secondly, it will only remove files and directories that are actually owned by the user, or symbolic links owned by anyone under the user's home directory. Finally, after deleting all contents owned by the user only empty directories will be removed. +If the home directory is a ZFS dataset and has been emptied, +the dataset will be destroyed. +ZFS datasets within the home directory and snapshots are not handled. If any additional cleanup work is required, this is left to the administrator. .El .Pp @@ -1077,7 +1080,8 @@ No base home directory configured. .Xr passwd 5 , .Xr pw.conf 5 , .Xr pwd_mkdb 8 , -.Xr vipw 8 +.Xr vipw 8 , +.Xr zfs 8 .Sh HISTORY The .Nm diff --git a/usr.sbin/pw/pw_user.c b/usr.sbin/pw/pw_user.c index 89354b249935..d9fd8c77c13e 100644 --- a/usr.sbin/pw/pw_user.c +++ b/usr.sbin/pw/pw_user.c @@ -28,7 +28,7 @@ */ #include -#include +#include #include #include @@ -669,6 +669,7 @@ rmat(uid_t uid) while ((e = readdir(d)) != NULL) { struct stat st; + pid_t pid; if (strncmp(e->d_name, ".lock", 5) != 0 && stat(e->d_name, &st) == 0 && @@ -679,11 +680,12 @@ rmat(uid_t uid) e->d_name, NULL }; - if (posix_spawn(NULL, argv[0], NULL, NULL, + if (posix_spawn(&pid, argv[0], NULL, NULL, (char *const *) argv, environ)) { warn("Failed to execute '%s %s'", argv[0], argv[1]); - } + } else + (void) waitpid(pid, NULL, 0); } } closedir(d); @@ -919,11 +921,14 @@ pw_user_del(int argc, char **argv, char *arg1) "-r", NULL }; - if (posix_spawnp(NULL, argv[0], NULL, NULL, + pid_t pid; + + if (posix_spawnp(&pid, argv[0], NULL, NULL, (char *const *) argv, environ)) { warn("Failed to execute '%s %s'", argv[0], argv[1]); - } + } else + (void) waitpid(pid, NULL, 0); } } diff --git a/usr.sbin/pw/pwupd.h b/usr.sbin/pw/pwupd.h index d174a4a20200..262b044e07fc 100644 --- a/usr.sbin/pw/pwupd.h +++ b/usr.sbin/pw/pwupd.h @@ -139,7 +139,7 @@ void vendgrent(void); void copymkdir(int rootfd, char const * dir, int skelfd, mode_t mode, uid_t uid, gid_t gid, int flags); -void rm_r(int rootfd, char const * dir, uid_t uid); +bool rm_r(int rootfd, char const * dir, uid_t uid); __END_DECLS #endif /* !_PWUPD_H */ diff --git a/usr.sbin/pw/rm_r.c b/usr.sbin/pw/rm_r.c index 14218d68215b..f25da8ce6ad3 100644 --- a/usr.sbin/pw/rm_r.c +++ b/usr.sbin/pw/rm_r.c @@ -26,35 +26,58 @@ * SUCH DAMAGE. */ +#include +#include #include +#include #include +#include +#include #include +#include +#include +#include +#include +#include +#include #include #include #include "pwupd.h" -void +static bool try_dataset_remove(const char *home); +extern char **environ; + +/* + * "rm -r" a directory tree. If the top-level directory cannot be removed + * due to EBUSY, indicating that it is a ZFS dataset, and we have emptied + * it, destroy the dataset. Return true if any files or directories + * remain. + */ +bool rm_r(int rootfd, const char *path, uid_t uid) { int dirfd; DIR *d; struct dirent *e; struct stat st; + const char *fullpath; + bool skipped = false; + fullpath = path; if (*path == '/') path++; dirfd = openat(rootfd, path, O_DIRECTORY); if (dirfd == -1) { - return; + return (true); } d = fdopendir(dirfd); if (d == NULL) { (void)close(dirfd); - return; + return (true); } while ((e = readdir(d)) != NULL) { if (strcmp(e->d_name, ".") == 0 || strcmp(e->d_name, "..") == 0) @@ -62,16 +85,84 @@ rm_r(int rootfd, const char *path, uid_t uid) if (fstatat(dirfd, e->d_name, &st, AT_SYMLINK_NOFOLLOW) != 0) continue; - if (S_ISDIR(st.st_mode)) - rm_r(dirfd, e->d_name, uid); - else if (S_ISLNK(st.st_mode) || st.st_uid == uid) + if (S_ISDIR(st.st_mode)) { + if (rm_r(dirfd, e->d_name, uid) == true) + skipped = true; + } else if (S_ISLNK(st.st_mode) || st.st_uid == uid) unlinkat(dirfd, e->d_name, 0); + else + skipped = true; } closedir(d); if (fstatat(rootfd, path, &st, AT_SYMLINK_NOFOLLOW) != 0) - return; - if (S_ISLNK(st.st_mode)) - unlinkat(rootfd, path, 0); - else if (st.st_uid == uid) - unlinkat(rootfd, path, AT_REMOVEDIR); + return (skipped); + if (S_ISLNK(st.st_mode)) { + if (unlinkat(rootfd, path, 0) == -1) + skipped = true; + } else if (st.st_uid == uid) { + if (unlinkat(rootfd, path, AT_REMOVEDIR) == -1) { + if (errno == EBUSY && skipped == false) + skipped = try_dataset_remove(fullpath); + else + skipped = true; + } + } else + skipped = true; + + return (skipped); +} + +/* + * If the home directory is a ZFS dataset, attempt to destroy it. + * Return true if the dataset is not destroyed. + * This would be more straightforward as a shell script. + */ +static bool +try_dataset_remove(const char *path) +{ + bool skipped = true; + struct statfs stat; + const char *argv[] = { + "/sbin/zfs", + "destroy", + NULL, + NULL + }; + int status; + pid_t pid; + + /* see if this is an absolute path (top-level directory) */ + if (*path != '/') + return (skipped); + /* see if ZFS is loaded */ + if (kld_isloaded("zfs") == 0) + return (skipped); + /* This won't work if root dir is not / (-R option) */ + if (strcmp(conf.rootdir, "/") != 0) { + warnx("cannot destroy home dataset when -R was used"); + return (skipped); + } + /* if so, find dataset name */ + if (statfs(path, &stat) != 0) { + warn("statfs %s", path); + return (skipped); + } + /* + * Check that the path refers to the dataset itself, + * not a subdirectory. + */ + if (strcmp(stat.f_mntonname, path) != 0) + return (skipped); + argv[2] = stat.f_mntfromname; + if ((skipped = posix_spawn(&pid, argv[0], NULL, NULL, + (char *const *) argv, environ)) != 0) { + warn("Failed to execute '%s %s %s'", + argv[0], argv[1], argv[2]); + } else { + if (waitpid(pid, &status, 0) != -1 && status != 0) { + warnx("'%s %s %s' exit status %d\n", + argv[0], argv[1], argv[2], status); + } + } + return (skipped); } From nobody Thu May 30 01:42: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 4VqTXB4Vftz5Llkw; Thu, 30 May 2024 01:42: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 4VqTXB48LBz4KRR; Thu, 30 May 2024 01:42:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717033354; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SIJvlwm+oUvhcAyXeUZzrPPPP0uLrsepA/4kJVFhF7s=; b=JOXsXIn99E/MRAXD+9Ia0Rl7VOKnsor/h7mEpFxkJdgEwJUdbgkBo7ELuY8kKVM0IndNAe s8w8UZptn/FQFP2tZFwo+oXC2eat/cVyovNBKDzu2tX6JqFYNF5YuJPQ8tD54s2WcS91BB 4Zsr3moDWWsq1q42nrkbLY5xKHUh8hjlAs8Mn/NAhEK3WRcdaoek8Nd0amgrOENB0IUei1 DrIpXDsLz7IeuRocUNlHXgUYld3DYn5gx05RuezmohND1d0K85rJmtpzP5nRI3y723ZhdO NQlAd9xB614wWOQSdeMOOTmUvgJhiiijng7Tcwwad3mYbo4TIdgSUctQ//3Mng== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1717033354; a=rsa-sha256; cv=none; b=lpz6kYoRAkhYQkxENJMSGafxGMOw9Gt2AlNfI/I72Zai917BXb2h6BKQ3ta5rBCx4hxqbs DhEJyXadsHCIilr74zZwxERMgw4RcnYKyxc8ELBNvjH5Cdw73ucu9LeiitefSE9Lvh6Cn/ VUKlKjUH8BoDBgItky1tLriho0yAWGz65STMaOE9whxI2ahNvp7YRRcl7HE2WmWcAQ3JWb m2f1JGjxxp1AB4fkKcJ3rcqnu1f4qh+U4GuKsn7rIBKiieMl+Bg21RAloOjghExBWY13YJ wIqizPB5Wb+A/q1AG1+UsO+dvpa0atZd491mA2v6kpCUMr1AqAhacSY+YWK6hA== 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=1717033354; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SIJvlwm+oUvhcAyXeUZzrPPPP0uLrsepA/4kJVFhF7s=; b=CZMHUxvMxfA743CaphaJa/rV1lqWkZxYhK52rD+KIfxGFtg9CQdDaByXz6A8Ba0saTWAU1 Wpl6daznzBy7PXVzG46sDJS4CN1Vp6LYaEB1R2besIHWJwoxHVvq9LZpgTIekkIaTf4GOu 3g3oaNZYscstZ/TFzUs7R382EFl+cOF6sWPfJqBcAqH64zaPDN8lnFmBOUKP+TKJ6Wr4Qc HoJ4o5m6dTpvqqAqGr0UM1/pIJ22o/qqbovW/XTqtOPpcegULUIch6qUf964rkw1L4OvAk XRWIbTqGVEWOLslj2aTSXpNDvTDh15ikbxdhfNh+WWQQ9LMBap9PJnjj6W0T6Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VqTXB3lT5zLNr; Thu, 30 May 2024 01:42: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 44U1gYbi028806; Thu, 30 May 2024 01:42:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44U1gXTX028802; Thu, 30 May 2024 01:42:33 GMT (envelope-from git) Date: Thu, 30 May 2024 01:42:33 GMT Message-Id: <202405300142.44U1gXTX028802@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: f9b726163260 - stable/14 - ntp: Vendor import of ntp-4.2.8p18 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: f9b726163260d7428846865abc1d133a68197e09 Auto-Submitted: auto-generated The branch stable/14 has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=f9b726163260d7428846865abc1d133a68197e09 commit f9b726163260d7428846865abc1d133a68197e09 Author: Cy Schubert AuthorDate: 2024-05-27 01:41:22 +0000 Commit: Cy Schubert CommitDate: 2024-05-30 01:42:19 +0000 ntp: Vendor import of ntp-4.2.8p18 Merge commit '1f833b3fc9968c3dd7ed79ccf0525ebf16c891ad' into main (cherry picked from commit f5f40dd63bc7acbb5312b26ac1ea1103c12352a6) --- contrib/ntp/COPYRIGHT | 4 +- contrib/ntp/ChangeLog | 120 +- contrib/ntp/CommitLog | 3221 ++++ contrib/ntp/Makefile.am | 6 +- contrib/ntp/Makefile.in | 7 +- contrib/ntp/NEWS | 3902 ++++ contrib/ntp/adjtimed/Makefile.in | 13 +- contrib/ntp/check-libntp.mf | 10 +- contrib/ntp/check-libntpd.mf | 13 +- contrib/ntp/check-libunity.mf | 4 +- contrib/ntp/check-scm-rev.mf | 6 +- contrib/ntp/clockstuff/Makefile.in | 13 +- contrib/ntp/config.h.in | 44 +- contrib/ntp/configure | 2726 +-- contrib/ntp/configure.ac | 81 +- contrib/ntp/flock-build | 22 +- contrib/ntp/html/.datecheck | 0 contrib/ntp/html/clockopt.html | 9 +- contrib/ntp/html/copyright.html | 4 +- contrib/ntp/html/release.html | 2 +- contrib/ntp/include/Makefile.am | 1 + contrib/ntp/include/Makefile.in | 2 + contrib/ntp/include/c99_snprintf.h | 28 + contrib/ntp/include/isc/Makefile.in | 1 + contrib/ntp/include/lib_strbuf.h | 30 +- contrib/ntp/include/ntp.h | 73 +- contrib/ntp/include/ntp_config.h | 13 +- contrib/ntp/include/ntp_control.h | 2 +- contrib/ntp/include/ntp_lists.h | 4 +- contrib/ntp/include/ntp_md5.h | 25 +- contrib/ntp/include/ntp_net.h | 13 +- contrib/ntp/include/ntp_psl.h | 11 +- contrib/ntp/include/ntp_stdlib.h | 20 +- contrib/ntp/include/ntp_tty.h | 5 + contrib/ntp/include/ntp_types.h | 10 - contrib/ntp/include/ntpd.h | 80 +- contrib/ntp/include/vint64ops.h | 2 +- contrib/ntp/kernel/Makefile.in | 1 + contrib/ntp/kernel/sys/Makefile.in | 1 + contrib/ntp/libntp/Makefile.am | 1 - contrib/ntp/libntp/Makefile.in | 76 +- contrib/ntp/libntp/a_md5encrypt.c | 169 +- contrib/ntp/libntp/adjtime.c | 2 +- contrib/ntp/libntp/audio.c | 2 +- contrib/ntp/libntp/authkeys.c | 4 + contrib/ntp/libntp/authreadkeys.c | 12 +- contrib/ntp/libntp/bsd_strerror.c | 2 +- contrib/ntp/libntp/clocktypes.c | 1 - contrib/ntp/libntp/dofptoa.c | 2 - contrib/ntp/libntp/dolfptoa.c | 2 - contrib/ntp/libntp/humandate.c | 1 - contrib/ntp/libntp/lib/isc/win32/strerror.c | 64 +- contrib/ntp/libntp/lib_strbuf.c | 51 +- contrib/ntp/libntp/machines.c | 60 +- contrib/ntp/libntp/modetoa.c | 1 - contrib/ntp/libntp/msyslog.c | 6 +- contrib/ntp/libntp/netof.c | 24 +- contrib/ntp/libntp/ntp_calendar.c | 1 - contrib/ntp/libntp/ntp_intres.c | 6 - contrib/ntp/libntp/ntp_realpath.c | 43 +- contrib/ntp/libntp/numtoa.c | 64 +- contrib/ntp/libntp/numtohost.c | 43 - contrib/ntp/libntp/prettydate.c | 1 - contrib/ntp/libntp/recvbuff.c | 39 +- contrib/ntp/libntp/refnumtoa.c | 1 - contrib/ntp/libntp/snprintf.c | 2 +- contrib/ntp/libntp/socket.c | 16 +- contrib/ntp/libntp/socktoa.c | 1 - contrib/ntp/libntp/socktohost.c | 1 - contrib/ntp/libntp/ssl_init.c | 74 +- contrib/ntp/libntp/statestr.c | 1 - contrib/ntp/libntp/systime.c | 1 - contrib/ntp/libntp/timexsup.c | 22 +- contrib/ntp/libntp/uglydate.c | 1 - contrib/ntp/libntp/vint64ops.c | 21 +- contrib/ntp/libntp/work_thread.c | 17 +- contrib/ntp/libparse/Makefile.am | 15 +- contrib/ntp/libparse/Makefile.in | 30 +- contrib/ntp/libparse/clk_computime.c | 2 +- contrib/ntp/libparse/clk_dcf7000.c | 2 +- contrib/ntp/libparse/clk_hopf6021.c | 2 +- contrib/ntp/libparse/clk_meinberg.c | 2 +- contrib/ntp/libparse/clk_rawdcf.c | 2 +- contrib/ntp/libparse/clk_rcc8000.c | 2 +- contrib/ntp/libparse/clk_schmid.c | 2 +- contrib/ntp/libparse/clk_sel240x.c | 2 +- contrib/ntp/libparse/clk_trimtaip.c | 2 +- contrib/ntp/libparse/clk_trimtsip.c | 2 +- contrib/ntp/libparse/clk_varitext.c | 2 +- contrib/ntp/libparse/clk_wharton.c | 2 +- contrib/ntp/libparse/ieee754io.c | 25 +- contrib/ntp/libparse/parse.c | 2 +- contrib/ntp/libparse/parse_conf.c | 2 +- contrib/ntp/ntpd/Makefile.in | 20 +- contrib/ntp/ntpd/cmd_args.c | 18 +- contrib/ntp/ntpd/complete.conf.in | 43 +- contrib/ntp/ntpd/invoke-ntp.conf.texi | 99 +- contrib/ntp/ntpd/invoke-ntp.keys.texi | 2 +- contrib/ntp/ntpd/invoke-ntpd.texi | 4 +- contrib/ntp/ntpd/keyword-gen-utd | 2 +- contrib/ntp/ntpd/keyword-gen.c | 2 +- contrib/ntp/ntpd/ntp.conf.5man | 106 +- contrib/ntp/ntpd/ntp.conf.5mdoc | 106 +- contrib/ntp/ntpd/ntp.conf.def | 100 +- contrib/ntp/ntpd/ntp.conf.html | 102 +- contrib/ntp/ntpd/ntp.conf.man.in | 106 +- contrib/ntp/ntpd/ntp.conf.mdoc.in | 106 +- contrib/ntp/ntpd/ntp.keys.5man | 6 +- contrib/ntp/ntpd/ntp.keys.5mdoc | 6 +- contrib/ntp/ntpd/ntp.keys.html | 2 +- contrib/ntp/ntpd/ntp.keys.man.in | 6 +- contrib/ntp/ntpd/ntp.keys.mdoc.in | 6 +- contrib/ntp/ntpd/ntp_config.c | 696 +- contrib/ntp/ntpd/ntp_control.c | 68 +- contrib/ntp/ntpd/ntp_crypto.c | 134 +- contrib/ntp/ntpd/ntp_io.c | 927 +- contrib/ntp/ntpd/ntp_keyword.h | 2078 +-- contrib/ntp/ntpd/ntp_leapsec.c | 78 +- contrib/ntp/ntpd/ntp_loopfilter.c | 16 + contrib/ntp/ntpd/ntp_monitor.c | 21 +- contrib/ntp/ntpd/ntp_parser.c | 3279 ++-- contrib/ntp/ntpd/ntp_parser.h | 752 +- contrib/ntp/ntpd/ntp_peer.c | 202 +- contrib/ntp/ntpd/ntp_proto.c | 334 +- contrib/ntp/ntpd/ntp_refclock.c | 58 +- contrib/ntp/ntpd/ntp_request.c | 15 +- contrib/ntp/ntpd/ntp_restrict.c | 725 +- contrib/ntp/ntpd/ntp_scanner.c | 22 +- contrib/ntp/ntpd/ntp_timer.c | 303 +- contrib/ntp/ntpd/ntp_util.c | 249 +- contrib/ntp/ntpd/ntpd-opts.c | 20 +- contrib/ntp/ntpd/ntpd-opts.h | 8 +- contrib/ntp/ntpd/ntpd.1ntpdman | 6 +- contrib/ntp/ntpd/ntpd.1ntpdmdoc | 6 +- contrib/ntp/ntpd/ntpd.c | 101 +- contrib/ntp/ntpd/ntpd.html | 4 +- contrib/ntp/ntpd/ntpd.man.in | 6 +- contrib/ntp/ntpd/ntpd.mdoc.in | 6 +- contrib/ntp/ntpd/refclock_acts.c | 2 +- contrib/ntp/ntpd/refclock_arbiter.c | 2 +- contrib/ntp/ntpd/refclock_arc.c | 13 +- contrib/ntp/ntpd/refclock_as2201.c | 2 +- contrib/ntp/ntpd/refclock_atom.c | 2 +- contrib/ntp/ntpd/refclock_bancomm.c | 2 +- contrib/ntp/ntpd/refclock_chronolog.c | 2 +- contrib/ntp/ntpd/refclock_conf.c | 2 +- contrib/ntp/ntpd/refclock_dumbclock.c | 2 +- contrib/ntp/ntpd/refclock_fg.c | 2 +- contrib/ntp/ntpd/refclock_gpsvme.c | 2 +- contrib/ntp/ntpd/refclock_heath.c | 2 +- contrib/ntp/ntpd/refclock_hopfpci.c | 2 +- contrib/ntp/ntpd/refclock_hopfser.c | 2 +- contrib/ntp/ntpd/refclock_hpgps.c | 2 +- contrib/ntp/ntpd/refclock_irig.c | 2 +- contrib/ntp/ntpd/refclock_jjy.c | 2 +- contrib/ntp/ntpd/refclock_jupiter.c | 2 +- contrib/ntp/ntpd/refclock_local.c | 2 +- contrib/ntp/ntpd/refclock_mx4200.c | 2 +- contrib/ntp/ntpd/refclock_neoclock4x.c | 2 +- contrib/ntp/ntpd/refclock_nmea.c | 2 + contrib/ntp/ntpd/refclock_oncore.c | 2 +- contrib/ntp/ntpd/refclock_palisade.c | 2 +- contrib/ntp/ntpd/refclock_pcf.c | 2 +- contrib/ntp/ntpd/refclock_pst.c | 2 +- contrib/ntp/ntpd/refclock_ripencc.c | 2 +- contrib/ntp/ntpd/refclock_tpro.c | 2 +- contrib/ntp/ntpd/refclock_true.c | 2 +- contrib/ntp/ntpd/refclock_tsyncpci.c | 2 +- contrib/ntp/ntpd/refclock_tt560.c | 2 +- contrib/ntp/ntpd/refclock_ulink.c | 2 +- contrib/ntp/ntpd/refclock_wwv.c | 2 +- contrib/ntp/ntpd/refclock_wwvb.c | 2 +- contrib/ntp/ntpd/refclock_zyfer.c | 2 +- contrib/ntp/ntpdate/Makefile.in | 18 +- contrib/ntp/ntpdc/Makefile.in | 18 +- contrib/ntp/ntpdc/invoke-ntpdc.texi | 4 +- contrib/ntp/ntpdc/nl.pl | 1 + contrib/ntp/ntpdc/nl.pl.in | 1 + contrib/ntp/ntpdc/ntpdc-opts.c | 20 +- contrib/ntp/ntpdc/ntpdc-opts.h | 8 +- contrib/ntp/ntpdc/ntpdc.1ntpdcman | 6 +- contrib/ntp/ntpdc/ntpdc.1ntpdcmdoc | 6 +- contrib/ntp/ntpdc/ntpdc.html | 4 +- contrib/ntp/ntpdc/ntpdc.man.in | 6 +- contrib/ntp/ntpdc/ntpdc.mdoc.in | 6 +- contrib/ntp/ntpq/Makefile.in | 18 +- contrib/ntp/ntpq/invoke-ntpq.texi | 4 +- contrib/ntp/ntpq/ntpq-opts.c | 20 +- contrib/ntp/ntpq/ntpq-opts.h | 8 +- contrib/ntp/ntpq/ntpq-subs.c | 41 +- contrib/ntp/ntpq/ntpq.1ntpqman | 6 +- contrib/ntp/ntpq/ntpq.1ntpqmdoc | 6 +- contrib/ntp/ntpq/ntpq.c | 25 +- contrib/ntp/ntpq/ntpq.h | 1 - contrib/ntp/ntpq/ntpq.html | 4 +- contrib/ntp/ntpq/ntpq.man.in | 6 +- contrib/ntp/ntpq/ntpq.mdoc.in | 6 +- contrib/ntp/ntpsnmpd/Makefile.am | 8 +- contrib/ntp/ntpsnmpd/Makefile.in | 22 +- contrib/ntp/ntpsnmpd/invoke-ntpsnmpd.texi | 4 +- contrib/ntp/ntpsnmpd/netsnmp_daemonize.c | 18 +- contrib/ntp/ntpsnmpd/ntpsnmpd-opts.c | 20 +- contrib/ntp/ntpsnmpd/ntpsnmpd-opts.h | 8 +- contrib/ntp/ntpsnmpd/ntpsnmpd.1ntpsnmpdman | 6 +- contrib/ntp/ntpsnmpd/ntpsnmpd.1ntpsnmpdmdoc | 6 +- contrib/ntp/ntpsnmpd/ntpsnmpd.html | 2 +- contrib/ntp/ntpsnmpd/ntpsnmpd.man.in | 6 +- contrib/ntp/ntpsnmpd/ntpsnmpd.mdoc.in | 6 +- contrib/ntp/packageinfo.sh | 4 +- contrib/ntp/parseutil/Makefile.in | 1 + contrib/ntp/scripts/Makefile.in | 1 + contrib/ntp/scripts/build/Makefile.in | 1 + contrib/ntp/scripts/build/checkHtmlFileDates | 24 +- contrib/ntp/scripts/build/genAuthors.in | 1 + contrib/ntp/scripts/build/mkver.in | 2 + contrib/ntp/scripts/calc_tickadj/Makefile.in | 1 + .../calc_tickadj/calc_tickadj.1calc_tickadjman | 4 +- .../calc_tickadj/calc_tickadj.1calc_tickadjmdoc | 4 +- contrib/ntp/scripts/calc_tickadj/calc_tickadj.html | 2 +- contrib/ntp/scripts/calc_tickadj/calc_tickadj.in | 1 + .../ntp/scripts/calc_tickadj/calc_tickadj.man.in | 4 +- .../ntp/scripts/calc_tickadj/calc_tickadj.mdoc.in | 4 +- .../scripts/calc_tickadj/invoke-calc_tickadj.texi | 2 +- contrib/ntp/scripts/invoke-plot_summary.texi | 4 +- contrib/ntp/scripts/invoke-summary.texi | 4 +- contrib/ntp/scripts/lib/Makefile.in | 1 + contrib/ntp/scripts/ntp-wait/Makefile.in | 1 + contrib/ntp/scripts/ntp-wait/invoke-ntp-wait.texi | 4 +- contrib/ntp/scripts/ntp-wait/ntp-wait-opts | 4 +- contrib/ntp/scripts/ntp-wait/ntp-wait.1ntp-waitman | 4 +- .../ntp/scripts/ntp-wait/ntp-wait.1ntp-waitmdoc | 4 +- contrib/ntp/scripts/ntp-wait/ntp-wait.html | 4 +- contrib/ntp/scripts/ntp-wait/ntp-wait.in | 1 + contrib/ntp/scripts/ntp-wait/ntp-wait.man.in | 4 +- contrib/ntp/scripts/ntp-wait/ntp-wait.mdoc.in | 4 +- contrib/ntp/scripts/ntpsweep/Makefile.in | 1 + contrib/ntp/scripts/ntpsweep/invoke-ntpsweep.texi | 4 +- contrib/ntp/scripts/ntpsweep/ntpsweep-opts | 4 +- contrib/ntp/scripts/ntpsweep/ntpsweep.1ntpsweepman | 4 +- .../ntp/scripts/ntpsweep/ntpsweep.1ntpsweepmdoc | 4 +- contrib/ntp/scripts/ntpsweep/ntpsweep.html | 4 +- contrib/ntp/scripts/ntpsweep/ntpsweep.in | 1 + contrib/ntp/scripts/ntpsweep/ntpsweep.man.in | 4 +- contrib/ntp/scripts/ntpsweep/ntpsweep.mdoc.in | 4 +- contrib/ntp/scripts/ntptrace/Makefile.in | 1 + contrib/ntp/scripts/ntptrace/invoke-ntptrace.texi | 4 +- contrib/ntp/scripts/ntptrace/ntptrace-opts | 4 +- contrib/ntp/scripts/ntptrace/ntptrace.1ntptraceman | 4 +- .../ntp/scripts/ntptrace/ntptrace.1ntptracemdoc | 4 +- contrib/ntp/scripts/ntptrace/ntptrace.html | 4 +- contrib/ntp/scripts/ntptrace/ntptrace.in | 11 + contrib/ntp/scripts/ntptrace/ntptrace.man.in | 4 +- contrib/ntp/scripts/ntptrace/ntptrace.mdoc.in | 4 +- contrib/ntp/scripts/ntpver.in | 3 +- contrib/ntp/scripts/plot_summary-opts | 4 +- contrib/ntp/scripts/plot_summary.1plot_summaryman | 4 +- contrib/ntp/scripts/plot_summary.1plot_summarymdoc | 4 +- contrib/ntp/scripts/plot_summary.html | 4 +- contrib/ntp/scripts/plot_summary.in | 1 + contrib/ntp/scripts/plot_summary.man.in | 4 +- contrib/ntp/scripts/plot_summary.mdoc.in | 4 +- contrib/ntp/scripts/summary-opts | 4 +- contrib/ntp/scripts/summary.1summaryman | 4 +- contrib/ntp/scripts/summary.1summarymdoc | 4 +- contrib/ntp/scripts/summary.html | 4 +- contrib/ntp/scripts/summary.in | 1 + contrib/ntp/scripts/summary.man.in | 4 +- contrib/ntp/scripts/summary.mdoc.in | 4 +- contrib/ntp/scripts/update-leap/Makefile.in | 1 + .../scripts/update-leap/invoke-update-leap.texi | 2 +- contrib/ntp/scripts/update-leap/update-leap-opts | 4 +- .../update-leap/update-leap.1update-leapman | 4 +- .../update-leap/update-leap.1update-leapmdoc | 4 +- contrib/ntp/scripts/update-leap/update-leap.html | 2 +- contrib/ntp/scripts/update-leap/update-leap.in | 1 + contrib/ntp/scripts/update-leap/update-leap.man.in | 4 +- .../ntp/scripts/update-leap/update-leap.mdoc.in | 4 +- contrib/ntp/sntp/COPYRIGHT | 4 +- contrib/ntp/sntp/Makefile.am | 3 +- contrib/ntp/sntp/Makefile.in | 17 +- contrib/ntp/sntp/aclocal.m4 | 1 + contrib/ntp/sntp/check-libntp.mf | 10 +- contrib/ntp/sntp/check-libsntp.mf | 8 +- contrib/ntp/sntp/check-libunity.mf | 3 +- contrib/ntp/sntp/config.h.in | 41 +- contrib/ntp/sntp/configure | 18356 ++++++++++--------- contrib/ntp/sntp/configure.ac | 8 +- contrib/ntp/sntp/crypto.c | 72 +- contrib/ntp/sntp/crypto.h | 15 +- contrib/ntp/sntp/include/Makefile.in | 2 + contrib/ntp/sntp/include/copyright.def | 2 +- contrib/ntp/sntp/include/version.def | 2 +- contrib/ntp/sntp/include/version.texi | 6 +- contrib/ntp/sntp/invoke-sntp.texi | 4 +- contrib/ntp/sntp/libevent/Makefile.in | 3 + contrib/ntp/sntp/libevent/configure | 8 +- contrib/ntp/sntp/libevent/configure.ac | 7 +- contrib/ntp/sntp/libevent/kqueue.c | 2 +- contrib/ntp/sntp/libevent/m4/acx_pthread.m4 | 2 +- contrib/ntp/sntp/libopts/Makefile.am | 4 +- contrib/ntp/sntp/libopts/Makefile.in | 23 +- contrib/ntp/sntp/m4/ntp_compiler.m4 | 68 +- contrib/ntp/sntp/m4/ntp_crypto_rand.m4 | 37 +- contrib/ntp/sntp/m4/ntp_facilitynames.m4 | 33 +- contrib/ntp/sntp/m4/ntp_libevent.m4 | 10 +- contrib/ntp/sntp/m4/ntp_libntp.m4 | 89 +- contrib/ntp/sntp/m4/ntp_openssl.m4 | 827 +- contrib/ntp/sntp/m4/version.m4 | 2 +- contrib/ntp/sntp/main.c | 20 +- contrib/ntp/sntp/scm-rev | 2 +- contrib/ntp/sntp/scripts/Makefile.in | 2 + contrib/ntp/sntp/scripts/cvo.sh | 8 +- contrib/ntp/sntp/sntp-opts.c | 20 +- contrib/ntp/sntp/sntp-opts.h | 8 +- contrib/ntp/sntp/sntp.1sntpman | 6 +- contrib/ntp/sntp/sntp.1sntpmdoc | 6 +- contrib/ntp/sntp/sntp.html | 4 +- contrib/ntp/sntp/sntp.man.in | 6 +- contrib/ntp/sntp/sntp.mdoc.in | 6 +- contrib/ntp/sntp/tests/Makefile.in | 23 +- contrib/ntp/sntp/tests/crypto.c | 235 +- contrib/ntp/sntp/tests/fileHandlingTest.h.in | 8 +- contrib/ntp/sntp/tests/packetHandling.c | 50 +- contrib/ntp/sntp/tests/packetProcessing.c | 168 +- contrib/ntp/sntp/tests/run-crypto.c | 20 +- contrib/ntp/sntp/tests/run-packetProcessing.c | 40 +- contrib/ntp/sntp/unity/Makefile.in | 2 + contrib/ntp/sntp/unity/unity_internals.h | 10 +- contrib/ntp/sntp/utilities.h | 1 - contrib/ntp/tests/libntp/data/ntp.keys | 23 +- contrib/ntp/tests/libntp/digests.c | 125 +- contrib/ntp/tests/libntp/run-digests.c | 6 + contrib/ntp/util/Makefile.am | 4 +- contrib/ntp/util/Makefile.in | 62 +- contrib/ntp/util/invoke-ntp-keygen.texi | 4 +- contrib/ntp/util/lsf-times.c | 220 + contrib/ntp/util/ntp-keygen-opts.c | 20 +- contrib/ntp/util/ntp-keygen-opts.h | 8 +- contrib/ntp/util/ntp-keygen.1ntp-keygenman | 6 +- contrib/ntp/util/ntp-keygen.1ntp-keygenmdoc | 6 +- contrib/ntp/util/ntp-keygen.c | 55 +- contrib/ntp/util/ntp-keygen.html | 4 +- contrib/ntp/util/ntp-keygen.man.in | 6 +- contrib/ntp/util/ntp-keygen.mdoc.in | 6 +- usr.sbin/ntp/config.h | 545 +- usr.sbin/ntp/libntp/Makefile | 2 +- usr.sbin/ntp/ntpd/Makefile | 4 +- usr.sbin/ntp/ntpdate/Makefile | 4 +- usr.sbin/ntp/ntpdc/Makefile | 4 +- usr.sbin/ntp/ntpq/Makefile | 4 +- usr.sbin/ntp/sntp/Makefile | 4 +- 351 files changed, 26986 insertions(+), 17542 deletions(-) diff --git a/contrib/ntp/COPYRIGHT b/contrib/ntp/COPYRIGHT index 013202c0fb09..0cb57168ebfc 100644 --- a/contrib/ntp/COPYRIGHT +++ b/contrib/ntp/COPYRIGHT @@ -3,7 +3,7 @@ This file is automatically generated from html/copyright.html jpg "Clone me," says Dolly sheepishly. - Last update: 2-Mar-2023 05:21 UTC + Last update: 7-Jan-2024 00:29 UTC __________________________________________________________________ The following copyright notice applies to all files collectively called @@ -32,7 +32,7 @@ This file is automatically generated from html/copyright.html Hart, Danny Mayer, Martin Burnicki, and possibly others is: *********************************************************************** * * -* Copyright (c) Network Time Foundation 2011-2023 * +* Copyright (c) Network Time Foundation 2011-2024 * * * * All Rights Reserved * * * diff --git a/contrib/ntp/ChangeLog b/contrib/ntp/ChangeLog index 93cdab8b94eb..f4a196aa57cd 100644 --- a/contrib/ntp/ChangeLog +++ b/contrib/ntp/ChangeLog @@ -1,3 +1,121 @@ +--- +(4.2.8p18) 2024/05/25 Released by Harlan Stenn + +* [Bug 3918] Tweak openssl header/library handling. +* [Bug 3914] Spurious "Unexpected origin timestamp" logged after time + stepped. +* [Bug 3913] Avoid duplicate IPv6 link-local manycast associations. + +* [Bug 3912] Avoid rare math errors in ntptrace. +* [Bug 3910] Memory leak using openssl-3 +* [Bug 3909] Do not select multicast local address for unicast peer. + +* [Bug 3903] lib/isc/win32/strerror.c NTstrerror() is not thread-safe. + +* [Bug 3901] LIB_GETBUF isn't thread-safe. +* [Bug 3900] fast_xmit() selects wrong local addr responding to mcast on + Windows. +* [Bug 3888] ntpd with multiple same-subnet IPs using manycastclient creates + duplicate associations. +* [Bug 3872] Ignore restrict mask for hostname. +* [Bug 3871] 4.2.8p17 build without hopf6021 refclock enabled fails. + Reported by Hans Mayer. Moved NONEMPTY_TRANSLATION_UNIT + declaration from ntp_types.h to config.h. +* [Bug 3870] Server drops client packets with ppoll < 4. +* [Bug 3869] Remove long-gone "calldelay" & "crypto sign" from docs. + Reported by PoolMUC@web.de. +* [Bug 3868] Cannot restrict a pool peer. Thanks to + Edward McGuire for tracking down the deficiency. +* [Bug 3864] ntpd IPv6 refid different for big-endian and little-endian. + +* [Bug 3859] Use NotifyIpInterfaceChange on Windows ntpd. +* [Bug 3856] Enable Edit & Continue debugging with Visual Studio. + +* [Bug 3855] ntpq lacks an equivalent to ntpdc's delrestrict. +* [Bug 3854] ntpd 4.2.8p17 corrupts rawstats file with space in refid. + +* [Bug 3853] Clean up warnings with modern compilers. +* [Bug 3852] check-libntp.mf and friends are not triggering rebuilds as + intended. +* [Bug 3851] Drop pool server when no local address can reach it. + +* [Bug 3850] ntpq -c apeers breaks column formatting s2 w/refclock refid. + +* [Bug 3849] ntpd --wait-sync times out. +* [Bug 3847] SSL detection in configure should run-test if runpath is needed. + +* [Bug 3846] Use -Wno-format-truncation by default. +* [Bug 3845] accelerate pool clock_sync when IPv6 has only link-local access. + +* [Bug 3842] Windows ntpd PPSAPI DLL load failure crashes. +* [Bug 3841] 4.2.8p17 build break w/ gcc 12 -Wformat-security without -Wformat + Need to remove --Wformat-security when removing -Wformat to + silence numerous libopts warnings. +* [Bug 3837] NULL pointer deref crash when ntpd deletes last interface. + Reported by renmingshuai. Correct UNLINK_EXPR_SLIST() when the + list is empty. +* [Bug 3835] NTP_HARD_*FLAGS not used by libevent tearoff. +* [Bug 3831] pollskewlist zeroed on runtime configuration. +* [Bug 3830] configure libevent check intersperses output with answer. +* [Bug 3828] BK should ignore a git repo in the same directory. + +* [Bug 3827] Fix build in case CLOCK_HOPF6021 or CLOCK_WHARTON_400A + is disabled. +* [Bug 3825] Don't touch HTML files unless building inside a BK repo. + Fix the script checkHtmlFileDates. +* [Bug 3756] Improve OpenSSL library/header detection. +* [Bug 3753] ntpd fails to start with FIPS-enabled OpenSSL 3. +* [Bug 2734] TEST3 prevents initial interleave sync. Fix from +* Log failures to allocate receive buffers. +* Remove extraneous */ from libparse/ieee754io.c +* Fix .datecheck target line in Makefile.am. +* Update the copyright year. +* Update ntp.conf documentation to add "delrestrict" and correct information + about KoD rate limiting. +* html/clockopt.html cleanup. +* util/lsf-times - added. +* Add DSA, DSA-SHA, and SHA to tests/libntp/digests.c. +* Provide ntpd thread names to debugger on Windows. +* Remove dead code libntp/numtohost.c and its unit tests. +* Remove class A, B, C IPv4 distinctions in netof(). +* Use @configure_input@ in various *.in files to include a comment that + the file is generated from another pointing to the *.in. +* Correct underquoting, indents in ntp_facilitynames.m4. +* Clean up a few warnings seen building with older gcc. +* Fix build on older FreeBSD lacking sys/procctl.h. +* Disable [Bug 3627] workaround on newer FreeBSD which has the kernel fix + that makes it unnecessary, re-enabling ASLR stack gap. +* Use NONEMPTY_COMPILATION_UNIT in more conditionally-compiled files. +* Remove useless pointer to Windows Help from system error messages. +* Avoid newlines within Windows error messages. +* Ensure unique association IDs if wrapped. +* Simplify calc_addr_distance(). +* Clamp min/maxpoll in edge cases in newpeer(). +* Quiet local addr change logging when unpeering. +* Correct missing arg for %s printf specifier in + send_blocking_resp_internal(). +* Suppress OpenSSL 3 deprecation warning clutter. +* Correct OpenSSL usage in Autokey code to avoid warnings about + discarding const qualifiers with OpenSSL 3. +* Display KoD refid as text in recently added message. +* Avoid running checkHtmlFileDates script repeatedly when no html/*.html + files have changed. +* Abort configure if --enable-crypto-rand given & unavailable. +* Add configure --enable-verbose-ssl to trace SSL detection. +* Add build test coverage for --disable-saveconfig to flock-build script. + +* Remove deprecated configure --with-arlib option. +* Remove configure support for ISC UNIX ca. 1998. +* Move NTP_OPENSSL and NTP_CRYPTO_RAND invocations from configure.ac files + to NTP_LIBNTP. +* Remove dead code: HAVE_U_INT32_ONLY_WITH_DNS. +* Eliminate [v]snprintf redefinition warnings on macOS. +* Fix clang 14 cast increases alignment warning on Linux. +* Move ENABLE_CMAC to ntp_openssl.m4, reviving sntp/tests CMAC unit tests. + +* Use NTP_HARD_CPPFLAGS in libopts tearoff. +* wire in --enable-build-framework-help + --- (4.2.8p17) 2023/06/06 Released by Harlan Stenn @@ -10,7 +128,7 @@ Miroslav Lichvar and Matt for rapid testing and identifying the problem. * Add tests/libntp/digests.c to catch regressions reading keys file or with - symmetric authentication digest output. + symmetric authentication digest output. --- (4.2.8p16) 2023/05/31 Released by Harlan Stenn diff --git a/contrib/ntp/CommitLog b/contrib/ntp/CommitLog index adeda2c60402..49952cfaef0d 100644 --- a/contrib/ntp/CommitLog +++ b/contrib/ntp/CommitLog @@ -1,3 +1,3224 @@ +ChangeSet@1.4062, 2024-05-25 00:06:49-07:00, ntpreleng@ntp-build.tal1.ntfo.org + NTP_4_2_8P18 + TAG: NTP_4_2_8P18 + + ChangeLog@1.2103 +1 -0 + NTP_4_2_8P18 + + ntpd/invoke-ntp.conf.texi@1.231 +1 -1 + NTP_4_2_8P18 + + ntpd/invoke-ntp.keys.texi@1.214 +1 -1 + NTP_4_2_8P18 + + ntpd/invoke-ntpd.texi@1.528 +2 -2 + NTP_4_2_8P18 + + ntpd/ntp.conf.5man@1.265 +2 -2 + NTP_4_2_8P18 + + ntpd/ntp.conf.5mdoc@1.265 +2 -2 + NTP_4_2_8P18 + + ntpd/ntp.conf.html@1.213 +1 -1 + NTP_4_2_8P18 + + ntpd/ntp.conf.man.in@1.265 +2 -2 + NTP_4_2_8P18 + + ntpd/ntp.conf.mdoc.in@1.265 +2 -2 + NTP_4_2_8P18 + + ntpd/ntp.keys.5man@1.248 +2 -2 + NTP_4_2_8P18 + + ntpd/ntp.keys.5mdoc@1.248 +2 -2 + NTP_4_2_8P18 + + ntpd/ntp.keys.html@1.208 +1 -1 + NTP_4_2_8P18 + + ntpd/ntp.keys.man.in@1.248 +2 -2 + NTP_4_2_8P18 + + ntpd/ntp.keys.mdoc.in@1.248 +2 -2 + NTP_4_2_8P18 + + ntpd/ntpd-opts.c@1.553 +245 -245 + NTP_4_2_8P18 + + ntpd/ntpd-opts.h@1.552 +3 -3 + NTP_4_2_8P18 + + ntpd/ntpd.1ntpdman@1.357 +2 -2 + NTP_4_2_8P18 + + ntpd/ntpd.1ntpdmdoc@1.357 +2 -2 + NTP_4_2_8P18 + + ntpd/ntpd.html@1.202 +2 -2 + NTP_4_2_8P18 + + ntpd/ntpd.man.in@1.357 +2 -2 + NTP_4_2_8P18 + + ntpd/ntpd.mdoc.in@1.357 +2 -2 + NTP_4_2_8P18 + + ntpdc/invoke-ntpdc.texi@1.527 +2 -2 + NTP_4_2_8P18 + + ntpdc/ntpdc-opts.c@1.548 +113 -113 + NTP_4_2_8P18 + + ntpdc/ntpdc-opts.h@1.547 +3 -3 + NTP_4_2_8P18 + + ntpdc/ntpdc.1ntpdcman@1.358 +2 -2 + NTP_4_2_8P18 + + ntpdc/ntpdc.1ntpdcmdoc@1.358 +2 -2 + NTP_4_2_8P18 + + ntpdc/ntpdc.html@1.372 +2 -2 + NTP_4_2_8P18 + + ntpdc/ntpdc.man.in@1.358 +2 -2 + NTP_4_2_8P18 + + ntpdc/ntpdc.mdoc.in@1.358 +2 -2 + NTP_4_2_8P18 + + ntpq/invoke-ntpq.texi@1.537 +2 -2 + NTP_4_2_8P18 + + ntpq/ntpq-opts.c@1.557 +120 -120 + NTP_4_2_8P18 + + ntpq/ntpq-opts.h@1.555 +3 -3 + NTP_4_2_8P18 + + ntpq/ntpq.1ntpqman@1.365 +2 -2 + NTP_4_2_8P18 + + ntpq/ntpq.1ntpqmdoc@1.365 +2 -2 + NTP_4_2_8P18 + + ntpq/ntpq.html@1.202 +2 -2 + NTP_4_2_8P18 + + ntpq/ntpq.man.in@1.365 +2 -2 + NTP_4_2_8P18 + + ntpq/ntpq.mdoc.in@1.365 +2 -2 + NTP_4_2_8P18 + + ntpsnmpd/invoke-ntpsnmpd.texi@1.527 +2 -2 + NTP_4_2_8P18 + + ntpsnmpd/ntpsnmpd-opts.c@1.548 +68 -68 + NTP_4_2_8P18 + + ntpsnmpd/ntpsnmpd-opts.h@1.547 +3 -3 + NTP_4_2_8P18 + + ntpsnmpd/ntpsnmpd.1ntpsnmpdman@1.356 +2 -2 + NTP_4_2_8P18 + + ntpsnmpd/ntpsnmpd.1ntpsnmpdmdoc@1.356 +2 -2 + NTP_4_2_8P18 + + ntpsnmpd/ntpsnmpd.html@1.194 +1 -1 + NTP_4_2_8P18 + + ntpsnmpd/ntpsnmpd.man.in@1.356 +2 -2 + NTP_4_2_8P18 + + ntpsnmpd/ntpsnmpd.mdoc.in@1.356 +2 -2 + NTP_4_2_8P18 + + packageinfo.sh@1.553 +2 -2 + NTP_4_2_8P18 + + scripts/calc_tickadj/calc_tickadj.1calc_tickadjman@1.117 +2 -2 + NTP_4_2_8P18 + + scripts/calc_tickadj/calc_tickadj.1calc_tickadjmdoc@1.119 +2 -2 + NTP_4_2_8P18 + + scripts/calc_tickadj/calc_tickadj.html@1.118 +1 -1 + NTP_4_2_8P18 + + scripts/calc_tickadj/calc_tickadj.man.in@1.116 +2 -2 + NTP_4_2_8P18 + + scripts/calc_tickadj/calc_tickadj.mdoc.in@1.119 +2 -2 + NTP_4_2_8P18 + + scripts/calc_tickadj/invoke-calc_tickadj.texi@1.121 +1 -1 + NTP_4_2_8P18 + + scripts/invoke-plot_summary.texi@1.139 +2 -2 + NTP_4_2_8P18 + + scripts/invoke-summary.texi@1.138 +2 -2 + NTP_4_2_8P18 + + scripts/ntp-wait/invoke-ntp-wait.texi@1.350 +2 -2 + NTP_4_2_8P18 + + scripts/ntp-wait/ntp-wait-opts@1.86 +2 -2 + NTP_4_2_8P18 + + scripts/ntp-wait/ntp-wait.1ntp-waitman@1.345 +2 -2 + NTP_4_2_8P18 + + scripts/ntp-wait/ntp-wait.1ntp-waitmdoc@1.347 +2 -2 + NTP_4_2_8P18 + + scripts/ntp-wait/ntp-wait.html@1.366 +2 -2 + NTP_4_2_8P18 + + scripts/ntp-wait/ntp-wait.man.in@1.345 +2 -2 + NTP_4_2_8P18 + + scripts/ntp-wait/ntp-wait.mdoc.in@1.347 +2 -2 + NTP_4_2_8P18 + + scripts/ntpsweep/invoke-ntpsweep.texi@1.136 +2 -2 + NTP_4_2_8P18 + + scripts/ntpsweep/ntpsweep-opts@1.89 +2 -2 + NTP_4_2_8P18 + + scripts/ntpsweep/ntpsweep.1ntpsweepman@1.124 +2 -2 + NTP_4_2_8P18 + + scripts/ntpsweep/ntpsweep.1ntpsweepmdoc@1.124 +2 -2 + NTP_4_2_8P18 + + scripts/ntpsweep/ntpsweep.html@1.138 +2 -2 + NTP_4_2_8P18 + + scripts/ntpsweep/ntpsweep.man.in@1.124 +2 -2 + NTP_4_2_8P18 + + scripts/ntpsweep/ntpsweep.mdoc.in@1.125 +2 -2 + NTP_4_2_8P18 + + scripts/ntptrace/invoke-ntptrace.texi@1.139 +2 -2 + NTP_4_2_8P18 + + scripts/ntptrace/ntptrace-opts@1.89 +2 -2 + NTP_4_2_8P18 + + scripts/ntptrace/ntptrace.1ntptraceman@1.124 +2 -2 + NTP_4_2_8P18 + + scripts/ntptrace/ntptrace.1ntptracemdoc@1.126 +2 -2 + NTP_4_2_8P18 + + scripts/ntptrace/ntptrace.html@1.139 +2 -2 + NTP_4_2_8P18 + + scripts/ntptrace/ntptrace.man.in@1.124 +2 -2 + NTP_4_2_8P18 + + scripts/ntptrace/ntptrace.mdoc.in@1.127 +2 -2 + NTP_4_2_8P18 + + scripts/plot_summary-opts@1.90 +2 -2 + NTP_4_2_8P18 + + scripts/plot_summary.1plot_summaryman@1.137 +2 -2 + NTP_4_2_8P18 + + scripts/plot_summary.1plot_summarymdoc@1.137 +2 -2 + NTP_4_2_8P18 + + scripts/plot_summary.html@1.141 +2 -2 + NTP_4_2_8P18 + + scripts/plot_summary.man.in@1.137 +2 -2 + NTP_4_2_8P18 + + scripts/plot_summary.mdoc.in@1.137 +2 -2 + NTP_4_2_8P18 + + scripts/summary-opts@1.89 +2 -2 + NTP_4_2_8P18 + + scripts/summary.1summaryman@1.136 +2 -2 + NTP_4_2_8P18 + + scripts/summary.1summarymdoc@1.136 +2 -2 + NTP_4_2_8P18 + + scripts/summary.html@1.140 +2 -2 + NTP_4_2_8P18 + + scripts/summary.man.in@1.136 +2 -2 + NTP_4_2_8P18 + + scripts/summary.mdoc.in@1.136 +2 -2 + NTP_4_2_8P18 + + scripts/update-leap/invoke-update-leap.texi@1.37 +1 -1 + NTP_4_2_8P18 + + scripts/update-leap/update-leap-opts@1.39 +2 -2 + NTP_4_2_8P18 + + scripts/update-leap/update-leap.1update-leapman@1.37 +2 -2 + NTP_4_2_8P18 + + scripts/update-leap/update-leap.1update-leapmdoc@1.38 +2 -2 + NTP_4_2_8P18 + + scripts/update-leap/update-leap.html@1.37 +1 -1 + NTP_4_2_8P18 + + scripts/update-leap/update-leap.man.in@1.37 +2 -2 + NTP_4_2_8P18 + + scripts/update-leap/update-leap.mdoc.in@1.38 +2 -2 + NTP_4_2_8P18 + + sntp/invoke-sntp.texi@1.527 +2 -2 + NTP_4_2_8P18 + + sntp/sntp-opts.c@1.549 +161 -161 + NTP_4_2_8P18 + + sntp/sntp-opts.h@1.547 +3 -3 + NTP_4_2_8P18 + + sntp/sntp.1sntpman@1.362 +2 -2 + NTP_4_2_8P18 + + sntp/sntp.1sntpmdoc@1.362 +2 -2 + NTP_4_2_8P18 + + sntp/sntp.html@1.543 +2 -2 + NTP_4_2_8P18 + + sntp/sntp.man.in@1.362 +2 -2 + NTP_4_2_8P18 + + sntp/sntp.mdoc.in@1.362 +2 -2 + NTP_4_2_8P18 + + util/invoke-ntp-keygen.texi@1.530 +2 -2 + NTP_4_2_8P18 + + util/ntp-keygen-opts.c@1.551 +174 -174 + NTP_4_2_8P18 + + util/ntp-keygen-opts.h@1.549 +3 -3 + NTP_4_2_8P18 + + util/ntp-keygen.1ntp-keygenman@1.358 +2 -2 + NTP_4_2_8P18 + + util/ntp-keygen.1ntp-keygenmdoc@1.358 +2 -2 + NTP_4_2_8P18 + + util/ntp-keygen.html@1.203 +2 -2 + NTP_4_2_8P18 + + util/ntp-keygen.man.in@1.358 +2 -2 + NTP_4_2_8P18 + + util/ntp-keygen.mdoc.in@1.358 +2 -2 + NTP_4_2_8P18 + +ChangeSet@1.4061, 2024-05-24 23:46:58-07:00, ntpreleng@ntp-build.tal1.ntfo.org + ntp-4.2.8p18 + + ChangeLog@1.2102 +0 -2 + ntp-4.2.8p18 + +ChangeSet@1.4060, 2024-05-24 22:53:53-07:00, ntpreleng@ntp-build.tal1.ntfo.org + NTP_4_2_8P18_RCGO + TAG: NTP_4_2_8P18_RCGO + + ChangeLog@1.2101 +1 -0 + NTP_4_2_8P18_RCGO + + ntpd/invoke-ntp.conf.texi@1.230 +1 -1 + NTP_4_2_8P18_RCGO + + ntpd/invoke-ntp.keys.texi@1.213 +1 -1 + NTP_4_2_8P18_RCGO + + ntpd/invoke-ntpd.texi@1.527 +2 -2 + NTP_4_2_8P18_RCGO + + ntpd/ntp.conf.5man@1.264 +2 -2 + NTP_4_2_8P18_RCGO + + ntpd/ntp.conf.5mdoc@1.264 +2 -2 + NTP_4_2_8P18_RCGO + + ntpd/ntp.conf.html@1.212 +1 -1 + NTP_4_2_8P18_RCGO + + ntpd/ntp.conf.man.in@1.264 +2 -2 + NTP_4_2_8P18_RCGO + + ntpd/ntp.conf.mdoc.in@1.264 +2 -2 + NTP_4_2_8P18_RCGO + + ntpd/ntp.keys.5man@1.247 +2 -2 + NTP_4_2_8P18_RCGO + + ntpd/ntp.keys.5mdoc@1.247 +2 -2 + NTP_4_2_8P18_RCGO + + ntpd/ntp.keys.html@1.207 +1 -1 + NTP_4_2_8P18_RCGO + + ntpd/ntp.keys.man.in@1.247 +2 -2 + NTP_4_2_8P18_RCGO + + ntpd/ntp.keys.mdoc.in@1.247 +2 -2 + NTP_4_2_8P18_RCGO + + ntpd/ntpd-opts.c@1.552 +7 -7 + NTP_4_2_8P18_RCGO + + ntpd/ntpd-opts.h@1.551 +3 -3 + NTP_4_2_8P18_RCGO + + ntpd/ntpd.1ntpdman@1.356 +2 -2 + NTP_4_2_8P18_RCGO + + ntpd/ntpd.1ntpdmdoc@1.356 +2 -2 + NTP_4_2_8P18_RCGO + + ntpd/ntpd.html@1.201 +2 -2 + NTP_4_2_8P18_RCGO + + ntpd/ntpd.man.in@1.356 +2 -2 + NTP_4_2_8P18_RCGO + + ntpd/ntpd.mdoc.in@1.356 +2 -2 + NTP_4_2_8P18_RCGO + + ntpdc/invoke-ntpdc.texi@1.526 +2 -2 + NTP_4_2_8P18_RCGO + + ntpdc/ntpdc-opts.c@1.547 +7 -7 + NTP_4_2_8P18_RCGO + + ntpdc/ntpdc-opts.h@1.546 +3 -3 + NTP_4_2_8P18_RCGO + + ntpdc/ntpdc.1ntpdcman@1.357 +2 -2 + NTP_4_2_8P18_RCGO + + ntpdc/ntpdc.1ntpdcmdoc@1.357 +2 -2 + NTP_4_2_8P18_RCGO + + ntpdc/ntpdc.html@1.371 +2 -2 + NTP_4_2_8P18_RCGO + + ntpdc/ntpdc.man.in@1.357 +2 -2 + NTP_4_2_8P18_RCGO + + ntpdc/ntpdc.mdoc.in@1.357 +2 -2 + NTP_4_2_8P18_RCGO + + ntpq/invoke-ntpq.texi@1.536 +2 -2 + NTP_4_2_8P18_RCGO + + ntpq/ntpq-opts.c@1.556 +7 -7 + NTP_4_2_8P18_RCGO + + ntpq/ntpq-opts.h@1.554 +3 -3 + NTP_4_2_8P18_RCGO + + ntpq/ntpq.1ntpqman@1.364 +2 -2 + NTP_4_2_8P18_RCGO + + ntpq/ntpq.1ntpqmdoc@1.364 +2 -2 + NTP_4_2_8P18_RCGO + + ntpq/ntpq.html@1.201 +2 -2 + NTP_4_2_8P18_RCGO + + ntpq/ntpq.man.in@1.364 +2 -2 + NTP_4_2_8P18_RCGO + + ntpq/ntpq.mdoc.in@1.364 +2 -2 + NTP_4_2_8P18_RCGO + *** 59789 LINES SKIPPED *** From nobody Thu May 30 01:42: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 4VqTXC6cLNz5Llky; Thu, 30 May 2024 01:42: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 4VqTXC5YF8z4K0C; Thu, 30 May 2024 01:42:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717033355; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YChly7MGF3OEpOKg6/XxQKMso8LLA9Cqu/QNoJP5PfY=; b=eudqGVuyE4l12VPqN2mjfilTqLUGlaQ5nnhFpHHgu7s5/3MsS2kLlXdqFfxl+DFwrQoonm gF1mpdbazH5vjURUebj7seDETdAYr1AP9YbbJn1m+xpV78jfWoHtsIEKbxJRqY5RLBFpm0 qUNALgUiwdD1eSvONS3jx5S8a8MfIr3zAfb5MhomVkxLAbbhsj3DcKvL3ZfXm2QAVuXHH6 xgDq0BUlpLePWZ5dbZOd3aPbsq4NuspYyb2utIDDUDAPrGmcgCFTYsYQsfcNWrUFBqQb5g 9gPvhAHOXPhh9dWG5Z3dLXjxdJwqlyfhK3M5LqO/JfQryTpbdyVlZsaoPqIW4w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1717033355; a=rsa-sha256; cv=none; b=ghhSCEaD6xKQKjI/+ESzShR04t+zIlfiu45O7Rvn1JzUFsjJDPVjOABo/G6LJ4Kqq/FgWh +EvwfxGht8nldlQJ9l0rOEhKlDgWuGUPOd9JfRXbPWyYbPwsqBQBrUh3xcBUBffBrCmfwp X6gGJFmEyGk0XmKdQ+cNwt6TYBkhj2K5oE5gmnFV3wThuN+RKzuNtKnbjb3mULplwTlQ2f dEYAN03NwvROxmQbhuwTOS58IkKRzoLPHby0T6Hl37hMi2J2sH017rFgx/AWL9rS7GgBI+ 2WW4t7R3YCCSx2ALEWfGOkBhA5fjBwiirHAy7+OymxZpaH7YnPUt+dyuEDdUfw== 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=1717033355; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YChly7MGF3OEpOKg6/XxQKMso8LLA9Cqu/QNoJP5PfY=; b=Rm6AmwTSawD5Fr+RC3FOVo7bXDXZYo/LQ0tSumtZegMY7qYZOxuzEsKVpzl7lRufkbTjUV 9dc9vpnsl3QaHC2DjUBvUSgsUuBv5imp+EmagGLP6Lc2uxD9Hcih80aMZSG/ZcUy8y7WwS evYdLtkxYUuc7ass3lnbEdGEwG7bLO2oWlvkmZYyitGUQhKzE6VS+5uzJ4FQkUbikvZ42g zsbe6FsgYozAIp/Un2xbTjEJui6ij1YmaacjNUqLlZ7zJmhYM8RZdbELEbwzKYsvbOfioZ OmA41QK1oUnF5pgeWA2QcY0V8oxqDWCD+6M0Ct3svWjp8DlQE1ZI343PSE4HjQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VqTXC51NmzLRF; Thu, 30 May 2024 01:42: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 44U1gZel028848; Thu, 30 May 2024 01:42:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44U1gZGt028845; Thu, 30 May 2024 01:42:35 GMT (envelope-from git) Date: Thu, 30 May 2024 01:42:35 GMT Message-Id: <202405300142.44U1gZGt028845@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: 1ed9f1b038fc - stable/14 - ntp: Update version strings List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: 1ed9f1b038fc78e6f2813868d3db0fe885ebf714 Auto-Submitted: auto-generated The branch stable/14 has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=1ed9f1b038fc78e6f2813868d3db0fe885ebf714 commit 1ed9f1b038fc78e6f2813868d3db0fe885ebf714 Author: Cy Schubert AuthorDate: 2024-05-27 09:12:49 +0000 Commit: Cy Schubert CommitDate: 2024-05-30 01:42:19 +0000 ntp: Update version strings Reported by: "Herbert J. Skuhra" Fixes: f5f40dd63bc7 (cherry picked from commit 018a4ab7b04deb0710743533f2b799d68b406f85) --- usr.sbin/ntp/config.h | 4 ++-- usr.sbin/ntp/scripts/mkver | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/usr.sbin/ntp/config.h b/usr.sbin/ntp/config.h index 2e5eea82ff29..3d6a1364dd10 100644 --- a/usr.sbin/ntp/config.h +++ b/usr.sbin/ntp/config.h @@ -1494,7 +1494,7 @@ #define PACKAGE_NAME "ntp" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "ntp 4.2.8p18-RC1" +#define PACKAGE_STRING "ntp 4.2.8p18" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "ntp" @@ -1768,7 +1768,7 @@ typedef unsigned int uintptr_t; /* #undef USE_UDP_SIGPOLL */ /* Version number of package */ -#define VERSION "4.2.8p18-RC1" +#define VERSION "4.2.8p18" /* vsnprintf expands "%m" to strerror(errno) */ #define VSNPRINTF_PERCENT_M 1 diff --git a/usr.sbin/ntp/scripts/mkver b/usr.sbin/ntp/scripts/mkver index 279468a1af1c..2336dd71bacb 100755 --- a/usr.sbin/ntp/scripts/mkver +++ b/usr.sbin/ntp/scripts/mkver @@ -7,7 +7,7 @@ PROG=${1-UNKNOWN} ConfStr="$PROG" -ConfStr="$ConfStr 4.2.8p16" +ConfStr="$ConfStr 4.2.8p18" case "$CSET" in '') ;; From nobody Thu May 30 01:43: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 4VqTXq4Gmyz5Lm4B; Thu, 30 May 2024 01:43: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 4VqTXq427Sz4Klp; Thu, 30 May 2024 01:43:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717033387; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cQeSxBXAx1yLDhIGiN95rJ52v+d9qChatyCDHnm42cw=; b=b/hfC82pBsxcBq7zPJCD5bZQfYsk6FWvMaAoz3aK5TTN7fCpezI6Ow8KDSqQxse55e+ez0 WycgzDsgTdddY5XCiwH6Tf1qXmJV1WNC+qj2rqiNaI8EyXVmhr20e7B0ddRrcwZGG2e/PD 3fueqPdQPLJ1ulVNZh3lMuwoxHdtbNN89lbqnZ41M9rnEbvNAanm6AhrEuud+6OjqsjQrT a1m690QVyP/+YExTW/BE3UOZOeEuPvEXS2b60lS6E1TBOsfxfihuWAaiskIFqBtggVEWhe 49IYTko9kiMmqSaP7aWvmFUR8FnGiTthh3trgSRGCcU/eAElsI71TaSUyyFRvQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1717033387; a=rsa-sha256; cv=none; b=KgTZKmSQ8rx2cWWzLS+S705D7h6p8jFk6nTC+SdnlZuJp5I2KF8BDfhMevQZXvYJ9/qY23 ed1Le0M9hBQygsPhcyMlYNVGuZAnLyU9fSskiDZBMZRcoBMMMGLLO9Vdrf8kfDedVBoBf9 T0lukfz6JV3goBUj0dtyU4aFq8PXN7Et/bpxozeWbGSQAoSvVWZz6Dga/Q1yCG9fqAaGlG sdm1MsPOrXU07GMjAzlBGZYDsrsPQWNeChsRtMtEWbl9Phqn3y+5j6PzVgl3iZg3xwK+d5 4SXvBOXeOR0P63eEWKN1qzHFIei6pbdZXbWRPOAPqNr1XkKFNdE2Rv81F14qBQ== 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=1717033387; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cQeSxBXAx1yLDhIGiN95rJ52v+d9qChatyCDHnm42cw=; b=epTFYvn4/rE84RU5ueFBYgc4XSs22T4Nmyay10HOzA9yOECslEqUcsEM0efCWICF4ZWA2S ouvESuJ1qkpA9KhKfZJytyRlgNx/7ORbZts5VrW/bZEIqMGXu46Pg0Ad1Is7keTI3QJ8Uo D6lVUvgIZeetka1Xvaob3HdnslxJwUTuOhvkaQsHFMjBqBECSejVC3L4Ixglh6NCnYiIci 2jEfl+xSMSYZIp/ZZG99TxvcD9chsXQRmxHDm9ovxx3atu5et+gc+inaXUHPTYxI63Cs9H jPkx8ajQmcvBEE27QdeSVifhKgnYxnt6Gnc126I+VYr9FIsuxMYmY4ghmvhaUg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VqTXq39q1zLRG; Thu, 30 May 2024 01:43: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 44U1h7Cn029051; Thu, 30 May 2024 01:43:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44U1h6s0029047; Thu, 30 May 2024 01:43:06 GMT (envelope-from git) Date: Thu, 30 May 2024 01:43:06 GMT Message-Id: <202405300143.44U1h6s0029047@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: 6f3fd5d45e98 - stable/13 - ntp: Vendor import of ntp-4.2.8p18 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: 6f3fd5d45e98738a3035abc2d179d457f29bc541 Auto-Submitted: auto-generated The branch stable/13 has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=6f3fd5d45e98738a3035abc2d179d457f29bc541 commit 6f3fd5d45e98738a3035abc2d179d457f29bc541 Author: Cy Schubert AuthorDate: 2024-05-27 01:41:22 +0000 Commit: Cy Schubert CommitDate: 2024-05-30 01:42:54 +0000 ntp: Vendor import of ntp-4.2.8p18 Merge commit '1f833b3fc9968c3dd7ed79ccf0525ebf16c891ad' into main (cherry picked from commit f5f40dd63bc7acbb5312b26ac1ea1103c12352a6) --- contrib/ntp/COPYRIGHT | 4 +- contrib/ntp/ChangeLog | 120 +- contrib/ntp/CommitLog | 3221 ++++ contrib/ntp/Makefile.am | 6 +- contrib/ntp/Makefile.in | 7 +- contrib/ntp/NEWS | 3902 ++++ contrib/ntp/adjtimed/Makefile.in | 13 +- contrib/ntp/check-libntp.mf | 10 +- contrib/ntp/check-libntpd.mf | 13 +- contrib/ntp/check-libunity.mf | 4 +- contrib/ntp/check-scm-rev.mf | 6 +- contrib/ntp/clockstuff/Makefile.in | 13 +- contrib/ntp/config.h.in | 44 +- contrib/ntp/configure | 2726 +-- contrib/ntp/configure.ac | 81 +- contrib/ntp/flock-build | 22 +- contrib/ntp/html/.datecheck | 0 contrib/ntp/html/clockopt.html | 9 +- contrib/ntp/html/copyright.html | 4 +- contrib/ntp/html/release.html | 2 +- contrib/ntp/include/Makefile.am | 1 + contrib/ntp/include/Makefile.in | 2 + contrib/ntp/include/c99_snprintf.h | 28 + contrib/ntp/include/isc/Makefile.in | 1 + contrib/ntp/include/lib_strbuf.h | 30 +- contrib/ntp/include/ntp.h | 73 +- contrib/ntp/include/ntp_config.h | 13 +- contrib/ntp/include/ntp_control.h | 2 +- contrib/ntp/include/ntp_lists.h | 4 +- contrib/ntp/include/ntp_md5.h | 25 +- contrib/ntp/include/ntp_net.h | 13 +- contrib/ntp/include/ntp_psl.h | 11 +- contrib/ntp/include/ntp_stdlib.h | 20 +- contrib/ntp/include/ntp_tty.h | 5 + contrib/ntp/include/ntp_types.h | 10 - contrib/ntp/include/ntpd.h | 80 +- contrib/ntp/include/vint64ops.h | 2 +- contrib/ntp/kernel/Makefile.in | 1 + contrib/ntp/kernel/sys/Makefile.in | 1 + contrib/ntp/libntp/Makefile.am | 1 - contrib/ntp/libntp/Makefile.in | 76 +- contrib/ntp/libntp/a_md5encrypt.c | 169 +- contrib/ntp/libntp/adjtime.c | 2 +- contrib/ntp/libntp/audio.c | 2 +- contrib/ntp/libntp/authkeys.c | 4 + contrib/ntp/libntp/authreadkeys.c | 12 +- contrib/ntp/libntp/bsd_strerror.c | 2 +- contrib/ntp/libntp/clocktypes.c | 1 - contrib/ntp/libntp/dofptoa.c | 2 - contrib/ntp/libntp/dolfptoa.c | 2 - contrib/ntp/libntp/humandate.c | 1 - contrib/ntp/libntp/lib/isc/win32/strerror.c | 64 +- contrib/ntp/libntp/lib_strbuf.c | 51 +- contrib/ntp/libntp/machines.c | 60 +- contrib/ntp/libntp/modetoa.c | 1 - contrib/ntp/libntp/msyslog.c | 6 +- contrib/ntp/libntp/netof.c | 24 +- contrib/ntp/libntp/ntp_calendar.c | 1 - contrib/ntp/libntp/ntp_intres.c | 6 - contrib/ntp/libntp/ntp_realpath.c | 43 +- contrib/ntp/libntp/numtoa.c | 64 +- contrib/ntp/libntp/numtohost.c | 43 - contrib/ntp/libntp/prettydate.c | 1 - contrib/ntp/libntp/recvbuff.c | 39 +- contrib/ntp/libntp/refnumtoa.c | 1 - contrib/ntp/libntp/snprintf.c | 2 +- contrib/ntp/libntp/socket.c | 16 +- contrib/ntp/libntp/socktoa.c | 1 - contrib/ntp/libntp/socktohost.c | 1 - contrib/ntp/libntp/ssl_init.c | 74 +- contrib/ntp/libntp/statestr.c | 1 - contrib/ntp/libntp/systime.c | 1 - contrib/ntp/libntp/timexsup.c | 22 +- contrib/ntp/libntp/uglydate.c | 1 - contrib/ntp/libntp/vint64ops.c | 21 +- contrib/ntp/libntp/work_thread.c | 17 +- contrib/ntp/libparse/Makefile.am | 15 +- contrib/ntp/libparse/Makefile.in | 30 +- contrib/ntp/libparse/clk_computime.c | 2 +- contrib/ntp/libparse/clk_dcf7000.c | 2 +- contrib/ntp/libparse/clk_hopf6021.c | 2 +- contrib/ntp/libparse/clk_meinberg.c | 2 +- contrib/ntp/libparse/clk_rawdcf.c | 2 +- contrib/ntp/libparse/clk_rcc8000.c | 2 +- contrib/ntp/libparse/clk_schmid.c | 2 +- contrib/ntp/libparse/clk_sel240x.c | 2 +- contrib/ntp/libparse/clk_trimtaip.c | 2 +- contrib/ntp/libparse/clk_trimtsip.c | 2 +- contrib/ntp/libparse/clk_varitext.c | 2 +- contrib/ntp/libparse/clk_wharton.c | 2 +- contrib/ntp/libparse/ieee754io.c | 25 +- contrib/ntp/libparse/parse.c | 2 +- contrib/ntp/libparse/parse_conf.c | 2 +- contrib/ntp/ntpd/Makefile.in | 20 +- contrib/ntp/ntpd/cmd_args.c | 18 +- contrib/ntp/ntpd/complete.conf.in | 43 +- contrib/ntp/ntpd/invoke-ntp.conf.texi | 99 +- contrib/ntp/ntpd/invoke-ntp.keys.texi | 2 +- contrib/ntp/ntpd/invoke-ntpd.texi | 4 +- contrib/ntp/ntpd/keyword-gen-utd | 2 +- contrib/ntp/ntpd/keyword-gen.c | 2 +- contrib/ntp/ntpd/ntp.conf.5man | 106 +- contrib/ntp/ntpd/ntp.conf.5mdoc | 106 +- contrib/ntp/ntpd/ntp.conf.def | 100 +- contrib/ntp/ntpd/ntp.conf.html | 102 +- contrib/ntp/ntpd/ntp.conf.man.in | 106 +- contrib/ntp/ntpd/ntp.conf.mdoc.in | 106 +- contrib/ntp/ntpd/ntp.keys.5man | 6 +- contrib/ntp/ntpd/ntp.keys.5mdoc | 6 +- contrib/ntp/ntpd/ntp.keys.html | 2 +- contrib/ntp/ntpd/ntp.keys.man.in | 6 +- contrib/ntp/ntpd/ntp.keys.mdoc.in | 6 +- contrib/ntp/ntpd/ntp_config.c | 696 +- contrib/ntp/ntpd/ntp_control.c | 68 +- contrib/ntp/ntpd/ntp_crypto.c | 134 +- contrib/ntp/ntpd/ntp_io.c | 927 +- contrib/ntp/ntpd/ntp_keyword.h | 2078 +-- contrib/ntp/ntpd/ntp_leapsec.c | 78 +- contrib/ntp/ntpd/ntp_loopfilter.c | 16 + contrib/ntp/ntpd/ntp_monitor.c | 21 +- contrib/ntp/ntpd/ntp_parser.c | 3279 ++-- contrib/ntp/ntpd/ntp_parser.h | 752 +- contrib/ntp/ntpd/ntp_peer.c | 202 +- contrib/ntp/ntpd/ntp_proto.c | 334 +- contrib/ntp/ntpd/ntp_refclock.c | 58 +- contrib/ntp/ntpd/ntp_request.c | 15 +- contrib/ntp/ntpd/ntp_restrict.c | 725 +- contrib/ntp/ntpd/ntp_scanner.c | 22 +- contrib/ntp/ntpd/ntp_timer.c | 303 +- contrib/ntp/ntpd/ntp_util.c | 249 +- contrib/ntp/ntpd/ntpd-opts.c | 20 +- contrib/ntp/ntpd/ntpd-opts.h | 8 +- contrib/ntp/ntpd/ntpd.1ntpdman | 6 +- contrib/ntp/ntpd/ntpd.1ntpdmdoc | 6 +- contrib/ntp/ntpd/ntpd.c | 101 +- contrib/ntp/ntpd/ntpd.html | 4 +- contrib/ntp/ntpd/ntpd.man.in | 6 +- contrib/ntp/ntpd/ntpd.mdoc.in | 6 +- contrib/ntp/ntpd/refclock_acts.c | 2 +- contrib/ntp/ntpd/refclock_arbiter.c | 2 +- contrib/ntp/ntpd/refclock_arc.c | 13 +- contrib/ntp/ntpd/refclock_as2201.c | 2 +- contrib/ntp/ntpd/refclock_atom.c | 2 +- contrib/ntp/ntpd/refclock_bancomm.c | 2 +- contrib/ntp/ntpd/refclock_chronolog.c | 2 +- contrib/ntp/ntpd/refclock_conf.c | 2 +- contrib/ntp/ntpd/refclock_dumbclock.c | 2 +- contrib/ntp/ntpd/refclock_fg.c | 2 +- contrib/ntp/ntpd/refclock_gpsvme.c | 2 +- contrib/ntp/ntpd/refclock_heath.c | 2 +- contrib/ntp/ntpd/refclock_hopfpci.c | 2 +- contrib/ntp/ntpd/refclock_hopfser.c | 2 +- contrib/ntp/ntpd/refclock_hpgps.c | 2 +- contrib/ntp/ntpd/refclock_irig.c | 2 +- contrib/ntp/ntpd/refclock_jjy.c | 2 +- contrib/ntp/ntpd/refclock_jupiter.c | 2 +- contrib/ntp/ntpd/refclock_local.c | 2 +- contrib/ntp/ntpd/refclock_mx4200.c | 2 +- contrib/ntp/ntpd/refclock_neoclock4x.c | 2 +- contrib/ntp/ntpd/refclock_nmea.c | 2 + contrib/ntp/ntpd/refclock_oncore.c | 2 +- contrib/ntp/ntpd/refclock_palisade.c | 2 +- contrib/ntp/ntpd/refclock_pcf.c | 2 +- contrib/ntp/ntpd/refclock_pst.c | 2 +- contrib/ntp/ntpd/refclock_ripencc.c | 2 +- contrib/ntp/ntpd/refclock_tpro.c | 2 +- contrib/ntp/ntpd/refclock_true.c | 2 +- contrib/ntp/ntpd/refclock_tsyncpci.c | 2 +- contrib/ntp/ntpd/refclock_tt560.c | 2 +- contrib/ntp/ntpd/refclock_ulink.c | 2 +- contrib/ntp/ntpd/refclock_wwv.c | 2 +- contrib/ntp/ntpd/refclock_wwvb.c | 2 +- contrib/ntp/ntpd/refclock_zyfer.c | 2 +- contrib/ntp/ntpdate/Makefile.in | 18 +- contrib/ntp/ntpdc/Makefile.in | 18 +- contrib/ntp/ntpdc/invoke-ntpdc.texi | 4 +- contrib/ntp/ntpdc/nl.pl | 1 + contrib/ntp/ntpdc/nl.pl.in | 1 + contrib/ntp/ntpdc/ntpdc-opts.c | 20 +- contrib/ntp/ntpdc/ntpdc-opts.h | 8 +- contrib/ntp/ntpdc/ntpdc.1ntpdcman | 6 +- contrib/ntp/ntpdc/ntpdc.1ntpdcmdoc | 6 +- contrib/ntp/ntpdc/ntpdc.html | 4 +- contrib/ntp/ntpdc/ntpdc.man.in | 6 +- contrib/ntp/ntpdc/ntpdc.mdoc.in | 6 +- contrib/ntp/ntpq/Makefile.in | 18 +- contrib/ntp/ntpq/invoke-ntpq.texi | 4 +- contrib/ntp/ntpq/ntpq-opts.c | 20 +- contrib/ntp/ntpq/ntpq-opts.h | 8 +- contrib/ntp/ntpq/ntpq-subs.c | 41 +- contrib/ntp/ntpq/ntpq.1ntpqman | 6 +- contrib/ntp/ntpq/ntpq.1ntpqmdoc | 6 +- contrib/ntp/ntpq/ntpq.c | 25 +- contrib/ntp/ntpq/ntpq.h | 1 - contrib/ntp/ntpq/ntpq.html | 4 +- contrib/ntp/ntpq/ntpq.man.in | 6 +- contrib/ntp/ntpq/ntpq.mdoc.in | 6 +- contrib/ntp/ntpsnmpd/Makefile.am | 8 +- contrib/ntp/ntpsnmpd/Makefile.in | 22 +- contrib/ntp/ntpsnmpd/invoke-ntpsnmpd.texi | 4 +- contrib/ntp/ntpsnmpd/netsnmp_daemonize.c | 18 +- contrib/ntp/ntpsnmpd/ntpsnmpd-opts.c | 20 +- contrib/ntp/ntpsnmpd/ntpsnmpd-opts.h | 8 +- contrib/ntp/ntpsnmpd/ntpsnmpd.1ntpsnmpdman | 6 +- contrib/ntp/ntpsnmpd/ntpsnmpd.1ntpsnmpdmdoc | 6 +- contrib/ntp/ntpsnmpd/ntpsnmpd.html | 2 +- contrib/ntp/ntpsnmpd/ntpsnmpd.man.in | 6 +- contrib/ntp/ntpsnmpd/ntpsnmpd.mdoc.in | 6 +- contrib/ntp/packageinfo.sh | 4 +- contrib/ntp/parseutil/Makefile.in | 1 + contrib/ntp/scripts/Makefile.in | 1 + contrib/ntp/scripts/build/Makefile.in | 1 + contrib/ntp/scripts/build/checkHtmlFileDates | 24 +- contrib/ntp/scripts/build/genAuthors.in | 1 + contrib/ntp/scripts/build/mkver.in | 2 + contrib/ntp/scripts/calc_tickadj/Makefile.in | 1 + .../calc_tickadj/calc_tickadj.1calc_tickadjman | 4 +- .../calc_tickadj/calc_tickadj.1calc_tickadjmdoc | 4 +- contrib/ntp/scripts/calc_tickadj/calc_tickadj.html | 2 +- contrib/ntp/scripts/calc_tickadj/calc_tickadj.in | 1 + .../ntp/scripts/calc_tickadj/calc_tickadj.man.in | 4 +- .../ntp/scripts/calc_tickadj/calc_tickadj.mdoc.in | 4 +- .../scripts/calc_tickadj/invoke-calc_tickadj.texi | 2 +- contrib/ntp/scripts/invoke-plot_summary.texi | 4 +- contrib/ntp/scripts/invoke-summary.texi | 4 +- contrib/ntp/scripts/lib/Makefile.in | 1 + contrib/ntp/scripts/ntp-wait/Makefile.in | 1 + contrib/ntp/scripts/ntp-wait/invoke-ntp-wait.texi | 4 +- contrib/ntp/scripts/ntp-wait/ntp-wait-opts | 4 +- contrib/ntp/scripts/ntp-wait/ntp-wait.1ntp-waitman | 4 +- .../ntp/scripts/ntp-wait/ntp-wait.1ntp-waitmdoc | 4 +- contrib/ntp/scripts/ntp-wait/ntp-wait.html | 4 +- contrib/ntp/scripts/ntp-wait/ntp-wait.in | 1 + contrib/ntp/scripts/ntp-wait/ntp-wait.man.in | 4 +- contrib/ntp/scripts/ntp-wait/ntp-wait.mdoc.in | 4 +- contrib/ntp/scripts/ntpsweep/Makefile.in | 1 + contrib/ntp/scripts/ntpsweep/invoke-ntpsweep.texi | 4 +- contrib/ntp/scripts/ntpsweep/ntpsweep-opts | 4 +- contrib/ntp/scripts/ntpsweep/ntpsweep.1ntpsweepman | 4 +- .../ntp/scripts/ntpsweep/ntpsweep.1ntpsweepmdoc | 4 +- contrib/ntp/scripts/ntpsweep/ntpsweep.html | 4 +- contrib/ntp/scripts/ntpsweep/ntpsweep.in | 1 + contrib/ntp/scripts/ntpsweep/ntpsweep.man.in | 4 +- contrib/ntp/scripts/ntpsweep/ntpsweep.mdoc.in | 4 +- contrib/ntp/scripts/ntptrace/Makefile.in | 1 + contrib/ntp/scripts/ntptrace/invoke-ntptrace.texi | 4 +- contrib/ntp/scripts/ntptrace/ntptrace-opts | 4 +- contrib/ntp/scripts/ntptrace/ntptrace.1ntptraceman | 4 +- .../ntp/scripts/ntptrace/ntptrace.1ntptracemdoc | 4 +- contrib/ntp/scripts/ntptrace/ntptrace.html | 4 +- contrib/ntp/scripts/ntptrace/ntptrace.in | 11 + contrib/ntp/scripts/ntptrace/ntptrace.man.in | 4 +- contrib/ntp/scripts/ntptrace/ntptrace.mdoc.in | 4 +- contrib/ntp/scripts/ntpver.in | 3 +- contrib/ntp/scripts/plot_summary-opts | 4 +- contrib/ntp/scripts/plot_summary.1plot_summaryman | 4 +- contrib/ntp/scripts/plot_summary.1plot_summarymdoc | 4 +- contrib/ntp/scripts/plot_summary.html | 4 +- contrib/ntp/scripts/plot_summary.in | 1 + contrib/ntp/scripts/plot_summary.man.in | 4 +- contrib/ntp/scripts/plot_summary.mdoc.in | 4 +- contrib/ntp/scripts/summary-opts | 4 +- contrib/ntp/scripts/summary.1summaryman | 4 +- contrib/ntp/scripts/summary.1summarymdoc | 4 +- contrib/ntp/scripts/summary.html | 4 +- contrib/ntp/scripts/summary.in | 1 + contrib/ntp/scripts/summary.man.in | 4 +- contrib/ntp/scripts/summary.mdoc.in | 4 +- contrib/ntp/scripts/update-leap/Makefile.in | 1 + .../scripts/update-leap/invoke-update-leap.texi | 2 +- contrib/ntp/scripts/update-leap/update-leap-opts | 4 +- .../update-leap/update-leap.1update-leapman | 4 +- .../update-leap/update-leap.1update-leapmdoc | 4 +- contrib/ntp/scripts/update-leap/update-leap.html | 2 +- contrib/ntp/scripts/update-leap/update-leap.in | 1 + contrib/ntp/scripts/update-leap/update-leap.man.in | 4 +- .../ntp/scripts/update-leap/update-leap.mdoc.in | 4 +- contrib/ntp/sntp/COPYRIGHT | 4 +- contrib/ntp/sntp/Makefile.am | 3 +- contrib/ntp/sntp/Makefile.in | 17 +- contrib/ntp/sntp/aclocal.m4 | 1 + contrib/ntp/sntp/check-libntp.mf | 10 +- contrib/ntp/sntp/check-libsntp.mf | 8 +- contrib/ntp/sntp/check-libunity.mf | 3 +- contrib/ntp/sntp/config.h.in | 41 +- contrib/ntp/sntp/configure | 18356 ++++++++++--------- contrib/ntp/sntp/configure.ac | 8 +- contrib/ntp/sntp/crypto.c | 72 +- contrib/ntp/sntp/crypto.h | 15 +- contrib/ntp/sntp/include/Makefile.in | 2 + contrib/ntp/sntp/include/copyright.def | 2 +- contrib/ntp/sntp/include/version.def | 2 +- contrib/ntp/sntp/include/version.texi | 6 +- contrib/ntp/sntp/invoke-sntp.texi | 4 +- contrib/ntp/sntp/libevent/Makefile.in | 3 + contrib/ntp/sntp/libevent/configure | 8 +- contrib/ntp/sntp/libevent/configure.ac | 7 +- contrib/ntp/sntp/libevent/kqueue.c | 2 +- contrib/ntp/sntp/libevent/m4/acx_pthread.m4 | 2 +- contrib/ntp/sntp/libopts/Makefile.am | 4 +- contrib/ntp/sntp/libopts/Makefile.in | 23 +- contrib/ntp/sntp/m4/ntp_compiler.m4 | 68 +- contrib/ntp/sntp/m4/ntp_crypto_rand.m4 | 37 +- contrib/ntp/sntp/m4/ntp_facilitynames.m4 | 33 +- contrib/ntp/sntp/m4/ntp_libevent.m4 | 10 +- contrib/ntp/sntp/m4/ntp_libntp.m4 | 89 +- contrib/ntp/sntp/m4/ntp_openssl.m4 | 827 +- contrib/ntp/sntp/m4/version.m4 | 2 +- contrib/ntp/sntp/main.c | 20 +- contrib/ntp/sntp/scm-rev | 2 +- contrib/ntp/sntp/scripts/Makefile.in | 2 + contrib/ntp/sntp/scripts/cvo.sh | 8 +- contrib/ntp/sntp/sntp-opts.c | 20 +- contrib/ntp/sntp/sntp-opts.h | 8 +- contrib/ntp/sntp/sntp.1sntpman | 6 +- contrib/ntp/sntp/sntp.1sntpmdoc | 6 +- contrib/ntp/sntp/sntp.html | 4 +- contrib/ntp/sntp/sntp.man.in | 6 +- contrib/ntp/sntp/sntp.mdoc.in | 6 +- contrib/ntp/sntp/tests/Makefile.in | 23 +- contrib/ntp/sntp/tests/crypto.c | 235 +- contrib/ntp/sntp/tests/fileHandlingTest.h.in | 8 +- contrib/ntp/sntp/tests/packetHandling.c | 50 +- contrib/ntp/sntp/tests/packetProcessing.c | 168 +- contrib/ntp/sntp/tests/run-crypto.c | 20 +- contrib/ntp/sntp/tests/run-packetProcessing.c | 40 +- contrib/ntp/sntp/unity/Makefile.in | 2 + contrib/ntp/sntp/unity/unity_internals.h | 10 +- contrib/ntp/sntp/utilities.h | 1 - contrib/ntp/tests/libntp/data/ntp.keys | 23 +- contrib/ntp/tests/libntp/digests.c | 125 +- contrib/ntp/tests/libntp/run-digests.c | 6 + contrib/ntp/util/Makefile.am | 4 +- contrib/ntp/util/Makefile.in | 62 +- contrib/ntp/util/invoke-ntp-keygen.texi | 4 +- contrib/ntp/util/lsf-times.c | 220 + contrib/ntp/util/ntp-keygen-opts.c | 20 +- contrib/ntp/util/ntp-keygen-opts.h | 8 +- contrib/ntp/util/ntp-keygen.1ntp-keygenman | 6 +- contrib/ntp/util/ntp-keygen.1ntp-keygenmdoc | 6 +- contrib/ntp/util/ntp-keygen.c | 55 +- contrib/ntp/util/ntp-keygen.html | 4 +- contrib/ntp/util/ntp-keygen.man.in | 6 +- contrib/ntp/util/ntp-keygen.mdoc.in | 6 +- usr.sbin/ntp/config.h | 545 +- usr.sbin/ntp/libntp/Makefile | 2 +- usr.sbin/ntp/ntpd/Makefile | 4 +- usr.sbin/ntp/ntpdate/Makefile | 4 +- usr.sbin/ntp/ntpdc/Makefile | 4 +- usr.sbin/ntp/ntpq/Makefile | 4 +- usr.sbin/ntp/sntp/Makefile | 4 +- 351 files changed, 26986 insertions(+), 17542 deletions(-) diff --git a/contrib/ntp/COPYRIGHT b/contrib/ntp/COPYRIGHT index 013202c0fb09..0cb57168ebfc 100644 --- a/contrib/ntp/COPYRIGHT +++ b/contrib/ntp/COPYRIGHT @@ -3,7 +3,7 @@ This file is automatically generated from html/copyright.html jpg "Clone me," says Dolly sheepishly. - Last update: 2-Mar-2023 05:21 UTC + Last update: 7-Jan-2024 00:29 UTC __________________________________________________________________ The following copyright notice applies to all files collectively called @@ -32,7 +32,7 @@ This file is automatically generated from html/copyright.html Hart, Danny Mayer, Martin Burnicki, and possibly others is: *********************************************************************** * * -* Copyright (c) Network Time Foundation 2011-2023 * +* Copyright (c) Network Time Foundation 2011-2024 * * * * All Rights Reserved * * * diff --git a/contrib/ntp/ChangeLog b/contrib/ntp/ChangeLog index 93cdab8b94eb..f4a196aa57cd 100644 --- a/contrib/ntp/ChangeLog +++ b/contrib/ntp/ChangeLog @@ -1,3 +1,121 @@ +--- +(4.2.8p18) 2024/05/25 Released by Harlan Stenn + +* [Bug 3918] Tweak openssl header/library handling. +* [Bug 3914] Spurious "Unexpected origin timestamp" logged after time + stepped. +* [Bug 3913] Avoid duplicate IPv6 link-local manycast associations. + +* [Bug 3912] Avoid rare math errors in ntptrace. +* [Bug 3910] Memory leak using openssl-3 +* [Bug 3909] Do not select multicast local address for unicast peer. + +* [Bug 3903] lib/isc/win32/strerror.c NTstrerror() is not thread-safe. + +* [Bug 3901] LIB_GETBUF isn't thread-safe. +* [Bug 3900] fast_xmit() selects wrong local addr responding to mcast on + Windows. +* [Bug 3888] ntpd with multiple same-subnet IPs using manycastclient creates + duplicate associations. +* [Bug 3872] Ignore restrict mask for hostname. +* [Bug 3871] 4.2.8p17 build without hopf6021 refclock enabled fails. + Reported by Hans Mayer. Moved NONEMPTY_TRANSLATION_UNIT + declaration from ntp_types.h to config.h. +* [Bug 3870] Server drops client packets with ppoll < 4. +* [Bug 3869] Remove long-gone "calldelay" & "crypto sign" from docs. + Reported by PoolMUC@web.de. +* [Bug 3868] Cannot restrict a pool peer. Thanks to + Edward McGuire for tracking down the deficiency. +* [Bug 3864] ntpd IPv6 refid different for big-endian and little-endian. + +* [Bug 3859] Use NotifyIpInterfaceChange on Windows ntpd. +* [Bug 3856] Enable Edit & Continue debugging with Visual Studio. + +* [Bug 3855] ntpq lacks an equivalent to ntpdc's delrestrict. +* [Bug 3854] ntpd 4.2.8p17 corrupts rawstats file with space in refid. + +* [Bug 3853] Clean up warnings with modern compilers. +* [Bug 3852] check-libntp.mf and friends are not triggering rebuilds as + intended. +* [Bug 3851] Drop pool server when no local address can reach it. + +* [Bug 3850] ntpq -c apeers breaks column formatting s2 w/refclock refid. + +* [Bug 3849] ntpd --wait-sync times out. +* [Bug 3847] SSL detection in configure should run-test if runpath is needed. + +* [Bug 3846] Use -Wno-format-truncation by default. +* [Bug 3845] accelerate pool clock_sync when IPv6 has only link-local access. + +* [Bug 3842] Windows ntpd PPSAPI DLL load failure crashes. +* [Bug 3841] 4.2.8p17 build break w/ gcc 12 -Wformat-security without -Wformat + Need to remove --Wformat-security when removing -Wformat to + silence numerous libopts warnings. +* [Bug 3837] NULL pointer deref crash when ntpd deletes last interface. + Reported by renmingshuai. Correct UNLINK_EXPR_SLIST() when the + list is empty. +* [Bug 3835] NTP_HARD_*FLAGS not used by libevent tearoff. +* [Bug 3831] pollskewlist zeroed on runtime configuration. +* [Bug 3830] configure libevent check intersperses output with answer. +* [Bug 3828] BK should ignore a git repo in the same directory. + +* [Bug 3827] Fix build in case CLOCK_HOPF6021 or CLOCK_WHARTON_400A + is disabled. +* [Bug 3825] Don't touch HTML files unless building inside a BK repo. + Fix the script checkHtmlFileDates. +* [Bug 3756] Improve OpenSSL library/header detection. +* [Bug 3753] ntpd fails to start with FIPS-enabled OpenSSL 3. +* [Bug 2734] TEST3 prevents initial interleave sync. Fix from +* Log failures to allocate receive buffers. +* Remove extraneous */ from libparse/ieee754io.c +* Fix .datecheck target line in Makefile.am. +* Update the copyright year. +* Update ntp.conf documentation to add "delrestrict" and correct information + about KoD rate limiting. +* html/clockopt.html cleanup. +* util/lsf-times - added. +* Add DSA, DSA-SHA, and SHA to tests/libntp/digests.c. +* Provide ntpd thread names to debugger on Windows. +* Remove dead code libntp/numtohost.c and its unit tests. +* Remove class A, B, C IPv4 distinctions in netof(). +* Use @configure_input@ in various *.in files to include a comment that + the file is generated from another pointing to the *.in. +* Correct underquoting, indents in ntp_facilitynames.m4. +* Clean up a few warnings seen building with older gcc. +* Fix build on older FreeBSD lacking sys/procctl.h. +* Disable [Bug 3627] workaround on newer FreeBSD which has the kernel fix + that makes it unnecessary, re-enabling ASLR stack gap. +* Use NONEMPTY_COMPILATION_UNIT in more conditionally-compiled files. +* Remove useless pointer to Windows Help from system error messages. +* Avoid newlines within Windows error messages. +* Ensure unique association IDs if wrapped. +* Simplify calc_addr_distance(). +* Clamp min/maxpoll in edge cases in newpeer(). +* Quiet local addr change logging when unpeering. +* Correct missing arg for %s printf specifier in + send_blocking_resp_internal(). +* Suppress OpenSSL 3 deprecation warning clutter. +* Correct OpenSSL usage in Autokey code to avoid warnings about + discarding const qualifiers with OpenSSL 3. +* Display KoD refid as text in recently added message. +* Avoid running checkHtmlFileDates script repeatedly when no html/*.html + files have changed. +* Abort configure if --enable-crypto-rand given & unavailable. +* Add configure --enable-verbose-ssl to trace SSL detection. +* Add build test coverage for --disable-saveconfig to flock-build script. + +* Remove deprecated configure --with-arlib option. +* Remove configure support for ISC UNIX ca. 1998. +* Move NTP_OPENSSL and NTP_CRYPTO_RAND invocations from configure.ac files + to NTP_LIBNTP. +* Remove dead code: HAVE_U_INT32_ONLY_WITH_DNS. +* Eliminate [v]snprintf redefinition warnings on macOS. +* Fix clang 14 cast increases alignment warning on Linux. +* Move ENABLE_CMAC to ntp_openssl.m4, reviving sntp/tests CMAC unit tests. + +* Use NTP_HARD_CPPFLAGS in libopts tearoff. +* wire in --enable-build-framework-help + --- (4.2.8p17) 2023/06/06 Released by Harlan Stenn @@ -10,7 +128,7 @@ Miroslav Lichvar and Matt for rapid testing and identifying the problem. * Add tests/libntp/digests.c to catch regressions reading keys file or with - symmetric authentication digest output. + symmetric authentication digest output. --- (4.2.8p16) 2023/05/31 Released by Harlan Stenn diff --git a/contrib/ntp/CommitLog b/contrib/ntp/CommitLog index adeda2c60402..49952cfaef0d 100644 --- a/contrib/ntp/CommitLog +++ b/contrib/ntp/CommitLog @@ -1,3 +1,3224 @@ +ChangeSet@1.4062, 2024-05-25 00:06:49-07:00, ntpreleng@ntp-build.tal1.ntfo.org + NTP_4_2_8P18 + TAG: NTP_4_2_8P18 + + ChangeLog@1.2103 +1 -0 + NTP_4_2_8P18 + + ntpd/invoke-ntp.conf.texi@1.231 +1 -1 + NTP_4_2_8P18 + + ntpd/invoke-ntp.keys.texi@1.214 +1 -1 + NTP_4_2_8P18 + + ntpd/invoke-ntpd.texi@1.528 +2 -2 + NTP_4_2_8P18 + + ntpd/ntp.conf.5man@1.265 +2 -2 + NTP_4_2_8P18 + + ntpd/ntp.conf.5mdoc@1.265 +2 -2 + NTP_4_2_8P18 + + ntpd/ntp.conf.html@1.213 +1 -1 + NTP_4_2_8P18 + + ntpd/ntp.conf.man.in@1.265 +2 -2 + NTP_4_2_8P18 + + ntpd/ntp.conf.mdoc.in@1.265 +2 -2 + NTP_4_2_8P18 + + ntpd/ntp.keys.5man@1.248 +2 -2 + NTP_4_2_8P18 + + ntpd/ntp.keys.5mdoc@1.248 +2 -2 + NTP_4_2_8P18 + + ntpd/ntp.keys.html@1.208 +1 -1 + NTP_4_2_8P18 + + ntpd/ntp.keys.man.in@1.248 +2 -2 + NTP_4_2_8P18 + + ntpd/ntp.keys.mdoc.in@1.248 +2 -2 + NTP_4_2_8P18 + + ntpd/ntpd-opts.c@1.553 +245 -245 + NTP_4_2_8P18 + + ntpd/ntpd-opts.h@1.552 +3 -3 + NTP_4_2_8P18 + + ntpd/ntpd.1ntpdman@1.357 +2 -2 + NTP_4_2_8P18 + + ntpd/ntpd.1ntpdmdoc@1.357 +2 -2 + NTP_4_2_8P18 + + ntpd/ntpd.html@1.202 +2 -2 + NTP_4_2_8P18 + + ntpd/ntpd.man.in@1.357 +2 -2 + NTP_4_2_8P18 + + ntpd/ntpd.mdoc.in@1.357 +2 -2 + NTP_4_2_8P18 + + ntpdc/invoke-ntpdc.texi@1.527 +2 -2 + NTP_4_2_8P18 + + ntpdc/ntpdc-opts.c@1.548 +113 -113 + NTP_4_2_8P18 + + ntpdc/ntpdc-opts.h@1.547 +3 -3 + NTP_4_2_8P18 + + ntpdc/ntpdc.1ntpdcman@1.358 +2 -2 + NTP_4_2_8P18 + + ntpdc/ntpdc.1ntpdcmdoc@1.358 +2 -2 + NTP_4_2_8P18 + + ntpdc/ntpdc.html@1.372 +2 -2 + NTP_4_2_8P18 + + ntpdc/ntpdc.man.in@1.358 +2 -2 + NTP_4_2_8P18 + + ntpdc/ntpdc.mdoc.in@1.358 +2 -2 + NTP_4_2_8P18 + + ntpq/invoke-ntpq.texi@1.537 +2 -2 + NTP_4_2_8P18 + + ntpq/ntpq-opts.c@1.557 +120 -120 + NTP_4_2_8P18 + + ntpq/ntpq-opts.h@1.555 +3 -3 + NTP_4_2_8P18 + + ntpq/ntpq.1ntpqman@1.365 +2 -2 + NTP_4_2_8P18 + + ntpq/ntpq.1ntpqmdoc@1.365 +2 -2 + NTP_4_2_8P18 + + ntpq/ntpq.html@1.202 +2 -2 + NTP_4_2_8P18 + + ntpq/ntpq.man.in@1.365 +2 -2 + NTP_4_2_8P18 + + ntpq/ntpq.mdoc.in@1.365 +2 -2 + NTP_4_2_8P18 + + ntpsnmpd/invoke-ntpsnmpd.texi@1.527 +2 -2 + NTP_4_2_8P18 + + ntpsnmpd/ntpsnmpd-opts.c@1.548 +68 -68 + NTP_4_2_8P18 + + ntpsnmpd/ntpsnmpd-opts.h@1.547 +3 -3 + NTP_4_2_8P18 + + ntpsnmpd/ntpsnmpd.1ntpsnmpdman@1.356 +2 -2 + NTP_4_2_8P18 + + ntpsnmpd/ntpsnmpd.1ntpsnmpdmdoc@1.356 +2 -2 + NTP_4_2_8P18 + + ntpsnmpd/ntpsnmpd.html@1.194 +1 -1 + NTP_4_2_8P18 + + ntpsnmpd/ntpsnmpd.man.in@1.356 +2 -2 + NTP_4_2_8P18 + + ntpsnmpd/ntpsnmpd.mdoc.in@1.356 +2 -2 + NTP_4_2_8P18 + + packageinfo.sh@1.553 +2 -2 + NTP_4_2_8P18 + + scripts/calc_tickadj/calc_tickadj.1calc_tickadjman@1.117 +2 -2 + NTP_4_2_8P18 + + scripts/calc_tickadj/calc_tickadj.1calc_tickadjmdoc@1.119 +2 -2 + NTP_4_2_8P18 + + scripts/calc_tickadj/calc_tickadj.html@1.118 +1 -1 + NTP_4_2_8P18 + + scripts/calc_tickadj/calc_tickadj.man.in@1.116 +2 -2 + NTP_4_2_8P18 + + scripts/calc_tickadj/calc_tickadj.mdoc.in@1.119 +2 -2 + NTP_4_2_8P18 + + scripts/calc_tickadj/invoke-calc_tickadj.texi@1.121 +1 -1 + NTP_4_2_8P18 + + scripts/invoke-plot_summary.texi@1.139 +2 -2 + NTP_4_2_8P18 + + scripts/invoke-summary.texi@1.138 +2 -2 + NTP_4_2_8P18 + + scripts/ntp-wait/invoke-ntp-wait.texi@1.350 +2 -2 + NTP_4_2_8P18 + + scripts/ntp-wait/ntp-wait-opts@1.86 +2 -2 + NTP_4_2_8P18 + + scripts/ntp-wait/ntp-wait.1ntp-waitman@1.345 +2 -2 + NTP_4_2_8P18 + + scripts/ntp-wait/ntp-wait.1ntp-waitmdoc@1.347 +2 -2 + NTP_4_2_8P18 + + scripts/ntp-wait/ntp-wait.html@1.366 +2 -2 + NTP_4_2_8P18 + + scripts/ntp-wait/ntp-wait.man.in@1.345 +2 -2 + NTP_4_2_8P18 + + scripts/ntp-wait/ntp-wait.mdoc.in@1.347 +2 -2 + NTP_4_2_8P18 + + scripts/ntpsweep/invoke-ntpsweep.texi@1.136 +2 -2 + NTP_4_2_8P18 + + scripts/ntpsweep/ntpsweep-opts@1.89 +2 -2 + NTP_4_2_8P18 + + scripts/ntpsweep/ntpsweep.1ntpsweepman@1.124 +2 -2 + NTP_4_2_8P18 + + scripts/ntpsweep/ntpsweep.1ntpsweepmdoc@1.124 +2 -2 + NTP_4_2_8P18 + + scripts/ntpsweep/ntpsweep.html@1.138 +2 -2 + NTP_4_2_8P18 + + scripts/ntpsweep/ntpsweep.man.in@1.124 +2 -2 + NTP_4_2_8P18 + + scripts/ntpsweep/ntpsweep.mdoc.in@1.125 +2 -2 + NTP_4_2_8P18 + + scripts/ntptrace/invoke-ntptrace.texi@1.139 +2 -2 + NTP_4_2_8P18 + + scripts/ntptrace/ntptrace-opts@1.89 +2 -2 + NTP_4_2_8P18 + + scripts/ntptrace/ntptrace.1ntptraceman@1.124 +2 -2 + NTP_4_2_8P18 + + scripts/ntptrace/ntptrace.1ntptracemdoc@1.126 +2 -2 + NTP_4_2_8P18 + + scripts/ntptrace/ntptrace.html@1.139 +2 -2 + NTP_4_2_8P18 + + scripts/ntptrace/ntptrace.man.in@1.124 +2 -2 + NTP_4_2_8P18 + + scripts/ntptrace/ntptrace.mdoc.in@1.127 +2 -2 + NTP_4_2_8P18 + + scripts/plot_summary-opts@1.90 +2 -2 + NTP_4_2_8P18 + + scripts/plot_summary.1plot_summaryman@1.137 +2 -2 + NTP_4_2_8P18 + + scripts/plot_summary.1plot_summarymdoc@1.137 +2 -2 + NTP_4_2_8P18 + + scripts/plot_summary.html@1.141 +2 -2 + NTP_4_2_8P18 + + scripts/plot_summary.man.in@1.137 +2 -2 + NTP_4_2_8P18 + + scripts/plot_summary.mdoc.in@1.137 +2 -2 + NTP_4_2_8P18 + + scripts/summary-opts@1.89 +2 -2 + NTP_4_2_8P18 + + scripts/summary.1summaryman@1.136 +2 -2 + NTP_4_2_8P18 + + scripts/summary.1summarymdoc@1.136 +2 -2 + NTP_4_2_8P18 + + scripts/summary.html@1.140 +2 -2 + NTP_4_2_8P18 + + scripts/summary.man.in@1.136 +2 -2 + NTP_4_2_8P18 + + scripts/summary.mdoc.in@1.136 +2 -2 + NTP_4_2_8P18 + + scripts/update-leap/invoke-update-leap.texi@1.37 +1 -1 + NTP_4_2_8P18 + + scripts/update-leap/update-leap-opts@1.39 +2 -2 + NTP_4_2_8P18 + + scripts/update-leap/update-leap.1update-leapman@1.37 +2 -2 + NTP_4_2_8P18 + + scripts/update-leap/update-leap.1update-leapmdoc@1.38 +2 -2 + NTP_4_2_8P18 + + scripts/update-leap/update-leap.html@1.37 +1 -1 + NTP_4_2_8P18 + + scripts/update-leap/update-leap.man.in@1.37 +2 -2 + NTP_4_2_8P18 + + scripts/update-leap/update-leap.mdoc.in@1.38 +2 -2 + NTP_4_2_8P18 + + sntp/invoke-sntp.texi@1.527 +2 -2 + NTP_4_2_8P18 + + sntp/sntp-opts.c@1.549 +161 -161 + NTP_4_2_8P18 + + sntp/sntp-opts.h@1.547 +3 -3 + NTP_4_2_8P18 + + sntp/sntp.1sntpman@1.362 +2 -2 + NTP_4_2_8P18 + + sntp/sntp.1sntpmdoc@1.362 +2 -2 + NTP_4_2_8P18 + + sntp/sntp.html@1.543 +2 -2 + NTP_4_2_8P18 + + sntp/sntp.man.in@1.362 +2 -2 + NTP_4_2_8P18 + + sntp/sntp.mdoc.in@1.362 +2 -2 + NTP_4_2_8P18 + + util/invoke-ntp-keygen.texi@1.530 +2 -2 + NTP_4_2_8P18 + + util/ntp-keygen-opts.c@1.551 +174 -174 + NTP_4_2_8P18 + + util/ntp-keygen-opts.h@1.549 +3 -3 + NTP_4_2_8P18 + + util/ntp-keygen.1ntp-keygenman@1.358 +2 -2 + NTP_4_2_8P18 + + util/ntp-keygen.1ntp-keygenmdoc@1.358 +2 -2 + NTP_4_2_8P18 + + util/ntp-keygen.html@1.203 +2 -2 + NTP_4_2_8P18 + + util/ntp-keygen.man.in@1.358 +2 -2 + NTP_4_2_8P18 + + util/ntp-keygen.mdoc.in@1.358 +2 -2 + NTP_4_2_8P18 + +ChangeSet@1.4061, 2024-05-24 23:46:58-07:00, ntpreleng@ntp-build.tal1.ntfo.org + ntp-4.2.8p18 + + ChangeLog@1.2102 +0 -2 + ntp-4.2.8p18 + +ChangeSet@1.4060, 2024-05-24 22:53:53-07:00, ntpreleng@ntp-build.tal1.ntfo.org + NTP_4_2_8P18_RCGO + TAG: NTP_4_2_8P18_RCGO + + ChangeLog@1.2101 +1 -0 + NTP_4_2_8P18_RCGO + + ntpd/invoke-ntp.conf.texi@1.230 +1 -1 + NTP_4_2_8P18_RCGO + + ntpd/invoke-ntp.keys.texi@1.213 +1 -1 + NTP_4_2_8P18_RCGO + + ntpd/invoke-ntpd.texi@1.527 +2 -2 + NTP_4_2_8P18_RCGO + + ntpd/ntp.conf.5man@1.264 +2 -2 + NTP_4_2_8P18_RCGO + + ntpd/ntp.conf.5mdoc@1.264 +2 -2 + NTP_4_2_8P18_RCGO + + ntpd/ntp.conf.html@1.212 +1 -1 + NTP_4_2_8P18_RCGO + + ntpd/ntp.conf.man.in@1.264 +2 -2 + NTP_4_2_8P18_RCGO + + ntpd/ntp.conf.mdoc.in@1.264 +2 -2 + NTP_4_2_8P18_RCGO + + ntpd/ntp.keys.5man@1.247 +2 -2 + NTP_4_2_8P18_RCGO + + ntpd/ntp.keys.5mdoc@1.247 +2 -2 + NTP_4_2_8P18_RCGO + + ntpd/ntp.keys.html@1.207 +1 -1 + NTP_4_2_8P18_RCGO + + ntpd/ntp.keys.man.in@1.247 +2 -2 + NTP_4_2_8P18_RCGO + + ntpd/ntp.keys.mdoc.in@1.247 +2 -2 + NTP_4_2_8P18_RCGO + + ntpd/ntpd-opts.c@1.552 +7 -7 + NTP_4_2_8P18_RCGO + + ntpd/ntpd-opts.h@1.551 +3 -3 + NTP_4_2_8P18_RCGO + + ntpd/ntpd.1ntpdman@1.356 +2 -2 + NTP_4_2_8P18_RCGO + + ntpd/ntpd.1ntpdmdoc@1.356 +2 -2 + NTP_4_2_8P18_RCGO + + ntpd/ntpd.html@1.201 +2 -2 + NTP_4_2_8P18_RCGO + + ntpd/ntpd.man.in@1.356 +2 -2 + NTP_4_2_8P18_RCGO + + ntpd/ntpd.mdoc.in@1.356 +2 -2 + NTP_4_2_8P18_RCGO + + ntpdc/invoke-ntpdc.texi@1.526 +2 -2 + NTP_4_2_8P18_RCGO + + ntpdc/ntpdc-opts.c@1.547 +7 -7 + NTP_4_2_8P18_RCGO + + ntpdc/ntpdc-opts.h@1.546 +3 -3 + NTP_4_2_8P18_RCGO + + ntpdc/ntpdc.1ntpdcman@1.357 +2 -2 + NTP_4_2_8P18_RCGO + + ntpdc/ntpdc.1ntpdcmdoc@1.357 +2 -2 + NTP_4_2_8P18_RCGO + + ntpdc/ntpdc.html@1.371 +2 -2 + NTP_4_2_8P18_RCGO + + ntpdc/ntpdc.man.in@1.357 +2 -2 + NTP_4_2_8P18_RCGO + + ntpdc/ntpdc.mdoc.in@1.357 +2 -2 + NTP_4_2_8P18_RCGO + + ntpq/invoke-ntpq.texi@1.536 +2 -2 + NTP_4_2_8P18_RCGO + + ntpq/ntpq-opts.c@1.556 +7 -7 + NTP_4_2_8P18_RCGO + + ntpq/ntpq-opts.h@1.554 +3 -3 + NTP_4_2_8P18_RCGO + + ntpq/ntpq.1ntpqman@1.364 +2 -2 + NTP_4_2_8P18_RCGO + + ntpq/ntpq.1ntpqmdoc@1.364 +2 -2 + NTP_4_2_8P18_RCGO + + ntpq/ntpq.html@1.201 +2 -2 + NTP_4_2_8P18_RCGO + + ntpq/ntpq.man.in@1.364 +2 -2 + NTP_4_2_8P18_RCGO + + ntpq/ntpq.mdoc.in@1.364 +2 -2 + NTP_4_2_8P18_RCGO + *** 59789 LINES SKIPPED *** From nobody Thu May 30 01:43: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 4VqTXr4kMvz5LldS; Thu, 30 May 2024 01:43: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 4VqTXr48Vrz4Kp5; Thu, 30 May 2024 01:43:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717033388; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Gh1P8G8ks48e7K9Kt2J0UZQ5OSn0SVlRhm40Lliz2Ko=; b=ZQE1yigwGiJk0BWmsrkwB9a2MAXSFhNYsRrCjR0SbkSpTiLrrsVqXmNmnblVZwMTji60lF lPzCCiOLvhvW7zD8tmh9CxWJJgc9bARu94xrCnWia9CSH+e+OnfnUoVJ7B+r3fCEliG/XL scDg3DamgY+NnvW+GqxO0xiw5sOCinEX2rHVqavWLWXemI3UVHwSrlZlCcUi5aT+NRZPtL WDnAofTaFDKhPqqt41hYzZDABKhhzMF9Urw+7bmWR+6ZCkaqBJHtO2yMuJGgtaEGSW9EZg 6w19m64/moYUE7Or6xpIRpy5IL6SvxjOTV8YeV3JrsH3JnJIbnCiUkz3Lb8WBw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1717033388; a=rsa-sha256; cv=none; b=TVbL6lLl3WCfrizVtOXRMhBLGB4IUjBUq9sNNxF81ES7vE5U3LZfgdOqf+18PZ0jtqbW4I JVwZDtYVM2EhxAIvC1HK9PazaG6NvU9biSiB4TnThpqOhBmxsB0+h1/+nRuLDb62oXTKbh KyFS8c1OrCT86kAe+hb5OXfaTSiGq4BYuD5MYNMnicr8J9TAL485M2kh81XYvcv2dtVDS2 4EkzOiiV88ORa7zQ26bTPIbNJH2M7oj8a8TOdc7VrE78Q1SPa8h51GU7RkhcUp+a5Guo5H i8xNKLwbdT5k2j9gJtrIJHf/NyvbkH9N7BP4AiuTi81pwBwidnPJ+MfzQ1FL3Q== 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=1717033388; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Gh1P8G8ks48e7K9Kt2J0UZQ5OSn0SVlRhm40Lliz2Ko=; b=nAsVGo8RDreWTD6aWexYz2r29FfmnPpDR/f37ErJqW6OLJr2DxpBmk0hPTw6F8yqfz0DAL G9qy6E62iAbMWE8pBOxwMsNiHjptTj70zLd3GGAY3H/MToCc/S5XtlbGCFLVebzT9biPzr 7DMWSosefAv0sk3BeKZJfD9rHgp/U00uXm91qJDWe2whMlx9qUJDfvISjcBKT02rJz2PfI hF2wAoVHkilaoSMG+5jnAFr/jm8wElofz5iLrTNhPRFtZ8vVmlXFi2tQXSb3vx9x7valMv wtDwKoAaD+15ltGYVPoxcZdhGT8v4zYbJN9PjiJWzqnf8/zBPlRl132gAerZBg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VqTXr3lp8zKvk; Thu, 30 May 2024 01:43: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 44U1h8Vv029098; Thu, 30 May 2024 01:43:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44U1h8j7029096; Thu, 30 May 2024 01:43:08 GMT (envelope-from git) Date: Thu, 30 May 2024 01:43:08 GMT Message-Id: <202405300143.44U1h8j7029096@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: 858f4e52dd32 - stable/13 - ntp: Update version strings List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: 858f4e52dd323054b16719e0602189774d70cfc5 Auto-Submitted: auto-generated The branch stable/13 has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=858f4e52dd323054b16719e0602189774d70cfc5 commit 858f4e52dd323054b16719e0602189774d70cfc5 Author: Cy Schubert AuthorDate: 2024-05-27 09:12:49 +0000 Commit: Cy Schubert CommitDate: 2024-05-30 01:42:54 +0000 ntp: Update version strings Reported by: "Herbert J. Skuhra" Fixes: f5f40dd63bc7 (cherry picked from commit 018a4ab7b04deb0710743533f2b799d68b406f85) --- usr.sbin/ntp/config.h | 4 ++-- usr.sbin/ntp/scripts/mkver | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/usr.sbin/ntp/config.h b/usr.sbin/ntp/config.h index 03f55ef07819..c8e918a9128b 100644 --- a/usr.sbin/ntp/config.h +++ b/usr.sbin/ntp/config.h @@ -1494,7 +1494,7 @@ #define PACKAGE_NAME "ntp" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "ntp 4.2.8p18-RC1" +#define PACKAGE_STRING "ntp 4.2.8p18" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "ntp" @@ -1772,7 +1772,7 @@ typedef unsigned int uintptr_t; /* #undef USE_UDP_SIGPOLL */ /* Version number of package */ -#define VERSION "4.2.8p18-RC1" +#define VERSION "4.2.8p18" /* vsnprintf expands "%m" to strerror(errno) */ #define VSNPRINTF_PERCENT_M 1 diff --git a/usr.sbin/ntp/scripts/mkver b/usr.sbin/ntp/scripts/mkver index 279468a1af1c..2336dd71bacb 100755 --- a/usr.sbin/ntp/scripts/mkver +++ b/usr.sbin/ntp/scripts/mkver @@ -7,7 +7,7 @@ PROG=${1-UNKNOWN} ConfStr="$PROG" -ConfStr="$ConfStr 4.2.8p16" +ConfStr="$ConfStr 4.2.8p18" case "$CSET" in '') ;; From nobody Thu May 30 03:00: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 4VqWFq4SJ8z5Lv1s for ; Thu, 30 May 2024 03:00:15 +0000 (UTC) (envelope-from 0100018fc770df1a-ada2b0c5-6cfe-471c-b26e-3f10580dcf49-000000@amazonses.com) Received: from a8-13.smtp-out.amazonses.com (a8-13.smtp-out.amazonses.com [54.240.8.13]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4VqWFp6s8qz4V8m for ; Thu, 30 May 2024 03:00:14 +0000 (UTC) (envelope-from 0100018fc770df1a-ada2b0c5-6cfe-471c-b26e-3f10580dcf49-000000@amazonses.com) Authentication-Results: mx1.freebsd.org; dkim=pass header.d=tarsnap.com header.s=dqtolf56kk3wpt62c3jnwboqvr7iedax header.b=flVwP2ZD; dkim=pass header.d=amazonses.com header.s=ug7nbtf4gccmlpwj322ax3p6ow6yfsug header.b=bdzcdf1Y; dmarc=pass (policy=none) header.from=tarsnap.com; spf=pass (mx1.freebsd.org: domain of 0100018fc770df1a-ada2b0c5-6cfe-471c-b26e-3f10580dcf49-000000@amazonses.com designates 54.240.8.13 as permitted sender) smtp.mailfrom=0100018fc770df1a-ada2b0c5-6cfe-471c-b26e-3f10580dcf49-000000@amazonses.com DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=dqtolf56kk3wpt62c3jnwboqvr7iedax; d=tarsnap.com; t=1717038014; h=Message-ID:Date:MIME-Version:Subject:To:References:From:In-Reply-To:Content-Type:Content-Transfer-Encoding; bh=W7H6Huj/QS0YdI8Y826nV0g3uRNbNHRpnYLsnXBucxg=; b=flVwP2ZD0yMUX7yo/WJ2w9TYTqlquDYeNQ6UR+YNwlo/jaTn+3hmk8yvp9bYAKcu uoSk3Ju45s1iptQsxpirdZh0S70GfCdIIM2NpUMLjDBMTFI6TudLuzYhmzshJ5Mwaq8 4pDlKwUTrhR57AekVCDbkDdn2YlQ4G5799HSx5ho= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=ug7nbtf4gccmlpwj322ax3p6ow6yfsug; d=amazonses.com; t=1717038014; h=Message-ID:Date:MIME-Version:Subject:To:References:From:In-Reply-To:Content-Type:Content-Transfer-Encoding:Feedback-ID; bh=W7H6Huj/QS0YdI8Y826nV0g3uRNbNHRpnYLsnXBucxg=; b=bdzcdf1YaDUlAzeDdPAhY0W6HNITPwnTo9ogMtcra7x9rakXR6PpVWDnh7jMh2BC DsI0q6w1plPeNRoZphLq86oiXsFOs74baFO4ARt1vsEpEs646zMg0dpqI6ohV92O815 exIXwgaI1NCnA/cL885N9hEkmqehgMiKpKtVlyRs= Message-ID: <0100018fc770df1a-ada2b0c5-6cfe-471c-b26e-3f10580dcf49-000000@email.amazonses.com> Date: Thu, 30 May 2024 03:00:14 +0000 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: git: 3a0793336edf - main - Merge llvm-project release/18.x llvmorg-18.1.6-0-g1118c2e05e67 To: Dimitry Andric , src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org References: <202405241559.44OFxHbI038322@gitrepo.freebsd.org> Content-Language: en-US From: Colin Percival Autocrypt: addr=cperciva@tarsnap.com; keydata= xsFNBGWMSrYBEACdWRqDn3B3SKO7IG0/fGHYtfs26f3Q5QeAcasy1fQLniwGQWn5rlILhbCD K/jdNoDm5Zxq20eqyffoDNObCjnHgg4tGANdi+RmDy+7CDpE789H8dss9y7Pt5DlGGAXQQnt hxush3EYS/Ctprd9UUL/lzOOLOU1aNtzB84tNrJBtcJmL7OYHfyTSNFxvedqJrrasejIQOLI t/DQ89BPzz+vsKHz7FJPXh3fsVkzLA00DJYcfkgxyABfJNA7U6yMwd4DVSdx/SsvfIDMVXnu UXCXswo106WPZbYGlZPpq0wW6iibtTerJix+8AeuwXvl9O1p8yESK4ErkIxCnmghTSz+pdzj z/6xBRkdDM9VdZ0r+CzsaNXMpDOzFuKyjaiYBdgCLljbDnXIHFcqXenrZ7Xwkm09g/M4uVSh pIUG2RYa6tsHSQoGCp3f2RZv1znfViKQFbbL83QjtPA20AhseZSYbHp1FPhXyy9J0wkGL16L e99g6gdGeIRE82BZjBjKGDkoyDPq+oDRSFl8NtzmIKy+cfz00nViqcTF4bREXEawFGhlpO0X O9q8mijI9iFB6zaPBiSdJGBL5ML5qLTNCl8Zlf4m1TBvmRTqF/lzMHVXHidDoUhpSh/y3AFZ 1KrYc27ztJQywDJPJPWPbtY8YhFLFs377gfP8WldsZjzp8nvoQARAQABzSVDb2xpbiBQZXJj aXZhbCA8Y3BlcmNpdmFAdGFyc25hcC5jb20+wsGRBBMBCAA7FiEEglY7hNBiDtwN+4ZBOJfy 4i5lrT8FAmWMSyYCGwMICwkNCAwHCwMFFQoJCAsFFgMCAQACHgUCF4AACgkQOJfy4i5lrT+i Yg/+PYyJNoFuygtV5t/skcjYmvEC93mnazEvh+x99vGYZnGKeJ8NDOF4QCUzeHquOWxDi8Zl reXyswKcrIquPxxX6+YyGe97VbvLnez3ksfzOYRj1F4qV0Rq8ZNK51+bvIrbcS3SfDaRioAk D7WWwFor8y/hSwxYkfsKbtP5PRcem20JUxuC085zqWLaKv5t5n2CBzAGMjwJaQ3tM3AXVwWJ uJaHA6ot/6fntJlmkfcyCYyyr0D6b0guRj3STbZ2hNn5o2AI+f6LJJ31s2sPFjl6rs7fORf3 hFSNOHDd2HxfVBXFdQy24ROkC4orBBz2xh9GScjxxT/hbXkfufkubFubw7n0HkvHzA3UF+Qq A8JiI3n+d7ocsP0/5BQ2sZdeqPGJgHx6RkAMuW1tJ29wSvCN1qMgFwhYkpQdfvHlociQrimU fvlRfSrBEe8o7tvIuEdpvwvCZSTJqQbVoMw8UHFE7nzyCXUSab5h6PbjakCqim13ekVO2KFF TTPcz5o5jEeUY75tzbIwcDfFbT5KqNjWy06TVdM9VEJDHSfOfxHR3kSEwZ+tT2aTvL3grsUn gFwSNcj4Cl4CRFfUw8zVZY+7O7RiMlhBqykikvUurrdGKc1Scwa0yuppdA6eVvylyTWSQGrQ +uLWtV1LUKN7ZqKJWBkLPt9nS4XZWGyBvxOHYqjOwU0EZYxKtgEQANYfgbtUMVnhjxDHhWLp g5kLHK3YW0TfJKzpXqDB7NiqxHofn4OcbZnVC3MKggcbs9o1/UtsjnlsG8550PfiYkDXvPiO RJwgbGs6MGIDK797C6cnBLQ8xwBa9SL4cl5iQFnhWmt6vwnJ+an/cm5JpYves3wL7jV09qU9 57hkHXEUcl38r4FssZzVcLKPUVTa3Un+QGRTGDGe/f4ctjMaqv0ZCM+l2ixPhf/vqESrfSLv V/+T3dmtUfXjazO3SABvsHwxgGuTTYOlKoPCaebr+BRdqm0xeIShoIlhvTI8y4clchqx/Uxg UG5X2kvU13k3DS3Q8uLE4Et9x1CcZT6WGgBZSR6R0WfD0SDnzufNnRWJ0dEPA2MtJHE7+85R Vi9j/IgZV+y5Ur+bnPkjDG1s2SVciX5v9HQ0oilcBhvx0j5lGE9hhurD9F+fCvkr4KdbCknE 6Y8ce8pCNBUoB/DqibJivOzTk9K9MGB5x0De5TerIrFiaw3/mQC9nGeO9dtE7wvDJetWeoTq 4BEaCzpufNqbkpOaTQILr4V6Gp7M6v97g83TVAwZntz/q8ptwuKQPZ2JaSFLZn7oWUpYXA5s +SIODFHLn6iMoYpBQskHQjnj4lEPJadl4qj+ZKA89iDAKsniyoFXsbJe2CPbMS1yzBxKZq6K D/jpt7BOnuHr/JrXABEBAAHCwXYEGAEIACAWIQSCVjuE0GIO3A37hkE4l/LiLmWtPwUCZYxK tgIbDAAKCRA4l/LiLmWtP3jmEACQrh9gWe8F1Tkw3m6VoHKwLc5he4tX3WpQa//soPO6iGG3 S3WPruQ46NrAaAojoOcKI9UONDO5rxG0ZTX53S+lu2EO47jbcLwOCjaEpjKpDRt9ZXBQE8Xl mtBE9Bp3W9gpjB1nE3KNM1mJYgsK0QdRpwwfh4pVgGpOj8j23I6MCK+v99zEBnpgCn2GX8W/ kctRXHqWwndHysOJtRP/zrl7dDaABF1f9efUl0LL3TD3GJ9VDz+DNOin/uK2a1hiJo8QzTRk PpfUQ2ebzDsrd1i/pOWkMSkdH+rEu4AGrXWtaBwrMyrGkL6Icb6yO+P9/z0W2wlgBf3P1YRt JPgQt/Dj3yvA/UnaV/QmuVQPjl13o24UnJGsZM8XGnNdfWBKkC1Q6VXC4QT+dyBHYH9MuE9d 6oGl8pFM1+cTfEfbM62/rRoPkF1yHMsI/903VxEvuUIKfhEZAVLFyHldooNxuchntHQP9y8J 8Ou9bWYQP7MnEn+kwSwrZkjurfPkan+xQvp6dDYnj3V0GwA5pprBMaB928VIDVOv+1PNQI3t Cvk5VPv/skq+TJRMHW7bFSt8PRa91cUf1FOLIz9APDiJOzXkwxUEHGV3zPSaUhs1JYjyBeGT wDAvtLUdjOnRhEUOwlnIrztmvyciutjJoVzKEEjj5WXnHk9L9kQ1bpAjkjTONw== In-Reply-To: <202405241559.44OFxHbI038322@gitrepo.freebsd.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Feedback-ID: ::1.us-east-1.Lv9FVjaNvvR5llaqfLoOVbo2VxOELl7cjN0AOyXnPlk=:AmazonSES X-SES-Outgoing: 2024.05.30-54.240.8.13 X-Spamd-Bar: - X-Spamd-Result: default: False [-1.38 / 15.00]; FORGED_MUA_THUNDERBIRD_MSGID_UNKNOWN(2.50)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_SHORT(-0.99)[-0.995]; DMARC_POLICY_ALLOW(-0.50)[tarsnap.com,none]; FORGED_SENDER(0.30)[cperciva@tarsnap.com,0100018fc770df1a-ada2b0c5-6cfe-471c-b26e-3f10580dcf49-000000@amazonses.com]; R_SPF_ALLOW(-0.20)[+ip4:54.240.0.0/18]; R_DKIM_ALLOW(-0.20)[tarsnap.com:s=dqtolf56kk3wpt62c3jnwboqvr7iedax,amazonses.com:s=ug7nbtf4gccmlpwj322ax3p6ow6yfsug]; RWL_MAILSPIKE_VERYGOOD(-0.20)[54.240.8.13:from]; MIME_GOOD(-0.10)[text/plain]; XM_UA_NO_VERSION(0.01)[]; MIME_TRACE(0.00)[0:+]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; RCVD_IN_DNSWL_NONE(0.00)[54.240.8.13:from]; DWL_DNSWL_NONE(0.00)[amazonses.com:dkim]; ARC_NA(0.00)[]; ASN(0.00)[asn:14618, ipnet:54.240.8.0/21, country:US]; TO_MATCH_ENVRCPT_SOME(0.00)[]; MLMMJ_DEST(0.00)[dev-commits-src-all@FreeBSD.org]; FROM_NEQ_ENVFROM(0.00)[cperciva@tarsnap.com,0100018fc770df1a-ada2b0c5-6cfe-471c-b26e-3f10580dcf49-000000@amazonses.com]; RCPT_COUNT_THREE(0.00)[4]; RCVD_COUNT_ZERO(0.00)[0]; DKIM_TRACE(0.00)[tarsnap.com:+,amazonses.com:+] X-Rspamd-Queue-Id: 4VqWFp6s8qz4V8m On 5/24/24 08:59, Dimitry Andric wrote: > commit 3a0793336edfc21cb6d4c8c5c5d7f1665f3e6c5a > > Merge llvm-project release/18.x llvmorg-18.1.6-0-g1118c2e05e67 > > This updates llvm, clang, compiler-rt, libc++, libunwind, lld, lldb and > openmp to llvm-project release/18.x llvmorg-18.1.6-0-g1118c2e05e67. This broke the weekly snapshot builds for powerpc* platforms. It looks like we have the same issue as https://github.com/llvm/llvm-project/issues/92991 (failure is "Running pass 'PPC Merge String Pool' on module '/usr/src/crypto/openssh/sshkey.c'.") so hopefully importing the fix from that issue can fix them for next week. -- Colin Percival FreeBSD Release Engineering Lead & EC2 platform maintainer Founder, Tarsnap | www.tarsnap.com | Online backups for the truly paranoid From nobody Thu May 30 09:06: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 4VqgN63SB0z5MGlc; Thu, 30 May 2024 09:06:14 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VqgN62RtNz46mR; Thu, 30 May 2024 09:06:14 +0000 (UTC) (envelope-from dim@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717059974; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ZYZWa37E3ocq1pH7g/qaPyZQwSrBNR+ohKDamtpxnnw=; b=eG20m16akWiBNv0FK5CfQFO3N06SX6qpwJyItV5xWHxxXv9ybKDZomcR/BMkMOF1OoDBa8 TgafeVeiafJve6tBM+Jd2W5Lw2qEFctdDAvqyQVqBpGwEY5ezkZeWkPjY7rUk3l6EbdZpi CIPO4gWBEtOwc/n47cBOQYCGxOQ7vaqwUne9We9ulZCbs3ubjG1ndJJN77dU67brR/793g JEGZWOtXeYgjzLTuZ//fpZ/KgyFS9CWnOsU/niIkmOKpmOsfgyeHSvJsVxELqFWaJeCR2y AuOZ/+7QCZdNxyr7PFkyMsOAlM5PPGBhrh4Wwn+4CPDybC1ihluPX8Qi2v3o7Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1717059974; a=rsa-sha256; cv=none; b=yJ9/9zcAP6LNd2aWZvFFEr0dQiAjNZazKb5jQGyqLhAoXx8Fpblpz6VJpcdTZ2j6BGGUVX rhnwHjQ7nOy+g09G4fT9BBGrHF3Tfw21pCeJ0BxZOmanjbuqD7eZP0pCoYFx+br/vD3BDA dVwuUiAnTtAbJdsv1IuUI6h1c21/QL0UH4LV9UiMJ90zH7n9RENnBK4zOuk/97FNOYQ29N tAQSeHhuz6euat+BqVu3r1QCCza00N87mPu7pI3Tk7T0yj1H+QBc5fApoQstqwxrwjhunn rwM4UTWuXoFTKEKRSiBL97qc/6blFhz285QpJXnE5Gx+dIK4k7cRgZteI2MkvA== 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=1717059974; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ZYZWa37E3ocq1pH7g/qaPyZQwSrBNR+ohKDamtpxnnw=; b=mlwXTgX0uBHx/pwvxkTBa2mQ7rgSFcKWOoupc4bDwPC7Ht0mbtCc88HWbNfXmAkCiarBhE BhYfJ/BAiYcGywdQazrPTKmnKTqb3gNb3dtH4ncJaonurcqupOYo2KUpM/2IxBbZw2LQzL 4gXalI8MIlfy8rwcEelTobfRxt1zkEbu61oeLLR8Vcaw8fNmqcNFhjURoMYhAsndKPJEwl QqhvONJSKq5YPuXs3mjXQdWvaok41brp35J5Pxh4orO2Qiprednpwg5fSA2faUPX+w+8mK dd9vDkG9c8VU8JGc9/ky2QeYjilV0J2C7c01rNe2VI86nD0MpuUDd6yJIU6Bsg== Received: from tensor.andric.com (tensor.andric.com [87.251.56.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "tensor.andric.com", Issuer "R3" (verified OK)) (Authenticated sender: dim) by smtp.freebsd.org (Postfix) with ESMTPSA id 4VqgN61Kwczbyt; Thu, 30 May 2024 09:06:14 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from smtpclient.apple (longrow.home.andric.com [192.168.0.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by tensor.andric.com (Postfix) with ESMTPSA id 00798204D4; Thu, 30 May 2024 11:06:12 +0200 (CEST) Content-Type: text/plain; charset=us-ascii List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3731.700.6.1.1\)) Subject: Re: git: 3a0793336edf - main - Merge llvm-project release/18.x llvmorg-18.1.6-0-g1118c2e05e67 From: Dimitry Andric In-Reply-To: <0100018fc770df1b-2a8b8552-4730-40d3-8439-3f5553c45e04-000000@email.amazonses.com> Date: Thu, 30 May 2024 11:06:12 +0200 Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Content-Transfer-Encoding: quoted-printable Message-Id: References: <202405241559.44OFxHbI038322@gitrepo.freebsd.org> <0100018fc770df1b-2a8b8552-4730-40d3-8439-3f5553c45e04-000000@email.amazonses.com> To: Colin Percival X-Mailer: Apple Mail (2.3731.700.6.1.1) On 30 May 2024, at 05:00, Colin Percival wrote: >=20 > On 5/24/24 08:59, Dimitry Andric wrote: >> commit 3a0793336edfc21cb6d4c8c5c5d7f1665f3e6c5a >> Merge llvm-project release/18.x llvmorg-18.1.6-0-g1118c2e05e67 >> This updates llvm, clang, compiler-rt, libc++, libunwind, = lld, lldb and >> openmp to llvm-project release/18.x = llvmorg-18.1.6-0-g1118c2e05e67. >=20 > This broke the weekly snapshot builds for powerpc* platforms. It = looks like > we have the same issue as = https://github.com/llvm/llvm-project/issues/92991 > (failure is "Running pass 'PPC Merge String Pool' on module = '/usr/src/crypto/openssh/sshkey.c'.") so hopefully importing the fix = from that issue can fix > them for next week. I tried reproducing the crash with a "make buildworld TARGET=3Dpowerpc TARGET_ARCH=3Dpowerpc64", but it worked just fine for me. Is there any = way to reproduce this on a non-PowerPC host? That said, I will be happy to import the fix, but it would be nice if I can verify that it is really solving the problem. :) -Dimitry From nobody Thu May 30 11:53: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 4Vql5K1Rycz5MWBH for ; Thu, 30 May 2024 11:53:41 +0000 (UTC) (envelope-from 0100018fc9593a16-3bb8d161-3b08-4515-aae7-fa878b27c690-000000@amazonses.com) Received: from a8-26.smtp-out.amazonses.com (a8-26.smtp-out.amazonses.com [54.240.8.26]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4Vql5J1zv2z4Nvt for ; Thu, 30 May 2024 11:53:40 +0000 (UTC) (envelope-from 0100018fc9593a16-3bb8d161-3b08-4515-aae7-fa878b27c690-000000@amazonses.com) Authentication-Results: mx1.freebsd.org; none DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=dqtolf56kk3wpt62c3jnwboqvr7iedax; d=tarsnap.com; t=1717070019; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From:In-Reply-To:Content-Type:Content-Transfer-Encoding; bh=0uaF57H7si1bSyKzbok3PxEYq/AEJrFUChAHYUFxH58=; b=i1SOj1EKursEPPM81cD9gDc5mypbuctmzjBDjGFgZP6Sx9RbJ7xVKVx3zJCtq220 GLUNfnEhrKc7T6lqmFQZPOmesFa8QU4cKJTgIj4BSc+4AX6is3qgGsAetid8gmifEU1 YBdfqphKxIXkXy7uREw0tdI+ccH6U4nfOsPfgV7c= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=ug7nbtf4gccmlpwj322ax3p6ow6yfsug; d=amazonses.com; t=1717070019; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From:In-Reply-To:Content-Type:Content-Transfer-Encoding:Feedback-ID; bh=0uaF57H7si1bSyKzbok3PxEYq/AEJrFUChAHYUFxH58=; b=OOmJVq6aZowMu3THjNfwHCt7eaFHahgVb8167MGpW8R1lCl5eZ7j1ooLb4XWGrgH DQMZMONPDCRyGqdyV/qzvhdMAdw5Wl6f4zy41RwIykEB9wPwbjwfpsYvBES70a0SQn3 2LgQ9uxfl1TXNyryLpiH8hZFsiVrqmFRcL1+kf9w= Message-ID: <0100018fc9593a16-3bb8d161-3b08-4515-aae7-fa878b27c690-000000@email.amazonses.com> Date: Thu, 30 May 2024 11:53:39 +0000 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: git: 3a0793336edf - main - Merge llvm-project release/18.x llvmorg-18.1.6-0-g1118c2e05e67 To: Dimitry Andric Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" References: <202405241559.44OFxHbI038322@gitrepo.freebsd.org> <0100018fc770df1b-2a8b8552-4730-40d3-8439-3f5553c45e04-000000@email.amazonses.com> Content-Language: en-US From: Colin Percival Autocrypt: addr=cperciva@tarsnap.com; keydata= xsFNBGWMSrYBEACdWRqDn3B3SKO7IG0/fGHYtfs26f3Q5QeAcasy1fQLniwGQWn5rlILhbCD K/jdNoDm5Zxq20eqyffoDNObCjnHgg4tGANdi+RmDy+7CDpE789H8dss9y7Pt5DlGGAXQQnt hxush3EYS/Ctprd9UUL/lzOOLOU1aNtzB84tNrJBtcJmL7OYHfyTSNFxvedqJrrasejIQOLI t/DQ89BPzz+vsKHz7FJPXh3fsVkzLA00DJYcfkgxyABfJNA7U6yMwd4DVSdx/SsvfIDMVXnu UXCXswo106WPZbYGlZPpq0wW6iibtTerJix+8AeuwXvl9O1p8yESK4ErkIxCnmghTSz+pdzj z/6xBRkdDM9VdZ0r+CzsaNXMpDOzFuKyjaiYBdgCLljbDnXIHFcqXenrZ7Xwkm09g/M4uVSh pIUG2RYa6tsHSQoGCp3f2RZv1znfViKQFbbL83QjtPA20AhseZSYbHp1FPhXyy9J0wkGL16L e99g6gdGeIRE82BZjBjKGDkoyDPq+oDRSFl8NtzmIKy+cfz00nViqcTF4bREXEawFGhlpO0X O9q8mijI9iFB6zaPBiSdJGBL5ML5qLTNCl8Zlf4m1TBvmRTqF/lzMHVXHidDoUhpSh/y3AFZ 1KrYc27ztJQywDJPJPWPbtY8YhFLFs377gfP8WldsZjzp8nvoQARAQABzSVDb2xpbiBQZXJj aXZhbCA8Y3BlcmNpdmFAdGFyc25hcC5jb20+wsGRBBMBCAA7FiEEglY7hNBiDtwN+4ZBOJfy 4i5lrT8FAmWMSyYCGwMICwkNCAwHCwMFFQoJCAsFFgMCAQACHgUCF4AACgkQOJfy4i5lrT+i Yg/+PYyJNoFuygtV5t/skcjYmvEC93mnazEvh+x99vGYZnGKeJ8NDOF4QCUzeHquOWxDi8Zl reXyswKcrIquPxxX6+YyGe97VbvLnez3ksfzOYRj1F4qV0Rq8ZNK51+bvIrbcS3SfDaRioAk D7WWwFor8y/hSwxYkfsKbtP5PRcem20JUxuC085zqWLaKv5t5n2CBzAGMjwJaQ3tM3AXVwWJ uJaHA6ot/6fntJlmkfcyCYyyr0D6b0guRj3STbZ2hNn5o2AI+f6LJJ31s2sPFjl6rs7fORf3 hFSNOHDd2HxfVBXFdQy24ROkC4orBBz2xh9GScjxxT/hbXkfufkubFubw7n0HkvHzA3UF+Qq A8JiI3n+d7ocsP0/5BQ2sZdeqPGJgHx6RkAMuW1tJ29wSvCN1qMgFwhYkpQdfvHlociQrimU fvlRfSrBEe8o7tvIuEdpvwvCZSTJqQbVoMw8UHFE7nzyCXUSab5h6PbjakCqim13ekVO2KFF TTPcz5o5jEeUY75tzbIwcDfFbT5KqNjWy06TVdM9VEJDHSfOfxHR3kSEwZ+tT2aTvL3grsUn gFwSNcj4Cl4CRFfUw8zVZY+7O7RiMlhBqykikvUurrdGKc1Scwa0yuppdA6eVvylyTWSQGrQ +uLWtV1LUKN7ZqKJWBkLPt9nS4XZWGyBvxOHYqjOwU0EZYxKtgEQANYfgbtUMVnhjxDHhWLp g5kLHK3YW0TfJKzpXqDB7NiqxHofn4OcbZnVC3MKggcbs9o1/UtsjnlsG8550PfiYkDXvPiO RJwgbGs6MGIDK797C6cnBLQ8xwBa9SL4cl5iQFnhWmt6vwnJ+an/cm5JpYves3wL7jV09qU9 57hkHXEUcl38r4FssZzVcLKPUVTa3Un+QGRTGDGe/f4ctjMaqv0ZCM+l2ixPhf/vqESrfSLv V/+T3dmtUfXjazO3SABvsHwxgGuTTYOlKoPCaebr+BRdqm0xeIShoIlhvTI8y4clchqx/Uxg UG5X2kvU13k3DS3Q8uLE4Et9x1CcZT6WGgBZSR6R0WfD0SDnzufNnRWJ0dEPA2MtJHE7+85R Vi9j/IgZV+y5Ur+bnPkjDG1s2SVciX5v9HQ0oilcBhvx0j5lGE9hhurD9F+fCvkr4KdbCknE 6Y8ce8pCNBUoB/DqibJivOzTk9K9MGB5x0De5TerIrFiaw3/mQC9nGeO9dtE7wvDJetWeoTq 4BEaCzpufNqbkpOaTQILr4V6Gp7M6v97g83TVAwZntz/q8ptwuKQPZ2JaSFLZn7oWUpYXA5s +SIODFHLn6iMoYpBQskHQjnj4lEPJadl4qj+ZKA89iDAKsniyoFXsbJe2CPbMS1yzBxKZq6K D/jpt7BOnuHr/JrXABEBAAHCwXYEGAEIACAWIQSCVjuE0GIO3A37hkE4l/LiLmWtPwUCZYxK tgIbDAAKCRA4l/LiLmWtP3jmEACQrh9gWe8F1Tkw3m6VoHKwLc5he4tX3WpQa//soPO6iGG3 S3WPruQ46NrAaAojoOcKI9UONDO5rxG0ZTX53S+lu2EO47jbcLwOCjaEpjKpDRt9ZXBQE8Xl mtBE9Bp3W9gpjB1nE3KNM1mJYgsK0QdRpwwfh4pVgGpOj8j23I6MCK+v99zEBnpgCn2GX8W/ kctRXHqWwndHysOJtRP/zrl7dDaABF1f9efUl0LL3TD3GJ9VDz+DNOin/uK2a1hiJo8QzTRk PpfUQ2ebzDsrd1i/pOWkMSkdH+rEu4AGrXWtaBwrMyrGkL6Icb6yO+P9/z0W2wlgBf3P1YRt JPgQt/Dj3yvA/UnaV/QmuVQPjl13o24UnJGsZM8XGnNdfWBKkC1Q6VXC4QT+dyBHYH9MuE9d 6oGl8pFM1+cTfEfbM62/rRoPkF1yHMsI/903VxEvuUIKfhEZAVLFyHldooNxuchntHQP9y8J 8Ou9bWYQP7MnEn+kwSwrZkjurfPkan+xQvp6dDYnj3V0GwA5pprBMaB928VIDVOv+1PNQI3t Cvk5VPv/skq+TJRMHW7bFSt8PRa91cUf1FOLIz9APDiJOzXkwxUEHGV3zPSaUhs1JYjyBeGT wDAvtLUdjOnRhEUOwlnIrztmvyciutjJoVzKEEjj5WXnHk9L9kQ1bpAjkjTONw== In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Feedback-ID: ::1.us-east-1.Lv9FVjaNvvR5llaqfLoOVbo2VxOELl7cjN0AOyXnPlk=:AmazonSES X-SES-Outgoing: 2024.05.30-54.240.8.26 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:14618, ipnet:54.240.8.0/21, country:US] X-Rspamd-Queue-Id: 4Vql5J1zv2z4Nvt On 5/30/24 02:06, Dimitry Andric wrote: > On 30 May 2024, at 05:00, Colin Percival wrote: >> On 5/24/24 08:59, Dimitry Andric wrote: >>> commit 3a0793336edfc21cb6d4c8c5c5d7f1665f3e6c5a >>> Merge llvm-project release/18.x llvmorg-18.1.6-0-g1118c2e05e67 >>> This updates llvm, clang, compiler-rt, libc++, libunwind, lld, lldb and >>> openmp to llvm-project release/18.x llvmorg-18.1.6-0-g1118c2e05e67. >> >> This broke the weekly snapshot builds for powerpc* platforms. It looks like >> we have the same issue as https://github.com/llvm/llvm-project/issues/92991 >> (failure is "Running pass 'PPC Merge String Pool' on module '/usr/src/crypto/openssh/sshkey.c'.") so hopefully importing the fix from that issue can fix >> them for next week. > > I tried reproducing the crash with a "make buildworld TARGET=powerpc > TARGET_ARCH=powerpc64", but it worked just fine for me. Is there any way > to reproduce this on a non-PowerPC host? There seems to be some indeterminacy going on here; all four powerpc* platforms broke for 15.x, but the stable/13 and stable/14 builds (which I think have the same llvm code) worked fine. The weekly snapshot builds happen on amd64 hardware, so using a powerpc host is not required. > That said, I will be happy to import the fix, but it would be nice if I > can verify that it is really solving the problem. :) I have the files from the failed builds, so I can give you the logs and the preprocessed source and build script that clang reported. That might be enough to reproduce it? Let me know if you'd like those. -- Colin Percival FreeBSD Release Engineering Lead & EC2 platform maintainer Founder, Tarsnap | www.tarsnap.com | Online backups for the truly paranoid From nobody Thu May 30 12:45: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 4VqmDp3Qk2z5MZpT; Thu, 30 May 2024 12:45: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 4VqmDp2pqXz4VKL; Thu, 30 May 2024 12:45:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717073114; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eyIIqDvzUhcQeDAjkCJYBtGabGukW7nSL/3WI1nWnhk=; b=n09yByVPIcr1GFkQyr1XpAUP7PJ8zEMHhKS6oAXGaXfHMwqj2KpNtq6XFwqidYdZMwVQPM d0q1oU5LqJ9LbwTbDZmwjj0XeTO96ULidqw6pvm/v0g25kKcg+EcmJ3VCgszz8WKdveBDU jGO7EX7sw9yfOrhGebPlV/PBDbKcJIQz7C9y8k71Ar+R42OAnsAy4jhs9uR3aT8IC6RDRO I/IryzIDcIkQjhgIL6Wz1jUouWtfJsX9BoMP3McKa5iWzr6yRzluspEvfe7lE4/A8gOYiz BhjJ1W7al9Q+TERdSAWDV1rPxzVxVpuZIelrSNe0vk6zhwvZCOZp/rBIModcjg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1717073114; a=rsa-sha256; cv=none; b=SeLWxskrT+GilKo9mvfmeWc/Yp36FJL2udMujPB/IwgZ8r1gHjpMsVBNOtAzv1o/wruSLg RFbq5wRB7Nxe1Z/G85+3N1GuJ3fvJd5Jb8Lln1+4fWWBiE+7spIFs28C/ej835v9fnxW+s 6wOqc/WuHo1JyLT+uffxg1uWE1nLiLUA3xOeJj8W0dpkLmJ2DjSZw6pEhceDxMJaTZ8V+m hz8HVcyM2nAxUVydvH+D4OHpxbNMXJC2DynoBA1TGg/gRTO8o1xla3wKD1GZsPGsKCWFfS 3hPw57tkmDQTiyx5hnVymr+ihQDsbAQpLCvqIatm03gdRDOSWUT6Xy734dPpEA== 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=1717073114; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eyIIqDvzUhcQeDAjkCJYBtGabGukW7nSL/3WI1nWnhk=; b=lrWWEYOXcsfgq56DOFJvaX8uUQ//oRkaS+oLtJ7tZ0gudJeEOYbLiK0Dt3GxC8ntJm4onU rNch9qLoUTYirek5S/wA0q3ntNKN0dC/JiWaFTIXMFziOww27OVlNMEpZQ0jC+Rdex2hrm oSSC+aXZker/Hv2l0tebd88tXfSQSJWHVaohefZXhxh4gu/MViiqJMl5rKUH6+pm7zz8h/ jRAHfjUBiDF8F3YfB8992RahjHF5z5UVhEq7/+SY95pg6pqGlrA7uoJMfI+Xjg3Bsh9E8J 6LxA3fFomS55I6AAzj36TnFfaLTaqcDuP4IepKPqqUXbCrPJzJsCOeNZ9QphVQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VqmDp2HstzgPj; Thu, 30 May 2024 12:45: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 44UCjE6G045411; Thu, 30 May 2024 12:45:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44UCjEtB045408; Thu, 30 May 2024 12:45:14 GMT (envelope-from git) Date: Thu, 30 May 2024 12:45:14 GMT Message-Id: <202405301245.44UCjEtB045408@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: ff7de3b4d32b - main - nextboot: Permit ZFS boot filesystems mounted at the pool's root List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ff7de3b4d32b64acb609af8a4e6e0b640dbd2973 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=ff7de3b4d32b64acb609af8a4e6e0b640dbd2973 commit ff7de3b4d32b64acb609af8a4e6e0b640dbd2973 Author: John Baldwin AuthorDate: 2024-05-30 12:44:55 +0000 Commit: John Baldwin CommitDate: 2024-05-30 12:44:55 +0000 nextboot: Permit ZFS boot filesystems mounted at the pool's root This restores nextboot -k on ZFS setups where /boot is on the root dataset of a pool. Reviewed by: jrtc27, glebius Fixes: 0c3ade2cf13d nextboot: fix nextboot -k on ZFS Sponsored by: Chelsio Communications Differential Revision: https://reviews.freebsd.org/D45306 --- sbin/reboot/reboot.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sbin/reboot/reboot.c b/sbin/reboot/reboot.c index 1b806a90de1d..c6b0e0980c88 100644 --- a/sbin/reboot/reboot.c +++ b/sbin/reboot/reboot.c @@ -134,9 +134,9 @@ write_nextboot(const char *fn, const char *env, bool force) if (zfs) { char *slash; - if ((slash = strchr(sfs.f_mntfromname, '/')) == NULL) - E("Can't find ZFS pool name in %s", sfs.f_mntfromname); - *slash = '\0'; + slash = strchr(sfs.f_mntfromname, '/'); + if (slash != NULL) + *slash = '\0'; zfsbootcfg(sfs.f_mntfromname, force); } From nobody Thu May 30 13:18: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 4Vqmzh3G5Mz5MdYN; Thu, 30 May 2024 13:18:56 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Vqmzh2Wnpz4XwS; Thu, 30 May 2024 13:18:56 +0000 (UTC) (envelope-from dim@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717075136; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=w1DtdUgT9xJfH700oyJT+5EnuRtTl0XONvJF3N+Ac5Y=; b=KWdSj3BKSyt8cajjeb1fNz/zlQNQfmusvtMabnV1jW+hLRi6ek3ju4GPrKT2Zyp7+Ru0qB zBd25sKVala2DRHwKnL4SRi9GhsiunerduO39l1mekHoef5gkNWIzj+kpZBiYzzDd508za RCo50Zn1nQokBxY3bmABQ5ApysClYWynym6z1O3EA+TiV7k6hFqs8REmyJ89TNpMQkVEWx ql/CdPz0L3mJsSAj4Eo/6Zm6bPiTx/h2m50iEcKZETi3/PnGUMGpTUQ4eQEipQmh0hITS2 wZ2Jx4YiUTXvg5lIO3+1WiOZU4aHjLRUMqwYlbjp4bMpgM6v2RenKG6mcIzWbw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1717075136; a=rsa-sha256; cv=none; b=j1TagUAl3exgJCJqxU2Q5IWMesIgsbJX1XVYltSUYRZYdt3l1mudCd5eO64wbY0SHSpuqZ BOSfeQfJIF/4GtnDxxJcyHRi1AsDFC1W3/AZPuC/0xGDsNHv+PwQz0k2R5MrvjB3zSRvwT s+09wtKxsdCuc7hRnOscyLT1NE/UZgDDDP2BuFvgsycA7pAu6J49LA44RmTV8QwYhYOn1b dfERYhcwOlElvROez4IllAxrMmTpGmIFOS1DTI/3gxBMdwtbLnbkzRWB/q5ZtpD3xyITKH +NywSMyP8OUedEoFoqtmcnGtioC/R69ezLhNLI6oB/bhWEofU+oyzajvjtmz5A== 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=1717075136; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=w1DtdUgT9xJfH700oyJT+5EnuRtTl0XONvJF3N+Ac5Y=; b=jLOYx/UYs7oJX33pyU+Le1J25OJPSzEU+36BWc97pgWgPpC6Qh99St80mWnYppnLbxYFiW vfgYalL9EBh0LpBZeYNP7X19iVsP+4y53zKOk8R35kp3MhmNfCo6jqhJmzYI0yzSSO3+jC jxst/Mzbq1ctapAf7/zLmJLV+Vm4dXrNzE1kzy97b0GLnT9bLV3AWgShFyaJ9Oer8r7HBz mq5/B3lHIBSeps1rQZGDTSB8rDIcfwzBujIZmrfEOZQrxPmIKocLwBnIoXOp/Fey7sHKqE wdVTVOQDN07g04emWsSHRPWZS/wrBx8KhJdtRq2ITAvLk9pqMOIU5eSGKv20vQ== Received: from tensor.andric.com (tensor.andric.com [87.251.56.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "tensor.andric.com", Issuer "R3" (verified OK)) (Authenticated sender: dim) by smtp.freebsd.org (Postfix) with ESMTPSA id 4Vqmzh13xzzhPw; Thu, 30 May 2024 13:18:56 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from smtpclient.apple (longrow.home.andric.com [192.168.0.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by tensor.andric.com (Postfix) with ESMTPSA id 175C020877; Thu, 30 May 2024 15:18:55 +0200 (CEST) Content-Type: text/plain; charset=us-ascii List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3731.700.6.1.1\)) Subject: Re: git: 3a0793336edf - main - Merge llvm-project release/18.x llvmorg-18.1.6-0-g1118c2e05e67 From: Dimitry Andric In-Reply-To: <0100018fc9593a08-ab77676e-117a-4b79-9e87-b85db35c72a3-000000@email.amazonses.com> Date: Thu, 30 May 2024 15:18:54 +0200 Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Content-Transfer-Encoding: quoted-printable Message-Id: <080963CB-7D8C-4F96-94AC-39E07597C94E@FreeBSD.org> References: <202405241559.44OFxHbI038322@gitrepo.freebsd.org> <0100018fc770df1b-2a8b8552-4730-40d3-8439-3f5553c45e04-000000@email.amazonses.com> <0100018fc9593a08-ab77676e-117a-4b79-9e87-b85db35c72a3-000000@email.amazonses.com> To: Colin Percival X-Mailer: Apple Mail (2.3731.700.6.1.1) On 30 May 2024, at 13:53, Colin Percival wrote: >=20 > On 5/30/24 02:06, Dimitry Andric wrote: >> On 30 May 2024, at 05:00, Colin Percival = wrote: >>> On 5/24/24 08:59, Dimitry Andric wrote: >>>> commit 3a0793336edfc21cb6d4c8c5c5d7f1665f3e6c5a >>>> Merge llvm-project release/18.x llvmorg-18.1.6-0-g1118c2e05e67 >>>> This updates llvm, clang, compiler-rt, libc++, libunwind, = lld, lldb and >>>> openmp to llvm-project release/18.x = llvmorg-18.1.6-0-g1118c2e05e67. >>>=20 >>> This broke the weekly snapshot builds for powerpc* platforms. It = looks like >>> we have the same issue as = https://github.com/llvm/llvm-project/issues/92991 >>> (failure is "Running pass 'PPC Merge String Pool' on module = '/usr/src/crypto/openssh/sshkey.c'.") so hopefully importing the fix = from that issue can fix >>> them for next week. >> I tried reproducing the crash with a "make buildworld TARGET=3Dpowerpc >> TARGET_ARCH=3Dpowerpc64", but it worked just fine for me. Is there = any way >> to reproduce this on a non-PowerPC host? >=20 > There seems to be some indeterminacy going on here; all four powerpc* > platforms broke for 15.x, but the stable/13 and stable/14 builds = (which > I think have the same llvm code) worked fine. The weekly snapshot = builds > happen on amd64 hardware, so using a powerpc host is not required. >=20 >> That said, I will be happy to import the fix, but it would be nice if = I >> can verify that it is really solving the problem. :) >=20 > I have the files from the failed builds, so I can give you the logs = and the > preprocessed source and build script that clang reported. That might = be > enough to reproduce it? Let me know if you'd like those. I have been able to reproduce it now, using the .bc file from = . I can confirm that the upstream fix solves the crash, and will commit it later today. This uses the default MFC timeout of 3 days, is that early enough for the next snapshot builds? -Dimitry From nobody Thu May 30 14: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 4VqpHh0SfJz5Mjm4 for ; Thu, 30 May 2024 14:17:52 +0000 (UTC) (envelope-from 0100018fc9dd3def-35e797ac-3b63-421d-8469-589219943ec3-000000@amazonses.com) Received: from a8-26.smtp-out.amazonses.com (a8-26.smtp-out.amazonses.com [54.240.8.26]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4VqpHg5mWgz4jKx for ; Thu, 30 May 2024 14:17:51 +0000 (UTC) (envelope-from 0100018fc9dd3def-35e797ac-3b63-421d-8469-589219943ec3-000000@amazonses.com) Authentication-Results: mx1.freebsd.org; none DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=dqtolf56kk3wpt62c3jnwboqvr7iedax; d=tarsnap.com; t=1717078670; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From:In-Reply-To:Content-Type:Content-Transfer-Encoding; bh=5qpkkVDvIOEkmbHh+QadV1xmbpR0IO2Dnv/ztVvZy0k=; b=E8Ms0bnyIDUGr/evJDzk3q+on+YDuzJAUmNO3o6IVEv45Xeqr4O/4MnQQiHEfath FiQSJL7SsNu7yl5vqKdt06FWlpk/Ebx3KadNpxHU16QEq9JqIbF0rED/ds2NyQSMuFw /CnF43zfvzphnn+q9FQocUGm99gxlDPmBUE/Pc7g= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=ug7nbtf4gccmlpwj322ax3p6ow6yfsug; d=amazonses.com; t=1717078670; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From:In-Reply-To:Content-Type:Content-Transfer-Encoding:Feedback-ID; bh=5qpkkVDvIOEkmbHh+QadV1xmbpR0IO2Dnv/ztVvZy0k=; b=XcSAWSvzC3FvaX6c/OUHwHs/rsI0uxJmLDskqoieQLij3TqHoPG0pfzF+Ut9EQA4 yROMPeptp050/VEikBmmmPrbCLn8F0rB6h1jsQez+jozKmbmrsOOPKa7+gJXM0+NyTF 17GJpHTNr81m3K5zBro8vDyHFmwDvubkjBf3ArQs= Message-ID: <0100018fc9dd3def-35e797ac-3b63-421d-8469-589219943ec3-000000@email.amazonses.com> Date: Thu, 30 May 2024 14:17:50 +0000 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: git: 3a0793336edf - main - Merge llvm-project release/18.x llvmorg-18.1.6-0-g1118c2e05e67 To: Dimitry Andric Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" References: <202405241559.44OFxHbI038322@gitrepo.freebsd.org> <0100018fc770df1b-2a8b8552-4730-40d3-8439-3f5553c45e04-000000@email.amazonses.com> <0100018fc9593a08-ab77676e-117a-4b79-9e87-b85db35c72a3-000000@email.amazonses.com> <080963CB-7D8C-4F96-94AC-39E07597C94E@FreeBSD.org> Content-Language: en-US From: Colin Percival Autocrypt: addr=cperciva@tarsnap.com; keydata= xsFNBGWMSrYBEACdWRqDn3B3SKO7IG0/fGHYtfs26f3Q5QeAcasy1fQLniwGQWn5rlILhbCD K/jdNoDm5Zxq20eqyffoDNObCjnHgg4tGANdi+RmDy+7CDpE789H8dss9y7Pt5DlGGAXQQnt hxush3EYS/Ctprd9UUL/lzOOLOU1aNtzB84tNrJBtcJmL7OYHfyTSNFxvedqJrrasejIQOLI t/DQ89BPzz+vsKHz7FJPXh3fsVkzLA00DJYcfkgxyABfJNA7U6yMwd4DVSdx/SsvfIDMVXnu UXCXswo106WPZbYGlZPpq0wW6iibtTerJix+8AeuwXvl9O1p8yESK4ErkIxCnmghTSz+pdzj z/6xBRkdDM9VdZ0r+CzsaNXMpDOzFuKyjaiYBdgCLljbDnXIHFcqXenrZ7Xwkm09g/M4uVSh pIUG2RYa6tsHSQoGCp3f2RZv1znfViKQFbbL83QjtPA20AhseZSYbHp1FPhXyy9J0wkGL16L e99g6gdGeIRE82BZjBjKGDkoyDPq+oDRSFl8NtzmIKy+cfz00nViqcTF4bREXEawFGhlpO0X O9q8mijI9iFB6zaPBiSdJGBL5ML5qLTNCl8Zlf4m1TBvmRTqF/lzMHVXHidDoUhpSh/y3AFZ 1KrYc27ztJQywDJPJPWPbtY8YhFLFs377gfP8WldsZjzp8nvoQARAQABzSVDb2xpbiBQZXJj aXZhbCA8Y3BlcmNpdmFAdGFyc25hcC5jb20+wsGRBBMBCAA7FiEEglY7hNBiDtwN+4ZBOJfy 4i5lrT8FAmWMSyYCGwMICwkNCAwHCwMFFQoJCAsFFgMCAQACHgUCF4AACgkQOJfy4i5lrT+i Yg/+PYyJNoFuygtV5t/skcjYmvEC93mnazEvh+x99vGYZnGKeJ8NDOF4QCUzeHquOWxDi8Zl reXyswKcrIquPxxX6+YyGe97VbvLnez3ksfzOYRj1F4qV0Rq8ZNK51+bvIrbcS3SfDaRioAk D7WWwFor8y/hSwxYkfsKbtP5PRcem20JUxuC085zqWLaKv5t5n2CBzAGMjwJaQ3tM3AXVwWJ uJaHA6ot/6fntJlmkfcyCYyyr0D6b0guRj3STbZ2hNn5o2AI+f6LJJ31s2sPFjl6rs7fORf3 hFSNOHDd2HxfVBXFdQy24ROkC4orBBz2xh9GScjxxT/hbXkfufkubFubw7n0HkvHzA3UF+Qq A8JiI3n+d7ocsP0/5BQ2sZdeqPGJgHx6RkAMuW1tJ29wSvCN1qMgFwhYkpQdfvHlociQrimU fvlRfSrBEe8o7tvIuEdpvwvCZSTJqQbVoMw8UHFE7nzyCXUSab5h6PbjakCqim13ekVO2KFF TTPcz5o5jEeUY75tzbIwcDfFbT5KqNjWy06TVdM9VEJDHSfOfxHR3kSEwZ+tT2aTvL3grsUn gFwSNcj4Cl4CRFfUw8zVZY+7O7RiMlhBqykikvUurrdGKc1Scwa0yuppdA6eVvylyTWSQGrQ +uLWtV1LUKN7ZqKJWBkLPt9nS4XZWGyBvxOHYqjOwU0EZYxKtgEQANYfgbtUMVnhjxDHhWLp g5kLHK3YW0TfJKzpXqDB7NiqxHofn4OcbZnVC3MKggcbs9o1/UtsjnlsG8550PfiYkDXvPiO RJwgbGs6MGIDK797C6cnBLQ8xwBa9SL4cl5iQFnhWmt6vwnJ+an/cm5JpYves3wL7jV09qU9 57hkHXEUcl38r4FssZzVcLKPUVTa3Un+QGRTGDGe/f4ctjMaqv0ZCM+l2ixPhf/vqESrfSLv V/+T3dmtUfXjazO3SABvsHwxgGuTTYOlKoPCaebr+BRdqm0xeIShoIlhvTI8y4clchqx/Uxg UG5X2kvU13k3DS3Q8uLE4Et9x1CcZT6WGgBZSR6R0WfD0SDnzufNnRWJ0dEPA2MtJHE7+85R Vi9j/IgZV+y5Ur+bnPkjDG1s2SVciX5v9HQ0oilcBhvx0j5lGE9hhurD9F+fCvkr4KdbCknE 6Y8ce8pCNBUoB/DqibJivOzTk9K9MGB5x0De5TerIrFiaw3/mQC9nGeO9dtE7wvDJetWeoTq 4BEaCzpufNqbkpOaTQILr4V6Gp7M6v97g83TVAwZntz/q8ptwuKQPZ2JaSFLZn7oWUpYXA5s +SIODFHLn6iMoYpBQskHQjnj4lEPJadl4qj+ZKA89iDAKsniyoFXsbJe2CPbMS1yzBxKZq6K D/jpt7BOnuHr/JrXABEBAAHCwXYEGAEIACAWIQSCVjuE0GIO3A37hkE4l/LiLmWtPwUCZYxK tgIbDAAKCRA4l/LiLmWtP3jmEACQrh9gWe8F1Tkw3m6VoHKwLc5he4tX3WpQa//soPO6iGG3 S3WPruQ46NrAaAojoOcKI9UONDO5rxG0ZTX53S+lu2EO47jbcLwOCjaEpjKpDRt9ZXBQE8Xl mtBE9Bp3W9gpjB1nE3KNM1mJYgsK0QdRpwwfh4pVgGpOj8j23I6MCK+v99zEBnpgCn2GX8W/ kctRXHqWwndHysOJtRP/zrl7dDaABF1f9efUl0LL3TD3GJ9VDz+DNOin/uK2a1hiJo8QzTRk PpfUQ2ebzDsrd1i/pOWkMSkdH+rEu4AGrXWtaBwrMyrGkL6Icb6yO+P9/z0W2wlgBf3P1YRt JPgQt/Dj3yvA/UnaV/QmuVQPjl13o24UnJGsZM8XGnNdfWBKkC1Q6VXC4QT+dyBHYH9MuE9d 6oGl8pFM1+cTfEfbM62/rRoPkF1yHMsI/903VxEvuUIKfhEZAVLFyHldooNxuchntHQP9y8J 8Ou9bWYQP7MnEn+kwSwrZkjurfPkan+xQvp6dDYnj3V0GwA5pprBMaB928VIDVOv+1PNQI3t Cvk5VPv/skq+TJRMHW7bFSt8PRa91cUf1FOLIz9APDiJOzXkwxUEHGV3zPSaUhs1JYjyBeGT wDAvtLUdjOnRhEUOwlnIrztmvyciutjJoVzKEEjj5WXnHk9L9kQ1bpAjkjTONw== In-Reply-To: <080963CB-7D8C-4F96-94AC-39E07597C94E@FreeBSD.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Feedback-ID: ::1.us-east-1.Lv9FVjaNvvR5llaqfLoOVbo2VxOELl7cjN0AOyXnPlk=:AmazonSES X-SES-Outgoing: 2024.05.30-54.240.8.26 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:14618, ipnet:54.240.8.0/21, country:US] X-Rspamd-Queue-Id: 4VqpHg5mWgz4jKx On 5/30/24 06:18, Dimitry Andric wrote: > On 30 May 2024, at 13:53, Colin Percival wrote: >> On 5/30/24 02:06, Dimitry Andric wrote: >>> That said, I will be happy to import the fix, but it would be nice if I >>> can verify that it is really solving the problem. :) >> >> I have the files from the failed builds, so I can give you the logs and the >> preprocessed source and build script that clang reported. That might be >> enough to reproduce it? Let me know if you'd like those. > > I have been able to reproduce it now, using the .bc file from > . > > I can confirm that the upstream fix solves the crash, and will commit it > later today. This uses the default MFC timeout of 3 days, is that early > enough for the next snapshot builds? Yes, that's fine. -- Colin Percival FreeBSD Release Engineering Lead & EC2 platform maintainer Founder, Tarsnap | www.tarsnap.com | Online backups for the truly paranoid From nobody Thu May 30 15:35: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 4Vqr1W39Qzz5Mqs0; Thu, 30 May 2024 15:35: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 4Vqr1W2L9gz4v3q; Thu, 30 May 2024 15:35:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717083343; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Q/AJPgxDPTKW2foznqpuoGST/cqz+PrjigCD7v6f0pw=; b=I+/PvGbAMXbnlsdKl9UBg3VFx9IFa8Wtk0p5I8Gf7CgalEpG8QdVJhxPTMVLi28B/i/yA7 wqExDT2/LyIuYCU5+vDPP4tLOiNTKzqOjXdijThXgfHbUda6DK2AQTwZ10v47mcYBAHU/i mKo+9BMlq7idZQgpTWcKdvUCHEHUZk9QLiCFdm/bvGFXHmFSOTN5Vi6+jkb5YrBZx9ZS97 dahRcMBTarzPKDls2k263G1w39gXSFBJtJTcVS7NpWXc0UistIffxM6ftG196W7dydOsbB O7N6OfgT6hmykd9I0LolLTd597bM1jZu1+ZfyTwvyzHNmsd+PvlIdcxBS46YdQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1717083343; a=rsa-sha256; cv=none; b=NcE6SH3nTCSceXLTTkqwApEej/VIfYeuXjedOLjU4weo1f+dHbw3rtdCZAJQR7yfkzE37P P3fpYsCIh+kv24FNZxpaFKHidGxzfGiHy3BIdxHqeiYjkS7T96O+nDXdi+AAf8/W0BWMdA 5TGdxCUtyRedZpNztTLoWOBMpKpNqGn/DUi3xDA8BViYs14FqlEQftEi7SB84kTR/Tliny K89pjAcqlUJJqs7r1awE4KdrP7gR48XGs/LfeTDgfensURwovS9n/elaVb54UC96k2sqNS TprhisrbgJe++OK/WmIFUat1yuhW2P0wN9Jh8qZyDJKVRGkYve7pNAD8bOhKDA== 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=1717083343; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Q/AJPgxDPTKW2foznqpuoGST/cqz+PrjigCD7v6f0pw=; b=bwkZ4PjipbMNyMUWp09dBM1GgjxRrUuGQ+T/mpiz83LVlcPLqKW+itcjbbmUPFD7Plp7r1 T1xVO5lEHJ4j5BXCV7ErzsUDEBo+kv5IpiyavhpUqPhoD0B03n+JYdwEeoLMUY4A5FG+nl GMl4YuTzG2P521qE40mqSvD+EA9zureuRhGCelZw7orEnlAqYJCaFkujGJyhPtczsc2Qco Sh/gpyzuHFHs533pDxnqlpioiMVN2bijJOoydhA9UCz3fqRyzuitxKSd046b7ol0dlpYxX FV0VUFVu6YS9Gn++dHk0DZmOq66PTxSKlWB/Zo9QiMSLLXRFaMDQCi46SNfqsA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Vqr1W1xbdzmCk; Thu, 30 May 2024 15:35: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 44UFZhTN034326; Thu, 30 May 2024 15:35:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44UFZhot034324; Thu, 30 May 2024 15:35:43 GMT (envelope-from git) Date: Thu, 30 May 2024 15:35:43 GMT Message-Id: <202405301535.44UFZhot034324@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: f30188c4680a - main - Merge commit 9f85bc834b07 from llvm-project (by Nikita Popov): List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: f30188c4680a85126e793de157b851bf5ee47529 Auto-Submitted: auto-generated The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=f30188c4680a85126e793de157b851bf5ee47529 commit f30188c4680a85126e793de157b851bf5ee47529 Author: Dimitry Andric AuthorDate: 2024-05-30 15:35:15 +0000 Commit: Dimitry Andric CommitDate: 2024-05-30 15:35:15 +0000 Merge commit 9f85bc834b07 from llvm-project (by Nikita Popov): [PPCMergeStringPool] Only replace constant once (#92996) In #88846 I changed this code to use RAUW to perform the replacement instead of manual updates -- but kept the outer loop, which means we try to perform RAUW once per user. However, some of the users might be freed by the RAUW operation, resulting in use-after-free. The case where this happens is constant users where the replacement might result in the destruction of the original constant. Fixes https://github.com/llvm/llvm-project/issues/92991. This fixes a possible crash when building crypto/openssh/sshkey.c for PowerPC targets. Reported by: cperciva PR: 276104 MFC after: 3 days --- .../llvm/lib/Target/PowerPC/PPCMergeStringPool.cpp | 37 ++++------------------ 1 file changed, 7 insertions(+), 30 deletions(-) diff --git a/contrib/llvm-project/llvm/lib/Target/PowerPC/PPCMergeStringPool.cpp b/contrib/llvm-project/llvm/lib/Target/PowerPC/PPCMergeStringPool.cpp index ebd876d50c44..0830b02370cd 100644 --- a/contrib/llvm-project/llvm/lib/Target/PowerPC/PPCMergeStringPool.cpp +++ b/contrib/llvm-project/llvm/lib/Target/PowerPC/PPCMergeStringPool.cpp @@ -290,13 +290,6 @@ bool PPCMergeStringPool::mergeModuleStringPool(Module &M) { return true; } -static bool userHasOperand(User *TheUser, GlobalVariable *GVOperand) { - for (Value *Op : TheUser->operands()) - if (Op == GVOperand) - return true; - return false; -} - // For pooled strings we need to add the offset into the pool for each string. // This is done by adding a Get Element Pointer (GEP) before each user. This // function adds the GEP. @@ -307,29 +300,13 @@ void PPCMergeStringPool::replaceUsesWithGEP(GlobalVariable *GlobalToReplace, Indices.push_back(ConstantInt::get(Type::getInt32Ty(*Context), 0)); Indices.push_back(ConstantInt::get(Type::getInt32Ty(*Context), ElementIndex)); - // Need to save a temporary copy of each user list because we remove uses - // as we replace them. - SmallVector Users; - for (User *CurrentUser : GlobalToReplace->users()) - Users.push_back(CurrentUser); - - for (User *CurrentUser : Users) { - // The user was not found so it must have been replaced earlier. - if (!userHasOperand(CurrentUser, GlobalToReplace)) - continue; - - // We cannot replace operands in globals so we ignore those. - if (isa(CurrentUser)) - continue; - - Constant *ConstGEP = ConstantExpr::getInBoundsGetElementPtr( - PooledStructType, GPool, Indices); - LLVM_DEBUG(dbgs() << "Replacing this global:\n"); - LLVM_DEBUG(GlobalToReplace->dump()); - LLVM_DEBUG(dbgs() << "with this:\n"); - LLVM_DEBUG(ConstGEP->dump()); - GlobalToReplace->replaceAllUsesWith(ConstGEP); - } + Constant *ConstGEP = + ConstantExpr::getInBoundsGetElementPtr(PooledStructType, GPool, Indices); + LLVM_DEBUG(dbgs() << "Replacing this global:\n"); + LLVM_DEBUG(GlobalToReplace->dump()); + LLVM_DEBUG(dbgs() << "with this:\n"); + LLVM_DEBUG(ConstGEP->dump()); + GlobalToReplace->replaceAllUsesWith(ConstGEP); } } // namespace From nobody Thu May 30 17:01: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 4Vqsvy2MsPz5L1Fd; Thu, 30 May 2024 17:01: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 4Vqsvy1m4Cz444N; Thu, 30 May 2024 17:01:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717088462; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vnL+RHZQK1XBjwejMKJNZtXvNhbjCb424xESQ0odLvM=; b=CcJaS04Nl3lcb/lLG7BQ3bnJDf2eJgGR2lPsxk6ZnQ6aHePReLzL8fRv/8oYJaXQhkSwp8 8M6/TJfVfJ0RFzO0vx0kkbH1FDOwvEXfkll0COYXBHuTdvYo2vTHDdOs7897fMDtm2rnW1 J43ADCBgsQyacxrGnuY/PPnC7vxGc0yY1pDndHUSJgSPeGtSG5F0yAbuB4QtQBElB36PI1 MudQ9B7WLOKjmn9nytAN0/KCZ1IvBWUTqsPx9UkYB1JGQK7upfXmBlh22c+qivcu5yWG+I w91DX9F62Jtb7Sios1BFw8/WJOl0vdu2/U/RAY9TRhST7xleP1X0tAcKTsbyBg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1717088462; a=rsa-sha256; cv=none; b=Y/G/BNXGyblxcHscc7R3Dh/Cj/35aJLpVo3cyrCWy3AgfsjW2pNRLWv2iMXfC2gCUUoTIR 31rqvmihFl0m3tsRpewmXeYWB+WqPORgKPlZfhS/D4My4f2f0us9kvBS2nsOPuvf/NguBt DbOa++kpKzINQ0rxQaQQeSnQaqR9vyxIQCJVhGxWHmwOjGooPJfIPDb3scKiFxcMQ6rXeZ lS91uAZ2uAPeZKh/a/h/HTarMdjT1f7a/ECKomilhKojLlyUkrr05Vz4K3zzNkJ/FZ0ej/ LtNYaBoU1DT1EwQIW+8EDmc9cMxLfvl0jUguOl/OrrZBkOoz6ESU9H3Rp98emg== 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=1717088462; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vnL+RHZQK1XBjwejMKJNZtXvNhbjCb424xESQ0odLvM=; b=u1d7XK47Of8khQ2kcnggLQ65CmfjIDuC38y3YIyKxZ/gLaqrt/8KYdVzso9J6f2RKNGPHn 3QgDfjC30itvLRxD0h8vkDuMcAX4cimlHLENeHhYDrkWTfGJvyj9cpKdL6GceBv6pVw5ul h0gwzCCeP8Gj0bHfkIZEbmIbuUZhBQM+GtrO8mDAQpmn5yOJEUNoaT5DJmnLhi11UI9hPK DQbZ3QTToamJiiPROoldDGSNTJVI7xHAU8hg3eAVtW5756ZcPJ9aljrxBGVMQWJlHBa6Ui agNR8TaUFjnh48VkiD9xM8jJ8v3c2aXn4nJVdMaAlUO3N8gcKZNwJlnq2Aa9mg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Vqsvy1MJ0zpPq; Thu, 30 May 2024 17:01: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 44UH120W081040; Thu, 30 May 2024 17:01:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44UH12Gx081028; Thu, 30 May 2024 17:01:02 GMT (envelope-from git) Date: Thu, 30 May 2024 17:01:02 GMT Message-Id: <202405301701.44UH12Gx081028@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Colin Percival Subject: git: a04ecddfc721 - main - release/Makefile.vm: Use qemu-user-static-devel List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a04ecddfc721427fd97fd1fcc27492ebd19ad183 Auto-Submitted: auto-generated The branch main has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=a04ecddfc721427fd97fd1fcc27492ebd19ad183 commit a04ecddfc721427fd97fd1fcc27492ebd19ad183 Author: Colin Percival AuthorDate: 2024-05-30 16:48:40 +0000 Commit: Colin Percival CommitDate: 2024-05-30 17:00:42 +0000 release/Makefile.vm: Use qemu-user-static-devel This is a newer version of the qemu-user-static code, which is very much out of date. Requested by: imp --- release/Makefile.vm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/release/Makefile.vm b/release/Makefile.vm index 548b4c1cca3b..b5c1470a6eac 100644 --- a/release/Makefile.vm +++ b/release/Makefile.vm @@ -75,16 +75,16 @@ ${_V}!= eval $$(awk '/^${_V}=/{print}' ${.CURDIR}/../sys/conf/newvers.sh); echo emulator-portinstall: .if !exists(/usr/local/bin/qemu-${TARGET_ARCH}-static) -.if exists(${PORTSDIR}/emulators/qemu-user-static/Makefile) +.if exists(${PORTSDIR}/emulators/qemu-user-static-devel/Makefile) env - UNAME_r=${UNAME_r} PATH=$$PATH \ - make -C ${PORTSDIR}/emulators/qemu-user-static \ + make -C ${PORTSDIR}/emulators/qemu-user-static-devel \ BATCH=1 WRKDIRPREFIX=/tmp/ports DISTDIR=/tmp/distfiles \ all install clean .else .if !exists(/usr/local/sbin/pkg-static) env ASSUME_ALWAYS_YES=yes pkg bootstrap -y .endif - env ASSUME_ALWAYS_YES=yes pkg install -y emulators/qemu-user-static + env ASSUME_ALWAYS_YES=yes pkg install -y emulators/qemu-user-static-devel .endif .endif touch ${.TARGET} From nobody Thu May 30 19:41: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 4VqxSm2pGkz5LHPX; Thu, 30 May 2024 19:41: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 4VqxSm2K5gz4K97; Thu, 30 May 2024 19:41:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717098072; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0j9WBxrtLcnYZ0jnots//2/f96+hZasQhL+6EHxnldY=; b=kez023O2nrj9QMWZS+6LXeN04o93DQxCm4LIDUshHGkt93PeCaDJmrVy/DglQ3/IujKOBN c5h9jw9OSKPDbW+mUDlNMtdgFD8zHo6+mqC71DbeHUTq624fa7+cZLLXPXlsrBOeUTgglg 0GOjoM4fR/0WRxY8jxdTGSl9fBqiLMcz9Y1Cjg67aysCTHqjNOsi+yEtQ5MtEnqxwNvfOH Yaiu3J0y7PDmDLqY7MMi8vs5740aRAMrgD1vCOajqGEZKK3P2qZms19gLLPkYXVZeZyw0P J5brO0JtY7U3X2UgzycVKrD/M6WWIBdLHsZKIMpSxoKiHOrotSCmbptrkxfqqQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1717098072; a=rsa-sha256; cv=none; b=jW5Uo3lNxBeesT5x59Tw1wl0ypHql/lG2lxBQaCI/pYXY/HbronGZjISl7iZQ26IW8kP4/ 1SAcmkvqVzAwwaL+V9wEPr6sAx4PK7Gz8V++YWGp5io4jfAwXf9T6reV+O3LvJsdLkWpKq Ywkr0mEYettxxrOZuGe3irBMAdIfeuaIwtd5Sc8V3TqgwLe5F81BiogtytDjMaIV7fPMF1 C72sCB4lNAVAgX02DC7metbTavhD71vDOU0EtOH2SuAy4Bpg7bRfYMVseqidI/Elv5IZm8 ourPqO6jL9vKkYEJ7/HSfj0D9f3pUVx8e2BleWTlC+BjztP0baH1TV338YjRDg== 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=1717098072; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0j9WBxrtLcnYZ0jnots//2/f96+hZasQhL+6EHxnldY=; b=OuoZlIrpLxGTjp4+oSLbu+p621k4U52fludm0DSAu485S3T+yWgCdSkXAeZy2zRfsmz8+j KF0jq5Dhnp8JKxr2qvUg/ZumH426XDoU8ZObgZPxA9xf383XmJ17pPvuoOb0Y51etBoUiM i+Yn9G28a2Hsi4QUpmxCImiaZjMzXZtz3PMGVBvbH6HWTlMo6nA2VbzkWTfPEltH4Zkgji CY2BOSJfAgY1d4Pz2YuLSWyKf5P0Xd0XJFznkLYS2N6T7OtZXToo6m2YFP+ayHQKZwmURs DRUR4ygIRGKV+Z0lvi4giD3K9A/rfpD9BvXl3784dB/rddRo+HPzVnwqev65DA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VqxSm1wLFzsqn; Thu, 30 May 2024 19:41: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 44UJfCZA049222; Thu, 30 May 2024 19:41:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44UJfCgK049219; Thu, 30 May 2024 19:41:12 GMT (envelope-from git) Date: Thu, 30 May 2024 19:41:12 GMT Message-Id: <202405301941.44UJfCgK049219@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: e7381521aa75 - main - tcp: remove unused code in tcp_usr_attach List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: e7381521aa755682f42e7b2d1a435ce7768aa708 Auto-Submitted: auto-generated The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=e7381521aa755682f42e7b2d1a435ce7768aa708 commit e7381521aa755682f42e7b2d1a435ce7768aa708 Author: Michael Tuexen AuthorDate: 2024-05-30 19:23:45 +0000 Commit: Michael Tuexen CommitDate: 2024-05-30 19:23:45 +0000 tcp: remove unused code in tcp_usr_attach pr_attach is only called on a socket (so) with so->so_listen != NULL via sonewconn. However, sonewconn is not called from the TCP code. The listening sockets are handled in tcp_syncache.c without using sonewconn. Therefore, the code removed is never executed. No functional change intended. Reviewed by: rrs, peter.lei_ieee.org MFC after: 1 week Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D45412 --- sys/netinet/tcp_usrreq.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/sys/netinet/tcp_usrreq.c b/sys/netinet/tcp_usrreq.c index 9e0a702a6c0f..f768f42114d4 100644 --- a/sys/netinet/tcp_usrreq.c +++ b/sys/netinet/tcp_usrreq.c @@ -179,12 +179,6 @@ tcp_usr_attach(struct socket *so, int proto, struct thread *td) goto out; } tp->t_state = TCPS_CLOSED; - /* Can we inherit anything from the listener? */ - if ((so->so_listen != NULL) && - (so->so_listen->so_pcb != NULL) && - (tp->t_fb->tfb_inherit != NULL)) { - (*tp->t_fb->tfb_inherit)(tp, sotoinpcb(so->so_listen)); - } tcp_bblog_pru(tp, PRU_ATTACH, error); INP_WUNLOCK(inp); TCPSTATES_INC(TCPS_CLOSED); From nobody Thu May 30 21:03: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 4VqzHX31Zzz5LQ6g; Thu, 30 May 2024 21:03:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VqzHX1qLrz4T1Y; Thu, 30 May 2024 21:03:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717103000; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=v6SvcbaoIGRBwlJt100OMIQBQGAsXsWsrYl7zyMZ2Xs=; b=TXUBLrSV7dTKP3SbAP2sPOrD9dgA5T74V/yXCDhX8vXjpJVGGXO+vFTYTRteFAhO1pgZof k53hR3EIemOIwyem9rzO1Wpj0ArMiCKAGV0/7xGPtTNfn6nSqXnFRG6OwIFI2AfSm1MW1Q R22IrSLrVFU5xTAZK5jyyBI7KK44bz+r62FI/VFH8/ONrLhdXJiVxUnPUxFMV/l0aWM9PH 3ChqCOvuNoVSJ2pYSqj9Jz100XN31z2QdCNktOoWwG4s536pBiGIV+BDdBKANTL7YEQXiP +/uO44YLUgic1y0Lspxkfl0t7AEvCloDVNyN8slZy9BumWWPJ2hpvGW9KnGeRA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1717103000; a=rsa-sha256; cv=none; b=MPenOfHkbEmBYQW8RWuzX/MxN8R23xDCIGoFsPgm1K72pXyhFnZVL4nLLFoXssjn/Hy03/ eC5mdW/AWPoKJS2w4aoEzwAbzoBUwzG3Rr96Sf1z+izG6PX+06vOAjIdfUYgR0kYb1PCBn QMdL+ePINEGPYv2HIEf/u39f+TWTlJISycR6oOvQLvMkBG+MSIu8eS8LuGKdJGoDpxHX6Z U1Do3ekEvSDME/bO21gCcmLlkCCa44BAoLRf6c1BnhR6vjiYvylMEo/V64HynajUpEx6vh WiSG3qmZ1qbI8QM/HPwcXdWGWrAD2UYjy/Wf8aR0uYfIP60eMV1PJVVezn3EHA== 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=1717103000; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=v6SvcbaoIGRBwlJt100OMIQBQGAsXsWsrYl7zyMZ2Xs=; b=Ec9PAFEgZuLSKfse5dMWoTVWoDMxiZmbAx13aD2TZEvjEfUi7hdyS0bql8J76At1/CsRVO i7ElPNLMhwjR/CqEdtJQwM/mtLEEkWODm1qIGp13kGk04yg45W58KSTmbml3ZgW0eVdh1R o1V7tgoGK2AV8I+H+1ruNi3dt4wQVxJ2XQglaAghGIbCd9iQm8z4nw3Vg3JNdGWqMavpZ6 xCw2UbryyR153x5R6Ow+u8JfNsfNDmdgjUwy1IIijncAUPDlSKjEN/FaqfRZyr2M2CdxTS W0deK5tLqk4U9wWdoSNqNhrd0LZjgvhNmgT3T9Y8ypnz4GD0O0REAYqpmhvXvg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VqzHX17H3zwbn; Thu, 30 May 2024 21:03: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 44UL3KXq091469; Thu, 30 May 2024 21:03:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44UL3KdQ091466; Thu, 30 May 2024 21:03:20 GMT (envelope-from git) Date: Thu, 30 May 2024 21:03:20 GMT Message-Id: <202405302103.44UL3KdQ091466@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: ecd1d1f1dac4 - main - LinuxKPI: remove extern from function declarations List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: ecd1d1f1dac49c7ecbf1e7c5ffc64356c2851efd Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=ecd1d1f1dac49c7ecbf1e7c5ffc64356c2851efd commit ecd1d1f1dac49c7ecbf1e7c5ffc64356c2851efd Author: Bjoern A. Zeeb AuthorDate: 2024-05-27 19:49:45 +0000 Commit: Bjoern A. Zeeb CommitDate: 2024-05-30 21:01:57 +0000 LinuxKPI: remove extern from function declarations Sponsored by: The FreeBSD Foundation MFC after: 3 days Reviewed by: emaste (earlier version, found another two) Differential Revision: https://reviews.freebsd.org/D45386 --- sys/compat/linuxkpi/common/include/linux/gfp.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/linux/gfp.h b/sys/compat/linuxkpi/common/include/linux/gfp.h index f6cce379924d..8a0ce489f19f 100644 --- a/sys/compat/linuxkpi/common/include/linux/gfp.h +++ b/sys/compat/linuxkpi/common/include/linux/gfp.h @@ -89,15 +89,15 @@ struct page_frag_cache { * * NOTE: This function only works for pages allocated by the kernel. */ -extern void *linux_page_address(struct page *); +void *linux_page_address(struct page *); #define page_address(page) linux_page_address(page) /* * Page management for unmapped pages: */ -extern struct page *linux_alloc_pages(gfp_t flags, unsigned int order); -extern void linux_free_pages(struct page *page, unsigned int order); +struct page *linux_alloc_pages(gfp_t flags, unsigned int order); +void linux_free_pages(struct page *page, unsigned int order); void *linuxkpi_page_frag_alloc(struct page_frag_cache *, size_t, gfp_t); void linuxkpi_page_frag_free(void *); void linuxkpi__page_frag_cache_drain(struct page *, size_t); @@ -146,8 +146,8 @@ dev_alloc_pages(unsigned int order) /* * Page management for mapped pages: */ -extern vm_offset_t linux_alloc_kmem(gfp_t flags, unsigned int order); -extern void linux_free_kmem(vm_offset_t, unsigned int order); +vm_offset_t linux_alloc_kmem(gfp_t flags, unsigned int order); +void linux_free_kmem(vm_offset_t, unsigned int order); static inline vm_offset_t get_zeroed_page(gfp_t flags) From nobody Fri May 31 00:34: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 4Vr3zj64gXz5LlXc; Fri, 31 May 2024 00:34:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Vr3zj5Wynz4l1b; Fri, 31 May 2024 00:34:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717115697; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=044e7TfXmz+Cw9P8JVDHNpdgVmFkrSJ2c2XW7m/6mfI=; b=oeSq0iUr8exrSD7Ka7CSl+GcJhrRVTXmjxOnf1QPQfE91FoNzdyai5+xyd6Ux6G/5UAJpP H1JZqZ1x4h8yMbADI3jXzk9kbMtPPXpj7bTKHEJKZithp1C6R5753NfxUsOnYv5DLLW7kt Dkj+pEvfJ0gydUPo/fBdOSUur6AY4CV3ahrU/3QCXcZSc+mzuT/D6xju7HyL8wKgNnr056 06zwWxDdLbsFcJQarSkty0CKEVvyPGcija9C0Cdi8/AipcE/MUgydZsyyutnOJyzuY/RCZ rt+30Xa6GEOBWKpFsL30HeNhoK2d2TGFQaYwRl19x0CzuP5LfLSVygrYUZzMMQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1717115697; a=rsa-sha256; cv=none; b=wk1ENCR+P74SanveaxiZrzgMdCbvVPXTOF5aaW3cwqasJFUyfsxKaxSpMy1aDnCZzDpxU8 O9vYgFEHQgrlyRYqr2BDoaNcah7J9QaltMu30qc+NrNlkPoI3QcRevIPRFY9Fdm1HzC6rK 6B51i1SD85XNDJ9Hc6WZgHU8X0TOm3Wxc3uXLP9KmFfALxWYbbmNSx0Ml+w3T3ri/UStXa cTEVpkguC3e5hnS6C/HZ8cIk3G0X4TLd6v8nj1jdZdB5wcfhhqTHyEoRoDthiiaDQhftSa 0hh0QF6IehBfpUiMBWxmSMbH/IuPA9k1XVyF0F3aZYL3GX7AoSQ3Fy+NIaSynA== 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=1717115697; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=044e7TfXmz+Cw9P8JVDHNpdgVmFkrSJ2c2XW7m/6mfI=; b=WUUhDIW2RznRgROuMHGpZDFd9DfrHiyIRnxwOp6UA7PKk0hUjKsF/6MF1afhja+zQ3hLHX VlDh/4dprbkLyIl3zLhZUUT4TDI6caq6+/pY1mUNnw1O/vIGZr/lbSCz5mYnKpIa7kZ8kq mM7SqQHhOc0fZ02jG/a9kIpZuvTcNJ42cPfEHg/83+u30S5hYckRh9ISAVCnYs/zl9fRs/ PhwS/COvATFp+S2jw4Mfq+nIUyIkdBVGrF85s4ltR6d/OoXyOrRwdtlVafzcAtA/GypPoV MYZ7AGuVEoENlZZyaWJ/SBpTXgKqTkEO4hGCKR3ul9DT67unIeTghP35WzcIsw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Vr3zj51N7z12mN; Fri, 31 May 2024 00:34: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 44V0Yvhj043446; Fri, 31 May 2024 00:34:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44V0Yvtj043443; Fri, 31 May 2024 00:34:57 GMT (envelope-from git) Date: Fri, 31 May 2024 00:34:57 GMT Message-Id: <202405310034.44V0Yvtj043443@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: 10e31f0946d8 - releng/14.1 - Update in preparation for 14.1-RELEASE List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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/releng/14.1 X-Git-Reftype: branch X-Git-Commit: 10e31f0946d820d53adc58b7d013b969e4a9a8ed Auto-Submitted: auto-generated The branch releng/14.1 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=10e31f0946d820d53adc58b7d013b969e4a9a8ed commit 10e31f0946d820d53adc58b7d013b969e4a9a8ed Author: Colin Percival AuthorDate: 2024-05-31 00:31:16 +0000 Commit: Colin Percival CommitDate: 2024-05-31 00:31:16 +0000 Update in preparation for 14.1-RELEASE - Bump BRANCH to RELEASE - Add the anticipated RELEASE announcement date - Set a static __FreeBSD_version Approved by: re (implicit) Sponsored by: https://www.patreon.com/cperciva --- UPDATING | 3 +++ lib/csu/common/crtbrand.S | 2 +- sys/conf/newvers.sh | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/UPDATING b/UPDATING index 83b0d8b27cda..2d4a66d0d29c 100644 --- a/UPDATING +++ b/UPDATING @@ -12,6 +12,9 @@ Items affecting the ports and packages system can be found in /usr/ports/UPDATING. Please read that file before updating system packages and/or ports. +20240604: + 14.1-RELEASE. + 20240202: Loader now also read configuration files listed in local_loader_conf_files. Files listed here are the last ones read. And /boot/loader.conf.local was diff --git a/lib/csu/common/crtbrand.S b/lib/csu/common/crtbrand.S index b59e2fd8056b..65c0c3863bde 100644 --- a/lib/csu/common/crtbrand.S +++ b/lib/csu/common/crtbrand.S @@ -43,7 +43,7 @@ .4byte NT_FREEBSD_ABI_TAG 1: .asciz NOTE_FREEBSD_VENDOR 2: .p2align 2 -3: .4byte __FreeBSD_version +3: .4byte 1401000 4: .section .note.GNU-stack,"",%progbits diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh index 7ba6ed47b3b8..38d445be32a6 100644 --- a/sys/conf/newvers.sh +++ b/sys/conf/newvers.sh @@ -53,7 +53,7 @@ TYPE="FreeBSD" REVISION="14.1" -BRANCH="RC1" +BRANCH="RELEASE" if [ -n "${BRANCH_OVERRIDE}" ]; then BRANCH=${BRANCH_OVERRIDE} fi From nobody Fri May 31 00:35: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 4Vr3zw4QVFz5LlVD; Fri, 31 May 2024 00:35: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 4Vr3zw3xtsz4lHN; Fri, 31 May 2024 00:35:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717115708; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mj5pqxuXXMkXwWZR+2empqVOueWPraXmYPnwKx6Lte0=; b=BOQ2WCsFCY6GXplKgT5rFc809/QEv3LkiTH3MWHIgZ7jJBSj5AGuNbwiSxZSjZS6Pa1jDv EJd4/oP/qeT9VibcLP6OWx7IgAhjtlABDNLsrD223F4u0wAd1gQd1Zjy4a1Io1CWbnFmR2 wP3Fw1wVg31ZAOG0URU79NvZ/l8ZaX/ywYe40eUFKvmCQ4J4t1I1jK3f4uj6LKln4i3wag nWl3rV+n8JbKfEQmYoLivi2vszxFXaJ6DnEj03lTxHQ/iJVi19hEqyOGnPoHs5UBKxDWgn EPcVf31y0yZERWbLk8RhFRyG6xmzWWSMn08xT0tDOh87PgACvQWrCDnXNTeafQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1717115708; a=rsa-sha256; cv=none; b=jv1lf5M3/RiuGXNo97ndXl6d1qB1CJPZF+CqF5fIOgP2AT+zsOMALG+ken5pTbXw3x6+jg sSgbVDK0E1shLVpBwKKaMGYR4NyP16KM2bSak7Yu7bhOjdVHYltgEJdId5GgufRE9f3oBt UxwCM+8Phgmws8QeThWBMRMGpeHIxaSlG+l0CT4kYXhCMMoG8BpqPScWY+Tia/cl2mO9YC eDFYR1eYF0YnXutU6L2Z8b8LYOLlkCTGZm3BqMVIQLjMEqxx7Sg3+XNvRJpqczf8SL93iW MdYHxXSAabacjwLaYX21MM9sxoOZEB6OLDIsMKWj8+kl1JZUvPpOfU+/tU7PcA== 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=1717115708; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mj5pqxuXXMkXwWZR+2empqVOueWPraXmYPnwKx6Lte0=; b=qL85mVlvx3ioQl6OB0Sjg12bsTuZ0kt/+ZWSxOEbbsTcTtvngl9D9gXNZXdSpfOHImSm1t l4uyLEn84nuFzOn2FvTwvFVvB8UU6+sdtYT3DwXKpXMmtlozZHdFC8HXePbNBmXUqeI8Mr FCpgs+MfZRdCgW0juPCe/z88RM6CF+rCjjqImNb6Q+iso9qpiDSwXMKDat9fJtl5Dx0236 R5tkgIjrwZ5p8HkculYFtpyJOBhluu3uUqBDJ3odZb8aSEVJzdybs/ntKSxZT5DpPVVEKD CpG2AQMbz5xtwhqmP07ERH7zRw56BSuIjzKCcNvjhU5/Qo8D+IB7JZ4KtslwGg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Vr3zw3Ybhz121k; Fri, 31 May 2024 00:35: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 44V0Z850043569; Fri, 31 May 2024 00:35:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44V0Z8Bh043568; Fri, 31 May 2024 00:35:08 GMT (envelope-from git) Date: Fri, 31 May 2024 00:35:08 GMT Message-Id: <202405310035.44V0Z8Bh043568@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: 9699c03aaf9a - Create tag release/14.1.0 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/tags/release/14.1.0 X-Git-Reftype: annotated tag X-Git-Commit: 9699c03aaf9a4530f1a5eb193591e1e919f075e8 Auto-Submitted: auto-generated The annotated tag release/14.1.0 has been created by cperciva: URL: https://cgit.FreeBSD.org/src/tag/?h=release/14.1.0 tag release/14.1.0 Tagger: Colin Percival TaggerDate: 2024-05-31 00:34:21 +0000 Tag 14.1-RELEASE from 10e31f0946d820d53adc58b7d013b969e4a9a8ed -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEEglY7hNBiDtwN+4ZBOJfy4i5lrT8FAmZZGw0ACgkQOJfy4i5l rT81KxAAgMHObpgfoTUaNveIOfu8W7C38VRO6+UBQNCVgTX7+vh68uXbwHKwGqXd 5SLExEMbNHuBz/nIF90dB9rReQmjP3MUMVgqkdQxdrrTCPCxp1pzjsyapWZ3UCvC aUBSVV1isbOksthavq1AhOwVWquvrt4mtbEX+8yo4nryYj8ATWx9++zIqhi7bmGI /680hLNRpd4NlNPneLRNTdcVD8SOeqCpPCwWAakUN3Ax80j+aPpjtzMDLveGbFwE ZKTbbc/uCFqYSgCcJacPwppKAEhcJ52M21dF9ND1J6aLhAyeKmj0zHfWmF6pImWC rXB4xNZCCiMOZEvb70k+Achoxx2OIimf6OltcyZiuhbbA1Q/ZMnOXILPXTm38Oqu 4IDjSR8ClI6ZK5+kDQTrJiEGUiD0NQFI6lKGEyyVsxbHsaXi+Jqr4beExKYa1Sn8 LEQddB5ld/sGj139PXwbP7HJx9onbzxyXy3hFbi3X/WQTRSmQWayUejz0pXDmgY4 OhQ6Mjkzg2SdX9vnAvxv0uUc3f3jqfQ/Qhf9WoFgRuWKKK3QV0Qd1Y8jkNW3oRmb e9HJ8raRV4j0L/R1Lolu6YwH9Mdhqy+9Y3a5aDIripkhYORyII0UBQ5efPmDJARv Y1dmI2IH7+tIjouxHF60Lic8Qpb98+RpWHAXujKkybLkXa7s70Y= =5ldh -----END PGP SIGNATURE----- commit 10e31f0946d820d53adc58b7d013b969e4a9a8ed Author: Colin Percival AuthorDate: 2024-05-31 00:31:16 +0000 Commit: Colin Percival CommitDate: 2024-05-31 00:31:16 +0000 Update in preparation for 14.1-RELEASE - Bump BRANCH to RELEASE - Add the anticipated RELEASE announcement date - Set a static __FreeBSD_version Approved by: re (implicit) Sponsored by: https://www.patreon.com/cperciva From nobody Fri May 31 01:30: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 4Vr5CM2BPPz5Lr35; Fri, 31 May 2024 01:30: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 4Vr5CM1Ppgz4plB; Fri, 31 May 2024 01:30:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717119007; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=C73ryekOru2slC24NzNQ735J9wSV2sMQ8mFZ3MLzAVs=; b=MjUurzZm8csAd8Qw91Y/5O+kUGJ9ofGLww9TIks6JdrvGlV+YYV+emfmjlfFmaKnyfqOnT whtbFy7iW4pD6FtxuFTAS++5lyr/s42ZTXokiAauZlcvRMOvrDKT9ZQrJZ/L8o/Dj2BnV7 uncs7rCRywrcFtvQL6moWd/13cGgV2CxmVpzXKB3wLoOmoioV4IQXcObFPfJx+a561QDLr hSkwBuiS6H8K8+/zQN46jbw786JmRYElsCbSbPuyqD8WXALMX+qohNpqxpggd6B/3LNTUB SYGcGt6lIwvV5Yo9k2M8xVkWrw3rMdHstrmUc/6iG53Q/NNwx8AkRrWoLZnIEw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1717119007; a=rsa-sha256; cv=none; b=ZzYO2KEvEEj4YSY5f69Ht8ESlyu4fL9fKTFdQtP1sJ8y1IfSv7gFzZgInEyDrYZLmRfVPn yOP90YMTLDxyvUE982wzhEDiw5elfmEQKaWM2eY8/KI4Xgmqb9hJZk2f2SWuxdIz/TVYAl T/3+/bKRtG6CDTOr9bpuQDyhn0lBvJrZZJu0BM8nmvfRb1qOQH/Pioh2jyY1yNsvnIz89J ye9tzuQWMvw/iTJFl2pb5zo1HB1Vj+w47cKU2jCDEuBft/3lQrgFxzsmzjdKnU0136/cme ifOQ/Iq8SmgVCC4CfJjgCck/eEoHmImTaPYqLTUashJsWsXokrjXpIqL4tU9SQ== 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=1717119007; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=C73ryekOru2slC24NzNQ735J9wSV2sMQ8mFZ3MLzAVs=; b=JVXYGOxBZGNnddwkW1I2YICQW/N3KZbYKhrVbCr/RS8RtvtFMIpBdMZwTbR6qhEJ190L/o zLkaJ1Na/zPg9BVOpFTUSzggGEBkECiy3pKBgwRxMMNP7g+tfgGHlEQFa0iENtg+OPbBB1 x2L9ALLbW8VAjZjp7ubKO+zp+TwGTiG5Gd1daZ4UxaY492D7UjNEMc4iqNGwswBH6y7OvQ 02MbH7NVmLf9MgwEES7p34Fe1JMNHKNysdI0qgtMns41D0Tk9z+tceFpXsQOsAjpYo6xdM 5EDIoFnimi4bxIyCx52PKGw+Z25jX8q3Q97KdjxnXjXFaT0ESddw/rbr1E5yGw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Vr5CM10TVz141h; Fri, 31 May 2024 01:30: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 44V1U7YO031728; Fri, 31 May 2024 01:30:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44V1U7mI031723; Fri, 31 May 2024 01:30:07 GMT (envelope-from git) Date: Fri, 31 May 2024 01:30:07 GMT Message-Id: <202405310130.44V1U7mI031723@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: dddf29712f38 - main - smbfs manuals: describe consistently List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: dddf29712f38ba1d804c02bcfd02d24098ae48b0 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=dddf29712f38ba1d804c02bcfd02d24098ae48b0 commit dddf29712f38ba1d804c02bcfd02d24098ae48b0 Author: Alexander Ziaee AuthorDate: 2024-05-30 21:37:15 +0000 Commit: Warner Losh CommitDate: 2024-05-31 01:29:17 +0000 smbfs manuals: describe consistently MFC after: 3 days Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/ --- contrib/smbfs/mount_smbfs/mount_smbfs.8 | 3 +-- contrib/smbfs/smbutil/smbutil.1 | 2 +- share/man/man5/nsmb.conf.5 | 7 ++++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/contrib/smbfs/mount_smbfs/mount_smbfs.8 b/contrib/smbfs/mount_smbfs/mount_smbfs.8 index 4b4c205dc7da..604b1b414243 100644 --- a/contrib/smbfs/mount_smbfs/mount_smbfs.8 +++ b/contrib/smbfs/mount_smbfs/mount_smbfs.8 @@ -1,11 +1,10 @@ .\" $Id: mount_smbfs.8,v 1.10 2002/04/16 02:47:41 bp Exp $ -.\" $FreeBSD$ .Dd November 1, 2018 .Dt MOUNT_SMBFS 8 .Os .Sh NAME .Nm mount_smbfs -.Nd "mount a shared resource from an SMB file server" +.Nd mount a server message block (SMB1/CIFS) file system .Sh SYNOPSIS .Nm .Op Fl E Ar cs1 Ns Cm \&: Ns Ar cs2 diff --git a/contrib/smbfs/smbutil/smbutil.1 b/contrib/smbfs/smbutil/smbutil.1 index cf133bad309a..c82ba91ea99e 100644 --- a/contrib/smbfs/smbutil/smbutil.1 +++ b/contrib/smbfs/smbutil/smbutil.1 @@ -4,7 +4,7 @@ .Os .Sh NAME .Nm smbutil -.Nd "interface to the SMB requester" +.Nd interface to the server message block (SMB1/CIFS) requester .Sh SYNOPSIS .Nm .Op Fl hv diff --git a/share/man/man5/nsmb.conf.5 b/share/man/man5/nsmb.conf.5 index 1a09743874e5..0da10343ed77 100644 --- a/share/man/man5/nsmb.conf.5 +++ b/share/man/man5/nsmb.conf.5 @@ -1,3 +1,6 @@ +.\"- +.\" SPDX-License-Identifier: BSD-2-Clause +.\" .\" Copyright (c) 2003 .\" Originally written by Sergey A. Osokin .\" Rewritten by Tom Rhodes @@ -28,9 +31,7 @@ .Os .Sh NAME .Nm nsmb.conf -.Nd configuration file for -.Tn SMB -requests +.Nd configuration file for server message block (SMB1/CIFS) requests .Sh DESCRIPTION The .Nm From nobody Fri May 31 01:32:42 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Vr5GL4qZQz5LqyB; Fri, 31 May 2024 01:32:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Vr5GL2d7rz4qKg; Fri, 31 May 2024 01:32:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717119162; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8pl/pN/F+EyfIaY8GvqtAW1q6TVFZeNNhCdVaMl+ta0=; b=bCVZV58eW22CeI87nN8cFG1gAexayzmAZubX09kA0/Pt16zDPuIfQ781Hpvh6FoJHXSFDV XeOcP1DT3qIQKDa5iaJvGmkgP01eI0ZZs1PCO9E4xl/mRqDrqBWPdsDJrJMm8Pc0FdoQfu SQHYj/bEN8vIdQuVyoCUuLWLMyk9omewR8ztdlZL2OB3HXWi3jc2drClefKqJ0tBTUwei4 PKBm9p+8JaGoWWLqvLDcF5c4KCefk5Z67rzt0ARbyuAZ12pn4kAkUkuC8pRSEs1HDyjzkR ae8DDRlPWu2aGkFUABdBrkzN/5jeCMQZQI/uFsI6nflhn49zgN4/tlX9XsqqDA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1717119162; a=rsa-sha256; cv=none; b=OOdcP9/itUy+8ZH1/VrKZwsZwKaKJSrJ3PBtOU4mPQVN3uJXjVuVPaNGHRfkjOmtSGO1TD rvyrX56PZHZ3VhdjrVeK0p8SapRYjo1obo7/NLW7ak5HpC/S1Au2CztwHUz++JNNtjr9jG 5Sofyl8gswCAsUDGnspYV6zghKWkuZY4CObzIsprEW6H5iPXalwW/ux+7wn3sGRYYbsiAM TZsl1YjpAyWZgJDL25aSIWOJT1P5AgsIlNkQWvU4dHEjq3mXjSdo02fHepxLdBsZkVR7pK AoS34e8nSHqtPaU0IJPn/SyFo7nB4tJKzMgb6vpI+eGuq1oLeKBAdWmmDSUV+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=1717119162; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8pl/pN/F+EyfIaY8GvqtAW1q6TVFZeNNhCdVaMl+ta0=; b=jBrI3MfaC+fQDOAM9LevihOfLcvSBJh8lkTopAb4PmE8uam0wljFtPE+bx2TCECof47T/W Qn9Ndd0B/G1OxmQxaajCI0Z/P/9hhOFysYTQ9zhRQ4k9KtPXMvSzF7IdfwtGg7oGYtPW8E FJq9behHuG/oS29qlfmgiN/m5H8aYATbtNpvKfYze2Qux80zQwsIyqfR4gutpoFoXeBM5L mu3bPAVeg3wG+KnqVCc7mS0zoHOmJmEvH0YxPtfDDnQknx7t7f9Ve5Bm5ER6ocewQ6VxSh 5072kJGsaPTxqdbUa/Punh/luKptF3zAG+FUOnKZFEe7OoWbVCqgC0yUrD91gg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Vr5GL2F1tz14D4; Fri, 31 May 2024 01:32:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44V1WgaG044168; Fri, 31 May 2024 01:32:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44V1WgsZ044165; Fri, 31 May 2024 01:32:42 GMT (envelope-from git) Date: Fri, 31 May 2024 01:32:42 GMT Message-Id: <202405310132.44V1WgsZ044165@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: 8ccdf86ee575 - main - smbus manuals: include term SMBus in description List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8ccdf86ee57575b04983bc7be68c357fb83668f8 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=8ccdf86ee57575b04983bc7be68c357fb83668f8 commit 8ccdf86ee57575b04983bc7be68c357fb83668f8 Author: Alexander Ziaee AuthorDate: 2024-05-30 21:58:20 +0000 Commit: Warner Losh CommitDate: 2024-05-31 01:31:21 +0000 smbus manuals: include term SMBus in description Fixes: 5ad3b09f2fe9 (smb: distinguishable descriptions) MFC after: 3 days Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/ --- share/man/man4/iicsmb.4 | 8 +++++--- share/man/man4/smb.4 | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/share/man/man4/iicsmb.4 b/share/man/man4/iicsmb.4 index b6f5e39ce5cc..ffa38000659f 100644 --- a/share/man/man4/iicsmb.4 +++ b/share/man/man4/iicsmb.4 @@ -1,5 +1,7 @@ -.\" Copyright (c) 1998, Nicolas Souchu -.\" All rights reserved. +.\"- +.\" SPDX-License-Identifier: BSD-2-Clause +.\" +.\" Copyright (c) 1998, Nicolas Souchu. All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without .\" modification, are permitted provided that the following conditions @@ -27,7 +29,7 @@ .Os .Sh NAME .Nm iicsmb -.Nd I2C to SMB bridge +.Nd I2C to SMBus bridge .Sh SYNOPSIS .Cd "device iicsmb" .Pp diff --git a/share/man/man4/smb.4 b/share/man/man4/smb.4 index fb4836c03688..e944f1b76b5e 100644 --- a/share/man/man4/smb.4 +++ b/share/man/man4/smb.4 @@ -32,7 +32,7 @@ .Os .Sh NAME .Nm smb -.Nd System Management Bus generic I/O device driver +.Nd System Management Bus (SMBus) generic I/O device driver .Sh SYNOPSIS .Cd "device smb" .Sh DESCRIPTION From nobody Fri May 31 01:41: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 4Vr5S66PRPz5Lrg5; Fri, 31 May 2024 01:41: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 4Vr5S65Vvpz4r8Q; Fri, 31 May 2024 01:41:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717119670; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OiILDrf52NywqlEV0HqDc1hiK0lsv3dZoK+IoD00DrY=; b=jf1ddQra7NX/Xz5wW0JSE7C3xS7w/UzRN/PcEJ9f0PS7wx0doJvaYwefq0ZvaR1UeP/Q+p g7990169yE9tmp2NURmfmXbwHUrlTOswIwEFxbgxEjMyBJOROYcGRz/TED45U1OC3QkMYZ N6BosIEsGh2CFUBFmBkfb4f7rSgMjhGdRDFbce5th0vOmv0ZAK8jFR64MGuMYqpCGoPExm gdA4KJtmWdSxes8o+0/jvTi0i5z+aqSO+dSX+5VYRr232EXOErHKuouq/okrjnoMpeURKJ bm8yJjKxKMvZrUOctcrWv14qi1/LS7vG576YE4wMAaX6X5/PjEDuS+awzdKfEQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1717119670; a=rsa-sha256; cv=none; b=BxYvbxcCIrOmOu00c5/5N0hC+SVoY6XHjMMEsQxv9GltaIYrnwisnEGcUj+94LtGC1hcL1 VeQrBSQrS+VKBG/vnhl61snuVhfGpc5c6zxiSAzPNu3NkjKl0VpNsef7z+1QheSM8ZeA4q ot7Gs8sGY4sFnS+RGuBC3KhKzIW4RbwlpFQQ+0o/VI28A/TDNxaOyIHAU/bNayJa8l0ODb REApiQaYX61giMgPg5rf9X0ZV2GMzwqHmx/0sGPcEZDItmzDPvy+LtEH/T2T+XkzD4TSf8 tUq2RSrq7GvkCXvUT+iw5hVeSl813mjeBDGWwGXaZhruR/6PxAq+iyn0FwnkNQ== 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=1717119670; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OiILDrf52NywqlEV0HqDc1hiK0lsv3dZoK+IoD00DrY=; b=jSXGe6REX8XX78SPAnqz5sSE3Isdu6EMu9xITWEjNLvh0m5w2XagV3q1QOZMzVADunvtU4 EocevuGd+xsIb2XTRBGCorakHKWMP4NY3p7Bqf8jaUsxhO4YS1BTePNrIL92M8gW+clUQL Nm/Fa7JYw0a8RmiaTufX7ZpmKRL1V6xV04sZqFl3qIo871g2qweN9R/3uxfetlAk+D4A/z R3ir8uQZQD7XXLkpWEvR7xy9gBEA30Y40FdponnxAcVxK2/E6c5e8lBNcJ/f6PvgD0Ru4e a1oMH9Sf1I2kemC48V5P6YxBF5JvLoMVFyArxxOA3vWi5TmY93nnNzTz/SS7og== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Vr5S656HJz142S; Fri, 31 May 2024 01:41: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 44V1fACg057642; Fri, 31 May 2024 01:41:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44V1fAff057640; Fri, 31 May 2024 01:41:10 GMT (envelope-from git) Date: Fri, 31 May 2024 01:41:10 GMT Message-Id: <202405310141.44V1fAff057640@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kevin Lo Subject: git: 345fd21a6a03 - main - Add a new USB ID for Xiaomi mini USB WiFi List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevlo X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 345fd21a6a03477b788f353c29d36fee034e6480 Auto-Submitted: auto-generated The branch main has been updated by kevlo: URL: https://cgit.FreeBSD.org/src/commit/?id=345fd21a6a03477b788f353c29d36fee034e6480 commit 345fd21a6a03477b788f353c29d36fee034e6480 Author: Kevin Lo AuthorDate: 2024-05-31 01:40:03 +0000 Commit: Kevin Lo CommitDate: 2024-05-31 01:40:03 +0000 Add a new USB ID for Xiaomi mini USB WiFi --- sys/dev/usb/usbdevs | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sys/dev/usb/usbdevs b/sys/dev/usb/usbdevs index 6820e8b4025a..4bb24e01c97c 100644 --- a/sys/dev/usb/usbdevs +++ b/sys/dev/usb/usbdevs @@ -779,6 +779,7 @@ vendor TRIPPLITE 0x2478 Tripp-Lite vendor NORELSYS 0x2537 NOREL Systems Ltd. vendor TENDA2 0x2604 Tenda vendor HIROSE 0x2631 Hirose Electric +vendor XIAOMI 0x2717 Xiaomi vendor NHJ 0x2770 NHJ vendor THINGM 0x27b8 ThingM vendor PERASO 0x2932 Peraso Technologies, Inc. @@ -4966,6 +4967,9 @@ product WISTRONNEWEB AR5523_2_NF 0x0829 AR5523 (no firmware) /* Xerox products */ product XEROX WCM15 0xffef WorkCenter M15 +/* Xiaomi products */ +product XIAOMI MT7601U 0x4106 MT7601U + /* Xirlink products */ product XIRLINK PCCAM 0x8080 IBM PC Camera From nobody Fri May 31 03:59:59 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Vr8XH2WtFz5M4Cg; Fri, 31 May 2024 03:59:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Vr8XH207Qz43RG; Fri, 31 May 2024 03:59:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717127999; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yyA55YAUaNtZ68TfnC8IU1dWl7A6IVnWZV5ASbpchn8=; b=yKqPnPXTA4BXyzQ++CL8LQqeOIUl9KTJRN432kEtSo6lPgQrDIx+lOBohr2toiECALVX0z 26o2WEfFBrYvbp0PKzIV0ZvQuP9gcNKK/uvHQ2PlWwnL/80/ZGJYVsa30dOYRqlhrBaoJS I2zNQIhqJlpseHwZo+wGcbC++pAOKKzmIg4etreY8OiDg7bf8h5EM+r3BHi5A9ydSJKKx2 9lf4NEXjMARtaGgQUjJgnBc3Zbh7z7Q642alzXBjXVdK+c/5oB90XZVIdraAlsd684zLTE J++Fhlm405o8+EFi3KOKetAAQfu/8zfPg3JimkbO0L8Ct9Xc1ndwAWq9xUQfBA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1717127999; a=rsa-sha256; cv=none; b=CUAZHDkBLCI1xpwxrsxgC9EwV57LRWm93ZAcqi9Up5Qft7x23rvSOA+++nO9RlAWxUESUk amWCGxE+PY3DgW2zR066xwQTDh/1dVxlFp3AJyi0VNg3xYKzTNt6W3wYnDcZwUpvI1pwdc 9r1zpMHF2BFW8r9D02th+R0sbUgnz6P0eu2UambReOCEBSdwuVq+PzlNJYkNAF9UU5hoyK vPOmCPvwqF3G182o8SxHRaFGYIm0O+01OsR2OhTofELlM/MLAF2+5o7MpK0MB/XR1usTfL YAh52pIEQvo0RE/ei4tBOeJtw4lLFI+RPVZhcSyT2KWeu8Bw9pDrmEC+6L+yLQ== 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=1717127999; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yyA55YAUaNtZ68TfnC8IU1dWl7A6IVnWZV5ASbpchn8=; b=r7MPStrVmUkPxggDhWVzNQeH6V4l0p+WaePFVQPUZG6QiFqOl2ayJVs8D8haZyQXOGPl30 3ae9yW4EwnMwjuL7xHA3O6uzCH+x5YH2BsOL7lCNj1ZmOevCiJjnq2IYqesrPuFk47y15d Wk2c8rPmHZgyzxumdZ72BwSq59/tyzLMM9wc9sIGMyclN3FPKX2UF1llyWcwZni377OPow 5ce6sSdJObcvBRgEIdwN9DxgNl9FodybYCE7duESrhG/Wrzjlb36k89GDGEMsNhp1LuPHA lO7WJEWiL8ibaLkSyILu04OQafw93wfmux8/rsuduW2cRVX8irzeuvm/r0ndbA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Vr8XH1WzVz17gZ; Fri, 31 May 2024 03:59: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 44V3xxEj081629; Fri, 31 May 2024 03:59:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44V3xxir081626; Fri, 31 May 2024 03:59:59 GMT (envelope-from git) Date: Fri, 31 May 2024 03:59:59 GMT Message-Id: <202405310359.44V3xxir081626@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: d28bbfa2715a - main - localedef: Bootstrap better List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d28bbfa2715a45c841e0eeec38d7f7b73513c66e Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=d28bbfa2715a45c841e0eeec38d7f7b73513c66e commit d28bbfa2715a45c841e0eeec38d7f7b73513c66e Author: Warner Losh AuthorDate: 2024-05-27 17:07:26 +0000 Commit: Warner Losh CommitDate: 2024-05-31 03:59:15 +0000 localedef: Bootstrap better Declare these functions in a macro-safe way instead of relying on ifdefs. Sponsored by: Netflix --- usr.bin/localedef/bootstrap/ctype.h | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/usr.bin/localedef/bootstrap/ctype.h b/usr.bin/localedef/bootstrap/ctype.h index 510873aaa764..6c9532540219 100644 --- a/usr.bin/localedef/bootstrap/ctype.h +++ b/usr.bin/localedef/bootstrap/ctype.h @@ -40,17 +40,14 @@ /* * On macOS isxdigit(), etc are defined in _ctype.h, but we have to include the * target _ctype.h so that localedef uses the correct values. - * To fix macOS bootstrap, provide a declaration of isxdigit(), etc. here. - * However, only do so if they are not already define as a macro (as is the - * case on Linux). + * To fix macOS bootstrap, provide a declaration of isxdigit(), etc. here in + * a macro-safe way. */ -#ifndef isxdigit __BEGIN_DECLS -int isalpha(int); -int isascii(int); -int isdigit(int); -int isgraph(int); -int islower(int); -int isxdigit(int); +int (isalpha)(int); +int (isascii)(int); +int (isdigit)(int); +int (isgraph)(int); +int (islower)(int); +int (isxdigit)(int); __END_DECLS -#endif From nobody Fri May 31 07:30: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 4VrFBv4V3mz5MN3b for ; Fri, 31 May 2024 07:30: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 4VrFBv43NBz4MQd; Fri, 31 May 2024 07:30:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717140615; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=D7sXZWVEDMlXy9mca7ZINqmOqSLTBrrl9HkyYFvHAvM=; b=GTHOvPAltib/QbFNnEvMSrIQiEJjgVrokTI2TOe6c+81IfFsxmAaYgBky8gOivhgZYyr6O 1TH086UZ48MQXtFeKj2jmYwpXeihVRISO1AmCeM4uzyHU1SASpYpL89bsccCZPg3Lhsjjm N7oKXDh8v2dQufzoRVMaDnLgBDzvIBwb3IGB6++fCT+MGdPYGBjSAw8Wqxt1LSnzrcLTb7 /9Aiilw8VdNHeKamTO3Ekjqs/++YkvVi4iG/cG//2PNTMO5PGVN8CCUP2zYqSWYVvEUyPm Ar/yT/hC1q/YDgisMi1OZCTvbD0ZSBnRddpIMTl0h49xjPKgjnveFsk/76oR8w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1717140615; a=rsa-sha256; cv=none; b=F6w0uEONWJ7pamXFNXrOMuA5e7NDNdRKPM5z+28MRajKixwM8s9MYGClf/8BzqEc7y4b8f xGZW0gARqFGyfWIcqmmoNKEmSjufqfhcgN9CxGL2VHWcDI3dri+ge45eNUlUJPmnOTRnOX iH67xGXF+wad+gN1Nx7cPaaqNaydoEJr2Ndj5JUZiJHPz2BTzKNVHxGdKnsUFqwcbmJDz3 b6yYhRusf6rDtOV+sGcQa3XbKJCullhgjc8na7viuk9FXvs4kiLrFGx5Cpja2tc+6EFf1J Ub2x0bxD6gKZyA28iezv/UvZFMeb4XRSuGu6dvzBtk5Y8OM9zZEi6G9z5nbm4g== 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=1717140615; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=D7sXZWVEDMlXy9mca7ZINqmOqSLTBrrl9HkyYFvHAvM=; b=tOf+XV4ZTVGQqQ+kdYErd0zxpeZsOW6hygmbH09vPVU7Egi/6+5PdoyDssJgLrSp/oflox Qsre/eHgS91JHJgn7bgvtFvHpyNcO6jpCfci0pvSJRuu+iUiKHv8J3ul6RLnXbsNgxwedA uCFxhe4tscwgk2aG048b8QHWfu5ujeB3xLYp7Rk0KGHSNtz9Pq5bvv6K4BkSX9OiDX6KFS q12cgioWjRSBw1nEH2fINrSZwcam7PkGZCAI/lsFeNI88W9p8ziC7lby2eTtHWQy3IA9co xhX4SkCzqmIrfzAR56VyjdQRrE1OxmviIAjVWFK2iU+uMa/4j1HeeEauIyvaVA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VrFBv3fYwzFNC; Fri, 31 May 2024 07:30: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 44V7UFfF042806; Fri, 31 May 2024 07:30:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44V7UF6G042803; Fri, 31 May 2024 07:30:15 GMT (envelope-from git) Date: Fri, 31 May 2024 07:30:15 GMT Message-Id: <202405310730.44V7UF6G042803@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: Martin Matuska Subject: git: 02c5aa9b0928..e2357561b949 - vendor/openzfs/master - vendor branch updated List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mm X-Git-Repository: src X-Git-Refname: refs/heads/vendor/openzfs/master X-Git-Reftype: branch X-Git-Commit: e2357561b9499296bff758afe4868dbc39735675 X-Git-Oldrev: 02c5aa9b092818785ed8db4e2246a828278138e3 X-Git-Newrev: e2357561b9499296bff758afe4868dbc39735675 Auto-Submitted: auto-generated The branch vendor/openzfs/master has been updated by mm: URL: https://cgit.FreeBSD.org/src/log/?id=02c5aa9b0928..e2357561b949 800d59d57718 Some improvements to metaslabs eviction 6b95031f5642 zed: Add deadman-slot_off.sh zedlet 01c8efdd59b5 Simplify issig(). ae22044da998 spl: fix compilation without HAVE_BACKTRACE 5137c132a5e8 zpool import output is not formated properly. e2357561b949 FreeBSD: Add const qualifier to members of struct opensolaris_utsname From nobody Fri May 31 13:01: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 4VrNYB34Tdz5Mrt5; Fri, 31 May 2024 13:01: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 4VrNYB2S9Kz4ptP; Fri, 31 May 2024 13:01:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717160494; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0a0vrCRpUrRJqrV/eI7QZLUbpvkKdWmrJpMWzm1fD8I=; b=pq5mQYH9rNNPLYhzH4yC9OK5dCyAzMMYW3i9CGkFdv8RwGTmEMd8tOyko1CxILdgSt7V3B ZNRMuEhHVUmScwbbof+4+6LS16+9DDGbbLy0tESVyOuvW8g9FzmhejmYaLtQS4iG2C5zf2 awWqcN8ZikC87lyQ4h9MElhvlFbGwOhSagvKpcGlMSQv+78+1QvmnXr2ulEfPNN82LycOJ E13g9fh/ncTUiQGgCGUMd42UmRqhIeIvRxm4QXjLtdSuRVaMyAKvPiJcIVVe9/2wDh+Eq+ T0FNWxmSqEPULNJjvpfis+aE4hDvdYJe6iM8grpZny0oN18vxHWJRybLmewNhw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1717160494; a=rsa-sha256; cv=none; b=PS66tRf5yiVGUhAVdV/5utRLmqPubUN8qJoDe+aaakRoIwvIb0HibTntISsLiuQ9u/SwSH w811q8dqCgPOdzCVIu90if5iRCLa9oR6nWvaCmPUzp/hZREo7yModfFwQ2JVcz4pOx9XEk S5Ch1EriAVuFwdk1gAOWKQ9WsltthR3AxpDaMdqgXEAHMK8n3uyq/HdO9p0N/UgLWg5PG5 IatAB1LOR9kAPeiJRb4nBHOdOJH0D5Isngqt5M5JPuBYD2t+TDiBj7LB8xpDbdOeUQCJCt VFE/OXPct66XVl5vm+UEBoLf1XBOh3n39KhMKD+0oLSq3tomGK/bGGDgX6R6uQ== 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=1717160494; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0a0vrCRpUrRJqrV/eI7QZLUbpvkKdWmrJpMWzm1fD8I=; b=uyV4C25g9rQQ6UyxM7LG7XJgEh/S40GJtdysHs+wMmM7yFJaBe7ckU9AQxXVUgNQlsKRP8 ElA79nEBMRdgKmkvyJY+inkPI1z3arNmNrS0fybYBsyisjMr72KLxMt1TY70664AjA6xNU /Ns+z2MNC5SmTmuHzxb/2kgl5eo8w+gR95kVS43gSCfxsOBArgAVFcTpQ5o6phx+Uks4xY mXcvJ13gc1GwVk0TBNpnu7OYjngt7fyIt3BZXVtLz8591R1p2f492yCaY3t1Ni5fzeiPXV NHdtaYmpT8jSB5wFqVBkzrAonSDDFcrmB/r4Swy2XH/qkOKb3UiTTXpk8ota9A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VrNYB22przQ4v; Fri, 31 May 2024 13:01: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 44VD1Ywk004259; Fri, 31 May 2024 13:01:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44VD1UhH004254; Fri, 31 May 2024 13:01:30 GMT (envelope-from git) Date: Fri, 31 May 2024 13:01:30 GMT Message-Id: <202405311301.44VD1UhH004254@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Martin Matuska Subject: git: aca928a50a42 - main - zfs: merge openzfs/zfs@e2357561b List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mm X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: aca928a50a42f00f344df934005b09dbcb4e2f77 Auto-Submitted: auto-generated The branch main has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=aca928a50a42f00f344df934005b09dbcb4e2f77 commit aca928a50a42f00f344df934005b09dbcb4e2f77 Merge: d28bbfa2715a e2357561b949 Author: Martin Matuska AuthorDate: 2024-05-31 07:31:58 +0000 Commit: Martin Matuska CommitDate: 2024-05-31 09:26:50 +0000 zfs: merge openzfs/zfs@e2357561b Notable upstream pull request merges: #15940 41ae864b6 Replace P2ALIGN with P2ALIGN_TYPED and delete P2ALIGN #16128 5137c132a zpool import output is not formated properly #16138 efbef9e6c FreeBSD: Add zfs_link_create() error handling #16146 04bae5ec9 Disable high priority ZIO threads on FreeBSD and Linux #16151 cc3869153 zfs_ioc_send: use a dedicated taskq thread for send #16151 adda768e3 spa: remove spa_taskq_dispatch_sync() #16151 515c4dd21 spa: flatten spa_taskq_dispatch_ent() #16151 0a543db37 spa_taskq_dispatch_ent: simplify arguments #16153 975a13259 Add support for parallel pool exports #16153 89acef992 Simplified the scope of the namespace lock #16159 136c05321 ZAP: Fix leaf references on zap_expand_leaf() errors #16162 af5dbed31 Fix scn_queue races on very old pools #16165 3400127a7 Fix ZIL clone records for legacy holes #16167 414acbd37 Unbreak FreeBSD cross-build on MacOS broken in 051460b8b #16172 eced2e2f1 libzfs: Fix mounting datasets under thread limit pressure #16178 b64afa41d Better control the thread pool size when mounting datasets #16181 fa99d9cd9 zfs_dbgmsg_print: make FreeBSD and Linux consistent #16191 e675852bc dbuf: separate refcount calls for dbuf and dbuf_user #16198 a043b60f1 Correct level handling in zstream recompress #16204 34906f8bb zap: reuse zap_leaf_t on dbuf reuse after shrink #16206 d0aa9dbcc Use memset to zero stack allocations containing unions #16207 8865dfbca Fix assertion in Persistent L2ARC #16208 08648cf0d Allow block cloning to be interrupted by a signal #16210 e2357561b FreeBSD: Add const qualifier to members of struct opensolaris_utsname #16214 800d59d57 Some improvements to metaslabs eviction #16216 02c5aa9b0 Destroy ARC buffer in case of fill error #16225 01c8efdd5 Simplify issig() Obtained from: OpenZFS OpenZFS commit: e2357561b9499296bff758afe4868dbc39735675 cddl/lib/libspl/Makefile | 1 + sys/contrib/openzfs/cmd/zdb/zdb.c | 132 ++++++-- sys/contrib/openzfs/cmd/zed/agents/zfs_mod.c | 2 +- sys/contrib/openzfs/cmd/zed/zed.d/Makefile.am | 2 + .../openzfs/cmd/zed/zed.d/deadman-slot_off.sh | 71 ++++ sys/contrib/openzfs/cmd/zed/zed.d/zed.rc | 7 + sys/contrib/openzfs/cmd/zfs/zfs_main.c | 6 +- sys/contrib/openzfs/cmd/zpool/zpool_main.c | 377 +++++++++++++-------- .../openzfs/cmd/zstream/zstream_recompress.c | 2 +- sys/contrib/openzfs/cmd/zstream/zstream_redup.c | 4 +- sys/contrib/openzfs/cmd/ztest.c | 32 +- sys/contrib/openzfs/config/kernel-types.m4 | 40 +++ sys/contrib/openzfs/config/kernel.m4 | 2 + sys/contrib/openzfs/config/zfs-build.m4 | 92 ++--- sys/contrib/openzfs/include/libzfs.h | 5 +- .../openzfs/include/os/freebsd/spl/sys/ccompile.h | 3 +- .../openzfs/include/os/freebsd/spl/sys/misc.h | 10 +- .../openzfs/include/os/freebsd/spl/sys/sig.h | 8 +- .../openzfs/include/os/freebsd/spl/sys/sysmacros.h | 3 +- .../openzfs/include/os/linux/spl/sys/signal.h | 5 +- .../openzfs/include/os/linux/spl/sys/sysmacros.h | 3 +- .../openzfs/include/os/linux/spl/sys/types.h | 2 + sys/contrib/openzfs/include/sys/spa_impl.h | 7 +- sys/contrib/openzfs/include/sys/zfs_context.h | 3 +- sys/contrib/openzfs/include/sys/zfs_debug.h | 2 +- sys/contrib/openzfs/lib/libefi/rdwr_efi.c | 4 +- sys/contrib/openzfs/lib/libnvpair/libnvpair.abi | 111 +++++- sys/contrib/openzfs/lib/libspl/Makefile.am | 7 +- sys/contrib/openzfs/lib/libspl/assert.c | 53 +-- sys/contrib/openzfs/lib/libspl/backtrace.c | 119 +++++++ sys/contrib/openzfs/lib/libspl/include/Makefile.am | 1 + .../lib/libspl/include/os/linux/sys/sysmacros.h | 3 +- .../openzfs/lib/libspl/include/sys/backtrace.h | 32 ++ sys/contrib/openzfs/lib/libtpool/thread_pool.c | 28 +- sys/contrib/openzfs/lib/libuutil/libuutil.abi | 85 ++++- sys/contrib/openzfs/lib/libzfs/libzfs.abi | 44 ++- sys/contrib/openzfs/lib/libzfs/libzfs_mount.c | 30 +- sys/contrib/openzfs/lib/libzfs/libzfs_sendrecv.c | 6 +- .../openzfs/lib/libzfs/os/linux/libzfs_pool_os.c | 3 +- .../openzfs/lib/libzfs_core/libzfs_core.abi | 89 ++++- sys/contrib/openzfs/man/man4/zfs.4 | 23 +- sys/contrib/openzfs/module/icp/io/aes.c | 8 +- .../openzfs/module/os/freebsd/spl/spl_misc.c | 7 +- .../openzfs/module/os/freebsd/zfs/vdev_geom.c | 2 +- .../openzfs/module/os/freebsd/zfs/zfs_debug.c | 25 +- .../openzfs/module/os/freebsd/zfs/zfs_dir.c | 1 + .../openzfs/module/os/freebsd/zfs/zfs_vnops_os.c | 54 ++- .../openzfs/module/os/freebsd/zfs/zfs_znode.c | 1 - .../openzfs/module/os/linux/spl/spl-procfs-list.c | 2 +- .../openzfs/module/os/linux/spl/spl-taskq.c | 2 +- .../openzfs/module/os/linux/spl/spl-thread.c | 16 +- .../openzfs/module/os/linux/zfs/vdev_disk.c | 2 +- .../openzfs/module/os/linux/zfs/zfs_debug.c | 22 +- sys/contrib/openzfs/module/os/linux/zfs/zvol_os.c | 5 +- sys/contrib/openzfs/module/zcommon/zfs_fletcher.c | 8 +- sys/contrib/openzfs/module/zfs/arc.c | 6 +- sys/contrib/openzfs/module/zfs/btree.c | 2 +- sys/contrib/openzfs/module/zfs/dbuf.c | 35 +- sys/contrib/openzfs/module/zfs/dmu.c | 5 +- sys/contrib/openzfs/module/zfs/dmu_diff.c | 2 +- sys/contrib/openzfs/module/zfs/dmu_object.c | 2 +- sys/contrib/openzfs/module/zfs/dmu_objset.c | 2 +- sys/contrib/openzfs/module/zfs/dmu_recv.c | 2 +- sys/contrib/openzfs/module/zfs/dmu_redact.c | 2 +- sys/contrib/openzfs/module/zfs/dmu_send.c | 2 +- sys/contrib/openzfs/module/zfs/metaslab.c | 11 +- sys/contrib/openzfs/module/zfs/spa.c | 100 ++++-- sys/contrib/openzfs/module/zfs/spa_misc.c | 33 +- sys/contrib/openzfs/module/zfs/vdev.c | 21 +- sys/contrib/openzfs/module/zfs/vdev_initialize.c | 9 +- sys/contrib/openzfs/module/zfs/vdev_raidz.c | 3 +- sys/contrib/openzfs/module/zfs/vdev_rebuild.c | 3 +- sys/contrib/openzfs/module/zfs/vdev_trim.c | 9 +- sys/contrib/openzfs/module/zfs/zap.c | 61 ++-- sys/contrib/openzfs/module/zfs/zcp.c | 3 +- sys/contrib/openzfs/module/zfs/zfs_ioctl.c | 105 ++++-- sys/contrib/openzfs/module/zfs/zfs_log.c | 8 +- sys/contrib/openzfs/module/zfs/zfs_vnops.c | 5 + sys/contrib/openzfs/module/zfs/zio.c | 27 +- sys/contrib/openzfs/tests/runfiles/common.run | 3 +- .../openzfs/tests/test-runner/bin/zts-report.py.in | 1 - .../tests/zfs-tests/cmd/libzfs_input_check.c | 4 +- .../openzfs/tests/zfs-tests/include/tunables.cfg | 1 + .../openzfs/tests/zfs-tests/tests/Makefile.am | 2 + .../zpool_export/zpool_export_parallel_admin.ksh | 72 ++++ .../zpool_export/zpool_export_parallel_pos.ksh | 129 +++++++ .../tests/functional/deadman/deadman_ratelimit.ksh | 8 +- sys/modules/zfs/zfs_config.h | 10 +- sys/modules/zfs/zfs_gitrev.h | 2 +- 89 files changed, 1694 insertions(+), 610 deletions(-) diff --cc cddl/lib/libspl/Makefile index e432b313d9d0,000000000000..6c43e1750c3c mode 100644,000000..100644 --- a/cddl/lib/libspl/Makefile +++ b/cddl/lib/libspl/Makefile @@@ -1,49 -1,0 +1,50 @@@ + +.include +.include + +.PATH: ${SRCTOP}/sys/contrib/openzfs/lib/libspl +.PATH: ${SRCTOP}/sys/contrib/openzfs/include + +LIB= spl +LIBADD= +PACKAGE= zfs + +SRCS = \ + assert.c \ ++ backtrace.c \ + list.c \ + mkdirp.c \ + os/freebsd/zone.c \ + page.c \ + timestamp.c \ + include/sys/list.h \ + include/sys/list_impl.h + +# These functions are not required when bootstrapping and the atomic code +# will not compile when building on macOS. +.if !defined(BOOTSTRAPPING) +SRCS += \ + atomic.c \ + getexecname.c \ + os/freebsd/getexecname.c \ + os/freebsd/gethostid.c \ + os/freebsd/getmntany.c \ + os/freebsd/mnttab.c +.endif + +WARNS?= 2 +CSTD= c99 +CFLAGS+= -DIN_BASE +CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include +CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/ +CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/os/freebsd +CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/include +CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/module/icp/include +CFLAGS+= -include ${SRCTOP}/sys/contrib/openzfs/include/os/freebsd/spl/sys/ccompile.h +CFLAGS+= -DHAVE_ISSETUGID +CFLAGS+= -include ${SRCTOP}/sys/modules/zfs/zfs_config.h +.if ${COMPILER_TYPE} == "clang" +CFLAGS.atomic.c+= -Wno-error=atomic-alignment +.endif + +.include diff --cc sys/contrib/openzfs/cmd/zed/zed.d/deadman-slot_off.sh index 000000000000,7b339b3add01..7b339b3add01 mode 000000,100755..100755 --- a/sys/contrib/openzfs/cmd/zed/zed.d/deadman-slot_off.sh +++ b/sys/contrib/openzfs/cmd/zed/zed.d/deadman-slot_off.sh diff --cc sys/contrib/openzfs/config/kernel-types.m4 index 000000000000,ed76af28337b..ed76af28337b mode 000000,100644..100644 --- a/sys/contrib/openzfs/config/kernel-types.m4 +++ b/sys/contrib/openzfs/config/kernel-types.m4 diff --cc sys/contrib/openzfs/lib/libspl/assert.c index 5b12c14acd6e,d11361b387e2..315ddd6b9a9d --- a/sys/contrib/openzfs/lib/libspl/assert.c +++ b/sys/contrib/openzfs/lib/libspl/assert.c @@@ -51,55 -52,6 +52,19 @@@ pthread_getname_np(pthread_self(), buf, len); #endif - #if defined(HAVE_LIBUNWIND) - #define UNW_LOCAL_ONLY - #include - - static inline void - libspl_dump_backtrace(void) ++#if defined(__APPLE__) ++static inline uint64_t ++libspl_gettid(void) +{ - unw_context_t uc; - unw_cursor_t cp; - unw_word_t ip, off; - char funcname[128]; - #ifdef HAVE_LIBUNWIND_ELF - char objname[128]; - unw_word_t objoff; - #endif ++ uint64_t tid; + - fprintf(stderr, "Call trace:\n"); - unw_getcontext(&uc); - unw_init_local(&cp, &uc); - while (unw_step(&cp) > 0) { - unw_get_reg(&cp, UNW_REG_IP, &ip); - unw_get_proc_name(&cp, funcname, sizeof (funcname), &off); - #ifdef HAVE_LIBUNWIND_ELF - unw_get_elf_filename(&cp, objname, sizeof (objname), &objoff); - fprintf(stderr, " [0x%08lx] %s+0x%2lx (in %s +0x%2lx)\n", - ip, funcname, off, objname, objoff); - #else - fprintf(stderr, " [0x%08lx] %s+0x%2lx\n", ip, funcname, off); - #endif - } - } - #elif defined(HAVE_BACKTRACE) - #include ++ if (pthread_threadid_np(NULL, &tid) != 0) ++ tid = 0; + - static inline void - libspl_dump_backtrace(void) - { - void *btptrs[100]; - size_t nptrs = backtrace(btptrs, 100); - char **bt = backtrace_symbols(btptrs, nptrs); - fprintf(stderr, "Call trace:\n"); - for (size_t i = 0; i < nptrs; i++) - fprintf(stderr, " %s\n", bt[i]); - free(bt); ++ return (tid); +} - #else - #define libspl_dump_backtrace() +#endif + #if defined(__APPLE__) static inline uint64_t libspl_gettid(void) diff --cc sys/contrib/openzfs/lib/libspl/backtrace.c index 000000000000,d26d742106e2..d26d742106e2 mode 000000,100644..100644 --- a/sys/contrib/openzfs/lib/libspl/backtrace.c +++ b/sys/contrib/openzfs/lib/libspl/backtrace.c diff --cc sys/contrib/openzfs/lib/libspl/include/sys/backtrace.h index 000000000000,f9869ffc9e1a..f9869ffc9e1a mode 000000,100644..100644 --- a/sys/contrib/openzfs/lib/libspl/include/sys/backtrace.h +++ b/sys/contrib/openzfs/lib/libspl/include/sys/backtrace.h diff --cc sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_export/zpool_export_parallel_admin.ksh index 000000000000,cab8fc2b4239..cab8fc2b4239 mode 000000,100755..100755 --- a/sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_export/zpool_export_parallel_admin.ksh +++ b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_export/zpool_export_parallel_admin.ksh diff --cc sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_export/zpool_export_parallel_pos.ksh index 000000000000,037d17d082bd..037d17d082bd mode 000000,100755..100755 --- a/sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_export/zpool_export_parallel_pos.ksh +++ b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_export/zpool_export_parallel_pos.ksh diff --cc sys/modules/zfs/zfs_config.h index 4d6786e92d22,000000000000..d5e9cebfffc7 mode 100644,000000..100644 --- a/sys/modules/zfs/zfs_config.h +++ b/sys/modules/zfs/zfs_config.h @@@ -1,1227 -1,0 +1,1233 @@@ +/* + */ + +/* zfs_config.h. Generated from zfs_config.h.in by configure. */ +/* zfs_config.h.in. Generated from configure.ac by autoheader. */ + +/* Define to 1 if translation of program messages to the user's native + language is requested. */ +/* #undef ENABLE_NLS */ + +/* bio_end_io_t wants 1 arg */ +/* #undef HAVE_1ARG_BIO_END_IO_T */ + +/* lookup_bdev() wants 1 arg */ +/* #undef HAVE_1ARG_LOOKUP_BDEV */ + +/* submit_bio() wants 1 arg */ +/* #undef HAVE_1ARG_SUBMIT_BIO */ + +/* bdi_setup_and_register() wants 2 args */ +/* #undef HAVE_2ARGS_BDI_SETUP_AND_REGISTER */ + +/* vfs_getattr wants 2 args */ +/* #undef HAVE_2ARGS_VFS_GETATTR */ + +/* zlib_deflate_workspacesize() wants 2 args */ +/* #undef HAVE_2ARGS_ZLIB_DEFLATE_WORKSPACESIZE */ + +/* bdi_setup_and_register() wants 3 args */ +/* #undef HAVE_3ARGS_BDI_SETUP_AND_REGISTER */ + +/* vfs_getattr wants 3 args */ +/* #undef HAVE_3ARGS_VFS_GETATTR */ + +/* vfs_getattr wants 4 args */ +/* #undef HAVE_4ARGS_VFS_GETATTR */ + +/* kernel has access_ok with 'type' parameter */ +/* #undef HAVE_ACCESS_OK_TYPE */ + +/* posix_acl has refcount_t */ +/* #undef HAVE_ACL_REFCOUNT */ + +/* add_disk() returns int */ +/* #undef HAVE_ADD_DISK_RET */ + +/* Define if host toolchain supports AES */ +#define HAVE_AES 1 + +/* Define if you have [rt] */ +#define HAVE_AIO_H 1 + +#ifdef __amd64__ +#ifndef RESCUE +/* Define if host toolchain supports AVX */ +#define HAVE_AVX 1 +#endif + +/* Define if host toolchain supports AVX2 */ +#define HAVE_AVX2 1 + +/* Define if host toolchain supports AVX512BW */ +#define HAVE_AVX512BW 1 + +/* Define if host toolchain supports AVX512CD */ +#define HAVE_AVX512CD 1 + +/* Define if host toolchain supports AVX512DQ */ +#define HAVE_AVX512DQ 1 + +/* Define if host toolchain supports AVX512ER */ +#define HAVE_AVX512ER 1 + +/* Define if host toolchain supports AVX512F */ +#define HAVE_AVX512F 1 + +/* Define if host toolchain supports AVX512IFMA */ +#define HAVE_AVX512IFMA 1 + +/* Define if host toolchain supports AVX512PF */ +#define HAVE_AVX512PF 1 + +/* Define if host toolchain supports AVX512VBMI */ +#define HAVE_AVX512VBMI 1 + +/* Define if host toolchain supports AVX512VL */ +#define HAVE_AVX512VL 1 +#endif + ++/* backtrace() is available */ ++/* #undef HAVE_BACKTRACE */ ++ +/* bdevname() is available */ +/* #undef HAVE_BDEVNAME */ + +/* bdev_check_media_change() exists */ +/* #undef HAVE_BDEV_CHECK_MEDIA_CHANGE */ + +/* bdev_file_open_by_path() exists */ +/* #undef HAVE_BDEV_FILE_OPEN_BY_PATH */ + +/* bdev_*_io_acct() available */ +/* #undef HAVE_BDEV_IO_ACCT_63 */ + +/* bdev_*_io_acct() available */ +/* #undef HAVE_BDEV_IO_ACCT_OLD */ + +/* bdev_kobj() exists */ +/* #undef HAVE_BDEV_KOBJ */ + +/* bdev_max_discard_sectors() is available */ +/* #undef HAVE_BDEV_MAX_DISCARD_SECTORS */ + +/* bdev_max_secure_erase_sectors() is available */ +/* #undef HAVE_BDEV_MAX_SECURE_ERASE_SECTORS */ + +/* bdev_open_by_path() exists */ +/* #undef HAVE_BDEV_OPEN_BY_PATH */ + +/* bdev_release() exists */ +/* #undef HAVE_BDEV_RELEASE */ + +/* block_device_operations->submit_bio() returns void */ +/* #undef HAVE_BDEV_SUBMIT_BIO_RETURNS_VOID */ + +/* bdev_whole() is available */ +/* #undef HAVE_BDEV_WHOLE */ + +/* bio_alloc() takes 4 arguments */ +/* #undef HAVE_BIO_ALLOC_4ARG */ + +/* bio->bi_bdev->bd_disk exists */ +/* #undef HAVE_BIO_BDEV_DISK */ + +/* bio->bi_opf is defined */ +/* #undef HAVE_BIO_BI_OPF */ + +/* bio->bi_status exists */ +/* #undef HAVE_BIO_BI_STATUS */ + +/* bio has bi_iter */ +/* #undef HAVE_BIO_BVEC_ITER */ + +/* bio_*_io_acct() available */ +/* #undef HAVE_BIO_IO_ACCT */ + +/* bio_max_segs() is implemented */ +/* #undef HAVE_BIO_MAX_SEGS */ + +/* bio_set_dev() is available */ +/* #undef HAVE_BIO_SET_DEV */ + +/* bio_set_dev() GPL-only */ +/* #undef HAVE_BIO_SET_DEV_GPL_ONLY */ + +/* bio_set_dev() is a macro */ +/* #undef HAVE_BIO_SET_DEV_MACRO */ + +/* bio_set_op_attrs is available */ +/* #undef HAVE_BIO_SET_OP_ATTRS */ + +/* blkdev_get_by_path() exists and takes 4 args */ +/* #undef HAVE_BLKDEV_GET_BY_PATH_4ARG */ + +/* blkdev_get_by_path() handles ERESTARTSYS */ +/* #undef HAVE_BLKDEV_GET_ERESTARTSYS */ + +/* __blkdev_issue_discard(flags) is available */ +/* #undef HAVE_BLKDEV_ISSUE_DISCARD_ASYNC_FLAGS */ + +/* __blkdev_issue_discard() is available */ +/* #undef HAVE_BLKDEV_ISSUE_DISCARD_ASYNC_NOFLAGS */ + +/* blkdev_issue_discard(flags) is available */ +/* #undef HAVE_BLKDEV_ISSUE_DISCARD_FLAGS */ + +/* blkdev_issue_discard() is available */ +/* #undef HAVE_BLKDEV_ISSUE_DISCARD_NOFLAGS */ + +/* blkdev_issue_secure_erase() is available */ +/* #undef HAVE_BLKDEV_ISSUE_SECURE_ERASE */ + +/* blkdev_put() exists */ +/* #undef HAVE_BLKDEV_PUT */ + +/* blkdev_put() accepts void* as arg 2 */ +/* #undef HAVE_BLKDEV_PUT_HOLDER */ + +/* blkdev_reread_part() exists */ +/* #undef HAVE_BLKDEV_REREAD_PART */ + +/* blkg_tryget() is available */ +/* #undef HAVE_BLKG_TRYGET */ + +/* blkg_tryget() GPL-only */ +/* #undef HAVE_BLKG_TRYGET_GPL_ONLY */ + +/* blk_alloc_disk() exists */ +/* #undef HAVE_BLK_ALLOC_DISK */ + +/* blk_alloc_disk() exists and takes 2 args */ +/* #undef HAVE_BLK_ALLOC_DISK_2ARG */ + +/* blk_alloc_queue() expects request function */ +/* #undef HAVE_BLK_ALLOC_QUEUE_REQUEST_FN */ + +/* blk_alloc_queue_rh() expects request function */ +/* #undef HAVE_BLK_ALLOC_QUEUE_REQUEST_FN_RH */ + +/* blk_cleanup_disk() exists */ +/* #undef HAVE_BLK_CLEANUP_DISK */ + +/* blk_mode_t is defined */ +/* #undef HAVE_BLK_MODE_T */ + +/* block multiqueue is available */ +/* #undef HAVE_BLK_MQ */ + +/* block multiqueue hardware context is cached in struct request */ +/* #undef HAVE_BLK_MQ_RQ_HCTX */ + +/* blk queue backing_dev_info is dynamic */ +/* #undef HAVE_BLK_QUEUE_BDI_DYNAMIC */ + +/* blk_queue_discard() is available */ +/* #undef HAVE_BLK_QUEUE_DISCARD */ + +/* blk_queue_flag_clear() exists */ +/* #undef HAVE_BLK_QUEUE_FLAG_CLEAR */ + +/* blk_queue_flag_set() exists */ +/* #undef HAVE_BLK_QUEUE_FLAG_SET */ + +/* blk_queue_flush() is available */ +/* #undef HAVE_BLK_QUEUE_FLUSH */ + +/* blk_queue_flush() is GPL-only */ +/* #undef HAVE_BLK_QUEUE_FLUSH_GPL_ONLY */ + +/* blk_queue_secdiscard() is available */ +/* #undef HAVE_BLK_QUEUE_SECDISCARD */ + +/* blk_queue_secure_erase() is available */ +/* #undef HAVE_BLK_QUEUE_SECURE_ERASE */ + +/* blk_queue_update_readahead() exists */ +/* #undef HAVE_BLK_QUEUE_UPDATE_READAHEAD */ + +/* blk_queue_write_cache() exists */ +/* #undef HAVE_BLK_QUEUE_WRITE_CACHE */ + +/* blk_queue_write_cache() is GPL-only */ +/* #undef HAVE_BLK_QUEUE_WRITE_CACHE_GPL_ONLY */ + +/* BLK_STS_RESV_CONFLICT is defined */ +/* #undef HAVE_BLK_STS_RESV_CONFLICT */ + +/* Define if release() in block_device_operations takes 1 arg */ +/* #undef HAVE_BLOCK_DEVICE_OPERATIONS_RELEASE_1ARG */ + +/* Define if revalidate_disk() in block_device_operations */ +/* #undef HAVE_BLOCK_DEVICE_OPERATIONS_REVALIDATE_DISK */ + +/* Define to 1 if you have the Mac OS X function CFLocaleCopyCurrent in the + CoreFoundation framework. */ +/* #undef HAVE_CFLOCALECOPYCURRENT */ + +/* Define to 1 if you have the Mac OS X function + CFLocaleCopyPreferredLanguages in the CoreFoundation framework. */ +/* #undef HAVE_CFLOCALECOPYPREFERREDLANGUAGES */ + +/* Define to 1 if you have the Mac OS X function CFPreferencesCopyAppValue in + the CoreFoundation framework. */ +/* #undef HAVE_CFPREFERENCESCOPYAPPVALUE */ + +/* check_disk_change() exists */ +/* #undef HAVE_CHECK_DISK_CHANGE */ + +/* clear_inode() is available */ +/* #undef HAVE_CLEAR_INODE */ + +/* dentry uses const struct dentry_operations */ +/* #undef HAVE_CONST_DENTRY_OPERATIONS */ + +/* copy_from_iter() is available */ +/* #undef HAVE_COPY_FROM_ITER */ + +/* copy_splice_read exists */ +/* #undef HAVE_COPY_SPLICE_READ */ + +/* copy_to_iter() is available */ +/* #undef HAVE_COPY_TO_ITER */ + +/* cpu_has_feature() is GPL-only */ +/* #undef HAVE_CPU_HAS_FEATURE_GPL_ONLY */ + +/* yes */ +/* #undef HAVE_CPU_HOTPLUG */ + +/* current_time() exists */ +/* #undef HAVE_CURRENT_TIME */ + +/* Define if the GNU dcgettext() function is already present or preinstalled. + */ +/* #undef HAVE_DCGETTEXT */ + +/* DECLARE_EVENT_CLASS() is available */ +/* #undef HAVE_DECLARE_EVENT_CLASS */ + +/* dentry aliases are in d_u member */ +/* #undef HAVE_DENTRY_D_U_ALIASES */ + +/* dequeue_signal() takes 4 arguments */ +/* #undef HAVE_DEQUEUE_SIGNAL_4ARG */ + +/* lookup_bdev() wants dev_t arg */ +/* #undef HAVE_DEVT_LOOKUP_BDEV */ + +/* sops->dirty_inode() wants flags */ +/* #undef HAVE_DIRTY_INODE_WITH_FLAGS */ + +/* disk_check_media_change() exists */ +/* #undef HAVE_DISK_CHECK_MEDIA_CHANGE */ + +/* disk_*_io_acct() available */ +/* #undef HAVE_DISK_IO_ACCT */ + +/* disk_update_readahead() exists */ +/* #undef HAVE_DISK_UPDATE_READAHEAD */ + +/* Define to 1 if you have the header file. */ +#define HAVE_DLFCN_H 1 + +/* d_make_root() is available */ +/* #undef HAVE_D_MAKE_ROOT */ + +/* d_prune_aliases() is available */ +/* #undef HAVE_D_PRUNE_ALIASES */ + +/* dops->d_revalidate() operation takes nameidata */ +/* #undef HAVE_D_REVALIDATE_NAMEIDATA */ + +/* eops->encode_fh() wants child and parent inodes */ +/* #undef HAVE_ENCODE_FH_WITH_INODE */ + +/* sops->evict_inode() exists */ +/* #undef HAVE_EVICT_INODE */ + +/* Define to 1 if you have the 'execvpe' function. */ +#define HAVE_EXECVPE 1 + +/* FALLOC_FL_ZERO_RANGE is defined */ +/* #undef HAVE_FALLOC_FL_ZERO_RANGE */ + +/* fault_in_iov_iter_readable() is available */ +/* #undef HAVE_FAULT_IN_IOV_ITER_READABLE */ + +/* filemap_range_has_page() is available */ +/* #undef HAVE_FILEMAP_RANGE_HAS_PAGE */ + +/* fops->aio_fsync() exists */ +/* #undef HAVE_FILE_AIO_FSYNC */ + +/* file_dentry() is available */ +/* #undef HAVE_FILE_DENTRY */ + +/* fops->fadvise() exists */ +/* #undef HAVE_FILE_FADVISE */ + +/* file_inode() is available */ +/* #undef HAVE_FILE_INODE */ + +/* flush_dcache_page() is GPL-only */ +/* #undef HAVE_FLUSH_DCACHE_PAGE_GPL_ONLY */ + +/* iops->follow_link() cookie */ +/* #undef HAVE_FOLLOW_LINK_COOKIE */ + +/* iops->follow_link() nameidata */ +/* #undef HAVE_FOLLOW_LINK_NAMEIDATA */ + +/* Define if compiler supports -Wformat-overflow */ +/* #undef HAVE_FORMAT_OVERFLOW */ + +/* fsync_bdev() is declared in include/blkdev.h */ +/* #undef HAVE_FSYNC_BDEV */ + +/* fops->fsync() with range */ +/* #undef HAVE_FSYNC_RANGE */ + +/* fops->fsync() without dentry */ +/* #undef HAVE_FSYNC_WITHOUT_DENTRY */ + +/* yes */ +/* #undef HAVE_GENERIC_FADVISE */ + +/* generic_fillattr requires struct mnt_idmap* */ +/* #undef HAVE_GENERIC_FILLATTR_IDMAP */ + +/* generic_fillattr requires struct mnt_idmap* and u32 request_mask */ +/* #undef HAVE_GENERIC_FILLATTR_IDMAP_REQMASK */ + +/* generic_fillattr requires struct user_namespace* */ +/* #undef HAVE_GENERIC_FILLATTR_USERNS */ + +/* generic_*_io_acct() 3 arg available */ +/* #undef HAVE_GENERIC_IO_ACCT_3ARG */ + +/* generic_*_io_acct() 4 arg available */ +/* #undef HAVE_GENERIC_IO_ACCT_4ARG */ + +/* generic_readlink is global */ +/* #undef HAVE_GENERIC_READLINK */ + +/* generic_setxattr() exists */ +/* #undef HAVE_GENERIC_SETXATTR */ + +/* generic_write_checks() takes kiocb */ +/* #undef HAVE_GENERIC_WRITE_CHECKS_KIOCB */ + +/* Define if the GNU gettext() function is already present or preinstalled. */ +/* #undef HAVE_GETTEXT */ + +/* Define to 1 if you have the 'gettid' function. */ +/* #undef HAVE_GETTID */ + +/* iops->get_acl() exists */ +/* #undef HAVE_GET_ACL */ + +/* iops->get_acl() takes rcu */ +/* #undef HAVE_GET_ACL_RCU */ + +/* has iops->get_inode_acl() */ +/* #undef HAVE_GET_INODE_ACL */ + +/* iops->get_link() cookie */ +/* #undef HAVE_GET_LINK_COOKIE */ + +/* iops->get_link() delayed */ +/* #undef HAVE_GET_LINK_DELAYED */ + +/* group_info->gid exists */ +/* #undef HAVE_GROUP_INFO_GID */ + +/* has_capability() is available */ +/* #undef HAVE_HAS_CAPABILITY */ + +/* iattr->ia_vfsuid and iattr->ia_vfsgid exist */ +/* #undef HAVE_IATTR_VFSID */ + +/* Define if you have the iconv() function and it works. */ +#define HAVE_ICONV 1 + +/* iops->getattr() takes struct mnt_idmap* */ +/* #undef HAVE_IDMAP_IOPS_GETATTR */ + +/* iops->setattr() takes struct mnt_idmap* */ +/* #undef HAVE_IDMAP_IOPS_SETATTR */ + +/* APIs for idmapped mount are present */ +/* #undef HAVE_IDMAP_MNT_API */ + +/* mnt_idmap does not have user_namespace */ +/* #undef HAVE_IDMAP_NO_USERNS */ + +/* Define if compiler supports -Wimplicit-fallthrough */ +/* #undef HAVE_IMPLICIT_FALLTHROUGH */ + +/* Define if compiler supports -Winfinite-recursion */ +/* #undef HAVE_INFINITE_RECURSION */ + +/* inode_get_atime() exists in linux/fs.h */ +/* #undef HAVE_INODE_GET_ATIME */ + +/* inode_get_ctime() exists in linux/fs.h */ +/* #undef HAVE_INODE_GET_CTIME */ + +/* inode_get_mtime() exists in linux/fs.h */ +/* #undef HAVE_INODE_GET_MTIME */ + +/* yes */ +/* #undef HAVE_INODE_LOCK_SHARED */ + +/* inode_owner_or_capable() exists */ +/* #undef HAVE_INODE_OWNER_OR_CAPABLE */ + +/* inode_owner_or_capable() takes mnt_idmap */ +/* #undef HAVE_INODE_OWNER_OR_CAPABLE_IDMAP */ + +/* inode_owner_or_capable() takes user_ns */ +/* #undef HAVE_INODE_OWNER_OR_CAPABLE_USERNS */ + +/* inode_set_atime_to_ts() exists in linux/fs.h */ +/* #undef HAVE_INODE_SET_ATIME_TO_TS */ + +/* inode_set_ctime_to_ts() exists in linux/fs.h */ +/* #undef HAVE_INODE_SET_CTIME_TO_TS */ + +/* inode_set_flags() exists */ +/* #undef HAVE_INODE_SET_FLAGS */ + +/* inode_set_iversion() exists */ +/* #undef HAVE_INODE_SET_IVERSION */ + +/* inode_set_mtime_to_ts() exists in linux/fs.h */ +/* #undef HAVE_INODE_SET_MTIME_TO_TS */ + +/* inode->i_*time's are timespec64 */ +/* #undef HAVE_INODE_TIMESPEC64_TIMES */ + +/* timestamp_truncate() exists */ +/* #undef HAVE_INODE_TIMESTAMP_TRUNCATE */ + +/* Define to 1 if you have the header file. */ +#define HAVE_INTTYPES_H 1 + +/* in_compat_syscall() is available */ +/* #undef HAVE_IN_COMPAT_SYSCALL */ + +/* iops->create() takes struct mnt_idmap* */ +/* #undef HAVE_IOPS_CREATE_IDMAP */ + +/* iops->create() takes struct user_namespace* */ +/* #undef HAVE_IOPS_CREATE_USERNS */ + +/* iops->mkdir() takes struct mnt_idmap* */ +/* #undef HAVE_IOPS_MKDIR_IDMAP */ + +/* iops->mkdir() takes struct user_namespace* */ +/* #undef HAVE_IOPS_MKDIR_USERNS */ + +/* iops->mknod() takes struct mnt_idmap* */ +/* #undef HAVE_IOPS_MKNOD_IDMAP */ + +/* iops->mknod() takes struct user_namespace* */ +/* #undef HAVE_IOPS_MKNOD_USERNS */ + +/* iops->permission() takes struct mnt_idmap* */ +/* #undef HAVE_IOPS_PERMISSION_IDMAP */ + +/* iops->permission() takes struct user_namespace* */ +/* #undef HAVE_IOPS_PERMISSION_USERNS */ + +/* iops->rename() takes struct mnt_idmap* */ +/* #undef HAVE_IOPS_RENAME_IDMAP */ + +/* iops->rename() takes struct user_namespace* */ +/* #undef HAVE_IOPS_RENAME_USERNS */ + +/* iops->setattr() exists */ +/* #undef HAVE_IOPS_SETATTR */ + +/* iops->symlink() takes struct mnt_idmap* */ +/* #undef HAVE_IOPS_SYMLINK_IDMAP */ + +/* iops->symlink() takes struct user_namespace* */ +/* #undef HAVE_IOPS_SYMLINK_USERNS */ + +/* iov_iter_advance() is available */ +/* #undef HAVE_IOV_ITER_ADVANCE */ + +/* iov_iter_count() is available */ +/* #undef HAVE_IOV_ITER_COUNT */ + +/* iov_iter_fault_in_readable() is available */ +/* #undef HAVE_IOV_ITER_FAULT_IN_READABLE */ + +/* iov_iter_revert() is available */ +/* #undef HAVE_IOV_ITER_REVERT */ + +/* iov_iter_type() is available */ +/* #undef HAVE_IOV_ITER_TYPE */ + +/* iov_iter types are available */ +/* #undef HAVE_IOV_ITER_TYPES */ + +/* yes */ +/* #undef HAVE_IO_SCHEDULE_TIMEOUT */ + +/* Define to 1 if you have the 'issetugid' function. */ +#define HAVE_ISSETUGID 1 + +/* iter_iov() is available */ +/* #undef HAVE_ITER_IOV */ + +/* kernel has kernel_fpu_* functions */ +/* #undef HAVE_KERNEL_FPU */ + +/* kernel has asm/fpu/api.h */ +/* #undef HAVE_KERNEL_FPU_API_HEADER */ + +/* kernel fpu internal */ +/* #undef HAVE_KERNEL_FPU_INTERNAL */ + +/* kernel has asm/fpu/internal.h */ +/* #undef HAVE_KERNEL_FPU_INTERNAL_HEADER */ + +/* uncached_acl_sentinel() exists */ +/* #undef HAVE_KERNEL_GET_ACL_HANDLE_CACHE */ + +/* Define if compiler supports -Winfinite-recursion */ +/* #undef HAVE_KERNEL_INFINITE_RECURSION */ + ++/* kernel defines intptr_t */ ++/* #undef HAVE_KERNEL_INTPTR_T */ ++ +/* kernel has kernel_neon_* functions */ +/* #undef HAVE_KERNEL_NEON */ + +/* kernel does stack verification */ +/* #undef HAVE_KERNEL_OBJTOOL */ + +/* kernel has linux/objtool.h */ +/* #undef HAVE_KERNEL_OBJTOOL_HEADER */ + +/* kernel_read() take loff_t pointer */ +/* #undef HAVE_KERNEL_READ_PPOS */ + +/* strlcpy() exists */ +/* #undef HAVE_KERNEL_STRLCPY */ + +/* strscpy() exists */ +/* #undef HAVE_KERNEL_STRSCPY */ + +/* timer_list.function gets a timer_list */ +/* #undef HAVE_KERNEL_TIMER_FUNCTION_TIMER_LIST */ + +/* struct timer_list has a flags member */ +/* #undef HAVE_KERNEL_TIMER_LIST_FLAGS */ + +/* timer_setup() is available */ +/* #undef HAVE_KERNEL_TIMER_SETUP */ + +/* kernel_write() take loff_t pointer */ +/* #undef HAVE_KERNEL_WRITE_PPOS */ + +/* kmem_cache_create_usercopy() exists */ +/* #undef HAVE_KMEM_CACHE_CREATE_USERCOPY */ + +/* kstrtoul() exists */ +/* #undef HAVE_KSTRTOUL */ + +/* ktime_get_coarse_real_ts64() exists */ +/* #undef HAVE_KTIME_GET_COARSE_REAL_TS64 */ + +/* ktime_get_raw_ts64() exists */ +/* #undef HAVE_KTIME_GET_RAW_TS64 */ + +/* kvmalloc exists */ +/* #undef HAVE_KVMALLOC */ + +/* Define if you have [aio] */ +/* #undef HAVE_LIBAIO */ + +/* Define if you have [blkid] */ +/* #undef HAVE_LIBBLKID */ + +/* Define if you have [crypto] */ +#define HAVE_LIBCRYPTO 1 + +/* Define if you have [tirpc] */ +/* #undef HAVE_LIBTIRPC */ + +/* Define if you have [udev] */ +/* #undef HAVE_LIBUDEV */ + +/* Define if you have [unwind] */ +/* #undef HAVE_LIBUNWIND */ + +/* libunwind has unw_get_elf_filename */ +/* #undef HAVE_LIBUNWIND_ELF */ + +/* Define if you have [uuid] */ +/* #undef HAVE_LIBUUID */ + +/* linux/blk-cgroup.h exists */ +/* #undef HAVE_LINUX_BLK_CGROUP_HEADER */ + +/* lseek_execute() is available */ +/* #undef HAVE_LSEEK_EXECUTE */ + +/* makedev() is declared in sys/mkdev.h */ +/* #undef HAVE_MAKEDEV_IN_MKDEV */ + +/* makedev() is declared in sys/sysmacros.h */ +/* #undef HAVE_MAKEDEV_IN_SYSMACROS */ + +/* Noting that make_request_fn() returns blk_qc_t */ +/* #undef HAVE_MAKE_REQUEST_FN_RET_QC */ + +/* Noting that make_request_fn() returns void */ *** 552 LINES SKIPPED *** From nobody Fri May 31 14:47:00 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VrQtr4Lr0z5N1WD; Fri, 31 May 2024 14:47: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 4VrQtr3cf0z519J; Fri, 31 May 2024 14:47:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717166820; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Eng+4ELDtXAmJ7PGNWWliOWGAhPnhQ2l8F7KldVbw+0=; b=hBM01aNKxoQ5nKjxPjJncJbfaCl6u7Q8OnsSPFGcEgpuzHJoGULPvP9LregF+LFqp/bnJ4 3jK5tWrw+b/dTtUlze2pDG2hrUVgy7kcengLEi6aJdycjtJO+Ucb4fMWpScGiozw3Rs6DF HuTYSAWdPIMQ/TLJbAK1hmnjDk5P+5vkL96/Q8hsR4vbrR82K9XnLgnMpRAk8ytM1yXdhJ nEbtt+X2JyA8vKul0F4ZX1bVQjeeCIGLU6g7qZx3u8ubGFvgAWSHHaoHzQhpjweMniNGt3 z1ZaWeJIO1iiIY5HYVsRElGSdRVG2MNeRJhL6iJs9sLDrEHePLDrHn3vKzT1iw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1717166820; a=rsa-sha256; cv=none; b=ZJRfqUm3cJbwBoOa4p3oxpRwd7XLXOrDFCMkBS67GYGm7XfvSpNE0u4cLNgijMctc84VBb xY59yXuXMhuNNVb28sXCopDtcaQLgQvdlrV0Vwn4dV9oZd/F7nQwXDtRFxf21VpFSIJNsJ haYe+KPZCAHa30SRsVczu1Lh5m9qgw72ijHxznVoCIxnh1qAhEt5c50bHpUwU93a1dfatS gRnjeDn0LAvPUZgzQH1PsrRAkAb3AvaF+CRvx1/PlTvRgRmxsLOEmEvcRICeX5WK5kllJZ l/Bq2y9OrnpoYnL1dUOAkpLiANY3G1tRxUoeJoY83Qpq5sq+tyLGdY9q+vkHig== 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=1717166820; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Eng+4ELDtXAmJ7PGNWWliOWGAhPnhQ2l8F7KldVbw+0=; b=FZExmxrNbDaNPTK8w2X3NsAqe1YI2seWAQ0VCkBcFoboguFz79T9KiZTSKgb0Jmf/SAzai OxJys8AU6oqN1mjl9qcvtTmX1kxruT4OMtbZVgcabYM/5NFnaZWFTR62PVtEE+v0jghdGc y8SeHyIdRFI2Re9pUerIR9Wag6wz8Tqmz7E75khEXvcZ4dRyJFGZXIK1L3XsYCd72CytVT lEdjQZaCUHQsVlFpaxBntpSH4aapFFldLxjZ1z7WDXIfI75zYCBbjb/WUnMYInJVssTCRr KHlwNZEdEuzbJ2MHLgDr0vFldTzAEZFW4b9ZzKSAdOFtRyXlB/8P9lwj11jYvA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VrQtr3CWjzSXd; Fri, 31 May 2024 14:47: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 44VEl0B6078154; Fri, 31 May 2024 14:47:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44VEl06w078151; Fri, 31 May 2024 14:47:00 GMT (envelope-from git) Date: Fri, 31 May 2024 14:47:00 GMT Message-Id: <202405311447.44VEl06w078151@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: 676041c41ba5 - main - WPA: Allow CLOCK_BOOTTIME and CLOCK_MONOTONIC to #define the same List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: 676041c41ba587285bb934aa2fca290ea7208038 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=676041c41ba587285bb934aa2fca290ea7208038 commit 676041c41ba587285bb934aa2fca290ea7208038 Author: Warner Losh AuthorDate: 2024-05-31 14:44:55 +0000 Commit: Warner Losh CommitDate: 2024-05-31 14:44:55 +0000 WPA: Allow CLOCK_BOOTTIME and CLOCK_MONOTONIC to #define the same Historically, these have been differnet values, and only one was defined or they were defined as different values. Now that they are about to be the same value, add #ifdef to cope. Sponsored by: Netflix Reviewed by: olce, val_packett.cool, adrian Differential Revision: https://reviews.freebsd.org/D45418 --- contrib/wpa/src/utils/os_unix.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/contrib/wpa/src/utils/os_unix.c b/contrib/wpa/src/utils/os_unix.c index 315c973f3228..a856179fb3b1 100644 --- a/contrib/wpa/src/utils/os_unix.c +++ b/contrib/wpa/src/utils/os_unix.c @@ -72,7 +72,6 @@ int os_get_time(struct os_time *t) return res; } - int os_get_reltime(struct os_reltime *t) { #ifndef __MACH__ @@ -97,15 +96,21 @@ int os_get_reltime(struct os_reltime *t) return 0; } switch (clock_id) { -#ifdef CLOCK_BOOTTIME +#if defined(CLOCK_BOOTTIME) case CLOCK_BOOTTIME: clock_id = CLOCK_MONOTONIC; break; #endif -#ifdef CLOCK_MONOTONIC +#if defined(CLOCK_MONOTONIC) +/* + * FreeBSD has both BOOTTIME and MONOTONIC defined to the same value, since they + * mean the same thing. FreeBSD 14.1 and ealier don't, so need this case. + */ +#if !(defined(CLOCK_BOOTTIME) && CLOCK_BOOTTIME == CLOCK_MONOTONIC) case CLOCK_MONOTONIC: clock_id = CLOCK_REALTIME; break; +#endif #endif case CLOCK_REALTIME: return -1; From nobody Fri May 31 14:47: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 4VrQts6SG6z5N1n0; Fri, 31 May 2024 14:47: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 4VrQts4P93z51LP; Fri, 31 May 2024 14:47:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717166821; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LEmfm8t3XMca5amt1LehVfsqrlh0yD+57vDZnzp2CiA=; b=GWrvGUWvAfW8L8LgRH4qr9gcUh8wXlFK/7UHsvrwUTCZ97+etLn1a19Himx5nDVyuDdDR0 XuU4bKHO1e9vmk3ZJ9e8ADq5L4J/UDTbviZVVtO37R3K6I9CY0Sq21AkxokYXwhz+KivfE p/NPC6BHlpvQLV/wAVDxYe1iraqxbQfNu1cWxLXU53SI9y551adxei5FmHIPT6BZ9JGMs6 aT7sesqsBUJ4g6JeO7GIFNvq6qLevOlasReVTmkMu6KBol4BoV5ARpM3i6J/aAtBJ49Xol DRQCmdxl3qAGl7inUVNFReua8mqgWa4RXKt1na5pP7aW0TvT48OsI+akUNLJBQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1717166821; a=rsa-sha256; cv=none; b=pkWo+wE6TEKRerN23B9orVu9yO2hS6y421HGCIJ11MAW/5Eq+P2YmG9HMKANxaBe3WF4Gs BPzQlAN7XCNDvqsB/ZNNFhBEghkymDyWoZ7MXLNHPZ6FhcI4WkC3/qILjKqqiNjXjA8DUO APovk7cA9ua0fNbK6IB8R1cLJYMiU4RSSm498K5K3k5gL/jzhFen4wEmwVYziyStmRLjs9 Tevd7vG4mt+iqI5LSOApRPPN4oG4AFswqjwWhraToImYQ423MPDmRJUIUEiN2h6kWghAah KhAq5PzMbzwnBAVXWHfgTxJygk/+ep/23OoGFOwXkU+NHYgVb710YldnoauJuQ== 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=1717166821; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LEmfm8t3XMca5amt1LehVfsqrlh0yD+57vDZnzp2CiA=; b=PqXM2KqVMFwT3OC5Ym0zI3vc8JdyS9R7XcquENUrtPXslOzACZ88VKIW8fIs715RnMX4Yp nEO+v+Y2qsJnDCapsiZWT2B4BGlAO9xJikx+PEtnJxqU8PDXv/s/kT6YU2Van54lomJhPu NREwsNwnnDc/EBzu1Mi7GRGbUpiKWfBD7mVWy/xeZAWb4uoxw6UY/8/z76cKOPGagdtf8e uP74KdfnVA/CGRnDZQB+hLh01CxEhOGT39xQZy4UFC3t8tG1OPjbZJvWg4iPAmfQqU0XTN KjTP7sUM1ZGD3dbhCykNkcFAu/6i7NO08ZbP6Yy5DQA2Km7ZxRUQ555O12+Vtw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VrQts400dzSZx; Fri, 31 May 2024 14:47: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 44VEl18E078202; Fri, 31 May 2024 14:47:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44VEl1G1078199; Fri, 31 May 2024 14:47:01 GMT (envelope-from git) Date: Fri, 31 May 2024 14:47:01 GMT Message-Id: <202405311447.44VEl1G1078199@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: 108de784513d - main - Redefine CLOCK_BOOTTIME to alias CLOCK_MONOTONIC, not CLOCK_UPTIME List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: 108de784513d87bbe850e7b003a73e26b5b54caa Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=108de784513d87bbe850e7b003a73e26b5b54caa commit 108de784513d87bbe850e7b003a73e26b5b54caa Author: Val Packett AuthorDate: 2024-05-31 14:45:02 +0000 Commit: Warner Losh CommitDate: 2024-05-31 14:45:02 +0000 Redefine CLOCK_BOOTTIME to alias CLOCK_MONOTONIC, not CLOCK_UPTIME The suspend-awareness situation with monotonic clocks across platforms is kind of a mess, let's try not making it worse. On Linux, CLOCK_MONOTONIC does NOT count suspended time, and CLOCK_BOOTTIME was introduced to INCLUDE suspended time. On OpenBSD, CLOCK_MONOTONIC DOES count suspended time, and CLOCK_UPTIME was introduced to EXCLUDE suspended time. On macOS, it's the same as OpenBSD, but with CLOCK_UPTIME_RAW. Right now, we do not have a monotonic clock that counts suspended time. We have CLOCK_UPTIME as a distinct ID alias, and CLOCK_BOOTTIME as a preprocessor alias, both being effectively `CLOCK_MONOTONIC` for now. When we introduce a suspend-aware clock in the future, it would make a lot more sense to do it the OpenBSD/macOS way, i.e. to make CLOCK_MONOTONIC include suspended time and make CLOCK_UPTIME exclude it, because that's what the name CLOCK_UPTIME implies: a deviation from the default intended for the uptime command to allow it to only show the time the system was actually up and not suspended. Let's change the define right now to make sure software using the define would not end up using the ID of the wrong clock in the future, and fix the IDs in the Linux compat code to match the expected changes too. See https://bugzilla.mozilla.org/show_bug.cgi?id=1824084 for more discussion. Fixes: 155f15118a77 ("clock_gettime: Add Linux aliases for CLOCK_*") Fixes: 25ada637362d ("Map Linux CLOCK_BOOTTIME to native CLOCK_UPTIME.") Sponsored by: https://www.patreon.com/valpackett Reviewed by: kib, imp Differential Revision: https://reviews.freebsd.org/D39270 --- sys/compat/linux/linux_time.c | 6 +++--- sys/sys/_clock_id.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/compat/linux/linux_time.c b/sys/compat/linux/linux_time.c index e9e5cf075210..f4dd26dd3d2a 100644 --- a/sys/compat/linux/linux_time.c +++ b/sys/compat/linux/linux_time.c @@ -287,7 +287,7 @@ linux_to_native_clockid(clockid_t *n, clockid_t l) *n = CLOCK_REALTIME; break; case LINUX_CLOCK_MONOTONIC: - *n = CLOCK_MONOTONIC; + *n = CLOCK_UPTIME; break; case LINUX_CLOCK_PROCESS_CPUTIME_ID: *n = CLOCK_PROCESS_CPUTIME_ID; @@ -300,10 +300,10 @@ linux_to_native_clockid(clockid_t *n, clockid_t l) break; case LINUX_CLOCK_MONOTONIC_COARSE: case LINUX_CLOCK_MONOTONIC_RAW: - *n = CLOCK_MONOTONIC_FAST; + *n = CLOCK_UPTIME_FAST; break; case LINUX_CLOCK_BOOTTIME: - *n = CLOCK_UPTIME; + *n = CLOCK_MONOTONIC; break; case LINUX_CLOCK_REALTIME_ALARM: case LINUX_CLOCK_BOOTTIME_ALARM: diff --git a/sys/sys/_clock_id.h b/sys/sys/_clock_id.h index 47a551428dc3..728346a0f0ab 100644 --- a/sys/sys/_clock_id.h +++ b/sys/sys/_clock_id.h @@ -78,7 +78,7 @@ * Linux compatible names. */ #if __BSD_VISIBLE -#define CLOCK_BOOTTIME CLOCK_UPTIME +#define CLOCK_BOOTTIME CLOCK_MONOTONIC #define CLOCK_REALTIME_COARSE CLOCK_REALTIME_FAST #define CLOCK_MONOTONIC_COARSE CLOCK_MONOTONIC_FAST #endif From nobody Fri May 31 14:47: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 4VrQtt6vJ8z5N1fD; Fri, 31 May 2024 14:47: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 4VrQtt5R0rz514p; Fri, 31 May 2024 14:47:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717166822; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VQoIgaXquUnxKtTkbBtS8Nt2AsVjqTppqSgIh00S4I0=; b=WLrQKKPESex/u/Et5WDlqlV1SKMc5FZrtO3sZPu5VaQ9GO991ZgvTKXnsYw6/1AhLr7seo fexju0VqaeJeftfEEKHmnBQs6hMg1TslKotG19nUZObwXpkk15qfkeHBDAp2SVEXQ5SCLA 7kPv35nnaXfUkisji232xuQCZd1HRVCcP3DRG7bB0vtq/i7Ip2fPh5TWl/Dm+jFnRyZdkY mgHWc6w8561K0Wc5nh0zVDbnps0ElBgrgjSh+UL4X0+WbE83LUtnlPpd7f8UYsIvYtzsPE R3E2jPEPf0LA4LqU2tgjZkV9bESaJcxZcsXdH1ZAz3SebOq2YfAcQwtv2gfG7Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1717166822; a=rsa-sha256; cv=none; b=VWtDY/mpPHaBeEiSOgbcNs3utV6Q4+mht3kbYE73Ahxeouq+xoOydlNCtGSy4b5glRJtoN G8PtnNF1kgnf2Lob5ov6q5TE+18397HXxahMZW+OBBfBW66tug7L95J1rkq0EOtafvjZDV 0HTsrV4bh9QZVRUbi7MlqUxqTu9+F/swKwIgijKCguR89VmTHQq4HnR80HZBWnbmc8ycOy X17bbQCSt1gf2Z8I6zKgZ4OI23piwB1P9srLx8dxwdCBJbVeLfuTneKrqVvBcp27hCiHw/ IpioBOzg9Ni5nkMgDuiptBAS+Iu/nlaDPOlZeM9kZLH/YTtLValUBw3eWhFw5g== 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=1717166822; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VQoIgaXquUnxKtTkbBtS8Nt2AsVjqTppqSgIh00S4I0=; b=Noc3HKyceThcdhkhXllrKr69tV8l210H9h9j6k+1aMGWYz2I2USlCYf/u0AJsht1qt1xEr CbwHbRGxbUHmAeksm0xEpg/LGrbAiWDIiD8YFx/pxNzi7E7Vhpa89So6eszAxG/PaAogzX 5EazK3pjUCYklsKDNkUn9JSppuduOWGntmxIcnL1bhf12vDtwxfHlWN7wa6Kz3GkjRBgUC JvBxF1gX8uxPJ1rFgAyBdlPk7uMT1ICFuPnyP+2wqfw32nVO1LFNxssRydOtlb1/502/mg /RgLfAMviP5pZhP10Ppf/jxwlbDviNQMyhRvwvvDb22rlf5I5+y0+dGbnez3PA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VrQtt52ZyzRx5; Fri, 31 May 2024 14:47: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 44VEl2LY078258; Fri, 31 May 2024 14:47:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44VEl2qG078255; Fri, 31 May 2024 14:47:02 GMT (envelope-from git) Date: Fri, 31 May 2024 14:47:02 GMT Message-Id: <202405311447.44VEl2qG078255@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: e03e8b077433 - main - sys/param.h: Bump FreeBSD_version to 1500019 for CLOCK_ define changes List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: e03e8b07743385e5b199409074fb60b1a9ed1fac Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=e03e8b07743385e5b199409074fb60b1a9ed1fac commit e03e8b07743385e5b199409074fb60b1a9ed1fac Author: Warner Losh AuthorDate: 2024-05-31 14:45:33 +0000 Commit: Warner Losh CommitDate: 2024-05-31 14:45:33 +0000 sys/param.h: Bump FreeBSD_version to 1500019 for CLOCK_ define changes Redefining CLOCK_BOOTTIME from CLOCK_UPTIME to CLOCK_MONOTONIC is an interesting event, create a FreeBSD_version for it. Sponsored by: Netflix --- sys/sys/param.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/sys/param.h b/sys/sys/param.h index e10b4f506520..75370d5998fb 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 1500018 +#define __FreeBSD_version 1500019 /* * __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD, From nobody Fri May 31 15:28: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 4VrRpb5Y2qz5N4Yh; Fri, 31 May 2024 15:28:23 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Received: from omta002.cacentral1.a.cloudfilter.net (omta002.cacentral1.a.cloudfilter.net [3.97.99.33]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "Client", Issuer "CA" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VrRpb3JLgz55LL; Fri, 31 May 2024 15:28:23 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Authentication-Results: mx1.freebsd.org; none Received: from shw-obgw-4002a.ext.cloudfilter.net ([10.228.9.250]) by cmsmtp with ESMTPS id Cz6zsbET9drxED4B4sGBZa; Fri, 31 May 2024 15:28:22 +0000 Received: from spqr.komquats.com ([70.66.152.170]) by cmsmtp with ESMTPSA id D4B2sUMvV9Cr4D4B3sVbJw; Fri, 31 May 2024 15:28:21 +0000 X-Auth-User: cschuber X-Authority-Analysis: v=2.4 cv=etl8zZpX c=1 sm=1 tr=0 ts=6659ec95 a=y8EK/9tc/U6QY+pUhnbtgQ==:117 a=y8EK/9tc/U6QY+pUhnbtgQ==:17 a=kj9zAlcOel0A:10 a=TpHVaj0NuXgA:10 a=6I5d2MoRAAAA:8 a=YxBL1-UpAAAA:8 a=EkcXrb_YAAAA:8 a=hHJK3tccsECb7jr94p4A:9 a=CjuIK1q_8ugA:10 a=IjZwj45LgO3ly-622nXo:22 a=Ia-lj3WSrqcvXOmTRaiG:22 a=LK5xJRSDVpKd5WXXoEvA:22 Received: from slippy.cwsent.com (slippy [10.1.1.91]) by spqr.komquats.com (Postfix) with ESMTP id A700299F; Fri, 31 May 2024 08:28:19 -0700 (PDT) Received: by slippy.cwsent.com (Postfix, from userid 1000) id 33B6597; Fri, 31 May 2024 08:28:19 -0700 (PDT) X-Mailer: exmh version 2.9.0 11/07/2018 with nmh-1.8+dev Reply-to: Cy Schubert From: Cy Schubert X-os: FreeBSD X-Sender: cy@cwsent.com X-URL: http://www.cschubert.com/ To: Warner Losh cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: 676041c41ba5 - main - WPA: Allow CLOCK_BOOTTIME and CLOCK_MONOTONIC to #define the same In-reply-to: <202405311447.44VEl06w078151@gitrepo.freebsd.org> References: <202405311447.44VEl06w078151@gitrepo.freebsd.org> Comments: In-reply-to Warner Losh message dated "Fri, 31 May 2024 14:47:00 +0000." List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Date: Fri, 31 May 2024 08:28:19 -0700 Message-Id: <20240531152819.33B6597@slippy.cwsent.com> X-CMAE-Envelope: MS4xfHfS4t4LUf9qRBN7R+EYT7AVP88mcPSQpu4ObM4UtHN9uFLTbpOp43l7O+hR6RbKz4jU5BQcPjnOtaQ2blkBzWk5/sX+5gyRJiJGaOqCQowZb86DHePF rmUiZS/isrYkpu5vL/2i2HKRVFhOHVQalMq7m8K3GLQYJIyLraiHJF1KLbgbXrV4icy2OH8PY1kDTB20wYTITK5m0sximzaWvdDyYLAyptD+1d0SbKWk2tJF oSOWj7whSkPnHUyOMTRnB4TbmddF/5recs4s0c8qZrRHsD+T4d6Ja6zcJkZo2GfLppp7B98sx/a/rzjVz97DUd2twSs1LLtvADFKasdSS3o= X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:16509, ipnet:3.96.0.0/15, country:US] X-Rspamd-Queue-Id: 4VrRpb3JLgz55LL In message <202405311447.44VEl06w078151@gitrepo.freebsd.org>, Warner Losh write s: > The branch main has been updated by imp: > > URL: https://cgit.FreeBSD.org/src/commit/?id=676041c41ba587285bb934aa2fca290e > a7208038 > > commit 676041c41ba587285bb934aa2fca290ea7208038 > Author: Warner Losh > AuthorDate: 2024-05-31 14:44:55 +0000 > Commit: Warner Losh > CommitDate: 2024-05-31 14:44:55 +0000 > > WPA: Allow CLOCK_BOOTTIME and CLOCK_MONOTONIC to #define the same > > Historically, these have been differnet values, and only one was defined > or they were defined as different values. Now that they are about to be > the same value, add #ifdef to cope. > > Sponsored by: Netflix > Reviewed by: olce, val_packett.cool, adrian > Differential Revision: https://reviews.freebsd.org/D45418 > --- > contrib/wpa/src/utils/os_unix.c | 11 ++++++++--- > 1 file changed, 8 insertions(+), 3 deletions(-) > > diff --git a/contrib/wpa/src/utils/os_unix.c b/contrib/wpa/src/utils/os_unix. > c > index 315c973f3228..a856179fb3b1 100644 > --- a/contrib/wpa/src/utils/os_unix.c > +++ b/contrib/wpa/src/utils/os_unix.c > @@ -72,7 +72,6 @@ int os_get_time(struct os_time *t) > return res; > } > > - > int os_get_reltime(struct os_reltime *t) > { > #ifndef __MACH__ > @@ -97,15 +96,21 @@ int os_get_reltime(struct os_reltime *t) > return 0; > } > switch (clock_id) { > -#ifdef CLOCK_BOOTTIME > +#if defined(CLOCK_BOOTTIME) Why this change? This could become a potential merge conflict next time WPA is MFVed. > case CLOCK_BOOTTIME: > clock_id = CLOCK_MONOTONIC; > break; > #endif > -#ifdef CLOCK_MONOTONIC > +#if defined(CLOCK_MONOTONIC) Ditto. > +/* > + * FreeBSD has both BOOTTIME and MONOTONIC defined to the same value, since > they > + * mean the same thing. FreeBSD 14.1 and ealier don't, so need this case. > + */ > +#if !(defined(CLOCK_BOOTTIME) && CLOCK_BOOTTIME == CLOCK_MONOTONIC) This I probably want to apply to the ports. > case CLOCK_MONOTONIC: > clock_id = CLOCK_REALTIME; > break; > +#endif > #endif > case CLOCK_REALTIME: > return -1; > -- Cheers, Cy Schubert FreeBSD UNIX: Web: https://FreeBSD.org NTP: Web: https://nwtime.org e^(i*pi)+1=0 From nobody Fri May 31 15:48: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 4VrSGB46pNz5N5pL for ; Fri, 31 May 2024 15:48:50 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-ej1-x632.google.com (mail-ej1-x632.google.com [IPv6:2a00:1450:4864:20::632]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "WR4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VrSGB13kTz58QJ for ; Fri, 31 May 2024 15:48:50 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-ej1-x632.google.com with SMTP id a640c23a62f3a-a62972c88a9so247479866b.1 for ; Fri, 31 May 2024 08:48:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20230601.gappssmtp.com; s=20230601; t=1717170528; x=1717775328; darn=freebsd.org; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=WvgjDlm27ay++k2JoNhD3oEi1QauYzKkPeyTfzQ6VnM=; b=m1HgSkoOB3P4hm5OrO2IgTAMha2ezF5TxFihqZzEFOMQP8TvUDufJAZyv9DvoT0wKB dlTjgGxCzor4eN+I3O1iTIfzQ6X+FV4HxuQokM0bWqiO7WETWmOK4n9lwfJ4T8gr+PVn 3+3kyQUEc9rK/FdncDz+pyaxm7E3Y60vqz7Y4RyMPtBEIaZNEEMW3VkjhdR+Qb1bNwv0 Rl57KL/QfYVWMjAdLMQl+yMT4cOKYUOq7avGA3gKaFT4vLc3hZ2fHTcGsCqxFI1YGuXY wQ6Zj1o9T9VgG1Y6xDXdN+TCLKo7Zo3uSM73invgwwAnYXmR59JP02CVqHN+FEJydJv4 CbOA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1717170528; x=1717775328; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=WvgjDlm27ay++k2JoNhD3oEi1QauYzKkPeyTfzQ6VnM=; b=YRS3iX7fWyTbRRIEW7jdS7GiEUAz84LMnHIZph3f94mygOYXX2dCdDlr8agoLEuhfb JV7bqn3vnTqxptAglY/dF+WTogjWIFjg9l2bnEamrGz/5Di9DhZ1yypkYke1pccs8ZuJ ylmPiVw9e0FmogiBxnl0VxtLzRwiBVLkiLyC7Wa1QjPOlUv2Sr+65lIIeYAVss+vo7jS Oz+r+YZzDTLrWK30vMb4qgHvgR3tNMBGZuYIEHOL1hnNpjzEgimmQlUjL9bLwegqf/9B fe/mplems099ROkAyFn4LcQoLrVcyLfkccDt76ItcKIj5IgywB0w2EH+rUnoXi9d+WJn 0obA== X-Forwarded-Encrypted: i=1; AJvYcCVxpDk9ymnXHVInNdyRfVF1aKqoM4fTwi3tkUDTLVjGkOu+tXikM5gpu7sPRYqFUWkm9KrFDni/myNeDZubl2JjkrWb0CNkTTnjJ+sVCXyG X-Gm-Message-State: AOJu0Yxg+MaaFEbhj963A6bwXCLLssw9pCK94Dqt474AIxCowkMO0daV ReIT4wcP9sylE32rlUUek8pg+YK3yMif5QtJucwJMnoDGNw3Cs9qqcVRhWJE30xePsJUwrCKWjH dAKiZUmNhVuMkjgA7MU+fK9P2y5bfhHggu/C8JbzCML0so1KmyjaZyA== X-Google-Smtp-Source: AGHT+IHBU35JMBVq12e5YS4vLwTP7nqURKyK2KyXFEzhPej0fQBc308BLnGTxPL8UqPG8PSYFRyCSPSDLW/YWc7zBo8= X-Received: by 2002:a17:906:cb12:b0:a59:ad15:6142 with SMTP id a640c23a62f3a-a682291c588mr147160466b.77.1717170527971; Fri, 31 May 2024 08:48:47 -0700 (PDT) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 References: <202405311447.44VEl06w078151@gitrepo.freebsd.org> <20240531152819.33B6597@slippy.cwsent.com> In-Reply-To: <20240531152819.33B6597@slippy.cwsent.com> From: Warner Losh Date: Fri, 31 May 2024 11:48:36 -0400 Message-ID: Subject: Re: git: 676041c41ba5 - main - WPA: Allow CLOCK_BOOTTIME and CLOCK_MONOTONIC to #define the same To: Cy Schubert Cc: Warner Losh , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Content-Type: multipart/alternative; boundary="00000000000056c22d0619c1eb4c" X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:2a00:1450::/32, country:US] X-Rspamd-Queue-Id: 4VrSGB13kTz58QJ --00000000000056c22d0619c1eb4c Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Fri, May 31, 2024 at 11:28=E2=80=AFAM Cy Schubert wrote: > In message <202405311447.44VEl06w078151@gitrepo.freebsd.org>, Warner Losh > write > s: > > The branch main has been updated by imp: > > > > URL: > https://cgit.FreeBSD.org/src/commit/?id=3D676041c41ba587285bb934aa2fca290= e > > a7208038 > > > > commit 676041c41ba587285bb934aa2fca290ea7208038 > > Author: Warner Losh > > AuthorDate: 2024-05-31 14:44:55 +0000 > > Commit: Warner Losh > > CommitDate: 2024-05-31 14:44:55 +0000 > > > > WPA: Allow CLOCK_BOOTTIME and CLOCK_MONOTONIC to #define the same > > > > Historically, these have been differnet values, and only one was > defined > > or they were defined as different values. Now that they are about t= o > be > > the same value, add #ifdef to cope. > > > > Sponsored by: Netflix > > Reviewed by: olce, val_packett.cool, adrian > > Differential Revision: https://reviews.freebsd.org/D45418 > > --- > > contrib/wpa/src/utils/os_unix.c | 11 ++++++++--- > > 1 file changed, 8 insertions(+), 3 deletions(-) > > > > diff --git a/contrib/wpa/src/utils/os_unix.c > b/contrib/wpa/src/utils/os_unix. > > c > > index 315c973f3228..a856179fb3b1 100644 > > --- a/contrib/wpa/src/utils/os_unix.c > > +++ b/contrib/wpa/src/utils/os_unix.c > > @@ -72,7 +72,6 @@ int os_get_time(struct os_time *t) > > return res; > > } > > > > - > > int os_get_reltime(struct os_reltime *t) > > { > > #ifndef __MACH__ > > @@ -97,15 +96,21 @@ int os_get_reltime(struct os_reltime *t) > > return 0; > > } > > switch (clock_id) { > > -#ifdef CLOCK_BOOTTIME > > +#if defined(CLOCK_BOOTTIME) > > Why this change? This could become a potential merge conflict next time > WPA > is MFVed. > Oh, that was a mistake. > > case CLOCK_BOOTTIME: > > clock_id =3D CLOCK_MONOTONIC; > > break; > > #endif > > -#ifdef CLOCK_MONOTONIC > > +#if defined(CLOCK_MONOTONIC) > > Ditto. > Ditto. I iterated on these changes and thought I'd restored them to the original. I'll do a followup diff minimization diff. > > > +/* > > + * FreeBSD has both BOOTTIME and MONOTONIC defined to the same value, > since > > they > > + * mean the same thing. FreeBSD 14.1 and ealier don't, so need this > case. > > + */ > > +#if !(defined(CLOCK_BOOTTIME) && CLOCK_BOOTTIME =3D=3D CLOCK_MONOTONIC= ) > > This I probably want to apply to the ports. > Yes. I had you on the review, but I did move kinda quickly on this, and so those ports are likely broken by the change in FreeBSD. My apologies. Warner > > case CLOCK_MONOTONIC: > > clock_id =3D CLOCK_REALTIME; > > break; > > +#endif > > #endif > > case CLOCK_REALTIME: > > return -1; > > > > > -- > Cheers, > Cy Schubert > FreeBSD UNIX: Web: https://FreeBSD.org > NTP: Web: https://nwtime.org > > e^(i*pi)+1=3D0 > > > --00000000000056c22d0619c1eb4c Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable


=
On Fri, May 31, 2024 at 11:28=E2=80= =AFAM Cy Schubert <Cy.Schub= ert@cschubert.com> wrote:
In message <202405311447.44VEl06w078151@gitre= po.freebsd.org>, Warner Losh
write
s:
> The branch main has been updated by imp:
>
> URL: https://cgit.Fre= eBSD.org/src/commit/?id=3D676041c41ba587285bb934aa2fca290e
> a7208038
>
> commit 676041c41ba587285bb934aa2fca290ea7208038
> Author:=C2=A0 =C2=A0 =C2=A0Warner Losh <imp@FreeBSD.org>
> AuthorDate: 2024-05-31 14:44:55 +0000
> Commit:=C2=A0 =C2=A0 =C2=A0Warner Losh <imp@FreeBSD.org>
> CommitDate: 2024-05-31 14:44:55 +0000
>
>=C2=A0 =C2=A0 =C2=A0WPA: Allow CLOCK_BOOTTIME and CLOCK_MONOTONIC to #d= efine the same
>=C2=A0 =C2=A0 =C2=A0
>=C2=A0 =C2=A0 =C2=A0Historically, these have been differnet values, and= only one was defined
>=C2=A0 =C2=A0 =C2=A0or they were defined as different values. Now that = they are about to be
>=C2=A0 =C2=A0 =C2=A0the same value, add #ifdef to cope.
>=C2=A0 =C2=A0 =C2=A0
>=C2=A0 =C2=A0 =C2=A0Sponsored by:=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0Netflix
>=C2=A0 =C2=A0 =C2=A0Reviewed by:=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 olce, val_packett.cool, adrian
>=C2=A0 =C2=A0 =C2=A0Differential Revision:=C2=A0 https://revie= ws.freebsd.org/D45418
> ---
>=C2=A0 contrib/wpa/src/utils/os_unix.c | 11 ++++++++---
>=C2=A0 1 file changed, 8 insertions(+), 3 deletions(-)
>
> diff --git a/contrib/wpa/src/utils/os_unix.c b/contrib/wpa/src/utils/o= s_unix.
> c
> index 315c973f3228..a856179fb3b1 100644
> --- a/contrib/wpa/src/utils/os_unix.c
> +++ b/contrib/wpa/src/utils/os_unix.c
> @@ -72,7 +72,6 @@ int os_get_time(struct os_time *t)
>=C2=A0 =C2=A0 =C2=A0 =C2=A0return res;
>=C2=A0 }
>=C2=A0
> -
>=C2=A0 int os_get_reltime(struct os_reltime *t)
>=C2=A0 {
>=C2=A0 #ifndef __MACH__
> @@ -97,15 +96,21 @@ int os_get_reltime(struct os_reltime *t)
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0return 0;
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0}
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0switch (clock_id= ) {
> -#ifdef CLOCK_BOOTTIME
> +#if defined(CLOCK_BOOTTIME)

Why this change? This could become a potential merge conflict next time WPA=
is MFVed.

Oh, that was a mistake.=C2=A0=
=C2=A0
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0case CLOCK_BOOTT= IME:
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0clock_id =3D CLOCK_MONOTONIC;
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0break;
>=C2=A0 #endif
> -#ifdef CLOCK_MONOTONIC
> +#if defined(CLOCK_MONOTONIC)

Ditto.

Ditto. I iterated on these chang= es and thought I'd restored them to the original. I'll do a followu= p diff minimization diff.=C2=A0

> +/*
> + * FreeBSD has both BOOTTIME and MONOTONIC defined to the same value,= since
> they
> + * mean the same thing. FreeBSD 14.1 and ealier don't, so need th= is case.
> + */
> +#if !(defined(CLOCK_BOOTTIME) && CLOCK_BOOTTIME =3D=3D CLOCK_= MONOTONIC)

This I probably want to apply to the ports.

=
Yes. I had you on the review, but I did move kinda quickly on this, an= d so those ports
are likely broken by the change in FreeBSD. My a= pologies.

Warner
=C2=A0
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0case CLOCK_MONOT= ONIC:
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0clock_id =3D CLOCK_REALTIME;
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0break;
> +#endif
>=C2=A0 #endif
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0case CLOCK_REALT= IME:
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0return -1;
>


--
Cheers,
Cy Schubert <Cy.Schubert@cschubert.com>
FreeBSD UNIX:=C2=A0 <cy@FreeBSD.org>=C2=A0 =C2=A0Web:=C2=A0 https://FreeB= SD.org
NTP:=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0<cy@nwtime.org>=C2=A0 =C2=A0 Web:=C2=A0 https://nwt= ime.org

=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 e^(i*pi)+1=3D0


--00000000000056c22d0619c1eb4c-- From nobody Fri May 31 16:00: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 4VrSWM1J77z5N6n7; Fri, 31 May 2024 16:00:15 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Received: from omta001.cacentral1.a.cloudfilter.net (omta001.cacentral1.a.cloudfilter.net [3.97.99.32]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "Client", Issuer "CA" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VrSWM0RS2z3x57; Fri, 31 May 2024 16:00:15 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Authentication-Results: mx1.freebsd.org; none Received: from shw-obgw-4001a.ext.cloudfilter.net ([10.228.9.142]) by cmsmtp with ESMTPS id D1GqsRb0N2Ui5D4fusBjkE; Fri, 31 May 2024 16:00:14 +0000 Received: from spqr.komquats.com ([70.66.152.170]) by cmsmtp with ESMTPSA id D4fssCjpOpsbgD4ftsx2e5; Fri, 31 May 2024 16:00:14 +0000 X-Auth-User: cschuber X-Authority-Analysis: v=2.4 cv=Ff+Ux4+6 c=1 sm=1 tr=0 ts=6659f40e a=y8EK/9tc/U6QY+pUhnbtgQ==:117 a=y8EK/9tc/U6QY+pUhnbtgQ==:17 a=kj9zAlcOel0A:10 a=TpHVaj0NuXgA:10 a=6I5d2MoRAAAA:8 a=YxBL1-UpAAAA:8 a=EkcXrb_YAAAA:8 a=f3Yg3hO_8iQK3PizN4cA:9 a=CjuIK1q_8ugA:10 a=IjZwj45LgO3ly-622nXo:22 a=Ia-lj3WSrqcvXOmTRaiG:22 a=LK5xJRSDVpKd5WXXoEvA:22 Received: from slippy.cwsent.com (slippy [10.1.1.91]) by spqr.komquats.com (Postfix) with ESMTP id 357FD5C; Fri, 31 May 2024 09:00:12 -0700 (PDT) Received: by slippy.cwsent.com (Postfix, from userid 1000) id 2D5AE111; Fri, 31 May 2024 09:00:12 -0700 (PDT) X-Mailer: exmh version 2.9.0 11/07/2018 with nmh-1.8+dev Reply-to: Cy Schubert From: Cy Schubert X-os: FreeBSD X-Sender: cy@cwsent.com X-URL: http://www.cschubert.com/ To: Warner Losh cc: Cy Schubert , Warner Losh , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 676041c41ba5 - main - WPA: Allow CLOCK_BOOTTIME and CLOCK_MONOTONIC to #define the same In-reply-to: References: <202405311447.44VEl06w078151@gitrepo.freebsd.org> <20240531152819.33B6597@slippy.cwsent.com> Comments: In-reply-to Warner Losh message dated "Fri, 31 May 2024 11:48:36 -0400." List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Date: Fri, 31 May 2024 09:00:12 -0700 Message-Id: <20240531160012.2D5AE111@slippy.cwsent.com> X-CMAE-Envelope: MS4xfLqzDKyugAIrCP8DU3oeyMUcUYvge/RuLk6hrVQDtKPx9k/sUqnlPCgeP4G0QIzojLpcbe8u9AIiyM34RWUiaqDjGGZV95l6lCv7kcOZp7rzEo30qa/L N9kg4b5g0hyo+DY2gS3qmYLhh4pdzVn6vE+tksh921XOQv9FTByDB4r2zvlr3IVgMoLZsbBDm1UMgc08DVJXUKdcbleO75Km+0MLljsp03kU4ls6xdVRLywS 5HwqAhfe1FmEQ+WaRWWowPTDZGDQrlguxdfqO+aChsFpir8DtGlUQJ/Wm7WRcrCrnaKOHW/JviVQ5cqGvGGZ/q2KdBVelzLKJRm27W6PSiyuCKqs6EoFa92d VTgIeePe X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:16509, ipnet:3.96.0.0/15, country:US] X-Rspamd-Queue-Id: 4VrSWM0RS2z3x57 In message , Warner Losh writes: > --00000000000056c22d0619c1eb4c > Content-Type: text/plain; charset="UTF-8" > Content-Transfer-Encoding: quoted-printable > > On Fri, May 31, 2024 at 11:28=E2=80=AFAM Cy Schubert .com> > wrote: > > > In message <202405311447.44VEl06w078151@gitrepo.freebsd.org>, Warner Losh > > write > > s: > > > The branch main has been updated by imp: > > > > > > URL: > > https://cgit.FreeBSD.org/src/commit/?id=3D676041c41ba587285bb934aa2fca290= > e > > > a7208038 > > > > > > commit 676041c41ba587285bb934aa2fca290ea7208038 > > > Author: Warner Losh > > > AuthorDate: 2024-05-31 14:44:55 +0000 > > > Commit: Warner Losh > > > CommitDate: 2024-05-31 14:44:55 +0000 > > > > > > WPA: Allow CLOCK_BOOTTIME and CLOCK_MONOTONIC to #define the same > > > > > > Historically, these have been differnet values, and only one was > > defined > > > or they were defined as different values. Now that they are about t= > o > > be > > > the same value, add #ifdef to cope. > > > > > > Sponsored by: Netflix > > > Reviewed by: olce, val_packett.cool, adrian > > > Differential Revision: https://reviews.freebsd.org/D45418 > > > --- > > > contrib/wpa/src/utils/os_unix.c | 11 ++++++++--- > > > 1 file changed, 8 insertions(+), 3 deletions(-) > > > > > > diff --git a/contrib/wpa/src/utils/os_unix.c > > b/contrib/wpa/src/utils/os_unix. > > > c > > > index 315c973f3228..a856179fb3b1 100644 > > > --- a/contrib/wpa/src/utils/os_unix.c > > > +++ b/contrib/wpa/src/utils/os_unix.c > > > @@ -72,7 +72,6 @@ int os_get_time(struct os_time *t) > > > return res; > > > } > > > > > > - > > > int os_get_reltime(struct os_reltime *t) > > > { > > > #ifndef __MACH__ > > > @@ -97,15 +96,21 @@ int os_get_reltime(struct os_reltime *t) > > > return 0; > > > } > > > switch (clock_id) { > > > -#ifdef CLOCK_BOOTTIME > > > +#if defined(CLOCK_BOOTTIME) > > > > Why this change? This could become a potential merge conflict next time > > WPA > > is MFVed. > > > > Oh, that was a mistake. > > > > > case CLOCK_BOOTTIME: > > > clock_id =3D CLOCK_MONOTONIC; > > > break; > > > #endif > > > -#ifdef CLOCK_MONOTONIC > > > +#if defined(CLOCK_MONOTONIC) > > > > Ditto. > > > > Ditto. I iterated on these changes and thought I'd restored them to the > original. I'll do a followup diff minimization diff. > > > > > > +/* > > > + * FreeBSD has both BOOTTIME and MONOTONIC defined to the same value, > > since > > > they > > > + * mean the same thing. FreeBSD 14.1 and ealier don't, so need this > > case. > > > + */ > > > +#if !(defined(CLOCK_BOOTTIME) && CLOCK_BOOTTIME =3D=3D CLOCK_MONOTONIC= > ) > > > > This I probably want to apply to the ports. > > > > Yes. I had you on the review, but I did move kinda quickly on this, and so That was my fault. My MH review folder is large and with all the things going on here I failed to cherry-pick this one out of that folder. This is totally on me, I'm sorry. > those ports > are likely broken by the change in FreeBSD. My apologies. No apologies necessary. As long as I know what can be kept and what can be overwritten next time WPA is MFVed. -- Cheers, Cy Schubert FreeBSD UNIX: Web: https://FreeBSD.org NTP: Web: https://nwtime.org e^(i*pi)+1=0 From nobody Fri May 31 16:05:11 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VrSd35G8Yz5N7Rm; Fri, 31 May 2024 16:05:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VrSd34XQCz40Cp; Fri, 31 May 2024 16:05:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717171511; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=T6jTY8rMCZgrUo7vsLAt+HU5ee9aMf5A2hlNGs+UGzI=; b=gB3baYUXr4PPI9j2ViVc6MI6sEEtuKbwxEth2aGQyeMvx+3IE9+Pk1RuEJgEOT0NRDYv4r vceBZpfaObquDvR1a61W7zC3uKtSWEOb6io1yu0lMiOiCTI2KS/E5uPoJmaZ/8GELj/GZ0 uaf0gBBqwuuqzEmqaTFOa41c+q/cnKppY/Lb5Z+EMb6y1FN26q9iOCcrdL40M+iFMU9p9Y D0Qpa3GRe10Mz+XK4i/1/6fJVMNOCtvEIzy0p5XLIkWatXBZMEKHPRhFT6JSCoWOrrxEiX iB4+lC8YMYxF+QKxGiZ8Tf8HY0jWHOqgM6XPQQ6fIZrONBxlxPvNLB+yqsUFfg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1717171511; a=rsa-sha256; cv=none; b=LsbnULy9HqXrdDEU7ffoaQ/Fo4MSR+S8zIznjXMAWs9cjSWEVneVQrUGHxEyqzsLdT7YJo MM03xcyj6+7d9LzuPgliVbwSSAjl14lRMT2rNI+myJzdhpriwX/UP/+IUAuIeQg6hKXFB+ 0g+aZKWTOdZXRWu5w2PlKiQSLAM0pxvOsPOYwGkC86nG5wsuaH70SzCrEovBLTKcF/VjiF FrrKjROkYpVs3in/ZntKepzbSd6WF7EEaoXPSgE3IZ4Ug5+90wDW0VSq1yBreFYNTfBgx4 4XbpZ9wAWVzAsXJJXzb+BfjLqZ0aXsRU6YbhgsxpWtZWOiUaCtmDH84cVF5ZDg== 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=1717171511; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=T6jTY8rMCZgrUo7vsLAt+HU5ee9aMf5A2hlNGs+UGzI=; b=FQRtfdQDyunfnVlF97AXz2jMF4wHvQLrPTO1CSD/Y5BFLTKFBhxVh6ITVztmVt6W8VXM5B xT3jVGSJ2phYS5yba8v7d5n4IlXyi3UX5O4XpF+qlNmiYfCDK4sDrFr2ylUUer0CXa7WkZ PZLA3vCUenQsKgbHH1Ke8/B5JTTtVPhsAqrfjct5x0aeNhGFW8RgS1o68fe7/ZnVJ+Kf2H PRNXWHq1/yUdAgcql7bsRNajWwqskdY17VcXYGSg5EfKAMl9mI2ut7Bp1PDAxTg7g3ySVJ hiv0hSZuQzIOl0vOf563VLMTZRSYobaL9PDEeX7/JL+YWYnHmKatYwbn45+AVg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VrSd33yrxzVJP; Fri, 31 May 2024 16:05: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 44VG5BGG013454; Fri, 31 May 2024 16:05:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44VG5BW0013451; Fri, 31 May 2024 16:05:11 GMT (envelope-from git) Date: Fri, 31 May 2024 16:05:11 GMT Message-Id: <202405311605.44VG5BW0013451@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: cab9ccf3ff8c - main - wpa: Diff reduction with upstream List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: cab9ccf3ff8c5722dace61a814d791aeba2751c6 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=cab9ccf3ff8c5722dace61a814d791aeba2751c6 commit cab9ccf3ff8c5722dace61a814d791aeba2751c6 Author: Warner Losh AuthorDate: 2024-05-31 16:02:37 +0000 Commit: Warner Losh CommitDate: 2024-05-31 16:02:37 +0000 wpa: Diff reduction with upstream I inadvertantly added gratuitous changes to upstream. Revert the gratuitous parts of 676041c41ba5 Suggested by: cy Fixes: 676041c41ba5 Sponsored by: Netflix --- contrib/wpa/src/utils/os_unix.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/contrib/wpa/src/utils/os_unix.c b/contrib/wpa/src/utils/os_unix.c index a856179fb3b1..c2f9e4fd1306 100644 --- a/contrib/wpa/src/utils/os_unix.c +++ b/contrib/wpa/src/utils/os_unix.c @@ -96,12 +96,12 @@ int os_get_reltime(struct os_reltime *t) return 0; } switch (clock_id) { -#if defined(CLOCK_BOOTTIME) +#ifdef CLOCK_BOOTTIME case CLOCK_BOOTTIME: clock_id = CLOCK_MONOTONIC; break; #endif -#if defined(CLOCK_MONOTONIC) +#ifdef CLOCK_MONOTONIC /* * FreeBSD has both BOOTTIME and MONOTONIC defined to the same value, since they * mean the same thing. FreeBSD 14.1 and ealier don't, so need this case. From nobody Fri May 31 16:06: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 4VrSfz2JfDz5N7MC for ; Fri, 31 May 2024 16:06:51 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-ed1-x52f.google.com (mail-ed1-x52f.google.com [IPv6:2a00:1450:4864:20::52f]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "WR4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VrSfy5NqNz40dP for ; Fri, 31 May 2024 16:06:50 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-ed1-x52f.google.com with SMTP id 4fb4d7f45d1cf-5789733769dso4058449a12.1 for ; Fri, 31 May 2024 09:06:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20230601.gappssmtp.com; s=20230601; t=1717171609; x=1717776409; darn=freebsd.org; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=cEt15uAZRehM84MFl8cjw8nd1G/6eC9Wh7BcYQnsymE=; b=r5BQZeQA2KNuoXbVsx5za8QWdNMrjpOVKDPQld9kXQkaCns7mqYvGOEyb64+YxQQLs 7KkkyFFMIf6MiaCZlRwiAhyQXixNGa5+qLnbL5q/4IxXBiSaXxQLdChbk2lznbUcxwUA nkjRcUddyR6ciHiJ1K8HrfuNJlEFEzuCorTmmGlXKOnLSsz165Q583+gEiD34d1qMXNl 0azWv0yHza0Ok0fEIePcQ3c2B4T+ItiCoJsA44BJ/A85UtTMbGOSZYaEDXO9wcSpKLLQ oocoj5pNtiY7ADMAUtpFuKIrDbAgVQOWUTxdIML8jag68Z7UdCUjdPPPWyPyoQGcfFyR eJqA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1717171609; x=1717776409; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=cEt15uAZRehM84MFl8cjw8nd1G/6eC9Wh7BcYQnsymE=; b=VDJlr9LRozk8fiZjfSgPYF5J+bxqEbMyV8jtPGSkhX/heP/4zZkFi2NYtbitqjMAik 4K+cj86dewHiUeApQE/1NH9AEa9e+EvpwPyraBm6S2Xu+Ky+v/QanwADegWG7OD5TiKE AWOQw3DpsFxV0pTeSJkGRIMX70TotDOrNlX4gvuWWElFXE9eZ8u+bLwMnQP/RFh03s/7 JrpAZq2TYO4F/Eek67gIrsu2/JZfoeyMyo2ESSe5L5yKUTiwY7IKrFbODYdWwzShqoYZ BaYLQHGr4+IEIYGVJHSc2CPzW56EiazDby9KJlIV7Dtelz51B6roOFEZBOUmauYdJbk7 cQzg== X-Forwarded-Encrypted: i=1; AJvYcCXwLgVmnSHN8YlWEDdi70Ulx2z9lKVjRZpz5aZdmHXdCmy6XUZ485GoxnjMAZmTv/XkCfTL53rL82rIrdpevkYqcy2VqfM3CjKpcwwwO57q X-Gm-Message-State: AOJu0Yxoy4WZJXC0LdGB1P3ebF+VHj7A/CI1AYoC8s6J+X+CTVaMXLi/ Oc3l7aBV4nYJBPn8680PVXZfyaXyV7It39PFQO5qVXM5/WlDEgEbLNo+Ly9bPpzK/oYePk++OUj q9KJtBWkLNPn7q0OjeyDnHeTpd5VG4m0iUCcHvQ== X-Google-Smtp-Source: AGHT+IFVRcrNNX2CRMz2ewWrEM8BDKzaBER52O3xThhFsK9fQsR8yhVD9NVkseZcW+hcl6B+8GrVoxTZzPUnMjCVLTU= X-Received: by 2002:a17:906:2c1a:b0:a59:cbcb:1cca with SMTP id a640c23a62f3a-a65f094096dmr458486166b.13.1717171608839; Fri, 31 May 2024 09:06:48 -0700 (PDT) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 References: <202405311447.44VEl06w078151@gitrepo.freebsd.org> <20240531152819.33B6597@slippy.cwsent.com> <20240531160012.2D5AE111@slippy.cwsent.com> In-Reply-To: <20240531160012.2D5AE111@slippy.cwsent.com> From: Warner Losh Date: Fri, 31 May 2024 12:06:37 -0400 Message-ID: Subject: Re: git: 676041c41ba5 - main - WPA: Allow CLOCK_BOOTTIME and CLOCK_MONOTONIC to #define the same To: Cy Schubert Cc: Warner Losh , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Content-Type: multipart/alternative; boundary="000000000000c388f30619c22bf5" X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:2a00:1450::/32, country:US] X-Rspamd-Queue-Id: 4VrSfy5NqNz40dP --000000000000c388f30619c22bf5 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Fri, May 31, 2024 at 12:00=E2=80=AFPM Cy Schubert wrote: > In message > om> > , Warner Losh writes: > > --00000000000056c22d0619c1eb4c > > Content-Type: text/plain; charset=3D"UTF-8" > > Content-Transfer-Encoding: quoted-printable > > > > On Fri, May 31, 2024 at 11:28=3DE2=3D80=3DAFAM Cy Schubert > > .com> > > wrote: > > > > > In message <202405311447.44VEl06w078151@gitrepo.freebsd.org>, Warner > Losh > > > write > > > s: > > > > The branch main has been updated by imp: > > > > > > > > URL: > > > > https://cgit.FreeBSD.org/src/commit/?id=3D3D676041c41ba587285bb934aa2fca2= 90=3D > > e > > > > a7208038 > > > > > > > > commit 676041c41ba587285bb934aa2fca290ea7208038 > > > > Author: Warner Losh > > > > AuthorDate: 2024-05-31 14:44:55 +0000 > > > > Commit: Warner Losh > > > > CommitDate: 2024-05-31 14:44:55 +0000 > > > > > > > > WPA: Allow CLOCK_BOOTTIME and CLOCK_MONOTONIC to #define the sa= me > > > > > > > > Historically, these have been differnet values, and only one wa= s > > > defined > > > > or they were defined as different values. Now that they are > about t=3D > > o > > > be > > > > the same value, add #ifdef to cope. > > > > > > > > Sponsored by: Netflix > > > > Reviewed by: olce, val_packett.cool, adrian > > > > Differential Revision: https://reviews.freebsd.org/D45418 > > > > --- > > > > contrib/wpa/src/utils/os_unix.c | 11 ++++++++--- > > > > 1 file changed, 8 insertions(+), 3 deletions(-) > > > > > > > > diff --git a/contrib/wpa/src/utils/os_unix.c > > > b/contrib/wpa/src/utils/os_unix. > > > > c > > > > index 315c973f3228..a856179fb3b1 100644 > > > > --- a/contrib/wpa/src/utils/os_unix.c > > > > +++ b/contrib/wpa/src/utils/os_unix.c > > > > @@ -72,7 +72,6 @@ int os_get_time(struct os_time *t) > > > > return res; > > > > } > > > > > > > > - > > > > int os_get_reltime(struct os_reltime *t) > > > > { > > > > #ifndef __MACH__ > > > > @@ -97,15 +96,21 @@ int os_get_reltime(struct os_reltime *t) > > > > return 0; > > > > } > > > > switch (clock_id) { > > > > -#ifdef CLOCK_BOOTTIME > > > > +#if defined(CLOCK_BOOTTIME) > > > > > > Why this change? This could become a potential merge conflict next ti= me > > > WPA > > > is MFVed. > > > > > > > Oh, that was a mistake. > > > > > > > > case CLOCK_BOOTTIME: > > > > clock_id =3D3D CLOCK_MONOTONIC; > > > > break; > > > > #endif > > > > -#ifdef CLOCK_MONOTONIC > > > > +#if defined(CLOCK_MONOTONIC) > > > > > > Ditto. > > > > > > > Ditto. I iterated on these changes and thought I'd restored them to the > > original. I'll do a followup diff minimization diff. > > > > > > > > > +/* > > > > + * FreeBSD has both BOOTTIME and MONOTONIC defined to the same > value, > > > since > > > > they > > > > + * mean the same thing. FreeBSD 14.1 and ealier don't, so need thi= s > > > case. > > > > + */ > > > > +#if !(defined(CLOCK_BOOTTIME) && CLOCK_BOOTTIME =3D3D=3D3D > CLOCK_MONOTONIC=3D > > ) > > > > > > This I probably want to apply to the ports. > > > > > > > Yes. I had you on the review, but I did move kinda quickly on this, and > so > > That was my fault. My MH review folder is large and with all the things > going on here I failed to cherry-pick this one out of that folder. This i= s > totally on me, I'm sorry. > Gotcha. No worries. > > those ports > > are likely broken by the change in FreeBSD. My apologies. > > No apologies necessary. As long as I know what can be kept and what can b= e > overwritten next time WPA is MFVed. > I've pushed a fix to avoid the gratuitous differences. It should be clear now that you know about it and the diffs are minimized. Warner > -- > Cheers, > Cy Schubert > FreeBSD UNIX: Web: https://FreeBSD.org > NTP: Web: https://nwtime.org > > e^(i*pi)+1=3D0 > > > --000000000000c388f30619c22bf5 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable


=
On Fri, May 31, 2024 at 12:00=E2=80= =AFPM Cy Schubert <Cy.Schub= ert@cschubert.com> wrote:
In message <CANCZdfpyhd=3DBAcF_YFCCTumYNpGUMs0bQandZnoT= YjFWcM7hqg@mail.gmail.c
om>
, Warner Losh writes:
> --00000000000056c22d0619c1eb4c
> Content-Type: text/plain; charset=3D"UTF-8"
> Content-Transfer-Encoding: quoted-printable
>
> On Fri, May 31, 2024 at 11:28=3DE2=3D80=3DAFAM Cy Schubert <Cy.Schu= bert@cschubert=3D
> .com>
> wrote:
>
> > In message <202405311447.44VEl06w078151@gitrepo.free= bsd.org>, Warner Losh
> > write
> > s:
> > > The branch main has been updated by imp:
> > >
> > > URL:
> > https://cgit= .FreeBSD.org/src/commit/?id=3D3D676041c41ba587285bb934aa2fca290=3D
> e
> > > a7208038
> > >
> > > commit 676041c41ba587285bb934aa2fca290ea7208038
> > > Author:=C2=A0 =C2=A0 =C2=A0Warner Losh <imp@FreeBSD.org&g= t;
> > > AuthorDate: 2024-05-31 14:44:55 +0000
> > > Commit:=C2=A0 =C2=A0 =C2=A0Warner Losh <imp@FreeBSD.org&g= t;
> > > CommitDate: 2024-05-31 14:44:55 +0000
> > >
> > >=C2=A0 =C2=A0 =C2=A0WPA: Allow CLOCK_BOOTTIME and CLOCK_MONOT= ONIC to #define the same
> > >
> > >=C2=A0 =C2=A0 =C2=A0Historically, these have been differnet v= alues, and only one was
> > defined
> > >=C2=A0 =C2=A0 =C2=A0or they were defined as different values.= Now that they are about t=3D
> o
> > be
> > >=C2=A0 =C2=A0 =C2=A0the same value, add #ifdef to cope.
> > >
> > >=C2=A0 =C2=A0 =C2=A0Sponsored by:=C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0Netflix
> > >=C2=A0 =C2=A0 =C2=A0Reviewed by:=C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0 olce, val_packett.cool, adrian
> > >=C2=A0 =C2=A0 =C2=A0Differential Revision:=C2=A0 htt= ps://reviews.freebsd.org/D45418
> > > ---
> > >=C2=A0 contrib/wpa/src/utils/os_unix.c | 11 ++++++++---
> > >=C2=A0 1 file changed, 8 insertions(+), 3 deletions(-)
> > >
> > > diff --git a/contrib/wpa/src/utils/os_unix.c
> > b/contrib/wpa/src/utils/os_unix.
> > > c
> > > index 315c973f3228..a856179fb3b1 100644
> > > --- a/contrib/wpa/src/utils/os_unix.c
> > > +++ b/contrib/wpa/src/utils/os_unix.c
> > > @@ -72,7 +72,6 @@ int os_get_time(struct os_time *t)
> > >=C2=A0 =C2=A0 =C2=A0 =C2=A0return res;
> > >=C2=A0 }
> > >
> > > -
> > >=C2=A0 int os_get_reltime(struct os_reltime *t)
> > >=C2=A0 {
> > >=C2=A0 #ifndef __MACH__
> > > @@ -97,15 +96,21 @@ int os_get_reltime(struct os_reltime *t)=
> > >=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0return 0;
> > >=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0}
> > >=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0switch= (clock_id) {
> > > -#ifdef CLOCK_BOOTTIME
> > > +#if defined(CLOCK_BOOTTIME)
> >
> > Why this change? This could become a potential merge conflict nex= t time
> > WPA
> > is MFVed.
> >
>
> Oh, that was a mistake.
>
>
> > >=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0case C= LOCK_BOOTTIME:
> > >=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0clock_id =3D3D CLOCK_MONOTONIC;
> > >=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0break;
> > >=C2=A0 #endif
> > > -#ifdef CLOCK_MONOTONIC
> > > +#if defined(CLOCK_MONOTONIC)
> >
> > Ditto.
> >
>
> Ditto. I iterated on these changes and thought I'd restored them t= o the
> original. I'll do a followup diff minimization diff.
>
> >
> > > +/*
> > > + * FreeBSD has both BOOTTIME and MONOTONIC defined to the s= ame value,
> > since
> > > they
> > > + * mean the same thing. FreeBSD 14.1 and ealier don't, = so need this
> > case.
> > > + */
> > > +#if !(defined(CLOCK_BOOTTIME) && CLOCK_BOOTTIME =3D= 3D=3D3D CLOCK_MONOTONIC=3D
> )
> >
> > This I probably want to apply to the ports.
> >
>
> Yes. I had you on the review, but I did move kinda quickly on this, an= d so

That was my fault. My MH review folder is large and with all the things going on here I failed to cherry-pick this one out of that folder. This is =
totally on me, I'm sorry.

Gotcha. N= o worries.
=C2=A0
> those ports
> are likely broken by the change in FreeBSD. My apologies.

No apologies necessary. As long as I know what can be kept and what can be =
overwritten next time WPA is MFVed.

I&#= 39;ve pushed a fix to avoid the gratuitous differences. It should be clear = now that you
know about it and the diffs are minimized.

Warner
=C2=A0
--
Cheers,
Cy Schubert <Cy.Schubert@cschubert.com>
FreeBSD UNIX:=C2=A0 <cy@FreeBSD.org>=C2=A0 =C2=A0Web:=C2=A0 https://FreeB= SD.org
NTP:=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0<cy@nwtime.org>=C2=A0 =C2=A0 Web:=C2=A0 https://nwt= ime.org

=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 e^(i*pi)+1=3D0


--000000000000c388f30619c22bf5-- From nobody Fri May 31 16:20: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 4VrSyB5W6wz5N8LY; Fri, 31 May 2024 16:20: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 4VrSyB4pjgz42dj; Fri, 31 May 2024 16:20:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717172402; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=z1W4xJmnv5JLNnuQI/8WZuOHy5l5/Cz26V6aax6oxdE=; b=e+PWPinywaK5+wDCC6ZcwzxdMDFlS2mUuCrkAeczgZB8nT4jA4LpBJFSVsViknx73FvdjO eOyOdTMqbHleQzipeimIjVQG5+KLrzJ4KYSGE8+bKrA63eKY28rzjo9HdWkpBS5N2oQPJT wukyT8INeVpli4zUhIRpkz4X6ADoL4x8Ck/uNWd2CyLes7Z1odspI13dhWPLpOlmkLlXit Xah4QTF+e3O4JvoCbZZ0Af8Gn0pNyMyJ/qPIsOQUwN85Jei/FIPzsajBB8/yIjFB04HoO6 iX9Hi45fXmzaiBCPzsQGToV1EyveOWLa5+qP+KwzQh6ebCcztxbsZ7YRNyxxIg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1717172402; a=rsa-sha256; cv=none; b=M+fSkfmmJTmf10VFOjaT2PuuVChwCY8V7M3Y4KfSXZcEPdIP+uf+9u37fPH8Dxzb0CX16/ 8+XgIlZhnQhiAmMyAJ4MAMYVNxrReHtyoznEZzb8TtqrJHqcrl64YZvK6cHgRTjbMtzO9K VyTtM0nPKYu9MITAsBrT5fMcVHrlP2G24X5eFBpCfFn4ZPPuVi6SZTBe+JxDdQd+ZO0Im/ 5NTXPSZTXOPSSy6CGpwXWIVYL7TQqQ3pF+hQgaXvuQnI8JZk0m0GSTACDd7kpqsRdePcjb 0Pv0lUwSQ4CN2l9jUj0BW0+fTns+xCvVEs1jzJLygH+fyxteAd0H430p7l1Y5w== 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=1717172402; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=z1W4xJmnv5JLNnuQI/8WZuOHy5l5/Cz26V6aax6oxdE=; b=isi9s8Towj/uiMqHPRxPuFws6e3KxSEFpiW82vbf98j1RVLi+m8H+BYyzG9OOWr4cVwmX4 Zuc4wErKPdR+ouyguHYbl0zEhtl/SQAoyF1NVBkdP/GYSuSmw9wpvG6Hv7WClI5E7kAblM CPQvD/8ZQ9LXzFRLInvnkmGNmKRG7ZHhQbT4Nh3TGvIPaw4xCZ0YO9lp9RB64AJgMMds8g HSfJ6uekZbQD9F2jl72lXSpbz5NcpQ/pOEdjGRPvTNuxPbUcp2BSMp7UeOo/4p5ZNj+vvm GjRKCXg4mvSx9LFAjTRtdteK1l3v6Ktgd5bVcWE6odFU/SF5RZFman+dzPzdTA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VrSyB4Q70zX7k; Fri, 31 May 2024 16:20: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 44VGK2ps033361; Fri, 31 May 2024 16:20:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44VGK2xX033356; Fri, 31 May 2024 16:20:02 GMT (envelope-from git) Date: Fri, 31 May 2024 16:20:02 GMT Message-Id: <202405311620.44VGK2xX033356@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: 9b8db66402e9 - main - netgraph: provide separate malloc type for nodes that are missing it List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9b8db66402e94919ab47fc2d69863968e49e305a Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=9b8db66402e94919ab47fc2d69863968e49e305a commit 9b8db66402e94919ab47fc2d69863968e49e305a Author: Dmitry Lukhtionov AuthorDate: 2024-05-31 16:19:54 +0000 Commit: Gleb Smirnoff CommitDate: 2024-05-31 16:19:54 +0000 netgraph: provide separate malloc type for nodes that are missing it The kernel option NG_SEPARATE_MALLOC helps to debug memory leaks in netgraph(4). Several nodes were missing the support. --- sys/netgraph/ng_car.c | 10 ++++++++-- sys/netgraph/ng_nat.c | 26 ++++++++++++++++---------- sys/netgraph/ng_pptpgre.c | 20 +++++++++++++------- sys/netgraph/ng_tcpmss.c | 10 ++++++++-- sys/netgraph/ng_tee.c | 10 ++++++++-- 5 files changed, 53 insertions(+), 23 deletions(-) diff --git a/sys/netgraph/ng_car.c b/sys/netgraph/ng_car.c index a4e8c0dd55d6..e828306bd7d5 100644 --- a/sys/netgraph/ng_car.c +++ b/sys/netgraph/ng_car.c @@ -51,6 +51,12 @@ #include "qos.h" +#ifdef NG_SEPARATE_MALLOC +static MALLOC_DEFINE(M_NETGRAPH_CAR, "netgraph_car", "netgraph car node"); +#else +#define M_NETGRAPH_CAR M_NETGRAPH +#endif + #define NG_CAR_QUEUE_SIZE 100 /* Maximum queue size for SHAPE mode */ #define NG_CAR_QUEUE_MIN_TH 8 /* Minimum RED threshold for SHAPE mode */ @@ -189,7 +195,7 @@ ng_car_constructor(node_p node) priv_p priv; /* Initialize private descriptor. */ - priv = malloc(sizeof(*priv), M_NETGRAPH, M_WAITOK | M_ZERO); + priv = malloc(sizeof(*priv), M_NETGRAPH_CAR, M_WAITOK | M_ZERO); NG_NODE_SET_PRIVATE(node, priv); priv->node = node; @@ -571,7 +577,7 @@ ng_car_shutdown(node_p node) mtx_destroy(&priv->upper.q_mtx); mtx_destroy(&priv->lower.q_mtx); NG_NODE_UNREF(priv->node); - free(priv, M_NETGRAPH); + free(priv, M_NETGRAPH_CAR); return (0); } diff --git a/sys/netgraph/ng_nat.c b/sys/netgraph/ng_nat.c index d7492b71e07c..e9de0e5b60c8 100644 --- a/sys/netgraph/ng_nat.c +++ b/sys/netgraph/ng_nat.c @@ -53,6 +53,12 @@ #include #include +#ifdef NG_SEPARATE_MALLOC +static MALLOC_DEFINE(M_NETGRAPH_NAT, "netgraph_nat", "netgraph nat node"); +#else +#define M_NETGRAPH_NAT M_NETGRAPH +#endif + static ng_constructor_t ng_nat_constructor; static ng_rcvmsg_t ng_nat_rcvmsg; static ng_shutdown_t ng_nat_shutdown; @@ -306,7 +312,7 @@ ng_nat_constructor(node_p node) priv_p priv; /* Initialize private descriptor. */ - priv = malloc(sizeof(*priv), M_NETGRAPH, M_WAITOK | M_ZERO); + priv = malloc(sizeof(*priv), M_NETGRAPH_NAT, M_WAITOK | M_ZERO); /* Init aliasing engine. */ priv->lib = LibAliasInit(NULL); @@ -422,7 +428,7 @@ ng_nat_rcvmsg(node_p node, item_p item, hook_p lasthook) } if ((entry = malloc(sizeof(struct ng_nat_rdr_lst), - M_NETGRAPH, M_NOWAIT | M_ZERO)) == NULL) { + M_NETGRAPH_NAT, M_NOWAIT | M_ZERO)) == NULL) { error = ENOMEM; break; } @@ -436,7 +442,7 @@ ng_nat_rcvmsg(node_p node, item_p item, hook_p lasthook) if (entry->lnk == NULL) { error = ENOMEM; - free(entry, M_NETGRAPH); + free(entry, M_NETGRAPH_NAT); break; } @@ -481,7 +487,7 @@ ng_nat_rcvmsg(node_p node, item_p item, hook_p lasthook) } if ((entry = malloc(sizeof(struct ng_nat_rdr_lst), - M_NETGRAPH, M_NOWAIT | M_ZERO)) == NULL) { + M_NETGRAPH_NAT, M_NOWAIT | M_ZERO)) == NULL) { error = ENOMEM; break; } @@ -492,7 +498,7 @@ ng_nat_rcvmsg(node_p node, item_p item, hook_p lasthook) if (entry->lnk == NULL) { error = ENOMEM; - free(entry, M_NETGRAPH); + free(entry, M_NETGRAPH_NAT); break; } @@ -533,7 +539,7 @@ ng_nat_rcvmsg(node_p node, item_p item, hook_p lasthook) } if ((entry = malloc(sizeof(struct ng_nat_rdr_lst), - M_NETGRAPH, M_NOWAIT | M_ZERO)) == NULL) { + M_NETGRAPH_NAT, M_NOWAIT | M_ZERO)) == NULL) { error = ENOMEM; break; } @@ -545,7 +551,7 @@ ng_nat_rcvmsg(node_p node, item_p item, hook_p lasthook) if (entry->lnk == NULL) { error = ENOMEM; - free(entry, M_NETGRAPH); + free(entry, M_NETGRAPH_NAT); break; } @@ -611,7 +617,7 @@ ng_nat_rcvmsg(node_p node, item_p item, hook_p lasthook) /* Delete entry from our internal list. */ priv->rdrcount--; STAILQ_REMOVE(&priv->redirhead, entry, ng_nat_rdr_lst, entries); - free(entry, M_NETGRAPH); + free(entry, M_NETGRAPH_NAT); } break; case NGM_NAT_ADD_SERVER: @@ -912,12 +918,12 @@ ng_nat_shutdown(node_p node) while (!STAILQ_EMPTY(&priv->redirhead)) { struct ng_nat_rdr_lst *entry = STAILQ_FIRST(&priv->redirhead); STAILQ_REMOVE_HEAD(&priv->redirhead, entries); - free(entry, M_NETGRAPH); + free(entry, M_NETGRAPH_NAT); } /* Final free. */ LibAliasUninit(priv->lib); - free(priv, M_NETGRAPH); + free(priv, M_NETGRAPH_NAT); return (0); } diff --git a/sys/netgraph/ng_pptpgre.c b/sys/netgraph/ng_pptpgre.c index 8bd866c2881a..ae55a8dae5fd 100644 --- a/sys/netgraph/ng_pptpgre.c +++ b/sys/netgraph/ng_pptpgre.c @@ -73,6 +73,12 @@ #include #include +#ifdef NG_SEPARATE_MALLOC +static MALLOC_DEFINE(M_NETGRAPH_PPTP, "netgraph_pptp", "netgraph pptpgre node"); +#else +#define M_NETGRAPH_PPTP M_NETGRAPH +#endif + /* GRE packet format, as used by PPTP */ struct greheader { #if BYTE_ORDER == LITTLE_ENDIAN @@ -320,7 +326,7 @@ ng_pptpgre_constructor(node_p node) int i; /* Allocate private structure */ - priv = malloc(sizeof(*priv), M_NETGRAPH, M_WAITOK | M_ZERO); + priv = malloc(sizeof(*priv), M_NETGRAPH_PPTP, M_WAITOK | M_ZERO); NG_NODE_SET_PRIVATE(node, priv); @@ -380,7 +386,7 @@ ng_pptpgre_newhook(node_p node, hook_p hook, const char *name) if (hex[i] != '\0') return (EINVAL); - hpriv = malloc(sizeof(*hpriv), M_NETGRAPH, M_NOWAIT | M_ZERO); + hpriv = malloc(sizeof(*hpriv), M_NETGRAPH_PPTP, M_NOWAIT | M_ZERO); if (hpriv == NULL) return (ENOMEM); @@ -542,7 +548,7 @@ ng_pptpgre_disconnect(hook_p hook) LIST_REMOVE(hpriv, sessions); mtx_destroy(&hpriv->mtx); - free(hpriv, M_NETGRAPH); + free(hpriv, M_NETGRAPH_PPTP); } /* Go away if no longer connected to anything */ @@ -566,7 +572,7 @@ ng_pptpgre_shutdown(node_p node) LIST_REMOVE(&priv->uppersess, sessions); mtx_destroy(&priv->uppersess.mtx); - free(priv, M_NETGRAPH); + free(priv, M_NETGRAPH_PPTP); /* Decrement ref count */ NG_NODE_UNREF(node); @@ -731,7 +737,7 @@ ng_pptpgre_sendq(const hpriv_p hpriv, roqh *q, const struct ng_pptpgre_roq *st) NGI_GET_M(np->item, m); NG_FWD_NEW_DATA(error, np->item, hpriv->hook, m); if (np != st) - free(np, M_NETGRAPH); + free(np, M_NETGRAPH_PPTP); } return (error); } @@ -967,7 +973,7 @@ badAck: hpriv->recvSeq = np->seq; enqueue: - np = malloc(sizeof(*np), M_NETGRAPH, M_NOWAIT | M_ZERO); + np = malloc(sizeof(*np), M_NETGRAPH_PPTP, M_NOWAIT | M_ZERO); if (np == NULL) { priv->stats.memoryFailures++; /* @@ -1263,7 +1269,7 @@ ng_pptpgre_reset(hpriv_p hpriv) np = SLIST_FIRST(&hpriv->roq); SLIST_REMOVE_HEAD(&hpriv->roq, next); NG_FREE_ITEM(np->item); - free(np, M_NETGRAPH); + free(np, M_NETGRAPH_PPTP); } hpriv->roq_len = 0; } diff --git a/sys/netgraph/ng_tcpmss.c b/sys/netgraph/ng_tcpmss.c index 3c5b4051ed92..02fa097369ad 100644 --- a/sys/netgraph/ng_tcpmss.c +++ b/sys/netgraph/ng_tcpmss.c @@ -63,6 +63,12 @@ #include #include +#ifdef NG_SEPARATE_MALLOC +static MALLOC_DEFINE(M_NETGRAPH_TCPMSS, "netgraph_tcpmss", "netgraph tcpmss node"); +#else +#define M_NETGRAPH_TCPMSS M_NETGRAPH +#endif + /* Per hook info. */ typedef struct { hook_p outHook; @@ -159,7 +165,7 @@ ng_tcpmss_newhook(node_p node, hook_p hook, const char *name) { hpriv_p priv; - priv = malloc(sizeof(*priv), M_NETGRAPH, M_NOWAIT | M_ZERO); + priv = malloc(sizeof(*priv), M_NETGRAPH_TCPMSS, M_NOWAIT | M_ZERO); if (priv == NULL) return (ENOMEM); @@ -371,7 +377,7 @@ ng_tcpmss_disconnect(hook_p hook) priv->outHook = NULL; } - free(NG_HOOK_PRIVATE(hook), M_NETGRAPH); + free(NG_HOOK_PRIVATE(hook), M_NETGRAPH_TCPMSS); if (NG_NODE_NUMHOOKS(NG_HOOK_NODE(hook)) == 0) ng_rmnode_self(NG_HOOK_NODE(hook)); diff --git a/sys/netgraph/ng_tee.c b/sys/netgraph/ng_tee.c index 391355cd756a..b2cceda29a40 100644 --- a/sys/netgraph/ng_tee.c +++ b/sys/netgraph/ng_tee.c @@ -60,6 +60,12 @@ #include #include +#ifdef NG_SEPARATE_MALLOC +static MALLOC_DEFINE(M_NETGRAPH_TEE, "netgraph_tee", "netgraph tee node"); +#else +#define M_NETGRAPH_TEE M_NETGRAPH +#endif + /* Per hook info */ struct hookinfo { hook_p hook; @@ -151,7 +157,7 @@ ng_tee_constructor(node_p node) { sc_p privdata; - privdata = malloc(sizeof(*privdata), M_NETGRAPH, M_WAITOK | M_ZERO); + privdata = malloc(sizeof(*privdata), M_NETGRAPH_TEE, M_WAITOK | M_ZERO); NG_NODE_SET_PRIVATE(node, privdata); return (0); @@ -352,7 +358,7 @@ ng_tee_shutdown(node_p node) const sc_p privdata = NG_NODE_PRIVATE(node); NG_NODE_SET_PRIVATE(node, NULL); - free(privdata, M_NETGRAPH); + free(privdata, M_NETGRAPH_TEE); NG_NODE_UNREF(node); return (0); } From nobody Fri May 31 16:53: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 4VrTjD0Fnhz5JkYR; Fri, 31 May 2024 16:53: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 4VrTjC6RQ4z45vy; Fri, 31 May 2024 16:53:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717174431; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0Yv3RGY0GO0MBqNig3134B4HPKznwbMrqWuj9hiAfeY=; b=yiUozZOa/oVAZFkJkH8AK6roCjRG+RtiVplIboCevhKkqMu28sHl48l6XA67+s+/51weqC 6aVlyeWsdx1OnAuvgqlFj181qdfXT6bmyoHvPGHp7RaZ+WuY/2l5/a3aLsyZu9KNfXZMTN alWpgn2djwMasBznH4ksZ4WGxmL5zjpMvQarvYEdUV9gKallwS7hcrinIZlMYYnaR1+Xps Hl/m7bTY/1vbHqahkxwHQ54yRANtb6nlRu+UITvCdiBdqDm82N5mv3WgWrFoxhcVEMdmLX flZ87ALNnZ4K9gjcI/woXfmWgqdRXz4sPA/jMguVIzG9ASINV55/C7gwujiaZw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1717174431; a=rsa-sha256; cv=none; b=wQCNLnwC0vZawroNTMs6zbcntv+GNWummDX+f1N8khwKEqQy9RHnXReCmmWkxGTPW06EYJ FNQWDIMFUaSN05djJHB/sI27bkMAw2tu0up09P3pkyswodohOXEF7thw5LakQVtReLIpAf xD9/7LpxCA4/2xUT7GEnqrdt4EjMDvzCo0dGfoj4+j3cWGf2Xjm9tg43iKOGqLg1ZfFyMd J5I0JENgZeOopGp+vP4ru2lrFYgBqiowL9qbim57syMPcB9Op7Qm02aDrJC3Zm7NE6cEWK aJOAUOw5GhO6I8rYx7mW6bXXjCvfQ2+QycTXOenZesT4qADQfTRoshbPYh1f8g== 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=1717174431; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0Yv3RGY0GO0MBqNig3134B4HPKznwbMrqWuj9hiAfeY=; b=OiDNvRkLHzhD41KYuTeL/z1RFb4GSr/mqNl7XypFhPDIrUAyB8YYvkghhjJG+vC6w4GP87 Z9xRUZSoteTZZaN9Wfsy2R+fL//TD8ppzSRQDbrs7CqRsCksqzYvnUjw4Qzj8fy9Di3G4i alb0HuPM3obDAw5TLCasJ27ynmSzePGvSI/eAlu0r99JCvwzHcd1keQsW3mCXrYPieHiir IYI7CGHsd6lDVdKNV7QwLd/rVwlFv65PXatXbKUvcS9b+ofjZOnwDpG77TCzrwG+2ydtnP +Ui9BIxZ36FhwGQbzApKdeZZ6McycEC86bj+ocHAWODoCXzWG/vCa9k8mr/7BA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VrTjC630GzY20; Fri, 31 May 2024 16:53: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 44VGrpLC096953; Fri, 31 May 2024 16:53:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44VGrp3H096950; Fri, 31 May 2024 16:53:51 GMT (envelope-from git) Date: Fri, 31 May 2024 16:53:51 GMT Message-Id: <202405311653.44VGrp3H096950@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: a8fe2d331be3 - main - posix_async: FreeBSD also defines {make|swap|get|set}context List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: a8fe2d331be35dcafefa5f706e955f0dde70aa5f Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=a8fe2d331be35dcafefa5f706e955f0dde70aa5f commit a8fe2d331be35dcafefa5f706e955f0dde70aa5f Author: Warner Losh AuthorDate: 2024-05-31 15:29:02 +0000 Commit: Warner Losh CommitDate: 2024-05-31 16:53:39 +0000 posix_async: FreeBSD also defines {make|swap|get|set}context FreeBSD also defines {make|swap|get|set}context for backward compatibility, despite also exposing POSIX_VERSION 200809L in FreeBSD 15-current. FreeBSD has defined these interfaces since FreeBSD 4.7, released over 20 years ago, so no further nuance in FreeBSD version number is necessary. Pull Request: https://github.com/openssl/openssl/pull/23885 Sponsored by: Netflix --- crypto/openssl/crypto/async/arch/async_posix.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crypto/openssl/crypto/async/arch/async_posix.h b/crypto/openssl/crypto/async/arch/async_posix.h index a17c6b8e68af..2ac99d6fea8a 100644 --- a/crypto/openssl/crypto/async/arch/async_posix.h +++ b/crypto/openssl/crypto/async/arch/async_posix.h @@ -18,7 +18,7 @@ # include # if _POSIX_VERSION >= 200112L \ - && (_POSIX_VERSION < 200809L || defined(__GLIBC__)) + && (_POSIX_VERSION < 200809L || defined(__GLIBC__) || defined(__FreeBSD__)) # include From nobody Fri May 31 16:53:52 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VrTjF2FsKz5JkrZ; Fri, 31 May 2024 16:53: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 4VrTjF0dD4z45kj; Fri, 31 May 2024 16:53:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717174433; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LsGLuDo7D6nJ5zM5PzUubRaJ5nSJcHAwTx1mwgh4H8o=; b=HgMQ/eER0bl6E9y8gbgJYDWZwNH0t7fUQYZXdPa8IqMresmARqyswVYwqHdH4mpHqKTnMb zTmbq5d5dZcBORyZs2wXXTN20eDDFDU6DOk6A50MobBaAVf8szCguZCaL1OppIFsAEFRHn 2vCgOws/7EAWS9orqdxGJfHOtY5jC3kSGyNKds8VHqmZc9jJ0hskToX/Q5S2LLZw+5IOXm +gWdlben/PmYQPbMQoIvsGdavbF8ozZL+d9tGZKAl1Joesw6CDtisV0V6uyRxkFFwkjPdx A9Wmfvx3ie6M4TCSIoWr13U9dR66MOdfU5gQKp5Bq9zPUrLuLGXL/f51gOJb7w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1717174433; a=rsa-sha256; cv=none; b=ZT6yoqsvVBxATriVnmDJfhnOBpQZIjRRqbmjL0SsAdTUzHASeTNingETXKZzYVGBlTpgsK e6jmbioHLccvWGdyC5bSS3triVjHciFMRX0iaV7pgU2D+zTtNMzRTdozmD8r+/dyFOD3uN F0+7u9LjI0srWPJ64GewVZT5m9JXFa04dvHncevTSCsCMcBi1VTgzltXr1H4KIDRvHQtfG pmdkMkzCSToswkHaGRCHZHBYiSI0xSldijXUwVMZsb0n/B7eVpG0ShK4n2XVsCR34Doxum GjJVPB6EBSN/SUoDqWcNbKbAQNoZclSV1+lajh2E8OOopOCcD+X9N7nIpH5yKg== 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=1717174433; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LsGLuDo7D6nJ5zM5PzUubRaJ5nSJcHAwTx1mwgh4H8o=; b=k/uHpoH17447mGiO/AJK+4Yxx80IuoghLqhCfOg+SOCUs91yUXiW6be4TEshB8bSL5T/c8 53+fpL1pxKmTxCzOQyz92P2hTfHTG8A4x8bBnmQqEFj8oUi4vfTIXUvM0erexum8ovXXUU +n/okhHiLR+AYSGxmHIUqMlBA0P0q4InXmE0BhFIDBlrNHIbrf8w9rNgfDY4clvRgNlV1q Ojy7/nr89/pChAkAlFbUrQq9kapCRD1RHG3YwH61dlwxZr6EFxbumAKBGMJbCMhJw4F1bX aA5+L/1ub/NrmRCrXhRpQA9PyhJdY4v2Q1Q2mNFz8dAi+D3rbAjmzcuqE/bl8A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VrTjF0DqwzXbs; Fri, 31 May 2024 16:53: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 44VGrqPY096995; Fri, 31 May 2024 16:53:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44VGrqVE096992; Fri, 31 May 2024 16:53:52 GMT (envelope-from git) Date: Fri, 31 May 2024 16:53:52 GMT Message-Id: <202405311653.44VGrqVE096992@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: 2e30926a680d - main - FreeBSD bump POSIX_VERISON to 200809L List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: 2e30926a680dab37a4501021085990905827fdf9 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=2e30926a680dab37a4501021085990905827fdf9 commit 2e30926a680dab37a4501021085990905827fdf9 Author: Warner Losh AuthorDate: 2024-05-31 15:31:52 +0000 Commit: Warner Losh CommitDate: 2024-05-31 16:53:39 +0000 FreeBSD bump POSIX_VERISON to 200809L FreeBSD now provides the overwhelming majority of the new interfaces for POSIX_VERSION 200809 (aka POSIX.1-2017 aka IEEE Std 1003.1™-2017, The Open Group Technical Standard Base Specifications, Issue 7 and IEEE Std 1003.1™-2017 (Revision of IEEE Std 1003.1-2008)) Exp Run PR: 249444 Sponsored by: Netflix --- sys/sys/unistd.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/sys/unistd.h b/sys/sys/unistd.h index 6128aab61877..fcfb417bfb1e 100644 --- a/sys/sys/unistd.h +++ b/sys/sys/unistd.h @@ -93,7 +93,7 @@ #endif /* Define the POSIX.1 version we target for compliance. */ -#define _POSIX_VERSION 200112L +#define _POSIX_VERSION 200808L /* access function */ #define F_OK 0 /* test for existence of file */ From nobody Fri May 31 17:41: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 4VrVmY3nx1z5Jpjx; Fri, 31 May 2024 17:41: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 4VrVmY312tz49S5; Fri, 31 May 2024 17:41:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717177309; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6fVwozQhiGfY5p43zpqmt5jMBJV6oeNpz44ebgCP9fo=; b=tDV9dRofjn5LCVLaEwsHozLua6z+vKpQJkodCdxvSOmQeLli9A7pHTh1npGZMhRMxLUDEU wm974a6nIgrPlpB4+sJY+lgcSHJ2cSFF384DJOCVNRcnlYdPuLkmJoVysTB4cX8VmQUxrC 4R0XEzdUUlEm060SC8cYKanbdOfN6wiVXJgRqmma+sTPBcxukWvp04/Fmt4q4dVAT2Benq TEdh1uRdJEoRC15Cc9abEuodYRCEv9TjJAsc/dhE0vcS6ehCFTMPSPXTF09psHTfedGVF8 ExLrIJWAK51boki3K5STqQRtakDtzCKVP551/YjXQJPdR0ObwC2xwRir+Uo16A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1717177309; a=rsa-sha256; cv=none; b=DwsL29pI1BZLCuSQKUrbe7yaicBvPMADeqqAA6Zj6uWdvnukj6g2QuKKA0dKJb8LuoPKap QpyqAC/g4eqxex9hiADnyA+wS/b1ynCpWwxQQZNy2DmRPILeYgBsACtR0kP0bqwlb6Fw2u tTDjVLom1Uf6mCrRzYuWdgvzCPqEuM3kOtQQJMMaHrar4OEhT4IC4c8fWwfvInOc+m8IOW e6oNxpH4KZ8EDT9zXlBQVugPwKJhNxITAJ2G7QAt6wMwPjzTDApiwubAeGSEeu6AUiKIu5 g+++t+Dbxn6344agqRLm/CJLkcLkwe4zZ4GSeRPSLjrHEzgByGTdi2HPKVldGg== 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=1717177309; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6fVwozQhiGfY5p43zpqmt5jMBJV6oeNpz44ebgCP9fo=; b=SX1lINLrpVDB+5PRtnF0K6dTQ9PCUJ1N1rrLwSRp89w8pPOfif07PwCIeA/EvkG+73rGJ4 9h258SuNLO0Bn+JZIB3yN5rOC/5NwpUf0DZG9u7asishLJZDTLa6V0f4WdD6FGJ7+k39ua kd/fmoNNj4v9BcSph162xkEF0pGgala8zY1ajZRySaSmHcTIL0dLJeH8Io/aThth7X0oDQ r6cwk0qnvfeeVDdL3QT19xh/EDPT9PGcCqujA5yuZiudJNXm4+2s7bYgxq14iDINIgRx79 jrLh+yvUU6nBbQqpkB8jYycCoDR5LIMwzTpIOFS1B/6qT6nuToPFHu3j9PpXDw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VrVmY2JSJzYsK; Fri, 31 May 2024 17:41: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 44VHfnnV078913; Fri, 31 May 2024 17:41:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44VHfn1x078910; Fri, 31 May 2024 17:41:49 GMT (envelope-from git) Date: Fri, 31 May 2024 17:41:49 GMT Message-Id: <202405311741.44VHfn1x078910@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: 2c901189bb65 - main - man bluetooth/fwdownloaders: terse descriptions List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: 2c901189bb65ea0bae03aa83459570a0f0ea0aa8 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=2c901189bb65ea0bae03aa83459570a0f0ea0aa8 commit 2c901189bb65ea0bae03aa83459570a0f0ea0aa8 Author: Alexander Ziaee AuthorDate: 2024-05-31 12:13:54 +0000 Commit: Warner Losh CommitDate: 2024-05-31 17:40:44 +0000 man bluetooth/fwdownloaders: terse descriptions + descriptions no longer wrap on a standard console, no keywords removed + more consistent language with other firmware tooling manuals MFC after: 3 days Reviewed by: imp (bumped date for Nd changes) Pull Request: https://github.com/freebsd/freebsd-src/pull/1266 --- usr.sbin/bluetooth/ath3kfw/ath3kfw.8 | 4 ++-- usr.sbin/bluetooth/bcmfw/bcmfw.8 | 6 ++---- usr.sbin/bluetooth/iwmbtfw/iwmbtfw.8 | 5 ++--- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/usr.sbin/bluetooth/ath3kfw/ath3kfw.8 b/usr.sbin/bluetooth/ath3kfw/ath3kfw.8 index 340871d31df8..74b9656c89af 100644 --- a/usr.sbin/bluetooth/ath3kfw/ath3kfw.8 +++ b/usr.sbin/bluetooth/ath3kfw/ath3kfw.8 @@ -23,12 +23,12 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd June 4, 2016 +.Dd May 31, 2024 .Dt ATH3KFW 8 .Os .Sh NAME .Nm ath3kfw -.Nd firmware download utility for Atheros AR3011/AR3012 chip based Bluetooth USB devices +.Nd download firmware for Atheros AR3011/AR3012 Bluetooth USB devices .Sh SYNOPSIS .Nm .Fl d Ar device_name diff --git a/usr.sbin/bluetooth/bcmfw/bcmfw.8 b/usr.sbin/bluetooth/bcmfw/bcmfw.8 index 22d793641759..d90757f871fa 100644 --- a/usr.sbin/bluetooth/bcmfw/bcmfw.8 +++ b/usr.sbin/bluetooth/bcmfw/bcmfw.8 @@ -22,14 +22,12 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $Id: bcmfw.8,v 1.7 2003/05/21 00:33:40 max Exp $ -.\" -.Dd March 31, 2003 +.Dd May 31, 2024 .Dt BCMFW 8 .Os .Sh NAME .Nm bcmfw -.Nd firmware download utility for Broadcom BCM2033 chip based Bluetooth USB devices +.Nd download firmware for Broadcom BCM2033 Bluetooth USB devices .Sh SYNOPSIS .Nm .Op Fl h diff --git a/usr.sbin/bluetooth/iwmbtfw/iwmbtfw.8 b/usr.sbin/bluetooth/iwmbtfw/iwmbtfw.8 index 368a3865a0eb..225355116ab7 100644 --- a/usr.sbin/bluetooth/iwmbtfw/iwmbtfw.8 +++ b/usr.sbin/bluetooth/iwmbtfw/iwmbtfw.8 @@ -23,13 +23,12 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd May 3, 2021 +.Dd May 31, 2024 .Dt IWMBTFW 8 .Os .Sh NAME .Nm iwmbtfw -.Nd firmware download utility for Intel Wireless 7260/8260/8265 chip based Bluetooth -USB devices +.Nd download firmware for Intel Wireless AC Bluetooth USB devices .Sh SYNOPSIS .Nm .Fl d Ar device_name From nobody Fri May 31 18:03: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 4VrWFK3ff6z5JrQn; Fri, 31 May 2024 18:03:17 +0000 (UTC) (envelope-from brooks@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VrWFK34xzz4DQX; Fri, 31 May 2024 18:03:17 +0000 (UTC) (envelope-from brooks@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717178597; 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=oB5lFlC1ZGN7x1S29cwXoDOQl17vVQV6jW2rfmdYogY=; b=RVU2b1vocQ0SQsySw8YlG23qKep1p1gIkI1HMvlhKAGFxCXLpM00fGjvvlznf2wkuel+fT hF5gaEtPMkYQ8O+quqIphGqfIkDQ5pGYNUzZb+Icc5kAazPnbwf289+qT4AG0vZY0jMVtJ P/hIiKCBV59b+QygRIenPcDVBs82Zw6SBVdJ/Q3YvI5MuDZ7xb4EgIUxrWaNxaFKsLZu84 5JLreTea6Vdaw4fqQ2G1wWtfw7HV0jHv1Om4k1ZmNbDp4w0AAtLAq2AHickqleaWX1K3E2 jEo0CBhTN9K/JQuOGYgcnG1r2wcP/lSudXAu5VgYaxnv9OJ7riW5HIC0q+KYlQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1717178597; a=rsa-sha256; cv=none; b=jzinBNzbzpSMdKxJ3Qk8KDJXA6OOpZDC2zK1VOmvgd04XBsKxTSzcPq306qokDF/xMN4Ys PJRfECgL6KIagOsXOF0ITaQkmnHxLPzgYFyKvoLvVz48s7S+gfZgXh5JgtaVVNds9U4FIT m921aCV3ra0PX8treouEuuVlO+yZvtgK1MnidUjAIg3VuLLx+xoiiS1C+7sk/CQVRxke0k 0A98D+8mdyxqExZK9nsPl5QGOJXMa2NX3kiF5kB3+MJg+kzFRoGcJRGk3rwdAiDNtBEpMS G21975rbzs3fZHcGDgKDfAIev89GQwZ/w7qU2eQdJKCmIikNPP30s12igJZl2g== 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=1717178597; 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=oB5lFlC1ZGN7x1S29cwXoDOQl17vVQV6jW2rfmdYogY=; b=sUiYyoFTfkuOSX4RL/M6fMySlH9xCaXg810T/xpKJr9DbrEFy2CUSK9b7EjiLJNFaPBxIU NPBLRsggQue69DbprtoW2DlATpi6LQOi8yXUo2UATdu/5Qc4i5xPvpLD/6xvDG2+HuYPwN bKNRWN2OgU3YiB07lspMORgZauonBEbq1oz49FFriJBvr76sZrZfE7lcHEj/JWo+L/Rcdo twnKVLMLOo0aVviGL+tbf/Kiaq06HR/4X8XhTUM3Z2jnKQHsahC8m4u6xR653YjWpDmrQJ Y1njv4aSWgaO9RIOBUp1QiIwQKJXGGoFWysT2L0UBGufeBQYmZCvd98gl1SuaA== Received: from spindle.one-eyed-alien.net (spindle.one-eyed-alien.net [199.48.129.229]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: brooks/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4VrWFK2bXlzHfp; Fri, 31 May 2024 18:03:17 +0000 (UTC) (envelope-from brooks@freebsd.org) Received: by spindle.one-eyed-alien.net (Postfix, from userid 3001) id ACADD3C019B; Fri, 31 May 2024 18:03:16 +0000 (UTC) Date: Fri, 31 May 2024 18:03:16 +0000 From: Brooks Davis To: Gleb Smirnoff Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 9b8db66402e9 - main - netgraph: provide separate malloc type for nodes that are missing it Message-ID: References: <202405311620.44VGK2xX033356@gitrepo.freebsd.org> List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <202405311620.44VGK2xX033356@gitrepo.freebsd.org> On Fri, May 31, 2024 at 04:20:02PM +0000, Gleb Smirnoff wrote: > The branch main has been updated by glebius: > > URL: https://cgit.FreeBSD.org/src/commit/?id=9b8db66402e94919ab47fc2d69863968e49e305a > > commit 9b8db66402e94919ab47fc2d69863968e49e305a > Author: Dmitry Lukhtionov > AuthorDate: 2024-05-31 16:19:54 +0000 > Commit: Gleb Smirnoff > CommitDate: 2024-05-31 16:19:54 +0000 > > netgraph: provide separate malloc type for nodes that are missing it > > The kernel option NG_SEPARATE_MALLOC helps to debug memory leaks in > netgraph(4). Several nodes were missing the support. I realize this commit didn't create the option, but is there really enough of a cost to having multiple malloc types to justify an option at all? -- Brooks From nobody Fri May 31 18:15: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 4VrWWH165Gz5JsXk; Fri, 31 May 2024 18:15: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 4VrWWH0Yc8z4FJq; Fri, 31 May 2024 18:15:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717179323; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Sxzs0IKoRWI5eyJiKewntS1GrMbYdsp9pB2RLtE5BsA=; b=wjIHahyVGv63eBcFeIm4vggYKDZqmsgq+pPnwf16vMUK9ZaOKDzWgh3nuw2sHSWosHNDUo PRM5Z5y+DdBNPeywGg+dH+bIIRmZgu6V65HkwaJY0fJBGIddalEEvvL8V9NJJq57womyIJ hZOWaiNWviz1jChy7X8yyKw1RzzvSI4zRROLBJmzm+sO1L8NYpTU4WPh53bO+GsoRjshl4 KPCwmllapUgqohmpIsjfXF1T2GYB8w7+l/56ZwHoLz6JwA7FqAXMMYXY5A0vHHzT25/+X7 qbip2dg61y37RLmUpasVaoinXoykrVtCPVnvychw2YST9LS98ynYOIv75ITmsA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1717179323; a=rsa-sha256; cv=none; b=mFSUdw2HQoWQuSK86cceGQQyJbs5oVleIAw1GOD5HV/k9v9Ow008NHQ8rb2FcNQ/Zf8XmF XJCyEbfGOSyJ6pFi6FH+jR9n6vnJcLkiqFOY8Ef34yLxi+ls6/nWb9PF5pH05+Dsp1FZPT RtlNinD9fCZztxI2r+tl+LCUMhJTZ1qnK1QDNCDvlKdPf1tjKOJ8D3rfKzD5OZNvtykSxw 9UEFZWJq/I4xrKQdckZ/s7WxaLZgdYo58xYtYce+ISVgK/MrBr0fyB08wyr1r9T4VFk9sl ACh+CSM2+bvGWuXrIzIgQTfQABMfhSlIgLFpMf9USvqrYu0cmiPf+4U9071qXA== 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=1717179323; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Sxzs0IKoRWI5eyJiKewntS1GrMbYdsp9pB2RLtE5BsA=; b=gGcTK43Qaxcrx/oBhYrkw7Duha7N4YZStif2utsYOqpdyNRulBp62LKEQz3vLNAX93aiWa 0TBqBKTVsazaz9GXEkyP39DuDcReBH4WqdahDbRK39GpSOh//VChlx+yyyUR1eYFVh+Ohd jhNmHhTtz6Gs+kXEoCr5RuKIUpCjVsOQlcI4uQ5Q96oT3Mse2C5o5apWKRKwCGj8n7HITJ ipqMA79Dq5IRDKJRYjE+XBaiK3hJ0g15/uT7do7uuptQAzEDF1FZZVplkNF02cJ9legPHf NnPgsDL9UMUvaNfN4DTFFu6lCwlJjOFSUVsGsRwy7J9FC14V5QXPNeO4MEEdhA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VrWWH08zyzb2y; Fri, 31 May 2024 18:15: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 44VIFMxw032563; Fri, 31 May 2024 18:15:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44VIFMqP032560; Fri, 31 May 2024 18:15:22 GMT (envelope-from git) Date: Fri, 31 May 2024 18:15:22 GMT Message-Id: <202405311815.44VIFMqP032560@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: 6e0278408ea0 - main - sys/unistd.h: Use correct POSIX_VERION of 200809L List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: 6e0278408ea0806ea1e0b4846796458c0dc26adc Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=6e0278408ea0806ea1e0b4846796458c0dc26adc commit 6e0278408ea0806ea1e0b4846796458c0dc26adc Author: Warner Losh AuthorDate: 2024-05-31 17:59:24 +0000 Commit: Warner Losh CommitDate: 2024-05-31 17:59:24 +0000 sys/unistd.h: Use correct POSIX_VERION of 200809L 200809L was tested, but I recreated the patch rather than using the actual patch and typo'd to 200808 by mistake. Also, the PR in original was the patch ID not the bug ID. Pr Exp Run: 277915 Fixes: 2e30926a680d Sponsored by: Netflix --- sys/sys/unistd.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/sys/unistd.h b/sys/sys/unistd.h index fcfb417bfb1e..096d3444f997 100644 --- a/sys/sys/unistd.h +++ b/sys/sys/unistd.h @@ -93,7 +93,7 @@ #endif /* Define the POSIX.1 version we target for compliance. */ -#define _POSIX_VERSION 200808L +#define _POSIX_VERSION 200809L /* access function */ #define F_OK 0 /* test for existence of file */ From nobody Fri May 31 18:39: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 4VrX3Y4xpCz5Jvcq; Fri, 31 May 2024 18:39:53 +0000 (UTC) (envelope-from wigneddoom@yandex.ru) Received: from forward500c.mail.yandex.net (forward500c.mail.yandex.net [178.154.239.208]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4VrX3X1hysz4GsT; Fri, 31 May 2024 18:39:52 +0000 (UTC) (envelope-from wigneddoom@yandex.ru) Authentication-Results: mx1.freebsd.org; dkim=pass header.d=yandex.ru header.s=mail header.b=KTvIkiNm; dmarc=pass (policy=none) header.from=yandex.ru; spf=pass (mx1.freebsd.org: domain of wigneddoom@yandex.ru designates 178.154.239.208 as permitted sender) smtp.mailfrom=wigneddoom@yandex.ru Received: from mail-nwsmtp-mxback-production-main-37.sas.yp-c.yandex.net (mail-nwsmtp-mxback-production-main-37.sas.yp-c.yandex.net [IPv6:2a02:6b8:c24:2009:0:640:be92:0]) by forward500c.mail.yandex.net (Yandex) with ESMTPS id 6D19C60A9E; Fri, 31 May 2024 21:39:48 +0300 (MSK) Received: from mail.yandex.ru (2a02:6b8:c08:3503:0:640:fbf3:0 [2a02:6b8:c08:3503:0:640:fbf3:0]) by mail-nwsmtp-mxback-production-main-37.sas.yp-c.yandex.net (mxback/Yandex) with HTTP id ldYHeD5MAeA0-2SQlTApm; Fri, 31 May 2024 21:39:48 +0300 X-Yandex-Fwd: 1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yandex.ru; s=mail; t=1717180788; bh=vSlaPM0MZlEqhtl6z76CfQtB+UrWVYBeUMz5emTBrXY=; h=Message-Id:References:Date:Cc:Subject:To:From; b=KTvIkiNmjbrw9NbMbGuAI6wcuYPcFCe6QUeYnm8mH+fWlIQMb+QS9OtaX8xKuE6Jb 3caWnBtONgI9S4IwDGeoOMFPnwGXmD/ZqWhnXMYSXJYrtzULVBuuN9SvuOefdw4jsn abBbPcjNBKflD0SKMcn7i924rLW1NAzeQBwhp1GM= Received: by 2ifjmylsx37py6nh.sas.yp-c.yandex.net with HTTP; Fri, 31 May 2024 21:39:47 +0300 From: Aleksandr Fedorov To: Brooks Davis , Gleb Smirnoff Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" References: <202405311620.44VGK2xX033356@gitrepo.freebsd.org> Subject: Re: git: 9b8db66402e9 - main - netgraph: provide separate malloc type for nodes that are missing it List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 X-Mailer: Yamail [ http://yandex.ru ] 5.0 Date: Fri, 31 May 2024 21:39:47 +0300 Message-Id: <543841717180705@mail.yandex.ru> Content-Transfer-Encoding: base64 Content-Type: text/html; charset=utf-8 X-Spamd-Bar: - X-Spamd-Result: default: False [-1.91 / 15.00]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_SPAM_SHORT(0.89)[0.892]; DMARC_POLICY_ALLOW(-0.50)[yandex.ru,none]; RWL_MAILSPIKE_VERYGOOD(-0.20)[178.154.239.208:from]; R_SPF_ALLOW(-0.20)[+ip4:178.154.239.208/28]; R_DKIM_ALLOW(-0.20)[yandex.ru:s=mail]; MIME_HTML_ONLY(0.20)[]; MIME_BASE64_TEXT(0.10)[]; TO_DN_SOME(0.00)[]; TO_DN_EQ_ADDR_SOME(0.00)[]; ARC_NA(0.00)[]; FREEMAIL_FROM(0.00)[yandex.ru]; FREEMAIL_ENVFROM(0.00)[yandex.ru]; MIME_TRACE(0.00)[0:~]; DWL_DNSWL_NONE(0.00)[yandex.ru:dkim]; FROM_HAS_DN(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; RCVD_TLS_LAST(0.00)[]; MID_RHS_MATCH_FROMTLD(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; RCVD_COUNT_THREE(0.00)[3]; MLMMJ_DEST(0.00)[dev-commits-src-all@freebsd.org,dev-commits-src-main@freebsd.org]; DKIM_TRACE(0.00)[yandex.ru:+]; ASN(0.00)[asn:200350, ipnet:178.154.224.0/19, country:RU]; RCVD_IN_DNSWL_NONE(0.00)[178.154.239.208:from]; RCPT_COUNT_FIVE(0.00)[5] X-Rspamd-Queue-Id: 4VrX3X1hysz4GsT PGRpdj48ZGl2PkkgdGhpbmsgd2Ugc2hvdWxkIHJlbW92ZSB0aGlzIG9wdGlvbiBhbHRvZ2V0aGVy IC0gTkdfU0VQQVJBVEVfTUFMTE9DLjwvZGl2PjxkaXY+wqA8L2Rpdj48ZGl2Pk5vdywgOTArJSBv ZiBub2RlcyBkZWNsYXJlIHRoZWlyIG93biBtYWxsb2MoOSkgdHlwZS48L2Rpdj48ZGl2PsKgPC9k aXY+PGRpdj5Gb3IgZXhhbXBsZSwgbG9vayBhdCBodHRwczovL2dpdGh1Yi5jb20vZnJlZWJzZC9m cmVlYnNkLXNyYy9ibG9iL21haW4vc3lzL25ldGdyYXBoL25nX2JyaWRnZS5jI0w4MTwvZGl2Pjxk aXY+wqA8L2Rpdj48ZGl2PlNvbWUgcGVvcGxlIHdhbnQgdG8gc2VlIHRoaXMgdGhyb3VnaCB2bXN0 YXQuPC9kaXY+PC9kaXY+PGRpdj7CoDwvZGl2PjxkaXY+wqA8L2Rpdj48ZGl2PjMxLjA1LjIwMjQs IDIxOjAzLCAiQnJvb2tzIERhdmlzIiAmbHQ7YnJvb2tzQGZyZWVic2Qub3JnJmd0Ozo8L2Rpdj48 ZGl2PjxiciAvPk9uIEZyaSwgTWF5IDMxLCAyMDI0IGF0IDA0OjIwOjAyUE0gKzAwMDAsIEdsZWIg U21pcm5vZmYgd3JvdGU6PGJyIC8+wqBUaGUgYnJhbmNoIG1haW4gaGFzIGJlZW4gdXBkYXRlZCBi eSBnbGViaXVzOjxiciAvPsKgPGJyIC8+wqBVUkw6IGh0dHBzOi8vY2dpdC5GcmVlQlNELm9yZy9z cmMvY29tbWl0Lz9pZD05YjhkYjY2NDAyZTk0OTE5YWI0N2ZjMmQ2OTg2Mzk2OGU0OWUzMDVhPGJy IC8+wqA8YnIgLz7CoGNvbW1pdCA5YjhkYjY2NDAyZTk0OTE5YWI0N2ZjMmQ2OTg2Mzk2OGU0OWUz MDVhPGJyIC8+wqBBdXRob3I6IERtaXRyeSBMdWtodGlvbm92ICZsdDtkbWl0cnlsdWh0aW9ub3ZA Z21haWwuY29tJmd0OzxiciAvPsKgQXV0aG9yRGF0ZTogMjAyNC0wNS0zMSAxNjoxOTo1NCArMDAw MDxiciAvPsKgQ29tbWl0OiBHbGViIFNtaXJub2ZmICZsdDtnbGViaXVzQEZyZWVCU0Qub3JnJmd0 OzxiciAvPsKgQ29tbWl0RGF0ZTogMjAyNC0wNS0zMSAxNjoxOTo1NCArMDAwMDxiciAvPsKgPGJy IC8+wqDCoMKgwqDCoG5ldGdyYXBoOiBwcm92aWRlIHNlcGFyYXRlIG1hbGxvYyB0eXBlIGZvciBu b2RlcyB0aGF0IGFyZSBtaXNzaW5nIGl0PGJyIC8+wqDCoMKgwqDCoDxiciAvPsKgwqDCoMKgwqBU aGUga2VybmVsIG9wdGlvbiBOR19TRVBBUkFURV9NQUxMT0MgaGVscHMgdG8gZGVidWcgbWVtb3J5 IGxlYWtzIGluPGJyIC8+wqDCoMKgwqDCoG5ldGdyYXBoKDQpLiBTZXZlcmFsIG5vZGVzIHdlcmUg bWlzc2luZyB0aGUgc3VwcG9ydC48YnIgLz48YnIgLz5JIHJlYWxpemUgdGhpcyBjb21taXQgZGlk bid0IGNyZWF0ZSB0aGUgb3B0aW9uLCBidXQgaXMgdGhlcmUgcmVhbGx5PGJyIC8+ZW5vdWdoIG9m IGEgY29zdCB0byBoYXZpbmcgbXVsdGlwbGUgbWFsbG9jIHR5cGVzIHRvIGp1c3RpZnkgYW4gb3B0 aW9uIGF0PGJyIC8+YWxsPzxiciAvPjxiciAvPi0tIEJyb29rczwvZGl2Pg== From nobody Fri May 31 19:18: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 4VrXvk07cXz5LCnJ; Fri, 31 May 2024 19:18: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 4VrXvj6jfXz4Kj9; Fri, 31 May 2024 19:18:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717183089; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wf15NvcFlZhNotkc+gGstP4GG2vJeoulu3imI2KimS0=; b=ZzHNMF6R5YDx8VYlXsVFuSu3/cfKq4pWgQYrpcYf6st1qs5UBX+Sn/xokpaEfV+GIcxCLb VE+zdd7tix0QbJfW3FBS0VEJ4BZSohNE7fc/KuVxr0h6DVJV41MvnVV2ccrkddDgl41uz+ 1sT7S1SGoj6syhQPzPG3UF0K2weIYud8SB10AibeFs+mPlkXqLTg+o40pAmZuGtQH0drl0 UstDSd8/dONer9JeKBMfqHlRUIFQje8L7B97oPjjCatE0x4vfXQv8S3G9PZTAlZWJvkr6q 2OlECqWtSDjyQpg/esTnkpeIXe6kJEQuy6wd1R0jTtrchlU4rJoHiLdJLOupxw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1717183089; a=rsa-sha256; cv=none; b=B8IiaViMEy/CSHRDST0fF0gHdVbrV1C322az1oo8kipmEssS682ovoA4xWlS0czc8VVvTe sB4LrZgJRxx8L4nCbAdnE3V69xKG/27lADheR3sj9APvV4oNvJ0M+M6ZZ2WzrwaPzCIL3r /ammVQfafHFcs323ey3OC26BCOS1AdETqD2BV3RDdzTtRpMzNY4AP/qC8whXRy2A9lf2wC 29o4sYs7c+poDe9Mu91/dOUK2z2iPpVLK9fRuYQ55W3QQQp11EkGEGhgraWcTVO2ewjDkL yC3bM0aXaQ05XihKgoIu88I+NdMDXKEqEY1aZIzHje/WPq7yaTB2X8hjprF9EQ== 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=1717183089; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wf15NvcFlZhNotkc+gGstP4GG2vJeoulu3imI2KimS0=; b=nut9dO3ZSqvLrxO23ADk/ES4+yHrITAkS3JEcqw1PboFzRC4A1orFx5VELaTdY9N1bTzqB AOT3A8E0n5O7kLdxkuWeCS2Tm0rOluvmdLSF1uTSpo8nLS930QqcQFHDFpcOB0UehzFATT bSextdS3UbulJXzuJaktecSOzB8Mm659R8Pz4UH6E1HwWzqeUW4OUq6grDkwFScLSPRMrp wSJuY7E4JfohYhEYQVbP7kX1CyuVuNTezkw+9plROeywyAxDkpqhROerGzHEvPm8ju2DNi PzSJuXAmOxt77FaqT1Yv8f1GIa0RBEfA9yBmsI8JWziwMdstP/5ncWDiL3jbQg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VrXvj68yGzcYT; Fri, 31 May 2024 19:18: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 44VJI94r034516; Fri, 31 May 2024 19:18:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44VJI94Z034513; Fri, 31 May 2024 19:18:09 GMT (envelope-from git) Date: Fri, 31 May 2024 19:18:09 GMT Message-Id: <202405311918.44VJI94Z034513@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: 1eb7099eacea - main - acpidump: improve length calculation for several IVHD elements List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: 1eb7099eaceacd4e26606b074db6633ca7e5359a Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=1eb7099eaceacd4e26606b074db6633ca7e5359a commit 1eb7099eaceacd4e26606b074db6633ca7e5359a Author: Konstantin Belousov AuthorDate: 2024-05-30 15:21:59 +0000 Commit: Konstantin Belousov CommitDate: 2024-05-31 19:10:39 +0000 acpidump: improve length calculation for several IVHD elements Use sizeofs of structures corresponding to the parsed device entry. This does not change the calculation, but fixes logical inconsistency. Sponsored by: The FreeBSD Foundation Sponsored by: Advanced Micro Devices (AMD) MFC after: 1 week --- usr.sbin/acpi/acpidump/acpi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/usr.sbin/acpi/acpidump/acpi.c b/usr.sbin/acpi/acpidump/acpi.c index fc2e8cb82c49..af0068649fbb 100644 --- a/usr.sbin/acpi/acpidump/acpi.c +++ b/usr.sbin/acpi/acpidump/acpi.c @@ -1629,8 +1629,8 @@ acpi_handle_ivrs_ivhd_devs(ACPI_IVRS_DE_HEADER *d, char *de) } 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); + d4 = (ACPI_IVRS_DEVICE4 *)(db + sizeof(*d8b)); + len = sizeof(*d8b) + 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); From nobody Fri May 31 19:18: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 4VrXvl0v2Dz5LCrF; Fri, 31 May 2024 19: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 4VrXvk6zPLz4KQQ; Fri, 31 May 2024 19:18:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717183091; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=a//h7UgvVC75zknVUcGwSfj4jUqDsLBxh1FO7DVycgE=; b=dAvhJj+cAPsUmiJ418SQe49xTqUkI2UaKboLUoVtM4Dz75CovhjNvC9HKJnWBpRpiG0Ep+ LA+YSp/pLJuNmLMui2kbWjrxYy2oGWMsNf50+iqLHFAV9lUh1cMSjjKfNQXF+3MUmT20ba kMX2rfwp57xijmHehm7w3XU/nC1Ac81nOFSm6mcVjXWzZHqAb1a0rKhmSbi03Nk1A2+szo 1KID1ZH49fMwZGuR2ubst889uusBw9N+c5t24fH1k7pVEqB1eg+gUm7FmA7eSyO4/QpzYB yvYoW+zf7jI0IB0G08p/KmL8Dioxde4Jutu9Uv5/0eMmlVCDfWLFNbExM4mfHw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1717183091; a=rsa-sha256; cv=none; b=cNKbP+sNm6cubtHkCwobvakcTZqJiwUkZhIsY6PMe3lZ9JRfx/wrh12Yn625YR0eKS0W9x 6i676PnnZmYmjArsJHx6f3bs1EegjWL1g5C/g5xxMgT9Cecvw1PtNe6HK8QyZJDf0TuKmG BMX4jXb9tRGU/M6MJBFqqlaEWmtHzZQlToRhmdpTDs8mYaZ/43SLFoCaIalqr9rMQhgtqR XBLJDRoDob1cyLKhw5Wlc/ZRxWU55ffv+oiTRcJ/MPoZhyak1D2wJIm6zTnagVteAXjQ8l 6R3vTCIJVuwFdVBUpAQB6P2MHt34pjfhnyznr7Za4PApTlFE00F+hS75Nkqo9g== 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=1717183091; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=a//h7UgvVC75zknVUcGwSfj4jUqDsLBxh1FO7DVycgE=; b=OyyZEUFVHu6W8X8PhrIiZO5LRXy5ps8pBgJEIT0T6TMNQ6MH91+xoA6tnKTBMN1j3cXVMw kYErYYupYrfyTvSk96VQ/7Niv7C7HNdwMU2FZm1vPvV9+HRmwFHRl8G/uwclNnKdHp3OR4 TznImuH/GndKE0qqhHqPqcc+PYYmGNiGAOvdYFugJAIfCygqk8MjU3b8r1NzQGjiAgr13T x8LYgDnsB3oPO1XUI7K4pfnHC1OnlyGf/hlYIVJ2vs4HiD/WZXXOz1Ech4yXM+8PtH8ErL YISDC/tAR4aY45pZXUEB0DTlWxVuBjjYLirtlL7zlty6IFArSMrtHTxkDyus4A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VrXvk6bYCzcSM; Fri, 31 May 2024 19:18: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 44VJIA8H034567; Fri, 31 May 2024 19:18:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44VJIANN034564; Fri, 31 May 2024 19:18:10 GMT (envelope-from git) Date: Fri, 31 May 2024 19:18:10 GMT Message-Id: <202405311918.44VJIANN034564@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: 164fdee11164 - main - Intel DMAR: remove the 'dev' member List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: 164fdee11164e9a43e279f9e45117e7573ddc15f Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=164fdee11164e9a43e279f9e45117e7573ddc15f commit 164fdee11164e9a43e279f9e45117e7573ddc15f Author: Konstantin Belousov AuthorDate: 2024-05-30 14:05:22 +0000 Commit: Konstantin Belousov CommitDate: 2024-05-31 19:10:39 +0000 Intel DMAR: remove the 'dev' member It duplicates iommu.dev, and was forgotten when struct iommu was split out from dmar. Sponsored by: The FreeBSD Foundation Sponsored by: AMD dvanced Micro Devices (AMD) MFC after: 1 week --- sys/x86/iommu/intel_dmar.h | 1 - sys/x86/iommu/intel_drv.c | 1 - sys/x86/iommu/intel_intrmap.c | 4 ++-- sys/x86/iommu/intel_quirks.c | 7 ++++--- sys/x86/iommu/intel_utils.c | 2 +- 5 files changed, 7 insertions(+), 8 deletions(-) diff --git a/sys/x86/iommu/intel_dmar.h b/sys/x86/iommu/intel_dmar.h index 8289478aed19..b7f0300e16f0 100644 --- a/sys/x86/iommu/intel_dmar.h +++ b/sys/x86/iommu/intel_dmar.h @@ -123,7 +123,6 @@ struct dmar_msi_data { struct dmar_unit { struct iommu_unit iommu; - device_t dev; uint16_t segment; uint64_t base; diff --git a/sys/x86/iommu/intel_drv.c b/sys/x86/iommu/intel_drv.c index 9a2fedf90b6a..0b25620114cd 100644 --- a/sys/x86/iommu/intel_drv.c +++ b/sys/x86/iommu/intel_drv.c @@ -410,7 +410,6 @@ dmar_attach(device_t dev) int i, error; unit = device_get_softc(dev); - unit->dev = dev; unit->iommu.unit = device_get_unit(dev); unit->iommu.dev = dev; dmaru = dmar_find_by_index(unit->iommu.unit); diff --git a/sys/x86/iommu/intel_intrmap.c b/sys/x86/iommu/intel_intrmap.c index 035de24a2d4e..66238b46c25e 100644 --- a/sys/x86/iommu/intel_intrmap.c +++ b/sys/x86/iommu/intel_intrmap.c @@ -271,7 +271,7 @@ dmar_ir_program_irte(struct dmar_unit *unit, u_int idx, uint64_t low, high = DMAR_IRTE2_SVT_RID | DMAR_IRTE2_SQ_RID | DMAR_IRTE2_SID_RID(rid); if (bootverbose) { - device_printf(unit->dev, + device_printf(unit->iommu.dev, "programming irte[%d] rid %#x high %#jx low %#jx\n", idx, rid, (uintmax_t)high, (uintmax_t)low); } @@ -335,7 +335,7 @@ dmar_init_irt(struct dmar_unit *unit) if (!unit->qi_enabled) { unit->ir_enabled = 0; if (bootverbose) - device_printf(unit->dev, + device_printf(unit->iommu.dev, "QI disabled, disabling interrupt remapping\n"); return (0); } diff --git a/sys/x86/iommu/intel_quirks.c b/sys/x86/iommu/intel_quirks.c index fd5c522d588d..751237a3ab54 100644 --- a/sys/x86/iommu/intel_quirks.c +++ b/sys/x86/iommu/intel_quirks.c @@ -108,7 +108,7 @@ dmar_match_quirks(struct dmar_unit *dmar, (nb_quirk->rev_no == rev_no || nb_quirk->rev_no == QUIRK_NB_ALL_REV)) { if (bootverbose) { - device_printf(dmar->dev, + device_printf(dmar->iommu.dev, "NB IOMMU quirk %s\n", nb_quirk->descr); } @@ -116,7 +116,8 @@ dmar_match_quirks(struct dmar_unit *dmar, } } } else { - device_printf(dmar->dev, "cannot find northbridge\n"); + device_printf(dmar->iommu.dev, + "cannot find northbridge\n"); } } if (cpu_quirks != NULL) { @@ -135,7 +136,7 @@ dmar_match_quirks(struct dmar_unit *dmar, (cpu_quirk->stepping == -1 || cpu_quirk->stepping == stepping)) { if (bootverbose) { - device_printf(dmar->dev, + device_printf(dmar->iommu.dev, "CPU IOMMU quirk %s\n", cpu_quirk->descr); } diff --git a/sys/x86/iommu/intel_utils.c b/sys/x86/iommu/intel_utils.c index 356b8d5e6436..a96f65fddfc5 100644 --- a/sys/x86/iommu/intel_utils.c +++ b/sys/x86/iommu/intel_utils.c @@ -136,7 +136,7 @@ domain_set_agaw(struct dmar_domain *domain, int mgaw) return (0); } } - device_printf(domain->dmar->dev, + device_printf(domain->dmar->iommu.dev, "context request mgaw %d: no agaw found, sagaw %x\n", mgaw, sagaw); return (EINVAL); From nobody Fri May 31 19:36: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 4VrYJp06y9z5LFF7; Fri, 31 May 2024 19:36: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 4VrYJn6XN4z4MT9; Fri, 31 May 2024 19:36:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717184185; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MR03PTYPfAEF19k7OUyzQ5EhuUzzI4AITxlTAPylbhQ=; b=Q7/GOwWYh11PX9p7YbkYYvCNAI5vuK6DHAiSxEDzCdMvaGHXcZjakTx/EQV6eftJSXfmcI 7ok57o29Yl5e3AI83lbYTHmp8Z2G55YAvz+r/uFUpYyKSTKJ96F9vhCUW9j+RGMtrtKwy6 I8ch9IWixsEK9WH/KbUmqxoC82tquN2Z2adxRAB5iXwN2MWn0yvW5WbNOKM+ajwXOQ+uK2 Qfr7JQnBA+gdsrAVLeJ/I7cc7bTJ63lagGzaNgPWC+ctKN7b500vd9ElecuoFEv7T4LCpz dvX9kGKYqtlp55gp+XxAsmW1DUxOjGFWb5DSL+MsDnqRzZIEFPgyEzfCxrAhXA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1717184185; a=rsa-sha256; cv=none; b=uP/5jbR4JzDOHTYOBYfbpisXfad7sWq/5bunme4hBcXDKhmO6YoRdnkeFNgGVW/pYKbHp0 jdE6OecAZ2hs5cfzKn0ewu+ysEhYPdeatKsrnC1zR/RREChaA64wghYFY5f2Pit3rXXiJe 0Yy57luZHdFjsIpzeumuGUzW73dwdxZMKOFoKWzgE+aVo6cEMZRSdRTwLpayKWIOKr63G8 Wf51mygLLdm2XoKLMCc6syHSnfJ+6c3iL84lCzwBx4RomFPcW+eXWJWxGGuywTeKWYYK0y 1sl8cSag1ZuEsquJJfJnikuv0bsFKV6FpCoMKMntRqFtsmudjQfSfTRTZudj4g== 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=1717184185; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MR03PTYPfAEF19k7OUyzQ5EhuUzzI4AITxlTAPylbhQ=; b=wjVW2pWtQI1EzAeBSFNyKFCmNkEJ2Fw76xWo+VL4krd9tQaY//UPTURSXTej7ByK9GicKl DbblWL93JXpmHWcgYkpR8trZjwaCOZXJK6qFlWJT62fN3ZGVJOCLRKHQ1Op05MIcY2j8ek NMa9ZMVaqUbFi8Xm6tZV6/3Bh4FEoJ4n5XFRWry6cp260LCpjBW8l+GKBLOYv/Rg3GK5JZ 3XNnfi8OP1e9PyB58Gd/2uQb1si9lbvM+VzIFIU2Rdj/YEGxOa8HTQ3hasPEYShMFp/Zvw 8ae0hl0uA5Ypd6szC+AiuzwoT8qJH7yjfjna8Dw8HMx1tciaIM98n1IBT2VF6g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VrYJn65r8zcXV; Fri, 31 May 2024 19:36: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 44VJaPhZ068232; Fri, 31 May 2024 19:36:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44VJaPJU068229; Fri, 31 May 2024 19:36:25 GMT (envelope-from git) Date: Fri, 31 May 2024 19:36:25 GMT Message-Id: <202405311936.44VJaPJU068229@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: 72ece341b427 - main - mitigations.7: mention supervisor mode memory access protections List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: 72ece341b42707af7837357dbb1f2c2fe17507fa Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=72ece341b42707af7837357dbb1f2c2fe17507fa commit 72ece341b42707af7837357dbb1f2c2fe17507fa Author: Ed Maste AuthorDate: 2024-05-31 14:13:11 +0000 Commit: Ed Maste CommitDate: 2024-05-31 19:35:56 +0000 mitigations.7: mention supervisor mode memory access protections Reviewed by: imp (earlier), olce (earlier), kib Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D45420 --- share/man/man7/mitigations.7 | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/share/man/man7/mitigations.7 b/share/man/man7/mitigations.7 index 1cea86e352c5..f97ba50320f2 100644 --- a/share/man/man7/mitigations.7 +++ b/share/man/man7/mitigations.7 @@ -25,7 +25,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd October 6, 2023 +.Dd May 31, 2024 .Dt MITIGATIONS 7 .Os .Sh NAME @@ -234,8 +234,26 @@ and it is possible that some applications may not function correctly. .\" .\".Ss Stack Smashing Protection (SSP) .\" -.\".Ss Supervisor mode memory protection -.\" +.Ss Supervisor mode memory protection +Certain processors include features that prevent unintended access to memory +pages accessible to userspace (non-privileged) code, while in a privileged +mode. +One feature prevents execution, intended to mitigate exploitation of kernel +vulnerabilities from userland. +Another feature prevents unintended reads from or writes to user space memory +from the kernel. +This also provides effective protection against NULL pointer dereferences from +kernel. +.Bl -column -offset indent "Architecture" "Feature" "Access Type Prevented" +.It Sy Architecture Ta Sy Feature Ta Sy Access Type Prevented +.It amd64 Ta SMAP Ta Read / Write +.It amd64 Ta SMEP Ta Execute +.It arm64 Ta PAN Ta Read / Write +.It arm64 Ta PXN Ta Execute +.El +.Pp +These features are automatically used by the kernel. +There is no user-facing configuration. .Ss Hardware vulnerability controls See .Xr security 7 From nobody Fri May 31 19:45: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 4VrYWr0Kzpz5LGWp; Fri, 31 May 2024 19:46: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 4VrYWq4rllz4NZb; Fri, 31 May 2024 19:45:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717184759; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=As4PPU6CuOFzr+jvMIrywC9BK/IdXwk5Bkit2M+GnJU=; b=ncqrYCqk7m7GEAlowV+3v94BuSBrde8G/t380ls4jLlF7s2qL1f67C6YcMlcziM9fR5GUj CLuQzzJARa9C5ehdSCjHry+GYTfVTNX1aaPLln0YFBIpnkEzuVEscse0naLF5ENJWLsRa+ o89ifEsM44qtSFJ65iIEo/x1HUNDpN/rMLX61K/9VQvm024Dr86+CcZTOa9n5vAc/OZa0u Bldkyo2kRolUd5Ny/16pxDpji1/YjRK9eS8xljNy4B8MS7forCwKvbikO4u+ZBbQT8uuhX lQIkcMWyYoPaOs4FwVoXnj81hNan2Kmzd6M/uAMjMpPh//B8LToo+wSdlzqzaA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1717184759; a=rsa-sha256; cv=none; b=atyE/uRrV5iJ9SzswNhWjQolNXR0BbTWpnjerJ6qKLBnl8smw1/xn94MftGPBDr/Og31uR 9Vb2oV/Yf+ngVzHB/gMMC8Gog5aUhMw9GBFc4C4TvkDmfgbtZ9GUSE6jQALE/JrApUj0FT 9ZzFz81AMdCVNQhSw6BqSkqnyjXIsrWtsSClN+r7bsk1bEWJmfU88q7HfedXLsxMxCpXrJ CogQVhDwYKJIN3LtkzQhPYJVK0qei+uDLBkjgEdjQ1gQy0ePyOWchU/Y0K1O1A5YzMREtj 7pQ2WJsMC9BHVGzNgEGm0uHl8fCZDm5pcoGKvHtTvMBnDYQw9g0Snt8huEDUYQ== 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=1717184759; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=As4PPU6CuOFzr+jvMIrywC9BK/IdXwk5Bkit2M+GnJU=; b=hLMeqr1waWboG8x47K6mvDozxsTz/swxgc7K2J1CYjGPPPfe6AHp7XH1qmZSmh2D0cXA3W Yf+tyetP9lN9zxV1fMYEAsFLiAOAlNNRX0xGld1UA6JmoqyXyHhEDM1jUoRxHdd5u/0LJP ceBsP+DfTN2l4ZyLKfONyNRJT2Zom82AHAPVGTWaEy4ogxWiCoEpAHpWDWB5Kb7wcJOO2G /XIIKYJqqDBdxg2m0wt+GsfGRSbXHPuOt05AAmBep9dj805kvZjyddy5yBNCLMi5ExqW7C 2CaYwY8RMGhs8XTBKfcU9fO2Qh2Rgg7t85fnp1B49Du/jirB2LcWZWGpjRtvMg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VrYWq4Rj0zcfJ; Fri, 31 May 2024 19:45:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44VJjxfS084811; Fri, 31 May 2024 19:45:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44VJjxSN084808; Fri, 31 May 2024 19:45:59 GMT (envelope-from git) Date: Fri, 31 May 2024 19:45:59 GMT Message-Id: <202405311945.44VJjxSN084808@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: d0a9cc17ba44 - main - sys/contrib: Mop up $FreeBSD$ tags List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d0a9cc17ba44cff547c673bd3086231a68b76370 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=d0a9cc17ba44cff547c673bd3086231a68b76370 commit d0a9cc17ba44cff547c673bd3086231a68b76370 Author: Warner Losh AuthorDate: 2024-05-31 19:44:14 +0000 Commit: Warner Losh CommitDate: 2024-05-31 19:45:26 +0000 sys/contrib: Mop up $FreeBSD$ tags Mop up left-over $FreeBSD$ tags that aren't in upstream and were added for the previous $FreeBSD$ checker. Sponsored by: Netflix --- sys/contrib/ck/FREEBSD-Xlist | 1 - sys/contrib/dev/ral/LICENSE | 2 -- sys/contrib/dev/ral/Makefile | 2 -- sys/contrib/dev/ral/rt2561.fw.uu | 1 - sys/contrib/dev/ral/rt2561s.fw.uu | 1 - sys/contrib/dev/ral/rt2661.fw.uu | 1 - sys/contrib/dev/ral/rt2860.fw.uu | 3 +-- sys/contrib/edk2/FREEBSD-upgrade | 2 -- sys/contrib/zstd/FREEBSD-Xlist | 2 -- sys/contrib/zstd/FREEBSD-upgrade | 2 -- 10 files changed, 1 insertion(+), 16 deletions(-) diff --git a/sys/contrib/ck/FREEBSD-Xlist b/sys/contrib/ck/FREEBSD-Xlist index 6789dd32987f..4d818cbd901d 100644 --- a/sys/contrib/ck/FREEBSD-Xlist +++ b/sys/contrib/ck/FREEBSD-Xlist @@ -1,4 +1,3 @@ -#$FreeBSD$ */LICENSE */Makefile.in */README diff --git a/sys/contrib/dev/ral/LICENSE b/sys/contrib/dev/ral/LICENSE index 5acf6dbed08c..84d9030afc6a 100644 --- a/sys/contrib/dev/ral/LICENSE +++ b/sys/contrib/dev/ral/LICENSE @@ -1,5 +1,3 @@ -$FreeBSD$ - Copyright (c) 2005-2008, Ralink Technology Corp. Paul Lin diff --git a/sys/contrib/dev/ral/Makefile b/sys/contrib/dev/ral/Makefile index 6ef8a9a535a9..9dd6cf38259c 100644 --- a/sys/contrib/dev/ral/Makefile +++ b/sys/contrib/dev/ral/Makefile @@ -1,5 +1,3 @@ -# $FreeBSD$ - FILES= rt2561s.fw.uu rt2561.fw.uu rt2661.fw.uu rt2860.fw.uu rt2561s.fw.uu: microcode.h LICENSE diff --git a/sys/contrib/dev/ral/rt2561.fw.uu b/sys/contrib/dev/ral/rt2561.fw.uu index 9e511d4c1d67..cfeaaa92da4b 100644 --- a/sys/contrib/dev/ral/rt2561.fw.uu +++ b/sys/contrib/dev/ral/rt2561.fw.uu @@ -1,4 +1,3 @@ -# $FreeBSD$ # # Copyright (c) 2005-2008, Ralink Technology Corp. # Paul Lin diff --git a/sys/contrib/dev/ral/rt2561s.fw.uu b/sys/contrib/dev/ral/rt2561s.fw.uu index 43d4353623fc..e534f36be716 100644 --- a/sys/contrib/dev/ral/rt2561s.fw.uu +++ b/sys/contrib/dev/ral/rt2561s.fw.uu @@ -1,4 +1,3 @@ -# $FreeBSD$ # # Copyright (c) 2005-2008, Ralink Technology Corp. # Paul Lin diff --git a/sys/contrib/dev/ral/rt2661.fw.uu b/sys/contrib/dev/ral/rt2661.fw.uu index ab022674065d..16a3bd484d42 100644 --- a/sys/contrib/dev/ral/rt2661.fw.uu +++ b/sys/contrib/dev/ral/rt2661.fw.uu @@ -1,4 +1,3 @@ -# $FreeBSD$ # # Copyright (c) 2005-2008, Ralink Technology Corp. # Paul Lin diff --git a/sys/contrib/dev/ral/rt2860.fw.uu b/sys/contrib/dev/ral/rt2860.fw.uu index 2350550b2482..9cf0d6ac1ac3 100644 --- a/sys/contrib/dev/ral/rt2860.fw.uu +++ b/sys/contrib/dev/ral/rt2860.fw.uu @@ -1,5 +1,4 @@ -# $FreeBSD$ -# +# # Copyright (c) 2005-2008, Ralink Technology Corp. # Paul Lin # diff --git a/sys/contrib/edk2/FREEBSD-upgrade b/sys/contrib/edk2/FREEBSD-upgrade index b36c3155c4a8..421d4cfe48e5 100644 --- a/sys/contrib/edk2/FREEBSD-upgrade +++ b/sys/contrib/edk2/FREEBSD-upgrade @@ -1,5 +1,3 @@ -$FreeBSD$ - We try to maintain the minimal set of headers required to build, as the full set of files from MdePkg is quite large (10MB at the time of writing). To do this when performing an upgrade, execute the following: diff --git a/sys/contrib/zstd/FREEBSD-Xlist b/sys/contrib/zstd/FREEBSD-Xlist index 55fed843f85d..f39005add49f 100644 --- a/sys/contrib/zstd/FREEBSD-Xlist +++ b/sys/contrib/zstd/FREEBSD-Xlist @@ -1,5 +1,3 @@ -$FreeBSD$ - .circleci .cirrus.yml .github diff --git a/sys/contrib/zstd/FREEBSD-upgrade b/sys/contrib/zstd/FREEBSD-upgrade index fb46da059004..e00f5e4520ad 100644 --- a/sys/contrib/zstd/FREEBSD-upgrade +++ b/sys/contrib/zstd/FREEBSD-upgrade @@ -1,5 +1,3 @@ -$FreeBSD$ - zstd To import new vendor sources, prune unwanted files with: From nobody Fri May 31 19:49: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 4VrYc14fS7z5LGln; Fri, 31 May 2024 19:49:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VrYc126cJz4PNZ; Fri, 31 May 2024 19:49:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717184977; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Rp2Bst4wK0iHWfLYXn4SQM3XyzLtIsWSwg+RdJHnCh4=; b=yDGuEMKmZoDThClrR6DvY9PMZiWk0xQHkAUgw9BFmBjSkQ+vFYDreEBWae2u19MSHW1S+z UrfC1uXbEzFHuAtR2H8jnPJmiCtQM9weEd5aTOUU8RMn8l460EO9pjTpFstvBJMeea0RVI WDhQd2QPL0PMiELmfkfj25FArjxJn1UJmUftbkwoeVcsClrZlLsoklqVlsfrpD0Cbgg8Ef Hb+cgzFVWTvDBb3/p/DNKNUz3j/XKrHFkwI2IIe9mJ4SU2x2X1NzLsvPBNO4zt+94NlfRa qW9J3XiGAOypo2yjCwLOnn5Wiwy6YMpceS2TiND+Q73XgbfAjrgckWow4M3/Zw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1717184977; a=rsa-sha256; cv=none; b=JXEsa00ZTY2FWjDR4OKeqL9UAFsVoNSbQg4ryLfeyuajKgwybOI+rNyrpIpgURCtd//eNw H0xha91khaUwsincwNrWLFQA9w0pKl3iJJL52L0JRhDQFjXiPtwdMn2bKOQVW//JyLzP1v B4hi3l/9Y5AwjNU6Sf4gAK76p38dAOtFLEmxHkI4DcNq2otS/KV/qPT6qS/xaMyrqeAIkw t9TyfEZzer8gfEG9OBspbUHbEOzQMrzNAJWypVO7jMRRw1ro2bJRh5vAbOxEQFj1YlSczA ftZWcpGz+7R/f08iKkZ/SY3gSZzkBNBh921p3acSEpz2b89cktPIlvhqcw/ZOw== 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=1717184977; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Rp2Bst4wK0iHWfLYXn4SQM3XyzLtIsWSwg+RdJHnCh4=; b=EQuH0zh76UOUB9cFa72F4XQOIw/dMwCo0PP7FtLi8iR0Zi4xJWMYU5przURr2gIFxPUBj2 QJ1SeFbi+CE2BkqvQVXcdL9Iv1IeEnR7czDbo0rgpdQqn/l+p1dYYcuqXMmERsNOcYJn9O DbO60P3ZGQTgof4DL2bCr8c5rSFosomJ4bLzfTnyiASdtcEzHeARpI1CoZxw7UnMZ7nbjN CvQ7EHQBejBi/x/tKV8PurKcq9ZprabFZ0/qTGGFw3u+daszSIH6Z6I1rqabOVwutNIOci Kno0ccJu2+kIexhkNUXXoVPg4gt/TNF4PD4EvkzMC/BhjsxNT5vyvR8grwHSDQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VrYc11k1tzct4; Fri, 31 May 2024 19:49:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44VJnbjJ085452; Fri, 31 May 2024 19:49:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44VJnbFp085449; Fri, 31 May 2024 19:49:37 GMT (envelope-from git) Date: Fri, 31 May 2024 19:49:37 GMT Message-Id: <202405311949.44VJnbFp085449@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: d37eb5104722 - main - contrib: Remove various $FreeBSD$ tags not upstream List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: d37eb51047221dc3322b34db1038ff3aa533883f Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=d37eb51047221dc3322b34db1038ff3aa533883f commit d37eb51047221dc3322b34db1038ff3aa533883f Author: Warner Losh AuthorDate: 2024-05-31 19:49:17 +0000 Commit: Warner Losh CommitDate: 2024-05-31 19:49:17 +0000 contrib: Remove various $FreeBSD$ tags not upstream Sponsored by: Netflix --- contrib/atf/FREEBSD-upgrade | 2 -- contrib/bsnmp/FREEBSD-Xlist | 1 - contrib/bsnmp/FREEBSD-upgrade | 2 -- contrib/bzip2/FREEBSD-Xlist | 1 - contrib/bzip2/FREEBSD-upgrade | 2 -- contrib/diff/FREEBSD-Xlist | 2 -- contrib/diff/FREEBSD-upgrade | 1 - contrib/expat/FREEBSD-Xlist | 1 - contrib/jemalloc/FREEBSD-Xlist | 1 - contrib/jemalloc/FREEBSD-upgrade | 1 - contrib/less/FREEBSD-upgrade | 2 -- contrib/libcxxrt/FREEBSD-upgrade | 2 -- contrib/ncurses/FREEBSD-Xlist | 2 -- contrib/ncurses/FREEBSD-upgrade | 2 -- contrib/netbsd-tests/FREEBSD-upgrade | 2 -- contrib/netcat/FREEBSD-Xlist | 2 -- contrib/netcat/FREEBSD-upgrade | 2 -- contrib/openbsm/FREEBSD-upgrade | 2 -- contrib/pjdfstest/FREEBSD-upgrade | 2 -- contrib/sendmail/FREEBSD-upgrade | 2 -- contrib/smbfs/FREEBSD-upgrade | 2 -- contrib/tcsh/FREEBSD-Xlist | 1 - contrib/tcsh/FREEBSD-upgrade | 2 -- 23 files changed, 39 deletions(-) diff --git a/contrib/atf/FREEBSD-upgrade b/contrib/atf/FREEBSD-upgrade index e9d7a4cb7b4f..4959b1e95de1 100644 --- a/contrib/atf/FREEBSD-upgrade +++ b/contrib/atf/FREEBSD-upgrade @@ -1,5 +1,3 @@ -$FreeBSD$ - This document contains a collection of notes specific to the import of atf into head. These notes are built on the instructions in the FreeBSD Subversion Primer that detail how to deal with vendor diff --git a/contrib/bsnmp/FREEBSD-Xlist b/contrib/bsnmp/FREEBSD-Xlist index 8a5166240e54..9b3f76007f38 100644 --- a/contrib/bsnmp/FREEBSD-Xlist +++ b/contrib/bsnmp/FREEBSD-Xlist @@ -1,4 +1,3 @@ -#$FreeBSD$ */Makefile.in */acinclude.m4 */aclocal.m4 diff --git a/contrib/bsnmp/FREEBSD-upgrade b/contrib/bsnmp/FREEBSD-upgrade index 4fb31fd9153c..6a18839db274 100644 --- a/contrib/bsnmp/FREEBSD-upgrade +++ b/contrib/bsnmp/FREEBSD-upgrade @@ -1,5 +1,3 @@ -$FreeBSD$ - This is the Begemot micro-SNMP daemon. It is the base for the ILMI daemon for ngATM. Be careful to feed changes back to the maintainer , because the code here is actually shared with other diff --git a/contrib/bzip2/FREEBSD-Xlist b/contrib/bzip2/FREEBSD-Xlist index 6c3c9b2fce5e..2ce9ec8902b9 100644 --- a/contrib/bzip2/FREEBSD-Xlist +++ b/contrib/bzip2/FREEBSD-Xlist @@ -1,4 +1,3 @@ -# $FreeBSD$ *Makefile* *README.XML.STUFF *bz-common.xsl diff --git a/contrib/bzip2/FREEBSD-upgrade b/contrib/bzip2/FREEBSD-upgrade index 48e788a329a4..15c037baa3e7 100644 --- a/contrib/bzip2/FREEBSD-upgrade +++ b/contrib/bzip2/FREEBSD-upgrade @@ -1,5 +1,3 @@ -$FreeBSD$ - Julian Seward's bzip2 originals can be found at: http://www.bzip.org/downloads.html diff --git a/contrib/diff/FREEBSD-Xlist b/contrib/diff/FREEBSD-Xlist index 64e22743e7af..d9b65bff1756 100644 --- a/contrib/diff/FREEBSD-Xlist +++ b/contrib/diff/FREEBSD-Xlist @@ -1,5 +1,3 @@ -# $FreeBSD$ - INSTALL Makefile.am Makefile.in diff --git a/contrib/diff/FREEBSD-upgrade b/contrib/diff/FREEBSD-upgrade index 61ad0c9435bf..6c9fad16eb89 100644 --- a/contrib/diff/FREEBSD-upgrade +++ b/contrib/diff/FREEBSD-upgrade @@ -1,4 +1,3 @@ -# $FreeBSD$ Import of GNU diff 2.8.7 Original source available as ftp://alpha.gnu.org/pub/gnu/diffutils/diffutils-2.8.7.tar.gz diff --git a/contrib/expat/FREEBSD-Xlist b/contrib/expat/FREEBSD-Xlist index c1f2a689fee4..82ceb055ae1e 100644 --- a/contrib/expat/FREEBSD-Xlist +++ b/contrib/expat/FREEBSD-Xlist @@ -1,4 +1,3 @@ -# $FreeBSD$ *.MPW *.cmake *.def diff --git a/contrib/jemalloc/FREEBSD-Xlist b/contrib/jemalloc/FREEBSD-Xlist index d84d4b9302b6..31853070379f 100644 --- a/contrib/jemalloc/FREEBSD-Xlist +++ b/contrib/jemalloc/FREEBSD-Xlist @@ -1,4 +1,3 @@ -$FreeBSD$ .appveyor.yml .autom4te.cfg .cirrus.yml diff --git a/contrib/jemalloc/FREEBSD-upgrade b/contrib/jemalloc/FREEBSD-upgrade index 666790bdff13..d3173b9d1f36 100755 --- a/contrib/jemalloc/FREEBSD-upgrade +++ b/contrib/jemalloc/FREEBSD-upgrade @@ -1,5 +1,4 @@ #!/bin/sh -# $FreeBSD$ # # Usage: cd /usr/src/contrib/jemalloc # ./FREEBSD-upgrade [args] diff --git a/contrib/less/FREEBSD-upgrade b/contrib/less/FREEBSD-upgrade index 6d30dfd039c3..ddbd758da264 100644 --- a/contrib/less/FREEBSD-upgrade +++ b/contrib/less/FREEBSD-upgrade @@ -1,5 +1,3 @@ -$FreeBSD$ - 1. Download latest less(1) tarball. The homepage of less(1) is at: http://www.greenwoodsoftware.com/less/ 2. Checkout $FSVN/vendor/less/ into less/ diff --git a/contrib/libcxxrt/FREEBSD-upgrade b/contrib/libcxxrt/FREEBSD-upgrade index bdd74f308a4f..3b2f2cf9e79f 100644 --- a/contrib/libcxxrt/FREEBSD-upgrade +++ b/contrib/libcxxrt/FREEBSD-upgrade @@ -1,5 +1,3 @@ -$FreeBSD$ - This is the FreeBSD copy of libcxxrt. It contains the src directory from the upstream repository. diff --git a/contrib/ncurses/FREEBSD-Xlist b/contrib/ncurses/FREEBSD-Xlist index a0ee58e5a0ea..21d8ebe29844 100644 --- a/contrib/ncurses/FREEBSD-Xlist +++ b/contrib/ncurses/FREEBSD-Xlist @@ -1,5 +1,3 @@ -$FreeBSD$ - Ada95 c++ doc/html/Ada95.html diff --git a/contrib/ncurses/FREEBSD-upgrade b/contrib/ncurses/FREEBSD-upgrade index ffa4ccb7b56b..539f471edc18 100644 --- a/contrib/ncurses/FREEBSD-upgrade +++ b/contrib/ncurses/FREEBSD-upgrade @@ -1,5 +1,3 @@ -$FreeBSD$ - ncurses The release tarball can be found at GNU FTP sites. diff --git a/contrib/netbsd-tests/FREEBSD-upgrade b/contrib/netbsd-tests/FREEBSD-upgrade index edeba708cb18..3c396979a760 100644 --- a/contrib/netbsd-tests/FREEBSD-upgrade +++ b/contrib/netbsd-tests/FREEBSD-upgrade @@ -1,5 +1,3 @@ -$FreeBSD$ - This document contains a collection of notes specific to the import of the NetBSD test suite into head. These notes are built on the instructions in the FreeBSD Subversion Primer that detail how to deal with vendor diff --git a/contrib/netcat/FREEBSD-Xlist b/contrib/netcat/FREEBSD-Xlist index b69f5e4de371..f3c7a7c5da68 100644 --- a/contrib/netcat/FREEBSD-Xlist +++ b/contrib/netcat/FREEBSD-Xlist @@ -1,3 +1 @@ -$FreeBSD$ - Makefile diff --git a/contrib/netcat/FREEBSD-upgrade b/contrib/netcat/FREEBSD-upgrade index 33f5ea2873d6..c57852c791f5 100644 --- a/contrib/netcat/FREEBSD-upgrade +++ b/contrib/netcat/FREEBSD-upgrade @@ -1,5 +1,3 @@ -$FreeBSD$ - Most of the instructions is outlined on FreeBSD wiki at: http://wiki.freebsd.org/SubversionPrimer/VendorImports diff --git a/contrib/openbsm/FREEBSD-upgrade b/contrib/openbsm/FREEBSD-upgrade index e1776753355e..f4a1fc05a597 100644 --- a/contrib/openbsm/FREEBSD-upgrade +++ b/contrib/openbsm/FREEBSD-upgrade @@ -52,5 +52,3 @@ be built with the version of the bsm/ include files in src/sys/bsm, not the version in contrib/openbsm/bsm, so buildworld tests before committing are necessary, and the commits to various parts of the system must be made in close succession. - -$FreeBSD$ diff --git a/contrib/pjdfstest/FREEBSD-upgrade b/contrib/pjdfstest/FREEBSD-upgrade index eff295fbfdc0..de6d728191f2 100644 --- a/contrib/pjdfstest/FREEBSD-upgrade +++ b/contrib/pjdfstest/FREEBSD-upgrade @@ -1,5 +1,3 @@ -$FreeBSD$ - This document contains a collection of notes specific to the import of pjdfstest into head. These notes are built on the instructions in the FreeBSD Subversion Primer that detail how to deal with vendor diff --git a/contrib/sendmail/FREEBSD-upgrade b/contrib/sendmail/FREEBSD-upgrade index 5cf41f10b6ad..c45d0a96b91e 100644 --- a/contrib/sendmail/FREEBSD-upgrade +++ b/contrib/sendmail/FREEBSD-upgrade @@ -1,5 +1,3 @@ -$FreeBSD$ - sendmail 8.18.1 originals can be found at: ftp://ftp.sendmail.org/pub/sendmail/ diff --git a/contrib/smbfs/FREEBSD-upgrade b/contrib/smbfs/FREEBSD-upgrade index 6fad7c6d729e..a1547eedf2a5 100644 --- a/contrib/smbfs/FREEBSD-upgrade +++ b/contrib/smbfs/FREEBSD-upgrade @@ -1,5 +1,3 @@ -$FreeBSD$ - The smbfs distribution was written with FreeBSD in mind, so the only change required before an import is: diff --git a/contrib/tcsh/FREEBSD-Xlist b/contrib/tcsh/FREEBSD-Xlist index 49621ab36f0f..1f6a5fb26101 100644 --- a/contrib/tcsh/FREEBSD-Xlist +++ b/contrib/tcsh/FREEBSD-Xlist @@ -1,4 +1,3 @@ -$FreeBSD$ */BUGS */Imakefile */MAKEDIFFS diff --git a/contrib/tcsh/FREEBSD-upgrade b/contrib/tcsh/FREEBSD-upgrade index 7bfdaf8a2091..2abb920e622a 100644 --- a/contrib/tcsh/FREEBSD-upgrade +++ b/contrib/tcsh/FREEBSD-upgrade @@ -1,5 +1,3 @@ -$FreeBSD$ - Christos Zoulas `tcsh' originals can be found at: ftp://ftp.astron.com/pub/tcsh/ From nobody Fri May 31 19:52: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 4VrYg55gr1z5LGdW; Fri, 31 May 2024 19:52:17 +0000 (UTC) (envelope-from kostikbel@gmail.com) Received: from kib.kiev.ua (kib.kiev.ua [IPv6:2001:470:d5e7:1::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4VrYg45QRMz4Pyf; Fri, 31 May 2024 19:52:16 +0000 (UTC) (envelope-from kostikbel@gmail.com) Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=fail reason="No valid SPF, No valid DKIM" header.from=gmail.com (policy=none); spf=softfail (mx1.freebsd.org: 2001:470:d5e7:1::1 is neither permitted nor denied by domain of kostikbel@gmail.com) smtp.mailfrom=kostikbel@gmail.com Received: from tom.home (kib@localhost [127.0.0.1] (may be forged)) by kib.kiev.ua (8.18.1/8.18.1) with ESMTP id 44VJq2Zk019896; Fri, 31 May 2024 22:52:05 +0300 (EEST) (envelope-from kostikbel@gmail.com) DKIM-Filter: OpenDKIM Filter v2.10.3 kib.kiev.ua 44VJq2Zk019896 Received: (from kostik@localhost) by tom.home (8.18.1/8.18.1/Submit) id 44VJq2IA019895; Fri, 31 May 2024 22:52:02 +0300 (EEST) (envelope-from kostikbel@gmail.com) X-Authentication-Warning: tom.home: kostik set sender to kostikbel@gmail.com using -f Date: Fri, 31 May 2024 22:52:02 +0300 From: Konstantin Belousov To: Kyle Evans Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 6e824f371301 - main - time: siginfo_recvd needs to be marked volatile Message-ID: References: <202405220537.44M5bugu007292@gitrepo.freebsd.org> List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <202405220537.44M5bugu007292@gitrepo.freebsd.org> X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED,BAYES_00, DKIM_ADSP_CUSTOM_MED,FORGED_GMAIL_RCVD,FREEMAIL_FROM, NML_ADSP_CUSTOM_MED autolearn=no autolearn_force=no version=4.0.1 X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on tom.home X-Spamd-Bar: -- X-Spamd-Result: default: False [-2.98 / 15.00]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_SHORT(-0.98)[-0.979]; MIME_GOOD(-0.10)[text/plain]; DMARC_POLICY_SOFTFAIL(0.10)[gmail.com : No valid SPF, No valid DKIM,none]; ARC_NA(0.00)[]; ASN(0.00)[asn:6939, ipnet:2001:470::/32, country:US]; MIME_TRACE(0.00)[0:+]; MISSING_XM_UA(0.00)[]; FREEMAIL_FROM(0.00)[gmail.com]; TO_DN_SOME(0.00)[]; HAS_XAW(0.00)[]; R_DKIM_NA(0.00)[]; MLMMJ_DEST(0.00)[dev-commits-src-all@freebsd.org,dev-commits-src-main@freebsd.org]; FROM_EQ_ENVFROM(0.00)[]; FROM_HAS_DN(0.00)[]; FREEMAIL_ENVFROM(0.00)[gmail.com]; RCVD_COUNT_TWO(0.00)[2]; TO_MATCH_ENVRCPT_ALL(0.00)[]; R_SPF_SOFTFAIL(0.00)[~all]; RCVD_TLS_LAST(0.00)[]; RCPT_COUNT_THREE(0.00)[4] X-Rspamd-Queue-Id: 4VrYg45QRMz4Pyf On Wed, May 22, 2024 at 05:37:56AM +0000, Kyle Evans wrote: > The branch main has been updated by kevans: > > URL: https://cgit.FreeBSD.org/src/commit/?id=6e824f3713011f7955a4f88fb16445e8e2cbe72c > > commit 6e824f3713011f7955a4f88fb16445e8e2cbe72c > Author: Kyle Evans > AuthorDate: 2024-05-22 05:36:29 +0000 > Commit: Kyle Evans > CommitDate: 2024-05-22 05:37:41 +0000 > > time: siginfo_recvd needs to be marked volatile I do not think so. It happens to work with the compilers we currently use. > > sig_atomic_t does not imply volatility, we must do it ourselves to avoid > caching of siginfo_recvd loads. For this purpose, standard provides atomic_signal_fence(). You would need to put it before read of siginfo_recvd (after wait4()), and after update of siginfo_recvd in the signal handler. From nobody Fri May 31 19:56: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 4VrYlm37lfz5LHBb; Fri, 31 May 2024 19:56: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 4VrYlm23pnz4QQh; Fri, 31 May 2024 19:56:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717185380; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=S4P6xb0+ee9Axgcb+eT+xoHkEjtoB1LICz5V7dumftU=; b=W6flAWanKf8mUnyLzVuhCZt8kx2owJsxqtFSSzUQF3RsLxjxWvwF0QqODvmdynGPwxF67O dwjmuQGlWAdgDbo9g4RNfUXb5iv0AchMgFrhTdLZpWc8Mxl9Jze303WGx8vyzYrr6HyPvK j+fZdkrP/zBTBvKNurvWivvcDHtiFIRmKJJqHaW4IudV4askNLYAm1y93DIBer3inWQ/fk SUHREsOPyCrIl5zvCQhIdYsG2tXJlH8M/sYUEAfr4/pVXqHw8TvzUiwAHX1QCjhM9sseZC +DhaRoKkdtKwoOXlRQGk79ej6V4qxfULvwAHwWXgATG34mYMrG1z2hPh6dCKjQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1717185380; a=rsa-sha256; cv=none; b=ctHah0t3wRNR5411JltHjbFGCLEeXg+/r2hX5MqkWUfeteWcIocGv1yWa9tnIxfddfopR2 4/Ksis0b2YX1eBd1oxERkkZwHOX5xof8sGFoUu2BlIAe6YM2n+LwTRgOJGm2DDJyO+o3ME v38DOXZeHzKv9UlJ7V8IS0dXw45/qFI/ohK+E6BMbXqEaBZMNK5l/G9IZKyLcgPIRuKWkb Tjm3QWdyiXkZJ0iZQWom4pLsXXT+d6XQzirBxF74/io21qZjl9H78zLHMnx3+BpvhhN1kY X8WqhA3iFPOwybEopJGjsRZsrSa6Wsxb3rl7e+G9Vhzpo1Vvjojo1DwUOJJOAw== 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=1717185380; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=S4P6xb0+ee9Axgcb+eT+xoHkEjtoB1LICz5V7dumftU=; b=KXdT9muWI6QTpkt1zdIyhzcqDfC+flSIFKeyHjZsz0iqu8rjvcR9bsJNnUt2jCzwIr8ALk pPDtlHB66D3iANjpH+hSxUJ9r5NsdZE8eWBI04OerlQRpViDvaMAGlUBfhO+NMWbwfPqjF ihSwXezBe9zJSDDeutntMOyOpoG01Q+KvWqcVp/cxYHW6ucSpyghZc5T8MnsMIJJGQS6lM CR2Bs5GwK45op3ENBh48HSfWtbtZThAmBl5C1ACFLF7WjLDLSy6mDtYOI8DDKpYI+/ASCk H0fQ8pdJ62GcRtrrhKNWjewt7yZKVCMhxV2fdasLPJ+Sjdre8P2/+nfRrd2F3w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VrYlm1ddZzdYb; Fri, 31 May 2024 19:56: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 44VJuK6I001789; Fri, 31 May 2024 19:56:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44VJuKRA001786; Fri, 31 May 2024 19:56:20 GMT (envelope-from git) Date: Fri, 31 May 2024 19:56:20 GMT Message-Id: <202405311956.44VJuKRA001786@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jessica Clarke Subject: git: a5ae2d2ab409 - main - mitigations.7: Document riscv's SM[AE]P equivalents List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a5ae2d2ab409834c28e71b1dcde4ebcd0d9b3671 Auto-Submitted: auto-generated The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=a5ae2d2ab409834c28e71b1dcde4ebcd0d9b3671 commit a5ae2d2ab409834c28e71b1dcde4ebcd0d9b3671 Author: Jessica Clarke AuthorDate: 2024-05-31 19:54:59 +0000 Commit: Jessica Clarke CommitDate: 2024-05-31 19:54:59 +0000 mitigations.7: Document riscv's SM[AE]P equivalents Its base privileged architecture provides these. Read/write is toggleable via the SUM bit, so use that as its feature name. Execute is always-on so has no name. --- share/man/man7/mitigations.7 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/share/man/man7/mitigations.7 b/share/man/man7/mitigations.7 index f97ba50320f2..afb88de56e86 100644 --- a/share/man/man7/mitigations.7 +++ b/share/man/man7/mitigations.7 @@ -250,6 +250,8 @@ kernel. .It amd64 Ta SMEP Ta Execute .It arm64 Ta PAN Ta Read / Write .It arm64 Ta PXN Ta Execute +.It riscv Ta SUM Ta Read / Write +.It riscv Ta - Ta Execute .El .Pp These features are automatically used by the kernel. From nobody Fri May 31 20:16: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 4VrZCL1JJSz5LK14 for ; Fri, 31 May 2024 20:16:46 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-ed1-x52f.google.com (mail-ed1-x52f.google.com [IPv6:2a00:1450:4864:20::52f]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "WR4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VrZCK34TWz4SLb for ; Fri, 31 May 2024 20:16:45 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-ed1-x52f.google.com with SMTP id 4fb4d7f45d1cf-5751bcb3139so2939435a12.1 for ; Fri, 31 May 2024 13:16:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20230601.gappssmtp.com; s=20230601; t=1717186602; x=1717791402; darn=freebsd.org; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=jhpnnxGqNm3GzgXGW937eW0cE6zyyi/+uS4E71S4RJs=; b=Ry1GDPmE9CCOS6TGpbod732+04dlmULICoXuHb43SbB8i/AKufr25wvTb2DjpegX1q dm9vMVnhVCQ9UnBTqfXJD20R2lerlV8262uEef3gIFIQdgvGgdwfb/uaVRJblGQECe+P 7P/kmGwqIKNT3kOSFpyAgXaxZn4ueUJ/bw+QGYaXJlLlWQY7CtfuCPRTZh6t7eHZ933M m55lPuM6pwfI5C1/sYaxHgLx6nEOCE7VsA+WPcXS35eEKtst24y+itcc3bNZXKatnt80 1o+2E8v+FozM8e/v+yWYpi/hT9xDVpwINnm5QT8p6nrM+BGRrek2fkX3wAfV3eGzGa4Y 7/AQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1717186602; x=1717791402; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=jhpnnxGqNm3GzgXGW937eW0cE6zyyi/+uS4E71S4RJs=; b=ttCPOtvheuawVSg5R1PoM7a1XR1zWwlEclcErb0GXdzRkobI2PJweIfEinNGdeSToe ZxcaWE2bB8hqI8FM3YN5ncaBBJU7Kc2DWB55ZC/M6QgysGPnedS8YAsI4DJvM3zxjAn/ 04VhwKW5HVXSBLAc7yybF4L2n0hSkkchzt0nh7tjKHwv0tiHNIG1cOKnpasB93/Jb15x GPuEloHlz8PHYQL/fWl09Hf+yypQXoVT6/VpLMtbV1TH4LF+lXShPWBJMM8HLnHBbqvy 77AWNys7LIj6w4SZZUW5bZIsBwBAaNB+pgVnAVoSfWMN9qKDh3dB6hc+X0DSpid2SVvr VIRQ== X-Forwarded-Encrypted: i=1; AJvYcCXVYuXOAZEiy4bYjeGTWXWI9zxRFj8/YKNuubb2KEDNPjSi+M/O3eBBLgGM6q692eDeritPq6iXVhkMb9/D3m9uYix0fPqOvlGGH58oqtdw X-Gm-Message-State: AOJu0Yy3fFSVPcD9C6LtYQSegOvtj1QvC/lLxMwUpMbfC+9rConrBCsJ Ll3/Bi6WUtrPobnu2UADN5qWO2OIXkaFdDBeTbQEN1XCUDi6nZIWLmYbzIyyAZnEmEsA75lsi2d 23RWVRciccD/ysRov2DXnQ95/cfU/MB6SfRmuCQ== X-Google-Smtp-Source: AGHT+IH9DSwwhCVqSKBKpGxc82fB26sU/CNzt11+a0eAMcnHpxHGg0gs2twMC7HXpJGZXVoyk+K9GVnMVRb/M2xE5MQ= X-Received: by 2002:a17:907:c93:b0:a59:a9c0:57ed with SMTP id a640c23a62f3a-a682272f3e6mr162766266b.68.1717186601775; Fri, 31 May 2024 13:16:41 -0700 (PDT) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 References: <202405311301.44VD1UhH004254@gitrepo.freebsd.org> In-Reply-To: <202405311301.44VD1UhH004254@gitrepo.freebsd.org> From: Warner Losh Date: Fri, 31 May 2024 16:16:29 -0400 Message-ID: Subject: Re: git: aca928a50a42 - main - zfs: merge openzfs/zfs@e2357561b To: Martin Matuska Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Content-Type: multipart/alternative; boundary="0000000000006990d20619c5a9d5" X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:2a00:1450::/32, country:US] X-Rspamd-Queue-Id: 4VrZCK34TWz4SLb --0000000000006990d20619c5a9d5 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable This seems to break macos bootstrap: % ./tools/build/make.py TARGET=3Darm64 TARGET_ARCH=3Daarch64 -DNOCLEAN buildworld -j 20 ... --- assert.o --- /Users/imp/git/head/sys/contrib/openzfs/lib/libspl/assert.c:70:1: error: redefinition of 'libspl_gettid' libspl_gettid(void) ^ /Users/imp/git/head/sys/contrib/openzfs/lib/libspl/assert.c:57:1: note: previous definition is here libspl_gettid(void) ^ 1 error generated. *** [assert.o] Error code 1 bmake[3]: stopped in /Users/imp/git/head/cddl/lib/libspl bmake[3]: 1 error Looks like two identical copies of #if defined(__APPLE__) static inline uint64_t libspl_gettid(void) { uint64_t tid; if (pthread_threadid_np(NULL, &tid) !=3D 0) tid =3D 0; return (tid); } #endif which normally aren't compiled on !macos. Removing one fixes the issue. Should I just commit because this is a mismerge, or should I let you take care of it with upstream? Warner On Fri, May 31, 2024 at 9:01=E2=80=AFAM Martin Matuska wro= te: > The branch main has been updated by mm: > > URL: > https://cgit.FreeBSD.org/src/commit/?id=3Daca928a50a42f00f344df934005b09d= bcb4e2f77 > > commit aca928a50a42f00f344df934005b09dbcb4e2f77 > Merge: d28bbfa2715a e2357561b949 > Author: Martin Matuska > AuthorDate: 2024-05-31 07:31:58 +0000 > Commit: Martin Matuska > CommitDate: 2024-05-31 09:26:50 +0000 > > zfs: merge openzfs/zfs@e2357561b > > Notable upstream pull request merges: > #15940 41ae864b6 Replace P2ALIGN with P2ALIGN_TYPED and delete P2ALI= GN > #16128 5137c132a zpool import output is not formated properly > #16138 efbef9e6c FreeBSD: Add zfs_link_create() error handling > #16146 04bae5ec9 Disable high priority ZIO threads on FreeBSD and > Linux > #16151 cc3869153 zfs_ioc_send: use a dedicated taskq thread for send > #16151 adda768e3 spa: remove spa_taskq_dispatch_sync() > #16151 515c4dd21 spa: flatten spa_taskq_dispatch_ent() > #16151 0a543db37 spa_taskq_dispatch_ent: simplify arguments > #16153 975a13259 Add support for parallel pool exports > #16153 89acef992 Simplified the scope of the namespace lock > #16159 136c05321 ZAP: Fix leaf references on zap_expand_leaf() error= s > #16162 af5dbed31 Fix scn_queue races on very old pools > #16165 3400127a7 Fix ZIL clone records for legacy holes > #16167 414acbd37 Unbreak FreeBSD cross-build on MacOS broken in > 051460b8b > #16172 eced2e2f1 libzfs: Fix mounting datasets under thread limit > pressure > #16178 b64afa41d Better control the thread pool size when mounting > datasets > #16181 fa99d9cd9 zfs_dbgmsg_print: make FreeBSD and Linux consistent > #16191 e675852bc dbuf: separate refcount calls for dbuf and dbuf_use= r > #16198 a043b60f1 Correct level handling in zstream recompress > #16204 34906f8bb zap: reuse zap_leaf_t on dbuf reuse after shrink > #16206 d0aa9dbcc Use memset to zero stack allocations containing > unions > #16207 8865dfbca Fix assertion in Persistent L2ARC > #16208 08648cf0d Allow block cloning to be interrupted by a signal > #16210 e2357561b FreeBSD: Add const qualifier to members of struct > opensolaris_utsname > #16214 800d59d57 Some improvements to metaslabs eviction > #16216 02c5aa9b0 Destroy ARC buffer in case of fill error > #16225 01c8efdd5 Simplify issig() > > Obtained from: OpenZFS > OpenZFS commit: e2357561b9499296bff758afe4868dbc39735675 > > cddl/lib/libspl/Makefile | 1 + > sys/contrib/openzfs/cmd/zdb/zdb.c | 132 ++++++-- > sys/contrib/openzfs/cmd/zed/agents/zfs_mod.c | 2 +- > sys/contrib/openzfs/cmd/zed/zed.d/Makefile.am | 2 + > .../openzfs/cmd/zed/zed.d/deadman-slot_off.sh | 71 ++++ > sys/contrib/openzfs/cmd/zed/zed.d/zed.rc | 7 + > sys/contrib/openzfs/cmd/zfs/zfs_main.c | 6 +- > sys/contrib/openzfs/cmd/zpool/zpool_main.c | 377 > +++++++++++++-------- > .../openzfs/cmd/zstream/zstream_recompress.c | 2 +- > sys/contrib/openzfs/cmd/zstream/zstream_redup.c | 4 +- > sys/contrib/openzfs/cmd/ztest.c | 32 +- > sys/contrib/openzfs/config/kernel-types.m4 | 40 +++ > sys/contrib/openzfs/config/kernel.m4 | 2 + > sys/contrib/openzfs/config/zfs-build.m4 | 92 ++--- > sys/contrib/openzfs/include/libzfs.h | 5 +- > .../openzfs/include/os/freebsd/spl/sys/ccompile.h | 3 +- > .../openzfs/include/os/freebsd/spl/sys/misc.h | 10 +- > .../openzfs/include/os/freebsd/spl/sys/sig.h | 8 +- > .../openzfs/include/os/freebsd/spl/sys/sysmacros.h | 3 +- > .../openzfs/include/os/linux/spl/sys/signal.h | 5 +- > .../openzfs/include/os/linux/spl/sys/sysmacros.h | 3 +- > .../openzfs/include/os/linux/spl/sys/types.h | 2 + > sys/contrib/openzfs/include/sys/spa_impl.h | 7 +- > sys/contrib/openzfs/include/sys/zfs_context.h | 3 +- > sys/contrib/openzfs/include/sys/zfs_debug.h | 2 +- > sys/contrib/openzfs/lib/libefi/rdwr_efi.c | 4 +- > sys/contrib/openzfs/lib/libnvpair/libnvpair.abi | 111 +++++- > sys/contrib/openzfs/lib/libspl/Makefile.am | 7 +- > sys/contrib/openzfs/lib/libspl/assert.c | 53 +-- > sys/contrib/openzfs/lib/libspl/backtrace.c | 119 +++++++ > sys/contrib/openzfs/lib/libspl/include/Makefile.am | 1 + > .../lib/libspl/include/os/linux/sys/sysmacros.h | 3 +- > .../openzfs/lib/libspl/include/sys/backtrace.h | 32 ++ > sys/contrib/openzfs/lib/libtpool/thread_pool.c | 28 +- > sys/contrib/openzfs/lib/libuutil/libuutil.abi | 85 ++++- > sys/contrib/openzfs/lib/libzfs/libzfs.abi | 44 ++- > sys/contrib/openzfs/lib/libzfs/libzfs_mount.c | 30 +- > sys/contrib/openzfs/lib/libzfs/libzfs_sendrecv.c | 6 +- > .../openzfs/lib/libzfs/os/linux/libzfs_pool_os.c | 3 +- > .../openzfs/lib/libzfs_core/libzfs_core.abi | 89 ++++- > sys/contrib/openzfs/man/man4/zfs.4 | 23 +- > sys/contrib/openzfs/module/icp/io/aes.c | 8 +- > .../openzfs/module/os/freebsd/spl/spl_misc.c | 7 +- > .../openzfs/module/os/freebsd/zfs/vdev_geom.c | 2 +- > .../openzfs/module/os/freebsd/zfs/zfs_debug.c | 25 +- > .../openzfs/module/os/freebsd/zfs/zfs_dir.c | 1 + > .../openzfs/module/os/freebsd/zfs/zfs_vnops_os.c | 54 ++- > .../openzfs/module/os/freebsd/zfs/zfs_znode.c | 1 - > .../openzfs/module/os/linux/spl/spl-procfs-list.c | 2 +- > .../openzfs/module/os/linux/spl/spl-taskq.c | 2 +- > .../openzfs/module/os/linux/spl/spl-thread.c | 16 +- > .../openzfs/module/os/linux/zfs/vdev_disk.c | 2 +- > .../openzfs/module/os/linux/zfs/zfs_debug.c | 22 +- > sys/contrib/openzfs/module/os/linux/zfs/zvol_os.c | 5 +- > sys/contrib/openzfs/module/zcommon/zfs_fletcher.c | 8 +- > sys/contrib/openzfs/module/zfs/arc.c | 6 +- > sys/contrib/openzfs/module/zfs/btree.c | 2 +- > sys/contrib/openzfs/module/zfs/dbuf.c | 35 +- > sys/contrib/openzfs/module/zfs/dmu.c | 5 +- > sys/contrib/openzfs/module/zfs/dmu_diff.c | 2 +- > sys/contrib/openzfs/module/zfs/dmu_object.c | 2 +- > sys/contrib/openzfs/module/zfs/dmu_objset.c | 2 +- > sys/contrib/openzfs/module/zfs/dmu_recv.c | 2 +- > sys/contrib/openzfs/module/zfs/dmu_redact.c | 2 +- > sys/contrib/openzfs/module/zfs/dmu_send.c | 2 +- > sys/contrib/openzfs/module/zfs/metaslab.c | 11 +- > sys/contrib/openzfs/module/zfs/spa.c | 100 ++++-- > sys/contrib/openzfs/module/zfs/spa_misc.c | 33 +- > sys/contrib/openzfs/module/zfs/vdev.c | 21 +- > sys/contrib/openzfs/module/zfs/vdev_initialize.c | 9 +- > sys/contrib/openzfs/module/zfs/vdev_raidz.c | 3 +- > sys/contrib/openzfs/module/zfs/vdev_rebuild.c | 3 +- > sys/contrib/openzfs/module/zfs/vdev_trim.c | 9 +- > sys/contrib/openzfs/module/zfs/zap.c | 61 ++-- > sys/contrib/openzfs/module/zfs/zcp.c | 3 +- > sys/contrib/openzfs/module/zfs/zfs_ioctl.c | 105 ++++-- > sys/contrib/openzfs/module/zfs/zfs_log.c | 8 +- > sys/contrib/openzfs/module/zfs/zfs_vnops.c | 5 + > sys/contrib/openzfs/module/zfs/zio.c | 27 +- > sys/contrib/openzfs/tests/runfiles/common.run | 3 +- > .../openzfs/tests/test-runner/bin/zts-report.py.in | 1 - > .../tests/zfs-tests/cmd/libzfs_input_check.c | 4 +- > .../openzfs/tests/zfs-tests/include/tunables.cfg | 1 + > .../openzfs/tests/zfs-tests/tests/Makefile.am | 2 + > .../zpool_export/zpool_export_parallel_admin.ksh | 72 ++++ > .../zpool_export/zpool_export_parallel_pos.ksh | 129 +++++++ > .../tests/functional/deadman/deadman_ratelimit.ksh | 8 +- > sys/modules/zfs/zfs_config.h | 10 +- > sys/modules/zfs/zfs_gitrev.h | 2 +- > 89 files changed, 1694 insertions(+), 610 deletions(-) > > diff --cc cddl/lib/libspl/Makefile > index e432b313d9d0,000000000000..6c43e1750c3c > mode 100644,000000..100644 > --- a/cddl/lib/libspl/Makefile > +++ b/cddl/lib/libspl/Makefile > @@@ -1,49 -1,0 +1,50 @@@ > + > +.include > +.include > + > +.PATH: ${SRCTOP}/sys/contrib/openzfs/lib/libspl > +.PATH: ${SRCTOP}/sys/contrib/openzfs/include > + > +LIB=3D spl > +LIBADD=3D > +PACKAGE=3D zfs > + > +SRCS =3D \ > + assert.c \ > ++ backtrace.c \ > + list.c \ > + mkdirp.c \ > + os/freebsd/zone.c \ > + page.c \ > + timestamp.c \ > + include/sys/list.h \ > + include/sys/list_impl.h > + > +# These functions are not required when bootstrapping and the atomic co= de > +# will not compile when building on macOS. > +.if !defined(BOOTSTRAPPING) > +SRCS +=3D \ > + atomic.c \ > + getexecname.c \ > + os/freebsd/getexecname.c \ > + os/freebsd/gethostid.c \ > + os/freebsd/getmntany.c \ > + os/freebsd/mnttab.c > +.endif > + > +WARNS?=3D 2 > +CSTD=3D c99 > +CFLAGS+=3D -DIN_BASE > +CFLAGS+=3D -I${SRCTOP}/sys/contrib/openzfs/include > +CFLAGS+=3D -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/ > +CFLAGS+=3D -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/os/freebs= d > +CFLAGS+=3D -I${SRCTOP}/cddl/compat/opensolaris/include > +CFLAGS+=3D -I${SRCTOP}/sys/contrib/openzfs/module/icp/include > +CFLAGS+=3D -include > ${SRCTOP}/sys/contrib/openzfs/include/os/freebsd/spl/sys/ccompile.h > +CFLAGS+=3D -DHAVE_ISSETUGID > +CFLAGS+=3D -include ${SRCTOP}/sys/modules/zfs/zfs_config.h > +.if ${COMPILER_TYPE} =3D=3D "clang" > +CFLAGS.atomic.c+=3D -Wno-error=3Datomic-alignment > +.endif > + > +.include > diff --cc sys/contrib/openzfs/cmd/zed/zed.d/deadman-slot_off.sh > index 000000000000,7b339b3add01..7b339b3add01 > mode 000000,100755..100755 > --- a/sys/contrib/openzfs/cmd/zed/zed.d/deadman-slot_off.sh > +++ b/sys/contrib/openzfs/cmd/zed/zed.d/deadman-slot_off.sh > diff --cc sys/contrib/openzfs/config/kernel-types.m4 > index 000000000000,ed76af28337b..ed76af28337b > mode 000000,100644..100644 > --- a/sys/contrib/openzfs/config/kernel-types.m4 > +++ b/sys/contrib/openzfs/config/kernel-types.m4 > diff --cc sys/contrib/openzfs/lib/libspl/assert.c > index 5b12c14acd6e,d11361b387e2..315ddd6b9a9d > --- a/sys/contrib/openzfs/lib/libspl/assert.c > +++ b/sys/contrib/openzfs/lib/libspl/assert.c > @@@ -51,55 -52,6 +52,19 @@@ > pthread_getname_np(pthread_self(), buf, len); > #endif > > - #if defined(HAVE_LIBUNWIND) > - #define UNW_LOCAL_ONLY > - #include > - > - static inline void > - libspl_dump_backtrace(void) > ++#if defined(__APPLE__) > ++static inline uint64_t > ++libspl_gettid(void) > +{ > - unw_context_t uc; > - unw_cursor_t cp; > - unw_word_t ip, off; > - char funcname[128]; > - #ifdef HAVE_LIBUNWIND_ELF > - char objname[128]; > - unw_word_t objoff; > - #endif > ++ uint64_t tid; > + > - fprintf(stderr, "Call trace:\n"); > - unw_getcontext(&uc); > - unw_init_local(&cp, &uc); > - while (unw_step(&cp) > 0) { > - unw_get_reg(&cp, UNW_REG_IP, &ip); > - unw_get_proc_name(&cp, funcname, sizeof (funcname), &off)= ; > - #ifdef HAVE_LIBUNWIND_ELF > - unw_get_elf_filename(&cp, objname, sizeof (objname), > &objoff); > - fprintf(stderr, " [0x%08lx] %s+0x%2lx (in %s +0x%2lx)\n"= , > - ip, funcname, off, objname, objoff); > - #else > - fprintf(stderr, " [0x%08lx] %s+0x%2lx\n", ip, funcname, > off); > - #endif > - } > - } > - #elif defined(HAVE_BACKTRACE) > - #include > ++ if (pthread_threadid_np(NULL, &tid) !=3D 0) > ++ tid =3D 0; > + > - static inline void > - libspl_dump_backtrace(void) > - { > - void *btptrs[100]; > - size_t nptrs =3D backtrace(btptrs, 100); > - char **bt =3D backtrace_symbols(btptrs, nptrs); > - fprintf(stderr, "Call trace:\n"); > - for (size_t i =3D 0; i < nptrs; i++) > - fprintf(stderr, " %s\n", bt[i]); > - free(bt); > ++ return (tid); > +} > - #else > - #define libspl_dump_backtrace() > +#endif > + > #if defined(__APPLE__) > static inline uint64_t > libspl_gettid(void) > diff --cc sys/contrib/openzfs/lib/libspl/backtrace.c > index 000000000000,d26d742106e2..d26d742106e2 > mode 000000,100644..100644 > --- a/sys/contrib/openzfs/lib/libspl/backtrace.c > +++ b/sys/contrib/openzfs/lib/libspl/backtrace.c > diff --cc sys/contrib/openzfs/lib/libspl/include/sys/backtrace.h > index 000000000000,f9869ffc9e1a..f9869ffc9e1a > mode 000000,100644..100644 > --- a/sys/contrib/openzfs/lib/libspl/include/sys/backtrace.h > +++ b/sys/contrib/openzfs/lib/libspl/include/sys/backtrace.h > diff --cc > sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_expor= t/zpool_export_parallel_admin.ksh > index 000000000000,cab8fc2b4239..cab8fc2b4239 > mode 000000,100755..100755 > --- > a/sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_exp= ort/zpool_export_parallel_admin.ksh > +++ > b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_exp= ort/zpool_export_parallel_admin.ksh > diff --cc > sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_expor= t/zpool_export_parallel_pos.ksh > index 000000000000,037d17d082bd..037d17d082bd > mode 000000,100755..100755 > --- > a/sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_exp= ort/zpool_export_parallel_pos.ksh > +++ > b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_exp= ort/zpool_export_parallel_pos.ksh > diff --cc sys/modules/zfs/zfs_config.h > index 4d6786e92d22,000000000000..d5e9cebfffc7 > mode 100644,000000..100644 > --- a/sys/modules/zfs/zfs_config.h > +++ b/sys/modules/zfs/zfs_config.h > @@@ -1,1227 -1,0 +1,1233 @@@ > +/* > + */ > + > +/* zfs_config.h. Generated from zfs_config.h.in by configure. */ > +/* zfs_config.h.in. Generated from configure.ac by autoheader. */ > + > +/* Define to 1 if translation of program messages to the user's native > + language is requested. */ > +/* #undef ENABLE_NLS */ > + > +/* bio_end_io_t wants 1 arg */ > +/* #undef HAVE_1ARG_BIO_END_IO_T */ > + > +/* lookup_bdev() wants 1 arg */ > +/* #undef HAVE_1ARG_LOOKUP_BDEV */ > + > +/* submit_bio() wants 1 arg */ > +/* #undef HAVE_1ARG_SUBMIT_BIO */ > + > +/* bdi_setup_and_register() wants 2 args */ > +/* #undef HAVE_2ARGS_BDI_SETUP_AND_REGISTER */ > + > +/* vfs_getattr wants 2 args */ > +/* #undef HAVE_2ARGS_VFS_GETATTR */ > + > +/* zlib_deflate_workspacesize() wants 2 args */ > +/* #undef HAVE_2ARGS_ZLIB_DEFLATE_WORKSPACESIZE */ > + > +/* bdi_setup_and_register() wants 3 args */ > +/* #undef HAVE_3ARGS_BDI_SETUP_AND_REGISTER */ > + > +/* vfs_getattr wants 3 args */ > +/* #undef HAVE_3ARGS_VFS_GETATTR */ > + > +/* vfs_getattr wants 4 args */ > +/* #undef HAVE_4ARGS_VFS_GETATTR */ > + > +/* kernel has access_ok with 'type' parameter */ > +/* #undef HAVE_ACCESS_OK_TYPE */ > + > +/* posix_acl has refcount_t */ > +/* #undef HAVE_ACL_REFCOUNT */ > + > +/* add_disk() returns int */ > +/* #undef HAVE_ADD_DISK_RET */ > + > +/* Define if host toolchain supports AES */ > +#define HAVE_AES 1 > + > +/* Define if you have [rt] */ > +#define HAVE_AIO_H 1 > + > +#ifdef __amd64__ > +#ifndef RESCUE > +/* Define if host toolchain supports AVX */ > +#define HAVE_AVX 1 > +#endif > + > +/* Define if host toolchain supports AVX2 */ > +#define HAVE_AVX2 1 > + > +/* Define if host toolchain supports AVX512BW */ > +#define HAVE_AVX512BW 1 > + > +/* Define if host toolchain supports AVX512CD */ > +#define HAVE_AVX512CD 1 > + > +/* Define if host toolchain supports AVX512DQ */ > +#define HAVE_AVX512DQ 1 > + > +/* Define if host toolchain supports AVX512ER */ > +#define HAVE_AVX512ER 1 > + > +/* Define if host toolchain supports AVX512F */ > +#define HAVE_AVX512F 1 > + > +/* Define if host toolchain supports AVX512IFMA */ > +#define HAVE_AVX512IFMA 1 > + > +/* Define if host toolchain supports AVX512PF */ > +#define HAVE_AVX512PF 1 > + > +/* Define if host toolchain supports AVX512VBMI */ > +#define HAVE_AVX512VBMI 1 > + > +/* Define if host toolchain supports AVX512VL */ > +#define HAVE_AVX512VL 1 > +#endif > + > ++/* backtrace() is available */ > ++/* #undef HAVE_BACKTRACE */ > ++ > +/* bdevname() is available */ > +/* #undef HAVE_BDEVNAME */ > + > +/* bdev_check_media_change() exists */ > +/* #undef HAVE_BDEV_CHECK_MEDIA_CHANGE */ > + > +/* bdev_file_open_by_path() exists */ > +/* #undef HAVE_BDEV_FILE_OPEN_BY_PATH */ > + > +/* bdev_*_io_acct() available */ > +/* #undef HAVE_BDEV_IO_ACCT_63 */ > + > +/* bdev_*_io_acct() available */ > +/* #undef HAVE_BDEV_IO_ACCT_OLD */ > + > +/* bdev_kobj() exists */ > +/* #undef HAVE_BDEV_KOBJ */ > + > +/* bdev_max_discard_sectors() is available */ > +/* #undef HAVE_BDEV_MAX_DISCARD_SECTORS */ > + > +/* bdev_max_secure_erase_sectors() is available */ > +/* #undef HAVE_BDEV_MAX_SECURE_ERASE_SECTORS */ > + > +/* bdev_open_by_path() exists */ > +/* #undef HAVE_BDEV_OPEN_BY_PATH */ > + > +/* bdev_release() exists */ > +/* #undef HAVE_BDEV_RELEASE */ > + > +/* block_device_operations->submit_bio() returns void */ > +/* #undef HAVE_BDEV_SUBMIT_BIO_RETURNS_VOID */ > + > +/* bdev_whole() is available */ > +/* #undef HAVE_BDEV_WHOLE */ > + > +/* bio_alloc() takes 4 arguments */ > +/* #undef HAVE_BIO_ALLOC_4ARG */ > + > +/* bio->bi_bdev->bd_disk exists */ > +/* #undef HAVE_BIO_BDEV_DISK */ > + > +/* bio->bi_opf is defined */ > +/* #undef HAVE_BIO_BI_OPF */ > + > +/* bio->bi_status exists */ > +/* #undef HAVE_BIO_BI_STATUS */ > + > +/* bio has bi_iter */ > +/* #undef HAVE_BIO_BVEC_ITER */ > + > +/* bio_*_io_acct() available */ > +/* #undef HAVE_BIO_IO_ACCT */ > + > +/* bio_max_segs() is implemented */ > +/* #undef HAVE_BIO_MAX_SEGS */ > + > +/* bio_set_dev() is available */ > +/* #undef HAVE_BIO_SET_DEV */ > + > +/* bio_set_dev() GPL-only */ > +/* #undef HAVE_BIO_SET_DEV_GPL_ONLY */ > + > +/* bio_set_dev() is a macro */ > +/* #undef HAVE_BIO_SET_DEV_MACRO */ > + > +/* bio_set_op_attrs is available */ > +/* #undef HAVE_BIO_SET_OP_ATTRS */ > + > +/* blkdev_get_by_path() exists and takes 4 args */ > +/* #undef HAVE_BLKDEV_GET_BY_PATH_4ARG */ > + > +/* blkdev_get_by_path() handles ERESTARTSYS */ > +/* #undef HAVE_BLKDEV_GET_ERESTARTSYS */ > + > +/* __blkdev_issue_discard(flags) is available */ > +/* #undef HAVE_BLKDEV_ISSUE_DISCARD_ASYNC_FLAGS */ > + > +/* __blkdev_issue_discard() is available */ > +/* #undef HAVE_BLKDEV_ISSUE_DISCARD_ASYNC_NOFLAGS */ > + > +/* blkdev_issue_discard(flags) is available */ > +/* #undef HAVE_BLKDEV_ISSUE_DISCARD_FLAGS */ > + > +/* blkdev_issue_discard() is available */ > +/* #undef HAVE_BLKDEV_ISSUE_DISCARD_NOFLAGS */ > + > +/* blkdev_issue_secure_erase() is available */ > +/* #undef HAVE_BLKDEV_ISSUE_SECURE_ERASE */ > + > +/* blkdev_put() exists */ > +/* #undef HAVE_BLKDEV_PUT */ > + > +/* blkdev_put() accepts void* as arg 2 */ > +/* #undef HAVE_BLKDEV_PUT_HOLDER */ > + > +/* blkdev_reread_part() exists */ > +/* #undef HAVE_BLKDEV_REREAD_PART */ > + > +/* blkg_tryget() is available */ > +/* #undef HAVE_BLKG_TRYGET */ > + > +/* blkg_tryget() GPL-only */ > +/* #undef HAVE_BLKG_TRYGET_GPL_ONLY */ > + > +/* blk_alloc_disk() exists */ > +/* #undef HAVE_BLK_ALLOC_DISK */ > + > +/* blk_alloc_disk() exists and takes 2 args */ > +/* #undef HAVE_BLK_ALLOC_DISK_2ARG */ > + > +/* blk_alloc_queue() expects request function */ > +/* #undef HAVE_BLK_ALLOC_QUEUE_REQUEST_FN */ > + > +/* blk_alloc_queue_rh() expects request function */ > +/* #undef HAVE_BLK_ALLOC_QUEUE_REQUEST_FN_RH */ > + > +/* blk_cleanup_disk() exists */ > +/* #undef HAVE_BLK_CLEANUP_DISK */ > + > +/* blk_mode_t is defined */ > +/* #undef HAVE_BLK_MODE_T */ > + > +/* block multiqueue is available */ > +/* #undef HAVE_BLK_MQ */ > + > +/* block multiqueue hardware context is cached in struct request */ > +/* #undef HAVE_BLK_MQ_RQ_HCTX */ > + > +/* blk queue backing_dev_info is dynamic */ > +/* #undef HAVE_BLK_QUEUE_BDI_DYNAMIC */ > + > +/* blk_queue_discard() is available */ > +/* #undef HAVE_BLK_QUEUE_DISCARD */ > + > +/* blk_queue_flag_clear() exists */ > +/* #undef HAVE_BLK_QUEUE_FLAG_CLEAR */ > + > +/* blk_queue_flag_set() exists */ > +/* #undef HAVE_BLK_QUEUE_FLAG_SET */ > + > +/* blk_queue_flush() is available */ > +/* #undef HAVE_BLK_QUEUE_FLUSH */ > + > +/* blk_queue_flush() is GPL-only */ > +/* #undef HAVE_BLK_QUEUE_FLUSH_GPL_ONLY */ > + > +/* blk_queue_secdiscard() is available */ > +/* #undef HAVE_BLK_QUEUE_SECDISCARD */ > + > +/* blk_queue_secure_erase() is available */ > +/* #undef HAVE_BLK_QUEUE_SECURE_ERASE */ > + > +/* blk_queue_update_readahead() exists */ > +/* #undef HAVE_BLK_QUEUE_UPDATE_READAHEAD */ > + > +/* blk_queue_write_cache() exists */ > +/* #undef HAVE_BLK_QUEUE_WRITE_CACHE */ > + > +/* blk_queue_write_cache() is GPL-only */ > +/* #undef HAVE_BLK_QUEUE_WRITE_CACHE_GPL_ONLY */ > + > +/* BLK_STS_RESV_CONFLICT is defined */ > +/* #undef HAVE_BLK_STS_RESV_CONFLICT */ > + > +/* Define if release() in block_device_operations takes 1 arg */ > +/* #undef HAVE_BLOCK_DEVICE_OPERATIONS_RELEASE_1ARG */ > + > +/* Define if revalidate_disk() in block_device_operations */ > +/* #undef HAVE_BLOCK_DEVICE_OPERATIONS_REVALIDATE_DISK */ > + > +/* Define to 1 if you have the Mac OS X function CFLocaleCopyCurrent in > the > + CoreFoundation framework. */ > +/* #undef HAVE_CFLOCALECOPYCURRENT */ > + > +/* Define to 1 if you have the Mac OS X function > + CFLocaleCopyPreferredLanguages in the CoreFoundation framework. */ > +/* #undef HAVE_CFLOCALECOPYPREFERREDLANGUAGES */ > + > +/* Define to 1 if you have the Mac OS X function > CFPreferencesCopyAppValue in > + the CoreFoundation framework. */ > +/* #undef HAVE_CFPREFERENCESCOPYAPPVALUE */ > + > +/* check_disk_change() exists */ > +/* #undef HAVE_CHECK_DISK_CHANGE */ > + > +/* clear_inode() is available */ > +/* #undef HAVE_CLEAR_INODE */ > + > +/* dentry uses const struct dentry_operations */ > +/* #undef HAVE_CONST_DENTRY_OPERATIONS */ > + > +/* copy_from_iter() is available */ > +/* #undef HAVE_COPY_FROM_ITER */ > + > +/* copy_splice_read exists */ > +/* #undef HAVE_COPY_SPLICE_READ */ > + > +/* copy_to_iter() is available */ > +/* #undef HAVE_COPY_TO_ITER */ > + > +/* cpu_has_feature() is GPL-only */ > +/* #undef HAVE_CPU_HAS_FEATURE_GPL_ONLY */ > + > +/* yes */ > +/* #undef HAVE_CPU_HOTPLUG */ > + > +/* current_time() exists */ > +/* #undef HAVE_CURRENT_TIME */ > + > +/* Define if the GNU dcgettext() function is already present or > preinstalled. > + */ > +/* #undef HAVE_DCGETTEXT */ > + > +/* DECLARE_EVENT_CLASS() is available */ > +/* #undef HAVE_DECLARE_EVENT_CLASS */ > + > +/* dentry aliases are in d_u member */ > +/* #undef HAVE_DENTRY_D_U_ALIASES */ > + > +/* dequeue_signal() takes 4 arguments */ > +/* #undef HAVE_DEQUEUE_SIGNAL_4ARG */ > + > +/* lookup_bdev() wants dev_t arg */ > +/* #undef HAVE_DEVT_LOOKUP_BDEV */ > + > +/* sops->dirty_inode() wants flags */ > +/* #undef HAVE_DIRTY_INODE_WITH_FLAGS */ > + > +/* disk_check_media_change() exists */ > +/* #undef HAVE_DISK_CHECK_MEDIA_CHANGE */ > + > +/* disk_*_io_acct() available */ > +/* #undef HAVE_DISK_IO_ACCT */ > + > +/* disk_update_readahead() exists */ > +/* #undef HAVE_DISK_UPDATE_READAHEAD */ > + > +/* Define to 1 if you have the header file. */ > +#define HAVE_DLFCN_H 1 > + > +/* d_make_root() is available */ > +/* #undef HAVE_D_MAKE_ROOT */ > + > +/* d_prune_aliases() is available */ > +/* #undef HAVE_D_PRUNE_ALIASES */ > + > +/* dops->d_revalidate() operation takes nameidata */ > +/* #undef HAVE_D_REVALIDATE_NAMEIDATA */ > + > +/* eops->encode_fh() wants child and parent inodes */ > +/* #undef HAVE_ENCODE_FH_WITH_INODE */ > + > +/* sops->evict_inode() exists */ > +/* #undef HAVE_EVICT_INODE */ > + > +/* Define to 1 if you have the 'execvpe' function. */ > +#define HAVE_EXECVPE 1 > + > +/* FALLOC_FL_ZERO_RANGE is defined */ > +/* #undef HAVE_FALLOC_FL_ZERO_RANGE */ > + > +/* fault_in_iov_iter_readable() is available */ > +/* #undef HAVE_FAULT_IN_IOV_ITER_READABLE */ > + > +/* filemap_range_has_page() is available */ > +/* #undef HAVE_FILEMAP_RANGE_HAS_PAGE */ > + > +/* fops->aio_fsync() exists */ > +/* #undef HAVE_FILE_AIO_FSYNC */ > + > +/* file_dentry() is available */ > +/* #undef HAVE_FILE_DENTRY */ > + > +/* fops->fadvise() exists */ > +/* #undef HAVE_FILE_FADVISE */ > + > +/* file_inode() is available */ > +/* #undef HAVE_FILE_INODE */ > + > +/* flush_dcache_page() is GPL-only */ > +/* #undef HAVE_FLUSH_DCACHE_PAGE_GPL_ONLY */ > + > +/* iops->follow_link() cookie */ > +/* #undef HAVE_FOLLOW_LINK_COOKIE */ > + > +/* iops->follow_link() nameidata */ > +/* #undef HAVE_FOLLOW_LINK_NAMEIDATA */ > + > +/* Define if compiler supports -Wformat-overflow */ > +/* #undef HAVE_FORMAT_OVERFLOW */ > + > +/* fsync_bdev() is declared in include/blkdev.h */ > +/* #undef HAVE_FSYNC_BDEV */ > + > +/* fops->fsync() with range */ > +/* #undef HAVE_FSYNC_RANGE */ > + > +/* fops->fsync() without dentry */ > +/* #undef HAVE_FSYNC_WITHOUT_DENTRY */ > + > +/* yes */ > +/* #undef HAVE_GENERIC_FADVISE */ > + > +/* generic_fillattr requires struct mnt_idmap* */ > +/* #undef HAVE_GENERIC_FILLATTR_IDMAP */ > + > +/* generic_fillattr requires struct mnt_idmap* and u32 request_mask */ > +/* #undef HAVE_GENERIC_FILLATTR_IDMAP_REQMASK */ > + > +/* generic_fillattr requires struct user_namespace* */ > +/* #undef HAVE_GENERIC_FILLATTR_USERNS */ > + > +/* generic_*_io_acct() 3 arg available */ > +/* #undef HAVE_GENERIC_IO_ACCT_3ARG */ > + > +/* generic_*_io_acct() 4 arg available */ > +/* #undef HAVE_GENERIC_IO_ACCT_4ARG */ > + > +/* generic_readlink is global */ > +/* #undef HAVE_GENERIC_READLINK */ > + > +/* generic_setxattr() exists */ > +/* #undef HAVE_GENERIC_SETXATTR */ > + > +/* generic_write_checks() takes kiocb */ > +/* #undef HAVE_GENERIC_WRITE_CHECKS_KIOCB */ > + > +/* Define if the GNU gettext() function is already present or > preinstalled. */ > +/* #undef HAVE_GETTEXT */ > + > +/* Define to 1 if you have the 'gettid' function. */ > +/* #undef HAVE_GETTID */ > + > +/* iops->get_acl() exists */ > +/* #undef HAVE_GET_ACL */ > + > +/* iops->get_acl() takes rcu */ > +/* #undef HAVE_GET_ACL_RCU */ > + > +/* has iops->get_inode_acl() */ > +/* #undef HAVE_GET_INODE_ACL */ > + > +/* iops->get_link() cookie */ > +/* #undef HAVE_GET_LINK_COOKIE */ > + > +/* iops->get_link() delayed */ > +/* #undef HAVE_GET_LINK_DELAYED */ > + > +/* group_info->gid exists */ > +/* #undef HAVE_GROUP_INFO_GID */ > + > +/* has_capability() is available */ > +/* #undef HAVE_HAS_CAPABILITY */ > + > +/* iattr->ia_vfsuid and iattr->ia_vfsgid exist */ > +/* #undef HAVE_IATTR_VFSID */ > + > +/* Define if you have the iconv() function and it works. */ > +#define HAVE_ICONV 1 > + > +/* iops->getattr() takes struct mnt_idmap* */ > +/* #undef HAVE_IDMAP_IOPS_GETATTR */ > + > +/* iops->setattr() takes struct mnt_idmap* */ > +/* #undef HAVE_IDMAP_IOPS_SETATTR */ > + > +/* APIs for idmapped mount are present */ > +/* #undef HAVE_IDMAP_MNT_API */ > + > +/* mnt_idmap does not have user_namespace */ > +/* #undef HAVE_IDMAP_NO_USERNS */ > + > +/* Define if compiler supports -Wimplicit-fallthrough */ > +/* #undef HAVE_IMPLICIT_FALLTHROUGH */ > + > +/* Define if compiler supports -Winfinite-recursion */ > +/* #undef HAVE_INFINITE_RECURSION */ > + > +/* inode_get_atime() exists in linux/fs.h */ > +/* #undef HAVE_INODE_GET_ATIME */ > + > +/* inode_get_ctime() exists in linux/fs.h */ > +/* #undef HAVE_INODE_GET_CTIME */ > + > +/* inode_get_mtime() exists in linux/fs.h */ > +/* #undef HAVE_INODE_GET_MTIME */ > + > +/* yes */ > +/* #undef HAVE_INODE_LOCK_SHARED */ > + > +/* inode_owner_or_capable() exists */ > +/* #undef HAVE_INODE_OWNER_OR_CAPABLE */ > + > +/* inode_owner_or_capable() takes mnt_idmap */ > +/* #undef HAVE_INODE_OWNER_OR_CAPABLE_IDMAP */ > + > +/* inode_owner_or_capable() takes user_ns */ > +/* #undef HAVE_INODE_OWNER_OR_CAPABLE_USERNS */ > + > +/* inode_set_atime_to_ts() exists in linux/fs.h */ > +/* #undef HAVE_INODE_SET_ATIME_TO_TS */ > + > +/* inode_set_ctime_to_ts() exists in linux/fs.h */ > +/* #undef HAVE_INODE_SET_CTIME_TO_TS */ > + > +/* inode_set_flags() exists */ > +/* #undef HAVE_INODE_SET_FLAGS */ > + > +/* inode_set_iversion() exists */ > +/* #undef HAVE_INODE_SET_IVERSION */ > + > +/* inode_set_mtime_to_ts() exists in linux/fs.h */ > +/* #undef HAVE_INODE_SET_MTIME_TO_TS */ > + > +/* inode->i_*time's are timespec64 */ > +/* #undef HAVE_INODE_TIMESPEC64_TIMES */ > + > +/* timestamp_truncate() exists */ > +/* #undef HAVE_INODE_TIMESTAMP_TRUNCATE */ > + > +/* Define to 1 if you have the header file. */ > +#define HAVE_INTTYPES_H 1 > + > +/* in_compat_syscall() is available */ > +/* #undef HAVE_IN_COMPAT_SYSCALL */ > + > +/* iops->create() takes struct mnt_idmap* */ > +/* #undef HAVE_IOPS_CREATE_IDMAP */ > + > +/* iops->create() takes struct user_namespace* */ > +/* #undef HAVE_IOPS_CREATE_USERNS */ > + > +/* iops->mkdir() takes struct mnt_idmap* */ > +/* #undef HAVE_IOPS_MKDIR_IDMAP */ > + > +/* iops->mkdir() takes struct user_namespace* */ > +/* #undef HAVE_IOPS_MKDIR_USERNS */ > + > +/* iops->mknod() takes struct mnt_idmap* */ > +/* #undef HAVE_IOPS_MKNOD_IDMAP */ > + > +/* iops->mknod() takes struct user_namespace* */ > +/* #undef HAVE_IOPS_MKNOD_USERNS */ > + > +/* iops->permission() takes struct mnt_idmap* */ > +/* #undef HAVE_IOPS_PERMISSION_IDMAP */ > + > +/* iops->permission() takes struct user_namespace* */ > +/* #undef HAVE_IOPS_PERMISSION_USERNS */ > + > +/* iops->rename() takes struct mnt_idmap* */ > +/* #undef HAVE_IOPS_RENAME_IDMAP */ > + > +/* iops->rename() takes struct user_namespace* */ > +/* #undef HAVE_IOPS_RENAME_USERNS */ > + > +/* iops->setattr() exists */ > +/* #undef HAVE_IOPS_SETATTR */ > + > +/* iops->symlink() takes struct mnt_idmap* */ > +/* #undef HAVE_IOPS_SYMLINK_IDMAP */ > + > +/* iops->symlink() takes struct user_namespace* */ > +/* #undef HAVE_IOPS_SYMLINK_USERNS */ > + > +/* iov_iter_advance() is available */ > +/* #undef HAVE_IOV_ITER_ADVANCE */ > + > +/* iov_iter_count() is available */ > +/* #undef HAVE_IOV_ITER_COUNT */ > + > +/* iov_iter_fault_in_readable() is available */ > +/* #undef HAVE_IOV_ITER_FAULT_IN_READABLE */ > + > +/* iov_iter_revert() is available */ > +/* #undef HAVE_IOV_ITER_REVERT */ > + > +/* iov_iter_type() is available */ > +/* #undef HAVE_IOV_ITER_TYPE */ > + > +/* iov_iter types are available */ > +/* #undef HAVE_IOV_ITER_TYPES */ > + > +/* yes */ > +/* #undef HAVE_IO_SCHEDULE_TIMEOUT */ > + > +/* Define to 1 if you have the 'issetugid' function. */ > +#define HAVE_ISSETUGID 1 > + > +/* iter_iov() is available */ > +/* #undef HAVE_ITER_IOV */ > + > +/* kernel has kernel_fpu_* functions */ > +/* #undef HAVE_KERNEL_FPU */ > + > +/* kernel has asm/fpu/api.h */ > +/* #undef HAVE_KERNEL_FPU_API_HEADER */ > + > +/* kernel fpu internal */ > +/* #undef HAVE_KERNEL_FPU_INTERNAL */ > + > +/* kernel has asm/fpu/internal.h */ > +/* #undef HAVE_KERNEL_FPU_INTERNAL_HEADER */ > + > +/* uncached_acl_sentinel() exists */ > +/* #undef HAVE_KERNEL_GET_ACL_HANDLE_CACHE */ > + > +/* Define if compiler supports -Winfinite-recursion */ > +/* #undef HAVE_KERNEL_INFINITE_RECURSION */ > + > ++/* kernel defines intptr_t */ > ++/* #undef HAVE_KERNEL_INTPTR_T */ > ++ > +/* kernel has kernel_neon_* functions */ > +/* #undef HAVE_KERNEL_NEON */ > + > +/* kernel does stack verification */ > +/* #undef HAVE_KERNEL_OBJTOOL */ > + > +/* kernel has linux/objtool.h */ > +/* #undef HAVE_KERNEL_OBJTOOL_HEADER */ > + > +/* kernel_read() take loff_t pointer */ > +/* #undef HAVE_KERNEL_READ_PPOS */ > + > +/* strlcpy() exists */ > +/* #undef HAVE_KERNEL_STRLCPY */ > + > +/* strscpy() exists */ > +/* #undef HAVE_KERNEL_STRSCPY */ > + > +/* timer_list.function gets a timer_list */ > +/* #undef HAVE_KERNEL_TIMER_FUNCTION_TIMER_LIST */ > + > +/* struct timer_list has a flags member */ > +/* #undef HAVE_KERNEL_TIMER_LIST_FLAGS */ > + > +/* timer_setup() is available */ > +/* #undef HAVE_KERNEL_TIMER_SETUP */ > + > +/* kernel_write() take loff_t pointer */ > +/* #undef HAVE_KERNEL_WRITE_PPOS */ > + > +/* kmem_cache_create_usercopy() exists */ > +/* #undef HAVE_KMEM_CACHE_CREATE_USERCOPY */ > + > +/* kstrtoul() exists */ > +/* #undef HAVE_KSTRTOUL */ > + > +/* ktime_get_coarse_real_ts64() exists */ > +/* #undef HAVE_KTIME_GET_COARSE_REAL_TS64 */ > + > +/* ktime_get_raw_ts64() exists */ > +/* #undef HAVE_KTIME_GET_RAW_TS64 */ > + > +/* kvmalloc exists */ > +/* #undef HAVE_KVMALLOC */ > + > +/* Define if you have [aio] */ > +/* #undef HAVE_LIBAIO */ > + > +/* Define if you have [blkid] */ > +/* #undef HAVE_LIBBLKID */ > + > +/* Define if you have [crypto] */ > +#define HAVE_LIBCRYPTO 1 > + > +/* Define if you have [tirpc] */ > +/* #undef HAVE_LIBTIRPC */ > + > +/* Define if you have [udev] */ > +/* #undef HAVE_LIBUDEV */ > + > +/* Define if you have [unwind] */ > +/* #undef HAVE_LIBUNWIND */ > + > +/* libunwind has unw_get_elf_filename */ > +/* #undef HAVE_LIBUNWIND_ELF */ > + > +/* Define if you have [uuid] */ > +/* #undef HAVE_LIBUUID */ > + > +/* linux/blk-cgroup.h exists */ > +/* #undef HAVE_LINUX_BLK_CGROUP_HEADER */ > + > +/* lseek_execute() is available */ > +/* #undef HAVE_LSEEK_EXECUTE */ > + > +/* makedev() is declared in sys/mkdev.h */ > +/* #undef HAVE_MAKEDEV_IN_MKDEV */ > + > +/* makedev() is declared in sys/sysmacros.h */ > +/* #undef HAVE_MAKEDEV_IN_SYSMACROS */ > + > +/* Noting that make_request_fn() returns blk_qc_t */ > +/* #undef HAVE_MAKE_REQUEST_FN_RET_QC */ > + > +/* Noting that make_request_fn() returns void */ > *** 552 LINES SKIPPED *** > --0000000000006990d20619c5a9d5 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
This seems to break macos bootstrap:

% = ./tools/build/make.py TARGET=3Darm64 TARGET_ARCH=3Daarch64 -DNOCLEAN buildw= orld -j 20
...
--- assert.o ---
/Users/imp/git/h= ead/sys/contrib/openzfs/lib/libspl/assert.c:70:1: error: redefinition of &#= 39;libspl_gettid'
libspl_gettid(void)
^
/Users/imp/git/head/sy= s/contrib/openzfs/lib/libspl/assert.c:57:1: note: previous definition is he= re
libspl_gettid(void)
^
1 error generated.
*** [assert.o] Erro= r code 1

bmake[3]: stopped in /Users/imp/git/head/cddl/lib/libsplbmake[3]: 1 error

Looks like two identical co= pies of
#if defined(__APPLE__)
static inline uint64_t
libsp= l_gettid(void)
{
uint64_t tid;

if (pthread_threadid_np(NULL,= &tid) !=3D 0)
tid =3D 0;

return (tid);
}
#endif
=
which normally aren't compiled on !macos. Removing one f= ixes the issue. Should I just commit because this is a mismerge, or should = I let you take care of it with upstream?

Warner

On Fri, May 31, 2024 at 9:01=E2=80=AFAM Martin Matuska <mm@freebsd.org> wrote:
The branch main has been updated by mm:<= br>
URL: https://cgit.= FreeBSD.org/src/commit/?id=3Daca928a50a42f00f344df934005b09dbcb4e2f77
commit aca928a50a42f00f344df934005b09dbcb4e2f77
Merge: d28bbfa2715a e2357561b949
Author:=C2=A0 =C2=A0 =C2=A0Martin Matuska <mm@FreeBSD.org>
AuthorDate: 2024-05-31 07:31:58 +0000
Commit:=C2=A0 =C2=A0 =C2=A0Martin Matuska <mm@FreeBSD.org>
CommitDate: 2024-05-31 09:26:50 +0000

=C2=A0 =C2=A0 zfs: merge openzfs/zfs@e2357561b

=C2=A0 =C2=A0 Notable upstream pull request merges:
=C2=A0 =C2=A0 =C2=A0#15940 41ae864b6 Replace P2ALIGN with P2ALIGN_TYPED and= delete P2ALIGN
=C2=A0 =C2=A0 =C2=A0#16128 5137c132a zpool import output is not formated pr= operly
=C2=A0 =C2=A0 =C2=A0#16138 efbef9e6c FreeBSD: Add zfs_link_create() error h= andling
=C2=A0 =C2=A0 =C2=A0#16146 04bae5ec9 Disable high priority ZIO threads on F= reeBSD and Linux
=C2=A0 =C2=A0 =C2=A0#16151 cc3869153 zfs_ioc_send: use a dedicated taskq th= read for send
=C2=A0 =C2=A0 =C2=A0#16151 adda768e3 spa: remove spa_taskq_dispatch_sync()<= br> =C2=A0 =C2=A0 =C2=A0#16151 515c4dd21 spa: flatten spa_taskq_dispatch_ent()<= br> =C2=A0 =C2=A0 =C2=A0#16151 0a543db37 spa_taskq_dispatch_ent: simplify argum= ents
=C2=A0 =C2=A0 =C2=A0#16153 975a13259 Add support for parallel pool exports<= br> =C2=A0 =C2=A0 =C2=A0#16153 89acef992 Simplified the scope of the namespace = lock
=C2=A0 =C2=A0 =C2=A0#16159 136c05321 ZAP: Fix leaf references on zap_expand= _leaf() errors
=C2=A0 =C2=A0 =C2=A0#16162 af5dbed31 Fix scn_queue races on very old pools<= br> =C2=A0 =C2=A0 =C2=A0#16165 3400127a7 Fix ZIL clone records for legacy holes=
=C2=A0 =C2=A0 =C2=A0#16167 414acbd37 Unbreak FreeBSD cross-build on MacOS b= roken in 051460b8b
=C2=A0 =C2=A0 =C2=A0#16172 eced2e2f1 libzfs: Fix mounting datasets under th= read limit pressure
=C2=A0 =C2=A0 =C2=A0#16178 b64afa41d Better control the thread pool size wh= en mounting datasets
=C2=A0 =C2=A0 =C2=A0#16181 fa99d9cd9 zfs_dbgmsg_print: make FreeBSD and Lin= ux consistent
=C2=A0 =C2=A0 =C2=A0#16191 e675852bc dbuf: separate refcount calls for dbuf= and dbuf_user
=C2=A0 =C2=A0 =C2=A0#16198 a043b60f1 Correct level handling in zstream reco= mpress
=C2=A0 =C2=A0 =C2=A0#16204 34906f8bb zap: reuse zap_leaf_t on dbuf reuse af= ter shrink
=C2=A0 =C2=A0 =C2=A0#16206 d0aa9dbcc Use memset to zero stack allocations c= ontaining unions
=C2=A0 =C2=A0 =C2=A0#16207 8865dfbca Fix assertion in Persistent L2ARC
=C2=A0 =C2=A0 =C2=A0#16208 08648cf0d Allow block cloning to be interrupted = by a signal
=C2=A0 =C2=A0 =C2=A0#16210 e2357561b FreeBSD: Add const qualifier to member= s of struct
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 opensolaris_utsname
=C2=A0 =C2=A0 =C2=A0#16214 800d59d57 Some improvements to metaslabs evictio= n
=C2=A0 =C2=A0 =C2=A0#16216 02c5aa9b0 Destroy ARC buffer in case of fill err= or
=C2=A0 =C2=A0 =C2=A0#16225 01c8efdd5 Simplify issig()

=C2=A0 =C2=A0 Obtained from:=C2=A0 OpenZFS
=C2=A0 =C2=A0 OpenZFS commit: e2357561b9499296bff758afe4868dbc39735675

=C2=A0cddl/lib/libspl/Makefile=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0|=C2=A0 =C2=A01 +
=C2=A0sys/contrib/openzfs/cmd/zdb/zdb.c=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0 =C2=A0 =C2=A0 | 132 ++++++--
=C2=A0sys/contrib/openzfs/cmd/zed/agents/zfs_mod.c=C2=A0 =C2=A0 =C2=A0 =C2= =A0|=C2=A0 =C2=A02 +-
=C2=A0sys/contrib/openzfs/cmd/zed/zed.d/Makefile.am=C2=A0 =C2=A0 =C2=A0 |= =C2=A0 =C2=A02 +
=C2=A0.../openzfs/cmd/zed/zed.d/deadman-slot_off.sh=C2=A0 =C2=A0 =C2=A0 |= =C2=A0 71 ++++
=C2=A0sys/contrib/openzfs/cmd/zed/zed.d/zed.rc=C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0|=C2=A0 =C2=A07 +
=C2=A0sys/contrib/openzfs/cmd/zfs/zfs_main.c=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0|=C2=A0 =C2=A06 +-
=C2=A0sys/contrib/openzfs/cmd/zpool/zpool_main.c=C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0| 377 +++++++++++++--------
=C2=A0.../openzfs/cmd/zstream/zstream_recompress.c=C2=A0 =C2=A0 =C2=A0 =C2= =A0|=C2=A0 =C2=A02 +-
=C2=A0sys/contrib/openzfs/cmd/zstream/zstream_redup.c=C2=A0 =C2=A0 |=C2=A0 = =C2=A04 +-
=C2=A0sys/contrib/openzfs/cmd/ztest.c=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 |=C2=A0 32 +-
=C2=A0sys/contrib/openzfs/config/kernel-types.m4=C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0|=C2=A0 40 +++
=C2=A0sys/contrib/openzfs/config/kernel.m4=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0|=C2=A0 =C2=A02 +
=C2=A0sys/contrib/openzfs/config/zfs-build.m4=C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0 |=C2=A0 92 ++---
=C2=A0sys/contrib/openzfs/include/libzfs.h=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0|=C2=A0 =C2=A05 +-
=C2=A0.../openzfs/include/os/freebsd/spl/sys/ccompile.h=C2=A0 |=C2=A0 =C2= =A03 +-
=C2=A0.../openzfs/include/os/freebsd/spl/sys/misc.h=C2=A0 =C2=A0 =C2=A0 |= =C2=A0 10 +-
=C2=A0.../openzfs/include/os/freebsd/spl/sys/sig.h=C2=A0 =C2=A0 =C2=A0 =C2= =A0|=C2=A0 =C2=A08 +-
=C2=A0.../openzfs/include/os/freebsd/spl/sys/sysmacros.h |=C2=A0 =C2=A03 +-=
=C2=A0.../openzfs/include/os/linux/spl/sys/signal.h=C2=A0 =C2=A0 =C2=A0 |= =C2=A0 =C2=A05 +-
=C2=A0.../openzfs/include/os/linux/spl/sys/sysmacros.h=C2=A0 =C2=A0|=C2=A0 = =C2=A03 +-
=C2=A0.../openzfs/include/os/linux/spl/sys/types.h=C2=A0 =C2=A0 =C2=A0 =C2= =A0|=C2=A0 =C2=A02 +
=C2=A0sys/contrib/openzfs/include/sys/spa_impl.h=C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0|=C2=A0 =C2=A07 +-
=C2=A0sys/contrib/openzfs/include/sys/zfs_context.h=C2=A0 =C2=A0 =C2=A0 |= =C2=A0 =C2=A03 +-
=C2=A0sys/contrib/openzfs/include/sys/zfs_debug.h=C2=A0 =C2=A0 =C2=A0 =C2= =A0 |=C2=A0 =C2=A02 +-
=C2=A0sys/contrib/openzfs/lib/libefi/rdwr_efi.c=C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 |=C2=A0 =C2=A04 +-
=C2=A0sys/contrib/openzfs/lib/libnvpair/libnvpair.abi=C2=A0 =C2=A0 | 111 ++= +++-
=C2=A0sys/contrib/openzfs/lib/libspl/Makefile.am=C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0|=C2=A0 =C2=A07 +-
=C2=A0sys/contrib/openzfs/lib/libspl/assert.c=C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0 |=C2=A0 53 +--
=C2=A0sys/contrib/openzfs/lib/libspl/backtrace.c=C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0| 119 +++++++
=C2=A0sys/contrib/openzfs/lib/libspl/include/Makefile.am |=C2=A0 =C2=A01 +<= br> =C2=A0.../lib/libspl/include/os/linux/sys/sysmacros.h=C2=A0 =C2=A0 |=C2=A0 = =C2=A03 +-
=C2=A0.../openzfs/lib/libspl/include/sys/backtrace.h=C2=A0 =C2=A0 =C2=A0|= =C2=A0 32 ++
=C2=A0sys/contrib/openzfs/lib/libtpool/thread_pool.c=C2=A0 =C2=A0 =C2=A0|= =C2=A0 28 +-
=C2=A0sys/contrib/openzfs/lib/libuutil/libuutil.abi=C2=A0 =C2=A0 =C2=A0 |= =C2=A0 85 ++++-
=C2=A0sys/contrib/openzfs/lib/libzfs/libzfs.abi=C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 |=C2=A0 44 ++-
=C2=A0sys/contrib/openzfs/lib/libzfs/libzfs_mount.c=C2=A0 =C2=A0 =C2=A0 |= =C2=A0 30 +-
=C2=A0sys/contrib/openzfs/lib/libzfs/libzfs_sendrecv.c=C2=A0 =C2=A0|=C2=A0 = =C2=A06 +-
=C2=A0.../openzfs/lib/libzfs/os/linux/libzfs_pool_os.c=C2=A0 =C2=A0|=C2=A0 = =C2=A03 +-
=C2=A0.../openzfs/lib/libzfs_core/libzfs_core.abi=C2=A0 =C2=A0 =C2=A0 =C2= =A0 |=C2=A0 89 ++++-
=C2=A0sys/contrib/openzfs/man/man4/zfs.4=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0 =C2=A0 =C2=A0|=C2=A0 23 +-
=C2=A0sys/contrib/openzfs/module/icp/io/aes.c=C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0 |=C2=A0 =C2=A08 +-
=C2=A0.../openzfs/module/os/freebsd/spl/spl_misc.c=C2=A0 =C2=A0 =C2=A0 =C2= =A0|=C2=A0 =C2=A07 +-
=C2=A0.../openzfs/module/os/freebsd/zfs/vdev_geom.c=C2=A0 =C2=A0 =C2=A0 |= =C2=A0 =C2=A02 +-
=C2=A0.../openzfs/module/os/freebsd/zfs/zfs_debug.c=C2=A0 =C2=A0 =C2=A0 |= =C2=A0 25 +-
=C2=A0.../openzfs/module/os/freebsd/zfs/zfs_dir.c=C2=A0 =C2=A0 =C2=A0 =C2= =A0 |=C2=A0 =C2=A01 +
=C2=A0.../openzfs/module/os/freebsd/zfs/zfs_vnops_os.c=C2=A0 =C2=A0|=C2=A0 = 54 ++-
=C2=A0.../openzfs/module/os/freebsd/zfs/zfs_znode.c=C2=A0 =C2=A0 =C2=A0 |= =C2=A0 =C2=A01 -
=C2=A0.../openzfs/module/os/linux/spl/spl-procfs-list.c=C2=A0 |=C2=A0 =C2= =A02 +-
=C2=A0.../openzfs/module/os/linux/spl/spl-taskq.c=C2=A0 =C2=A0 =C2=A0 =C2= =A0 |=C2=A0 =C2=A02 +-
=C2=A0.../openzfs/module/os/linux/spl/spl-thread.c=C2=A0 =C2=A0 =C2=A0 =C2= =A0|=C2=A0 16 +-
=C2=A0.../openzfs/module/os/linux/zfs/vdev_disk.c=C2=A0 =C2=A0 =C2=A0 =C2= =A0 |=C2=A0 =C2=A02 +-
=C2=A0.../openzfs/module/os/linux/zfs/zfs_debug.c=C2=A0 =C2=A0 =C2=A0 =C2= =A0 |=C2=A0 22 +-
=C2=A0sys/contrib/openzfs/module/os/linux/zfs/zvol_os.c=C2=A0 |=C2=A0 =C2= =A05 +-
=C2=A0sys/contrib/openzfs/module/zcommon/zfs_fletcher.c=C2=A0 |=C2=A0 =C2= =A08 +-
=C2=A0sys/contrib/openzfs/module/zfs/arc.c=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0|=C2=A0 =C2=A06 +-
=C2=A0sys/contrib/openzfs/module/zfs/btree.c=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0|=C2=A0 =C2=A02 +-
=C2=A0sys/contrib/openzfs/module/zfs/dbuf.c=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 |=C2=A0 35 +-
=C2=A0sys/contrib/openzfs/module/zfs/dmu.c=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0|=C2=A0 =C2=A05 +-
=C2=A0sys/contrib/openzfs/module/zfs/dmu_diff.c=C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 |=C2=A0 =C2=A02 +-
=C2=A0sys/contrib/openzfs/module/zfs/dmu_object.c=C2=A0 =C2=A0 =C2=A0 =C2= =A0 |=C2=A0 =C2=A02 +-
=C2=A0sys/contrib/openzfs/module/zfs/dmu_objset.c=C2=A0 =C2=A0 =C2=A0 =C2= =A0 |=C2=A0 =C2=A02 +-
=C2=A0sys/contrib/openzfs/module/zfs/dmu_recv.c=C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 |=C2=A0 =C2=A02 +-
=C2=A0sys/contrib/openzfs/module/zfs/dmu_redact.c=C2=A0 =C2=A0 =C2=A0 =C2= =A0 |=C2=A0 =C2=A02 +-
=C2=A0sys/contrib/openzfs/module/zfs/dmu_send.c=C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 |=C2=A0 =C2=A02 +-
=C2=A0sys/contrib/openzfs/module/zfs/metaslab.c=C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 |=C2=A0 11 +-
=C2=A0sys/contrib/openzfs/module/zfs/spa.c=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0| 100 ++++--
=C2=A0sys/contrib/openzfs/module/zfs/spa_misc.c=C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 |=C2=A0 33 +-
=C2=A0sys/contrib/openzfs/module/zfs/vdev.c=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 |=C2=A0 21 +-
=C2=A0sys/contrib/openzfs/module/zfs/vdev_initialize.c=C2=A0 =C2=A0|=C2=A0 = =C2=A09 +-
=C2=A0sys/contrib/openzfs/module/zfs/vdev_raidz.c=C2=A0 =C2=A0 =C2=A0 =C2= =A0 |=C2=A0 =C2=A03 +-
=C2=A0sys/contrib/openzfs/module/zfs/vdev_rebuild.c=C2=A0 =C2=A0 =C2=A0 |= =C2=A0 =C2=A03 +-
=C2=A0sys/contrib/openzfs/module/zfs/vdev_trim.c=C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0|=C2=A0 =C2=A09 +-
=C2=A0sys/contrib/openzfs/module/zfs/zap.c=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0|=C2=A0 61 ++--
=C2=A0sys/contrib/openzfs/module/zfs/zcp.c=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0|=C2=A0 =C2=A03 +-
=C2=A0sys/contrib/openzfs/module/zfs/zfs_ioctl.c=C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0| 105 ++++--
=C2=A0sys/contrib/openzfs/module/zfs/zfs_log.c=C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0|=C2=A0 =C2=A08 +-
=C2=A0sys/contrib/openzfs/module/zfs/zfs_vnops.c=C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0|=C2=A0 =C2=A05 +
=C2=A0sys/contrib/openzfs/module/zfs/zio.c=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0|=C2=A0 27 +-
=C2=A0sys/contrib/openzfs/tests/runfiles/common.run=C2=A0 =C2=A0 =C2=A0 |= =C2=A0 =C2=A03 +-
=C2=A0.../openzfs/tests/test-runner/bin/zts-report.py.in |=C2=A0 =C2=A01 = -
=C2=A0.../tests/zfs-tests/cmd/libzfs_input_check.c=C2=A0 =C2=A0 =C2=A0 =C2= =A0|=C2=A0 =C2=A04 +-
=C2=A0.../openzfs/tests/zfs-tests/include/tunables.cfg=C2=A0 =C2=A0|=C2=A0 = =C2=A01 +
=C2=A0.../openzfs/tests/zfs-tests/tests/Makefile.am=C2=A0 =C2=A0 =C2=A0 |= =C2=A0 =C2=A02 +
=C2=A0.../zpool_export/zpool_export_parallel_admin.ksh=C2=A0 =C2=A0|=C2=A0 = 72 ++++
=C2=A0.../zpool_export/zpool_export_parallel_pos.ksh=C2=A0 =C2=A0 =C2=A0| 1= 29 +++++++
=C2=A0.../tests/functional/deadman/deadman_ratelimit.ksh |=C2=A0 =C2=A08 +-=
=C2=A0sys/modules/zfs/zfs_config.h=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0|=C2=A0 10 +-
=C2=A0sys/modules/zfs/zfs_gitrev.h=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0|=C2=A0 =C2=A02 +-
=C2=A089 files changed, 1694 insertions(+), 610 deletions(-)

diff --cc cddl/lib/libspl/Makefile
index e432b313d9d0,000000000000..6c43e1750c3c
mode 100644,000000..100644
--- a/cddl/lib/libspl/Makefile
+++ b/cddl/lib/libspl/Makefile
@@@ -1,49 -1,0 +1,50 @@@
=C2=A0+
=C2=A0+.include <bsd.init.mk>
=C2=A0+.include <bsd.compiler.mk>
=C2=A0+
=C2=A0+.PATH: ${SRCTOP}/sys/contrib/openzfs/lib/libspl
=C2=A0+.PATH: ${SRCTOP}/sys/contrib/openzfs/include
=C2=A0+
=C2=A0+LIB=3D=C2=A0 spl
=C2=A0+LIBADD=3D
=C2=A0+PACKAGE=3D=C2=A0 =C2=A0 =C2=A0 zfs
=C2=A0+
=C2=A0+SRCS =3D \
=C2=A0+=C2=A0 =C2=A0 =C2=A0 =C2=A0 assert.c \
++=C2=A0 =C2=A0 =C2=A0 backtrace.c \
=C2=A0+=C2=A0 =C2=A0 =C2=A0 =C2=A0 list.c \
=C2=A0+=C2=A0 =C2=A0 =C2=A0 =C2=A0 mkdirp.c \
=C2=A0+=C2=A0 =C2=A0 =C2=A0 =C2=A0 os/freebsd/zone.c \
=C2=A0+=C2=A0 =C2=A0 =C2=A0 =C2=A0 page.c \
=C2=A0+=C2=A0 =C2=A0 =C2=A0 =C2=A0 timestamp.c \
=C2=A0+=C2=A0 =C2=A0 =C2=A0 =C2=A0 include/sys/list.h \
=C2=A0+=C2=A0 =C2=A0 =C2=A0 =C2=A0 include/sys/list_impl.h
=C2=A0+
=C2=A0+# These functions are not required when bootstrapping and the atomic= code
=C2=A0+# will not compile when building on macOS.
=C2=A0+.if !defined(BOOTSTRAPPING)
=C2=A0+SRCS +=3D \
=C2=A0+=C2=A0 =C2=A0 =C2=A0 =C2=A0 atomic.c \
=C2=A0+=C2=A0 =C2=A0 =C2=A0 =C2=A0 getexecname.c \
=C2=A0+=C2=A0 =C2=A0 =C2=A0 =C2=A0 os/freebsd/getexecname.c \
=C2=A0+=C2=A0 =C2=A0 =C2=A0 =C2=A0 os/freebsd/gethostid.c \
=C2=A0+=C2=A0 =C2=A0 =C2=A0 =C2=A0 os/freebsd/getmntany.c \
=C2=A0+=C2=A0 =C2=A0 =C2=A0 =C2=A0 os/freebsd/mnttab.c
=C2=A0+.endif
=C2=A0+
=C2=A0+WARNS?=3D=C2=A0 =C2=A0 =C2=A0 =C2=A02
=C2=A0+CSTD=3D c99
=C2=A0+CFLAGS+=3D -DIN_BASE
=C2=A0+CFLAGS+=3D -I${SRCTOP}/sys/contrib/openzfs/include
=C2=A0+CFLAGS+=3D -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/
=C2=A0+CFLAGS+=3D -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/os/fre= ebsd
=C2=A0+CFLAGS+=3D -I${SRCTOP}/cddl/compat/opensolaris/include
=C2=A0+CFLAGS+=3D -I${SRCTOP}/sys/contrib/openzfs/module/icp/include
=C2=A0+CFLAGS+=3D -include ${SRCTOP}/sys/contrib/openzfs/include/os/freebsd= /spl/sys/ccompile.h
=C2=A0+CFLAGS+=3D -DHAVE_ISSETUGID
=C2=A0+CFLAGS+=3D -include ${SRCTOP}/sys/modules/zfs/zfs_config.h
=C2=A0+.if ${COMPILER_TYPE} =3D=3D "clang"
=C2=A0+CFLAGS.atomic.c+=3D=C2=A0 =C2=A0 =C2=A0-Wno-error=3Datomic-alignment=
=C2=A0+.endif
=C2=A0+
=C2=A0+.include <bsd.lib.mk>
diff --cc sys/contrib/openzfs/cmd/zed/zed.d/deadman-slot_off.sh
index 000000000000,7b339b3add01..7b339b3add01
mode 000000,100755..100755
--- a/sys/contrib/openzfs/cmd/zed/zed.d/deadman-slot_off.sh
+++ b/sys/contrib/openzfs/cmd/zed/zed.d/deadman-slot_off.sh
diff --cc sys/contrib/openzfs/config/kernel-types.m4
index 000000000000,ed76af28337b..ed76af28337b
mode 000000,100644..100644
--- a/sys/contrib/openzfs/config/kernel-types.m4
+++ b/sys/contrib/openzfs/config/kernel-types.m4
diff --cc sys/contrib/openzfs/lib/libspl/assert.c
index 5b12c14acd6e,d11361b387e2..315ddd6b9a9d
--- a/sys/contrib/openzfs/lib/libspl/assert.c
+++ b/sys/contrib/openzfs/lib/libspl/assert.c
@@@ -51,55 -52,6 +52,19 @@@
=C2=A0 =C2=A0 =C2=A0 =C2=A0 pthread_getname_np(pthread_self(), buf, len); =C2=A0 #endif

- #if defined(HAVE_LIBUNWIND)
- #define=C2=A0 =C2=A0 =C2=A0 =C2=A0UNW_LOCAL_ONLY
- #include <libunwind.h>
-
- static inline void
- libspl_dump_backtrace(void)
++#if defined(__APPLE__)
++static inline uint64_t
++libspl_gettid(void)
=C2=A0+{
-=C2=A0 =C2=A0 =C2=A0 =C2=A0unw_context_t uc;
-=C2=A0 =C2=A0 =C2=A0 =C2=A0unw_cursor_t cp;
-=C2=A0 =C2=A0 =C2=A0 =C2=A0unw_word_t ip, off;
-=C2=A0 =C2=A0 =C2=A0 =C2=A0char funcname[128];
- #ifdef HAVE_LIBUNWIND_ELF
-=C2=A0 =C2=A0 =C2=A0 =C2=A0char objname[128];
-=C2=A0 =C2=A0 =C2=A0 =C2=A0unw_word_t objoff;
- #endif
++=C2=A0 =C2=A0 =C2=A0 uint64_t tid;
=C2=A0+
-=C2=A0 =C2=A0 =C2=A0 =C2=A0fprintf(stderr, "Call trace:\n");
-=C2=A0 =C2=A0 =C2=A0 =C2=A0unw_getcontext(&uc);
-=C2=A0 =C2=A0 =C2=A0 =C2=A0unw_init_local(&cp, &uc);
-=C2=A0 =C2=A0 =C2=A0 =C2=A0while (unw_step(&cp) > 0) {
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0unw_get_reg(&cp= , UNW_REG_IP, &ip);
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0unw_get_proc_name(&= amp;cp, funcname, sizeof (funcname), &off);
- #ifdef HAVE_LIBUNWIND_ELF
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0unw_get_elf_filenam= e(&cp, objname, sizeof (objname), &objoff);
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0fprintf(stderr, &qu= ot;=C2=A0 [0x%08lx] %s+0x%2lx (in %s +0x%2lx)\n",
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0ip, f= uncname, off, objname, objoff);
- #else
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0fprintf(stderr, &qu= ot;=C2=A0 [0x%08lx] %s+0x%2lx\n", ip, funcname, off);
- #endif
-=C2=A0 =C2=A0 =C2=A0 =C2=A0}
- }
- #elif defined(HAVE_BACKTRACE)
- #include <execinfo.h>
++=C2=A0 =C2=A0 =C2=A0 if (pthread_threadid_np(NULL, &tid) !=3D 0)
++=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 tid =3D 0;
=C2=A0+
- static inline void
- libspl_dump_backtrace(void)
- {
-=C2=A0 =C2=A0 =C2=A0 =C2=A0void *btptrs[100];
-=C2=A0 =C2=A0 =C2=A0 =C2=A0size_t nptrs =3D backtrace(btptrs, 100);
-=C2=A0 =C2=A0 =C2=A0 =C2=A0char **bt =3D backtrace_symbols(btptrs, nptrs);=
-=C2=A0 =C2=A0 =C2=A0 =C2=A0fprintf(stderr, "Call trace:\n");
-=C2=A0 =C2=A0 =C2=A0 =C2=A0for (size_t i =3D 0; i < nptrs; i++)
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0fprintf(stderr, &qu= ot;=C2=A0 %s\n", bt[i]);
-=C2=A0 =C2=A0 =C2=A0 =C2=A0free(bt);
++=C2=A0 =C2=A0 =C2=A0 return (tid);
=C2=A0+}
- #else
- #define=C2=A0 =C2=A0 =C2=A0 =C2=A0libspl_dump_backtrace()
=C2=A0+#endif
=C2=A0+
=C2=A0 #if defined(__APPLE__)
=C2=A0 static inline uint64_t
=C2=A0 libspl_gettid(void)
diff --cc sys/contrib/openzfs/lib/libspl/backtrace.c
index 000000000000,d26d742106e2..d26d742106e2
mode 000000,100644..100644
--- a/sys/contrib/openzfs/lib/libspl/backtrace.c
+++ b/sys/contrib/openzfs/lib/libspl/backtrace.c
diff --cc sys/contrib/openzfs/lib/libspl/include/sys/backtrace.h
index 000000000000,f9869ffc9e1a..f9869ffc9e1a
mode 000000,100644..100644
--- a/sys/contrib/openzfs/lib/libspl/include/sys/backtrace.h
+++ b/sys/contrib/openzfs/lib/libspl/include/sys/backtrace.h
diff --cc sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zpo= ol_export/zpool_export_parallel_admin.ksh
index 000000000000,cab8fc2b4239..cab8fc2b4239
mode 000000,100755..100755
--- a/sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_e= xport/zpool_export_parallel_admin.ksh
+++ b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_e= xport/zpool_export_parallel_admin.ksh
diff --cc sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zpo= ol_export/zpool_export_parallel_pos.ksh
index 000000000000,037d17d082bd..037d17d082bd
mode 000000,100755..100755
--- a/sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_e= xport/zpool_export_parallel_pos.ksh
+++ b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_e= xport/zpool_export_parallel_pos.ksh
diff --cc sys/modules/zfs/zfs_config.h
index 4d6786e92d22,000000000000..d5e9cebfffc7
mode 100644,000000..100644
--- a/sys/modules/zfs/zfs_config.h
+++ b/sys/modules/zfs/zfs_config.h
@@@ -1,1227 -1,0 +1,1233 @@@
=C2=A0+/*
=C2=A0+ */
=C2=A0+
=C2=A0+/* zfs_config.h.=C2=A0 Generated from zfs_config.h.in by configure.= =C2=A0 */
=C2=A0+/* zfs_config.h.in.=C2=A0 Generated from configure.ac by autoheader.= =C2=A0 */
=C2=A0+
=C2=A0+/* Define to 1 if translation of program messages to the user's = native
=C2=A0+=C2=A0 =C2=A0language is requested. */
=C2=A0+/* #undef ENABLE_NLS */
=C2=A0+
=C2=A0+/* bio_end_io_t wants 1 arg */
=C2=A0+/* #undef HAVE_1ARG_BIO_END_IO_T */
=C2=A0+
=C2=A0+/* lookup_bdev() wants 1 arg */
=C2=A0+/* #undef HAVE_1ARG_LOOKUP_BDEV */
=C2=A0+
=C2=A0+/* submit_bio() wants 1 arg */
=C2=A0+/* #undef HAVE_1ARG_SUBMIT_BIO */
=C2=A0+
=C2=A0+/* bdi_setup_and_register() wants 2 args */
=C2=A0+/* #undef HAVE_2ARGS_BDI_SETUP_AND_REGISTER */
=C2=A0+
=C2=A0+/* vfs_getattr wants 2 args */
=C2=A0+/* #undef HAVE_2ARGS_VFS_GETATTR */
=C2=A0+
=C2=A0+/* zlib_deflate_workspacesize() wants 2 args */
=C2=A0+/* #undef HAVE_2ARGS_ZLIB_DEFLATE_WORKSPACESIZE */
=C2=A0+
=C2=A0+/* bdi_setup_and_register() wants 3 args */
=C2=A0+/* #undef HAVE_3ARGS_BDI_SETUP_AND_REGISTER */
=C2=A0+
=C2=A0+/* vfs_getattr wants 3 args */
=C2=A0+/* #undef HAVE_3ARGS_VFS_GETATTR */
=C2=A0+
=C2=A0+/* vfs_getattr wants 4 args */
=C2=A0+/* #undef HAVE_4ARGS_VFS_GETATTR */
=C2=A0+
=C2=A0+/* kernel has access_ok with 'type' parameter */
=C2=A0+/* #undef HAVE_ACCESS_OK_TYPE */
=C2=A0+
=C2=A0+/* posix_acl has refcount_t */
=C2=A0+/* #undef HAVE_ACL_REFCOUNT */
=C2=A0+
=C2=A0+/* add_disk() returns int */
=C2=A0+/* #undef HAVE_ADD_DISK_RET */
=C2=A0+
=C2=A0+/* Define if host toolchain supports AES */
=C2=A0+#define HAVE_AES 1
=C2=A0+
=C2=A0+/* Define if you have [rt] */
=C2=A0+#define HAVE_AIO_H 1
=C2=A0+
=C2=A0+#ifdef __amd64__
=C2=A0+#ifndef RESCUE
=C2=A0+/* Define if host toolchain supports AVX */
=C2=A0+#define HAVE_AVX 1
=C2=A0+#endif
=C2=A0+
=C2=A0+/* Define if host toolchain supports AVX2 */
=C2=A0+#define HAVE_AVX2 1
=C2=A0+
=C2=A0+/* Define if host toolchain supports AVX512BW */
=C2=A0+#define HAVE_AVX512BW 1
=C2=A0+
=C2=A0+/* Define if host toolchain supports AVX512CD */
=C2=A0+#define HAVE_AVX512CD 1
=C2=A0+
=C2=A0+/* Define if host toolchain supports AVX512DQ */
=C2=A0+#define HAVE_AVX512DQ 1
=C2=A0+
=C2=A0+/* Define if host toolchain supports AVX512ER */
=C2=A0+#define HAVE_AVX512ER 1
=C2=A0+
=C2=A0+/* Define if host toolchain supports AVX512F */
=C2=A0+#define HAVE_AVX512F 1
=C2=A0+
=C2=A0+/* Define if host toolchain supports AVX512IFMA */
=C2=A0+#define HAVE_AVX512IFMA 1
=C2=A0+
=C2=A0+/* Define if host toolchain supports AVX512PF */
=C2=A0+#define HAVE_AVX512PF 1
=C2=A0+
=C2=A0+/* Define if host toolchain supports AVX512VBMI */
=C2=A0+#define HAVE_AVX512VBMI 1
=C2=A0+
=C2=A0+/* Define if host toolchain supports AVX512VL */
=C2=A0+#define HAVE_AVX512VL 1
=C2=A0+#endif
=C2=A0+
++/* backtrace() is available */
++/* #undef HAVE_BACKTRACE */
++
=C2=A0+/* bdevname() is available */
=C2=A0+/* #undef HAVE_BDEVNAME */
=C2=A0+
=C2=A0+/* bdev_check_media_change() exists */
=C2=A0+/* #undef HAVE_BDEV_CHECK_MEDIA_CHANGE */
=C2=A0+
=C2=A0+/* bdev_file_open_by_path() exists */
=C2=A0+/* #undef HAVE_BDEV_FILE_OPEN_BY_PATH */
=C2=A0+
=C2=A0+/* bdev_*_io_acct() available */
=C2=A0+/* #undef HAVE_BDEV_IO_ACCT_63 */
=C2=A0+
=C2=A0+/* bdev_*_io_acct() available */
=C2=A0+/* #undef HAVE_BDEV_IO_ACCT_OLD */
=C2=A0+
=C2=A0+/* bdev_kobj() exists */
=C2=A0+/* #undef HAVE_BDEV_KOBJ */
=C2=A0+
=C2=A0+/* bdev_max_discard_sectors() is available */
=C2=A0+/* #undef HAVE_BDEV_MAX_DISCARD_SECTORS */
=C2=A0+
=C2=A0+/* bdev_max_secure_erase_sectors() is available */
=C2=A0+/* #undef HAVE_BDEV_MAX_SECURE_ERASE_SECTORS */
=C2=A0+
=C2=A0+/* bdev_open_by_path() exists */
=C2=A0+/* #undef HAVE_BDEV_OPEN_BY_PATH */
=C2=A0+
=C2=A0+/* bdev_release() exists */
=C2=A0+/* #undef HAVE_BDEV_RELEASE */
=C2=A0+
=C2=A0+/* block_device_operations->submit_bio() returns void */
=C2=A0+/* #undef HAVE_BDEV_SUBMIT_BIO_RETURNS_VOID */
=C2=A0+
=C2=A0+/* bdev_whole() is available */
=C2=A0+/* #undef HAVE_BDEV_WHOLE */
=C2=A0+
=C2=A0+/* bio_alloc() takes 4 arguments */
=C2=A0+/* #undef HAVE_BIO_ALLOC_4ARG */
=C2=A0+
=C2=A0+/* bio->bi_bdev->bd_disk exists */
=C2=A0+/* #undef HAVE_BIO_BDEV_DISK */
=C2=A0+
=C2=A0+/* bio->bi_opf is defined */
=C2=A0+/* #undef HAVE_BIO_BI_OPF */
=C2=A0+
=C2=A0+/* bio->bi_status exists */
=C2=A0+/* #undef HAVE_BIO_BI_STATUS */
=C2=A0+
=C2=A0+/* bio has bi_iter */
=C2=A0+/* #undef HAVE_BIO_BVEC_ITER */
=C2=A0+
=C2=A0+/* bio_*_io_acct() available */
=C2=A0+/* #undef HAVE_BIO_IO_ACCT */
=C2=A0+
=C2=A0+/* bio_max_segs() is implemented */
=C2=A0+/* #undef HAVE_BIO_MAX_SEGS */
=C2=A0+
=C2=A0+/* bio_set_dev() is available */
=C2=A0+/* #undef HAVE_BIO_SET_DEV */
=C2=A0+
=C2=A0+/* bio_set_dev() GPL-only */
=C2=A0+/* #undef HAVE_BIO_SET_DEV_GPL_ONLY */
=C2=A0+
=C2=A0+/* bio_set_dev() is a macro */
=C2=A0+/* #undef HAVE_BIO_SET_DEV_MACRO */
=C2=A0+
=C2=A0+/* bio_set_op_attrs is available */
=C2=A0+/* #undef HAVE_BIO_SET_OP_ATTRS */
=C2=A0+
=C2=A0+/* blkdev_get_by_path() exists and takes 4 args */
=C2=A0+/* #undef HAVE_BLKDEV_GET_BY_PATH_4ARG */
=C2=A0+
=C2=A0+/* blkdev_get_by_path() handles ERESTARTSYS */
=C2=A0+/* #undef HAVE_BLKDEV_GET_ERESTARTSYS */
=C2=A0+
=C2=A0+/* __blkdev_issue_discard(flags) is available */
=C2=A0+/* #undef HAVE_BLKDEV_ISSUE_DISCARD_ASYNC_FLAGS */
=C2=A0+
=C2=A0+/* __blkdev_issue_discard() is available */
=C2=A0+/* #undef HAVE_BLKDEV_ISSUE_DISCARD_ASYNC_NOFLAGS */
=C2=A0+
=C2=A0+/* blkdev_issue_discard(flags) is available */
=C2=A0+/* #undef HAVE_BLKDEV_ISSUE_DISCARD_FLAGS */
=C2=A0+
=C2=A0+/* blkdev_issue_discard() is available */
=C2=A0+/* #undef HAVE_BLKDEV_ISSUE_DISCARD_NOFLAGS */
=C2=A0+
=C2=A0+/* blkdev_issue_secure_erase() is available */
=C2=A0+/* #undef HAVE_BLKDEV_ISSUE_SECURE_ERASE */
=C2=A0+
=C2=A0+/* blkdev_put() exists */
=C2=A0+/* #undef HAVE_BLKDEV_PUT */
=C2=A0+
=C2=A0+/* blkdev_put() accepts void* as arg 2 */
=C2=A0+/* #undef HAVE_BLKDEV_PUT_HOLDER */
=C2=A0+
=C2=A0+/* blkdev_reread_part() exists */
=C2=A0+/* #undef HAVE_BLKDEV_REREAD_PART */
=C2=A0+
=C2=A0+/* blkg_tryget() is available */
=C2=A0+/* #undef HAVE_BLKG_TRYGET */
=C2=A0+
=C2=A0+/* blkg_tryget() GPL-only */
=C2=A0+/* #undef HAVE_BLKG_TRYGET_GPL_ONLY */
=C2=A0+
=C2=A0+/* blk_alloc_disk() exists */
=C2=A0+/* #undef HAVE_BLK_ALLOC_DISK */
=C2=A0+
=C2=A0+/* blk_alloc_disk() exists and takes 2 args */
=C2=A0+/* #undef HAVE_BLK_ALLOC_DISK_2ARG */
=C2=A0+
=C2=A0+/* blk_alloc_queue() expects request function */
=C2=A0+/* #undef HAVE_BLK_ALLOC_QUEUE_REQUEST_FN */
=C2=A0+
=C2=A0+/* blk_alloc_queue_rh() expects request function */
=C2=A0+/* #undef HAVE_BLK_ALLOC_QUEUE_REQUEST_FN_RH */
=C2=A0+
=C2=A0+/* blk_cleanup_disk() exists */
=C2=A0+/* #undef HAVE_BLK_CLEANUP_DISK */
=C2=A0+
=C2=A0+/* blk_mode_t is defined */
=C2=A0+/* #undef HAVE_BLK_MODE_T */
=C2=A0+
=C2=A0+/* block multiqueue is available */
=C2=A0+/* #undef HAVE_BLK_MQ */
=C2=A0+
=C2=A0+/* block multiqueue hardware context is cached in struct request */<= br> =C2=A0+/* #undef HAVE_BLK_MQ_RQ_HCTX */
=C2=A0+
=C2=A0+/* blk queue backing_dev_info is dynamic */
=C2=A0+/* #undef HAVE_BLK_QUEUE_BDI_DYNAMIC */
=C2=A0+
=C2=A0+/* blk_queue_discard() is available */
=C2=A0+/* #undef HAVE_BLK_QUEUE_DISCARD */
=C2=A0+
=C2=A0+/* blk_queue_flag_clear() exists */
=C2=A0+/* #undef HAVE_BLK_QUEUE_FLAG_CLEAR */
=C2=A0+
=C2=A0+/* blk_queue_flag_set() exists */
=C2=A0+/* #undef HAVE_BLK_QUEUE_FLAG_SET */
=C2=A0+
=C2=A0+/* blk_queue_flush() is available */
=C2=A0+/* #undef HAVE_BLK_QUEUE_FLUSH */
=C2=A0+
=C2=A0+/* blk_queue_flush() is GPL-only */
=C2=A0+/* #undef HAVE_BLK_QUEUE_FLUSH_GPL_ONLY */
=C2=A0+
=C2=A0+/* blk_queue_secdiscard() is available */
=C2=A0+/* #undef HAVE_BLK_QUEUE_SECDISCARD */
=C2=A0+
=C2=A0+/* blk_queue_secure_erase() is available */
=C2=A0+/* #undef HAVE_BLK_QUEUE_SECURE_ERASE */
=C2=A0+
=C2=A0+/* blk_queue_update_readahead() exists */
=C2=A0+/* #undef HAVE_BLK_QUEUE_UPDATE_READAHEAD */
=C2=A0+
=C2=A0+/* blk_queue_write_cache() exists */
=C2=A0+/* #undef HAVE_BLK_QUEUE_WRITE_CACHE */
=C2=A0+
=C2=A0+/* blk_queue_write_cache() is GPL-only */
=C2=A0+/* #undef HAVE_BLK_QUEUE_WRITE_CACHE_GPL_ONLY */
=C2=A0+
=C2=A0+/* BLK_STS_RESV_CONFLICT is defined */
=C2=A0+/* #undef HAVE_BLK_STS_RESV_CONFLICT */
=C2=A0+
=C2=A0+/* Define if release() in block_device_operations takes 1 arg */
=C2=A0+/* #undef HAVE_BLOCK_DEVICE_OPERATIONS_RELEASE_1ARG */
=C2=A0+
=C2=A0+/* Define if revalidate_disk() in block_device_operations */
=C2=A0+/* #undef HAVE_BLOCK_DEVICE_OPERATIONS_REVALIDATE_DISK */
=C2=A0+
=C2=A0+/* Define to 1 if you have the Mac OS X function CFLocaleCopyCurrent= in the
=C2=A0+=C2=A0 =C2=A0CoreFoundation framework. */
=C2=A0+/* #undef HAVE_CFLOCALECOPYCURRENT */
=C2=A0+
=C2=A0+/* Define to 1 if you have the Mac OS X function
=C2=A0+=C2=A0 =C2=A0CFLocaleCopyPreferredLanguages in the CoreFoundation fr= amework. */
=C2=A0+/* #undef HAVE_CFLOCALECOPYPREFERREDLANGUAGES */
=C2=A0+
=C2=A0+/* Define to 1 if you have the Mac OS X function CFPreferencesCopyAp= pValue in
=C2=A0+=C2=A0 =C2=A0the CoreFoundation framework. */
=C2=A0+/* #undef HAVE_CFPREFERENCESCOPYAPPVALUE */
=C2=A0+
=C2=A0+/* check_disk_change() exists */
=C2=A0+/* #undef HAVE_CHECK_DISK_CHANGE */
=C2=A0+
=C2=A0+/* clear_inode() is available */
=C2=A0+/* #undef HAVE_CLEAR_INODE */
=C2=A0+
=C2=A0+/* dentry uses const struct dentry_operations */
=C2=A0+/* #undef HAVE_CONST_DENTRY_OPERATIONS */
=C2=A0+
=C2=A0+/* copy_from_iter() is available */
=C2=A0+/* #undef HAVE_COPY_FROM_ITER */
=C2=A0+
=C2=A0+/* copy_splice_read exists */
=C2=A0+/* #undef HAVE_COPY_SPLICE_READ */
=C2=A0+
=C2=A0+/* copy_to_iter() is available */
=C2=A0+/* #undef HAVE_COPY_TO_ITER */
=C2=A0+
=C2=A0+/* cpu_has_feature() is GPL-only */
=C2=A0+/* #undef HAVE_CPU_HAS_FEATURE_GPL_ONLY */
=C2=A0+
=C2=A0+/* yes */
=C2=A0+/* #undef HAVE_CPU_HOTPLUG */
=C2=A0+
=C2=A0+/* current_time() exists */
=C2=A0+/* #undef HAVE_CURRENT_TIME */
=C2=A0+
=C2=A0+/* Define if the GNU dcgettext() function is already present or prei= nstalled.
=C2=A0+=C2=A0 =C2=A0*/
=C2=A0+/* #undef HAVE_DCGETTEXT */
=C2=A0+
=C2=A0+/* DECLARE_EVENT_CLASS() is available */
=C2=A0+/* #undef HAVE_DECLARE_EVENT_CLASS */
=C2=A0+
=C2=A0+/* dentry aliases are in d_u member */
=C2=A0+/* #undef HAVE_DENTRY_D_U_ALIASES */
=C2=A0+
=C2=A0+/* dequeue_signal() takes 4 arguments */
=C2=A0+/* #undef HAVE_DEQUEUE_SIGNAL_4ARG */
=C2=A0+
=C2=A0+/* lookup_bdev() wants dev_t arg */
=C2=A0+/* #undef HAVE_DEVT_LOOKUP_BDEV */
=C2=A0+
=C2=A0+/* sops->dirty_inode() wants flags */
=C2=A0+/* #undef HAVE_DIRTY_INODE_WITH_FLAGS */
=C2=A0+
=C2=A0+/* disk_check_media_change() exists */
=C2=A0+/* #undef HAVE_DISK_CHECK_MEDIA_CHANGE */
=C2=A0+
=C2=A0+/* disk_*_io_acct() available */
=C2=A0+/* #undef HAVE_DISK_IO_ACCT */
=C2=A0+
=C2=A0+/* disk_update_readahead() exists */
=C2=A0+/* #undef HAVE_DISK_UPDATE_READAHEAD */
=C2=A0+
=C2=A0+/* Define to 1 if you have the <dlfcn.h> header file. */
=C2=A0+#define HAVE_DLFCN_H 1
=C2=A0+
=C2=A0+/* d_make_root() is available */
=C2=A0+/* #undef HAVE_D_MAKE_ROOT */
=C2=A0+
=C2=A0+/* d_prune_aliases() is available */
=C2=A0+/* #undef HAVE_D_PRUNE_ALIASES */
=C2=A0+
=C2=A0+/* dops->d_revalidate() operation takes nameidata */
=C2=A0+/* #undef HAVE_D_REVALIDATE_NAMEIDATA */
=C2=A0+
=C2=A0+/* eops->encode_fh() wants child and parent inodes */
=C2=A0+/* #undef HAVE_ENCODE_FH_WITH_INODE */
=C2=A0+
=C2=A0+/* sops->evict_inode() exists */
=C2=A0+/* #undef HAVE_EVICT_INODE */
=C2=A0+
=C2=A0+/* Define to 1 if you have the 'execvpe' function. */
=C2=A0+#define HAVE_EXECVPE 1
=C2=A0+
=C2=A0+/* FALLOC_FL_ZERO_RANGE is defined */
=C2=A0+/* #undef HAVE_FALLOC_FL_ZERO_RANGE */
=C2=A0+
=C2=A0+/* fault_in_iov_iter_readable() is available */
=C2=A0+/* #undef HAVE_FAULT_IN_IOV_ITER_READABLE */
=C2=A0+
=C2=A0+/* filemap_range_has_page() is available */
=C2=A0+/* #undef HAVE_FILEMAP_RANGE_HAS_PAGE */
=C2=A0+
=C2=A0+/* fops->aio_fsync() exists */
=C2=A0+/* #undef HAVE_FILE_AIO_FSYNC */
=C2=A0+
=C2=A0+/* file_dentry() is available */
=C2=A0+/* #undef HAVE_FILE_DENTRY */
=C2=A0+
=C2=A0+/* fops->fadvise() exists */
=C2=A0+/* #undef HAVE_FILE_FADVISE */
=C2=A0+
=C2=A0+/* file_inode() is available */
=C2=A0+/* #undef HAVE_FILE_INODE */
=C2=A0+
=C2=A0+/* flush_dcache_page() is GPL-only */
=C2=A0+/* #undef HAVE_FLUSH_DCACHE_PAGE_GPL_ONLY */
=C2=A0+
=C2=A0+/* iops->follow_link() cookie */
=C2=A0+/* #undef HAVE_FOLLOW_LINK_COOKIE */
=C2=A0+
=C2=A0+/* iops->follow_link() nameidata */
=C2=A0+/* #undef HAVE_FOLLOW_LINK_NAMEIDATA */
=C2=A0+
=C2=A0+/* Define if compiler supports -Wformat-overflow */
=C2=A0+/* #undef HAVE_FORMAT_OVERFLOW */
=C2=A0+
=C2=A0+/* fsync_bdev() is declared in include/blkdev.h */
=C2=A0+/* #undef HAVE_FSYNC_BDEV */
=C2=A0+
=C2=A0+/* fops->fsync() with range */
=C2=A0+/* #undef HAVE_FSYNC_RANGE */
=C2=A0+
=C2=A0+/* fops->fsync() without dentry */
=C2=A0+/* #undef HAVE_FSYNC_WITHOUT_DENTRY */
=C2=A0+
=C2=A0+/* yes */
=C2=A0+/* #undef HAVE_GENERIC_FADVISE */
=C2=A0+
=C2=A0+/* generic_fillattr requires struct mnt_idmap* */
=C2=A0+/* #undef HAVE_GENERIC_FILLATTR_IDMAP */
=C2=A0+
=C2=A0+/* generic_fillattr requires struct mnt_idmap* and u32 request_mask = */
=C2=A0+/* #undef HAVE_GENERIC_FILLATTR_IDMAP_REQMASK */
=C2=A0+
=C2=A0+/* generic_fillattr requires struct user_namespace* */
=C2=A0+/* #undef HAVE_GENERIC_FILLATTR_USERNS */
=C2=A0+
=C2=A0+/* generic_*_io_acct() 3 arg available */
=C2=A0+/* #undef HAVE_GENERIC_IO_ACCT_3ARG */
=C2=A0+
=C2=A0+/* generic_*_io_acct() 4 arg available */
=C2=A0+/* #undef HAVE_GENERIC_IO_ACCT_4ARG */
=C2=A0+
=C2=A0+/* generic_readlink is global */
=C2=A0+/* #undef HAVE_GENERIC_READLINK */
=C2=A0+
=C2=A0+/* generic_setxattr() exists */
=C2=A0+/* #undef HAVE_GENERIC_SETXATTR */
=C2=A0+
=C2=A0+/* generic_write_checks() takes kiocb */
=C2=A0+/* #undef HAVE_GENERIC_WRITE_CHECKS_KIOCB */
=C2=A0+
=C2=A0+/* Define if the GNU gettext() function is already present or preins= talled. */
=C2=A0+/* #undef HAVE_GETTEXT */
=C2=A0+
=C2=A0+/* Define to 1 if you have the 'gettid' function. */
=C2=A0+/* #undef HAVE_GETTID */
=C2=A0+
=C2=A0+/* iops->get_acl() exists */
=C2=A0+/* #undef HAVE_GET_ACL */
=C2=A0+
=C2=A0+/* iops->get_acl() takes rcu */
=C2=A0+/* #undef HAVE_GET_ACL_RCU */
=C2=A0+
=C2=A0+/* has iops->get_inode_acl() */
=C2=A0+/* #undef HAVE_GET_INODE_ACL */
=C2=A0+
=C2=A0+/* iops->get_link() cookie */
=C2=A0+/* #undef HAVE_GET_LINK_COOKIE */
=C2=A0+
=C2=A0+/* iops->get_link() delayed */
=C2=A0+/* #undef HAVE_GET_LINK_DELAYED */
=C2=A0+
=C2=A0+/* group_info->gid exists */
=C2=A0+/* #undef HAVE_GROUP_INFO_GID */
=C2=A0+
=C2=A0+/* has_capability() is available */
=C2=A0+/* #undef HAVE_HAS_CAPABILITY */
=C2=A0+
=C2=A0+/* iattr->ia_vfsuid and iattr->ia_vfsgid exist */
=C2=A0+/* #undef HAVE_IATTR_VFSID */
=C2=A0+
=C2=A0+/* Define if you have the iconv() function and it works. */
=C2=A0+#define HAVE_ICONV 1
=C2=A0+
=C2=A0+/* iops->getattr() takes struct mnt_idmap* */
=C2=A0+/* #undef HAVE_IDMAP_IOPS_GETATTR */
=C2=A0+
=C2=A0+/* iops->setattr() takes struct mnt_idmap* */
=C2=A0+/* #undef HAVE_IDMAP_IOPS_SETATTR */
=C2=A0+
=C2=A0+/* APIs for idmapped mount are present */
=C2=A0+/* #undef HAVE_IDMAP_MNT_API */
=C2=A0+
=C2=A0+/* mnt_idmap does not have user_namespace */
=C2=A0+/* #undef HAVE_IDMAP_NO_USERNS */
=C2=A0+
=C2=A0+/* Define if compiler supports -Wimplicit-fallthrough */
=C2=A0+/* #undef HAVE_IMPLICIT_FALLTHROUGH */
=C2=A0+
=C2=A0+/* Define if compiler supports -Winfinite-recursion */
=C2=A0+/* #undef HAVE_INFINITE_RECURSION */
=C2=A0+
=C2=A0+/* inode_get_atime() exists in linux/fs.h */
=C2=A0+/* #undef HAVE_INODE_GET_ATIME */
=C2=A0+
=C2=A0+/* inode_get_ctime() exists in linux/fs.h */
=C2=A0+/* #undef HAVE_INODE_GET_CTIME */
=C2=A0+
=C2=A0+/* inode_get_mtime() exists in linux/fs.h */
=C2=A0+/* #undef HAVE_INODE_GET_MTIME */
=C2=A0+
=C2=A0+/* yes */
=C2=A0+/* #undef HAVE_INODE_LOCK_SHARED */
=C2=A0+
=C2=A0+/* inode_owner_or_capable() exists */
=C2=A0+/* #undef HAVE_INODE_OWNER_OR_CAPABLE */
=C2=A0+
=C2=A0+/* inode_owner_or_capable() takes mnt_idmap */
=C2=A0+/* #undef HAVE_INODE_OWNER_OR_CAPABLE_IDMAP */
=C2=A0+
=C2=A0+/* inode_owner_or_capable() takes user_ns */
=C2=A0+/* #undef HAVE_INODE_OWNER_OR_CAPABLE_USERNS */
=C2=A0+
=C2=A0+/* inode_set_atime_to_ts() exists in linux/fs.h */
=C2=A0+/* #undef HAVE_INODE_SET_ATIME_TO_TS */
=C2=A0+
=C2=A0+/* inode_set_ctime_to_ts() exists in linux/fs.h */
=C2=A0+/* #undef HAVE_INODE_SET_CTIME_TO_TS */
=C2=A0+
=C2=A0+/* inode_set_flags() exists */
=C2=A0+/* #undef HAVE_INODE_SET_FLAGS */
=C2=A0+
=C2=A0+/* inode_set_iversion() exists */
=C2=A0+/* #undef HAVE_INODE_SET_IVERSION */
=C2=A0+
=C2=A0+/* inode_set_mtime_to_ts() exists in linux/fs.h */
=C2=A0+/* #undef HAVE_INODE_SET_MTIME_TO_TS */
=C2=A0+
=C2=A0+/* inode->i_*time's are timespec64 */
=C2=A0+/* #undef HAVE_INODE_TIMESPEC64_TIMES */
=C2=A0+
=C2=A0+/* timestamp_truncate() exists */
=C2=A0+/* #undef HAVE_INODE_TIMESTAMP_TRUNCATE */
=C2=A0+
=C2=A0+/* Define to 1 if you have the <inttypes.h> header file. */ =C2=A0+#define HAVE_INTTYPES_H 1
=C2=A0+
=C2=A0+/* in_compat_syscall() is available */
=C2=A0+/* #undef HAVE_IN_COMPAT_SYSCALL */
=C2=A0+
=C2=A0+/* iops->create() takes struct mnt_idmap* */
=C2=A0+/* #undef HAVE_IOPS_CREATE_IDMAP */
=C2=A0+
=C2=A0+/* iops->create() takes struct user_namespace* */
=C2=A0+/* #undef HAVE_IOPS_CREATE_USERNS */
=C2=A0+
=C2=A0+/* iops->mkdir() takes struct mnt_idmap* */
=C2=A0+/* #undef HAVE_IOPS_MKDIR_IDMAP */
=C2=A0+
=C2=A0+/* iops->mkdir() takes struct user_namespace* */
=C2=A0+/* #undef HAVE_IOPS_MKDIR_USERNS */
=C2=A0+
=C2=A0+/* iops->mknod() takes struct mnt_idmap* */
=C2=A0+/* #undef HAVE_IOPS_MKNOD_IDMAP */
=C2=A0+
=C2=A0+/* iops->mknod() takes struct user_namespace* */
=C2=A0+/* #undef HAVE_IOPS_MKNOD_USERNS */
=C2=A0+
=C2=A0+/* iops->permission() takes struct mnt_idmap* */
=C2=A0+/* #undef HAVE_IOPS_PERMISSION_IDMAP */
=C2=A0+
=C2=A0+/* iops->permission() takes struct user_namespace* */
=C2=A0+/* #undef HAVE_IOPS_PERMISSION_USERNS */
=C2=A0+
=C2=A0+/* iops->rename() takes struct mnt_idmap* */
=C2=A0+/* #undef HAVE_IOPS_RENAME_IDMAP */
=C2=A0+
=C2=A0+/* iops->rename() takes struct user_namespace* */
=C2=A0+/* #undef HAVE_IOPS_RENAME_USERNS */
=C2=A0+
=C2=A0+/* iops->setattr() exists */
=C2=A0+/* #undef HAVE_IOPS_SETATTR */
=C2=A0+
=C2=A0+/* iops->symlink() takes struct mnt_idmap* */
=C2=A0+/* #undef HAVE_IOPS_SYMLINK_IDMAP */
=C2=A0+
=C2=A0+/* iops->symlink() takes struct user_namespace* */
=C2=A0+/* #undef HAVE_IOPS_SYMLINK_USERNS */
=C2=A0+
=C2=A0+/* iov_iter_advance() is available */
=C2=A0+/* #undef HAVE_IOV_ITER_ADVANCE */
=C2=A0+
=C2=A0+/* iov_iter_count() is available */
=C2=A0+/* #undef HAVE_IOV_ITER_COUNT */
=C2=A0+
=C2=A0+/* iov_iter_fault_in_readable() is available */
=C2=A0+/* #undef HAVE_IOV_ITER_FAULT_IN_READABLE */
=C2=A0+
=C2=A0+/* iov_iter_revert() is available */
=C2=A0+/* #undef HAVE_IOV_ITER_REVERT */
=C2=A0+
=C2=A0+/* iov_iter_type() is available */
=C2=A0+/* #undef HAVE_IOV_ITER_TYPE */
=C2=A0+
=C2=A0+/* iov_iter types are available */
=C2=A0+/* #undef HAVE_IOV_ITER_TYPES */
=C2=A0+
=C2=A0+/* yes */
=C2=A0+/* #undef HAVE_IO_SCHEDULE_TIMEOUT */
=C2=A0+
=C2=A0+/* Define to 1 if you have the 'issetugid' function. */
=C2=A0+#define HAVE_ISSETUGID 1
=C2=A0+
=C2=A0+/* iter_iov() is available */
=C2=A0+/* #undef HAVE_ITER_IOV */
=C2=A0+
=C2=A0+/* kernel has kernel_fpu_* functions */
=C2=A0+/* #undef HAVE_KERNEL_FPU */
=C2=A0+
=C2=A0+/* kernel has asm/fpu/api.h */
=C2=A0+/* #undef HAVE_KERNEL_FPU_API_HEADER */
=C2=A0+
=C2=A0+/* kernel fpu internal */
=C2=A0+/* #undef HAVE_KERNEL_FPU_INTERNAL */
=C2=A0+
=C2=A0+/* kernel has asm/fpu/internal.h */
=C2=A0+/* #undef HAVE_KERNEL_FPU_INTERNAL_HEADER */
=C2=A0+
=C2=A0+/* uncached_acl_sentinel() exists */
=C2=A0+/* #undef HAVE_KERNEL_GET_ACL_HANDLE_CACHE */
=C2=A0+
=C2=A0+/* Define if compiler supports -Winfinite-recursion */
=C2=A0+/* #undef HAVE_KERNEL_INFINITE_RECURSION */
=C2=A0+
++/* kernel defines intptr_t */
++/* #undef HAVE_KERNEL_INTPTR_T */
++
=C2=A0+/* kernel has kernel_neon_* functions */
=C2=A0+/* #undef HAVE_KERNEL_NEON */
=C2=A0+
=C2=A0+/* kernel does stack verification */
=C2=A0+/* #undef HAVE_KERNEL_OBJTOOL */
=C2=A0+
=C2=A0+/* kernel has linux/objtool.h */
=C2=A0+/* #undef HAVE_KERNEL_OBJTOOL_HEADER */
=C2=A0+
=C2=A0+/* kernel_read() take loff_t pointer */
=C2=A0+/* #undef HAVE_KERNEL_READ_PPOS */
=C2=A0+
=C2=A0+/* strlcpy() exists */
=C2=A0+/* #undef HAVE_KERNEL_STRLCPY */
=C2=A0+
=C2=A0+/* strscpy() exists */
=C2=A0+/* #undef HAVE_KERNEL_STRSCPY */
=C2=A0+
=C2=A0+/* timer_list.function gets a timer_list */
=C2=A0+/* #undef HAVE_KERNEL_TIMER_FUNCTION_TIMER_LIST */
=C2=A0+
=C2=A0+/* struct timer_list has a flags member */
=C2=A0+/* #undef HAVE_KERNEL_TIMER_LIST_FLAGS */
=C2=A0+
=C2=A0+/* timer_setup() is available */
=C2=A0+/* #undef HAVE_KERNEL_TIMER_SETUP */
=C2=A0+
=C2=A0+/* kernel_write() take loff_t pointer */
=C2=A0+/* #undef HAVE_KERNEL_WRITE_PPOS */
=C2=A0+
=C2=A0+/* kmem_cache_create_usercopy() exists */
=C2=A0+/* #undef HAVE_KMEM_CACHE_CREATE_USERCOPY */
=C2=A0+
=C2=A0+/* kstrtoul() exists */
=C2=A0+/* #undef HAVE_KSTRTOUL */
=C2=A0+
=C2=A0+/* ktime_get_coarse_real_ts64() exists */
=C2=A0+/* #undef HAVE_KTIME_GET_COARSE_REAL_TS64 */
=C2=A0+
=C2=A0+/* ktime_get_raw_ts64() exists */
=C2=A0+/* #undef HAVE_KTIME_GET_RAW_TS64 */
=C2=A0+
=C2=A0+/* kvmalloc exists */
=C2=A0+/* #undef HAVE_KVMALLOC */
=C2=A0+
=C2=A0+/* Define if you have [aio] */
=C2=A0+/* #undef HAVE_LIBAIO */
=C2=A0+
=C2=A0+/* Define if you have [blkid] */
=C2=A0+/* #undef HAVE_LIBBLKID */
=C2=A0+
=C2=A0+/* Define if you have [crypto] */
=C2=A0+#define HAVE_LIBCRYPTO 1
=C2=A0+
=C2=A0+/* Define if you have [tirpc] */
=C2=A0+/* #undef HAVE_LIBTIRPC */
=C2=A0+
=C2=A0+/* Define if you have [udev] */
=C2=A0+/* #undef HAVE_LIBUDEV */
=C2=A0+
=C2=A0+/* Define if you have [unwind] */
=C2=A0+/* #undef HAVE_LIBUNWIND */
=C2=A0+
=C2=A0+/* libunwind has unw_get_elf_filename */
=C2=A0+/* #undef HAVE_LIBUNWIND_ELF */
=C2=A0+
=C2=A0+/* Define if you have [uuid] */
=C2=A0+/* #undef HAVE_LIBUUID */
=C2=A0+
=C2=A0+/* linux/blk-cgroup.h exists */
=C2=A0+/* #undef HAVE_LINUX_BLK_CGROUP_HEADER */
=C2=A0+
=C2=A0+/* lseek_execute() is available */
=C2=A0+/* #undef HAVE_LSEEK_EXECUTE */
=C2=A0+
=C2=A0+/* makedev() is declared in sys/mkdev.h */
=C2=A0+/* #undef HAVE_MAKEDEV_IN_MKDEV */
=C2=A0+
=C2=A0+/* makedev() is declared in sys/sysmacros.h */
=C2=A0+/* #undef HAVE_MAKEDEV_IN_SYSMACROS */
=C2=A0+
=C2=A0+/* Noting that make_request_fn() returns blk_qc_t */
=C2=A0+/* #undef HAVE_MAKE_REQUEST_FN_RET_QC */
=C2=A0+
=C2=A0+/* Noting that make_request_fn() returns void */
*** 552 LINES SKIPPED ***
--0000000000006990d20619c5a9d5-- From nobody Fri May 31 20:29: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 4VrZTd5DkFz5LKwK; Fri, 31 May 2024 20:29: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 4VrZTd4ckyz4TjV; Fri, 31 May 2024 20:29:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717187349; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tRKXIpIzQ81ABHN+zMAnhpyRbu6lsyMIwF6ZbSaZ2pE=; b=viXP2VPr2HUKo8m7s32RoHOeKMj5T1W9S4O4MOWGcttABTXynMQjyJ2gVAr2DAMlhMzjSz uEoGoRoKbhKrz9ae6sKqG5z94RBT0IuBMw8A5ZFqiNCCxV1UFyfZCRZ+i4wgz63F0XoQMe YvPOGJRUUg8nziPszlyAqRSgUxhtKAPXm0VF2TAbOaK5bTrU0PDJ93/Gc321DFbM/IJEfj UrOWPUb/3TF6xlu97T3adXDD1oSI9QR2PVSu6ykwvxIiHddCzfNJztCa3yQn+3pEs/SUX7 UZMR5ODI51/8zrB1+63F86fYCXTKHCI2VH+hHOkZ9iNc8Iyh0uLEXRkUSTKFLw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1717187349; a=rsa-sha256; cv=none; b=Axn0fkNQeBjcGHefWKNfFW9nWvCiF3evGmtqgLoL/yqyhCmgjzQmnR7kU5OWyPzNb3sFbb IvdDE4PWwqqY4YpHymRoQkVyz1jCN04YY+0t2fOcIfgvBkKoR3IOtmq9YUhVdtEwdpFc0r /wNCs+I33jcTNwuOYHCTvDKLbdo1eXGaFNIlvJvjVO2ooGWfB24h5iwAYNjETGa8fHjDnb q9bwNiJQ7oIMLBvklFbLsYcpLeT3t+5GDUK4kCJszz/OmNgYe4dctbq7aGfI3qkQ6aC6pz dB9xVmnp2ctevmVkxrLEvDDlQh25jWbkoJloT/t5szDRjkAltKWPlY+mL+ZapA== 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=1717187349; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tRKXIpIzQ81ABHN+zMAnhpyRbu6lsyMIwF6ZbSaZ2pE=; b=TUDh0/viBQsO81FWOiZqZ1/RF/obJSFWxrznTTEIJILa8RDRn6jtIQSdyJj6uPO40K4gLu RjOgqv8quGkINhknZBtIg/mnyedSenz3JqkCmOkVxtJc/nSDKREBosi++bcSFjDFEWI5Sk 2rzSvbUP0w+e4seBuoEt8s0oluaPiH/DHci+cEjHSvjHxT+KDnfmmQt+r1DEEnot+Fb7jS 48xdlzcTO5jU3HQFsgXTIIezbCodhoMGU0uxDIcQIomt+LqMxvq2NHtZFoU4aIHg+nvW0l Hpho4/5wYKF9cB3MCxZbzTEhyFcNZL/3bc9pHR8QhEalH70iGCaMh30dfE+l5Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VrZTd4D3nzf8m; Fri, 31 May 2024 20:29: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 44VKT966053093; Fri, 31 May 2024 20:29:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44VKT9pL053090; Fri, 31 May 2024 20:29:09 GMT (envelope-from git) Date: Fri, 31 May 2024 20:29:09 GMT Message-Id: <202405312029.44VKT9pL053090@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: 9c0d6df100ed - main - man bluetooth/fwdownloaders: alignment nits, SPDX List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: 9c0d6df100eda06697ad4ca86c97c554ee9d727c Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=9c0d6df100eda06697ad4ca86c97c554ee9d727c commit 9c0d6df100eda06697ad4ca86c97c554ee9d727c Author: Alexander Ziaee AuthorDate: 2024-05-31 19:27:58 +0000 Commit: Warner Losh CommitDate: 2024-05-31 20:26:09 +0000 man bluetooth/fwdownloaders: alignment nits, SPDX MFC after: 3 days Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/1267 --- usr.sbin/bluetooth/ath3kfw/ath3kfw.8 | 10 +++++++--- usr.sbin/bluetooth/bcmfw/bcmfw.8 | 7 +++++-- usr.sbin/bluetooth/iwmbtfw/iwmbtfw.8 | 14 +++++++++----- 3 files changed, 21 insertions(+), 10 deletions(-) diff --git a/usr.sbin/bluetooth/ath3kfw/ath3kfw.8 b/usr.sbin/bluetooth/ath3kfw/ath3kfw.8 index 74b9656c89af..beb1b102b194 100644 --- a/usr.sbin/bluetooth/ath3kfw/ath3kfw.8 +++ b/usr.sbin/bluetooth/ath3kfw/ath3kfw.8 @@ -1,3 +1,6 @@ +.\"- +.\" SPDX-License-Identifier: BSD-2-Clause +.\" .\" Copyright (c) 2010 Maksim Yevmenkin .\" Copyright (c) 2013, 2016 Adrian Chadd .\" All rights reserved. @@ -31,6 +34,7 @@ .Nd download firmware for Atheros AR3011/AR3012 Bluetooth USB devices .Sh SYNOPSIS .Nm +.Op Fl DI .Fl d Ar device_name .Fl f Ar firmware_path .Nm @@ -58,19 +62,19 @@ utility will query the device to determine which firmware image and board configuration to load in at runtime. .Pp The options are as follows: -.Bl -tag -width indent +.Bl -tag -width "-f firmware_path" .It Fl D Enable verbose debugging. .It Fl d Ar device_name Specify .Xr ugen 4 device name. -.It I -Enable informational debugging. .It Fl f Ar firmware_path Specify the directory containing the firmware files to search and upload. .It Fl h Display usage message and exit. +.It Fl I +Enable informational debugging. .El .Sh EXIT STATUS .Ex -std diff --git a/usr.sbin/bluetooth/bcmfw/bcmfw.8 b/usr.sbin/bluetooth/bcmfw/bcmfw.8 index d90757f871fa..50e9739340ee 100644 --- a/usr.sbin/bluetooth/bcmfw/bcmfw.8 +++ b/usr.sbin/bluetooth/bcmfw/bcmfw.8 @@ -1,3 +1,6 @@ +.\"- +.\" SPDX-License-Identifier: BSD-2-Clause +.\" .\" Copyright (c) 2003 Maksim Yevmenkin .\" All rights reserved. .\" @@ -62,7 +65,7 @@ I am using the following files from the bluez-firmware-1.0 package: .Dl "MD5 (BCM2033-FW.bin) = b4e142b3272cfe5a84b32fda6b4b032f" .Pp The options are as follows: -.Bl -tag -width indent +.Bl -tag -width "-m mini-driver_file_name" .It Fl f Ar firmware_file_name Specify firmware file name for download. .It Fl h @@ -73,7 +76,7 @@ Specify mini-driver file name for download. Specify device name. .El .Sh FILES -.Bl -tag -width ".Pa /dev/ubtbcmfw Ns Ar N Ns Pa \&. Ns Ar EE" -compact +.Bl -tag -width "-m mini-driver_file_name" -compact .It Pa BCM2033-MD.hex Mini-driver image. .It Pa BCM2033-FW.bin diff --git a/usr.sbin/bluetooth/iwmbtfw/iwmbtfw.8 b/usr.sbin/bluetooth/iwmbtfw/iwmbtfw.8 index 225355116ab7..1924c5f3ce74 100644 --- a/usr.sbin/bluetooth/iwmbtfw/iwmbtfw.8 +++ b/usr.sbin/bluetooth/iwmbtfw/iwmbtfw.8 @@ -1,3 +1,6 @@ +.\"- +.\" SPDX-License-Identifier: BSD-2-Clause +.\" .\" Copyright (c) 2013, 2016 Adrian Chadd .\" Copyright (c) 2019 Vladimir Kondratyev .\" Copyright (c) 2021 Philippe Michaud-Boudreault @@ -31,6 +34,7 @@ .Nd download firmware for Intel Wireless AC Bluetooth USB devices .Sh SYNOPSIS .Nm +.Op Fl DI .Fl d Ar device_name .Fl f Ar firmware_path .Nm @@ -44,8 +48,8 @@ device. .Pp This utility will .Em only -work with Intel Wireless 7260/8260/8265 chip based Bluetooth USB devices and some of -their successors. +work with Intel Wireless 7260/8260/8265 chip based Bluetooth USB devices +and some of their successors. The identification is currently based on USB vendor ID/product ID pair. The vendor ID should be 0x8087 .Pq Dv USB_VENDOR_INTEL2 @@ -61,19 +65,19 @@ utility will query the device to determine which firmware image and board configuration to load in at runtime. .Pp The options are as follows: -.Bl -tag -width indent +.Bl -tag -width "-f firmware_path" .It Fl D Enable verbose debugging. .It Fl d Ar device_name Specify .Xr ugen 4 device name. -.It Fl I -Enable informational debugging. .It Fl f Ar firmware_path Specify the directory containing the firmware files to search and upload. .It Fl h Display usage message and exit. +.It Fl I +Enable informational debugging. .El .Sh EXIT STATUS .Ex -std From nobody Fri May 31 21:13: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 4VrbSp4TD4z5LPbQ; Fri, 31 May 2024 21:13: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 4VrbSp3gznz4ZwT; Fri, 31 May 2024 21:13:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717190010; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LYK2fvpqOSFvdXY2ZZzrl7lB3au5FDnIvcq69e1hAQU=; b=PdsapOIULrWaU88L79SHViOS/EWfKfHduuxFU7gSe4Zy5e3ZR3TpKpRrWhZOSYPQAqozRI aqIulX9UsgjOhWi1P2e/ySY+q1xHgucrIVKfGQw6fUMC3iP2RqUnnBFlBMok9HC16Y4UHf R2epIH9xBSS8q8Ijqf55D7d+GJo+SJzRHZ9qeXO74WJzvt0j3XZsEkQAPZ7pVUkKUK58Fd Qvcd/6dZd0vkW30Ju2Rsy1DPp5CF6Xn+/PsZBwP8E1MBf2NVl40D43MtuesrjcGmVjARie wOFCmLyFr7k7gARn6HIEhZBwSN4RbBVgqD+hgolNdWs1wZ7wNfHdwEHHsZA84g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1717190010; a=rsa-sha256; cv=none; b=bH+FdgUzi6/+iuUpc1x+7UM5Gl3HpnKjwxAAqODuGL0don11i6DRDcEpBQK+L9/al0L2bW fBTrRoUlQXoWZJqi7j9E9F8St2MxikXPM4GckLaLii3DP3Wmeuo11EaXRoSp+kRvmOToHU XmWFEo7eqj0eIrLxbQIxgEm8Gq0Lvc4fmNB8EV5kwLpAMsugvdBluMp+yRecXtTgYMZb01 GfhVzIlREIgvwPHLLZUZjNxez/lPWUyv8O4ffcIx3l6a7B3cAET6gbzNu8yMyJl893rGpR XmVQUIgcZXtHNTyMuJvHBqCbe9fcsSeISSyjSXe+B7KGb4jv3D0+s4rrV31bQA== 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=1717190010; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LYK2fvpqOSFvdXY2ZZzrl7lB3au5FDnIvcq69e1hAQU=; b=hk9mA3LoBmvcpkf2zY0WABVOn712DUJS3Z9q8qV8JCVzIZnwFpr23XiII+fmi9G4vIi6Et pLQR1h7IyCpMTxBYaO+yM2QXxo6j/V2UWSkqd2Ozh6HlrakkT0ZOocrz6ifFl5f3hqY+A4 526uLMxnZ38fG5aHnniV9EuvH+U+vzuWcH/NUKKUz2581JQFsN2xX9zN1XCIqj+YLW0FWI HXosfhheacePnmZrA23wos0p6EygJs3dtrQjUz49T/k4Iyi+Xfmdq652xBRXWPAwk/8FQ4 rNQZpBvbReI35KxuV25QVFUnfjt1GAv8VXB+83mC2oatQ5MXTkysdkC9IhZ8SQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VrbSp3H5szg5n; Fri, 31 May 2024 21:13: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 44VLDUp4037555; Fri, 31 May 2024 21:13:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44VLDUal037552; Fri, 31 May 2024 21:13:30 GMT (envelope-from git) Date: Fri, 31 May 2024 21:13:30 GMT Message-Id: <202405312113.44VLDUal037552@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jessica Clarke Subject: git: fe2b60f87e1e - main - openzfs: Fix mismerge breaking macOS bootstrap List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fe2b60f87e1ec45594e61e4e2e5f188640bf540c Auto-Submitted: auto-generated The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=fe2b60f87e1ec45594e61e4e2e5f188640bf540c commit fe2b60f87e1ec45594e61e4e2e5f188640bf540c Author: Jessica Clarke AuthorDate: 2024-05-31 21:12:18 +0000 Commit: Jessica Clarke CommitDate: 2024-05-31 21:12:18 +0000 openzfs: Fix mismerge breaking macOS bootstrap Upstream added the libspl_gettid implementation for macOS and when merging back to FreeBSD this resulted in two copies of the same code. Delete this second copy, restoring the file to be the same as upstream. Fixes: aca928a50a42 ("zfs: merge openzfs/zfs@e2357561b") --- sys/contrib/openzfs/lib/libspl/assert.c | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/sys/contrib/openzfs/lib/libspl/assert.c b/sys/contrib/openzfs/lib/libspl/assert.c index 315ddd6b9a9d..d11361b387e2 100644 --- a/sys/contrib/openzfs/lib/libspl/assert.c +++ b/sys/contrib/openzfs/lib/libspl/assert.c @@ -65,19 +65,6 @@ libspl_gettid(void) } #endif -#if defined(__APPLE__) -static inline uint64_t -libspl_gettid(void) -{ - uint64_t tid; - - if (pthread_threadid_np(NULL, &tid) != 0) - tid = 0; - - return (tid); -} -#endif - static boolean_t libspl_assert_ok = B_FALSE; void From nobody Fri May 31 21:24:29 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VrbjT5lRtz5LQNb; Fri, 31 May 2024 21:24:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VrbjT5J9Wz4cH0; Fri, 31 May 2024 21:24:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717190669; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bqIvw7MoLp8cJ012Xzmx4RGXzWyPm72YAPJX2U7XVYY=; b=tIXIz/fquo3irQLIpjsGK71SYxJjcc8+FNVZTg7PC6SUC5nraV9hgEiTOjZ7puBnMgAKu/ VPEBn04A/OtS88XXDE5Z43O17OnQ69xG21pY3rmMJ4lOsEjamMc1pj3XHYJbeGyjs0cjra ZDyrKwgVYVeLB+bOki/EC7rQyg2keamYfhCe5hkJHP/Ci0vYR1WRq2piBUot9BuRcZ4GMn fOEQp5ASAOPVCq23TQUcSKSl3OHTNBO4js0usJ629QwALkYbxx5HG9YCMkMNgv3CBhl5MJ 8nTKo1bWKGbdcT07JPcAi22ceVXrZCDLZsA8nEIAAZfcCNVT9Tcq+p6tfiRhpA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1717190669; a=rsa-sha256; cv=none; b=mF9zBhyPv/edn13PuQ+FAJSWo676ATygp5o9dRO0Af4EgY3UayIvLGwZUU+krDb34CAxnt 6K6R50dT9IBTHj9qO4gJo9oIiAm+jPn4GFiPtPm5k6RjN9/mdZlPWa9TlUYHYDK9p5mRnn TYMT72eUWvvsPh8lvxDSssyoQ4xp9LYuWXv5TrWXA42AfkO64R6tJ4/G/DLra89a/9b3vT 0nU3SXdU7yXEfJKSkQDSrJMXFXS0fRX2jtdzADt6Sk7soxDtpSEXce2PrcD33POARgkAB5 xesaDJhFGASOCegI9R/pJ/vcYK26zC2Vxx7PEiQGSGeaTF8vYhbQ2dP9YFB13w== 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=1717190669; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bqIvw7MoLp8cJ012Xzmx4RGXzWyPm72YAPJX2U7XVYY=; b=bKzdCHeUOwpIGBwDO0XNrZpq9xq1WN0HHo1wDnXlq2KmvgicqRLEe68Od5CYBouAtQBHvQ fC7bVqwmxaGFpZbE/VzQ1mPj6yMjqMJNJSHUG74I8C9ONgzxju6LOtTc3Loz+QKjOzh4S2 kU8REidlRxChwnJwn43o+3G8PgchmgwpMKI9PNkyu2kPoH8+eQyCWG8LFfNmF4GABrbgzx QRCQPAMnVWfph2dTSD3DYE2TbFE1qyK1ZefWCjjCyak+127pNlrE+WIqgthUxyFG5BriBE Rap39Sk3V5V69L9DAwG7BxfCzh/LqmcdPd2uw864PEXItW70c2jp6jPctuMqRg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VrbjT4n8czgbg; Fri, 31 May 2024 21:24: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 44VLOT1J054262; Fri, 31 May 2024 21:24:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44VLOTF0054259; Fri, 31 May 2024 21:24:29 GMT (envelope-from git) Date: Fri, 31 May 2024 21:24:29 GMT Message-Id: <202405312124.44VLOTF0054259@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: d1bd097d52cb - main - mdconfig: fix cleanup in the attach_size_rounddown test List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: asomers X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d1bd097d52cb5f8b0484e1f22c5506846f4ed304 Auto-Submitted: auto-generated The branch main has been updated by asomers: URL: https://cgit.FreeBSD.org/src/commit/?id=d1bd097d52cb5f8b0484e1f22c5506846f4ed304 commit d1bd097d52cb5f8b0484e1f22c5506846f4ed304 Author: Alan Somers AuthorDate: 2024-05-31 21:18:25 +0000 Commit: Alan Somers CommitDate: 2024-05-31 21:20:13 +0000 mdconfig: fix cleanup in the attach_size_rounddown test MFC after: 1 week MFC with: ed59446b47095fc20c1f77e832286f5b953cd289 Sponsored by: Axcient --- sbin/mdconfig/tests/mdconfig_test.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbin/mdconfig/tests/mdconfig_test.sh b/sbin/mdconfig/tests/mdconfig_test.sh index 9aaf724206b1..655b7fd63b40 100755 --- a/sbin/mdconfig/tests/mdconfig_test.sh +++ b/sbin/mdconfig/tests/mdconfig_test.sh @@ -291,7 +291,7 @@ attach_size_rounddown_body() -x "mdconfig -r -u ${md#md} -s ${ms2}b" check_diskinfo "$md" 16384 2 $ss } -attach_size_rounddown() +attach_size_rounddown_cleanup() { cleanup_common } From nobody Fri May 31 21:54: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 4VrcNg0Vwcz5LTpC; Fri, 31 May 2024 21:54:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VrcNg03Gfz4fg0; Fri, 31 May 2024 21:54:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717192499; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rcS0o5/MaJOQ9OyAJO3+ty/5hGqZMUxlTynNluaNrpw=; b=QRygYUTsNLnD/jb/k3DDGFSadyI+9Rq/iptMgvHVOj5ga1ZmfNubusBn4GJUG5DsdSTkpX jcUF9+gAD5v/b6rzNPSLNakqG1HkRPw81NgZCnyWCy55J2NYH/bVHgvNS0e7WEqFE+TWji 1n5cSABn21GJeGGHFtfNd0zGoFcgV8adr050FyqfheiHjWH6GOZWmuYsJb/3CxxV0f+oAT GL+jSyvRA5XUcEAvMWqdzqcpYxNEAktI5Jpj5uLnUr27Ehd62ard/wZy9NP9byyq50mUHn QAXnag3B+aNIXDE7pUFtNEImhEhq298DEcsCtE6VoysgVGQaqP5VkjQg7JR7JQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1717192499; a=rsa-sha256; cv=none; b=Lcyo7srRG0ygaLdHjFajnXLOktx3967iKjfzS0x5A/ZIV0Cjm9Dy0t0NfBfP9pB4n5EefN 29AMiEAP/MHKlmej7VVlFbQ8NzPy0sE159K3giLlUymG6X12tg+Btq4iLWpRqd8JFSBKKd HiNJrFKx534lQIlxIpH/MqDwQZkfnzGcyPKsso/9RHgIfr9ok3TVSS1VSh7lvgg4YH6Enr imFa6gKeN88wsNXyJEVr63vkl6wKUmJOjtBZapiIO/wPdSKyM2oQ/e92+197TpzHysbJcM luDV+u8x8vavUMLJ7FBympp1KTfHJRMnIAKVCo4EC//dVFvb8KBo1q8Jl2Brmg== 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=1717192499; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rcS0o5/MaJOQ9OyAJO3+ty/5hGqZMUxlTynNluaNrpw=; b=XqdXwx5CVuTUbI9xQdrsHO/WjSTYH0ieZrLg5ZlmnwjbxW+LT33i8iqrV817dDzodtMVlG LJst/j/VwgaGWJv0OH4e4CskUm/6bdydtTt42xQCZAB2lzZIXc9k8uOsFe+d5xWoVBh7Rb kCXPyjJWN4OPHYALLwhkMiwdjZP9zxtqVAgd8Psg34+lVmd4kfotqrfImMf5bf6rzoFN+l E9kH+nbHb1X1HpRU9TuBnHbvR53oHNG4brzHGSY0jvJPFh1LdmpVla/3Y2u1OxP+8NPLsD o1GUeE80VdyfPnki4uKFpXz7g915EKC+y+naAsVdcrfC9cTETdk5+39NFi55hg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VrcNf6mgDzhVR; Fri, 31 May 2024 21:54: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 44VLswm6004883; Fri, 31 May 2024 21:54:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44VLswRX004880; Fri, 31 May 2024 21:54:58 GMT (envelope-from git) Date: Fri, 31 May 2024 21:54:58 GMT Message-Id: <202405312154.44VLswRX004880@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: 3dc2a8848986 - main - arm64 pmap: Convert panic()s to KASSERT()s List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: 3dc2a8848986df2c10ae7df4ce87a1538f549a85 Auto-Submitted: auto-generated The branch main has been updated by alc: URL: https://cgit.FreeBSD.org/src/commit/?id=3dc2a8848986df2c10ae7df4ce87a1538f549a85 commit 3dc2a8848986df2c10ae7df4ce87a1538f549a85 Author: Alan Cox AuthorDate: 2024-05-31 17:22:14 +0000 Commit: Alan Cox CommitDate: 2024-05-31 21:54:27 +0000 arm64 pmap: Convert panic()s to KASSERT()s There is no reason for the ATTR_SW_NO_PROMOTE checks in pmap_update_{entry,strided}() to be panic()s instead of KASSERT()s. Requested by: markj Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D45424 --- sys/arm64/arm64/pmap.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/sys/arm64/arm64/pmap.c b/sys/arm64/arm64/pmap.c index cd7837e58380..aaba6ca189a1 100644 --- a/sys/arm64/arm64/pmap.c +++ b/sys/arm64/arm64/pmap.c @@ -4565,9 +4565,8 @@ pmap_update_entry(pmap_t pmap, pd_entry_t *ptep, pd_entry_t newpte, register_t intr; PMAP_LOCK_ASSERT(pmap, MA_OWNED); - - if ((newpte & ATTR_SW_NO_PROMOTE) != 0) - panic("%s: Updating non-promote pte", __func__); + KASSERT((newpte & ATTR_SW_NO_PROMOTE) == 0, + ("%s: Updating non-promote pte", __func__)); /* * Ensure we don't get switched out with the page table in an @@ -4608,9 +4607,8 @@ pmap_update_strided(pmap_t pmap, pd_entry_t *ptep, pd_entry_t *ptep_end, register_t intr; PMAP_LOCK_ASSERT(pmap, MA_OWNED); - - if ((newpte & ATTR_SW_NO_PROMOTE) != 0) - panic("%s: Updating non-promote pte", __func__); + KASSERT((newpte & ATTR_SW_NO_PROMOTE) == 0, + ("%s: Updating non-promote pte", __func__)); /* * Ensure we don't get switched out with the page table in an From nobody Fri May 31 22:36: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 4VrdJM5fmRz5LXyM; Fri, 31 May 2024 22:36:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VrdJM58fnz4j9J; Fri, 31 May 2024 22:36:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717194979; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=f/1HrI+lJxWzjN7oAGtmHMVRXXfFjc8SbCQgmNpZIPw=; b=k78lWzoxpV4tk6teD6wEtW44/rVhgkCuhuFMp8vYy6XBV0KnBmSLTFgkVye+DgTVBmWOTF xq1drXr+/ukEG7T7X/zN7l6AA7nHd1+4ifYixBgdUV9V7cvWwC0tisGpqRSAPdPwoPf4xU 4+64Ev4a0foRZZ5Qolr7NnKqd0t7Rxd2OLKTmyE2uLIM26m/Nk2liNux9Ys+KjGBBoZLSn KFsLtFMBbm1xwl5P1xOeZ+RFg49u864VakuzBUy90sId1TlD4FZNtEvKiis74RzfcL5P+1 1gULRY3Ivv0Y7j2BwfCmbdZXG+h7/fXIBT0jsi5GQVPKUCJRJVADxVYYIBGmjQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1717194979; a=rsa-sha256; cv=none; b=eH2OSN9Zknv3XAtYpNZFhLbSiSU2NX83V/FQ/u0vfor9qlM47Drkqu5FuGoPgXqT6hWX8W 50coen7y0z2yW3Igli4kl97AYa/qPr7CbKdzY1XP2DtQWJ96avnvgsT74jq7/KPGFuOvXR 92Sbks/kemirkKExVf8SamxIkQo6R0eyHzBIY/tpoewLp8fkwUdGYC/qwUkE6OjxJkMBXU WlrBcGgVtRh1oACKEZo1DS6MSERRXAQhxzFArwjhucY//tujdjdtXlAEJclznPl/QaRzXY k2z0l/4gceTqxADnlvFYslH0GVNc5srtF3881Gcngy4rYoyy+DYaoPK4gqXoMg== 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=1717194979; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=f/1HrI+lJxWzjN7oAGtmHMVRXXfFjc8SbCQgmNpZIPw=; b=T1cgoz1FPGEDMZYdMmNZbz8afVBVcgR7zreJXJvpf6YhYboI8i+DBPwUzQeO94CRxl8mlq 6Fqfb4lHEb+zmiIKeClAXFPW/YJsxLBR7noM621FBBLCa3ejE9Uqy5XB9JYRJBsVjoaw5h GrRhAGDlFfYhhWVX7tta8pg6A7s9n8ctsRVr/iIglmR3NnJRG+80eTbqMV9P5Vmadu48aL vSX3Nuqtwllxz0hP8aj8YR/vw9ZdjUc8h7CTJv9e6BlPjua1ZPs0sHRYH+Y0uhuqnvVaKQ 4ws0FycTqOyxzgGkZvh3wGwYa9j3kryl4xnuWz/USWwTTx1SQ7DBWn21TBm8Tw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VrdJM4lmyzjDm; Fri, 31 May 2024 22:36: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 44VMaJxP072621; Fri, 31 May 2024 22:36:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44VMaJRH072618; Fri, 31 May 2024 22:36:19 GMT (envelope-from git) Date: Fri, 31 May 2024 22:36:19 GMT Message-Id: <202405312236.44VMaJRH072618@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: 4c136aad80e6 - stable/14 - svc.c: Check for a non-NULL xp_socket List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: 4c136aad80e6da1c9aa99de863642fe64a54f9a8 Auto-Submitted: auto-generated The branch stable/14 has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=4c136aad80e6da1c9aa99de863642fe64a54f9a8 commit 4c136aad80e6da1c9aa99de863642fe64a54f9a8 Author: Rick Macklem AuthorDate: 2024-05-28 02:22:04 +0000 Commit: Rick Macklem CommitDate: 2024-05-31 22:35:18 +0000 svc.c: Check for a non-NULL xp_socket Commit a16ff32f04b5 added support to the kernel RPC to set TCP_USE_DDP. However, for the unusual case of a NFSv4.1/4.2 non-NULL callback, the xp_socket field of SVCXPRT is NULL, since it uses the same socket as the client->server connection. This patch adds the check for this to avoid crashes. This only affects NFSv4.1/4.2 mounts where either pNFS or delegations are in use. (cherry picked from commit 6c9170e0afc4ebec81ba88a6370ebf6cb55520ba) --- sys/rpc/svc.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/rpc/svc.c b/sys/rpc/svc.c index 6d19a0b1ea7d..1e0e02c23cc1 100644 --- a/sys/rpc/svc.c +++ b/sys/rpc/svc.c @@ -1000,6 +1000,7 @@ svc_getreq(SVCXPRT *xprt, struct svc_req **rqstp_ret) * enable TLS offload first. */ if (xprt->xp_doneddp == 0 && r->rq_proc != NULLPROC && + xprt->xp_socket != NULL && atomic_cmpset_int(&xprt->xp_doneddp, 0, 1)) { if (xprt->xp_socket->so_proto->pr_protocol == IPPROTO_TCP) { From nobody Sat Jun 1 08:37: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 4Vrtdh68Mvz5MTVh; Sat, 01 Jun 2024 08:37:12 +0000 (UTC) (envelope-from eduardo@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 4Vrtdh5pzWz4hqM; Sat, 1 Jun 2024 08:37:12 +0000 (UTC) (envelope-from eduardo@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717231032; 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=pRlwitOzPwnpH/qMjNC93lYaxVW3uE6OuBNh/M4ViuM=; b=FNVTJUJFLh/rT7DIog6AxrbUOZF7MqC/xe5oEEh3CBJ3MKWQZ6OZPOWQR5Q0dhXJZ9ER6W gc9Yxsj68o8oKVOGMi9rZSKNYau4EuAcSv4R7v6x8APHoWmE0t62FvK1f+cm3oZmtdw9b4 B5oyUiZi0vX2wg3pZ1wx3y25ovRQctXjBj5SDscpv03hipofvTU26Usi7W0DopQGsS5bJ/ D7MbmY/tCS3q7YNWqYQgps6Q2C/TxqLl1Z/4KHAszxURbHv5FVgKvGYc3dIyfVy3W4zMXg Z9uP558yyM66T7Kcv6r/OevkOtlADBRFrjJ4CnUJK5sKkJS+x5HJ7SuFVtheCg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1717231032; a=rsa-sha256; cv=none; b=M47JfjNhEAxt45z8Q9nOg/nModsbMGNV31cEQ5lUjtASiPSNAVf0eXbOGgJ9QUp76y9Gz1 wohde06FQqH5LVAzEAfkT4239QIG3kVAbYzNVusDzb8RJWNKgt3Ykg8Nbbxb9coQc5HImg y50XcPgpBWReBkXZQI9U/MzEbEZ5UOretymPGVaeUJ4pn+hZyFUlQ3xk+1xSNKiU03umSK Z4KHyBr6zv+XY3fnrPOHRYJR70Rg5G457VfPxrRwhg08sz28f3mQIsGdkqn3TMDVJflRf7 7LxBZD0JsXryDMjlakDHLDOd8kOu03EYMNmHx1h1uLK16qrNxAbAVZdiYD0SPQ== 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=1717231032; 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=pRlwitOzPwnpH/qMjNC93lYaxVW3uE6OuBNh/M4ViuM=; b=YEY7Mvyy1yR6BCVjjUOvhTyVOIm7EB/rfATo6L7wMrpI8O+Q5b/UFpBLOux7EJ4crFb7ty wTow2SH28ixbWCYRBRtOtkQiXj+uzvdcbI0w6qPRiSEZvhjs5wDALa3cqXGQZsWfnkMQ2k /V2PFpDCH4YTca3wpYV2nQxH2FRGof5C2P/2upMswpwttX0c8a+qYaSstBadQM/3tQu0S6 6yXv+h8JSkNI79zkuVvcFxEdUZMh+V+fXfPvJjrSax3UUgZn+REhaZyOJ/gQUOSLCKNsL+ fePmHlzldXTIRevFWqqQrjaSow+QGp1SleqyX6/QDT5t4T6qMMJzcdvBdpswbg== Received: from mail-qk1-f180.google.com (mail-qk1-f180.google.com [209.85.222.180]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "WR4" (verified OK)) (Authenticated sender: eduardo) by smtp.freebsd.org (Postfix) with ESMTPSA id 4Vrtdh5PK1zZGm; Sat, 1 Jun 2024 08:37:12 +0000 (UTC) (envelope-from eduardo@freebsd.org) Received: by mail-qk1-f180.google.com with SMTP id af79cd13be357-795002e775bso11322885a.0; Sat, 01 Jun 2024 01:37:12 -0700 (PDT) X-Forwarded-Encrypted: i=1; AJvYcCUVvogpxJLLtcAii4cePYOku1yjeaugqqxOOk+QiK9EUpnXSiG1ixAXf648rBIKajf6iGPZRP6Bgt2RX1znb9KJoumSq/KblPLyg5dEjq88WkLp2+n1lZQtkFlGvmkEVUaPAQ1VNkm07l3dNE4RmWH6KA== X-Gm-Message-State: AOJu0YycNDASEfu8dkTrzga0xGXUqzj/7jys+wzRiya0Pjjwd1DHofxn 75BW20l+adGHXR3g/ilPc00pF4R8uYTw674Z9GePp9eTr5qZWrB96BAsq1EgIaYKwyk0ne96zh3 xm6khxvasu5s7u24OAvGiXeYXcHE= X-Google-Smtp-Source: AGHT+IFl9FBmnyxN0SEbAczpWuh/QiO8uDV8izpE7P++e8v/t8rsNKVjQlaiXSlJjpzt3PlSmjIXtX88IWtUdxAhONM= X-Received: by 2002:a05:620a:664:b0:794:9def:9691 with SMTP id af79cd13be357-794f5c93279mr343002885a.35.1717231031883; Sat, 01 Jun 2024 01:37:11 -0700 (PDT) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 References: <202405311447.44VEl1G1078199@gitrepo.freebsd.org> In-Reply-To: <202405311447.44VEl1G1078199@gitrepo.freebsd.org> From: Nuno Teixeira Date: Sat, 1 Jun 2024 09:37:00 +0100 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: git: 108de784513d - main - Redefine CLOCK_BOOTTIME to alias CLOCK_MONOTONIC, not CLOCK_UPTIME To: Warner Losh Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Content-Type: multipart/alternative; boundary="000000000000a7274a0619d0017c" --000000000000a7274a0619d0017c Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Hello, Having issues building graphics/mesa-dri: ../src/intel/common/xe/intel_gem.c:72:9: error: duplicate case value '4' 72 | case CLOCK_BOOTTIME: | ^ /usr/include/sys/_clock_id.h:81:25: note: expanded from macro 'CLOCK_BOOTTIME' 81 | #define CLOCK_BOOTTIME CLOCK_MONOTONIC | ^ /usr/include/sys/_clock_id.h:56:26: note: expanded from macro 'CLOCK_MONOTONIC' 56 | #define CLOCK_MONOTONIC 4 | ^ ../src/intel/common/xe/intel_gem.c:66:9: note: previous case defined here 66 | case CLOCK_MONOTONIC: | ^ /usr/include/sys/_clock_id.h:56:26: note: expanded from macro 'CLOCK_MONOTONIC' 56 | #define CLOCK_MONOTONIC 4 | ^ 1 error generated. Thanks Warner Losh escreveu (sexta, 31/05/2024 =C3=A0(s) 15:47): > The branch main has been updated by imp: > > URL: > https://cgit.FreeBSD.org/src/commit/?id=3D108de784513d87bbe850e7b003a73e2= 6b5b54caa > > commit 108de784513d87bbe850e7b003a73e26b5b54caa > Author: Val Packett > AuthorDate: 2024-05-31 14:45:02 +0000 > Commit: Warner Losh > CommitDate: 2024-05-31 14:45:02 +0000 > > Redefine CLOCK_BOOTTIME to alias CLOCK_MONOTONIC, not CLOCK_UPTIME > > The suspend-awareness situation with monotonic clocks across platform= s > is kind of a mess, let's try not making it worse. > > On Linux, CLOCK_MONOTONIC does NOT count suspended time, and > CLOCK_BOOTTIME was introduced to INCLUDE suspended time. > > On OpenBSD, CLOCK_MONOTONIC DOES count suspended time, and CLOCK_UPTI= ME > was introduced to EXCLUDE suspended time. > > On macOS, it's the same as OpenBSD, but with CLOCK_UPTIME_RAW. > > Right now, we do not have a monotonic clock that counts suspended tim= e. > We have CLOCK_UPTIME as a distinct ID alias, and CLOCK_BOOTTIME as a > preprocessor alias, both being effectively `CLOCK_MONOTONIC` for now. > > When we introduce a suspend-aware clock in the future, it would make = a > lot more sense to do it the OpenBSD/macOS way, i.e. to make > CLOCK_MONOTONIC include suspended time and make CLOCK_UPTIME exclude > it, > because that's what the name CLOCK_UPTIME implies: a deviation from t= he > default intended for the uptime command to allow it to only show the > time the system was actually up and not suspended. > > Let's change the define right now to make sure software using the > define > would not end up using the ID of the wrong clock in the future, and f= ix > the IDs in the Linux compat code to match the expected changes too. > > See https://bugzilla.mozilla.org/show_bug.cgi?id=3D1824084 > for more discussion. > > Fixes: 155f15118a77 ("clock_gettime: Add Linux aliases for > CLOCK_*") > Fixes: 25ada637362d ("Map Linux CLOCK_BOOTTIME to native > CLOCK_UPTIME.") > Sponsored by: https://www.patreon.com/valpackett > Reviewed by: kib, imp > Differential Revision: https://reviews.freebsd.org/D39270 > --- > sys/compat/linux/linux_time.c | 6 +++--- > sys/sys/_clock_id.h | 2 +- > 2 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/sys/compat/linux/linux_time.c b/sys/compat/linux/linux_time.= c > index e9e5cf075210..f4dd26dd3d2a 100644 > --- a/sys/compat/linux/linux_time.c > +++ b/sys/compat/linux/linux_time.c > @@ -287,7 +287,7 @@ linux_to_native_clockid(clockid_t *n, clockid_t l) > *n =3D CLOCK_REALTIME; > break; > case LINUX_CLOCK_MONOTONIC: > - *n =3D CLOCK_MONOTONIC; > + *n =3D CLOCK_UPTIME; > break; > case LINUX_CLOCK_PROCESS_CPUTIME_ID: > *n =3D CLOCK_PROCESS_CPUTIME_ID; > @@ -300,10 +300,10 @@ linux_to_native_clockid(clockid_t *n, clockid_t l) > break; > case LINUX_CLOCK_MONOTONIC_COARSE: > case LINUX_CLOCK_MONOTONIC_RAW: > - *n =3D CLOCK_MONOTONIC_FAST; > + *n =3D CLOCK_UPTIME_FAST; > break; > case LINUX_CLOCK_BOOTTIME: > - *n =3D CLOCK_UPTIME; > + *n =3D CLOCK_MONOTONIC; > break; > case LINUX_CLOCK_REALTIME_ALARM: > case LINUX_CLOCK_BOOTTIME_ALARM: > diff --git a/sys/sys/_clock_id.h b/sys/sys/_clock_id.h > index 47a551428dc3..728346a0f0ab 100644 > --- a/sys/sys/_clock_id.h > +++ b/sys/sys/_clock_id.h > @@ -78,7 +78,7 @@ > * Linux compatible names. > */ > #if __BSD_VISIBLE > -#define CLOCK_BOOTTIME CLOCK_UPTIME > +#define CLOCK_BOOTTIME CLOCK_MONOTONIC > #define CLOCK_REALTIME_COARSE CLOCK_REALTIME_FAST > #define CLOCK_MONOTONIC_COARSE CLOCK_MONOTONIC_FAST > #endif > > --=20 Nuno Teixeira FreeBSD UNIX: Web: https://FreeBSD.org --000000000000a7274a0619d0017c Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
Hello,

Having issues buildin= g graphics/mesa-dri:

../src/intel/common/xe/intel_= gem.c:72:9: error: duplicate case value '4'
=C2=A0 =C2=A072 | = =C2=A0 =C2=A0case CLOCK_BOOTTIME:
=C2=A0 =C2=A0 =C2=A0 | =C2=A0 =C2=A0 = =C2=A0 =C2=A0 ^
/usr/include/sys/_clock_id.h:81:25: note: expanded from = macro 'CLOCK_BOOTTIME'
=C2=A0 =C2=A081 | #define CLOCK_BOOTTIME = =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0CLOCK_MONOTONIC
=C2=A0 =C2=A0 =C2=A0 |= =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 ^
/usr/include/sys/_clock_id.h:56= :26: note: expanded from macro 'CLOCK_MONOTONIC'
=C2=A0 =C2=A056= | #define CLOCK_MONOTONIC =C2=A0 =C2=A0 =C2=A0 =C2=A0 4
=C2=A0 =C2=A0 = =C2=A0 | =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 ^
../src/intel/common/xe/i= ntel_gem.c:66:9: note: previous case defined here
=C2=A0 =C2=A066 | =C2= =A0 =C2=A0case CLOCK_MONOTONIC:
=C2=A0 =C2=A0 =C2=A0 | =C2=A0 =C2=A0 =C2= =A0 =C2=A0 ^
/usr/include/sys/_clock_id.h:56:26: note: expanded from mac= ro 'CLOCK_MONOTONIC'
=C2=A0 =C2=A056 | #define CLOCK_MONOTONIC = =C2=A0 =C2=A0 =C2=A0 =C2=A0 4
=C2=A0 =C2=A0 =C2=A0 | =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0 =C2=A0 ^
1 error generated.

Thanks
<= /font>

Warner Losh <i= mp@freebsd.org> escreveu (sexta, 31/05/2024 =C3=A0(s) 15:47):
The branch main has be= en updated by imp:

URL: https://cgit.= FreeBSD.org/src/commit/?id=3D108de784513d87bbe850e7b003a73e26b5b54caa
commit 108de784513d87bbe850e7b003a73e26b5b54caa
Author:=C2=A0 =C2=A0 =C2=A0Val Packett <val@packett.cool>
AuthorDate: 2024-05-31 14:45:02 +0000
Commit:=C2=A0 =C2=A0 =C2=A0Warner Losh <imp@FreeBSD.org>
CommitDate: 2024-05-31 14:45:02 +0000

=C2=A0 =C2=A0 Redefine CLOCK_BOOTTIME to alias CLOCK_MONOTONIC, not CLOCK_U= PTIME

=C2=A0 =C2=A0 The suspend-awareness situation with monotonic clocks across = platforms
=C2=A0 =C2=A0 is kind of a mess, let's try not making it worse.

=C2=A0 =C2=A0 On Linux, CLOCK_MONOTONIC does NOT count suspended time, and<= br> =C2=A0 =C2=A0 CLOCK_BOOTTIME was introduced to INCLUDE suspended time.

=C2=A0 =C2=A0 On OpenBSD, CLOCK_MONOTONIC DOES count suspended time, and CL= OCK_UPTIME
=C2=A0 =C2=A0 was introduced to EXCLUDE suspended time.

=C2=A0 =C2=A0 On macOS, it's the same as OpenBSD, but with CLOCK_UPTIME= _RAW.

=C2=A0 =C2=A0 Right now, we do not have a monotonic clock that counts suspe= nded time.
=C2=A0 =C2=A0 We have CLOCK_UPTIME as a distinct ID alias, and CLOCK_BOOTTI= ME as a
=C2=A0 =C2=A0 preprocessor alias, both being effectively `CLOCK_MONOTONIC` = for now.

=C2=A0 =C2=A0 When we introduce a suspend-aware clock in the future, it wou= ld make a
=C2=A0 =C2=A0 lot more sense to do it the OpenBSD/macOS way, i.e. to make =C2=A0 =C2=A0 CLOCK_MONOTONIC include suspended time and make CLOCK_UPTIME = exclude it,
=C2=A0 =C2=A0 because that's what the name CLOCK_UPTIME implies: a devi= ation from the
=C2=A0 =C2=A0 default intended for the uptime command to allow it to only s= how the
=C2=A0 =C2=A0 time the system was actually up and not suspended.

=C2=A0 =C2=A0 Let's change the define right now to make sure software u= sing the define
=C2=A0 =C2=A0 would not end up using the ID of the wrong clock in the futur= e, and fix
=C2=A0 =C2=A0 the IDs in the Linux compat code to match the expected change= s too.

=C2=A0 =C2=A0 See https://bugzilla.mozilla.o= rg/show_bug.cgi?id=3D1824084
=C2=A0 =C2=A0 for more discussion.

=C2=A0 =C2=A0 Fixes:=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 155f15118a77 ("= clock_gettime: Add Linux aliases for CLOCK_*")
=C2=A0 =C2=A0 Fixes:=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 25ada637362d ("= Map Linux CLOCK_BOOTTIME to native CLOCK_UPTIME.")
=C2=A0 =C2=A0 Sponsored by:=C2=A0 =C2=A0https://www.patreon.com/va= lpackett
=C2=A0 =C2=A0 Reviewed by:=C2=A0 =C2=A0 kib, imp
=C2=A0 =C2=A0 Differential Revision:=C2=A0 https://reviews.freebsd= .org/D39270
---
=C2=A0sys/compat/linux/linux_time.c | 6 +++---
=C2=A0sys/sys/_clock_id.h=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0| 2 +- =C2=A02 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/sys/compat/linux/linux_time.c b/sys/compat/linux/linux_time.c<= br> index e9e5cf075210..f4dd26dd3d2a 100644
--- a/sys/compat/linux/linux_time.c
+++ b/sys/compat/linux/linux_time.c
@@ -287,7 +287,7 @@ linux_to_native_clockid(clockid_t *n, clockid_t l)
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 *n =3D CLOCK_REALTI= ME;
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 break;
=C2=A0 =C2=A0 =C2=A0 =C2=A0 case LINUX_CLOCK_MONOTONIC:
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0*n =3D CLOCK_MONOTO= NIC;
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0*n =3D CLOCK_UPTIME= ;
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 break;
=C2=A0 =C2=A0 =C2=A0 =C2=A0 case LINUX_CLOCK_PROCESS_CPUTIME_ID:
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 *n =3D CLOCK_PROCES= S_CPUTIME_ID;
@@ -300,10 +300,10 @@ linux_to_native_clockid(clockid_t *n, clockid_t l) =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 break;
=C2=A0 =C2=A0 =C2=A0 =C2=A0 case LINUX_CLOCK_MONOTONIC_COARSE:
=C2=A0 =C2=A0 =C2=A0 =C2=A0 case LINUX_CLOCK_MONOTONIC_RAW:
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0*n =3D CLOCK_MONOTO= NIC_FAST;
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0*n =3D CLOCK_UPTIME= _FAST;
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 break;
=C2=A0 =C2=A0 =C2=A0 =C2=A0 case LINUX_CLOCK_BOOTTIME:
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0*n =3D CLOCK_UPTIME= ;
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0*n =3D CLOCK_MONOTO= NIC;
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 break;
=C2=A0 =C2=A0 =C2=A0 =C2=A0 case LINUX_CLOCK_REALTIME_ALARM:
=C2=A0 =C2=A0 =C2=A0 =C2=A0 case LINUX_CLOCK_BOOTTIME_ALARM:
diff --git a/sys/sys/_clock_id.h b/sys/sys/_clock_id.h
index 47a551428dc3..728346a0f0ab 100644
--- a/sys/sys/_clock_id.h
+++ b/sys/sys/_clock_id.h
@@ -78,7 +78,7 @@
=C2=A0 * Linux compatible names.
=C2=A0 */
=C2=A0#if __BSD_VISIBLE
-#define=C2=A0 =C2=A0 =C2=A0 =C2=A0 CLOCK_BOOTTIME=C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 CLOCK_UPTIME
+#define=C2=A0 =C2=A0 =C2=A0 =C2=A0 CLOCK_BOOTTIME=C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 CLOCK_MONOTONIC
=C2=A0#define=C2=A0 =C2=A0 =C2=A0 =C2=A0 CLOCK_REALTIME_COARSE=C2=A0 =C2=A0= CLOCK_REALTIME_FAST
=C2=A0#define=C2=A0 =C2=A0 =C2=A0 =C2=A0 CLOCK_MONOTONIC_COARSE=C2=A0 CLOCK= _MONOTONIC_FAST
=C2=A0#endif



--
Nuno Teixeira
FreeBSD UNIX:=C2=A0 <eduardo@FreeBSD.org>=C2=A0 =C2=A0Web:=C2=A0 https://Fr= eeBSD.org
--000000000000a7274a0619d0017c-- From nobody Sat Jun 1 09:24: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 4Vrvhb0JGtz5MXhq; Sat, 01 Jun 2024 09:24: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 4Vrvhb03W6z4m48; Sat, 1 Jun 2024 09:24:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717233887; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wrFttcU+7c8z+bQGXPKgabhV80vxXoes6OH4Turw6vg=; b=kzZJpF5bEoJ6FCKC6qc4Wh7lHudP7+5Wjg8CWOXkmylOKzzrChyyu2b9Uk8iPPP9zJwQJ3 DJVplWTrwT4g3pQiLg/Nv1HZl3/odEE5tQKHS2/UKacgCJxLlOFSSBLc89KIyIAs852LQB NbCieV7ebPhMcgXJo84Arvdv6TC0/QMDDn20rVBmrCkaSmO34oya2OzxF4ABp/paK8/tfq feKRSShiM7Pid9Se4X5CO9WYGwIlt7heeHQS30+ONyF5WyllgngbbudGChaYIaJiObypyU 3Mh5cVeyLdbZIojo3Jzu/2Qq4mbnSewRo6m9l8/CeNVCsYIYDrKTwDIte/naaQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1717233887; a=rsa-sha256; cv=none; b=D8vi427cK9Fup5436xAaJtl7Thd3B4HesZeUVYPmGo79N1n8Q1HRzHSxE89xgSxJpnDAfB s8pXvzDOnHxApTjHY/mgFVqSn6NqgH0iCcRzjZUXdd9qw/N38tJpR4taACq4mWbWCQLXln acUlyhrilA56nqn0I9YICxdzbUB6+5xILX7nTH9LDK///h17qkVfug1+1HsKXJ8SFPUIob wbDS+fXDVWmiOA23O4vZ+aHMdFgQt4ViYZN6yVFrdiFrQgWtStBP/3LSinaDDdaSyLG1HT +nwJ1hVzr4WbWqXzHpMUiqZ83DjZckX7eV+L2gj/Rh8Gnnr++ZW1EIT+uDrYlw== 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=1717233887; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wrFttcU+7c8z+bQGXPKgabhV80vxXoes6OH4Turw6vg=; b=SXE1iz6g1AGC3S5Cj67u/l2LkfFsQSCdgutgScJray6Dlx6s1yD0uq25lncDT0z62kIrY/ w8Mc6hTM75XYe20KFmgU8CFNZNJhIfrDz9ye5Cdb8fITvPU3kXIEOWiO05jDz8RjrB2XnN dbYCHM3yZ2xjUhWgCuobNlGVJpw9zXX1wFpGcvRgQg+3JXfjvMMb0Swz497KpPe/R1j5ok Yuz0MmDagQYhxTGuCDR/dCKUCqeqT0dAek+K6+O2hMS8kkuMZXSeNLR9TLdG97mSPFvmy5 wkZUMX2VW3mc6aiF/0f6UxSQfMctykVWORrlGXuLCTSoehkynLUzFryi0WIrfw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VrvhZ6mypz12yX; Sat, 1 Jun 2024 09:24: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 4519OktC070917; Sat, 1 Jun 2024 09:24:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4519OkDS070914; Sat, 1 Jun 2024 09:24:46 GMT (envelope-from git) Date: Sat, 1 Jun 2024 09:24:46 GMT Message-Id: <202406010924.4519OkDS070914@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: 339b47f01985 - stable/14 - x86/iommu: extract useful utilities into x86_iommu.c List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 339b47f01985628ccc4c3e9a29c36f26edb034c3 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=339b47f01985628ccc4c3e9a29c36f26edb034c3 commit 339b47f01985628ccc4c3e9a29c36f26edb034c3 Author: Konstantin Belousov AuthorDate: 2024-05-25 00:47:26 +0000 Commit: Konstantin Belousov CommitDate: 2024-06-01 09:24:24 +0000 x86/iommu: extract useful utilities into x86_iommu.c (cherry picked from commit 40d951bc5932deb87635f5c1780a6706d0c7c012) --- sys/conf/files.x86 | 1 + sys/x86/include/iommu.h | 1 + sys/x86/iommu/intel_ctx.c | 25 +++---- sys/x86/iommu/intel_dmar.h | 9 +-- sys/x86/iommu/intel_drv.c | 7 +- sys/x86/iommu/intel_fault.c | 1 + sys/x86/iommu/intel_idpgtbl.c | 77 ++++++++++---------- sys/x86/iommu/intel_intrmap.c | 3 +- sys/x86/iommu/intel_qi.c | 3 +- sys/x86/iommu/intel_quirks.c | 1 + sys/x86/iommu/intel_reg.h | 15 +--- sys/x86/iommu/intel_utils.c | 128 +++------------------------------ sys/x86/iommu/iommu_utils.c | 164 ++++++++++++++++++++++++++++++++++++++++++ sys/x86/iommu/x86_iommu.h | 62 ++++++++++++++++ 14 files changed, 302 insertions(+), 195 deletions(-) diff --git a/sys/conf/files.x86 b/sys/conf/files.x86 index 15781eea8fee..445bbf9091ba 100644 --- a/sys/conf/files.x86 +++ b/sys/conf/files.x86 @@ -320,6 +320,7 @@ x86/iommu/intel_intrmap.c optional acpi iommu pci x86/iommu/intel_qi.c optional acpi iommu pci x86/iommu/intel_quirks.c optional acpi iommu pci x86/iommu/intel_utils.c optional acpi iommu pci +x86/iommu/iommu_utils.c optional acpi iommu pci x86/isa/atrtc.c standard x86/isa/clock.c standard x86/isa/isa.c optional isa diff --git a/sys/x86/include/iommu.h b/sys/x86/include/iommu.h index a95480b53acc..98c6661aa8e3 100644 --- a/sys/x86/include/iommu.h +++ b/sys/x86/include/iommu.h @@ -7,6 +7,7 @@ #include #include +#include #include #endif /* !_MACHINE_IOMMU_H_ */ diff --git a/sys/x86/iommu/intel_ctx.c b/sys/x86/iommu/intel_ctx.c index 65ca88b052ed..444640570df7 100644 --- a/sys/x86/iommu/intel_ctx.c +++ b/sys/x86/iommu/intel_ctx.c @@ -66,6 +66,7 @@ #include #include #include +#include #include static MALLOC_DEFINE(M_DMAR_CTX, "dmar_ctx", "Intel DMAR Context"); @@ -85,7 +86,7 @@ dmar_ensure_ctx_page(struct dmar_unit *dmar, int bus) /* * Allocated context page must be linked. */ - ctxm = dmar_pgalloc(dmar->ctx_obj, 1 + bus, IOMMU_PGF_NOALLOC); + ctxm = iommu_pgalloc(dmar->ctx_obj, 1 + bus, IOMMU_PGF_NOALLOC); if (ctxm != NULL) return; @@ -96,14 +97,14 @@ dmar_ensure_ctx_page(struct dmar_unit *dmar, int bus) * threads are equal. */ TD_PREP_PINNED_ASSERT; - ctxm = dmar_pgalloc(dmar->ctx_obj, 1 + bus, IOMMU_PGF_ZERO | + ctxm = iommu_pgalloc(dmar->ctx_obj, 1 + bus, IOMMU_PGF_ZERO | IOMMU_PGF_WAITOK); - re = dmar_map_pgtbl(dmar->ctx_obj, 0, IOMMU_PGF_NOALLOC, &sf); + re = iommu_map_pgtbl(dmar->ctx_obj, 0, IOMMU_PGF_NOALLOC, &sf); re += bus; dmar_pte_store(&re->r1, DMAR_ROOT_R1_P | (DMAR_ROOT_R1_CTP_MASK & VM_PAGE_TO_PHYS(ctxm))); dmar_flush_root_to_ram(dmar, re); - dmar_unmap_pgtbl(sf); + iommu_unmap_pgtbl(sf); TD_PINNED_ASSERT; } @@ -115,7 +116,7 @@ dmar_map_ctx_entry(struct dmar_ctx *ctx, struct sf_buf **sfp) dmar = CTX2DMAR(ctx); - ctxp = dmar_map_pgtbl(dmar->ctx_obj, 1 + PCI_RID2BUS(ctx->context.rid), + ctxp = iommu_map_pgtbl(dmar->ctx_obj, 1 + PCI_RID2BUS(ctx->context.rid), IOMMU_PGF_NOALLOC | IOMMU_PGF_WAITOK, sfp); ctxp += ctx->context.rid & 0xff; return (ctxp); @@ -188,7 +189,7 @@ ctx_id_entry_init(struct dmar_ctx *ctx, dmar_ctx_entry_t *ctxp, bool move, ("ctx %p non-null pgtbl_obj", ctx)); ctx_root = NULL; } else { - ctx_root = dmar_pgalloc(domain->pgtbl_obj, 0, + ctx_root = iommu_pgalloc(domain->pgtbl_obj, 0, IOMMU_PGF_NOALLOC); } @@ -274,7 +275,7 @@ domain_init_rmrr(struct dmar_domain *domain, device_t dev, int bus, "region (%jx, %jx) corrected\n", domain->iodom.iommu->unit, start, end); } - entry->end += DMAR_PAGE_SIZE * 0x20; + entry->end += IOMMU_PAGE_SIZE * 0x20; } size = OFF_TO_IDX(entry->end - entry->start); ma = malloc(sizeof(vm_page_t) * size, M_TEMP, M_WAITOK); @@ -603,9 +604,9 @@ dmar_get_ctx_for_dev1(struct dmar_unit *dmar, device_t dev, uint16_t rid, func, rid, domain->domain, domain->mgaw, domain->agaw, id_mapped ? "id" : "re"); } - dmar_unmap_pgtbl(sf); + iommu_unmap_pgtbl(sf); } else { - dmar_unmap_pgtbl(sf); + iommu_unmap_pgtbl(sf); dmar_domain_destroy(domain1); /* Nothing needs to be done to destroy ctx1. */ free(ctx1, M_DMAR_CTX); @@ -705,7 +706,7 @@ dmar_move_ctx_to_domain(struct dmar_domain *domain, struct dmar_ctx *ctx) ctx->context.domain = &domain->iodom; dmar_ctx_link(ctx); ctx_id_entry_init(ctx, ctxp, true, PCI_BUSMAX + 100); - dmar_unmap_pgtbl(sf); + iommu_unmap_pgtbl(sf); error = dmar_flush_for_ctx_entry(dmar, true); /* If flush failed, rolling back would not work as well. */ printf("dmar%d rid %x domain %d->%d %s-mapped\n", @@ -789,7 +790,7 @@ dmar_free_ctx_locked(struct dmar_unit *dmar, struct dmar_ctx *ctx) if (ctx->refs > 1) { ctx->refs--; DMAR_UNLOCK(dmar); - dmar_unmap_pgtbl(sf); + iommu_unmap_pgtbl(sf); TD_PINNED_ASSERT; return; } @@ -811,7 +812,7 @@ dmar_free_ctx_locked(struct dmar_unit *dmar, struct dmar_ctx *ctx) else dmar_inv_iotlb_glob(dmar); } - dmar_unmap_pgtbl(sf); + iommu_unmap_pgtbl(sf); domain = CTX2DOM(ctx); dmar_ctx_unlink(ctx); free(ctx->context.tag, M_DMAR_CTX); diff --git a/sys/x86/iommu/intel_dmar.h b/sys/x86/iommu/intel_dmar.h index e20144094c80..8289478aed19 100644 --- a/sys/x86/iommu/intel_dmar.h +++ b/sys/x86/iommu/intel_dmar.h @@ -238,16 +238,11 @@ iommu_gaddr_t pglvl_page_size(int total_pglvl, int lvl); iommu_gaddr_t domain_page_size(struct dmar_domain *domain, int lvl); int calc_am(struct dmar_unit *unit, iommu_gaddr_t base, iommu_gaddr_t size, iommu_gaddr_t *isizep); -struct vm_page *dmar_pgalloc(vm_object_t obj, vm_pindex_t idx, int flags); -void dmar_pgfree(vm_object_t obj, vm_pindex_t idx, int flags); -void *dmar_map_pgtbl(vm_object_t obj, vm_pindex_t idx, int flags, - struct sf_buf **sf); -void dmar_unmap_pgtbl(struct sf_buf *sf); int dmar_load_root_entry_ptr(struct dmar_unit *unit); int dmar_inv_ctx_glob(struct dmar_unit *unit); int dmar_inv_iotlb_glob(struct dmar_unit *unit); int dmar_flush_write_bufs(struct dmar_unit *unit); -void dmar_flush_pte_to_ram(struct dmar_unit *unit, dmar_pte_t *dst); +void dmar_flush_pte_to_ram(struct dmar_unit *unit, iommu_pte_t *dst); void dmar_flush_ctx_to_ram(struct dmar_unit *unit, dmar_ctx_entry_t *dst); void dmar_flush_root_to_ram(struct dmar_unit *unit, dmar_root_entry_t *dst); int dmar_disable_protected_regions(struct dmar_unit *unit); @@ -315,9 +310,7 @@ void dmar_quirks_pre_use(struct iommu_unit *dmar); int dmar_init_irt(struct dmar_unit *unit); void dmar_fini_irt(struct dmar_unit *unit); -extern iommu_haddr_t dmar_high; extern int haw; -extern int dmar_tbl_pagecnt; extern int dmar_batch_coalesce; extern int dmar_rmrr_enable; diff --git a/sys/x86/iommu/intel_drv.c b/sys/x86/iommu/intel_drv.c index 7346162d1502..9a2fedf90b6a 100644 --- a/sys/x86/iommu/intel_drv.c +++ b/sys/x86/iommu/intel_drv.c @@ -67,6 +67,7 @@ #include #include #include +#include #include #ifdef DEV_APIC @@ -179,9 +180,9 @@ dmar_identify(driver_t *driver, device_t parent) return; haw = dmartbl->Width + 1; if ((1ULL << (haw + 1)) > BUS_SPACE_MAXADDR) - dmar_high = BUS_SPACE_MAXADDR; + iommu_high = BUS_SPACE_MAXADDR; else - dmar_high = 1ULL << (haw + 1); + iommu_high = 1ULL << (haw + 1); if (bootverbose) { printf("DMAR HAW=%d flags=<%b>\n", dmartbl->Width, (unsigned)dmartbl->Flags, @@ -490,7 +491,7 @@ dmar_attach(device_t dev) * address translation after the required invalidations are * done. */ - dmar_pgalloc(unit->ctx_obj, 0, IOMMU_PGF_WAITOK | IOMMU_PGF_ZERO); + iommu_pgalloc(unit->ctx_obj, 0, IOMMU_PGF_WAITOK | IOMMU_PGF_ZERO); DMAR_LOCK(unit); error = dmar_load_root_entry_ptr(unit); if (error != 0) { diff --git a/sys/x86/iommu/intel_fault.c b/sys/x86/iommu/intel_fault.c index e275304c8d51..59b482720cf1 100644 --- a/sys/x86/iommu/intel_fault.c +++ b/sys/x86/iommu/intel_fault.c @@ -54,6 +54,7 @@ #include #include #include +#include #include /* diff --git a/sys/x86/iommu/intel_idpgtbl.c b/sys/x86/iommu/intel_idpgtbl.c index 26f067e35278..82cac8bb2d39 100644 --- a/sys/x86/iommu/intel_idpgtbl.c +++ b/sys/x86/iommu/intel_idpgtbl.c @@ -64,6 +64,7 @@ #include #include #include +#include #include static int domain_unmap_buf_locked(struct dmar_domain *domain, @@ -109,7 +110,7 @@ domain_idmap_nextlvl(struct idpgtbl *tbl, int lvl, vm_pindex_t idx, iommu_gaddr_t addr) { vm_page_t m1; - dmar_pte_t *pte; + iommu_pte_t *pte; struct sf_buf *sf; iommu_gaddr_t f, pg_sz; vm_pindex_t base; @@ -118,28 +119,28 @@ domain_idmap_nextlvl(struct idpgtbl *tbl, int lvl, vm_pindex_t idx, VM_OBJECT_ASSERT_LOCKED(tbl->pgtbl_obj); if (addr >= tbl->maxaddr) return; - (void)dmar_pgalloc(tbl->pgtbl_obj, idx, IOMMU_PGF_OBJL | + (void)iommu_pgalloc(tbl->pgtbl_obj, idx, IOMMU_PGF_OBJL | IOMMU_PGF_WAITOK | IOMMU_PGF_ZERO); - base = idx * DMAR_NPTEPG + 1; /* Index of the first child page of idx */ + base = idx * IOMMU_NPTEPG + 1; /* Index of the first child page of idx */ pg_sz = pglvl_page_size(tbl->pglvl, lvl); if (lvl != tbl->leaf) { - for (i = 0, f = addr; i < DMAR_NPTEPG; i++, f += pg_sz) + for (i = 0, f = addr; i < IOMMU_NPTEPG; i++, f += pg_sz) domain_idmap_nextlvl(tbl, lvl + 1, base + i, f); } VM_OBJECT_WUNLOCK(tbl->pgtbl_obj); - pte = dmar_map_pgtbl(tbl->pgtbl_obj, idx, IOMMU_PGF_WAITOK, &sf); + pte = iommu_map_pgtbl(tbl->pgtbl_obj, idx, IOMMU_PGF_WAITOK, &sf); if (lvl == tbl->leaf) { - for (i = 0, f = addr; i < DMAR_NPTEPG; i++, f += pg_sz) { + for (i = 0, f = addr; i < IOMMU_NPTEPG; i++, f += pg_sz) { if (f >= tbl->maxaddr) break; pte[i].pte = (DMAR_PTE_ADDR_MASK & f) | DMAR_PTE_R | DMAR_PTE_W; } } else { - for (i = 0, f = addr; i < DMAR_NPTEPG; i++, f += pg_sz) { + for (i = 0, f = addr; i < IOMMU_NPTEPG; i++, f += pg_sz) { if (f >= tbl->maxaddr) break; - m1 = dmar_pgalloc(tbl->pgtbl_obj, base + i, + m1 = iommu_pgalloc(tbl->pgtbl_obj, base + i, IOMMU_PGF_NOALLOC); KASSERT(m1 != NULL, ("lost page table page")); pte[i].pte = (DMAR_PTE_ADDR_MASK & @@ -147,7 +148,7 @@ domain_idmap_nextlvl(struct idpgtbl *tbl, int lvl, vm_pindex_t idx, } } /* domain_get_idmap_pgtbl flushes CPU cache if needed. */ - dmar_unmap_pgtbl(sf); + iommu_unmap_pgtbl(sf); VM_OBJECT_WLOCK(tbl->pgtbl_obj); } @@ -301,7 +302,7 @@ put_idmap_pgtbl(vm_object_t obj) rmobj = tbl->pgtbl_obj; if (rmobj->ref_count == 1) { LIST_REMOVE(tbl, link); - atomic_subtract_int(&dmar_tbl_pagecnt, + atomic_subtract_int(&iommu_tbl_pagecnt, rmobj->resident_page_count); vm_object_deallocate(rmobj); free(tbl, M_DMAR_IDPGTBL); @@ -323,9 +324,9 @@ static int domain_pgtbl_pte_off(struct dmar_domain *domain, iommu_gaddr_t base, int lvl) { - base >>= DMAR_PAGE_SHIFT + (domain->pglvl - lvl - 1) * - DMAR_NPTEPGSHIFT; - return (base & DMAR_PTEMASK); + base >>= IOMMU_PAGE_SHIFT + (domain->pglvl - lvl - 1) * + IOMMU_NPTEPGSHIFT; + return (base & IOMMU_PTEMASK); } /* @@ -344,18 +345,18 @@ domain_pgtbl_get_pindex(struct dmar_domain *domain, iommu_gaddr_t base, int lvl) for (pidx = idx = 0, i = 0; i < lvl; i++, pidx = idx) { idx = domain_pgtbl_pte_off(domain, base, i) + - pidx * DMAR_NPTEPG + 1; + pidx * IOMMU_NPTEPG + 1; } return (idx); } -static dmar_pte_t * +static iommu_pte_t * domain_pgtbl_map_pte(struct dmar_domain *domain, iommu_gaddr_t base, int lvl, int flags, vm_pindex_t *idxp, struct sf_buf **sf) { vm_page_t m; struct sf_buf *sfp; - dmar_pte_t *pte, *ptep; + iommu_pte_t *pte, *ptep; vm_pindex_t idx, idx1; DMAR_DOMAIN_ASSERT_PGLOCKED(domain); @@ -363,13 +364,13 @@ domain_pgtbl_map_pte(struct dmar_domain *domain, iommu_gaddr_t base, int lvl, idx = domain_pgtbl_get_pindex(domain, base, lvl); if (*sf != NULL && idx == *idxp) { - pte = (dmar_pte_t *)sf_buf_kva(*sf); + pte = (iommu_pte_t *)sf_buf_kva(*sf); } else { if (*sf != NULL) - dmar_unmap_pgtbl(*sf); + iommu_unmap_pgtbl(*sf); *idxp = idx; retry: - pte = dmar_map_pgtbl(domain->pgtbl_obj, idx, flags, sf); + pte = iommu_map_pgtbl(domain->pgtbl_obj, idx, flags, sf); if (pte == NULL) { KASSERT(lvl > 0, ("lost root page table page %p", domain)); @@ -378,7 +379,7 @@ retry: * it and create a pte in the preceeding page level * to reference the allocated page table page. */ - m = dmar_pgalloc(domain->pgtbl_obj, idx, flags | + m = iommu_pgalloc(domain->pgtbl_obj, idx, flags | IOMMU_PGF_ZERO); if (m == NULL) return (NULL); @@ -399,7 +400,7 @@ retry: KASSERT(m->pindex != 0, ("loosing root page %p", domain)); m->ref_count--; - dmar_pgfree(domain->pgtbl_obj, m->pindex, + iommu_pgfree(domain->pgtbl_obj, m->pindex, flags); return (NULL); } @@ -408,7 +409,7 @@ retry: dmar_flush_pte_to_ram(domain->dmar, ptep); sf_buf_page(sfp)->ref_count += 1; m->ref_count--; - dmar_unmap_pgtbl(sfp); + iommu_unmap_pgtbl(sfp); /* Only executed once. */ goto retry; } @@ -421,7 +422,7 @@ static int domain_map_buf_locked(struct dmar_domain *domain, iommu_gaddr_t base, iommu_gaddr_t size, vm_page_t *ma, uint64_t pflags, int flags) { - dmar_pte_t *pte; + iommu_pte_t *pte; struct sf_buf *sf; iommu_gaddr_t pg_sz, base1; vm_pindex_t pi, c, idx, run_sz; @@ -438,7 +439,7 @@ domain_map_buf_locked(struct dmar_domain *domain, iommu_gaddr_t base, pi += run_sz) { for (lvl = 0, c = 0, superpage = false;; lvl++) { pg_sz = domain_page_size(domain, lvl); - run_sz = pg_sz >> DMAR_PAGE_SHIFT; + run_sz = pg_sz >> IOMMU_PAGE_SHIFT; if (lvl == domain->pglvl - 1) break; /* @@ -477,7 +478,7 @@ domain_map_buf_locked(struct dmar_domain *domain, iommu_gaddr_t base, KASSERT((flags & IOMMU_PGF_WAITOK) == 0, ("failed waitable pte alloc %p", domain)); if (sf != NULL) - dmar_unmap_pgtbl(sf); + iommu_unmap_pgtbl(sf); domain_unmap_buf_locked(domain, base1, base - base1, flags); TD_PINNED_ASSERT; @@ -489,7 +490,7 @@ domain_map_buf_locked(struct dmar_domain *domain, iommu_gaddr_t base, sf_buf_page(sf)->ref_count += 1; } if (sf != NULL) - dmar_unmap_pgtbl(sf); + iommu_unmap_pgtbl(sf); TD_PINNED_ASSERT; return (0); } @@ -513,10 +514,10 @@ domain_map_buf(struct iommu_domain *iodom, iommu_gaddr_t base, KASSERT((domain->iodom.flags & IOMMU_DOMAIN_IDMAP) == 0, ("modifying idmap pagetable domain %p", domain)); - KASSERT((base & DMAR_PAGE_MASK) == 0, + KASSERT((base & IOMMU_PAGE_MASK) == 0, ("non-aligned base %p %jx %jx", domain, (uintmax_t)base, (uintmax_t)size)); - KASSERT((size & DMAR_PAGE_MASK) == 0, + KASSERT((size & IOMMU_PAGE_MASK) == 0, ("non-aligned size %p %jx %jx", domain, (uintmax_t)base, (uintmax_t)size)); KASSERT(size > 0, ("zero size %p %jx %jx", domain, (uintmax_t)base, @@ -563,7 +564,7 @@ domain_map_buf(struct iommu_domain *iodom, iommu_gaddr_t base, } static void domain_unmap_clear_pte(struct dmar_domain *domain, - iommu_gaddr_t base, int lvl, int flags, dmar_pte_t *pte, + iommu_gaddr_t base, int lvl, int flags, iommu_pte_t *pte, struct sf_buf **sf, bool free_fs); static void @@ -571,7 +572,7 @@ domain_free_pgtbl_pde(struct dmar_domain *domain, iommu_gaddr_t base, int lvl, int flags) { struct sf_buf *sf; - dmar_pte_t *pde; + iommu_pte_t *pde; vm_pindex_t idx; sf = NULL; @@ -581,7 +582,7 @@ domain_free_pgtbl_pde(struct dmar_domain *domain, iommu_gaddr_t base, static void domain_unmap_clear_pte(struct dmar_domain *domain, iommu_gaddr_t base, int lvl, - int flags, dmar_pte_t *pte, struct sf_buf **sf, bool free_sf) + int flags, iommu_pte_t *pte, struct sf_buf **sf, bool free_sf) { vm_page_t m; @@ -589,7 +590,7 @@ domain_unmap_clear_pte(struct dmar_domain *domain, iommu_gaddr_t base, int lvl, dmar_flush_pte_to_ram(domain->dmar, pte); m = sf_buf_page(*sf); if (free_sf) { - dmar_unmap_pgtbl(*sf); + iommu_unmap_pgtbl(*sf); *sf = NULL; } m->ref_count--; @@ -601,7 +602,7 @@ domain_unmap_clear_pte(struct dmar_domain *domain, iommu_gaddr_t base, int lvl, KASSERT(m->pindex != 0, ("lost reference (idx) on root pg domain %p base %jx lvl %d", domain, (uintmax_t)base, lvl)); - dmar_pgfree(domain->pgtbl_obj, m->pindex, flags); + iommu_pgfree(domain->pgtbl_obj, m->pindex, flags); domain_free_pgtbl_pde(domain, base, lvl - 1, flags); } @@ -612,7 +613,7 @@ static int domain_unmap_buf_locked(struct dmar_domain *domain, iommu_gaddr_t base, iommu_gaddr_t size, int flags) { - dmar_pte_t *pte; + iommu_pte_t *pte; struct sf_buf *sf; vm_pindex_t idx; iommu_gaddr_t pg_sz; @@ -624,10 +625,10 @@ domain_unmap_buf_locked(struct dmar_domain *domain, iommu_gaddr_t base, KASSERT((domain->iodom.flags & IOMMU_DOMAIN_IDMAP) == 0, ("modifying idmap pagetable domain %p", domain)); - KASSERT((base & DMAR_PAGE_MASK) == 0, + KASSERT((base & IOMMU_PAGE_MASK) == 0, ("non-aligned base %p %jx %jx", domain, (uintmax_t)base, (uintmax_t)size)); - KASSERT((size & DMAR_PAGE_MASK) == 0, + KASSERT((size & IOMMU_PAGE_MASK) == 0, ("non-aligned size %p %jx %jx", domain, (uintmax_t)base, (uintmax_t)size)); KASSERT(base < (1ULL << domain->agaw), @@ -670,7 +671,7 @@ domain_unmap_buf_locked(struct dmar_domain *domain, iommu_gaddr_t base, (uintmax_t)base, (uintmax_t)size, (uintmax_t)pg_sz)); } if (sf != NULL) - dmar_unmap_pgtbl(sf); + iommu_unmap_pgtbl(sf); /* * See 11.1 Write Buffer Flushing for an explanation why RWBF * can be ignored there. @@ -706,7 +707,7 @@ domain_alloc_pgtbl(struct dmar_domain *domain) domain->pgtbl_obj = vm_pager_allocate(OBJT_PHYS, NULL, IDX_TO_OFF(pglvl_max_pages(domain->pglvl)), 0, 0, NULL); DMAR_DOMAIN_PGLOCK(domain); - m = dmar_pgalloc(domain->pgtbl_obj, 0, IOMMU_PGF_WAITOK | + m = iommu_pgalloc(domain->pgtbl_obj, 0, IOMMU_PGF_WAITOK | IOMMU_PGF_ZERO | IOMMU_PGF_OBJL); /* No implicit free of the top level page table page. */ m->ref_count = 1; diff --git a/sys/x86/iommu/intel_intrmap.c b/sys/x86/iommu/intel_intrmap.c index b2642197902a..02bf58dde299 100644 --- a/sys/x86/iommu/intel_intrmap.c +++ b/sys/x86/iommu/intel_intrmap.c @@ -55,6 +55,7 @@ #include #include #include +#include #include #include @@ -341,7 +342,7 @@ dmar_init_irt(struct dmar_unit *unit) } unit->irte_cnt = clp2(num_io_irqs); unit->irt = kmem_alloc_contig(unit->irte_cnt * sizeof(dmar_irte_t), - M_ZERO | M_WAITOK, 0, dmar_high, PAGE_SIZE, 0, + M_ZERO | M_WAITOK, 0, iommu_high, PAGE_SIZE, 0, DMAR_IS_COHERENT(unit) ? VM_MEMATTR_DEFAULT : VM_MEMATTR_UNCACHEABLE); if (unit->irt == NULL) diff --git a/sys/x86/iommu/intel_qi.c b/sys/x86/iommu/intel_qi.c index 37e2bf211e32..590cbac9bcbd 100644 --- a/sys/x86/iommu/intel_qi.c +++ b/sys/x86/iommu/intel_qi.c @@ -55,6 +55,7 @@ #include #include #include +#include #include static bool @@ -501,7 +502,7 @@ dmar_init_qi(struct dmar_unit *unit) /* The invalidation queue reads by DMARs are always coherent. */ unit->inv_queue = kmem_alloc_contig(unit->inv_queue_size, M_WAITOK | - M_ZERO, 0, dmar_high, PAGE_SIZE, 0, VM_MEMATTR_DEFAULT); + M_ZERO, 0, iommu_high, PAGE_SIZE, 0, VM_MEMATTR_DEFAULT); unit->inv_waitd_seq_hw_phys = pmap_kextract( (vm_offset_t)&unit->inv_waitd_seq_hw); diff --git a/sys/x86/iommu/intel_quirks.c b/sys/x86/iommu/intel_quirks.c index 589764bd0fa9..486bd1bc9496 100644 --- a/sys/x86/iommu/intel_quirks.c +++ b/sys/x86/iommu/intel_quirks.c @@ -59,6 +59,7 @@ #include #include #include +#include #include typedef void (*dmar_quirk_cpu_fun)(struct dmar_unit *); diff --git a/sys/x86/iommu/intel_reg.h b/sys/x86/iommu/intel_reg.h index 26a18ff94890..0fafcce7accf 100644 --- a/sys/x86/iommu/intel_reg.h +++ b/sys/x86/iommu/intel_reg.h @@ -31,16 +31,6 @@ #ifndef __X86_IOMMU_INTEL_REG_H #define __X86_IOMMU_INTEL_REG_H -#define DMAR_PAGE_SIZE PAGE_SIZE -#define DMAR_PAGE_MASK (DMAR_PAGE_SIZE - 1) -#define DMAR_PAGE_SHIFT PAGE_SHIFT -#define DMAR_NPTEPG (DMAR_PAGE_SIZE / sizeof(dmar_pte_t)) -#define DMAR_NPTEPGSHIFT 9 -#define DMAR_PTEMASK (DMAR_NPTEPG - 1) - -#define IOMMU_PAGE_SIZE DMAR_PAGE_SIZE -#define IOMMU_PAGE_MASK DMAR_PAGE_MASK - typedef struct dmar_root_entry { uint64_t r1; uint64_t r2; @@ -49,7 +39,7 @@ typedef struct dmar_root_entry { #define DMAR_ROOT_R1_CTP_MASK 0xfffffffffffff000 /* Mask for Context-Entry Table Pointer */ -#define DMAR_CTX_CNT (DMAR_PAGE_SIZE / sizeof(dmar_root_entry_t)) +#define DMAR_CTX_CNT (IOMMU_PAGE_SIZE / sizeof(dmar_root_entry_t)) typedef struct dmar_ctx_entry { uint64_t ctx1; @@ -73,9 +63,6 @@ typedef struct dmar_ctx_entry { #define DMAR_CTX2_DID(x) ((x) << 8) /* Domain Identifier */ #define DMAR_CTX2_GET_DID(ctx2) (((ctx2) & DMAR_CTX2_DID_MASK) >> 8) -typedef struct dmar_pte { - uint64_t pte; -} dmar_pte_t; #define DMAR_PTE_R 1 /* Read */ #define DMAR_PTE_W (1 << 1) /* Write */ #define DMAR_PTE_SP (1 << 7) /* Super Page */ diff --git a/sys/x86/iommu/intel_utils.c b/sys/x86/iommu/intel_utils.c index 19d4ec7d22bd..b0f2d167658a 100644 --- a/sys/x86/iommu/intel_utils.c +++ b/sys/x86/iommu/intel_utils.c @@ -64,6 +64,7 @@ #include #include #include +#include #include u_int @@ -183,7 +184,7 @@ pglvl_max_pages(int pglvl) int i; for (res = 0, i = pglvl; i > 0; i--) { - res *= DMAR_NPTEPG; + res *= IOMMU_NPTEPG; res++; } return (res); @@ -214,12 +215,12 @@ pglvl_page_size(int total_pglvl, int lvl) { int rlvl; static const iommu_gaddr_t pg_sz[] = { - (iommu_gaddr_t)DMAR_PAGE_SIZE, - (iommu_gaddr_t)DMAR_PAGE_SIZE << DMAR_NPTEPGSHIFT, - (iommu_gaddr_t)DMAR_PAGE_SIZE << (2 * DMAR_NPTEPGSHIFT), - (iommu_gaddr_t)DMAR_PAGE_SIZE << (3 * DMAR_NPTEPGSHIFT), - (iommu_gaddr_t)DMAR_PAGE_SIZE << (4 * DMAR_NPTEPGSHIFT), - (iommu_gaddr_t)DMAR_PAGE_SIZE << (5 * DMAR_NPTEPGSHIFT) + (iommu_gaddr_t)IOMMU_PAGE_SIZE, + (iommu_gaddr_t)IOMMU_PAGE_SIZE << IOMMU_NPTEPGSHIFT, + (iommu_gaddr_t)IOMMU_PAGE_SIZE << (2 * IOMMU_NPTEPGSHIFT), + (iommu_gaddr_t)IOMMU_PAGE_SIZE << (3 * IOMMU_NPTEPGSHIFT), + (iommu_gaddr_t)IOMMU_PAGE_SIZE << (4 * IOMMU_NPTEPGSHIFT), + (iommu_gaddr_t)IOMMU_PAGE_SIZE << (5 * IOMMU_NPTEPGSHIFT), }; KASSERT(lvl >= 0 && lvl < total_pglvl, @@ -244,7 +245,7 @@ calc_am(struct dmar_unit *unit, iommu_gaddr_t base, iommu_gaddr_t size, int am; for (am = DMAR_CAP_MAMV(unit->hw_cap);; am--) { - isize = 1ULL << (am + DMAR_PAGE_SHIFT); + isize = 1ULL << (am + IOMMU_PAGE_SHIFT); if ((base & (isize - 1)) == 0 && size >= isize) break; if (am == 0) @@ -254,113 +255,9 @@ calc_am(struct dmar_unit *unit, iommu_gaddr_t base, iommu_gaddr_t size, return (am); } -iommu_haddr_t dmar_high; int haw; int dmar_tbl_pagecnt; -vm_page_t -dmar_pgalloc(vm_object_t obj, vm_pindex_t idx, int flags) -{ - vm_page_t m; - int zeroed, aflags; - - zeroed = (flags & IOMMU_PGF_ZERO) != 0 ? VM_ALLOC_ZERO : 0; - aflags = zeroed | VM_ALLOC_NOBUSY | VM_ALLOC_SYSTEM | VM_ALLOC_NODUMP | - ((flags & IOMMU_PGF_WAITOK) != 0 ? VM_ALLOC_WAITFAIL : - VM_ALLOC_NOWAIT); - for (;;) { - if ((flags & IOMMU_PGF_OBJL) == 0) - VM_OBJECT_WLOCK(obj); - m = vm_page_lookup(obj, idx); - if ((flags & IOMMU_PGF_NOALLOC) != 0 || m != NULL) { - if ((flags & IOMMU_PGF_OBJL) == 0) - VM_OBJECT_WUNLOCK(obj); - break; - } - m = vm_page_alloc_contig(obj, idx, aflags, 1, 0, - dmar_high, PAGE_SIZE, 0, VM_MEMATTR_DEFAULT); - if ((flags & IOMMU_PGF_OBJL) == 0) - VM_OBJECT_WUNLOCK(obj); - if (m != NULL) { - if (zeroed && (m->flags & PG_ZERO) == 0) - pmap_zero_page(m); - atomic_add_int(&dmar_tbl_pagecnt, 1); - break; - } - if ((flags & IOMMU_PGF_WAITOK) == 0) - break; - } - return (m); -} - -void -dmar_pgfree(vm_object_t obj, vm_pindex_t idx, int flags) -{ - vm_page_t m; - - if ((flags & IOMMU_PGF_OBJL) == 0) - VM_OBJECT_WLOCK(obj); - m = vm_page_grab(obj, idx, VM_ALLOC_NOCREAT); - if (m != NULL) { - vm_page_free(m); - atomic_subtract_int(&dmar_tbl_pagecnt, 1); - } - if ((flags & IOMMU_PGF_OBJL) == 0) - VM_OBJECT_WUNLOCK(obj); -} - -void * -dmar_map_pgtbl(vm_object_t obj, vm_pindex_t idx, int flags, - struct sf_buf **sf) -{ - vm_page_t m; - bool allocated; - - if ((flags & IOMMU_PGF_OBJL) == 0) - VM_OBJECT_WLOCK(obj); - m = vm_page_lookup(obj, idx); - if (m == NULL && (flags & IOMMU_PGF_ALLOC) != 0) { - m = dmar_pgalloc(obj, idx, flags | IOMMU_PGF_OBJL); - allocated = true; - } else - allocated = false; - if (m == NULL) { - if ((flags & IOMMU_PGF_OBJL) == 0) - VM_OBJECT_WUNLOCK(obj); - return (NULL); - } - /* Sleepable allocations cannot fail. */ - if ((flags & IOMMU_PGF_WAITOK) != 0) - VM_OBJECT_WUNLOCK(obj); - sched_pin(); - *sf = sf_buf_alloc(m, SFB_CPUPRIVATE | ((flags & IOMMU_PGF_WAITOK) - == 0 ? SFB_NOWAIT : 0)); - if (*sf == NULL) { - sched_unpin(); - if (allocated) { - VM_OBJECT_ASSERT_WLOCKED(obj); - dmar_pgfree(obj, m->pindex, flags | IOMMU_PGF_OBJL); - } - if ((flags & IOMMU_PGF_OBJL) == 0) - VM_OBJECT_WUNLOCK(obj); - return (NULL); - } - if ((flags & (IOMMU_PGF_WAITOK | IOMMU_PGF_OBJL)) == - (IOMMU_PGF_WAITOK | IOMMU_PGF_OBJL)) - VM_OBJECT_WLOCK(obj); - else if ((flags & (IOMMU_PGF_WAITOK | IOMMU_PGF_OBJL)) == 0) - VM_OBJECT_WUNLOCK(obj); - return ((void *)sf_buf_kva(*sf)); -} - -void -dmar_unmap_pgtbl(struct sf_buf *sf) -{ - - sf_buf_free(sf); - sched_unpin(); -} - static void dmar_flush_transl_to_ram(struct dmar_unit *unit, void *dst, size_t sz) { @@ -375,7 +272,7 @@ dmar_flush_transl_to_ram(struct dmar_unit *unit, void *dst, size_t sz) } void -dmar_flush_pte_to_ram(struct dmar_unit *unit, dmar_pte_t *dst) +dmar_flush_pte_to_ram(struct dmar_unit *unit, iommu_pte_t *dst) { dmar_flush_transl_to_ram(unit, dst, sizeof(*dst)); @@ -687,11 +584,6 @@ dmar_timeout_sysctl(SYSCTL_HANDLER_ARGS) return (error); } -static SYSCTL_NODE(_hw_iommu, OID_AUTO, dmar, CTLFLAG_RD | CTLFLAG_MPSAFE, - NULL, ""); -SYSCTL_INT(_hw_iommu_dmar, OID_AUTO, tbl_pagecnt, CTLFLAG_RD, - &dmar_tbl_pagecnt, 0, - "Count of pages used for DMAR pagetables"); SYSCTL_INT(_hw_iommu_dmar, OID_AUTO, batch_coalesce, CTLFLAG_RWTUN, &dmar_batch_coalesce, 0, "Number of qi batches between interrupt"); diff --git a/sys/x86/iommu/iommu_utils.c b/sys/x86/iommu/iommu_utils.c new file mode 100644 index 000000000000..ffea1cc1a190 --- /dev/null +++ b/sys/x86/iommu/iommu_utils.c @@ -0,0 +1,164 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2013, 2014 The FreeBSD Foundation + * + * This software was 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: + * 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 +#include +#include +#include + +vm_page_t +iommu_pgalloc(vm_object_t obj, vm_pindex_t idx, int flags) +{ + vm_page_t m; + int zeroed, aflags; + + zeroed = (flags & IOMMU_PGF_ZERO) != 0 ? VM_ALLOC_ZERO : 0; + aflags = zeroed | VM_ALLOC_NOBUSY | VM_ALLOC_SYSTEM | VM_ALLOC_NODUMP | + ((flags & IOMMU_PGF_WAITOK) != 0 ? VM_ALLOC_WAITFAIL : + VM_ALLOC_NOWAIT); + for (;;) { + if ((flags & IOMMU_PGF_OBJL) == 0) + VM_OBJECT_WLOCK(obj); + m = vm_page_lookup(obj, idx); + if ((flags & IOMMU_PGF_NOALLOC) != 0 || m != NULL) { + if ((flags & IOMMU_PGF_OBJL) == 0) + VM_OBJECT_WUNLOCK(obj); + break; + } + m = vm_page_alloc_contig(obj, idx, aflags, 1, 0, + iommu_high, PAGE_SIZE, 0, VM_MEMATTR_DEFAULT); + if ((flags & IOMMU_PGF_OBJL) == 0) + VM_OBJECT_WUNLOCK(obj); + if (m != NULL) { + if (zeroed && (m->flags & PG_ZERO) == 0) + pmap_zero_page(m); + atomic_add_int(&iommu_tbl_pagecnt, 1); + break; + } + if ((flags & IOMMU_PGF_WAITOK) == 0) + break; + } + return (m); +} + +void +iommu_pgfree(vm_object_t obj, vm_pindex_t idx, int flags) +{ + vm_page_t m; + + if ((flags & IOMMU_PGF_OBJL) == 0) + VM_OBJECT_WLOCK(obj); + m = vm_page_grab(obj, idx, VM_ALLOC_NOCREAT); + if (m != NULL) { + vm_page_free(m); + atomic_subtract_int(&iommu_tbl_pagecnt, 1); + } + if ((flags & IOMMU_PGF_OBJL) == 0) + VM_OBJECT_WUNLOCK(obj); +} + +void * +iommu_map_pgtbl(vm_object_t obj, vm_pindex_t idx, int flags, + struct sf_buf **sf) +{ + vm_page_t m; + bool allocated; + + if ((flags & IOMMU_PGF_OBJL) == 0) + VM_OBJECT_WLOCK(obj); + m = vm_page_lookup(obj, idx); + if (m == NULL && (flags & IOMMU_PGF_ALLOC) != 0) { + m = iommu_pgalloc(obj, idx, flags | IOMMU_PGF_OBJL); + allocated = true; + } else + allocated = false; + if (m == NULL) { + if ((flags & IOMMU_PGF_OBJL) == 0) + VM_OBJECT_WUNLOCK(obj); + return (NULL); + } + /* Sleepable allocations cannot fail. */ + if ((flags & IOMMU_PGF_WAITOK) != 0) + VM_OBJECT_WUNLOCK(obj); + sched_pin(); + *sf = sf_buf_alloc(m, SFB_CPUPRIVATE | ((flags & IOMMU_PGF_WAITOK) + == 0 ? SFB_NOWAIT : 0)); + if (*sf == NULL) { + sched_unpin(); + if (allocated) { + VM_OBJECT_ASSERT_WLOCKED(obj); + iommu_pgfree(obj, m->pindex, flags | IOMMU_PGF_OBJL); + } + if ((flags & IOMMU_PGF_OBJL) == 0) + VM_OBJECT_WUNLOCK(obj); + return (NULL); + } + if ((flags & (IOMMU_PGF_WAITOK | IOMMU_PGF_OBJL)) == + (IOMMU_PGF_WAITOK | IOMMU_PGF_OBJL)) + VM_OBJECT_WLOCK(obj); + else if ((flags & (IOMMU_PGF_WAITOK | IOMMU_PGF_OBJL)) == 0) + VM_OBJECT_WUNLOCK(obj); + return ((void *)sf_buf_kva(*sf)); +} + +void +iommu_unmap_pgtbl(struct sf_buf *sf) +{ + + sf_buf_free(sf); + sched_unpin(); +} + +iommu_haddr_t iommu_high; +int iommu_tbl_pagecnt; + +SYSCTL_NODE(_hw_iommu, OID_AUTO, dmar, CTLFLAG_RD | CTLFLAG_MPSAFE, + NULL, ""); +SYSCTL_INT(_hw_iommu_dmar, OID_AUTO, tbl_pagecnt, CTLFLAG_RD, + &iommu_tbl_pagecnt, 0, + "Count of pages used for DMAR pagetables"); diff --git a/sys/x86/iommu/x86_iommu.h b/sys/x86/iommu/x86_iommu.h new file mode 100644 index 000000000000..3789586f1eaf --- /dev/null +++ b/sys/x86/iommu/x86_iommu.h @@ -0,0 +1,62 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2013-2015 The FreeBSD Foundation + * + * This software was developed by Konstantin Belousov + * under sponsorship from the FreeBSD Foundation. + * *** 54 LINES SKIPPED *** From nobody Sat Jun 1 11:14: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 4Vry7S3yrSz5Mhng; Sat, 01 Jun 2024 11:14: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 4Vry7S1zGcz3xB7; Sat, 1 Jun 2024 11:14:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717240484; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RI1qMWi5/XNoF+7WsTQ2aCUEdLvwaiRSCq1r+fz1B30=; b=DC+NNrTWjQ3w39AcOfz32SRO3l3BKkWqIr9sZKSRucG0E3oZ0cv6ahmN3WHyRFtVR34kct VpShNyC319Joh7Ey8YivEzWTfu+2GD/wlcAAmjndoKsV38uQVALCE6qOBNj/1cDtpljnNJ WGMA00ljnkXsEiM+Ukkef8c0R7uvIUkGDRRYRABd7HgCWjzcF8rFUMQJy20YvB0Yv70KiJ TBxsZuoUKPbvtT4KtWQ6jBmi8HUsePBrdLK7F/UnZLLQclBu/8kJ6E6NF4SFsEBL8+5V5p crdEpoQ2iajvzb0C/+tsJByw+h+Q/nCYe6eln0uxc6z2X79LbkOglwfUXbTn7Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1717240484; a=rsa-sha256; cv=none; b=XB862L5iKHoxZkb2vXJ9Y6IHh4N4A6X0N4za87sgp8NXmHSoHmcR+RRE87FcHOlNvDWgNn DimVEkDTB+C6EODp3Yu0vHLzg6m1VOfJmJe4n1WW4hwDanTgWYEut6Mu02lIaEgx9kfmHd NqHUKiY1umQ4EDDJ6iID83FY1AGy+aZWNEnaXPs+tlkaT8Mim3fAiKlgpUVqw2d9XzlX4o +ZJSXrRz6/Vm1bEdbBktM12QctTT26ItZadDVy7LfnDTeDYHE+a5dz7yOq+ciPrF9MG9ZW elpQJ88qxBFbSlBwlhio9rmlHjyyV5gIVGwU7wpMf3II32O5HDCgTkoLk7cH1A== 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=1717240484; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RI1qMWi5/XNoF+7WsTQ2aCUEdLvwaiRSCq1r+fz1B30=; b=fJ1VfxpcqKRG9A1D9YJ17NluyJyshr99/LtYEIAtmqnjVEi5vK3myYHrQSdewCxDC1+zfL tSTAIvtIRZsBZhCekTxazwRC4LhX6264VLIrEiUKbAYQmyN5v34czqXcz3cToca57lQJNX JBZhO4oVfGSoL+a3gbsRYxvWnuQkYWYVrjwGGte0/kF0b742QMGgJ8vnkJtmIwoEpAhFFj 1f/yj1Pn3qAAn1ardkLQZn3Z6lHVxjOHLl+LwSaIAEzEWfB2ar0/xjyCzfVF+CNYOBSxF9 p1dOMcT45vT9BW9VTXRL4JjIThCiCVncZ3LkvHlF2igD6diS+DLvqqgxSH73Fw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Vry7S0szvz15Tj; Sat, 1 Jun 2024 11:14: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 451BEhdJ057447; Sat, 1 Jun 2024 11:14:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 451BEhm6057444; Sat, 1 Jun 2024 11:14:43 GMT (envelope-from git) Date: Sat, 1 Jun 2024 11:14:43 GMT Message-Id: <202406011114.451BEhm6057444@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Chuck Tuffli Subject: git: ce75bfcac9cf - main - nvme: Change namespace device name List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: chuck X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ce75bfcac9cfe0bdd2285faea86019455c6fa7ea Auto-Submitted: auto-generated The branch main has been updated by chuck: URL: https://cgit.FreeBSD.org/src/commit/?id=ce75bfcac9cfe0bdd2285faea86019455c6fa7ea commit ce75bfcac9cfe0bdd2285faea86019455c6fa7ea Author: Chuck Tuffli AuthorDate: 2024-06-01 11:08:24 +0000 Commit: Chuck Tuffli CommitDate: 2024-06-01 11:14:14 +0000 nvme: Change namespace device name Changes the device name for NVMe and NVMe-oF namespaces from using "ns" to "n" to be more compatible with other operating systems. For example, a device which was previously /dev/nvme0ns1 is now /dev/nvme0n1. Preserves the existing functionality by creating alias from nvmeXnY to nvmeXnsY. Reviewed by: imp MFC after: 1 month Relnotes: yes Differential Revision: https://reviews.freebsd.org/D45414 --- sys/dev/nvme/nvme_ctrlr.c | 4 ++-- sys/dev/nvme/nvme_ns.c | 8 ++++++-- sys/dev/nvmf/host/nvmf_ns.c | 8 ++++++-- 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/sys/dev/nvme/nvme_ctrlr.c b/sys/dev/nvme/nvme_ctrlr.c index d9bd1fce2864..155aedf2f31a 100644 --- a/sys/dev/nvme/nvme_ctrlr.c +++ b/sys/dev/nvme/nvme_ctrlr.c @@ -1478,8 +1478,8 @@ nvme_ctrlr_construct(struct nvme_controller *ctrlr, device_t dev) md_args.mda_mode = 0600; md_args.mda_unit = device_get_unit(dev); md_args.mda_si_drv1 = (void *)ctrlr; - status = make_dev_s(&md_args, &ctrlr->cdev, "nvme%d", - device_get_unit(dev)); + status = make_dev_s(&md_args, &ctrlr->cdev, "%s", + device_get_nameunit(dev)); if (status != 0) return (ENXIO); diff --git a/sys/dev/nvme/nvme_ns.c b/sys/dev/nvme/nvme_ns.c index 201cf9188c1e..b19fc8664407 100644 --- a/sys/dev/nvme/nvme_ns.c +++ b/sys/dev/nvme/nvme_ns.c @@ -604,10 +604,12 @@ nvme_ns_construct(struct nvme_namespace *ns, uint32_t id, md_args.mda_unit = unit; md_args.mda_mode = 0600; md_args.mda_si_drv1 = ns; - res = make_dev_s(&md_args, &ns->cdev, "nvme%dns%d", - device_get_unit(ctrlr->dev), ns->id); + res = make_dev_s(&md_args, &ns->cdev, "%sn%d", + device_get_nameunit(ctrlr->dev), ns->id); if (res != 0) return (ENXIO); + ns->cdev->si_drv2 = make_dev_alias(ns->cdev, "%sns%d", + device_get_nameunit(ctrlr->dev), ns->id); ns->cdev->si_flags |= SI_UNMAPPED; @@ -618,6 +620,8 @@ void nvme_ns_destruct(struct nvme_namespace *ns) { + if (ns->cdev->si_drv2 != NULL) + destroy_dev(ns->cdev->si_drv2); if (ns->cdev != NULL) destroy_dev(ns->cdev); } diff --git a/sys/dev/nvmf/host/nvmf_ns.c b/sys/dev/nvmf/host/nvmf_ns.c index 3428cbadc974..30acbe815dbe 100644 --- a/sys/dev/nvmf/host/nvmf_ns.c +++ b/sys/dev/nvmf/host/nvmf_ns.c @@ -49,7 +49,7 @@ ns_printf(struct nvmf_namespace *ns, const char *fmt, ...) sbuf_new(&sb, buf, sizeof(buf), SBUF_FIXEDLEN); sbuf_set_drain(&sb, sbuf_printf_drain, NULL); - sbuf_printf(&sb, "%sns%u: ", device_get_nameunit(ns->sc->dev), + sbuf_printf(&sb, "%sn%u: ", device_get_nameunit(ns->sc->dev), ns->id); va_start(ap, fmt); @@ -371,10 +371,12 @@ nvmf_init_ns(struct nvmf_softc *sc, uint32_t id, mda.mda_gid = GID_WHEEL; mda.mda_mode = 0600; mda.mda_si_drv1 = ns; - error = make_dev_s(&mda, &ns->cdev, "%sns%u", + error = make_dev_s(&mda, &ns->cdev, "%sn%u", device_get_nameunit(sc->dev), id); if (error != 0) goto fail; + ns->cdev->si_drv2 = make_dev_alias(ns->cdev, "%sns%u", + device_get_nameunit(sc->dev), id); ns->cdev->si_flags |= SI_UNMAPPED; @@ -418,6 +420,8 @@ nvmf_destroy_ns(struct nvmf_namespace *ns) TAILQ_HEAD(, bio) bios; struct bio *bio; + if (ns->cdev->si_drv2 != NULL) + destroy_dev(ns->cdev->si_drv2); destroy_dev(ns->cdev); /* From nobody Sat Jun 1 11:55: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 4Vrz2c17ZMz5MmRH; Sat, 01 Jun 2024 11:55: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 4Vrz2b73lnz41h3; Sat, 1 Jun 2024 11:55:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717242936; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+FgyNtTQCyaK7Dvm6mCrlOWRB9xN86z6wENlqVxbdJQ=; b=MHirrd6XUS8iadtgha8Y1/P0aDuEcOPuAVAA1zg4S+MqKZAbwy+6dbMYSVsgXuxSkkE3wb LM/pO/m/E43F/EWBS/ZFEu8xnLD36qMS9WySZSRqDPadn+4BYeBJ5HBsRshirnmARIBBYP DRCmaqtLwaln7VO3EWnWYp0xC7BubpSKnXbGth6TFiDFWDO9O+CtK9lKkwA3SMQlsme266 wwHgVglpMVAFHy2zJCcR9HuqZ5R0AkJCabQcZQwPBPkc/QLkjk+BsPG2wabfrlNeoq6G/Y DrpNNB0kTLwvpbGBTk01owwuCFQAzQE1jbyLMeT/rqpfkqa7zoSap6ZGYc6+Bg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1717242936; a=rsa-sha256; cv=none; b=US2rDCMpKEJN9gwpRV9FsRTMrvGQT9s/PAyjWHGwwHqZjQxG/hsrTU0IMuaCcGIhd6EMTW qcdMw5Rv8NLb0rPmj7QX7pG9xtpkStMIe5dZt5caEnjJ5JLkrEE8DxT9mWkgAOdMocIiYT DiRPtPqYcE8dDJOvOvXeah0UnRvkV6BIec7AY5HqElyboNe5oj7Jm712wyYaCb4Nz9fCGF U+twTeCdMh/OirqhbEd9EFU3MdPjlAKUKZpkcyf7Azlg+cHv1VJ0ZgEOEDLsY/6VBHlxyI tabG3ZFXg19nn6hN6eQ9ynjAqVqQlUatD8YzwoEKhZYQEuBgeETbsW0FMVqIAQ== 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=1717242936; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+FgyNtTQCyaK7Dvm6mCrlOWRB9xN86z6wENlqVxbdJQ=; b=lF/xxlsoPrKa+tb5QTYndndS4eW1Nw8LIwlwA4wIKB8j9Ou25uzACIatjxuVsLAjmmWFtL /eBC0aN8rVv5mJeHc4a9l2rJGjIv2NK0ZEp6ZLzEV2QiEKpxr5KzAF+dh82jgv+s4yCCvv OZJeaQrdhhZ9ipayZnLgiEraJgPkMBrbIzQJFK00AwxvDSi86Z5n6oZTfBQ0uutfk+qCGl bMzAn0FXV92/P3kciFObGwcIOYvhKwNuGKUpONd857Lr0SxemRlKa8J+MV3MxEWaDo22iQ qKuMRJVfzBHhpbynYkUxt50UB27kSgTm3OTFz21kySG9hVD38/8gteTV/Y10fg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Vrz2b6fQCz16WM; Sat, 1 Jun 2024 11:55: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 451BtZGA024718; Sat, 1 Jun 2024 11:55:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 451BtZJN024715; Sat, 1 Jun 2024 11:55:35 GMT (envelope-from git) Date: Sat, 1 Jun 2024 11:55:35 GMT Message-Id: <202406011155.451BtZJN024715@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: 166ec3e86aa4 - main - mitigations.7: uncomment reference to recently added section List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: 166ec3e86aa4a48bdf2a56ee065f0173bbb8f745 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=166ec3e86aa4a48bdf2a56ee065f0173bbb8f745 commit 166ec3e86aa4a48bdf2a56ee065f0173bbb8f745 Author: Ed Maste AuthorDate: 2024-06-01 11:52:31 +0000 Commit: Ed Maste CommitDate: 2024-06-01 11:55:09 +0000 mitigations.7: uncomment reference to recently added section A brief description of supervisor mode memory access protection was added in 72ece341b427. Uncomment the existing reference to this section in the table of contents. Fixes: 72ece341b427 ("mitigations.7: mention supervisor mode memory...") Sponsored by: The FreeBSD Foundation --- share/man/man7/mitigations.7 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/share/man/man7/mitigations.7 b/share/man/man7/mitigations.7 index afb88de56e86..a322c9a917da 100644 --- a/share/man/man7/mitigations.7 +++ b/share/man/man7/mitigations.7 @@ -56,8 +56,8 @@ Relocation Read-Only (RELRO) Bind Now .\".It .\"Stack Smashing Protection (SSP) -.\".It -.\"Supervisor Mode Memory Protection +.It +Supervisor Mode Memory Protection .It Hardware Vulnerability Mitigation Controls .It From nobody Sat Jun 1 12:31: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 4Vrzrs4XJjz5MpdL for ; Sat, 01 Jun 2024 12:32:13 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-ej1-x62a.google.com (mail-ej1-x62a.google.com [IPv6:2a00:1450:4864:20::62a]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "WR4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Vrzrs1Pmfz45st for ; Sat, 1 Jun 2024 12:32:13 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-ej1-x62a.google.com with SMTP id a640c23a62f3a-a626919d19dso531701666b.0 for ; Sat, 01 Jun 2024 05:32:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20230601.gappssmtp.com; s=20230601; t=1717245132; x=1717849932; darn=freebsd.org; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=XZmleZTCSofRLnPXc5K44W5HJ9xJ4B5qCoXN+jZYAC0=; b=yGk0H2eKTc2kQ8IIpPAvu7NGtAXuKHC4gk1PjvJDeDTEmRJiDyJLx8DTTKUMAgzT9k SteJxsiM9t4eXwmjFG6F6SrU4Z1Y0CzMOZ+tpNFR7zKKCJlOIWiuZPgRclGVB7PAG6sI 8Mjyss2LZ9Uh+3iPqdUDGoVIDyv36/eBlOWG81gxel3ZLNrtO82EhRM8JcjP8s0HRmzl 62qJHV0Vhg98RcK6CVSkrxSuJqq7uhznbe+L1NyLsSwSc0rfeHIppJ02lUMJnmE3OgXI 7qURB7kDnLR9qtd071cR0H6oFPNvM6MRPxfnJqsijMOZUbOBK4ff+XWNfhCa4D+iR3+j fTKw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1717245132; x=1717849932; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=XZmleZTCSofRLnPXc5K44W5HJ9xJ4B5qCoXN+jZYAC0=; b=PtSOMuN+UHVjLQ/Jh5c0+a2hj/GpHbf55yY+HAi6b9ZPWWfnNgZJRzVPWLjVBPKicn ZURdeF2utjJojLbbOybIahCOlRoQzrr0SUNJRT2GogOOclFXF3Yi3knQybwxGlkIlYyQ Nk7hW1bAw5vH+oLKfLo3j+1PtuqgxYAs7fTmAhunf4A6zCUXVJN2dBRT9jFXMbqSYPut J6MM3ivhaaNa41FbeLc0S//zyvFIB0p2BmON0jQCRYzxlOP9F5s6SHr+gDsJFyFy6Bgb zrUPGYmCE2IiibHwSIcSpnnuL2H3J6ENeybeouN5qrUDfEbBZhLZdyhqRXVcZSsbx5bd oYgA== X-Forwarded-Encrypted: i=1; AJvYcCXGx3WFQDkqme1f4R9KRMCTbrIYTLg2SJ1kI2U+7drKcma2XWF3g5ELHy0Snyt2CKkb8ekDp9AoclyfoIWap/sSGY5/52Fx1kaqIzHUMGLh X-Gm-Message-State: AOJu0YwfMW86nz2+WtAjKPOCcij6z5GZ14LwlvG9CT70tG2dPeAdAars wzS7jFz8t0VLohApuNRl3UacdKe8JtNVhtklGJCPlvy70p4pPmqugLUb1Snpwie1BkzCU4xbB1A H/nushOKbGs2KeOMW+BZ/kfvM7xxR4k9nvPdkCYMTa7K6cab0G4t5uQ== X-Google-Smtp-Source: AGHT+IEuH3gz9yK422gOeaIpvlfby2kvvdLCEid2wVrYiZGnSgq1eQfwdLI3GEX0iKfv+qNEWTiH+5b5dU2PUI+vh/g= X-Received: by 2002:a17:906:2c1a:b0:a59:cbcb:1cca with SMTP id a640c23a62f3a-a65f094096dmr636818166b.13.1717245131445; Sat, 01 Jun 2024 05:32:11 -0700 (PDT) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 References: <202405311447.44VEl1G1078199@gitrepo.freebsd.org> In-Reply-To: From: Warner Losh Date: Sat, 1 Jun 2024 08:31:59 -0400 Message-ID: Subject: Re: git: 108de784513d - main - Redefine CLOCK_BOOTTIME to alias CLOCK_MONOTONIC, not CLOCK_UPTIME To: Nuno Teixeira Cc: Warner Losh , src-committers , "" , "" Content-Type: multipart/alternative; boundary="0000000000000d72080619d34a39" X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:2a00:1450::/32, country:US] X-Rspamd-Queue-Id: 4Vrzrs1Pmfz45st --0000000000000d72080619d34a39 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Sat, Jun 1, 2024, 4:37=E2=80=AFAM Nuno Teixeira wr= ote: > Hello, > > Having issues building graphics/mesa-dri: > > ../src/intel/common/xe/intel_gem.c:72:9: error: duplicate case value '4' > 72 | case CLOCK_BOOTTIME: > | ^ > /usr/include/sys/_clock_id.h:81:25: note: expanded from macro > 'CLOCK_BOOTTIME' > 81 | #define CLOCK_BOOTTIME CLOCK_MONOTONIC > | ^ > /usr/include/sys/_clock_id.h:56:26: note: expanded from macro > 'CLOCK_MONOTONIC' > 56 | #define CLOCK_MONOTONIC 4 > | ^ > ../src/intel/common/xe/intel_gem.c:66:9: note: previous case defined here > 66 | case CLOCK_MONOTONIC: > | ^ > /usr/include/sys/_clock_id.h:56:26: note: expanded from macro > 'CLOCK_MONOTONIC' > 56 | #define CLOCK_MONOTONIC 4 > | ^ > 1 error generated. > Mesa needs to be updated to not assume these are distinct values. Warner > Thanks > > Warner Losh escreveu (sexta, 31/05/2024 =C3=A0(s) 15:47= ): > >> The branch main has been updated by imp: >> >> URL: >> https://cgit.FreeBSD.org/src/commit/?id=3D108de784513d87bbe850e7b003a73e= 26b5b54caa >> >> commit 108de784513d87bbe850e7b003a73e26b5b54caa >> Author: Val Packett >> AuthorDate: 2024-05-31 14:45:02 +0000 >> Commit: Warner Losh >> CommitDate: 2024-05-31 14:45:02 +0000 >> >> Redefine CLOCK_BOOTTIME to alias CLOCK_MONOTONIC, not CLOCK_UPTIME >> >> The suspend-awareness situation with monotonic clocks across platfor= ms >> is kind of a mess, let's try not making it worse. >> >> On Linux, CLOCK_MONOTONIC does NOT count suspended time, and >> CLOCK_BOOTTIME was introduced to INCLUDE suspended time. >> >> On OpenBSD, CLOCK_MONOTONIC DOES count suspended time, and >> CLOCK_UPTIME >> was introduced to EXCLUDE suspended time. >> >> On macOS, it's the same as OpenBSD, but with CLOCK_UPTIME_RAW. >> >> Right now, we do not have a monotonic clock that counts suspended >> time. >> We have CLOCK_UPTIME as a distinct ID alias, and CLOCK_BOOTTIME as a >> preprocessor alias, both being effectively `CLOCK_MONOTONIC` for now= . >> >> When we introduce a suspend-aware clock in the future, it would make= a >> lot more sense to do it the OpenBSD/macOS way, i.e. to make >> CLOCK_MONOTONIC include suspended time and make CLOCK_UPTIME exclude >> it, >> because that's what the name CLOCK_UPTIME implies: a deviation from >> the >> default intended for the uptime command to allow it to only show the >> time the system was actually up and not suspended. >> >> Let's change the define right now to make sure software using the >> define >> would not end up using the ID of the wrong clock in the future, and >> fix >> the IDs in the Linux compat code to match the expected changes too. >> >> See https://bugzilla.mozilla.org/show_bug.cgi?id=3D1824084 >> for more discussion. >> >> Fixes: 155f15118a77 ("clock_gettime: Add Linux aliases for >> CLOCK_*") >> Fixes: 25ada637362d ("Map Linux CLOCK_BOOTTIME to native >> CLOCK_UPTIME.") >> Sponsored by: https://www.patreon.com/valpackett >> Reviewed by: kib, imp >> Differential Revision: https://reviews.freebsd.org/D39270 >> --- >> sys/compat/linux/linux_time.c | 6 +++--- >> sys/sys/_clock_id.h | 2 +- >> 2 files changed, 4 insertions(+), 4 deletions(-) >> >> diff --git a/sys/compat/linux/linux_time.c b/sys/compat/linux/linux_time= .c >> index e9e5cf075210..f4dd26dd3d2a 100644 >> --- a/sys/compat/linux/linux_time.c >> +++ b/sys/compat/linux/linux_time.c >> @@ -287,7 +287,7 @@ linux_to_native_clockid(clockid_t *n, clockid_t l) >> *n =3D CLOCK_REALTIME; >> break; >> case LINUX_CLOCK_MONOTONIC: >> - *n =3D CLOCK_MONOTONIC; >> + *n =3D CLOCK_UPTIME; >> break; >> case LINUX_CLOCK_PROCESS_CPUTIME_ID: >> *n =3D CLOCK_PROCESS_CPUTIME_ID; >> @@ -300,10 +300,10 @@ linux_to_native_clockid(clockid_t *n, clockid_t l) >> break; >> case LINUX_CLOCK_MONOTONIC_COARSE: >> case LINUX_CLOCK_MONOTONIC_RAW: >> - *n =3D CLOCK_MONOTONIC_FAST; >> + *n =3D CLOCK_UPTIME_FAST; >> break; >> case LINUX_CLOCK_BOOTTIME: >> - *n =3D CLOCK_UPTIME; >> + *n =3D CLOCK_MONOTONIC; >> break; >> case LINUX_CLOCK_REALTIME_ALARM: >> case LINUX_CLOCK_BOOTTIME_ALARM: >> diff --git a/sys/sys/_clock_id.h b/sys/sys/_clock_id.h >> index 47a551428dc3..728346a0f0ab 100644 >> --- a/sys/sys/_clock_id.h >> +++ b/sys/sys/_clock_id.h >> @@ -78,7 +78,7 @@ >> * Linux compatible names. >> */ >> #if __BSD_VISIBLE >> -#define CLOCK_BOOTTIME CLOCK_UPTIME >> +#define CLOCK_BOOTTIME CLOCK_MONOTONIC >> #define CLOCK_REALTIME_COARSE CLOCK_REALTIME_FAST >> #define CLOCK_MONOTONIC_COARSE CLOCK_MONOTONIC_FAST >> #endif >> >> > > -- > Nuno Teixeira > FreeBSD UNIX: Web: https://FreeBSD.org > --0000000000000d72080619d34a39 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable


=
On Sat, Jun 1, 2024, 4:37=E2=80=AFAM = Nuno Teixeira <= eduardo@freebsd.org> wrote:
=
Hello,

Having issues buildin= g graphics/mesa-dri:

../src/intel/common/xe/intel_= gem.c:72:9: error: duplicate case value '4'
=C2=A0 =C2=A072 | = =C2=A0 =C2=A0case CLOCK_BOOTTIME:
=C2=A0 =C2=A0 =C2=A0 | =C2=A0 =C2=A0 = =C2=A0 =C2=A0 ^
/usr/include/sys/_clock_id.h:81:25: note: expanded from = macro 'CLOCK_BOOTTIME'
=C2=A0 =C2=A081 | #define CLOCK_BOOTTIME = =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0CLOCK_MONOTONIC
=C2=A0 =C2=A0 =C2=A0 |= =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 ^
/usr/include/sys/_clock_id.h:56= :26: note: expanded from macro 'CLOCK_MONOTONIC'
=C2=A0 =C2=A056= | #define CLOCK_MONOTONIC =C2=A0 =C2=A0 =C2=A0 =C2=A0 4
=C2=A0 =C2=A0 = =C2=A0 | =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 ^
../src/intel/common/xe/i= ntel_gem.c:66:9: note: previous case defined here
=C2=A0 =C2=A066 | =C2= =A0 =C2=A0case CLOCK_MONOTONIC:
=C2=A0 =C2=A0 =C2=A0 | =C2=A0 =C2=A0 =C2= =A0 =C2=A0 ^
/usr/include/sys/_clock_id.h:56:26: note: expanded from mac= ro 'CLOCK_MONOTONIC'
=C2=A0 =C2=A056 | #define CLOCK_MONOTONIC = =C2=A0 =C2=A0 =C2=A0 =C2=A0 4
=C2=A0 =C2=A0 =C2=A0 | =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0 =C2=A0 ^
1 error generated.
=

Mesa needs to be updated to not assume these are distinct values.<= /div>

Warner
=C2=A0
Thanks

Warner Losh <imp@freebsd.org> escreveu= (sexta, 31/05/2024 =C3=A0(s) 15:47):
The branch main has been updated by imp:

URL: ht= tps://cgit.FreeBSD.org/src/commit/?id=3D108de784513d87bbe850e7b003a73e26b5b= 54caa

commit 108de784513d87bbe850e7b003a73e26b5b54caa
Author:=C2=A0 =C2=A0 =C2=A0Val Packett <val@packett.cool>
AuthorDate: 2024-05-31 14:45:02 +0000
Commit:=C2=A0 =C2=A0 =C2=A0Warner Losh <imp@FreeBSD.org>
CommitDate: 2024-05-31 14:45:02 +0000

=C2=A0 =C2=A0 Redefine CLOCK_BOOTTIME to alias CLOCK_MONOTONIC, not CLOCK_U= PTIME

=C2=A0 =C2=A0 The suspend-awareness situation with monotonic clocks across = platforms
=C2=A0 =C2=A0 is kind of a mess, let's try not making it worse.

=C2=A0 =C2=A0 On Linux, CLOCK_MONOTONIC does NOT count suspended time, and<= br> =C2=A0 =C2=A0 CLOCK_BOOTTIME was introduced to INCLUDE suspended time.

=C2=A0 =C2=A0 On OpenBSD, CLOCK_MONOTONIC DOES count suspended time, and CL= OCK_UPTIME
=C2=A0 =C2=A0 was introduced to EXCLUDE suspended time.

=C2=A0 =C2=A0 On macOS, it's the same as OpenBSD, but with CLOCK_UPTIME= _RAW.

=C2=A0 =C2=A0 Right now, we do not have a monotonic clock that counts suspe= nded time.
=C2=A0 =C2=A0 We have CLOCK_UPTIME as a distinct ID alias, and CLOCK_BOOTTI= ME as a
=C2=A0 =C2=A0 preprocessor alias, both being effectively `CLOCK_MONOTONIC` = for now.

=C2=A0 =C2=A0 When we introduce a suspend-aware clock in the future, it wou= ld make a
=C2=A0 =C2=A0 lot more sense to do it the OpenBSD/macOS way, i.e. to make =C2=A0 =C2=A0 CLOCK_MONOTONIC include suspended time and make CLOCK_UPTIME = exclude it,
=C2=A0 =C2=A0 because that's what the name CLOCK_UPTIME implies: a devi= ation from the
=C2=A0 =C2=A0 default intended for the uptime command to allow it to only s= how the
=C2=A0 =C2=A0 time the system was actually up and not suspended.

=C2=A0 =C2=A0 Let's change the define right now to make sure software u= sing the define
=C2=A0 =C2=A0 would not end up using the ID of the wrong clock in the futur= e, and fix
=C2=A0 =C2=A0 the IDs in the Linux compat code to match the expected change= s too.

=C2=A0 =C2=A0 See https://bugzill= a.mozilla.org/show_bug.cgi?id=3D1824084
=C2=A0 =C2=A0 for more discussion.

=C2=A0 =C2=A0 Fixes:=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 155f15118a77 ("= clock_gettime: Add Linux aliases for CLOCK_*")
=C2=A0 =C2=A0 Fixes:=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 25ada637362d ("= Map Linux CLOCK_BOOTTIME to native CLOCK_UPTIME.")
=C2=A0 =C2=A0 Sponsored by:=C2=A0 =C2=A0https://www.pat= reon.com/valpackett
=C2=A0 =C2=A0 Reviewed by:=C2=A0 =C2=A0 kib, imp
=C2=A0 =C2=A0 Differential Revision:=C2=A0 https://revi= ews.freebsd.org/D39270
---
=C2=A0sys/compat/linux/linux_time.c | 6 +++---
=C2=A0sys/sys/_clock_id.h=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0| 2 +- =C2=A02 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/sys/compat/linux/linux_time.c b/sys/compat/linux/linux_time.c<= br> index e9e5cf075210..f4dd26dd3d2a 100644
--- a/sys/compat/linux/linux_time.c
+++ b/sys/compat/linux/linux_time.c
@@ -287,7 +287,7 @@ linux_to_native_clockid(clockid_t *n, clockid_t l)
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 *n =3D CLOCK_REALTI= ME;
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 break;
=C2=A0 =C2=A0 =C2=A0 =C2=A0 case LINUX_CLOCK_MONOTONIC:
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0*n =3D CLOCK_MONOTO= NIC;
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0*n =3D CLOCK_UPTIME= ;
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 break;
=C2=A0 =C2=A0 =C2=A0 =C2=A0 case LINUX_CLOCK_PROCESS_CPUTIME_ID:
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 *n =3D CLOCK_PROCES= S_CPUTIME_ID;
@@ -300,10 +300,10 @@ linux_to_native_clockid(clockid_t *n, clockid_t l) =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 break;
=C2=A0 =C2=A0 =C2=A0 =C2=A0 case LINUX_CLOCK_MONOTONIC_COARSE:
=C2=A0 =C2=A0 =C2=A0 =C2=A0 case LINUX_CLOCK_MONOTONIC_RAW:
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0*n =3D CLOCK_MONOTO= NIC_FAST;
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0*n =3D CLOCK_UPTIME= _FAST;
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 break;
=C2=A0 =C2=A0 =C2=A0 =C2=A0 case LINUX_CLOCK_BOOTTIME:
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0*n =3D CLOCK_UPTIME= ;
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0*n =3D CLOCK_MONOTO= NIC;
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 break;
=C2=A0 =C2=A0 =C2=A0 =C2=A0 case LINUX_CLOCK_REALTIME_ALARM:
=C2=A0 =C2=A0 =C2=A0 =C2=A0 case LINUX_CLOCK_BOOTTIME_ALARM:
diff --git a/sys/sys/_clock_id.h b/sys/sys/_clock_id.h
index 47a551428dc3..728346a0f0ab 100644
--- a/sys/sys/_clock_id.h
+++ b/sys/sys/_clock_id.h
@@ -78,7 +78,7 @@
=C2=A0 * Linux compatible names.
=C2=A0 */
=C2=A0#if __BSD_VISIBLE
-#define=C2=A0 =C2=A0 =C2=A0 =C2=A0 CLOCK_BOOTTIME=C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 CLOCK_UPTIME
+#define=C2=A0 =C2=A0 =C2=A0 =C2=A0 CLOCK_BOOTTIME=C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 CLOCK_MONOTONIC
=C2=A0#define=C2=A0 =C2=A0 =C2=A0 =C2=A0 CLOCK_REALTIME_COARSE=C2=A0 =C2=A0= CLOCK_REALTIME_FAST
=C2=A0#define=C2=A0 =C2=A0 =C2=A0 =C2=A0 CLOCK_MONOTONIC_COARSE=C2=A0 CLOCK= _MONOTONIC_FAST
=C2=A0#endif



--
Nuno Teixeira
FreeBSD UNIX:=C2=A0 <eduardo@FreeBSD.org>=C2=A0 =C2=A0Web:=C2=A0 https://FreeBSD.org
--0000000000000d72080619d34a39-- From nobody Sat Jun 1 13:31: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 4Vs19s29WSz5MvBQ; Sat, 01 Jun 2024 13:32:01 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Received: from omta001.cacentral1.a.cloudfilter.net (omta001.cacentral1.a.cloudfilter.net [3.97.99.32]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "Client", Issuer "CA" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Vs19r5cc1z49ym; Sat, 1 Jun 2024 13:32:00 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Authentication-Results: mx1.freebsd.org; none Received: from shw-obgw-4002a.ext.cloudfilter.net ([10.228.9.250]) by cmsmtp with ESMTPS id D5tysRr3I2Ui5DOpzsDzmh; Sat, 01 Jun 2024 13:31:59 +0000 Received: from spqr.komquats.com ([70.66.152.170]) by cmsmtp with ESMTPSA id DOpxsYXeI9Cr4DOpysXEGe; Sat, 01 Jun 2024 13:31:59 +0000 X-Auth-User: cschuber X-Authority-Analysis: v=2.4 cv=etl8zZpX c=1 sm=1 tr=0 ts=665b22cf a=y8EK/9tc/U6QY+pUhnbtgQ==:117 a=y8EK/9tc/U6QY+pUhnbtgQ==:17 a=kj9zAlcOel0A:10 a=T1WGqf2p2xoA:10 a=6I5d2MoRAAAA:8 a=YxBL1-UpAAAA:8 a=EkcXrb_YAAAA:8 a=pQs5aej7AAAA:8 a=-wuKhKTYAAAA:8 a=wFNwba7RAAAA:8 a=SLG1KRGDAAAA:8 a=p1MGncNJEa64hhLhiKIA:9 a=m0aHWRZkbZ-AXnUG:21 a=CjuIK1q_8ugA:10 a=IjZwj45LgO3ly-622nXo:22 a=Ia-lj3WSrqcvXOmTRaiG:22 a=LK5xJRSDVpKd5WXXoEvA:22 a=prepyofVby0hjpoiPUJH:22 a=-TBaU1e9WpdkKBzYXnwo:22 Received: from slippy.cwsent.com (slippy [10.1.1.91]) by spqr.komquats.com (Postfix) with ESMTP id C022D1361; Sat, 01 Jun 2024 06:31:56 -0700 (PDT) Received: by slippy.cwsent.com (Postfix, from userid 1000) id 8EB804B0; Sat, 01 Jun 2024 06:31:56 -0700 (PDT) X-Mailer: exmh version 2.9.0 11/07/2018 with nmh-1.8+dev Reply-to: Cy Schubert From: Cy Schubert X-os: FreeBSD X-Sender: cy@cwsent.com X-URL: http://www.cschubert.com/ To: Warner Losh cc: Nuno Teixeira , Warner Losh , src-committers , "" , "" Subject: Re: git: 108de784513d - main - Redefine CLOCK_BOOTTIME to alias CLOCK_MONOTONIC, not CLOCK_UPTIME In-reply-to: References: <202405311447.44VEl1G1078199@gitrepo.freebsd.org> Comments: In-reply-to Warner Losh message dated "Sat, 01 Jun 2024 08:31:59 -0400." List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Date: Sat, 01 Jun 2024 06:31:56 -0700 Message-Id: <20240601133156.8EB804B0@slippy.cwsent.com> X-CMAE-Envelope: MS4xfDLxaB6lVPbLLhLD5ImcddkVkbztL6LI5EnUYRcq1Xi0d4TLQ6rYAElMDVhp2pA0alp0eLKj8MJuxaYelz+gEGXKDOjxsh+74/Nr+0T4HkuLcVQuFDVA TJ5JgtbKHbCwWbemTsAnNzQtZDLJMjGVr6zkl26yAbrZSW1rzVwlTtXdI63U0WroO/PcWHWgz8EqQWwhqal5SeNPGdh238BT1Vhk29uDnpiCHVf5b2hSewHN TOmcVYErV9Vsl7b0sUsAS33m6kYyhWs8Ac6spVudpyZ52x6nhNxLCCPJTMRyfDHLiv7XLtG5s6uvmgQ1u9SGB2zdPYqVKz4uuVoCSWHT9P7KzhyB3rHn67ql fKxNsNVrsOTy8rCScXQLUvqp6cM1MQ== X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:16509, ipnet:3.96.0.0/15, country:US] X-Rspamd-Queue-Id: 4Vs19r5cc1z49ym In message , Warner Losh writes: > --0000000000000d72080619d34a39 > Content-Type: text/plain; charset="UTF-8" > Content-Transfer-Encoding: quoted-printable > > On Sat, Jun 1, 2024, 4:37=E2=80=AFAM Nuno Teixeira wr= > ote: > > > Hello, > > > > Having issues building graphics/mesa-dri: > > > > ../src/intel/common/xe/intel_gem.c:72:9: error: duplicate case value '4' > > 72 | case CLOCK_BOOTTIME: > > | ^ > > /usr/include/sys/_clock_id.h:81:25: note: expanded from macro > > 'CLOCK_BOOTTIME' > > 81 | #define CLOCK_BOOTTIME CLOCK_MONOTONIC > > | ^ > > /usr/include/sys/_clock_id.h:56:26: note: expanded from macro > > 'CLOCK_MONOTONIC' > > 56 | #define CLOCK_MONOTONIC 4 > > | ^ > > ../src/intel/common/xe/intel_gem.c:66:9: note: previous case defined here > > 66 | case CLOCK_MONOTONIC: > > | ^ > > /usr/include/sys/_clock_id.h:56:26: note: expanded from macro > > 'CLOCK_MONOTONIC' > > 56 | #define CLOCK_MONOTONIC 4 > > | ^ > > 1 error generated. > > > > Mesa needs to be updated to not assume these are distinct values. You should be able to resolve this with, --- src/intel/common/xe/intel_gem.c.orig 2024-05-22 09:48:39.000000000 -0700 +++ src/intel/common/xe/intel_gem.c 2024-06-01 06:28:22.268439000 -0700 @@ -69,8 +69,10 @@ #endif case CLOCK_REALTIME: #ifdef CLOCK_BOOTTIME +#if CLOCK_BOOTTIME != CLOCK_MONOTONIC case CLOCK_BOOTTIME: #endif +#endif #ifdef CLOCK_TAI case CLOCK_TAI: #endif -- Cheers, Cy Schubert FreeBSD UNIX: Web: https://FreeBSD.org NTP: Web: https://nwtime.org e^(i*pi)+1=0 > > Warner > > > > Thanks > > > > Warner Losh escreveu (sexta, 31/05/2024 =C3=A0(s) 15:47= > ): > > > >> The branch main has been updated by imp: > >> > >> URL: > >> https://cgit.FreeBSD.org/src/commit/?id=3D108de784513d87bbe850e7b003a73e= > 26b5b54caa > >> > >> commit 108de784513d87bbe850e7b003a73e26b5b54caa > >> Author: Val Packett > >> AuthorDate: 2024-05-31 14:45:02 +0000 > >> Commit: Warner Losh > >> CommitDate: 2024-05-31 14:45:02 +0000 > >> > >> Redefine CLOCK_BOOTTIME to alias CLOCK_MONOTONIC, not CLOCK_UPTIME > >> > >> The suspend-awareness situation with monotonic clocks across platfor= > ms > >> is kind of a mess, let's try not making it worse. > >> > >> On Linux, CLOCK_MONOTONIC does NOT count suspended time, and > >> CLOCK_BOOTTIME was introduced to INCLUDE suspended time. > >> > >> On OpenBSD, CLOCK_MONOTONIC DOES count suspended time, and > >> CLOCK_UPTIME > >> was introduced to EXCLUDE suspended time. > >> > >> On macOS, it's the same as OpenBSD, but with CLOCK_UPTIME_RAW. > >> > >> Right now, we do not have a monotonic clock that counts suspended > >> time. > >> We have CLOCK_UPTIME as a distinct ID alias, and CLOCK_BOOTTIME as a > >> preprocessor alias, both being effectively `CLOCK_MONOTONIC` for now= > . > >> > >> When we introduce a suspend-aware clock in the future, it would make= > a > >> lot more sense to do it the OpenBSD/macOS way, i.e. to make > >> CLOCK_MONOTONIC include suspended time and make CLOCK_UPTIME exclude > >> it, > >> because that's what the name CLOCK_UPTIME implies: a deviation from > >> the > >> default intended for the uptime command to allow it to only show the > >> time the system was actually up and not suspended. > >> > >> Let's change the define right now to make sure software using the > >> define > >> would not end up using the ID of the wrong clock in the future, and > >> fix > >> the IDs in the Linux compat code to match the expected changes too. > >> > >> See https://bugzilla.mozilla.org/show_bug.cgi?id=3D1824084 > >> for more discussion. > >> > >> Fixes: 155f15118a77 ("clock_gettime: Add Linux aliases for > >> CLOCK_*") > >> Fixes: 25ada637362d ("Map Linux CLOCK_BOOTTIME to native > >> CLOCK_UPTIME.") > >> Sponsored by: https://www.patreon.com/valpackett > >> Reviewed by: kib, imp > >> Differential Revision: https://reviews.freebsd.org/D39270 > >> --- > >> sys/compat/linux/linux_time.c | 6 +++--- > >> sys/sys/_clock_id.h | 2 +- > >> 2 files changed, 4 insertions(+), 4 deletions(-) > >> > >> diff --git a/sys/compat/linux/linux_time.c b/sys/compat/linux/linux_time= > .c > >> index e9e5cf075210..f4dd26dd3d2a 100644 > >> --- a/sys/compat/linux/linux_time.c > >> +++ b/sys/compat/linux/linux_time.c > >> @@ -287,7 +287,7 @@ linux_to_native_clockid(clockid_t *n, clockid_t l) > >> *n =3D CLOCK_REALTIME; > >> break; > >> case LINUX_CLOCK_MONOTONIC: > >> - *n =3D CLOCK_MONOTONIC; > >> + *n =3D CLOCK_UPTIME; > >> break; > >> case LINUX_CLOCK_PROCESS_CPUTIME_ID: > >> *n =3D CLOCK_PROCESS_CPUTIME_ID; > >> @@ -300,10 +300,10 @@ linux_to_native_clockid(clockid_t *n, clockid_t l) > >> break; > >> case LINUX_CLOCK_MONOTONIC_COARSE: > >> case LINUX_CLOCK_MONOTONIC_RAW: > >> - *n =3D CLOCK_MONOTONIC_FAST; > >> + *n =3D CLOCK_UPTIME_FAST; > >> break; > >> case LINUX_CLOCK_BOOTTIME: > >> - *n =3D CLOCK_UPTIME; > >> + *n =3D CLOCK_MONOTONIC; > >> break; > >> case LINUX_CLOCK_REALTIME_ALARM: > >> case LINUX_CLOCK_BOOTTIME_ALARM: > >> diff --git a/sys/sys/_clock_id.h b/sys/sys/_clock_id.h > >> index 47a551428dc3..728346a0f0ab 100644 > >> --- a/sys/sys/_clock_id.h > >> +++ b/sys/sys/_clock_id.h > >> @@ -78,7 +78,7 @@ > >> * Linux compatible names. > >> */ > >> #if __BSD_VISIBLE > >> -#define CLOCK_BOOTTIME CLOCK_UPTIME > >> +#define CLOCK_BOOTTIME CLOCK_MONOTONIC > >> #define CLOCK_REALTIME_COARSE CLOCK_REALTIME_FAST > >> #define CLOCK_MONOTONIC_COARSE CLOCK_MONOTONIC_FAST > >> #endif > >> > >> > > > > -- > > Nuno Teixeira > > FreeBSD UNIX: Web: https://FreeBSD.org > > > > --0000000000000d72080619d34a39 > Content-Type: text/html; charset="UTF-8" > Content-Transfer-Encoding: quoted-printable > >


= >
On Sat, Jun 1, 2024, 4:37=E2=80=AFAM = > Nuno Teixeira <= > eduardo@freebsd.org> wrote:
e" style=3D"margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">= >
Hello,

Having issues buildin= > g graphics/mesa-dri:

../src/intel/common/xe/intel_= > gem.c:72:9: error: duplicate case value '4'
=C2=A0 =C2=A072 | = > =C2=A0 =C2=A0case CLOCK_BOOTTIME:
=C2=A0 =C2=A0 =C2=A0 | =C2=A0 =C2=A0 = > =C2=A0 =C2=A0 ^
/usr/include/sys/_clock_id.h:81:25: note: expanded from = > macro 'CLOCK_BOOTTIME'
=C2=A0 =C2=A081 | #define CLOCK_BOOTTIME = > =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0CLOCK_MONOTONIC
=C2=A0 =C2=A0 =C2=A0 |= > =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= > =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 ^
/usr/include/sys/_clock_id.h:56= > :26: note: expanded from macro 'CLOCK_MONOTONIC'
=C2=A0 =C2=A056= > | #define CLOCK_MONOTONIC =C2=A0 =C2=A0 =C2=A0 =C2=A0 4
=C2=A0 =C2=A0 = > =C2=A0 | =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= > =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 ^
../src/intel/common/xe/i= > ntel_gem.c:66:9: note: previous case defined here
=C2=A0 =C2=A066 | =C2= > =A0 =C2=A0case CLOCK_MONOTONIC:
=C2=A0 =C2=A0 =C2=A0 | =C2=A0 =C2=A0 =C2= > =A0 =C2=A0 ^
/usr/include/sys/_clock_id.h:56:26: note: expanded from mac= > ro 'CLOCK_MONOTONIC'
=C2=A0 =C2=A056 | #define CLOCK_MONOTONIC = > =C2=A0 =C2=A0 =C2=A0 =C2=A0 4
=C2=A0 =C2=A0 =C2=A0 | =C2=A0 =C2=A0 =C2= > =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = > =C2=A0 =C2=A0 =C2=A0 ^
1 error generated.
= >

te">
Mesa needs to be updated to not assume these are distinct values.<= > /div>

Warner
=C2=A0
gmail_quote" style=3D"margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-= > left:1ex">
Thanks
all">

=3D"ltr" class=3D"gmail_attr">Warner Losh < .org" rel=3D"noreferrer" target=3D"_blank">imp@freebsd.org> escreveu= > (sexta, 31/05/2024 =C3=A0(s) 15:47):
uote" style=3D"margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,2= > 04);padding-left:1ex">The branch main has been updated by imp:
>
> URL: 850e7b003a73e26b5b54caa" rel=3D"noreferrer noreferrer" target=3D"_blank">ht= > tps://cgit.FreeBSD.org/src/commit/?id=3D108de784513d87bbe850e7b003a73e26b5b= > 54caa
>
> commit 108de784513d87bbe850e7b003a73e26b5b54caa
> Author:=C2=A0 =C2=A0 =C2=A0Val Packett <val@packett.cool>
> AuthorDate: 2024-05-31 14:45:02 +0000
> Commit:=C2=A0 =C2=A0 =C2=A0Warner Losh <imp@FreeBSD.org>
> CommitDate: 2024-05-31 14:45:02 +0000
>
> =C2=A0 =C2=A0 Redefine CLOCK_BOOTTIME to alias CLOCK_MONOTONIC, not CLOCK_U= > PTIME
>
> =C2=A0 =C2=A0 The suspend-awareness situation with monotonic clocks across = > platforms
> =C2=A0 =C2=A0 is kind of a mess, let's try not making it worse.
>
> =C2=A0 =C2=A0 On Linux, CLOCK_MONOTONIC does NOT count suspended time, and<= > br> > =C2=A0 =C2=A0 CLOCK_BOOTTIME was introduced to INCLUDE suspended time.
>
> =C2=A0 =C2=A0 On OpenBSD, CLOCK_MONOTONIC DOES count suspended time, and CL= > OCK_UPTIME
> =C2=A0 =C2=A0 was introduced to EXCLUDE suspended time.
>
> =C2=A0 =C2=A0 On macOS, it's the same as OpenBSD, but with CLOCK_UPTIME= > _RAW.
>
> =C2=A0 =C2=A0 Right now, we do not have a monotonic clock that counts suspe= > nded time.
> =C2=A0 =C2=A0 We have CLOCK_UPTIME as a distinct ID alias, and CLOCK_BOOTTI= > ME as a
> =C2=A0 =C2=A0 preprocessor alias, both being effectively `CLOCK_MONOTONIC` = > for now.
>
> =C2=A0 =C2=A0 When we introduce a suspend-aware clock in the future, it wou= > ld make a
> =C2=A0 =C2=A0 lot more sense to do it the OpenBSD/macOS way, i.e. to make r> > =C2=A0 =C2=A0 CLOCK_MONOTONIC include suspended time and make CLOCK_UPTIME = > exclude it,
> =C2=A0 =C2=A0 because that's what the name CLOCK_UPTIME implies: a devi= > ation from the
> =C2=A0 =C2=A0 default intended for the uptime command to allow it to only s= > how the
> =C2=A0 =C2=A0 time the system was actually up and not suspended.
>
> =C2=A0 =C2=A0 Let's change the define right now to make sure software u= > sing the define
> =C2=A0 =C2=A0 would not end up using the ID of the wrong clock in the futur= > e, and fix
> =C2=A0 =C2=A0 the IDs in the Linux compat code to match the expected change= > s too.
>
> =C2=A0 =C2=A0 See =3D1824084" rel=3D"noreferrer noreferrer" target=3D"_blank">https://bugzill= > a.mozilla.org/show_bug.cgi?id=3D1824084
> =C2=A0 =C2=A0 for more discussion.
>
> =C2=A0 =C2=A0 Fixes:=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 155f15118a77 ("= > clock_gettime: Add Linux aliases for CLOCK_*")
> =C2=A0 =C2=A0 Fixes:=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 25ada637362d ("= > Map Linux CLOCK_BOOTTIME to native CLOCK_UPTIME.")
> =C2=A0 =C2=A0 Sponsored by:=C2=A0 =C2=A0 valpackett" rel=3D"noreferrer noreferrer" target=3D"_blank">https://www.pat= > reon.com/valpackett
> =C2=A0 =C2=A0 Reviewed by:=C2=A0 =C2=A0 kib, imp
> =C2=A0 =C2=A0 Differential Revision:=C2=A0 sd.org/D39270" rel=3D"noreferrer noreferrer" target=3D"_blank">https://revi= > ews.freebsd.org/D39270
> ---
> =C2=A0sys/compat/linux/linux_time.c | 6 +++---
> =C2=A0sys/sys/_clock_id.h=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0| 2 +- > > =C2=A02 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/sys/compat/linux/linux_time.c b/sys/compat/linux/linux_time.c<= > br> > index e9e5cf075210..f4dd26dd3d2a 100644
> --- a/sys/compat/linux/linux_time.c
> +++ b/sys/compat/linux/linux_time.c
> @@ -287,7 +287,7 @@ linux_to_native_clockid(clockid_t *n, clockid_t l)
> =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 *n =3D CLOCK_REALTI= > ME;
> =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 break;
> =C2=A0 =C2=A0 =C2=A0 =C2=A0 case LINUX_CLOCK_MONOTONIC:
> -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0*n =3D CLOCK_MONOTO= > NIC;
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0*n =3D CLOCK_UPTIME= > ;
> =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 break;
> =C2=A0 =C2=A0 =C2=A0 =C2=A0 case LINUX_CLOCK_PROCESS_CPUTIME_ID:
> =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 *n =3D CLOCK_PROCES= > S_CPUTIME_ID;
> @@ -300,10 +300,10 @@ linux_to_native_clockid(clockid_t *n, clockid_t l) > > =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 break;
> =C2=A0 =C2=A0 =C2=A0 =C2=A0 case LINUX_CLOCK_MONOTONIC_COARSE:
> =C2=A0 =C2=A0 =C2=A0 =C2=A0 case LINUX_CLOCK_MONOTONIC_RAW:
> -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0*n =3D CLOCK_MONOTO= > NIC_FAST;
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0*n =3D CLOCK_UPTIME= > _FAST;
> =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 break;
> =C2=A0 =C2=A0 =C2=A0 =C2=A0 case LINUX_CLOCK_BOOTTIME:
> -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0*n =3D CLOCK_UPTIME= > ;
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0*n =3D CLOCK_MONOTO= > NIC;
> =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 break;
> =C2=A0 =C2=A0 =C2=A0 =C2=A0 case LINUX_CLOCK_REALTIME_ALARM:
> =C2=A0 =C2=A0 =C2=A0 =C2=A0 case LINUX_CLOCK_BOOTTIME_ALARM:
> diff --git a/sys/sys/_clock_id.h b/sys/sys/_clock_id.h
> index 47a551428dc3..728346a0f0ab 100644
> --- a/sys/sys/_clock_id.h
> +++ b/sys/sys/_clock_id.h
> @@ -78,7 +78,7 @@
> =C2=A0 * Linux compatible names.
> =C2=A0 */
> =C2=A0#if __BSD_VISIBLE
> -#define=C2=A0 =C2=A0 =C2=A0 =C2=A0 CLOCK_BOOTTIME=C2=A0 =C2=A0 =C2=A0 =C2= > =A0 =C2=A0 CLOCK_UPTIME
> +#define=C2=A0 =C2=A0 =C2=A0 =C2=A0 CLOCK_BOOTTIME=C2=A0 =C2=A0 =C2=A0 =C2= > =A0 =C2=A0 CLOCK_MONOTONIC
> =C2=A0#define=C2=A0 =C2=A0 =C2=A0 =C2=A0 CLOCK_REALTIME_COARSE=C2=A0 =C2=A0= > CLOCK_REALTIME_FAST
> =C2=A0#define=C2=A0 =C2=A0 =C2=A0 =C2=A0 CLOCK_MONOTONIC_COARSE=C2=A0 CLOCK= > _MONOTONIC_FAST
> =C2=A0#endif
>
>


fix">--
tr">
Nuno Teixeira
color=3D"#888888"> > FreeBSD UNIX:=C2=A0 <eduardo@FreeBSD.org>=C2=A0 =C2=A0Web:=C2=A0 ref=3D"https://FreeBSD.org" rel=3D"noreferrer noreferrer" target=3D"_blank"= > >https://FreeBSD.org
>
>
> > --0000000000000d72080619d34a39-- > From nobody Sat Jun 1 13:51: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 4Vs1cm6kMsz5MwGS for ; Sat, 01 Jun 2024 13:51:52 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-ej1-x634.google.com (mail-ej1-x634.google.com [IPv6:2a00:1450:4864:20::634]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "WR4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Vs1cl6pRnz4Cy1 for ; Sat, 1 Jun 2024 13:51:51 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-ej1-x634.google.com with SMTP id a640c23a62f3a-a6266ffdba8so252121066b.1 for ; Sat, 01 Jun 2024 06:51:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20230601.gappssmtp.com; s=20230601; t=1717249910; x=1717854710; darn=freebsd.org; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=vVfUH4KgjCDjLxOQbSZkz92eRg9VaWN+g3Z8NQupgFs=; b=Nx9dGErY26pcjOPFetEJIb96+7JeMj4XpcXLTJbc8M4ULfJ1Z5fDk7KvbyIMts3Lqu AgxJcJ+oxIc7NC/89+yTC2PgIh3Z//lx9vk4Ae8mlaqFYaUBsA0167ucDrDDfkq//Vm9 mz5LLfZFoBXR6Sw7vG4DcmIHzMgzYx2mMiA1wyv4BjnSDvZZdeI9BFW6wAVV136ZoNkK qiTvMiLWogyf7LtRPh5s4qoVCwU8eLo08AHn1EkG0yK4mUFcvtVeANO85f8chRlYyj1l tYGNocIhEYHNKQ4l6Yi7i0z/6LngGN6vuKC6Rr+iYxAZOYachnoYfzmCzT25uN4CJVDK 4sjg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1717249910; x=1717854710; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=vVfUH4KgjCDjLxOQbSZkz92eRg9VaWN+g3Z8NQupgFs=; b=xVJgnrS/iHIwR/h3OKSZpxwqnnmKJr6Hos3Yv9l2j+6xpyqLH4nhpPHWy1xPN7whr+ h7slNt/7ck4dFlsYZh9S68iZlAuQy/UYgXgFc6VG10dN5xwRIUReh3HkPvTqPf2EA7pp 0+2gSJP3DVtA69U7JW0iR4wLCKVPn6ciHKxx1XboxnidBhcSpQyvGg8l+DY5TI+mpZj+ ZOqZS1fMtmMh8JRYNSQtGX1ZbySCLQmVXcl3KAdrFWI4MvEMCQJw2t9oB4BCL/3MbZBq t+qZ2NmbMgqN+gvGStNgO/QVhFP+jc/6bFAq6hQBXPUqJ1bjB82wx3GVBeb6tGZn+0Vn kuhA== X-Forwarded-Encrypted: i=1; AJvYcCVo9yTtEmavNgd4Frpl7dEe1SIfuV3ardtii9mulJncMbqt2j1KPV92WxKD0kt7q76lJzlIeMuuB0IocfyCgSwi2xoPjThAEwGpItbjCK2x X-Gm-Message-State: AOJu0Ywm1Wl7Viy76X3k291PILE/imB7rOPNV5dUcM5no6B8a0NqZrDe HGaHr90a//pEvVGxSxzpGB2J7JEV/JazCmYSbpcNUz1PYCaDMrrxBZqfSuv/QRMkNseimCXJ76L 18LnR9rQn6fxlrBAbBrXKYl3aLr11uHlMsnQTew== X-Google-Smtp-Source: AGHT+IHQJANmp+916C0l21OerYzyMlGKBtPtvdRB/Y3jl4HQuMFagLzesEsPwY997MetwJGZTAqdb52UJ86FxarYYZw= X-Received: by 2002:a17:907:c92a:b0:a66:197f:a47 with SMTP id a640c23a62f3a-a681c8d9e9amr282176766b.0.1717249909762; Sat, 01 Jun 2024 06:51:49 -0700 (PDT) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 References: <202405311447.44VEl1G1078199@gitrepo.freebsd.org> <20240601133156.8EB804B0@slippy.cwsent.com> In-Reply-To: <20240601133156.8EB804B0@slippy.cwsent.com> From: Warner Losh Date: Sat, 1 Jun 2024 09:51:37 -0400 Message-ID: Subject: Re: git: 108de784513d - main - Redefine CLOCK_BOOTTIME to alias CLOCK_MONOTONIC, not CLOCK_UPTIME To: Cy Schubert Cc: Nuno Teixeira , Warner Losh , src-committers , "" , "" Content-Type: multipart/alternative; boundary="000000000000dcc9a90619d4664c" X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:2a00:1450::/32, country:US] X-Rspamd-Queue-Id: 4Vs1cl6pRnz4Cy1 --000000000000dcc9a90619d4664c Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Sat, Jun 1, 2024 at 9:31=E2=80=AFAM Cy Schubert wrote: > In message > om> > , Warner Losh writes: > > --0000000000000d72080619d34a39 > > Content-Type: text/plain; charset=3D"UTF-8" > > Content-Transfer-Encoding: quoted-printable > > > > On Sat, Jun 1, 2024, 4:37=3DE2=3D80=3DAFAM Nuno Teixeira > wr=3D > > ote: > > > > > Hello, > > > > > > Having issues building graphics/mesa-dri: > > > > > > ../src/intel/common/xe/intel_gem.c:72:9: error: duplicate case value > '4' > > > 72 | case CLOCK_BOOTTIME: > > > | ^ > > > /usr/include/sys/_clock_id.h:81:25: note: expanded from macro > > > 'CLOCK_BOOTTIME' > > > 81 | #define CLOCK_BOOTTIME CLOCK_MONOTONIC > > > | ^ > > > /usr/include/sys/_clock_id.h:56:26: note: expanded from macro > > > 'CLOCK_MONOTONIC' > > > 56 | #define CLOCK_MONOTONIC 4 > > > | ^ > > > ../src/intel/common/xe/intel_gem.c:66:9: note: previous case defined > here > > > 66 | case CLOCK_MONOTONIC: > > > | ^ > > > /usr/include/sys/_clock_id.h:56:26: note: expanded from macro > > > 'CLOCK_MONOTONIC' > > > 56 | #define CLOCK_MONOTONIC 4 > > > | ^ > > > 1 error generated. > > > > > > > Mesa needs to be updated to not assume these are distinct values. > > You should be able to resolve this with, > > --- src/intel/common/xe/intel_gem.c.orig 2024-05-22 > 09:48:39.000000000 -0700 > +++ src/intel/common/xe/intel_gem.c 2024-06-01 06:28:22.268439000 -07= 00 > @@ -69,8 +69,10 @@ > #endif > case CLOCK_REALTIME: > #ifdef CLOCK_BOOTTIME > +#if CLOCK_BOOTTIME !=3D CLOCK_MONOTONIC > case CLOCK_BOOTTIME: > #endif > +#endif > #ifdef CLOCK_TAI > case CLOCK_TAI: > #endif > Yea, that should do it. I was going to look at this when I got back from BSDcan (mostly because my talk is this morning), but thanks for beating me to it. I woke up grump and it was bugging me on the walk over to the conference I was a little short in my first reply, but since you proposed a fix, I feel less guilty... :) Thanks! Warner Warner Warner > -- > Cheers, > Cy Schubert > FreeBSD UNIX: Web: https://FreeBSD.org > NTP: Web: https://nwtime.org > > e^(i*pi)+1=3D0 > > > > > > Warner > > > > > > > Thanks > > > > > > Warner Losh escreveu (sexta, 31/05/2024 =3DC3=3DA0(= s) > 15:47=3D > > ): > > > > > >> The branch main has been updated by imp: > > >> > > >> URL: > > >> > https://cgit.FreeBSD.org/src/commit/?id=3D3D108de784513d87bbe850e7b003a73= e=3D > > 26b5b54caa > > >> > > >> commit 108de784513d87bbe850e7b003a73e26b5b54caa > > >> Author: Val Packett > > >> AuthorDate: 2024-05-31 14:45:02 +0000 > > >> Commit: Warner Losh > > >> CommitDate: 2024-05-31 14:45:02 +0000 > > >> > > >> Redefine CLOCK_BOOTTIME to alias CLOCK_MONOTONIC, not CLOCK_UPTI= ME > > >> > > >> The suspend-awareness situation with monotonic clocks across > platfor=3D > > ms > > >> is kind of a mess, let's try not making it worse. > > >> > > >> On Linux, CLOCK_MONOTONIC does NOT count suspended time, and > > >> CLOCK_BOOTTIME was introduced to INCLUDE suspended time. > > >> > > >> On OpenBSD, CLOCK_MONOTONIC DOES count suspended time, and > > >> CLOCK_UPTIME > > >> was introduced to EXCLUDE suspended time. > > >> > > >> On macOS, it's the same as OpenBSD, but with CLOCK_UPTIME_RAW. > > >> > > >> Right now, we do not have a monotonic clock that counts suspende= d > > >> time. > > >> We have CLOCK_UPTIME as a distinct ID alias, and CLOCK_BOOTTIME > as a > > >> preprocessor alias, both being effectively `CLOCK_MONOTONIC` for > now=3D > > . > > >> > > >> When we introduce a suspend-aware clock in the future, it would > make=3D > > a > > >> lot more sense to do it the OpenBSD/macOS way, i.e. to make > > >> CLOCK_MONOTONIC include suspended time and make CLOCK_UPTIME > exclude > > >> it, > > >> because that's what the name CLOCK_UPTIME implies: a deviation > from > > >> the > > >> default intended for the uptime command to allow it to only show > the > > >> time the system was actually up and not suspended. > > >> > > >> Let's change the define right now to make sure software using th= e > > >> define > > >> would not end up using the ID of the wrong clock in the future, > and > > >> fix > > >> the IDs in the Linux compat code to match the expected changes > too. > > >> > > >> See https://bugzilla.mozilla.org/show_bug.cgi?id=3D3D1824084 > > >> for more discussion. > > >> > > >> Fixes: 155f15118a77 ("clock_gettime: Add Linux aliases > for > > >> CLOCK_*") > > >> Fixes: 25ada637362d ("Map Linux CLOCK_BOOTTIME to nativ= e > > >> CLOCK_UPTIME.") > > >> Sponsored by: https://www.patreon.com/valpackett > > >> Reviewed by: kib, imp > > >> Differential Revision: https://reviews.freebsd.org/D39270 > > >> --- > > >> sys/compat/linux/linux_time.c | 6 +++--- > > >> sys/sys/_clock_id.h | 2 +- > > >> 2 files changed, 4 insertions(+), 4 deletions(-) > > >> > > >> diff --git a/sys/compat/linux/linux_time.c > b/sys/compat/linux/linux_time=3D > > .c > > >> index e9e5cf075210..f4dd26dd3d2a 100644 > > >> --- a/sys/compat/linux/linux_time.c > > >> +++ b/sys/compat/linux/linux_time.c > > >> @@ -287,7 +287,7 @@ linux_to_native_clockid(clockid_t *n, clockid_t = l) > > >> *n =3D3D CLOCK_REALTIME; > > >> break; > > >> case LINUX_CLOCK_MONOTONIC: > > >> - *n =3D3D CLOCK_MONOTONIC; > > >> + *n =3D3D CLOCK_UPTIME; > > >> break; > > >> case LINUX_CLOCK_PROCESS_CPUTIME_ID: > > >> *n =3D3D CLOCK_PROCESS_CPUTIME_ID; > > >> @@ -300,10 +300,10 @@ linux_to_native_clockid(clockid_t *n, clockid_= t > l) > > >> break; > > >> case LINUX_CLOCK_MONOTONIC_COARSE: > > >> case LINUX_CLOCK_MONOTONIC_RAW: > > >> - *n =3D3D CLOCK_MONOTONIC_FAST; > > >> + *n =3D3D CLOCK_UPTIME_FAST; > > >> break; > > >> case LINUX_CLOCK_BOOTTIME: > > >> - *n =3D3D CLOCK_UPTIME; > > >> + *n =3D3D CLOCK_MONOTONIC; > > >> break; > > >> case LINUX_CLOCK_REALTIME_ALARM: > > >> case LINUX_CLOCK_BOOTTIME_ALARM: > > >> diff --git a/sys/sys/_clock_id.h b/sys/sys/_clock_id.h > > >> index 47a551428dc3..728346a0f0ab 100644 > > >> --- a/sys/sys/_clock_id.h > > >> +++ b/sys/sys/_clock_id.h > > >> @@ -78,7 +78,7 @@ > > >> * Linux compatible names. > > >> */ > > >> #if __BSD_VISIBLE > > >> -#define CLOCK_BOOTTIME CLOCK_UPTIME > > >> +#define CLOCK_BOOTTIME CLOCK_MONOTONIC > > >> #define CLOCK_REALTIME_COARSE CLOCK_REALTIME_FAST > > >> #define CLOCK_MONOTONIC_COARSE CLOCK_MONOTONIC_FAST > > >> #endif > > >> > > >> > > > > > > -- > > > Nuno Teixeira > > > FreeBSD UNIX: Web: https://FreeBSD.org > > > > > > > --0000000000000d72080619d34a39 > > Content-Type: text/html; charset=3D"UTF-8" > > Content-Transfer-Encoding: quoted-printable > > > >


class=3D3D"gmail_quote">=3D > >
On Sat, Jun 1, 2024, > 4:37=3DE2=3D80=3DAFAM =3D > > Nuno Teixeira < target=3D3D"_blank">=3D > > eduardo@freebsd.org> wrote:
class=3D3D"gmail_quot=3D > > e" style=3D3D"margin:0 0 0 .8ex;border-left:1px #ccc > solid;padding-left:1ex">=3D > >
Hello,

Having issues > buildin=3D > > g > graphics/mesa-dri:

../src/intel/common/xe/intel_= =3D > > gem.c:72:9: error: duplicate case value '4'
=3DC2=3DA0 =3DC2= =3DA072 | > =3D > > =3DC2=3DA0 =3DC2=3DA0case CLOCK_BOOTTIME:
=3DC2=3DA0 =3DC2=3DA0 =3DC= 2=3DA0 | =3DC2=3DA0 > =3DC2=3DA0 =3D > > =3DC2=3DA0 =3DC2=3DA0 ^
/usr/include/sys/_clock_id.h:81:25: note: ex= panded > from =3D > > macro 'CLOCK_BOOTTIME'
=3DC2=3DA0 =3DC2=3DA081 | #define > CLOCK_BOOTTIME =3D > > =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0CLOCK_MONOTONIC=3DC2=3DA0 =3DC2=3DA0 > =3DC2=3DA0 |=3D > > =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC= 2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 > =3DC2=3D > > =3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 > ^
/usr/include/sys/_clock_id.h:56=3D > > :26: note: expanded from macro 'CLOCK_MONOTONIC'
=3DC2=3DA0 > =3DC2=3DA056=3D > > | #define CLOCK_MONOTONIC =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 = 4
=3DC2=3DA0 > =3DC2=3DA0 =3D > > =3DC2=3DA0 | =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3D= C2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 > =3DC2=3D > > =3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 > ^
../src/intel/common/xe/i=3D > > ntel_gem.c:66:9: note: previous case defined here
=3DC2=3DA0 =3DC2= =3DA066 | > =3DC2=3D > > =3DA0 =3DC2=3DA0case CLOCK_MONOTONIC:
=3DC2=3DA0 =3DC2=3DA0 =3DC2=3D= A0 | =3DC2=3DA0 =3DC2=3DA0 > =3DC2=3D > > =3DA0 =3DC2=3DA0 ^
/usr/include/sys/_clock_id.h:56:26: note: expande= d from > mac=3D > > ro 'CLOCK_MONOTONIC'
=3DC2=3DA0 =3DC2=3DA056 | #define > CLOCK_MONOTONIC =3D > > =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 4
=3DC2=3DA0 =3DC2=3DA0 = =3DC2=3DA0 | =3DC2=3DA0 =3DC2=3DA0 > =3DC2=3D > > =3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0= =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 > =3DC2=3DA0 =3D > > =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 ^
1 error > generated.
=3D > >

class=3D3D"gmail_quo=3D > > te">
Mesa needs to be updated to not assume these are distinct > values.<=3D > > /div>

Warner
=3DC2=3DA0
class=3D3D"=3D > > gmail_quote" style=3D3D"margin:0 0 0 .8ex;border-left:1px #ccc > solid;padding-=3D > > left:1ex">
Thanks
clear=3D3D"=3D > > all">

dir=3D > > =3D3D"ltr" class=3D3D"gmail_attr">Warner Losh < imp@freebsd=3D > > .org" rel=3D3D"noreferrer" target=3D3D"_blank">imp@freebsd.org> > escreveu=3D > > (sexta, 31/05/2024 =3DC3=3DA0(s) 15:47):
class=3D3D"gmail_q=3D > > uote" style=3D3D"margin:0px 0px 0px 0.8ex;border-left:1px solid > rgb(204,204,2=3D > > 04);padding-left:1ex">The branch main has been updated by imp:
> >
> > URL: https://cgit.FreeBSD.org/src/commit/?id=3D3D108de784513d87bbe=3D > > 850e7b003a73e26b5b54caa" rel=3D3D"noreferrer noreferrer" > target=3D3D"_blank">ht=3D > > tps:// > cgit.FreeBSD.org/src/commit/?id=3D3D108de784513d87bbe850e7b003a73e26b5b= =3D > > 54caa
> >
> > commit 108de784513d87bbe850e7b003a73e26b5b54caa
> > Author:=3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0Val Packett <val@packett.cool= >
> > AuthorDate: 2024-05-31 14:45:02 +0000
> > Commit:=3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0Warner Losh <imp@FreeBSD.org&= gt;
> > CommitDate: 2024-05-31 14:45:02 +0000
> >
> > =3DC2=3DA0 =3DC2=3DA0 Redefine CLOCK_BOOTTIME to alias CLOCK_MONOTONIC,= not > CLOCK_U=3D > > PTIME
> >
> > =3DC2=3DA0 =3DC2=3DA0 The suspend-awareness situation with monotonic cl= ocks > across =3D > > platforms
> > =3DC2=3DA0 =3DC2=3DA0 is kind of a mess, let's try not making it wo= rse.
> >
> > =3DC2=3DA0 =3DC2=3DA0 On Linux, CLOCK_MONOTONIC does NOT count suspende= d time, > and<=3D > > br> > > =3DC2=3DA0 =3DC2=3DA0 CLOCK_BOOTTIME was introduced to INCLUDE suspende= d > time.
> >
> > =3DC2=3DA0 =3DC2=3DA0 On OpenBSD, CLOCK_MONOTONIC DOES count suspended = time, and > CL=3D > > OCK_UPTIME
> > =3DC2=3DA0 =3DC2=3DA0 was introduced to EXCLUDE suspended time.
> >
> > =3DC2=3DA0 =3DC2=3DA0 On macOS, it's the same as OpenBSD, but with > CLOCK_UPTIME=3D > > _RAW.
> >
> > =3DC2=3DA0 =3DC2=3DA0 Right now, we do not have a monotonic clock that = counts > suspe=3D > > nded time.
> > =3DC2=3DA0 =3DC2=3DA0 We have CLOCK_UPTIME as a distinct ID alias, and > CLOCK_BOOTTI=3D > > ME as a
> > =3DC2=3DA0 =3DC2=3DA0 preprocessor alias, both being effectively > `CLOCK_MONOTONIC` =3D > > for now.
> >
> > =3DC2=3DA0 =3DC2=3DA0 When we introduce a suspend-aware clock in the fu= ture, it > wou=3D > > ld make a
> > =3DC2=3DA0 =3DC2=3DA0 lot more sense to do it the OpenBSD/macOS way, i.= e. to > make > r> > > =3DC2=3DA0 =3DC2=3DA0 CLOCK_MONOTONIC include suspended time and make > CLOCK_UPTIME =3D > > exclude it,
> > =3DC2=3DA0 =3DC2=3DA0 because that's what the name CLOCK_UPTIME imp= lies: a > devi=3D > > ation from the
> > =3DC2=3DA0 =3DC2=3DA0 default intended for the uptime command to allow = it to > only s=3D > > how the
> > =3DC2=3DA0 =3DC2=3DA0 time the system was actually up and not suspended= .
> >
> > =3DC2=3DA0 =3DC2=3DA0 Let's change the define right now to make sur= e > software u=3D > > sing the define
> > =3DC2=3DA0 =3DC2=3DA0 would not end up using the ID of the wrong clock = in the > futur=3D > > e, and fix
> > =3DC2=3DA0 =3DC2=3DA0 the IDs in the Linux compat code to match the exp= ected > change=3D > > s too.
> >
> > =3DC2=3DA0 =3DC2=3DA0 See https://bugzilla.mozilla.org/show_bug.cgi?id=3D > > =3D3D1824084" rel=3D3D"noreferrer noreferrer" target=3D3D"_blank"> > https://bugzill=3D > > a.mozilla.org/show_bug.cgi?id=3D3D1824084
> > =3DC2=3DA0 =3DC2=3DA0 for more discussion.
> >
> > =3DC2=3DA0 =3DC2=3DA0 Fixes:=3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0= =3DC2=3DA0 155f15118a77 > ("=3D > > clock_gettime: Add Linux aliases for CLOCK_*")
> > =3DC2=3DA0 =3DC2=3DA0 Fixes:=3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0= =3DC2=3DA0 25ada637362d > ("=3D > > Map Linux CLOCK_BOOTTIME to native CLOCK_UPTIME.")
> > =3DC2=3DA0 =3DC2=3DA0 Sponsored by:=3DC2=3DA0 =3DC2=3DA0 https://www.patreon.com/=3D > > valpackett" rel=3D3D"noreferrer noreferrer" target=3D3D"_blank"> > https://www.pat=3D > > reon.com/valpackett
> > =3DC2=3DA0 =3DC2=3DA0 Reviewed by:=3DC2=3DA0 =3DC2=3DA0 kib, imp
> > =3DC2=3DA0 =3DC2=3DA0 Differential Revision:=3DC2=3DA0 https://reviews.freeb=3D > > sd.org/D39270" rel=3D3D"noreferrer noreferrer" target=3D3D"_blank"> > https://revi=3D > > ews.freebsd.org/D39270
> > ---
> > =3DC2=3DA0sys/compat/linux/linux_time.c | 6 +++---
> > =3DC2=3DA0sys/sys/_clock_id.h=3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA= 0 =3DC2=3DA0 =3DC2=3DA0| 2 > +- > > > > =3DC2=3DA02 files changed, 4 insertions(+), 4 deletions(-)
> >
> > diff --git a/sys/compat/linux/linux_time.c > b/sys/compat/linux/linux_time.c<=3D > > br> > > index e9e5cf075210..f4dd26dd3d2a 100644
> > --- a/sys/compat/linux/linux_time.c
> > +++ b/sys/compat/linux/linux_time.c
> > @@ -287,7 +287,7 @@ linux_to_native_clockid(clockid_t *n, clockid_t > l)
> > =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2= =3DA0 =3DC2=3DA0 *n =3D3D > CLOCK_REALTI=3D > > ME;
> > =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2= =3DA0 =3DC2=3DA0 break;
> > =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 case LINUX_CLOCK_MONOTONIC:=
> > -=3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC= 2=3DA0 =3DC2=3DA0*n =3D3D > CLOCK_MONOTO=3D > > NIC;
> > +=3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC= 2=3DA0 =3DC2=3DA0*n =3D3D > CLOCK_UPTIME=3D > > ;
> > =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2= =3DA0 =3DC2=3DA0 break;
> > =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 case LINUX_CLOCK_PROCESS_CP= UTIME_ID:
> > =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2= =3DA0 =3DC2=3DA0 *n =3D3D > CLOCK_PROCES=3D > > S_CPUTIME_ID;
> > @@ -300,10 +300,10 @@ linux_to_native_clockid(clockid_t *n, clockid_t > l) > > > > =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2= =3DA0 =3DC2=3DA0 break;
> > =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 case LINUX_CLOCK_MONOTONIC_= COARSE:
> > =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 case LINUX_CLOCK_MONOTONIC_= RAW:
> > -=3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC= 2=3DA0 =3DC2=3DA0*n =3D3D > CLOCK_MONOTO=3D > > NIC_FAST;
> > +=3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC= 2=3DA0 =3DC2=3DA0*n =3D3D > CLOCK_UPTIME=3D > > _FAST;
> > =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2= =3DA0 =3DC2=3DA0 break;
> > =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 case LINUX_CLOCK_BOOTTIME:<= br> > > -=3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC= 2=3DA0 =3DC2=3DA0*n =3D3D > CLOCK_UPTIME=3D > > ;
> > +=3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC= 2=3DA0 =3DC2=3DA0*n =3D3D > CLOCK_MONOTO=3D > > NIC;
> > =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2= =3DA0 =3DC2=3DA0 break;
> > =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 case LINUX_CLOCK_REALTIME_A= LARM:
> > =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 case LINUX_CLOCK_BOOTTIME_A= LARM:
> > diff --git a/sys/sys/_clock_id.h b/sys/sys/_clock_id.h
> > index 47a551428dc3..728346a0f0ab 100644
> > --- a/sys/sys/_clock_id.h
> > +++ b/sys/sys/_clock_id.h
> > @@ -78,7 +78,7 @@
> > =3DC2=3DA0 * Linux compatible names.
> > =3DC2=3DA0 */
> > =3DC2=3DA0#if __BSD_VISIBLE
> > -#define=3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 CLOCK_BOOTTIME=3DC2= =3DA0 =3DC2=3DA0 =3DC2=3DA0 > =3DC2=3D > > =3DA0 =3DC2=3DA0 CLOCK_UPTIME
> > +#define=3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 CLOCK_BOOTTIME=3DC2= =3DA0 =3DC2=3DA0 =3DC2=3DA0 > =3DC2=3D > > =3DA0 =3DC2=3DA0 CLOCK_MONOTONIC
> > =3DC2=3DA0#define=3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 CLOCK_REAL= TIME_COARSE=3DC2=3DA0 > =3DC2=3DA0=3D > > CLOCK_REALTIME_FAST
> > =3DC2=3DA0#define=3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 CLOCK_MONO= TONIC_COARSE=3DC2=3DA0 > CLOCK=3D > > _MONOTONIC_FAST
> > =3DC2=3DA0#endif
> >
> >


class=3D3D"gmail_signature_pre=3D > > fix">--
dir=3D3D"l=3D > > tr">
Nuno > Teixeira
> color=3D3D"#888888"> > > FreeBSD UNIX:=3DC2=3DA0 <eduardo@FreeBSD.org>=3DC2=3DA0 =3DC2=3DA= 0Web:=3DC2=3DA0 > > ref=3D3D"https://FreeBSD.org" rel=3D3D"noreferrer noreferrer" > target=3D3D"_blank"=3D > > >https://FreeBSD.org
> >
> >
> > > > --0000000000000d72080619d34a39-- > > > > > --000000000000dcc9a90619d4664c Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable


=
On Sat, Jun 1, 2024 at 9:31=E2=80=AFA= M Cy Schubert <Cy.Schubert@= cschubert.com> wrote:
In message <CANCZdfpMvorgKYx6pCL7_q6BW3AqZSDwryKHg_cV+yt_E-= FbOQ@mail.gmail.c
om>
, Warner Losh writes:
> --0000000000000d72080619d34a39
> Content-Type: text/plain; charset=3D"UTF-8"
> Content-Transfer-Encoding: quoted-printable
>
> On Sat, Jun 1, 2024, 4:37=3DE2=3D80=3DAFAM Nuno Teixeira <eduardo@freebsd.org&g= t; wr=3D
> ote:
>
> > Hello,
> >
> > Having issues building graphics/mesa-dri:
> >
> > ../src/intel/common/xe/intel_gem.c:72:9: error: duplicate case va= lue '4'
> >=C2=A0 =C2=A0 72 |=C2=A0 =C2=A0 case CLOCK_BOOTTIME:
> >=C2=A0 =C2=A0 =C2=A0 =C2=A0|=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0^ > > /usr/include/sys/_clock_id.h:81:25: note: expanded from macro
> > 'CLOCK_BOOTTIME'
> >=C2=A0 =C2=A0 81 | #define CLOCK_BOOTTIME=C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 CLOCK_MONOTONIC
> >=C2=A0 =C2=A0 =C2=A0 =C2=A0|=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0^
> > /usr/include/sys/_clock_id.h:56:26: note: expanded from macro
> > 'CLOCK_MONOTONIC'
> >=C2=A0 =C2=A0 56 | #define CLOCK_MONOTONIC=C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A04
> >=C2=A0 =C2=A0 =C2=A0 =C2=A0|=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0^
> > ../src/intel/common/xe/intel_gem.c:66:9: note: previous case defi= ned here
> >=C2=A0 =C2=A0 66 |=C2=A0 =C2=A0 case CLOCK_MONOTONIC:
> >=C2=A0 =C2=A0 =C2=A0 =C2=A0|=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0^ > > /usr/include/sys/_clock_id.h:56:26: note: expanded from macro
> > 'CLOCK_MONOTONIC'
> >=C2=A0 =C2=A0 56 | #define CLOCK_MONOTONIC=C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A04
> >=C2=A0 =C2=A0 =C2=A0 =C2=A0|=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0^
> > 1 error generated.
> >
>
> Mesa needs to be updated to not assume these are distinct values.

You should be able to resolve this with,

--- src/intel/common/xe/intel_gem.c.orig=C2=A0 =C2=A0 =C2=A0 =C2=A0 2024-05= -22 09:48:39.000000000 -0700
+++ src/intel/common/xe/intel_gem.c=C2=A0 =C2=A0 =C2=A02024-06-01 06:28:22.= 268439000 -0700
@@ -69,8 +69,10 @@
=C2=A0#endif
=C2=A0 =C2=A0 case CLOCK_REALTIME:
=C2=A0#ifdef CLOCK_BOOTTIME
+#if CLOCK_BOOTTIME !=3D CLOCK_MONOTONIC
=C2=A0 =C2=A0 case CLOCK_BOOTTIME:
=C2=A0#endif
+#endif
=C2=A0#ifdef CLOCK_TAI
=C2=A0 =C2=A0 case CLOCK_TAI:
=C2=A0#endif

Yea, that should do it. I = was going to look at this when I got back from BSDcan (mostly because
=
my talk is this morning), but thanks for beating me to it.=C2=A0 I wok= e up grump and it was bugging me
on the=C2=A0walk over to the con= ference I was a little short in my first reply, but since you proposed a
fix, I feel less guilty... :) Thanks!

Warn= er

Warner

Warner=C2=A0
--
Cheers,
Cy Schubert <Cy.Schubert@cschubert.com>
FreeBSD UNIX:=C2=A0 <cy@FreeBSD.org>=C2=A0 =C2=A0Web:=C2=A0 https://FreeB= SD.org
NTP:=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0<cy@nwtime.org>=C2=A0 =C2=A0 Web:=C2=A0 https://nwt= ime.org

=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 e^(i*pi)+1=3D0


>
> Warner
>
>
> > Thanks
> >
> > Warner Losh <imp@freebsd.org> escreveu (sexta, 31/05/2024 =3DC3=3DA0(s) 15:47= =3D
> ):
> >
> >> The branch main has been updated by imp:
> >>
> >> URL:
> >> https://c= git.FreeBSD.org/src/commit/?id=3D3D108de784513d87bbe850e7b003a73e=3D > 26b5b54caa
> >>
> >> commit 108de784513d87bbe850e7b003a73e26b5b54caa
> >> Author:=C2=A0 =C2=A0 =C2=A0Val Packett <val@packett.cool&g= t;
> >> AuthorDate: 2024-05-31 14:45:02 +0000
> >> Commit:=C2=A0 =C2=A0 =C2=A0Warner Losh <imp@FreeBSD.org>= ;
> >> CommitDate: 2024-05-31 14:45:02 +0000
> >>
> >>=C2=A0 =C2=A0 =C2=A0Redefine CLOCK_BOOTTIME to alias CLOCK_MON= OTONIC, not CLOCK_UPTIME
> >>
> >>=C2=A0 =C2=A0 =C2=A0The suspend-awareness situation with monot= onic clocks across platfor=3D
> ms
> >>=C2=A0 =C2=A0 =C2=A0is kind of a mess, let's try not makin= g it worse.
> >>
> >>=C2=A0 =C2=A0 =C2=A0On Linux, CLOCK_MONOTONIC does NOT count s= uspended time, and
> >>=C2=A0 =C2=A0 =C2=A0CLOCK_BOOTTIME was introduced to INCLUDE s= uspended time.
> >>
> >>=C2=A0 =C2=A0 =C2=A0On OpenBSD, CLOCK_MONOTONIC DOES count sus= pended time, and
> >> CLOCK_UPTIME
> >>=C2=A0 =C2=A0 =C2=A0was introduced to EXCLUDE suspended time.<= br> > >>
> >>=C2=A0 =C2=A0 =C2=A0On macOS, it's the same as OpenBSD, bu= t with CLOCK_UPTIME_RAW.
> >>
> >>=C2=A0 =C2=A0 =C2=A0Right now, we do not have a monotonic cloc= k that counts suspended
> >> time.
> >>=C2=A0 =C2=A0 =C2=A0We have CLOCK_UPTIME as a distinct ID alia= s, and CLOCK_BOOTTIME as a
> >>=C2=A0 =C2=A0 =C2=A0preprocessor alias, both being effectively= `CLOCK_MONOTONIC` for now=3D
> .
> >>
> >>=C2=A0 =C2=A0 =C2=A0When we introduce a suspend-aware clock in= the future, it would make=3D
>=C2=A0 a
> >>=C2=A0 =C2=A0 =C2=A0lot more sense to do it the OpenBSD/macOS = way, i.e. to make
> >>=C2=A0 =C2=A0 =C2=A0CLOCK_MONOTONIC include suspended time and= make CLOCK_UPTIME exclude
> >> it,
> >>=C2=A0 =C2=A0 =C2=A0because that's what the name CLOCK_UPT= IME implies: a deviation from
> >> the
> >>=C2=A0 =C2=A0 =C2=A0default intended for the uptime command to= allow it to only show the
> >>=C2=A0 =C2=A0 =C2=A0time the system was actually up and not su= spended.
> >>
> >>=C2=A0 =C2=A0 =C2=A0Let's change the define right now to m= ake sure software using the
> >> define
> >>=C2=A0 =C2=A0 =C2=A0would not end up using the ID of the wrong= clock in the future, and
> >> fix
> >>=C2=A0 =C2=A0 =C2=A0the IDs in the Linux compat code to match = the expected changes too.
> >>
> >>=C2=A0 =C2=A0 =C2=A0See https:/= /bugzilla.mozilla.org/show_bug.cgi?id=3D3D1824084
> >>=C2=A0 =C2=A0 =C2=A0for more discussion.
> >>
> >>=C2=A0 =C2=A0 =C2=A0Fixes:=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 1= 55f15118a77 ("clock_gettime: Add Linux aliases for
> >> CLOCK_*")
> >>=C2=A0 =C2=A0 =C2=A0Fixes:=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 2= 5ada637362d ("Map Linux CLOCK_BOOTTIME to native
> >> CLOCK_UPTIME.")
> >>=C2=A0 =C2=A0 =C2=A0Sponsored by:=C2=A0 =C2=A0https:/= /www.patreon.com/valpackett
> >>=C2=A0 =C2=A0 =C2=A0Reviewed by:=C2=A0 =C2=A0 kib, imp
> >>=C2=A0 =C2=A0 =C2=A0Differential Revision:=C2=A0 http= s://reviews.freebsd.org/D39270
> >> ---
> >>=C2=A0 sys/compat/linux/linux_time.c | 6 +++---
> >>=C2=A0 sys/sys/_clock_id.h=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0| 2 +-
> >>=C2=A0 2 files changed, 4 insertions(+), 4 deletions(-)
> >>
> >> diff --git a/sys/compat/linux/linux_time.c b/sys/compat/linux= /linux_time=3D
> .c
> >> index e9e5cf075210..f4dd26dd3d2a 100644
> >> --- a/sys/compat/linux/linux_time.c
> >> +++ b/sys/compat/linux/linux_time.c
> >> @@ -287,7 +287,7 @@ linux_to_native_clockid(clockid_t *n, clo= ckid_t l)
> >>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= *n =3D3D CLOCK_REALTIME;
> >>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= break;
> >>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0case LINUX_CLOCK_MONOTONIC:<= br> > >> -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0*n = =3D3D CLOCK_MONOTONIC;
> >> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0*n = =3D3D CLOCK_UPTIME;
> >>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= break;
> >>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0case LINUX_CLOCK_PROCESS_CPU= TIME_ID:
> >>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= *n =3D3D CLOCK_PROCESS_CPUTIME_ID;
> >> @@ -300,10 +300,10 @@ linux_to_native_clockid(clockid_t *n, c= lockid_t l)
> >>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= break;
> >>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0case LINUX_CLOCK_MONOTONIC_C= OARSE:
> >>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0case LINUX_CLOCK_MONOTONIC_R= AW:
> >> -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0*n = =3D3D CLOCK_MONOTONIC_FAST;
> >> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0*n = =3D3D CLOCK_UPTIME_FAST;
> >>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= break;
> >>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0case LINUX_CLOCK_BOOTTIME: > >> -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0*n = =3D3D CLOCK_UPTIME;
> >> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0*n = =3D3D CLOCK_MONOTONIC;
> >>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= break;
> >>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0case LINUX_CLOCK_REALTIME_AL= ARM:
> >>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0case LINUX_CLOCK_BOOTTIME_AL= ARM:
> >> diff --git a/sys/sys/_clock_id.h b/sys/sys/_clock_id.h
> >> index 47a551428dc3..728346a0f0ab 100644
> >> --- a/sys/sys/_clock_id.h
> >> +++ b/sys/sys/_clock_id.h
> >> @@ -78,7 +78,7 @@
> >>=C2=A0 =C2=A0* Linux compatible names.
> >>=C2=A0 =C2=A0*/
> >>=C2=A0 #if __BSD_VISIBLE
> >> -#define=C2=A0 =C2=A0 =C2=A0 =C2=A0 CLOCK_BOOTTIME=C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 CLOCK_UPTIME
> >> +#define=C2=A0 =C2=A0 =C2=A0 =C2=A0 CLOCK_BOOTTIME=C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 CLOCK_MONOTONIC
> >>=C2=A0 #define=C2=A0 =C2=A0 =C2=A0 =C2=A0 CLOCK_REALTIME_COARS= E=C2=A0 =C2=A0CLOCK_REALTIME_FAST
> >>=C2=A0 #define=C2=A0 =C2=A0 =C2=A0 =C2=A0 CLOCK_MONOTONIC_COAR= SE=C2=A0 CLOCK_MONOTONIC_FAST
> >>=C2=A0 #endif
> >>
> >>
> >
> > --
> > Nuno Teixeira
> > FreeBSD UNIX:=C2=A0 <eduardo@FreeBSD.org>=C2=A0 =C2=A0Web:= =C2=A0 https://FreeBSD.org
> >
>
> --0000000000000d72080619d34a39
> Content-Type: text/html; charset=3D"UTF-8"
> Content-Transfer-Encoding: quoted-printable
>
> <div dir=3D3D"ltr"><div dir=3D3D"auto">= ;<div><br><br><div class=3D3D"gmail_quote"&g= t;=3D
> <div dir=3D3D"ltr" class=3D3D"gmail_attr">On= Sat, Jun 1, 2024, 4:37=3DE2=3D80=3DAFAM =3D
> Nuno Teixeira &lt;<a href=3D3D"mailto:eduardo@freebsd.org" target= =3D3D"_blank">=3D
> eduardo@freeb= sd.org</a>&gt; wrote:<br></div><blockquote cla= ss=3D3D"gmail_quot=3D
> e" style=3D3D"margin:0 0 0 .8ex;border-left:1px #ccc solid;p= adding-left:1ex">=3D
> <div dir=3D3D"ltr"><div>Hello,</div><di= v><br></div><div>Having issues buildin=3D
> g graphics/mesa-dri:</div><div><br></div><d= iv>../src/intel/common/xe/intel_=3D
> gem.c:72:9: error: duplicate case value &#39;4&#39;<br>= =3DC2=3DA0 =3DC2=3DA072 | =3D
> =3DC2=3DA0 =3DC2=3DA0case CLOCK_BOOTTIME:<br>=3DC2=3DA0 =3DC2=3D= A0 =3DC2=3DA0 | =3DC2=3DA0 =3DC2=3DA0 =3D
> =3DC2=3DA0 =3DC2=3DA0 ^<br>/usr/include/sys/_clock_id.h:81:25: n= ote: expanded from =3D
> macro &#39;CLOCK_BOOTTIME&#39;<br>=3DC2=3DA0 =3DC2=3DA08= 1 | #define CLOCK_BOOTTIME =3D
> =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0CLOCK_MONOTONIC&= lt;br>=3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 |=3D
>=C2=A0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA= 0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3D
> =3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 ^<br&g= t;/usr/include/sys/_clock_id.h:56=3D
> :26: note: expanded from macro &#39;CLOCK_MONOTONIC&#39;<br= >=3DC2=3DA0 =3DC2=3DA056=3D
>=C2=A0 | #define CLOCK_MONOTONIC =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2= =3DA0 4<br>=3DC2=3DA0 =3DC2=3DA0 =3D
> =3DC2=3DA0 | =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 = =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3D
> =3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA= 0 ^<br>../src/intel/common/xe/i=3D
> ntel_gem.c:66:9: note: previous case defined here<br>=3DC2=3DA0 = =3DC2=3DA066 | =3DC2=3D
> =3DA0 =3DC2=3DA0case CLOCK_MONOTONIC:<br>=3DC2=3DA0 =3DC2=3DA0 = =3DC2=3DA0 | =3DC2=3DA0 =3DC2=3DA0 =3DC2=3D
> =3DA0 =3DC2=3DA0 ^<br>/usr/include/sys/_clock_id.h:56:26: note: = expanded from mac=3D
> ro &#39;CLOCK_MONOTONIC&#39;<br>=3DC2=3DA0 =3DC2=3DA056 = | #define CLOCK_MONOTONIC =3D
> =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 4<br>=3DC2=3DA0 =3DC= 2=3DA0 =3DC2=3DA0 | =3DC2=3DA0 =3DC2=3DA0 =3DC2=3D
> =3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA= 0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3D
> =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 ^<br>1 error generated.</div= ></div></blockquote></div>=3D
> </div><div dir=3D3D"auto"><br></div>= <div dir=3D3D"auto"><div class=3D3D"gmail_quo=3D > te"><div>Mesa needs to be updated to not assume these ar= e distinct values.<=3D
> /div><div><br></div><div>Warner</div>= <div>=3DC2=3DA0</div><blockquote class=3D3D"=3D
> gmail_quote" style=3D3D"margin:0 0 0 .8ex;border-left:1px #c= cc solid;padding-=3D
> left:1ex"><div dir=3D3D"ltr"><div><fo= nt color=3D3D"#888888">Thanks<br clear=3D3D"=3D
> all"></font></div><div></div></div&= gt;<br><div class=3D3D"gmail_quote"><div dir=3D > =3D3D"ltr" class=3D3D"gmail_attr">Warner Losh &= amp;lt;<a href=3D3D"mailto:imp@freebsd=3D
> .org" rel=3D3D"noreferrer" target=3D3D"_blank"= ;>imp@freebsd.org</a>&gt; escreveu=3D
>=C2=A0 (sexta, 31/05/2024 =3DC3=3DA0(s) 15:47):<br></div>&l= t;blockquote class=3D3D"gmail_q=3D
> uote" style=3D3D"margin:0px 0px 0px 0.8ex;border-left:1px so= lid rgb(204,204,2=3D
> 04);padding-left:1ex">The branch main has been updated by imp:= <br>
> <br>
> URL: <a href=3D3D"https= ://cgit.FreeBSD.org/src/commit/?id=3D3D108de784513d87bbe=3D
> 850e7b003a73e26b5b54caa" rel=3D3D"noreferrer noreferrer"= ; target=3D3D"_blank">ht=3D
> tps://cgit.Fre= eBSD.org/src/commit/?id=3D3D108de784513d87bbe850e7b003a73e26b5b=3D
> 54caa</a><br>
> <br>
> commit 108de784513d87bbe850e7b003a73e26b5b54caa<br>
> Author:=3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0Val Packett &lt;val@packett= .cool&gt;<br>
> AuthorDate: 2024-05-31 14:45:02 +0000<br>
> Commit:=3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0Warner Losh &lt;imp@FreeBSD= .org&gt;<br>
> CommitDate: 2024-05-31 14:45:02 +0000<br>
> <br>
> =3DC2=3DA0 =3DC2=3DA0 Redefine CLOCK_BOOTTIME to alias CLOCK_MONOTONIC= , not CLOCK_U=3D
> PTIME<br>
> <br>
> =3DC2=3DA0 =3DC2=3DA0 The suspend-awareness situation with monotonic c= locks across =3D
> platforms<br>
> =3DC2=3DA0 =3DC2=3DA0 is kind of a mess, let&#39;s try not making = it worse.<br>
> <br>
> =3DC2=3DA0 =3DC2=3DA0 On Linux, CLOCK_MONOTONIC does NOT count suspend= ed time, and<=3D
> br>
> =3DC2=3DA0 =3DC2=3DA0 CLOCK_BOOTTIME was introduced to INCLUDE suspend= ed time.<br>
> <br>
> =3DC2=3DA0 =3DC2=3DA0 On OpenBSD, CLOCK_MONOTONIC DOES count suspended= time, and CL=3D
> OCK_UPTIME<br>
> =3DC2=3DA0 =3DC2=3DA0 was introduced to EXCLUDE suspended time.<br&= gt;
> <br>
> =3DC2=3DA0 =3DC2=3DA0 On macOS, it&#39;s the same as OpenBSD, but = with CLOCK_UPTIME=3D
> _RAW.<br>
> <br>
> =3DC2=3DA0 =3DC2=3DA0 Right now, we do not have a monotonic clock that= counts suspe=3D
> nded time.<br>
> =3DC2=3DA0 =3DC2=3DA0 We have CLOCK_UPTIME as a distinct ID alias, and= CLOCK_BOOTTI=3D
> ME as a<br>
> =3DC2=3DA0 =3DC2=3DA0 preprocessor alias, both being effectively `CLOC= K_MONOTONIC` =3D
> for now.<br>
> <br>
> =3DC2=3DA0 =3DC2=3DA0 When we introduce a suspend-aware clock in the f= uture, it wou=3D
> ld make a<br>
> =3DC2=3DA0 =3DC2=3DA0 lot more sense to do it the OpenBSD/macOS way, i= .e. to make<b=3D
> r>
> =3DC2=3DA0 =3DC2=3DA0 CLOCK_MONOTONIC include suspended time and make = CLOCK_UPTIME =3D
> exclude it,<br>
> =3DC2=3DA0 =3DC2=3DA0 because that&#39;s what the name CLOCK_UPTIM= E implies: a devi=3D
> ation from the<br>
> =3DC2=3DA0 =3DC2=3DA0 default intended for the uptime command to allow= it to only s=3D
> how the<br>
> =3DC2=3DA0 =3DC2=3DA0 time the system was actually up and not suspende= d.<br>
> <br>
> =3DC2=3DA0 =3DC2=3DA0 Let&#39;s change the define right now to mak= e sure software u=3D
> sing the define<br>
> =3DC2=3DA0 =3DC2=3DA0 would not end up using the ID of the wrong clock= in the futur=3D
> e, and fix<br>
> =3DC2=3DA0 =3DC2=3DA0 the IDs in the Linux compat code to match the ex= pected change=3D
> s too.<br>
> <br>
> =3DC2=3DA0 =3DC2=3DA0 See <a href=3D3D"h= ttps://bugzilla.mozilla.org/show_bug.cgi?id=3D
> =3D3D1824084" rel=3D3D"noreferrer noreferrer" target=3D= 3D"_blank">https://bugzill=3D
> a.mozilla.org/show_bug.cgi?id=3D3D1824084&l= t;/a><br>
> =3DC2=3DA0 =3DC2=3DA0 for more discussion.<br>
> <br>
> =3DC2=3DA0 =3DC2=3DA0 Fixes:=3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA= 0 =3DC2=3DA0 155f15118a77 (&quot;=3D
> clock_gettime: Add Linux aliases for CLOCK_*&quot;)<br>
> =3DC2=3DA0 =3DC2=3DA0 Fixes:=3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA= 0 =3DC2=3DA0 25ada637362d (&quot;=3D
> Map Linux CLOCK_BOOTTIME to native CLOCK_UPTIME.&quot;)<br><= br> > =3DC2=3DA0 =3DC2=3DA0 Sponsored by:=3DC2=3DA0 =3DC2=3DA0<a href=3D3= D"https://www.patreon.com/=3D
> valpackett" rel=3D3D"noreferrer noreferrer" target=3D3D= "_blank">https://www.pat=3D
> reon.com/valpackett</a><br>
> =3DC2=3DA0 =3DC2=3DA0 Reviewed by:=3DC2=3DA0 =3DC2=3DA0 kib, imp<br= >
> =3DC2=3DA0 =3DC2=3DA0 Differential Revision:=3DC2=3DA0 <a href=3D3D= "https://reviews.freeb=3D
> = sd.org/D39270" rel=3D3D"noreferrer noreferrer" target=3D= 3D"_blank">https://revi=3D
> ews.freebsd.org/D39270</a><br>
> ---<br>
> =3DC2=3DA0sys/compat/linux/linux_time.c | 6 +++---<br>
> =3DC2=3DA0sys/sys/_clock_id.h=3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3D= A0 =3DC2=3DA0 =3DC2=3DA0| 2 +-<br=3D
> >
> =3DC2=3DA02 files changed, 4 insertions(+), 4 deletions(-)<br> > <br>
> diff --git a/sys/compat/linux/linux_time.c b/sys/compat/linux/linux_ti= me.c<=3D
> br>
> index e9e5cf075210..f4dd26dd3d2a 100644<br>
> --- a/sys/compat/linux/linux_time.c<br>
> +++ b/sys/compat/linux/linux_time.c<br>
> @@ -287,7 +287,7 @@ linux_to_native_clockid(clockid_t *n, clockid_t l)= <br>
> =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC= 2=3DA0 =3DC2=3DA0 *n =3D3D CLOCK_REALTI=3D
> ME;<br>
> =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC= 2=3DA0 =3DC2=3DA0 break;<br>
> =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 case LINUX_CLOCK_MONOTONIC= :<br>
> -=3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3D= C2=3DA0 =3DC2=3DA0*n =3D3D CLOCK_MONOTO=3D
> NIC;<br>
> +=3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3D= C2=3DA0 =3DC2=3DA0*n =3D3D CLOCK_UPTIME=3D
> ;<br>
> =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC= 2=3DA0 =3DC2=3DA0 break;<br>
> =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 case LINUX_CLOCK_PROCESS_C= PUTIME_ID:<br>
> =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC= 2=3DA0 =3DC2=3DA0 *n =3D3D CLOCK_PROCES=3D
> S_CPUTIME_ID;<br>
> @@ -300,10 +300,10 @@ linux_to_native_clockid(clockid_t *n, clockid_t = l)<br=3D
> >
> =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC= 2=3DA0 =3DC2=3DA0 break;<br>
> =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 case LINUX_CLOCK_MONOTONIC= _COARSE:<br>
> =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 case LINUX_CLOCK_MONOTONIC= _RAW:<br>
> -=3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3D= C2=3DA0 =3DC2=3DA0*n =3D3D CLOCK_MONOTO=3D
> NIC_FAST;<br>
> +=3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3D= C2=3DA0 =3DC2=3DA0*n =3D3D CLOCK_UPTIME=3D
> _FAST;<br>
> =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC= 2=3DA0 =3DC2=3DA0 break;<br>
> =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 case LINUX_CLOCK_BOOTTIME:= <br>
> -=3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3D= C2=3DA0 =3DC2=3DA0*n =3D3D CLOCK_UPTIME=3D
> ;<br>
> +=3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3D= C2=3DA0 =3DC2=3DA0*n =3D3D CLOCK_MONOTO=3D
> NIC;<br>
> =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC= 2=3DA0 =3DC2=3DA0 break;<br>
> =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 case LINUX_CLOCK_REALTIME_= ALARM:<br>
> =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 case LINUX_CLOCK_BOOTTIME_= ALARM:<br>
> diff --git a/sys/sys/_clock_id.h b/sys/sys/_clock_id.h<br>
> index 47a551428dc3..728346a0f0ab 100644<br>
> --- a/sys/sys/_clock_id.h<br>
> +++ b/sys/sys/_clock_id.h<br>
> @@ -78,7 +78,7 @@<br>
> =3DC2=3DA0 * Linux compatible names.<br>
> =3DC2=3DA0 */<br>
> =3DC2=3DA0#if __BSD_VISIBLE<br>
> -#define=3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 CLOCK_BOOTTIME=3DC= 2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3D
> =3DA0 =3DC2=3DA0 CLOCK_UPTIME<br>
> +#define=3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 CLOCK_BOOTTIME=3DC= 2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3D
> =3DA0 =3DC2=3DA0 CLOCK_MONOTONIC<br>
> =3DC2=3DA0#define=3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 CLOCK_REA= LTIME_COARSE=3DC2=3DA0 =3DC2=3DA0=3D
> CLOCK_REALTIME_FAST<br>
> =3DC2=3DA0#define=3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 CLOCK_MON= OTONIC_COARSE=3DC2=3DA0 CLOCK=3D
> _MONOTONIC_FAST<br>
> =3DC2=3DA0#endif<br>
> <br>
> </blockquote></div><br clear=3D3D"all"><= ;br><span class=3D3D"gmail_signature_pre=3D
> fix">-- </span><br><div dir=3D3D"ltr"= class=3D3D"gmail_signature"><div dir=3D3D"l=3D
> tr"><div><font color=3D3D"#888888">Nuno = Teixeira</font></div><div><div><font =3D
> color=3D3D"#888888">
> FreeBSD UNIX:=3DC2=3DA0 &lt;eduardo@FreeBSD.org&gt;=3DC2=3DA0 = =3DC2=3DA0Web:=3DC2=3DA0 <a h=3D
> ref=3D3D"https://FreeBSD.org" rel=3D3D"noreferrer norefer= rer" target=3D3D"_blank"=3D
> >https://FreeBSD.org</a><br></font></div><= /div></div></div>
> </blockquote></div></div></div>
> </div>
>
> --0000000000000d72080619d34a39--
>


--000000000000dcc9a90619d4664c-- From nobody Sat Jun 1 15:00: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 4Vs37q11j5z5N1fc; Sat, 01 Jun 2024 15:00: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 4Vs37q0X1Xz4J6F; Sat, 1 Jun 2024 15:00:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717254023; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OoJvUcSHPHKCxZDXv16bbrLP0E1JSj+m4H6rl/WIaLo=; b=oFNSnoIPt/9BrSVTLk2rsdbN73VqeLVZOav4c2vBhPaU48FxLm5sjR/S3a2RLXD7s4badF sUdJQpADSiVYGAkUkMtK+VQs1r7h0OjPiuz9wBG4sAZwDGh8VVQb2BmGrdJNNL4jCeVSws Pa6SNn+QYbvE1IwPIDrUw44HuTp4nvVx924t3njTlevsbnwD4BnwbC8A777eD5kGb4fJ28 M+Yx8E4mSNlZ2VHD1e1sgYqD3qfwGPU5Dz58An0k4yGvcw2nUjtsAeyjwB0GciCQRqHtR6 xbueKSRvqu+1n23TBksjdGWcsAb6TqNREvTBcfYVr4IDWLrj4u3Q+xyuEkPt9g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1717254023; a=rsa-sha256; cv=none; b=nxgu3SqyUuG0kvooBPXFh3Laaw1IgcgJ60MWISwCpjyRarzXkOwf3gK8dE+xN5CPR4D+sD MdPBHfrDxgaMBGfeYrbRAHqOclNhmtS8snowwcENCSajVTf1WaWldsxiCanmBYAyoLr78r zcsK1J9ducQx0ree2cnxTRlSEGZQ/f0HUXUNih0kMWo981ljhb1rfI0AmSB5tKuUkcctc0 xsCs1D29bZjl7J9joboxTUlsQAQbrSofgFz2mZHEbZkhcXzwZY6y876R4SAK9RY0wr4Wq5 AZsCaEkTpDpfOENIgBzsYM3TVQVzyTRHDxVM3gr6ItreNjOzgeFpZ4rvdvICgQ== 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=1717254023; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OoJvUcSHPHKCxZDXv16bbrLP0E1JSj+m4H6rl/WIaLo=; b=WL1jKQzyefyR9YLSFF5lzW8z4WEuZb8wop3E26BuiXWB+AT3GBYTJNPZnuWBMP2UWH60Rw dlo1hQ8Eyu50aiH1Fm2g+Vx8xT+Dd7FCNB06XDkT5O02S/mKfYhdT5UW1xk+Wodbac4ylY CrJypzOIZXLV+5qYc3cZKYS1cpxKZLYPgLONKS/FQqWgWryu+n67bcCYlaEkd5EToT5lDn AzmFPqIerJLGQoIyMobePgFt1I1wKUH5kz9xZLAM7ktDOPDSkg/fYswMcJobFRPliNqghD D2nmkYreP0joIlOB48Na8bTYrwvbH19yt4xFGWa8PUzYAGI+iF26nTbaMkP8nw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Vs37q06hPz1BXW; Sat, 1 Jun 2024 15:00: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 451F0MZw038240; Sat, 1 Jun 2024 15:00:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 451F0MHx038237; Sat, 1 Jun 2024 15:00:22 GMT (envelope-from git) Date: Sat, 1 Jun 2024 15:00:22 GMT Message-Id: <202406011500.451F0MHx038237@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: 4b72bab96e89 - main - mdconfig: don't print NUL in the options list List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4b72bab96e8978eaed30fd44f7f51e1b4918d4db Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=4b72bab96e8978eaed30fd44f7f51e1b4918d4db commit 4b72bab96e8978eaed30fd44f7f51e1b4918d4db Author: Alan Somers AuthorDate: 2024-05-31 21:13:03 +0000 Commit: Warner Losh CommitDate: 2024-06-01 14:08:16 +0000 mdconfig: don't print NUL in the options list Fixes: b01988d5e570 Sponsored by: Axcient Reviewed by: imp, Ricardo Branco Pull Request: https://github.com/freebsd/freebsd-src/pull/1268 --- sbin/mdconfig/mdconfig.c | 38 ++++++++++++++++++------------------ sbin/mdconfig/tests/mdconfig_test.sh | 20 +++++++++++++++++++ 2 files changed, 39 insertions(+), 19 deletions(-) diff --git a/sbin/mdconfig/mdconfig.c b/sbin/mdconfig/mdconfig.c index d49eb6ed08e5..abcb34c1fed1 100644 --- a/sbin/mdconfig/mdconfig.c +++ b/sbin/mdconfig/mdconfig.c @@ -409,7 +409,7 @@ print_options(const char *dev, const char *file) { struct md_ioctl mdiox; int unit; - char sep = '\0'; + const char *sep = ""; if (sscanf(dev, "md%d", &unit) != 1) err(1, "invalid device: %s", dev); @@ -427,40 +427,40 @@ print_options(const char *dev, const char *file) printf("\t"); if (mdiox.md_options & MD_ASYNC) { - printf("%casync", sep); - sep = ','; + printf("%sasync", sep); + sep = ","; } if (mdiox.md_options & MD_CACHE) { - printf("%ccache", sep); - sep = ','; + printf("%scache", sep); + sep = ","; } if (mdiox.md_options & MD_CLUSTER) { - printf("%ccluster", sep); - sep = ','; + printf("%scluster", sep); + sep = ","; } if (mdiox.md_options & MD_COMPRESS) { - printf("%ccompress", sep); - sep = ','; + printf("%scompress", sep); + sep = ","; } if (mdiox.md_options & MD_FORCE) { - printf("%cforce", sep); - sep = ','; + printf("%sforce", sep); + sep = ","; } if (mdiox.md_options & MD_READONLY) { - printf("%creadonly", sep); - sep = ','; + printf("%sreadonly", sep); + sep = ","; } if (mdiox.md_options & MD_RESERVE) { - printf("%creserve", sep); - sep = ','; + printf("%sreserve", sep); + sep = ","; } if (mdiox.md_options & MD_VERIFY) { - printf("%cverify", sep); - sep = ','; + printf("%sverify", sep); + sep = ","; } if (mdiox.md_options & MD_MUSTDEALLOC) { - printf("%cmustdealloc", sep); - sep = ','; + printf("%smustdealloc", sep); + sep = ","; } } diff --git a/sbin/mdconfig/tests/mdconfig_test.sh b/sbin/mdconfig/tests/mdconfig_test.sh index 655b7fd63b40..ea87ff5d542d 100755 --- a/sbin/mdconfig/tests/mdconfig_test.sh +++ b/sbin/mdconfig/tests/mdconfig_test.sh @@ -296,6 +296,25 @@ attach_size_rounddown_cleanup() cleanup_common } +atf_test_case query_verbose cleanup +query_verbose() +{ + atf_set "descr" "mdconfig -lv should print device details" +} +query_verbose_body() +{ + atf_check -s exit:0 -o save:mdconfig.out \ + -x 'mdconfig -a -t swap -s 1m -o reserve -o force' + md=$(cat mdconfig.out) + atf_check -s exit:0 \ + -o match:"$md[[:space:]]+swap[[:space:]]+1024K[[:space:]]+[-][[:space:]]+[-][[:space:]]+force,reserve" \ + -x "mdconfig -lv -u $md" +} +query_verbose_cleanup() +{ + cleanup_common +} + atf_init_test_cases() { atf_add_test_case attach_vnode_non_explicit_type @@ -307,4 +326,5 @@ atf_init_test_cases() atf_add_test_case attach_swap atf_add_test_case attach_with_specific_unit_number atf_add_test_case attach_size_rounddown + atf_add_test_case query_verbose } From nobody Sat Jun 1 15:04:58 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Vs3FC4cP2z5N1yn; Sat, 01 Jun 2024 15:05:03 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Received: from omta002.cacentral1.a.cloudfilter.net (omta002.cacentral1.a.cloudfilter.net [3.97.99.33]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "Client", Issuer "CA" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Vs3FC1Kl6z4KXJ; Sat, 1 Jun 2024 15:05:03 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Authentication-Results: mx1.freebsd.org; none Received: from shw-obgw-4001a.ext.cloudfilter.net ([10.228.9.142]) by cmsmtp with ESMTPS id D7V2sbi0KdrxEDQI2sIkE4; Sat, 01 Jun 2024 15:05:02 +0000 Received: from spqr.komquats.com ([70.66.152.170]) by cmsmtp with ESMTPSA id DQHzsH4zFpsbgDQI0syg32; Sat, 01 Jun 2024 15:05:01 +0000 X-Auth-User: cschuber X-Authority-Analysis: v=2.4 cv=Ff+Ux4+6 c=1 sm=1 tr=0 ts=665b389d a=y8EK/9tc/U6QY+pUhnbtgQ==:117 a=y8EK/9tc/U6QY+pUhnbtgQ==:17 a=kj9zAlcOel0A:10 a=T1WGqf2p2xoA:10 a=SLG1KRGDAAAA:8 a=YxBL1-UpAAAA:8 a=6I5d2MoRAAAA:8 a=EkcXrb_YAAAA:8 a=pQs5aej7AAAA:8 a=-wuKhKTYAAAA:8 a=wFNwba7RAAAA:8 a=0FNk9USiAAAA:8 a=Ds8RGfT2AAAA:8 a=NMM7OKYrAAAA:8 a=zqNM9luALEXC4t7HWfkA:9 a=Vv29y2/UI4YIqoRk+XuAf7aa6iQ=:19 a=zz45bIk1XtsMeathu/1YEEouC2M=:19 a=65j1Gnx_R-Yhi4dZ:21 a=lqcHg5cX4UMA:10 a=CjuIK1q_8ugA:10 a=s5zKW874KtQA:10 a=-TBaU1e9WpdkKBzYXnwo:22 a=Ia-lj3WSrqcvXOmTRaiG:22 a=IjZwj45LgO3ly-622nXo:22 a=LK5xJRSDVpKd5WXXoEvA:22 a=prepyofVby0hjpoiPUJH:22 a=TF7iPsq83L4KsoDyi5cH:22 a=0afPCejbyZHll-xH3H2j:22 a=isrg6BwTYk6I_F0B0DtW:22 Received: from slippy.cwsent.com (slippy [10.1.1.91]) by spqr.komquats.com (Postfix) with ESMTP id B3F26148E; Sat, 01 Jun 2024 08:04:58 -0700 (PDT) Received: by slippy.cwsent.com (Postfix, from userid 1000) id A23E8532; Sat, 01 Jun 2024 08:04:58 -0700 (PDT) X-Mailer: exmh version 2.9.0 11/07/2018 with nmh-1.8+dev Reply-to: Cy Schubert From: Cy Schubert X-os: FreeBSD X-Sender: cy@cwsent.com X-URL: http://www.cschubert.com/ To: Warner Losh cc: Cy Schubert , Nuno Teixeira , Warner Losh , src-committers , "" , "" Subject: Re: git: 108de784513d - main - Redefine CLOCK_BOOTTIME to alias CLOCK_MONOTONIC, not CLOCK_UPTIME In-reply-to: References: <202405311447.44VEl1G1078199@gitrepo.freebsd.org> <20240601133156.8EB804B0@slippy.cwsent.com> Comments: In-reply-to Warner Losh message dated "Sat, 01 Jun 2024 09:51:37 -0400." List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Date: Sat, 01 Jun 2024 08:04:58 -0700 Message-Id: <20240601150458.A23E8532@slippy.cwsent.com> X-CMAE-Envelope: MS4xfAXyHLtQt2ovpadNKmiXZUbFqd0d1osnqEDrkrO7Ngir40ecvLH7NeWWYKYn2hkK0TuTBvdbRp6usI1Jsetfy7cmt7mgC4rM0ObjB5uEtv5QPF6YGJ5L k6MMsOK1sR5d2QklGaq90SEVCyE4QWvgDrBcQRz3orRKepu0cljJM2vXrweyBJcv33Hv2mejvp6KBeJlCT47d3uGiMpgpaRPRvwDSjL5WYzHK2hbKg1JpYlE +4cEr3EdSI+Y/LG9xIakC5dnZ0+T/ELSM/l4JXy6mBP/M9HNbUek6PkM84tYb2EhuTYZMO8jU8a1zvOxkgbbH1k/MWP1DaoNYbhBdOCQoYaxroW4TMDfvNI8 l6duY76fTZWYXZmvwVtol9eOU7/jdQ== X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:16509, ipnet:3.96.0.0/15, country:US] X-Rspamd-Queue-Id: 4Vs3FC1Kl6z4KXJ In message , Warner Losh writes: > --000000000000dcc9a90619d4664c > Content-Type: text/plain; charset="UTF-8" > Content-Transfer-Encoding: quoted-printable > > On Sat, Jun 1, 2024 at 9:31=E2=80=AFAM Cy Schubert om> > wrote: > > > In message > > > om> > > , Warner Losh writes: > > > --0000000000000d72080619d34a39 > > > Content-Type: text/plain; charset=3D"UTF-8" > > > Content-Transfer-Encoding: quoted-printable > > > > > > On Sat, Jun 1, 2024, 4:37=3DE2=3D80=3DAFAM Nuno Teixeira sd.org> > > wr=3D > > > ote: > > > > > > > Hello, > > > > > > > > Having issues building graphics/mesa-dri: > > > > > > > > ../src/intel/common/xe/intel_gem.c:72:9: error: duplicate case value > > '4' > > > > 72 | case CLOCK_BOOTTIME: > > > > | ^ > > > > /usr/include/sys/_clock_id.h:81:25: note: expanded from macro > > > > 'CLOCK_BOOTTIME' > > > > 81 | #define CLOCK_BOOTTIME CLOCK_MONOTONIC > > > > | ^ > > > > /usr/include/sys/_clock_id.h:56:26: note: expanded from macro > > > > 'CLOCK_MONOTONIC' > > > > 56 | #define CLOCK_MONOTONIC 4 > > > > | ^ > > > > ../src/intel/common/xe/intel_gem.c:66:9: note: previous case defined > > here > > > > 66 | case CLOCK_MONOTONIC: > > > > | ^ > > > > /usr/include/sys/_clock_id.h:56:26: note: expanded from macro > > > > 'CLOCK_MONOTONIC' > > > > 56 | #define CLOCK_MONOTONIC 4 > > > > | ^ > > > > 1 error generated. > > > > > > > > > > Mesa needs to be updated to not assume these are distinct values. > > > > You should be able to resolve this with, > > > > --- src/intel/common/xe/intel_gem.c.orig 2024-05-22 > > 09:48:39.000000000 -0700 > > +++ src/intel/common/xe/intel_gem.c 2024-06-01 06:28:22.268439000 -07= > 00 > > @@ -69,8 +69,10 @@ > > #endif > > case CLOCK_REALTIME: > > #ifdef CLOCK_BOOTTIME > > +#if CLOCK_BOOTTIME !=3D CLOCK_MONOTONIC > > case CLOCK_BOOTTIME: > > #endif > > +#endif > > #ifdef CLOCK_TAI > > case CLOCK_TAI: > > #endif > > > > Yea, that should do it. I was going to look at this when I got back from > BSDcan (mostly because > my talk is this morning), but thanks for beating me to it. I woke up grump > and it was bugging me > on the walk over to the conference I was a little short in my first reply, > but since you proposed a > fix, I feel less guilty... :) Thanks! I just put it out there. I'm outside, again, today continuing to build that new fence. I can submit a poudriere review or PR for X11 maintainer approval. I'll need to show the WPA ports a little loving attention at that time too. Maybe tonight. -- Cheers, Cy Schubert FreeBSD UNIX: Web: https://FreeBSD.org NTP: Web: https://nwtime.org e^(i*pi)+1=0 > > Warner > > Warner > > Warner > > > -- > > Cheers, > > Cy Schubert > > FreeBSD UNIX: Web: https://FreeBSD.org > > NTP: Web: https://nwtime.org > > > > e^(i*pi)+1=3D0 > > > > > > > > > > Warner > > > > > > > > > > Thanks > > > > > > > > Warner Losh escreveu (sexta, 31/05/2024 =3DC3=3DA0(= > s) > > 15:47=3D > > > ): > > > > > > > >> The branch main has been updated by imp: > > > >> > > > >> URL: > > > >> > > https://cgit.FreeBSD.org/src/commit/?id=3D3D108de784513d87bbe850e7b003a73= > e=3D > > > 26b5b54caa > > > >> > > > >> commit 108de784513d87bbe850e7b003a73e26b5b54caa > > > >> Author: Val Packett > > > >> AuthorDate: 2024-05-31 14:45:02 +0000 > > > >> Commit: Warner Losh > > > >> CommitDate: 2024-05-31 14:45:02 +0000 > > > >> > > > >> Redefine CLOCK_BOOTTIME to alias CLOCK_MONOTONIC, not CLOCK_UPTI= > ME > > > >> > > > >> The suspend-awareness situation with monotonic clocks across > > platfor=3D > > > ms > > > >> is kind of a mess, let's try not making it worse. > > > >> > > > >> On Linux, CLOCK_MONOTONIC does NOT count suspended time, and > > > >> CLOCK_BOOTTIME was introduced to INCLUDE suspended time. > > > >> > > > >> On OpenBSD, CLOCK_MONOTONIC DOES count suspended time, and > > > >> CLOCK_UPTIME > > > >> was introduced to EXCLUDE suspended time. > > > >> > > > >> On macOS, it's the same as OpenBSD, but with CLOCK_UPTIME_RAW. > > > >> > > > >> Right now, we do not have a monotonic clock that counts suspende= > d > > > >> time. > > > >> We have CLOCK_UPTIME as a distinct ID alias, and CLOCK_BOOTTIME > > as a > > > >> preprocessor alias, both being effectively `CLOCK_MONOTONIC` for > > now=3D > > > . > > > >> > > > >> When we introduce a suspend-aware clock in the future, it would > > make=3D > > > a > > > >> lot more sense to do it the OpenBSD/macOS way, i.e. to make > > > >> CLOCK_MONOTONIC include suspended time and make CLOCK_UPTIME > > exclude > > > >> it, > > > >> because that's what the name CLOCK_UPTIME implies: a deviation > > from > > > >> the > > > >> default intended for the uptime command to allow it to only show > > the > > > >> time the system was actually up and not suspended. > > > >> > > > >> Let's change the define right now to make sure software using th= > e > > > >> define > > > >> would not end up using the ID of the wrong clock in the future, > > and > > > >> fix > > > >> the IDs in the Linux compat code to match the expected changes > > too. > > > >> > > > >> See https://bugzilla.mozilla.org/show_bug.cgi?id=3D3D1824084 > > > >> for more discussion. > > > >> > > > >> Fixes: 155f15118a77 ("clock_gettime: Add Linux aliases > > for > > > >> CLOCK_*") > > > >> Fixes: 25ada637362d ("Map Linux CLOCK_BOOTTIME to nativ= > e > > > >> CLOCK_UPTIME.") > > > >> Sponsored by: https://www.patreon.com/valpackett > > > >> Reviewed by: kib, imp > > > >> Differential Revision: https://reviews.freebsd.org/D39270 > > > >> --- > > > >> sys/compat/linux/linux_time.c | 6 +++--- > > > >> sys/sys/_clock_id.h | 2 +- > > > >> 2 files changed, 4 insertions(+), 4 deletions(-) > > > >> > > > >> diff --git a/sys/compat/linux/linux_time.c > > b/sys/compat/linux/linux_time=3D > > > .c > > > >> index e9e5cf075210..f4dd26dd3d2a 100644 > > > >> --- a/sys/compat/linux/linux_time.c > > > >> +++ b/sys/compat/linux/linux_time.c > > > >> @@ -287,7 +287,7 @@ linux_to_native_clockid(clockid_t *n, clockid_t = > l) > > > >> *n =3D3D CLOCK_REALTIME; > > > >> break; > > > >> case LINUX_CLOCK_MONOTONIC: > > > >> - *n =3D3D CLOCK_MONOTONIC; > > > >> + *n =3D3D CLOCK_UPTIME; > > > >> break; > > > >> case LINUX_CLOCK_PROCESS_CPUTIME_ID: > > > >> *n =3D3D CLOCK_PROCESS_CPUTIME_ID; > > > >> @@ -300,10 +300,10 @@ linux_to_native_clockid(clockid_t *n, clockid_= > t > > l) > > > >> break; > > > >> case LINUX_CLOCK_MONOTONIC_COARSE: > > > >> case LINUX_CLOCK_MONOTONIC_RAW: > > > >> - *n =3D3D CLOCK_MONOTONIC_FAST; > > > >> + *n =3D3D CLOCK_UPTIME_FAST; > > > >> break; > > > >> case LINUX_CLOCK_BOOTTIME: > > > >> - *n =3D3D CLOCK_UPTIME; > > > >> + *n =3D3D CLOCK_MONOTONIC; > > > >> break; > > > >> case LINUX_CLOCK_REALTIME_ALARM: > > > >> case LINUX_CLOCK_BOOTTIME_ALARM: > > > >> diff --git a/sys/sys/_clock_id.h b/sys/sys/_clock_id.h > > > >> index 47a551428dc3..728346a0f0ab 100644 > > > >> --- a/sys/sys/_clock_id.h > > > >> +++ b/sys/sys/_clock_id.h > > > >> @@ -78,7 +78,7 @@ > > > >> * Linux compatible names. > > > >> */ > > > >> #if __BSD_VISIBLE > > > >> -#define CLOCK_BOOTTIME CLOCK_UPTIME > > > >> +#define CLOCK_BOOTTIME CLOCK_MONOTONIC > > > >> #define CLOCK_REALTIME_COARSE CLOCK_REALTIME_FAST > > > >> #define CLOCK_MONOTONIC_COARSE CLOCK_MONOTONIC_FAST > > > >> #endif > > > >> > > > >> > > > > > > > > -- > > > > Nuno Teixeira > > > > FreeBSD UNIX: Web: https://FreeBSD.org > > > > > > > > > > --0000000000000d72080619d34a39 > > > Content-Type: text/html; charset=3D"UTF-8" > > > Content-Transfer-Encoding: quoted-printable > > > > > >


> class=3D3D"gmail_quote">=3D > > >
On Sat, Jun 1, 2024, > > 4:37=3DE2=3D80=3DAFAM =3D > > > Nuno Teixeira < > target=3D3D"_blank">=3D > > > eduardo@freebsd.org> wrote:
> class=3D3D"gmail_quot=3D > > > e" style=3D3D"margin:0 0 0 .8ex;border-left:1px #ccc > > solid;padding-left:1ex">=3D > > >
Hello,

Having issues > > buildin=3D > > > g > > graphics/mesa-dri:

../src/intel/common/xe/intel_= > =3D > > > gem.c:72:9: error: duplicate case value '4'
=3DC2=3DA0 =3DC2= > =3DA072 | > > =3D > > > =3DC2=3DA0 =3DC2=3DA0case CLOCK_BOOTTIME:
=3DC2=3DA0 =3DC2=3DA0 =3DC= > 2=3DA0 | =3DC2=3DA0 > > =3DC2=3DA0 =3D > > > =3DC2=3DA0 =3DC2=3DA0 ^
/usr/include/sys/_clock_id.h:81:25: note: ex= > panded > > from =3D > > > macro 'CLOCK_BOOTTIME'
=3DC2=3DA0 =3DC2=3DA081 | #define > > CLOCK_BOOTTIME =3D > > > =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0CLOCK_MONOTONIC r>=3DC2=3DA0 =3DC2=3DA0 > > =3DC2=3DA0 |=3D > > > =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC= > 2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 > > =3DC2=3D > > > =3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 > > ^
/usr/include/sys/_clock_id.h:56=3D > > > :26: note: expanded from macro 'CLOCK_MONOTONIC'
=3DC2=3DA0 > > =3DC2=3DA056=3D > > > | #define CLOCK_MONOTONIC =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 = > 4
=3DC2=3DA0 > > =3DC2=3DA0 =3D > > > =3DC2=3DA0 | =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3D= > C2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 > > =3DC2=3D > > > =3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 > > ^
../src/intel/common/xe/i=3D > > > ntel_gem.c:66:9: note: previous case defined here
=3DC2=3DA0 =3DC2= > =3DA066 | > > =3DC2=3D > > > =3DA0 =3DC2=3DA0case CLOCK_MONOTONIC:
=3DC2=3DA0 =3DC2=3DA0 =3DC2=3D= > A0 | =3DC2=3DA0 =3DC2=3DA0 > > =3DC2=3D > > > =3DA0 =3DC2=3DA0 ^
/usr/include/sys/_clock_id.h:56:26: note: expande= > d from > > mac=3D > > > ro 'CLOCK_MONOTONIC'
=3DC2=3DA0 =3DC2=3DA056 | #define > > CLOCK_MONOTONIC =3D > > > =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 4
=3DC2=3DA0 =3DC2=3DA0 = > =3DC2=3DA0 | =3DC2=3DA0 =3DC2=3DA0 > > =3DC2=3D > > > =3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0= > =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 > > =3DC2=3DA0 =3D > > > =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 ^
1 error > > generated.
=3D > > >

> class=3D3D"gmail_quo=3D > > > te">
Mesa needs to be updated to not assume these are distinct > > values.<=3D > > > /div>

Warner
=3DC2=3DA0
> class=3D3D"=3D > > > gmail_quote" style=3D3D"margin:0 0 0 .8ex;border-left:1px #ccc > > solid;padding-=3D > > > left:1ex">
Thanks
> clear=3D3D"=3D > > > all">

v > > dir=3D > > > =3D3D"ltr" class=3D3D"gmail_attr">Warner Losh < > imp@freebsd=3D > > > .org" rel=3D3D"noreferrer" target=3D3D"_blank">imp@freebsd.org> > > escreveu=3D > > > (sexta, 31/05/2024 =3DC3=3DA0(s) 15:47):
> class=3D3D"gmail_q=3D > > > uote" style=3D3D"margin:0px 0px 0px 0.8ex;border-left:1px solid > > rgb(204,204,2=3D > > > 04);padding-left:1ex">The branch main has been updated by imp:
> > >
> > > URL: > https://cgit.FreeBSD.org/src/commit/?id=3D3D108de784513d87bbe=3D > > > 850e7b003a73e26b5b54caa" rel=3D3D"noreferrer noreferrer" > > target=3D3D"_blank">ht=3D > > > tps:// > > cgit.FreeBSD.org/src/commit/?id=3D3D108de784513d87bbe850e7b003a73e26b5b= > =3D > > > 54caa
> > >
> > > commit 108de784513d87bbe850e7b003a73e26b5b54caa
> > > Author:=3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0Val Packett <val@packett.cool= > >
> > > AuthorDate: 2024-05-31 14:45:02 +0000
> > > Commit:=3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0Warner Losh <imp@FreeBSD.org&= > gt;
> > > CommitDate: 2024-05-31 14:45:02 +0000
> > >
> > > =3DC2=3DA0 =3DC2=3DA0 Redefine CLOCK_BOOTTIME to alias CLOCK_MONOTONIC,= > not > > CLOCK_U=3D > > > PTIME
> > >
> > > =3DC2=3DA0 =3DC2=3DA0 The suspend-awareness situation with monotonic cl= > ocks > > across =3D > > > platforms
> > > =3DC2=3DA0 =3DC2=3DA0 is kind of a mess, let's try not making it wo= > rse.
> > >
> > > =3DC2=3DA0 =3DC2=3DA0 On Linux, CLOCK_MONOTONIC does NOT count suspende= > d time, > > and<=3D > > > br> > > > =3DC2=3DA0 =3DC2=3DA0 CLOCK_BOOTTIME was introduced to INCLUDE suspende= > d > > time.
> > >
> > > =3DC2=3DA0 =3DC2=3DA0 On OpenBSD, CLOCK_MONOTONIC DOES count suspended = > time, and > > CL=3D > > > OCK_UPTIME
> > > =3DC2=3DA0 =3DC2=3DA0 was introduced to EXCLUDE suspended time.
> > >
> > > =3DC2=3DA0 =3DC2=3DA0 On macOS, it's the same as OpenBSD, but with > > CLOCK_UPTIME=3D > > > _RAW.
> > >
> > > =3DC2=3DA0 =3DC2=3DA0 Right now, we do not have a monotonic clock that = > counts > > suspe=3D > > > nded time.
> > > =3DC2=3DA0 =3DC2=3DA0 We have CLOCK_UPTIME as a distinct ID alias, and > > CLOCK_BOOTTI=3D > > > ME as a
> > > =3DC2=3DA0 =3DC2=3DA0 preprocessor alias, both being effectively > > `CLOCK_MONOTONIC` =3D > > > for now.
> > >
> > > =3DC2=3DA0 =3DC2=3DA0 When we introduce a suspend-aware clock in the fu= > ture, it > > wou=3D > > > ld make a
> > > =3DC2=3DA0 =3DC2=3DA0 lot more sense to do it the OpenBSD/macOS way, i.= > e. to > > make > > r> > > > =3DC2=3DA0 =3DC2=3DA0 CLOCK_MONOTONIC include suspended time and make > > CLOCK_UPTIME =3D > > > exclude it,
> > > =3DC2=3DA0 =3DC2=3DA0 because that's what the name CLOCK_UPTIME imp= > lies: a > > devi=3D > > > ation from the
> > > =3DC2=3DA0 =3DC2=3DA0 default intended for the uptime command to allow = > it to > > only s=3D > > > how the
> > > =3DC2=3DA0 =3DC2=3DA0 time the system was actually up and not suspended= > .
> > >
> > > =3DC2=3DA0 =3DC2=3DA0 Let's change the define right now to make sur= > e > > software u=3D > > > sing the define
> > > =3DC2=3DA0 =3DC2=3DA0 would not end up using the ID of the wrong clock = > in the > > futur=3D > > > e, and fix
> > > =3DC2=3DA0 =3DC2=3DA0 the IDs in the Linux compat code to match the exp= > ected > > change=3D > > > s too.
> > >
> > > =3DC2=3DA0 =3DC2=3DA0 See > https://bugzilla.mozilla.org/show_bug.cgi?id=3D > > > =3D3D1824084" rel=3D3D"noreferrer noreferrer" target=3D3D"_blank"> > > https://bugzill=3D > > > a.mozilla.org/show_bug.cgi?id=3D3D1824084
> > > =3DC2=3DA0 =3DC2=3DA0 for more discussion.
> > >
> > > =3DC2=3DA0 =3DC2=3DA0 Fixes:=3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0= > =3DC2=3DA0 155f15118a77 > > ("=3D > > > clock_gettime: Add Linux aliases for CLOCK_*")
> > > =3DC2=3DA0 =3DC2=3DA0 Fixes:=3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0= > =3DC2=3DA0 25ada637362d > > ("=3D > > > Map Linux CLOCK_BOOTTIME to native CLOCK_UPTIME.")
> > > =3DC2=3DA0 =3DC2=3DA0 Sponsored by:=3DC2=3DA0 =3DC2=3DA0 > https://www.patreon.com/=3D > > > valpackett" rel=3D3D"noreferrer noreferrer" target=3D3D"_blank"> > > https://www.pat=3D > > > reon.com/valpackett
> > > =3DC2=3DA0 =3DC2=3DA0 Reviewed by:=3DC2=3DA0 =3DC2=3DA0 kib, imp
> > > =3DC2=3DA0 =3DC2=3DA0 Differential Revision:=3DC2=3DA0 > https://reviews.freeb=3D > > > sd.org/D39270" rel=3D3D"noreferrer noreferrer" target=3D3D"_blank"> > > https://revi=3D > > > ews.freebsd.org/D39270
> > > ---
> > > =3DC2=3DA0sys/compat/linux/linux_time.c | 6 +++---
> > > =3DC2=3DA0sys/sys/_clock_id.h=3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA= > 0 =3DC2=3DA0 =3DC2=3DA0| 2 > > +- > > > > > > =3DC2=3DA02 files changed, 4 insertions(+), 4 deletions(-)
> > >
> > > diff --git a/sys/compat/linux/linux_time.c > > b/sys/compat/linux/linux_time.c<=3D > > > br> > > > index e9e5cf075210..f4dd26dd3d2a 100644
> > > --- a/sys/compat/linux/linux_time.c
> > > +++ b/sys/compat/linux/linux_time.c
> > > @@ -287,7 +287,7 @@ linux_to_native_clockid(clockid_t *n, clockid_t > > l)
> > > =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2= > =3DA0 =3DC2=3DA0 *n =3D3D > > CLOCK_REALTI=3D > > > ME;
> > > =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2= > =3DA0 =3DC2=3DA0 break;
> > > =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 case LINUX_CLOCK_MONOTONIC:= >
> > > -=3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC= > 2=3DA0 =3DC2=3DA0*n =3D3D > > CLOCK_MONOTO=3D > > > NIC;
> > > +=3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC= > 2=3DA0 =3DC2=3DA0*n =3D3D > > CLOCK_UPTIME=3D > > > ;
> > > =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2= > =3DA0 =3DC2=3DA0 break;
> > > =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 case LINUX_CLOCK_PROCESS_CP= > UTIME_ID:
> > > =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2= > =3DA0 =3DC2=3DA0 *n =3D3D > > CLOCK_PROCES=3D > > > S_CPUTIME_ID;
> > > @@ -300,10 +300,10 @@ linux_to_native_clockid(clockid_t *n, clockid_t > > l) > > > > > > =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2= > =3DA0 =3DC2=3DA0 break;
> > > =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 case LINUX_CLOCK_MONOTONIC_= > COARSE:
> > > =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 case LINUX_CLOCK_MONOTONIC_= > RAW:
> > > -=3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC= > 2=3DA0 =3DC2=3DA0*n =3D3D > > CLOCK_MONOTO=3D > > > NIC_FAST;
> > > +=3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC= > 2=3DA0 =3DC2=3DA0*n =3D3D > > CLOCK_UPTIME=3D > > > _FAST;
> > > =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2= > =3DA0 =3DC2=3DA0 break;
> > > =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 case LINUX_CLOCK_BOOTTIME:<= > br> > > > -=3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC= > 2=3DA0 =3DC2=3DA0*n =3D3D > > CLOCK_UPTIME=3D > > > ;
> > > +=3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC= > 2=3DA0 =3DC2=3DA0*n =3D3D > > CLOCK_MONOTO=3D > > > NIC;
> > > =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2= > =3DA0 =3DC2=3DA0 break;
> > > =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 case LINUX_CLOCK_REALTIME_A= > LARM:
> > > =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 case LINUX_CLOCK_BOOTTIME_A= > LARM:
> > > diff --git a/sys/sys/_clock_id.h b/sys/sys/_clock_id.h
> > > index 47a551428dc3..728346a0f0ab 100644
> > > --- a/sys/sys/_clock_id.h
> > > +++ b/sys/sys/_clock_id.h
> > > @@ -78,7 +78,7 @@
> > > =3DC2=3DA0 * Linux compatible names.
> > > =3DC2=3DA0 */
> > > =3DC2=3DA0#if __BSD_VISIBLE
> > > -#define=3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 CLOCK_BOOTTIME=3DC2= > =3DA0 =3DC2=3DA0 =3DC2=3DA0 > > =3DC2=3D > > > =3DA0 =3DC2=3DA0 CLOCK_UPTIME
> > > +#define=3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 CLOCK_BOOTTIME=3DC2= > =3DA0 =3DC2=3DA0 =3DC2=3DA0 > > =3DC2=3D > > > =3DA0 =3DC2=3DA0 CLOCK_MONOTONIC
> > > =3DC2=3DA0#define=3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 CLOCK_REAL= > TIME_COARSE=3DC2=3DA0 > > =3DC2=3DA0=3D > > > CLOCK_REALTIME_FAST
> > > =3DC2=3DA0#define=3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 CLOCK_MONO= > TONIC_COARSE=3DC2=3DA0 > > CLOCK=3D > > > _MONOTONIC_FAST
> > > =3DC2=3DA0#endif
> > >
> > >


> class=3D3D"gmail_signature_pre=3D > > > fix">--
> dir=3D3D"l=3D > > > tr">
Nuno > > Teixeira
> > color=3D3D"#888888"> > > > FreeBSD UNIX:=3DC2=3DA0 <eduardo@FreeBSD.org>=3DC2=3DA0 =3DC2=3DA= > 0Web:=3DC2=3DA0 > > > > ref=3D3D"https://FreeBSD.org" rel=3D3D"noreferrer noreferrer" > > target=3D3D"_blank"=3D > > > >https://FreeBSD.org
> > >
> > >
> > > > > > --0000000000000d72080619d34a39-- > > > > > > > > > > > --000000000000dcc9a90619d4664c > Content-Type: text/html; charset="UTF-8" > Content-Transfer-Encoding: quoted-printable > >


= >
On Sat, Jun 1, 2024 at 9:31=E2=80=AFA= > M Cy Schubert <Cy.Schubert@= > cschubert.com> wrote:
le=3D"margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);paddi= > ng-left:1ex">In message <CANCZdfpMvorgKYx6pCL7_q6BW3AqZSDwryKHg_cV+yt_E-= > FbOQ@mail.gmail.c
> om>
> , Warner Losh writes:
> > --0000000000000d72080619d34a39
> > Content-Type: text/plain; charset=3D"UTF-8"
> > Content-Transfer-Encoding: quoted-printable
> >
> > On Sat, Jun 1, 2024, 4:37=3DE2=3D80=3DAFAM Nuno Teixeira < =3D"mailto:eduardo@freebsd.org" target=3D"_blank">eduardo@freebsd.org&g= > t; wr=3D
> > ote:
> >
> > > Hello,
> > >
> > > Having issues building graphics/mesa-dri:
> > >
> > > ../src/intel/common/xe/intel_gem.c:72:9: error: duplicate case va= > lue '4'
> > >=C2=A0 =C2=A0 72 |=C2=A0 =C2=A0 case CLOCK_BOOTTIME:
> > >=C2=A0 =C2=A0 =C2=A0 =C2=A0|=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0^ > > > > /usr/include/sys/_clock_id.h:81:25: note: expanded from macro
> > > 'CLOCK_BOOTTIME'
> > >=C2=A0 =C2=A0 81 | #define CLOCK_BOOTTIME=C2=A0 =C2=A0 =C2=A0 =C2= > =A0 =C2=A0 CLOCK_MONOTONIC
> > >=C2=A0 =C2=A0 =C2=A0 =C2=A0|=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= > =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = > =C2=A0^
> > > /usr/include/sys/_clock_id.h:56:26: note: expanded from macro
> > > 'CLOCK_MONOTONIC'
> > >=C2=A0 =C2=A0 56 | #define CLOCK_MONOTONIC=C2=A0 =C2=A0 =C2=A0 =C2= > =A0 =C2=A04
> > >=C2=A0 =C2=A0 =C2=A0 =C2=A0|=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= > =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = > =C2=A0^
> > > ../src/intel/common/xe/intel_gem.c:66:9: note: previous case defi= > ned here
> > >=C2=A0 =C2=A0 66 |=C2=A0 =C2=A0 case CLOCK_MONOTONIC:
> > >=C2=A0 =C2=A0 =C2=A0 =C2=A0|=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0^ > > > > /usr/include/sys/_clock_id.h:56:26: note: expanded from macro
> > > 'CLOCK_MONOTONIC'
> > >=C2=A0 =C2=A0 56 | #define CLOCK_MONOTONIC=C2=A0 =C2=A0 =C2=A0 =C2= > =A0 =C2=A04
> > >=C2=A0 =C2=A0 =C2=A0 =C2=A0|=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= > =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = > =C2=A0^
> > > 1 error generated.
> > >
> >
> > Mesa needs to be updated to not assume these are distinct values.
>
> You should be able to resolve this with,
>
> --- src/intel/common/xe/intel_gem.c.orig=C2=A0 =C2=A0 =C2=A0 =C2=A0 2024-05= > -22 09:48:39.000000000 -0700
> +++ src/intel/common/xe/intel_gem.c=C2=A0 =C2=A0 =C2=A02024-06-01 06:28:22.= > 268439000 -0700
> @@ -69,8 +69,10 @@
> =C2=A0#endif
> =C2=A0 =C2=A0 case CLOCK_REALTIME:
> =C2=A0#ifdef CLOCK_BOOTTIME
> +#if CLOCK_BOOTTIME !=3D CLOCK_MONOTONIC
> =C2=A0 =C2=A0 case CLOCK_BOOTTIME:
> =C2=A0#endif
> +#endif
> =C2=A0#ifdef CLOCK_TAI
> =C2=A0 =C2=A0 case CLOCK_TAI:
> =C2=A0#endif

Yea, that should do it. I = > was going to look at this when I got back from BSDcan (mostly because
= >
my talk is this morning), but thanks for beating me to it.=C2=A0 I wok= > e up grump and it was bugging me
on the=C2=A0walk over to the con= > ference I was a little short in my first reply, but since you proposed a iv>
fix, I feel less guilty... :) Thanks!

Warn= > er

Warner

Warner=C2=A0 iv>
er-left:1px solid rgb(204,204,204);padding-left:1ex"> > --
> Cheers,
> Cy Schubert < nk">Cy.Schubert@cschubert.com>
> FreeBSD UNIX:=C2=A0 <cy@FreeBSD.org>=C2=A0 =C2=A0Web:=C2=A0 =3D"https://FreeBSD.org" rel=3D"noreferrer" target=3D"_blank">https://FreeB= > SD.org
> NTP:=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0< e.org" target=3D"_blank">cy@nwtime.org>=C2=A0 =C2=A0 Web:=C2=A0 ref=3D"https://nwtime.org" rel=3D"noreferrer" target=3D"_blank">https://nwt= > ime.org
>
> =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= > =A0 =C2=A0 e^(i*pi)+1=3D0
>
>
> >
> > Warner
> >
> >
> > > Thanks
> > >
> > > Warner Losh < nk">imp@freebsd.org> escreveu (sexta, 31/05/2024 =3DC3=3DA0(s) 15:47= > =3D
> > ):
> > >
> > >> The branch main has been updated by imp:
> > >>
> > >> URL:
> > >> 84513d87bbe850e7b003a73e=3D" rel=3D"noreferrer" target=3D"_blank">https://c= > git.FreeBSD.org/src/commit/?id=3D3D108de784513d87bbe850e7b003a73e=3D > > > 26b5b54caa
> > >>
> > >> commit 108de784513d87bbe850e7b003a73e26b5b54caa
> > >> Author:=C2=A0 =C2=A0 =C2=A0Val Packett <val@packett.cool&g= > t;
> > >> AuthorDate: 2024-05-31 14:45:02 +0000
> > >> Commit:=C2=A0 =C2=A0 =C2=A0Warner Losh <imp@FreeBSD.org>= > ;
> > >> CommitDate: 2024-05-31 14:45:02 +0000
> > >>
> > >>=C2=A0 =C2=A0 =C2=A0Redefine CLOCK_BOOTTIME to alias CLOCK_MON= > OTONIC, not CLOCK_UPTIME
> > >>
> > >>=C2=A0 =C2=A0 =C2=A0The suspend-awareness situation with monot= > onic clocks across platfor=3D
> > ms
> > >>=C2=A0 =C2=A0 =C2=A0is kind of a mess, let's try not makin= > g it worse.
> > >>
> > >>=C2=A0 =C2=A0 =C2=A0On Linux, CLOCK_MONOTONIC does NOT count s= > uspended time, and
> > >>=C2=A0 =C2=A0 =C2=A0CLOCK_BOOTTIME was introduced to INCLUDE s= > uspended time.
> > >>
> > >>=C2=A0 =C2=A0 =C2=A0On OpenBSD, CLOCK_MONOTONIC DOES count sus= > pended time, and
> > >> CLOCK_UPTIME
> > >>=C2=A0 =C2=A0 =C2=A0was introduced to EXCLUDE suspended time.<= > br> > > >>
> > >>=C2=A0 =C2=A0 =C2=A0On macOS, it's the same as OpenBSD, bu= > t with CLOCK_UPTIME_RAW.
> > >>
> > >>=C2=A0 =C2=A0 =C2=A0Right now, we do not have a monotonic cloc= > k that counts suspended
> > >> time.
> > >>=C2=A0 =C2=A0 =C2=A0We have CLOCK_UPTIME as a distinct ID alia= > s, and CLOCK_BOOTTIME as a
> > >>=C2=A0 =C2=A0 =C2=A0preprocessor alias, both being effectively= > `CLOCK_MONOTONIC` for now=3D
> > .
> > >>
> > >>=C2=A0 =C2=A0 =C2=A0When we introduce a suspend-aware clock in= > the future, it would make=3D
> >=C2=A0 a
> > >>=C2=A0 =C2=A0 =C2=A0lot more sense to do it the OpenBSD/macOS = > way, i.e. to make
> > >>=C2=A0 =C2=A0 =C2=A0CLOCK_MONOTONIC include suspended time and= > make CLOCK_UPTIME exclude
> > >> it,
> > >>=C2=A0 =C2=A0 =C2=A0because that's what the name CLOCK_UPT= > IME implies: a deviation from
> > >> the
> > >>=C2=A0 =C2=A0 =C2=A0default intended for the uptime command to= > allow it to only show the
> > >>=C2=A0 =C2=A0 =C2=A0time the system was actually up and not su= > spended.
> > >>
> > >>=C2=A0 =C2=A0 =C2=A0Let's change the define right now to m= > ake sure software using the
> > >> define
> > >>=C2=A0 =C2=A0 =C2=A0would not end up using the ID of the wrong= > clock in the future, and
> > >> fix
> > >>=C2=A0 =C2=A0 =C2=A0the IDs in the Linux compat code to match = > the expected changes too.
> > >>
> > >>=C2=A0 =C2=A0 =C2=A0See g/show_bug.cgi?id=3D3D1824084" rel=3D"noreferrer" target=3D"_blank">https:/= > /bugzilla.mozilla.org/show_bug.cgi?id=3D3D1824084
> > >>=C2=A0 =C2=A0 =C2=A0for more discussion.
> > >>
> > >>=C2=A0 =C2=A0 =C2=A0Fixes:=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 1= > 55f15118a77 ("clock_gettime: Add Linux aliases for
> > >> CLOCK_*")
> > >>=C2=A0 =C2=A0 =C2=A0Fixes:=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 2= > 5ada637362d ("Map Linux CLOCK_BOOTTIME to native
> > >> CLOCK_UPTIME.")
> > >>=C2=A0 =C2=A0 =C2=A0Sponsored by:=C2=A0 =C2=A0 ://www.patreon.com/valpackett" rel=3D"noreferrer" target=3D"_blank">https:/= > /www.patreon.com/valpackett
> > >>=C2=A0 =C2=A0 =C2=A0Reviewed by:=C2=A0 =C2=A0 kib, imp
> > >>=C2=A0 =C2=A0 =C2=A0Differential Revision:=C2=A0 tps://reviews.freebsd.org/D39270" rel=3D"noreferrer" target=3D"_blank">http= > s://reviews.freebsd.org/D39270
> > >> ---
> > >>=C2=A0 sys/compat/linux/linux_time.c | 6 +++---
> > >>=C2=A0 sys/sys/_clock_id.h=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = > =C2=A0| 2 +-
> > >>=C2=A0 2 files changed, 4 insertions(+), 4 deletions(-)
> > >>
> > >> diff --git a/sys/compat/linux/linux_time.c b/sys/compat/linux= > /linux_time=3D
> > .c
> > >> index e9e5cf075210..f4dd26dd3d2a 100644
> > >> --- a/sys/compat/linux/linux_time.c
> > >> +++ b/sys/compat/linux/linux_time.c
> > >> @@ -287,7 +287,7 @@ linux_to_native_clockid(clockid_t *n, clo= > ckid_t l)
> > >>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= > *n =3D3D CLOCK_REALTIME;
> > >>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= > break;
> > >>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0case LINUX_CLOCK_MONOTONIC:<= > br> > > >> -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0*n = > =3D3D CLOCK_MONOTONIC;
> > >> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0*n = > =3D3D CLOCK_UPTIME;
> > >>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= > break;
> > >>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0case LINUX_CLOCK_PROCESS_CPU= > TIME_ID:
> > >>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= > *n =3D3D CLOCK_PROCESS_CPUTIME_ID;
> > >> @@ -300,10 +300,10 @@ linux_to_native_clockid(clockid_t *n, c= > lockid_t l)
> > >>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= > break;
> > >>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0case LINUX_CLOCK_MONOTONIC_C= > OARSE:
> > >>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0case LINUX_CLOCK_MONOTONIC_R= > AW:
> > >> -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0*n = > =3D3D CLOCK_MONOTONIC_FAST;
> > >> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0*n = > =3D3D CLOCK_UPTIME_FAST;
> > >>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= > break;
> > >>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0case LINUX_CLOCK_BOOTTIME: r> > > >> -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0*n = > =3D3D CLOCK_UPTIME;
> > >> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0*n = > =3D3D CLOCK_MONOTONIC;
> > >>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= > break;
> > >>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0case LINUX_CLOCK_REALTIME_AL= > ARM:
> > >>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0case LINUX_CLOCK_BOOTTIME_AL= > ARM:
> > >> diff --git a/sys/sys/_clock_id.h b/sys/sys/_clock_id.h
> > >> index 47a551428dc3..728346a0f0ab 100644
> > >> --- a/sys/sys/_clock_id.h
> > >> +++ b/sys/sys/_clock_id.h
> > >> @@ -78,7 +78,7 @@
> > >>=C2=A0 =C2=A0* Linux compatible names.
> > >>=C2=A0 =C2=A0*/
> > >>=C2=A0 #if __BSD_VISIBLE
> > >> -#define=C2=A0 =C2=A0 =C2=A0 =C2=A0 CLOCK_BOOTTIME=C2=A0 =C2= > =A0 =C2=A0 =C2=A0 =C2=A0 CLOCK_UPTIME
> > >> +#define=C2=A0 =C2=A0 =C2=A0 =C2=A0 CLOCK_BOOTTIME=C2=A0 =C2= > =A0 =C2=A0 =C2=A0 =C2=A0 CLOCK_MONOTONIC
> > >>=C2=A0 #define=C2=A0 =C2=A0 =C2=A0 =C2=A0 CLOCK_REALTIME_COARS= > E=C2=A0 =C2=A0CLOCK_REALTIME_FAST
> > >>=C2=A0 #define=C2=A0 =C2=A0 =C2=A0 =C2=A0 CLOCK_MONOTONIC_COAR= > SE=C2=A0 CLOCK_MONOTONIC_FAST
> > >>=C2=A0 #endif
> > >>
> > >>
> > >
> > > --
> > > Nuno Teixeira
> > > FreeBSD UNIX:=C2=A0 <eduardo@FreeBSD.org>=C2=A0 =C2=A0Web:= > =C2=A0 >https://FreeBSD.org
> > >
> >
> > --0000000000000d72080619d34a39
> > Content-Type: text/html; charset=3D"UTF-8"
> > Content-Transfer-Encoding: quoted-printable
> >
> > <div dir=3D3D"ltr"><div dir=3D3D"auto">= > ;<div><br><br><div class=3D3D"gmail_quote"&g= > t;=3D
> > <div dir=3D3D"ltr" class=3D3D"gmail_attr">On= > Sat, Jun 1, 2024, 4:37=3DE2=3D80=3DAFAM =3D
> > Nuno Teixeira &lt;<a href=3D3D"mailto: uardo@freebsd.org" target=3D"_blank">eduardo@freebsd.org" target= > =3D3D"_blank">=3D
> > eduardo@freeb= > sd.org</a>&gt; wrote:<br></div><blockquote cla= > ss=3D3D"gmail_quot=3D
> > e" style=3D3D"margin:0 0 0 .8ex;border-left:1px #ccc solid;p= > adding-left:1ex">=3D
> > <div dir=3D3D"ltr"><div>Hello,</div><di= > v><br></div><div>Having issues buildin=3D
> > g graphics/mesa-dri:</div><div><br></div><d= > iv>../src/intel/common/xe/intel_=3D
> > gem.c:72:9: error: duplicate case value &#39;4&#39;<br>= > =3DC2=3DA0 =3DC2=3DA072 | =3D
> > =3DC2=3DA0 =3DC2=3DA0case CLOCK_BOOTTIME:<br>=3DC2=3DA0 =3DC2=3D= > A0 =3DC2=3DA0 | =3DC2=3DA0 =3DC2=3DA0 =3D
> > =3DC2=3DA0 =3DC2=3DA0 ^<br>/usr/include/sys/_clock_id.h:81:25: n= > ote: expanded from =3D
> > macro &#39;CLOCK_BOOTTIME&#39;<br>=3DC2=3DA0 =3DC2=3DA08= > 1 | #define CLOCK_BOOTTIME =3D
> > =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0CLOCK_MONOTONIC&= > lt;br>=3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 |=3D
> >=C2=A0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA= > 0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3D
> > =3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 ^<br&g= > t;/usr/include/sys/_clock_id.h:56=3D
> > :26: note: expanded from macro &#39;CLOCK_MONOTONIC&#39;<br= > >=3DC2=3DA0 =3DC2=3DA056=3D
> >=C2=A0 | #define CLOCK_MONOTONIC =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2= > =3DA0 4<br>=3DC2=3DA0 =3DC2=3DA0 =3D
> > =3DC2=3DA0 | =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 = > =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3D
> > =3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA= > 0 ^<br>../src/intel/common/xe/i=3D
> > ntel_gem.c:66:9: note: previous case defined here<br>=3DC2=3DA0 = > =3DC2=3DA066 | =3DC2=3D
> > =3DA0 =3DC2=3DA0case CLOCK_MONOTONIC:<br>=3DC2=3DA0 =3DC2=3DA0 = > =3DC2=3DA0 | =3DC2=3DA0 =3DC2=3DA0 =3DC2=3D
> > =3DA0 =3DC2=3DA0 ^<br>/usr/include/sys/_clock_id.h:56:26: note: = > expanded from mac=3D
> > ro &#39;CLOCK_MONOTONIC&#39;<br>=3DC2=3DA0 =3DC2=3DA056 = > | #define CLOCK_MONOTONIC =3D
> > =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 4<br>=3DC2=3DA0 =3DC= > 2=3DA0 =3DC2=3DA0 | =3DC2=3DA0 =3DC2=3DA0 =3DC2=3D
> > =3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA= > 0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3D
> > =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 ^<br>1 error generated.</div= > ></div></blockquote></div>=3D
> > </div><div dir=3D3D"auto"><br></div>= > <div dir=3D3D"auto"><div class=3D3D"gmail_quo=3D > > > te"><div>Mesa needs to be updated to not assume these ar= > e distinct values.<=3D
> > /div><div><br></div><div>Warner</div>= > <div>=3DC2=3DA0</div><blockquote class=3D3D"=3D
> > gmail_quote" style=3D3D"margin:0 0 0 .8ex;border-left:1px #c= > cc solid;padding-=3D
> > left:1ex"><div dir=3D3D"ltr"><div><fo= > nt color=3D3D"#888888">Thanks<br clear=3D3D"=3D
> > all"></font></div><div></div></div&= > gt;<br><div class=3D3D"gmail_quote"><div dir=3D > > > =3D3D"ltr" class=3D3D"gmail_attr">Warner Losh &= > amp;lt;<a href=3D3D"mailto: "_blank">imp@freebsd=3D
> > .org" rel=3D3D"noreferrer" target=3D3D"_blank"= > ;>imp@freebsd.org a></a>&gt; escreveu=3D
> >=C2=A0 (sexta, 31/05/2024 =3DC3=3DA0(s) 15:47):<br></div>&l= > t;blockquote class=3D3D"gmail_q=3D
> > uote" style=3D3D"margin:0px 0px 0px 0.8ex;border-left:1px so= > lid rgb(204,204,2=3D
> > 04);padding-left:1ex">The branch main has been updated by imp:= > <br>
> > <br>
> > URL: <a href=3D3D" it/?id=3D3D108de784513d87bbe=3D" rel=3D"noreferrer" target=3D"_blank">https= > ://cgit.FreeBSD.org/src/commit/?id=3D3D108de784513d87bbe=3D
> > 850e7b003a73e26b5b54caa" rel=3D3D"noreferrer noreferrer"= > ; target=3D3D"_blank">ht=3D
> > tps:// 3d87bbe850e7b003a73e26b5b=3D" rel=3D"noreferrer" target=3D"_blank">cgit.Fre= > eBSD.org/src/commit/?id=3D3D108de784513d87bbe850e7b003a73e26b5b=3D
> > 54caa</a><br>
> > <br>
> > commit 108de784513d87bbe850e7b003a73e26b5b54caa<br>
> > Author:=3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0Val Packett &lt;val@packett= > .cool&gt;<br>
> > AuthorDate: 2024-05-31 14:45:02 +0000<br>
> > Commit:=3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0Warner Losh &lt;imp@FreeBSD= > .org&gt;<br>
> > CommitDate: 2024-05-31 14:45:02 +0000<br>
> > <br>
> > =3DC2=3DA0 =3DC2=3DA0 Redefine CLOCK_BOOTTIME to alias CLOCK_MONOTONIC= > , not CLOCK_U=3D
> > PTIME<br>
> > <br>
> > =3DC2=3DA0 =3DC2=3DA0 The suspend-awareness situation with monotonic c= > locks across =3D
> > platforms<br>
> > =3DC2=3DA0 =3DC2=3DA0 is kind of a mess, let&#39;s try not making = > it worse.<br>
> > <br>
> > =3DC2=3DA0 =3DC2=3DA0 On Linux, CLOCK_MONOTONIC does NOT count suspend= > ed time, and<=3D
> > br>
> > =3DC2=3DA0 =3DC2=3DA0 CLOCK_BOOTTIME was introduced to INCLUDE suspend= > ed time.<br>
> > <br>
> > =3DC2=3DA0 =3DC2=3DA0 On OpenBSD, CLOCK_MONOTONIC DOES count suspended= > time, and CL=3D
> > OCK_UPTIME<br>
> > =3DC2=3DA0 =3DC2=3DA0 was introduced to EXCLUDE suspended time.<br&= > gt;
> > <br>
> > =3DC2=3DA0 =3DC2=3DA0 On macOS, it&#39;s the same as OpenBSD, but = > with CLOCK_UPTIME=3D
> > _RAW.<br>
> > <br>
> > =3DC2=3DA0 =3DC2=3DA0 Right now, we do not have a monotonic clock that= > counts suspe=3D
> > nded time.<br>
> > =3DC2=3DA0 =3DC2=3DA0 We have CLOCK_UPTIME as a distinct ID alias, and= > CLOCK_BOOTTI=3D
> > ME as a<br>
> > =3DC2=3DA0 =3DC2=3DA0 preprocessor alias, both being effectively `CLOC= > K_MONOTONIC` =3D
> > for now.<br>
> > <br>
> > =3DC2=3DA0 =3DC2=3DA0 When we introduce a suspend-aware clock in the f= > uture, it wou=3D
> > ld make a<br>
> > =3DC2=3DA0 =3DC2=3DA0 lot more sense to do it the OpenBSD/macOS way, i= > .e. to make<b=3D
> > r>
> > =3DC2=3DA0 =3DC2=3DA0 CLOCK_MONOTONIC include suspended time and make = > CLOCK_UPTIME =3D
> > exclude it,<br>
> > =3DC2=3DA0 =3DC2=3DA0 because that&#39;s what the name CLOCK_UPTIM= > E implies: a devi=3D
> > ation from the<br>
> > =3DC2=3DA0 =3DC2=3DA0 default intended for the uptime command to allow= > it to only s=3D
> > how the<br>
> > =3DC2=3DA0 =3DC2=3DA0 time the system was actually up and not suspende= > d.<br>
> > <br>
> > =3DC2=3DA0 =3DC2=3DA0 Let&#39;s change the define right now to mak= > e sure software u=3D
> > sing the define<br>
> > =3DC2=3DA0 =3DC2=3DA0 would not end up using the ID of the wrong clock= > in the futur=3D
> > e, and fix<br>
> > =3DC2=3DA0 =3DC2=3DA0 the IDs in the Linux compat code to match the ex= > pected change=3D
> > s too.<br>
> > <br>
> > =3DC2=3DA0 =3DC2=3DA0 See <a href=3D3D" illa.mozilla.org/show_bug.cgi?id=3D" rel=3D"noreferrer" target=3D"_blank">h= > ttps://bugzilla.mozilla.org/show_bug.cgi?id=3D
> > =3D3D1824084" rel=3D3D"noreferrer noreferrer" target=3D= > 3D"_blank"> et=3D"_blank">https://bugzill=3D
> > referrer" target=3D"_blank">a.mozilla.org/show_bug.cgi?id=3D3D1824084&l= > t;/a><br>
> > =3DC2=3DA0 =3DC2=3DA0 for more discussion.<br>
> > <br>
> > =3DC2=3DA0 =3DC2=3DA0 Fixes:=3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA= > 0 =3DC2=3DA0 155f15118a77 (&quot;=3D
> > clock_gettime: Add Linux aliases for CLOCK_*&quot;)<br>
> > =3DC2=3DA0 =3DC2=3DA0 Fixes:=3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA= > 0 =3DC2=3DA0 25ada637362d (&quot;=3D
> > Map Linux CLOCK_BOOTTIME to native CLOCK_UPTIME.&quot;)<br><= > br> > > =3DC2=3DA0 =3DC2=3DA0 Sponsored by:=3DC2=3DA0 =3DC2=3DA0<a href=3D3= > D" "_blank">https://www.patreon.com/=3D
> > valpackett" rel=3D3D"noreferrer noreferrer" target=3D3D= > "_blank"> =3D"_blank">https://www.pat=3D
> > lank">reon.com/valpackett</a><br>
> > =3DC2=3DA0 =3DC2=3DA0 Reviewed by:=3DC2=3DA0 =3DC2=3DA0 kib, imp<br= > >
> > =3DC2=3DA0 =3DC2=3DA0 Differential Revision:=3DC2=3DA0 <a href=3D3D= > " ">https://reviews.freeb=3D
> > = > sd.org/D39270" rel=3D3D"noreferrer noreferrer" target=3D= > 3D"_blank"> =3D"_blank">https://revi=3D
> > "_blank">ews.freebsd.org/D39270</a><br>
> > ---<br>
> > =3DC2=3DA0sys/compat/linux/linux_time.c | 6 +++---<br>
> > =3DC2=3DA0sys/sys/_clock_id.h=3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3D= > A0 =3DC2=3DA0 =3DC2=3DA0| 2 +-<br=3D
> > >
> > =3DC2=3DA02 files changed, 4 insertions(+), 4 deletions(-)<br> r> > > <br>
> > diff --git a/sys/compat/linux/linux_time.c b/sys/compat/linux/linux_ti= > me.c<=3D
> > br>
> > index e9e5cf075210..f4dd26dd3d2a 100644<br>
> > --- a/sys/compat/linux/linux_time.c<br>
> > +++ b/sys/compat/linux/linux_time.c<br>
> > @@ -287,7 +287,7 @@ linux_to_native_clockid(clockid_t *n, clockid_t l)= > <br>
> > =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC= > 2=3DA0 =3DC2=3DA0 *n =3D3D CLOCK_REALTI=3D
> > ME;<br>
> > =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC= > 2=3DA0 =3DC2=3DA0 break;<br>
> > =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 case LINUX_CLOCK_MONOTONIC= > :<br>
> > -=3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3D= > C2=3DA0 =3DC2=3DA0*n =3D3D CLOCK_MONOTO=3D
> > NIC;<br>
> > +=3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3D= > C2=3DA0 =3DC2=3DA0*n =3D3D CLOCK_UPTIME=3D
> > ;<br>
> > =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC= > 2=3DA0 =3DC2=3DA0 break;<br>
> > =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 case LINUX_CLOCK_PROCESS_C= > PUTIME_ID:<br>
> > =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC= > 2=3DA0 =3DC2=3DA0 *n =3D3D CLOCK_PROCES=3D
> > S_CPUTIME_ID;<br>
> > @@ -300,10 +300,10 @@ linux_to_native_clockid(clockid_t *n, clockid_t = > l)<br=3D
> > >
> > =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC= > 2=3DA0 =3DC2=3DA0 break;<br>
> > =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 case LINUX_CLOCK_MONOTONIC= > _COARSE:<br>
> > =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 case LINUX_CLOCK_MONOTONIC= > _RAW:<br>
> > -=3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3D= > C2=3DA0 =3DC2=3DA0*n =3D3D CLOCK_MONOTO=3D
> > NIC_FAST;<br>
> > +=3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3D= > C2=3DA0 =3DC2=3DA0*n =3D3D CLOCK_UPTIME=3D
> > _FAST;<br>
> > =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC= > 2=3DA0 =3DC2=3DA0 break;<br>
> > =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 case LINUX_CLOCK_BOOTTIME:= > <br>
> > -=3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3D= > C2=3DA0 =3DC2=3DA0*n =3D3D CLOCK_UPTIME=3D
> > ;<br>
> > +=3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3D= > C2=3DA0 =3DC2=3DA0*n =3D3D CLOCK_MONOTO=3D
> > NIC;<br>
> > =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC= > 2=3DA0 =3DC2=3DA0 break;<br>
> > =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 case LINUX_CLOCK_REALTIME_= > ALARM:<br>
> > =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 case LINUX_CLOCK_BOOTTIME_= > ALARM:<br>
> > diff --git a/sys/sys/_clock_id.h b/sys/sys/_clock_id.h<br>
> > index 47a551428dc3..728346a0f0ab 100644<br>
> > --- a/sys/sys/_clock_id.h<br>
> > +++ b/sys/sys/_clock_id.h<br>
> > @@ -78,7 +78,7 @@<br>
> > =3DC2=3DA0 * Linux compatible names.<br>
> > =3DC2=3DA0 */<br>
> > =3DC2=3DA0#if __BSD_VISIBLE<br>
> > -#define=3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 CLOCK_BOOTTIME=3DC= > 2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3D
> > =3DA0 =3DC2=3DA0 CLOCK_UPTIME<br>
> > +#define=3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 CLOCK_BOOTTIME=3DC= > 2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3D
> > =3DA0 =3DC2=3DA0 CLOCK_MONOTONIC<br>
> > =3DC2=3DA0#define=3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 CLOCK_REA= > LTIME_COARSE=3DC2=3DA0 =3DC2=3DA0=3D
> > CLOCK_REALTIME_FAST<br>
> > =3DC2=3DA0#define=3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 CLOCK_MON= > OTONIC_COARSE=3DC2=3DA0 CLOCK=3D
> > _MONOTONIC_FAST<br>
> > =3DC2=3DA0#endif<br>
> > <br>
> > </blockquote></div><br clear=3D3D"all"><= > ;br><span class=3D3D"gmail_signature_pre=3D
> > fix">-- </span><br><div dir=3D3D"ltr"= > class=3D3D"gmail_signature"><div dir=3D3D"l=3D
> > tr"><div><font color=3D3D"#888888">Nuno = > Teixeira</font></div><div><div><font =3D
> > color=3D3D"#888888">
> > FreeBSD UNIX:=3DC2=3DA0 &lt;eduardo@FreeBSD.org&gt;=3DC2=3DA0 = > =3DC2=3DA0Web:=3DC2=3DA0 <a h=3D
> > ref=3D3D" t=3D"_blank">https://FreeBSD.org" rel=3D3D"noreferrer norefer= > rer" target=3D3D"_blank"=3D
> > > k">https://FreeBSD.org</a><br></font></div><= > /div></div></div>
> > </blockquote></div></div></div>
> > </div>
> >
> > --0000000000000d72080619d34a39--
> >
>
>
>
> > --000000000000dcc9a90619d4664c-- From nobody Sat Jun 1 15:09: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 4Vs3Lc5TwKz5N2VQ; Sat, 01 Jun 2024 15:09: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 4Vs3Lc4mMlz4L7K; Sat, 1 Jun 2024 15:09:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717254584; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2rK/Ime0knRezH/adpBAj614z8deIPIZ38sN43FV9Bg=; b=Cgua4lrdujigLPAs15uSxZ8J/gisDuw04yjGvcMJQzh3bpnp1wR4CD35vL2gVXo07lDbye ap/e4P7ippzGiaqGAOg6u4+vbvpYmL89bYHqszlof/KpsHbUnothKKNMNe49ZJY+yr5AnH U/fa7c9z1wqshH0TEDKaxsK6xMn/ASC4YYo8oUfadVxLkjvSiSVk/zkAgxDdqeJW161Zmw hPSoiwqqUYufRKJ/XNXfU59dmypHGyMqBrEOzkXlKWl46zVjIEtnrUub07Oh6Sfk5L7uS4 lQ6AyQvecE27Z+oFyD9XRVTL6ls2zfcgp6lfVxMALLwAPv0iIxF9n0mUyoMQoQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1717254584; a=rsa-sha256; cv=none; b=KEWb5JxwMxdjlcr8IhA/1VtWCFYUjaUqEpokO7SJU2hIqT7Sx2t2D1xIyE3QF2JL+7eqSe 0oklTCKxbNK6GpCwB49F+T11u85EaEO2A2K5jh3GFOlyqTbjl4MQe7uu01GrADRmq0OM52 MbBybxekYUrfdbO8tiEILMtg/xxIjUs0mOnMV/q+WacM2m6KYSaXe0QPUvKrEFos/4DEje j7vIKoJl5CN2k61IQge3sPf2frO7rXXAeLLyNnB/gjGt4TT3zd7Zw4vKhPxzpsbxq/TRz0 8rve9sijomgWPdvIZXZXLIsY+x39JTMz24BROMC/fvjNrlQNc5dl173ORWfcew== 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=1717254584; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2rK/Ime0knRezH/adpBAj614z8deIPIZ38sN43FV9Bg=; b=r9keudrdrAG/VWFKW3jqdRyv76EVgsUwMLg8T/epoluVeKrqoukbU0WOKg5SW76ZpzQDyj 45GMpF3CX+wGPaX52w6LDyeZE0DItOfoQnxCOFfUW116tC1mAJsHv1UAncRcUisAkbBIEX feWfSqzL12B9xnlMmjus6MZdD7aZsfYt06tLOUG7cyjNeuacjlRNFG+9DvgjWyzlXYidJI JVI3yESuKYPOUkGKEWWjXBRPfReza93bk2uJ+yTVl9EBmYSPbyVVnFL7OSFwEPjhJBakWT dUUi25N8arLrpL5qIFYZLW5rqDPhsPSIkCfh12IMn+FD7xNhE7TDdDQ573eO1Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Vs3Lc48CRz1CDl; Sat, 1 Jun 2024 15:09: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 451F9i1J046143; Sat, 1 Jun 2024 15:09:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 451F9ijF046140; Sat, 1 Jun 2024 15:09:44 GMT (envelope-from git) Date: Sat, 1 Jun 2024 15:09:44 GMT Message-Id: <202406011509.451F9ijF046140@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: 297bb39b6f0f - main - mitigations.7: move SSP documentation from security.7 to here List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: 297bb39b6f0fcfc5d571dc77008eb7acf138d279 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=297bb39b6f0fcfc5d571dc77008eb7acf138d279 commit 297bb39b6f0fcfc5d571dc77008eb7acf138d279 Author: Ed Maste AuthorDate: 2024-06-01 12:07:38 +0000 Commit: Ed Maste CommitDate: 2024-06-01 15:09:30 +0000 mitigations.7: move SSP documentation from security.7 to here Stack Smashing Protection (SSP) is a software vulnerability mitigation, and fits with this page. Add a note to the beginning of security.7 providing a more explicit cross reference to mitigations.7. Reviewed by: kevans Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D45435 --- share/man/man7/mitigations.7 | 82 +++++++++++++++++++++++++++++++++++++++--- share/man/man7/security.7 | 85 +++++--------------------------------------- 2 files changed, 87 insertions(+), 80 deletions(-) diff --git a/share/man/man7/mitigations.7 b/share/man/man7/mitigations.7 index a322c9a917da..e5ff439455e3 100644 --- a/share/man/man7/mitigations.7 +++ b/share/man/man7/mitigations.7 @@ -25,7 +25,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd May 31, 2024 +.Dd June 1, 2024 .Dt MITIGATIONS 7 .Os .Sh NAME @@ -54,8 +54,8 @@ Write XOR Execute page protection policy Relocation Read-Only (RELRO) .It Bind Now -.\".It -.\"Stack Smashing Protection (SSP) +.It +Stack Overflow Protection .It Supervisor Mode Memory Protection .It @@ -232,7 +232,81 @@ preventing attacks on the relocation table. Note that this results in a nonstandard Application Binary Interface (ABI), and it is possible that some applications may not function correctly. .\" -.\".Ss Stack Smashing Protection (SSP) +.Ss Stack Overflow Protection +.Fx +supports stack overflow protection using the Stack Smashing Protector +.Pq SSP +compiler feature. +In userland, SSP adds a per-process randomized canary at the end of every stack +frame which is checked for corruption upon return from the function. +In the kernel, a single randomized canary is used globally except on aarch64, +which has a +.Dv PERTHREAD_SSP +.Xr config 8 +option to enable per-thread randomized canaries. +If stack corruption is detected, then the process aborts to avoid potentially +malicious execution as a result of the corruption. +SSP may be enabled or disabled when building +.Fx +base with the +.Xr src.conf 5 +SSP knob. +.Pp +When +.Va WITH_SSP +is enabled, which is the default, world is built with the +.Fl fstack-protector-strong +compiler option. +The kernel is built with the +.Fl fstack-protector +option. +.Pp +In addition to SSP, a +.Dq FORTIFY_SOURCE +implementation is supported up to level 2 by defining +.Va _FORTIFY_SOURCE +to +.Dv 1 +or +.Dv 2 +before including any +.Fx +headers. +.Fx +world builds can set +.Va FORTIFY_SOURCE +to provide a default value for +.Va _FORTIFY_SOURCE . +When enabled, +.Dq FORTIFY_SOURCE +enables extra bounds checking in various functions that accept buffers to be +written into. +These functions currently have extra bounds checking support: +.Bl -column -offset indent "snprintf" "memmove" "strncpy" "vsnprintf" "readlink" +.It bcopy Ta bzero Ta fgets Ta getcwd Ta gets +.It memcpy Ta memmove Ta memset Ta read Ta readlink +.It snprintf Ta sprintf Ta stpcpy Ta stpncpy Ta strcat +.It strcpy Ta strncat Ta strncpy Ta vsnprintf Ta vsprintf +.El +.Pp +.Dq FORTIFY_SOURCE +requires compiler support from +.Xr clang 1 +or +.Xr gcc 1 , +which provide the +.Xr __builtin_object_size 3 +function that is used to determine the bounds of an object. +This feature works best at optimization levels +.Fl O1 +and above, as some object sizes may be less obvious without some data that the +compiler would collect in an optimization pass. +.Pp +Similar to SSP, violating the bounds of an object will cause the program to +abort in an effort to avoid malicious execution. +This effectively provides finer-grained protection than SSP for some class of +function and system calls, along with some protection for buffers allocated as +part of the program data. .\" .Ss Supervisor mode memory protection Certain processors include features that prevent unintended access to memory diff --git a/share/man/man7/security.7 b/share/man/man7/security.7 index 2e690e35d534..7cb906304861 100644 --- a/share/man/man7/security.7 +++ b/share/man/man7/security.7 @@ -26,13 +26,21 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd October 5, 2023 +.Dd June 1, 2024 .Dt SECURITY 7 .Os .Sh NAME .Nm security .Nd introduction to security under FreeBSD .Sh DESCRIPTION +See +.Xr mitigations 7 +for a description of vulnerability mitigations in +.Fx . +This man page documents other +.Fx +security related topics. +.Pp Security is a function that begins and ends with the system administrator. While all .Bx @@ -939,81 +947,6 @@ option that SSH allows in its .Pa authorized_keys file to make the key only usable to entities logging in from specific machines. -.Sh STACK OVERFLOW PROTECTION -.Fx -supports stack overflow protection using the Stack Smashing Protector -.Pq SSP -compiler feature. -In userland, SSP adds a per-process randomized canary at the end of every stack -frame which is checked for corruption upon return from the function. -In the kernel, a single randomized canary is used globally except on aarch64, -which has a -.Dv PERTHREAD_SSP -.Xr config 8 -option to enable per-thread randomized canaries. -If stack corruption is detected, then the process aborts to avoid potentially -malicious execution as a result of the corruption. -SSP may be enabled or disabled when building -.Fx -base with the -.Xr src.conf 5 -SSP knob. -.Pp -When -.Va WITH_SSP -is enabled, which is the default, world is built with the -.Fl fstack-protector-strong -compiler option. -The kernel is built with the -.Fl fstack-protector -option. -.Pp -In addition to SSP, a -.Dq FORTIFY_SOURCE -implementation is supported up to level 2 by defining -.Va _FORTIFY_SOURCE -to -.Dv 1 -or -.Dv 2 -before including any -.Fx -headers. -.Fx -world builds can set -.Va FORTIFY_SOURCE -to provide a default value for -.Va _FORTIFY_SOURCE . -When enabled, -.Dq FORTIFY_SOURCE -enables extra bounds checking in various functions that accept buffers to be -written into. -These functions currently have extra bounds checking support: -.Bl -column -offset indent "snprintf" "memmove" "strncpy" "vsnprintf" "readlink" -.It bcopy Ta bzero Ta fgets Ta getcwd Ta gets -.It memcpy Ta memmove Ta memset Ta read Ta readlink -.It snprintf Ta sprintf Ta stpcpy Ta stpncpy Ta strcat -.It strcpy Ta strncat Ta strncpy Ta vsnprintf Ta vsprintf -.El -.Pp -.Dq FORTIFY_SOURCE -requires compiler support from -.Xr clang 1 -or -.Xr gcc 1 , -which provide the -.Xr __builtin_object_size 3 -function that is used to determine the bounds of an object. -This feature works best at optimization levels -.Fl O1 -and above, as some object sizes may be less obvious without some data that the -compiler would collect in an optimization pass. -.Pp -Similar to SSP, violating the bounds of an object will cause the program to -abort in an effort to avoid malicious execution. -This effectively provides finer-grained protection than SSP for some class of -function and system calls, along with some protection for buffers allocated as -part of the program data. .Sh KNOBS AND TWEAKS .Fx provides several knobs and tweak handles that make some introspection From nobody Sat Jun 1 15:18: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 4Vs3XP65h4z5N2fg; Sat, 01 Jun 2024 15:18: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 4Vs3XP5Mtqz4Lgb; Sat, 1 Jun 2024 15:18:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717255093; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VBbGTPsRhxcmWvnmV+hDoQwWgo/iPuw3SGvSwVFNT+Q=; b=svqeDXqrp/5O3q7Pgl5pSvaaqmaJC71PdL9AC3I4pIGcr9WnT4ORqd1VeNw5kaj1hWQnbE lVZykFEmBdpqVXdF8X0UlwpzmLoegDk08Qwl8mGxmoSQUjB/ThoHyo1O0ySEph7UV7EYLG J4saFxLAzxp8NAjaayJRWZjvEHOY5MFbW4ive46EoLiWToOtHj4endsFk1HHtYURVKRT0F GVNZsQy7M3aBMZaQuLNy5ZgSyA2Dm5h6yGWdakbuiSUDoz6bdWYUDv6Nl31pw0RzNWiMnb sAbJ+Ig4UzRZx3Ok6ZjQiDlrbHvxvCkUhxGF21b5vMWh5vJvFlQn2/IPvZd56Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1717255093; a=rsa-sha256; cv=none; b=xszBObR26UgaQmauPfTHcM1xxesZsD3VCkoW/V7NZ9wGqCgVybyhBwB0t5ibzE7i5Dsxog 5mNm3AXTEU3ZKHAg90oioRIRWdAlcYKM85AqpsMkjd2cga7HDe/MMx6h1Mf9UPx+IiMEjt D137udJq5sQWMrS+X869Ff7+ja4rQs4eyD5kKj9hhmd9Rd3kCJWPSPrXNMnIKQRbJZn69S 9BiStLdf6YHwhILJj/62yTUp+UqkvtRVHSsm9Hu0kl8+WBlaS2hNEEwada9UAkykiWfphl PWulRbvP/dtC81TPFMgIxkVG2fUrcrmYlrSTFmBKyjcgdbHP5WwuuZk3Xwdtqw== 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=1717255093; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VBbGTPsRhxcmWvnmV+hDoQwWgo/iPuw3SGvSwVFNT+Q=; b=PMcjmk1Y3epcqqzhN5iSYT2msLGSq884M02vbNCA1dwjS082+7kXXI/fhIZd35A7yBY1P8 k/BW/rusAayCO3JWuWScEpgqb9K3EaHgUNzRRSaz+LSyH3XNPiCX/p/Wkh3nO5rexqMr41 2NhrRdqdA9ZxZ2p01SsoRMx2dD7JtZQHU2cNsqLfINAVKmaE28pOiNmoTN1HcnDfAe73jJ HugWKH/pZICtGFr2XtHic9JcWfrNs3328y/GOApaczObFWKDzvVlZxfrP9Vk9gpM5kcAfZ jDh4q+qpa3oJZTk1uYPhwd+wr/MeHfDedX+/Ryl5TIVmwUsrgoO4Ci6Le5mD0Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Vs3XP4zkTz1C3x; Sat, 1 Jun 2024 15:18: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 451FID41062955; Sat, 1 Jun 2024 15:18:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 451FIDQD062953; Sat, 1 Jun 2024 15:18:13 GMT (envelope-from git) Date: Sat, 1 Jun 2024 15:18:13 GMT Message-Id: <202406011518.451FIDQD062953@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: 2468e20df43f - main - boot/zfs: Sync the definition of dsl_dataset_phys with OpenZFS List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: 2468e20df43fdc8e5042e45a42235cf00e65e4b1 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=2468e20df43fdc8e5042e45a42235cf00e65e4b1 commit 2468e20df43fdc8e5042e45a42235cf00e65e4b1 Author: Mark Johnston AuthorDate: 2024-05-04 16:12:21 +0000 Commit: Mark Johnston CommitDate: 2024-06-01 15:12:12 +0000 boot/zfs: Sync the definition of dsl_dataset_phys with OpenZFS No functional change intended. MFC after: 1 week --- sys/cddl/boot/zfs/zfsimpl.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sys/cddl/boot/zfs/zfsimpl.h b/sys/cddl/boot/zfs/zfsimpl.h index fcaf407bcb75..0ce38384abbf 100644 --- a/sys/cddl/boot/zfs/zfsimpl.h +++ b/sys/cddl/boot/zfs/zfsimpl.h @@ -1465,7 +1465,10 @@ typedef struct dsl_dataset_phys { uint64_t ds_guid; uint64_t ds_flags; blkptr_t ds_bp; - uint64_t ds_pad[8]; /* pad out to 320 bytes for good measure */ + uint64_t ds_next_clones_obj; /* DMU_OT_DSL_CLONES */ + uint64_t ds_props_obj; /* DMU_OT_DSL_PROPS for snaps */ + uint64_t ds_userrefs_obj; /* DMU_OT_USERREFS */ + uint64_t ds_pad[5]; /* pad out to 320 bytes for good measure */ } dsl_dataset_phys_t; typedef struct dsl_deadlist_phys { From nobody Sat Jun 1 15:18: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 4Vs3XR025Hz5N2x1; Sat, 01 Jun 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 4Vs3XQ6N6zz4LMS; Sat, 1 Jun 2024 15:18:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717255094; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FJhzyeAFfG9VNZQhKhwrefKK1b7d4CR3MusGQBzfXkE=; b=xK6icVv2hjxrSe6QHxjqwFAF/ltQM1AuRix4aBMKwbbGEow2wLynpbFNqhKWtjfmAMsAIN Lso2ozCsCUKUGUDadnLPTdB55d+Q1GxPYAxxThX2pa4On1X8a/c50XYGImKGZRMyvwbr2J n8ptrLcJEA4NwUsPccbiNwB7UAImQRhqjEQITj2HvPTi+fZKrrlLgM4BlZ0vnR0+aKGGB5 YHd44SA3Mje9CXSgAipSnqZIvCIiFWr8H0+R0R3wao5aAgLhFQ/o194uzkTakBs5Cip9Xp hofALNJHJTj4BbP28/uvIIbYC2XZAlO2Cc6LGcwz+9JXkC92m5mPN76COjBgMw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1717255094; a=rsa-sha256; cv=none; b=sLOf1HvYPOwOWBc7MMt8wtBxeBiMczsS1QbDoUxPPFdWJaWO+iQRa4KeIzNr+7Gd8yTMcY hTsgsNI6mdE9tOXbWSCSoVjbkNWcGYo8tye5G6l8xEJ3N7zkDmRcEjlyURNAQEU6lRNalT Y09LFGLLxCbU7/X9SBA91Rva3ONCTrW6wnrcs5ew9am1dfpBGf+5Km7g4ZYYhUt1V36oUX vAZlxdVhjU82Wz9yICjEEKuQ5FUkEXOg43QybT4ADwm4ze86HWTxwH8eHegQReuSleR7kZ qVr2LCG4syneGjK4kbkmx/+jwD1bN+fMuj4C8ugCGzoShEPq5Z65zfQbpSXIZA== 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=1717255094; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FJhzyeAFfG9VNZQhKhwrefKK1b7d4CR3MusGQBzfXkE=; b=A/1GEMgLZiDWYxGmQIVhWTArLqJuMnmVOWfUPQ53Fdl/yKSot82iv/oe2SA0yl/KmMbz6z OW8TLveixJubRJA8y4Qfm8mnXa1j44ZY95/0SE/qdRqVjtzGYLXbNrngIdoJqJgylAPyE5 RQvRVvtqS8L5tOcjAsI5BChBIgI0Oa2C9Fs+QSl9qvrdOETOse8kqtGkL/MSJ02Vl3AHVA g6aEdJGQhSZxqwXdww8ksLBHCYZeOjIYe4beAM6bz9zvGgvCw/8F++34Iggzjvuf8yKfI3 nfjiKFa0H20HVjRw92TJb8vpowvTkw8OYrTH2wh9PZwrGntceJBlbz9jhqoqPA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Vs3XQ5zj9z1CGM; Sat, 1 Jun 2024 15:18:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 451FIEHT063016; Sat, 1 Jun 2024 15:18:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 451FIEeY063013; Sat, 1 Jun 2024 15:18:14 GMT (envelope-from git) Date: Sat, 1 Jun 2024 15:18:14 GMT Message-Id: <202406011518.451FIEeY063013@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: be2f92a96b96 - main - makefs/zfs: Add a helper function for adding ZAP entries List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: be2f92a96b96149fccb4ec9e9f9c42ee29b455e6 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=be2f92a96b96149fccb4ec9e9f9c42ee29b455e6 commit be2f92a96b96149fccb4ec9e9f9c42ee29b455e6 Author: Mark Johnston AuthorDate: 2024-06-01 15:16:18 +0000 Commit: Mark Johnston CommitDate: 2024-06-01 15:16:18 +0000 makefs/zfs: Add a helper function for adding ZAP entries Some ZAPs are used to represent sets, in which keys and values are the same. Add a helper function for this case. No functional change intended. MFC after: 1 week --- usr.sbin/makefs/zfs/dsl.c | 4 +--- usr.sbin/makefs/zfs/zap.c | 9 +++++++++ usr.sbin/makefs/zfs/zfs.h | 1 + 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/usr.sbin/makefs/zfs/dsl.c b/usr.sbin/makefs/zfs/dsl.c index 93083f286e81..f7264b9d2ca7 100644 --- a/usr.sbin/makefs/zfs/dsl.c +++ b/usr.sbin/makefs/zfs/dsl.c @@ -490,7 +490,6 @@ dsl_dir_finalize_props(zfs_dsl_dir_t *dir) static void dsl_dir_finalize(zfs_opt_t *zfs, zfs_dsl_dir_t *dir, void *arg __unused) { - char key[32]; zfs_dsl_dir_t *cdir; dnode_phys_t *snapnames; zfs_dsl_dataset_t *headds; @@ -519,8 +518,7 @@ dsl_dir_finalize(zfs_opt_t *zfs, zfs_dsl_dir_t *dir, void *arg __unused) objset_root_blkptr_copy(os, &headds->phys->ds_bp); zfs->snapds->phys->ds_num_children++; - snprintf(key, sizeof(key), "%jx", (uintmax_t)headds->dsid); - zap_add_uint64(zfs->cloneszap, key, headds->dsid); + zap_add_uint64_self(zfs->cloneszap, headds->dsid); bytes = objset_space(os); headds->phys->ds_used_bytes = bytes; diff --git a/usr.sbin/makefs/zfs/zap.c b/usr.sbin/makefs/zfs/zap.c index 2437ee3bfd1e..d01f7527adf9 100644 --- a/usr.sbin/makefs/zfs/zap.c +++ b/usr.sbin/makefs/zfs/zap.c @@ -166,6 +166,15 @@ zap_add_uint64(zfs_zap_t *zap, const char *name, uint64_t val) zap_add(zap, name, sizeof(uint64_t), 1, (uint8_t *)&val); } +void +zap_add_uint64_self(zfs_zap_t *zap, uint64_t val) +{ + char name[32]; + + snprintf(name, sizeof(name), "%jx", (uintmax_t)val); + zap_add(zap, name, sizeof(uint64_t), 1, (uint8_t *)&val); +} + void zap_add_string(zfs_zap_t *zap, const char *name, const char *val) { diff --git a/usr.sbin/makefs/zfs/zfs.h b/usr.sbin/makefs/zfs/zfs.h index 9af090b14912..ff94c270bbf6 100644 --- a/usr.sbin/makefs/zfs/zfs.h +++ b/usr.sbin/makefs/zfs/zfs.h @@ -159,6 +159,7 @@ void vdev_fini(zfs_opt_t *zfs); zfs_zap_t *zap_alloc(zfs_objset_t *, dnode_phys_t *); void zap_add(zfs_zap_t *, const char *, size_t, size_t, const uint8_t *); void zap_add_uint64(zfs_zap_t *, const char *, uint64_t); +void zap_add_uint64_self(zfs_zap_t *, uint64_t); void zap_add_string(zfs_zap_t *, const char *, const char *); bool zap_entry_exists(zfs_zap_t *, const char *); void zap_write(zfs_opt_t *, zfs_zap_t *); From nobody Sat Jun 1 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 4Vs3XS1j2gz5N31s; Sat, 01 Jun 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 4Vs3XS0LW8z4Lgd; Sat, 1 Jun 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=1717255096; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=l26+awNYMIQKFIi2TzmvpnfBh/pcuE9lYA3CB5qxUZY=; b=dPZ8/i+MZPVJdlh85pz5CEoS9vsd1qDRK3/fcwSAtfeRLWMwkZuoQH19Qa4eg94wbfoY/0 fsW0E1vVNxX7zcx3Sj5oQakiizc2rxLPo/gW9QrQyOswb/zc2IwEobX0umTrOZCdD9YOXl ciMrxH25YMC9wzcb0FyLg4n6hPET+1+YX/xpiyemo+CYsLIxkl/QjZiqjNKrALJmho2ezV HJrUFxT4CO5HC/S+IIweGjuEI4On+iZZ6Z/OgsC2ZldD94mKEMXcckdclOWeqI97pXXqRl 7j1Ywy5tZy79m5plU9egHuAZfQZ8UvXCPU9pKfUtfkJT1KxADHmtmp6+WRCOQQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1717255096; a=rsa-sha256; cv=none; b=Y/cGTqSVDOGJ7QFmwo0Tq0CAxV0v7HoJA6wXDpS495WaN38zAaccUc5Zzmr8CaMF3/8QFy ucMrcSlkwD4BZXXGh9zjYpw8OAxaYi7TK2/5/fHCNRUgFuVXQYGVflDiCYbQngLwNlTOmw LpDYyJTIw0+oTN5k6wrmS4YZ69dz211JVn7H6y8+LFXPVmp0kWoikM6F38SrQxpcfeHhQ1 GG+cN8VL8pcVYMESJ9AIOEcLqpzGydBgudyz8vn81hKLIMSCWSdLTHYoSC5Exj/k7f9Moj n1T5TPATGTCPkQiHnsiaRaJh+DVVgWWMJ6JcGxuDlCJtUAjSrbEXAMoOCwZj+g== 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=1717255096; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=l26+awNYMIQKFIi2TzmvpnfBh/pcuE9lYA3CB5qxUZY=; b=Aei1UGQPSDgjpRbEYLAz5hR6jshyxP1BoiyZzhLKCZ+azbtS34+e+cG57O2CsM4dVFUYcW PKPtYEUzJCiG6BT23xAuVHRGTCZy10ZOcH7D5UDJjiuowidbaW4Me1BLAgMBZDMYgsaTc/ 56hfhucrv95S87anytKeS4cYPrvT8sJanSeViOu9/jHJvf1iExc2OkuTLmU4Ri2gs2g5d1 6PkQW3BNNIdM2/+GYVjA61IV4o2I7hDcDL05Tw2fZEUhatemsgb7OYibP7ActGAHNELpTI +y34LKqDL6kUjIp4c/itpv3rM0/6MLJdhRSj5EOxkPtvd1ZJ/z6a9QWlkxTv0Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Vs3XR71lbz1C1y; Sat, 1 Jun 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 451FIFvn063064; Sat, 1 Jun 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 451FIFuF063061; Sat, 1 Jun 2024 15:18:15 GMT (envelope-from git) Date: Sat, 1 Jun 2024 15:18:15 GMT Message-Id: <202406011518.451FIFuF063061@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: 4bddff0833d3 - main - libdtrace: Work around a warning from flex List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: 4bddff0833d3efee77a099b3ef447fbae1e63d21 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=4bddff0833d3efee77a099b3ef447fbae1e63d21 commit 4bddff0833d3efee77a099b3ef447fbae1e63d21 Author: Mark Johnston AuthorDate: 2024-06-01 15:16:26 +0000 Commit: Mark Johnston CommitDate: 2024-06-01 15:16:26 +0000 libdtrace: Work around a warning from flex When compiling dt_lex.l, flex produces warnings of the form: dt_lex.l:413: warning, trailing context made variable due to preceding '|' action dt_lex.l:412: warning, dangerous trailing context dt_lex.l:412: warning, dangerous trailing context Here, trailing context refers to the use of "$", which expands to "/\n". The meaning behind these warnings is described in the first two paragraphs of the flex manual's DEFICIENCIES/BUGS section: Some trailing context patterns cannot be properly matched and generate warning messages ("dangerous trailing context"). These are patterns where the ending of the first part of the rule matches the beginning of the second part, such as "zx*/xy*", where the 'x*' matches the 'x' at the beginning of the trailing context. (Note that the POSIX draft states that the text matched by such patterns is undefined.) For some trailing context rules, parts which are actually fixed-length are not recognized as such, leading to the above mentioned performance loss. In particular, parts using '|' or {n} (such as "foo{3}") are always considered variable-length. Here, the warnings appear to be bogus in this case. The lexer has no problem matching either of the referenced patterns, e.g., printf("foobar or # 1 "asdfasdf Introduce a small amount of code duplication to silence the warning. MFC after: 2 weeks --- cddl/contrib/opensolaris/lib/libdtrace/common/dt_lex.l | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cddl/contrib/opensolaris/lib/libdtrace/common/dt_lex.l b/cddl/contrib/opensolaris/lib/libdtrace/common/dt_lex.l index d50369bb57c9..756a48b9c45f 100644 --- a/cddl/contrib/opensolaris/lib/libdtrace/common/dt_lex.l +++ b/cddl/contrib/opensolaris/lib/libdtrace/common/dt_lex.l @@ -407,7 +407,7 @@ if (yypcb->pcb_token != 0) { {RGX_FP} yyerror("floating-point constants are not permitted\n"); -\"{RGX_STR}$ | +\"{RGX_STR}$ xyerror(D_STR_NL, "newline encountered in string literal"); \"{RGX_STR}$ xyerror(D_STR_NL, "newline encountered in string literal"); \"{RGX_STR}\" | From nobody Sat Jun 1 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 4Vs3XT4Lt4z5N34T; Sat, 01 Jun 2024 15:18:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Vs3XT1fHvz4LfX; Sat, 1 Jun 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=1717255097; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=F5MSa33vxGWjRtD4Qh3zJglC5MUDtCr1HrsORntVZS4=; b=S3FUoj8XZk+k/VsHdq35XdJVrEsV11jkT4kZOrWRN9CjxiX0I8qTPFrzg5aceJkKGVX8iC a3X7fPlIc91QNC6bU+xUzI9JblB/6FihAAhXMNzkBuIEaosIDrkuynjAUCSbIArcqngTf6 jwOY7tCsGVFStypSdZjGYo7KhZq6OnBgWWwy/74KO+xff20vk7XYEegxF3SIvOj2KwWYGu XPHYzKUzTPf8aygOFfxtD29LaWwR2yBac/zC8aAymD2sf8VqUTcNTNArm1OpXWge0Pf7av vpZSRXXkS2SzH1JVydxqCbbzEnDCAwEfSe27xj92RoV3DER6AhmteFhFkdpnTQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1717255097; a=rsa-sha256; cv=none; b=hXHlv1squxiDdqgl1v7EXA5HqBhIOUj02cQ/RDeZ2RyWFyX6YAjAIq4DueWcIC5Uvrrw7V eI+rdnfw1vcip4Dj9MzqZLmNyTKFcVQc6q0jxvjpbG627g5VQE4hfM7okGuQ5pkJuWwKyM Ulah0PjIMivpuCWh4YJ2+0uZpcZTuyiS6UjK+5IP6rz8rKb3gqi79U7hsahdBIAI/Ay+Kr FiVtykX4RvxDxf0kB0vvxW194IlvphpZA9f1qHfsOvNbzVUT57YyE7L3sMK0lAO+V+5Ksj MG8nxnEWYEvdDiqiA6jyCJE8zKoESAJCxzHQrn085Fk+E6W5zwcMsMkvR66QIA== 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=1717255097; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=F5MSa33vxGWjRtD4Qh3zJglC5MUDtCr1HrsORntVZS4=; b=oyXn14eNHF+RXqN1pB5xmg9YpkCF602XkmimPAtdF+BstLI5spv8jmp5oE0BbeIapgBaG5 11X0Z9ly4fqh8Ea+VY6GNjrj1DM0h8s4+XbKbXsEBQDYITHf6w3r1W7XvLxhnYmxh3lt5X UnLaxYGej5flhu41CIfiMeCiZWX5f9E0QLn3YhXujeG60teIsXTMfNT3aLheqFp1YkMJlX 7sLnPRW2TdWUwaSqXslD9Qs0Szk3MYxRUqQJ07lZS73ex3ft2g9vldcVVRkfArssKnDdA0 HH/Pq8AqA1/TOw0Tey+eoed+TfhbA3xPZHY9zI7Yy9LGT2sxYao4T55F4Xpk1Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Vs3XT0z7Jz1C20; Sat, 1 Jun 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 451FIHDK063118; Sat, 1 Jun 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 451FIHkr063115; Sat, 1 Jun 2024 15:18:17 GMT (envelope-from git) Date: Sat, 1 Jun 2024 15:18:17 GMT Message-Id: <202406011518.451FIHkr063115@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: cb6b5e8ab9cf - main - dtrace tests: Fix loading of the test kernel 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: cb6b5e8ab9cfe3938855826fa3de0f58dacd364e Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=cb6b5e8ab9cfe3938855826fa3de0f58dacd364e commit cb6b5e8ab9cfe3938855826fa3de0f58dacd364e Author: Mark Johnston AuthorDate: 2024-06-01 15:16:33 +0000 Commit: Mark Johnston CommitDate: 2024-06-01 15:16:33 +0000 dtrace tests: Fix loading of the test kernel module The old way is racy and can cause two instances, running in parallel, to attempt to load dtrace_test, and only one will succeed. This caused errors when running dtrace tests in parallel. MFC after: 1 week --- cddl/usr.sbin/dtrace/tests/tools/dtest.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cddl/usr.sbin/dtrace/tests/tools/dtest.sh b/cddl/usr.sbin/dtrace/tests/tools/dtest.sh index d2f3dc4ed8df..a6634bea43a6 100755 --- a/cddl/usr.sbin/dtrace/tests/tools/dtest.sh +++ b/cddl/usr.sbin/dtrace/tests/tools/dtest.sh @@ -100,7 +100,7 @@ readonly STDOUT=$(mktemp) readonly TFILE=$(basename $1) readonly EXOUT=${TFILE}.out -kldstat -q -m dtrace_test || kldload dtrace_test +kldload -n dtrace_test cd $(dirname $1) runtest RESULT=$? From nobody Sat Jun 1 15:18: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 4Vs3XW4M18z5N2ty; Sat, 01 Jun 2024 15:18: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 4Vs3XV2Jznz4Lm2; Sat, 1 Jun 2024 15:18:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717255098; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3+bqGlvxeH9qTCDyAfS6OqJN/55r38fykImQSFmJGic=; b=GugmitfRWOyG9YKDEaEGSC78B9NeyZl/tqHFsFonZlewpPxVrd79032P17Q0aNX+nq+FS2 ws+XksqfMvLBgKw5nlzklZKPjLkXv1Hae2ZfG6rt6ynxLyiiTs90yDqRTJMv6KBGIxDrL0 w3IGyZPdPr2qN/5Nkv2GW3zkUmc5kt0kSxc/3YBT/CAGcWa3gP/pGylrN8/CSD8jm54OIP 9NA4ZS+eB0HpDeHjF9m8EsWl7PQ4crqT4SgOvhJ7PYsIT9ubclVEjJzzavWaWyKjGO9jOd vtca/ENe7vmwgsx78zIjSVRR+pF2gPTcUOyUug51e95UORTW5QNonFCw8M6tSQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1717255098; a=rsa-sha256; cv=none; b=Hufz/wbHkc2Mo5yNxlhKxlTBdAEdXO8HVR4wGIS74+YJjb9shcKPg01X504KYACiRVmGgx Yxigxh3wkqzQSAKoqn38dTRo4ZAfD/hdizlONzgux8swKHEvutLW9RySTShUa5NJfp9HA9 L4PTePWTG1IRG/xVg4nXYxmkgBXq5QJFqAZkZki2JjgGz2m4g/KIXZAJyYaQEuWhgrSrqO OjezWLDGvWjHpMaLDMlxrr6NmcTnzekC4y1oJOVReHL05l4Wgc70u9HLy2towZlu4EHjZ7 VeW5AsSH37V+/P9Yxr+ANTpH+mMJv6vqn2H8TEnlXelT43JsNNj2YlIHMy9IjQ== 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=1717255098; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3+bqGlvxeH9qTCDyAfS6OqJN/55r38fykImQSFmJGic=; b=f7Ta1O56Vdlz3cuDFpIjTbxtIvdzwBDVS8GnE3KlZQRHEEh+f7FhrI5GGkW7OElc79CuO6 O5T8XpytE9K1w1GutDD+6YrwH1tQwSBlyi2jpWtoIRs6ZdpxvOGI0veRcmg9EvnSfY20N3 wYUfjJWlykcP3trkG1/5ZtnceI/QmK0UHR8wBQHYiW+nrlCMxJHaqHJJHl5yqfi0rewbL3 Hr9MKSH5IgTpwvsiFpN22+N6mj+nIpTEZv/vm0H3LtZtqA/PoQrS6UZ44wXDU5tyjp2Tdg z69yX1WlrWjuSqWdF7jWNIflyt7pfjq7AEMLK8C0+yRz4GY/l+TtKM7dDQXjAA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Vs3XV1plZz1ByZ; Sat, 1 Jun 2024 15:18: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 451FIIkY063166; Sat, 1 Jun 2024 15:18:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 451FIIPi063163; Sat, 1 Jun 2024 15:18:18 GMT (envelope-from git) Date: Sat, 1 Jun 2024 15:18:18 GMT Message-Id: <202406011518.451FIIPi063163@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: 397e83df75e0 - main - dtrace tests: Regenerate makefiles after commit d0b2dbfa0ecf List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: 397e83df75e0fcd0d3fcb95ae4d794cb7600fc89 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=397e83df75e0fcd0d3fcb95ae4d794cb7600fc89 commit 397e83df75e0fcd0d3fcb95ae4d794cb7600fc89 Author: Mark Johnston AuthorDate: 2024-06-01 15:16:39 +0000 Commit: Mark Johnston CommitDate: 2024-06-01 15:16:39 +0000 dtrace tests: Regenerate makefiles after commit d0b2dbfa0ecf --- cddl/usr.sbin/dtrace/tests/amd64/arrays/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/aggs/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/arithmetic/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/arrays/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/assocs/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/begin/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/bitfields/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/buffering/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/builtinvar/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/cg/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/clauses/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/cpc/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/decls/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/docsExamples/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/drops/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/dtraceUtil/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/end/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/enum/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/env/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/error/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/exit/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/fbtprovider/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/funcs/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/grammar/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/include/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/inline/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/io/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/ip/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/java_api/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/json/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/kinst/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/lexer/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/llquantize/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/mdb/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/mib/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/misc/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/multiaggs/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/nfs/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/offsetof/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/operators/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/pid/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/plockstat/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/pointers/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/pragma/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/predicates/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/preprocessor/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/print/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/printa/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/printf/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/privs/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/probes/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/proc/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/profile-n/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/providers/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/raise/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/rates/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/safety/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/scalars/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/sched/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/scripting/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/sdt/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/sizeof/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/speculation/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/stability/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/stack/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/stackdepth/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/stop/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/strlen/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/strtoll/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/struct/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/sugar/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/syscall/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/sysevent/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/tick-n/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/trace/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/tracemem/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/translators/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/typedef/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/types/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/uctf/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/union/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/usdt/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/ustack/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/vars/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/version/Makefile | 1 - cddl/usr.sbin/dtrace/tests/i386/arrays/Makefile | 1 - cddl/usr.sbin/dtrace/tests/i386/funcs/Makefile | 1 - cddl/usr.sbin/dtrace/tests/i386/pid/Makefile | 1 - cddl/usr.sbin/dtrace/tests/i386/ustack/Makefile | 1 - 89 files changed, 89 deletions(-) diff --git a/cddl/usr.sbin/dtrace/tests/amd64/arrays/Makefile b/cddl/usr.sbin/dtrace/tests/amd64/arrays/Makefile index 60d6cdfd1f9f..d06cfb032f58 100644 --- a/cddl/usr.sbin/dtrace/tests/amd64/arrays/Makefile +++ b/cddl/usr.sbin/dtrace/tests/amd64/arrays/Makefile @@ -1,4 +1,3 @@ - # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # diff --git a/cddl/usr.sbin/dtrace/tests/common/aggs/Makefile b/cddl/usr.sbin/dtrace/tests/common/aggs/Makefile index a3c7736f20f7..2ab9c05e2f80 100644 --- a/cddl/usr.sbin/dtrace/tests/common/aggs/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/aggs/Makefile @@ -1,4 +1,3 @@ - # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # diff --git a/cddl/usr.sbin/dtrace/tests/common/arithmetic/Makefile b/cddl/usr.sbin/dtrace/tests/common/arithmetic/Makefile index d573cb4b06c6..e7b8177f51f9 100644 --- a/cddl/usr.sbin/dtrace/tests/common/arithmetic/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/arithmetic/Makefile @@ -1,4 +1,3 @@ - # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # diff --git a/cddl/usr.sbin/dtrace/tests/common/arrays/Makefile b/cddl/usr.sbin/dtrace/tests/common/arrays/Makefile index 032f47461a92..04f64f07221c 100644 --- a/cddl/usr.sbin/dtrace/tests/common/arrays/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/arrays/Makefile @@ -1,4 +1,3 @@ - # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # diff --git a/cddl/usr.sbin/dtrace/tests/common/assocs/Makefile b/cddl/usr.sbin/dtrace/tests/common/assocs/Makefile index 772b560bb516..faee92dcfe00 100644 --- a/cddl/usr.sbin/dtrace/tests/common/assocs/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/assocs/Makefile @@ -1,4 +1,3 @@ - # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # diff --git a/cddl/usr.sbin/dtrace/tests/common/begin/Makefile b/cddl/usr.sbin/dtrace/tests/common/begin/Makefile index c540a96cfaf4..733f2f73fa19 100644 --- a/cddl/usr.sbin/dtrace/tests/common/begin/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/begin/Makefile @@ -1,4 +1,3 @@ - # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # diff --git a/cddl/usr.sbin/dtrace/tests/common/bitfields/Makefile b/cddl/usr.sbin/dtrace/tests/common/bitfields/Makefile index 2b3499fa092b..dc3637c7fd07 100644 --- a/cddl/usr.sbin/dtrace/tests/common/bitfields/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/bitfields/Makefile @@ -1,4 +1,3 @@ - # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # diff --git a/cddl/usr.sbin/dtrace/tests/common/buffering/Makefile b/cddl/usr.sbin/dtrace/tests/common/buffering/Makefile index 7f6223e3796e..f5e2f40cb1a8 100644 --- a/cddl/usr.sbin/dtrace/tests/common/buffering/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/buffering/Makefile @@ -1,4 +1,3 @@ - # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # diff --git a/cddl/usr.sbin/dtrace/tests/common/builtinvar/Makefile b/cddl/usr.sbin/dtrace/tests/common/builtinvar/Makefile index b0cbc7961e9b..a22dd3ea6d05 100644 --- a/cddl/usr.sbin/dtrace/tests/common/builtinvar/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/builtinvar/Makefile @@ -1,4 +1,3 @@ - # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # diff --git a/cddl/usr.sbin/dtrace/tests/common/cg/Makefile b/cddl/usr.sbin/dtrace/tests/common/cg/Makefile index 104dc2063a8c..68baf9acd33b 100644 --- a/cddl/usr.sbin/dtrace/tests/common/cg/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/cg/Makefile @@ -1,4 +1,3 @@ - # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # diff --git a/cddl/usr.sbin/dtrace/tests/common/clauses/Makefile b/cddl/usr.sbin/dtrace/tests/common/clauses/Makefile index ecd84a68928d..f72aa480efba 100644 --- a/cddl/usr.sbin/dtrace/tests/common/clauses/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/clauses/Makefile @@ -1,4 +1,3 @@ - # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # diff --git a/cddl/usr.sbin/dtrace/tests/common/cpc/Makefile b/cddl/usr.sbin/dtrace/tests/common/cpc/Makefile index 75d5bebfaf93..ec489bb094b6 100644 --- a/cddl/usr.sbin/dtrace/tests/common/cpc/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/cpc/Makefile @@ -1,4 +1,3 @@ - # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # diff --git a/cddl/usr.sbin/dtrace/tests/common/decls/Makefile b/cddl/usr.sbin/dtrace/tests/common/decls/Makefile index 1c0800355eff..6b8fb677d8a6 100644 --- a/cddl/usr.sbin/dtrace/tests/common/decls/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/decls/Makefile @@ -1,4 +1,3 @@ - # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # diff --git a/cddl/usr.sbin/dtrace/tests/common/docsExamples/Makefile b/cddl/usr.sbin/dtrace/tests/common/docsExamples/Makefile index 4115176de9af..1dae1ddb11b4 100644 --- a/cddl/usr.sbin/dtrace/tests/common/docsExamples/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/docsExamples/Makefile @@ -1,4 +1,3 @@ - # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # diff --git a/cddl/usr.sbin/dtrace/tests/common/drops/Makefile b/cddl/usr.sbin/dtrace/tests/common/drops/Makefile index b7edb1177a78..87ed77eb0c2d 100644 --- a/cddl/usr.sbin/dtrace/tests/common/drops/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/drops/Makefile @@ -1,4 +1,3 @@ - # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # diff --git a/cddl/usr.sbin/dtrace/tests/common/dtraceUtil/Makefile b/cddl/usr.sbin/dtrace/tests/common/dtraceUtil/Makefile index 6d3815bbc80d..9371ab837a40 100644 --- a/cddl/usr.sbin/dtrace/tests/common/dtraceUtil/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/dtraceUtil/Makefile @@ -1,4 +1,3 @@ - # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # diff --git a/cddl/usr.sbin/dtrace/tests/common/end/Makefile b/cddl/usr.sbin/dtrace/tests/common/end/Makefile index 8bc3ec2c65df..957a2290d250 100644 --- a/cddl/usr.sbin/dtrace/tests/common/end/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/end/Makefile @@ -1,4 +1,3 @@ - # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # diff --git a/cddl/usr.sbin/dtrace/tests/common/enum/Makefile b/cddl/usr.sbin/dtrace/tests/common/enum/Makefile index 463824118757..b83f0251799b 100644 --- a/cddl/usr.sbin/dtrace/tests/common/enum/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/enum/Makefile @@ -1,4 +1,3 @@ - # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # diff --git a/cddl/usr.sbin/dtrace/tests/common/env/Makefile b/cddl/usr.sbin/dtrace/tests/common/env/Makefile index 35eff477d4bb..0d7ee4b975dd 100644 --- a/cddl/usr.sbin/dtrace/tests/common/env/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/env/Makefile @@ -1,4 +1,3 @@ - # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # diff --git a/cddl/usr.sbin/dtrace/tests/common/error/Makefile b/cddl/usr.sbin/dtrace/tests/common/error/Makefile index 372a8968585f..7bf4f38b63bf 100644 --- a/cddl/usr.sbin/dtrace/tests/common/error/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/error/Makefile @@ -1,4 +1,3 @@ - # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # diff --git a/cddl/usr.sbin/dtrace/tests/common/exit/Makefile b/cddl/usr.sbin/dtrace/tests/common/exit/Makefile index ded0777e452b..d58baea479c5 100644 --- a/cddl/usr.sbin/dtrace/tests/common/exit/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/exit/Makefile @@ -1,4 +1,3 @@ - # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # diff --git a/cddl/usr.sbin/dtrace/tests/common/fbtprovider/Makefile b/cddl/usr.sbin/dtrace/tests/common/fbtprovider/Makefile index 4aaf2013d59f..3ca540fd77f1 100644 --- a/cddl/usr.sbin/dtrace/tests/common/fbtprovider/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/fbtprovider/Makefile @@ -1,4 +1,3 @@ - # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # diff --git a/cddl/usr.sbin/dtrace/tests/common/funcs/Makefile b/cddl/usr.sbin/dtrace/tests/common/funcs/Makefile index 2fb59dc91f1d..52bd1fc67ba7 100644 --- a/cddl/usr.sbin/dtrace/tests/common/funcs/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/funcs/Makefile @@ -1,4 +1,3 @@ - # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # diff --git a/cddl/usr.sbin/dtrace/tests/common/grammar/Makefile b/cddl/usr.sbin/dtrace/tests/common/grammar/Makefile index 0e07006bc116..42cad7c69357 100644 --- a/cddl/usr.sbin/dtrace/tests/common/grammar/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/grammar/Makefile @@ -1,4 +1,3 @@ - # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # diff --git a/cddl/usr.sbin/dtrace/tests/common/include/Makefile b/cddl/usr.sbin/dtrace/tests/common/include/Makefile index 6d01872ad48c..5e8a18816dfa 100644 --- a/cddl/usr.sbin/dtrace/tests/common/include/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/include/Makefile @@ -1,4 +1,3 @@ - # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # diff --git a/cddl/usr.sbin/dtrace/tests/common/inline/Makefile b/cddl/usr.sbin/dtrace/tests/common/inline/Makefile index e3ff5a1e9a84..f21a46a7b41a 100644 --- a/cddl/usr.sbin/dtrace/tests/common/inline/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/inline/Makefile @@ -1,4 +1,3 @@ - # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # diff --git a/cddl/usr.sbin/dtrace/tests/common/io/Makefile b/cddl/usr.sbin/dtrace/tests/common/io/Makefile index 58e1d3ed2745..e8af41d187da 100644 --- a/cddl/usr.sbin/dtrace/tests/common/io/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/io/Makefile @@ -1,4 +1,3 @@ - # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # diff --git a/cddl/usr.sbin/dtrace/tests/common/ip/Makefile b/cddl/usr.sbin/dtrace/tests/common/ip/Makefile index 73cc3443d987..e005b43d064d 100644 --- a/cddl/usr.sbin/dtrace/tests/common/ip/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/ip/Makefile @@ -1,4 +1,3 @@ - # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # diff --git a/cddl/usr.sbin/dtrace/tests/common/java_api/Makefile b/cddl/usr.sbin/dtrace/tests/common/java_api/Makefile index 08072d19e0ed..e902c1bc4562 100644 --- a/cddl/usr.sbin/dtrace/tests/common/java_api/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/java_api/Makefile @@ -1,4 +1,3 @@ - # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # diff --git a/cddl/usr.sbin/dtrace/tests/common/json/Makefile b/cddl/usr.sbin/dtrace/tests/common/json/Makefile index c004df07d6ef..e3a0020149c2 100644 --- a/cddl/usr.sbin/dtrace/tests/common/json/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/json/Makefile @@ -1,4 +1,3 @@ - # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # diff --git a/cddl/usr.sbin/dtrace/tests/common/kinst/Makefile b/cddl/usr.sbin/dtrace/tests/common/kinst/Makefile index f33a649010a5..c683a5ce0700 100644 --- a/cddl/usr.sbin/dtrace/tests/common/kinst/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/kinst/Makefile @@ -1,4 +1,3 @@ - # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # diff --git a/cddl/usr.sbin/dtrace/tests/common/lexer/Makefile b/cddl/usr.sbin/dtrace/tests/common/lexer/Makefile index abeb9f04ea5d..8b7ec52c7f1f 100644 --- a/cddl/usr.sbin/dtrace/tests/common/lexer/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/lexer/Makefile @@ -1,4 +1,3 @@ - # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # diff --git a/cddl/usr.sbin/dtrace/tests/common/llquantize/Makefile b/cddl/usr.sbin/dtrace/tests/common/llquantize/Makefile index a73998387cc5..e4bb476f0df7 100644 --- a/cddl/usr.sbin/dtrace/tests/common/llquantize/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/llquantize/Makefile @@ -1,4 +1,3 @@ - # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # diff --git a/cddl/usr.sbin/dtrace/tests/common/mdb/Makefile b/cddl/usr.sbin/dtrace/tests/common/mdb/Makefile index 855582e677d7..be8f66af0193 100644 --- a/cddl/usr.sbin/dtrace/tests/common/mdb/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/mdb/Makefile @@ -1,4 +1,3 @@ - # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # diff --git a/cddl/usr.sbin/dtrace/tests/common/mib/Makefile b/cddl/usr.sbin/dtrace/tests/common/mib/Makefile index 573cc5ec1033..b6d335b03f7e 100644 --- a/cddl/usr.sbin/dtrace/tests/common/mib/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/mib/Makefile @@ -1,4 +1,3 @@ - # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # diff --git a/cddl/usr.sbin/dtrace/tests/common/misc/Makefile b/cddl/usr.sbin/dtrace/tests/common/misc/Makefile index 2bd6eb69a1d2..bc96403cfe22 100644 --- a/cddl/usr.sbin/dtrace/tests/common/misc/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/misc/Makefile @@ -1,4 +1,3 @@ - # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # diff --git a/cddl/usr.sbin/dtrace/tests/common/multiaggs/Makefile b/cddl/usr.sbin/dtrace/tests/common/multiaggs/Makefile index 906d3e4bc4a7..16bb602627bb 100644 --- a/cddl/usr.sbin/dtrace/tests/common/multiaggs/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/multiaggs/Makefile @@ -1,4 +1,3 @@ - # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # diff --git a/cddl/usr.sbin/dtrace/tests/common/nfs/Makefile b/cddl/usr.sbin/dtrace/tests/common/nfs/Makefile index ae820ee08c88..81af106bce7d 100644 --- a/cddl/usr.sbin/dtrace/tests/common/nfs/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/nfs/Makefile @@ -1,4 +1,3 @@ - # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # diff --git a/cddl/usr.sbin/dtrace/tests/common/offsetof/Makefile b/cddl/usr.sbin/dtrace/tests/common/offsetof/Makefile index 6973488a7d28..856f58d0afbd 100644 --- a/cddl/usr.sbin/dtrace/tests/common/offsetof/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/offsetof/Makefile @@ -1,4 +1,3 @@ - # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # diff --git a/cddl/usr.sbin/dtrace/tests/common/operators/Makefile b/cddl/usr.sbin/dtrace/tests/common/operators/Makefile index ccbbe083c13c..6586e026fa0e 100644 --- a/cddl/usr.sbin/dtrace/tests/common/operators/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/operators/Makefile @@ -1,4 +1,3 @@ - # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # diff --git a/cddl/usr.sbin/dtrace/tests/common/pid/Makefile b/cddl/usr.sbin/dtrace/tests/common/pid/Makefile index 0058a1100196..70fc2f3f34e6 100644 --- a/cddl/usr.sbin/dtrace/tests/common/pid/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/pid/Makefile @@ -1,4 +1,3 @@ - # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # diff --git a/cddl/usr.sbin/dtrace/tests/common/plockstat/Makefile b/cddl/usr.sbin/dtrace/tests/common/plockstat/Makefile index ec40ac7ae151..bf927d104601 100644 --- a/cddl/usr.sbin/dtrace/tests/common/plockstat/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/plockstat/Makefile @@ -1,4 +1,3 @@ - # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # diff --git a/cddl/usr.sbin/dtrace/tests/common/pointers/Makefile b/cddl/usr.sbin/dtrace/tests/common/pointers/Makefile index 55921d888df8..cfd83844f53c 100644 --- a/cddl/usr.sbin/dtrace/tests/common/pointers/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/pointers/Makefile @@ -1,4 +1,3 @@ - # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # diff --git a/cddl/usr.sbin/dtrace/tests/common/pragma/Makefile b/cddl/usr.sbin/dtrace/tests/common/pragma/Makefile index b00a28915ea1..008bbeb50dcf 100644 --- a/cddl/usr.sbin/dtrace/tests/common/pragma/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/pragma/Makefile @@ -1,4 +1,3 @@ - # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # diff --git a/cddl/usr.sbin/dtrace/tests/common/predicates/Makefile b/cddl/usr.sbin/dtrace/tests/common/predicates/Makefile index d0a983398dd6..9de4716fdad8 100644 --- a/cddl/usr.sbin/dtrace/tests/common/predicates/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/predicates/Makefile @@ -1,4 +1,3 @@ - # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # diff --git a/cddl/usr.sbin/dtrace/tests/common/preprocessor/Makefile b/cddl/usr.sbin/dtrace/tests/common/preprocessor/Makefile index 11ac3dc1107d..a32410bab1c8 100644 --- a/cddl/usr.sbin/dtrace/tests/common/preprocessor/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/preprocessor/Makefile @@ -1,4 +1,3 @@ - # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # diff --git a/cddl/usr.sbin/dtrace/tests/common/print/Makefile b/cddl/usr.sbin/dtrace/tests/common/print/Makefile index ecd2bee5d677..e072128c6b44 100644 --- a/cddl/usr.sbin/dtrace/tests/common/print/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/print/Makefile @@ -1,4 +1,3 @@ - # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # diff --git a/cddl/usr.sbin/dtrace/tests/common/printa/Makefile b/cddl/usr.sbin/dtrace/tests/common/printa/Makefile index 895c00fc589f..490a1976abe6 100644 --- a/cddl/usr.sbin/dtrace/tests/common/printa/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/printa/Makefile @@ -1,4 +1,3 @@ - # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # diff --git a/cddl/usr.sbin/dtrace/tests/common/printf/Makefile b/cddl/usr.sbin/dtrace/tests/common/printf/Makefile index 97b9c89bc63c..1e4e418adbd2 100644 --- a/cddl/usr.sbin/dtrace/tests/common/printf/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/printf/Makefile @@ -1,4 +1,3 @@ - # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # diff --git a/cddl/usr.sbin/dtrace/tests/common/privs/Makefile b/cddl/usr.sbin/dtrace/tests/common/privs/Makefile index a53c8d87f70f..7c06b13489e5 100644 --- a/cddl/usr.sbin/dtrace/tests/common/privs/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/privs/Makefile @@ -1,4 +1,3 @@ - # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # diff --git a/cddl/usr.sbin/dtrace/tests/common/probes/Makefile b/cddl/usr.sbin/dtrace/tests/common/probes/Makefile index 718afcbbc375..9bc11ba16362 100644 --- a/cddl/usr.sbin/dtrace/tests/common/probes/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/probes/Makefile @@ -1,4 +1,3 @@ - # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # diff --git a/cddl/usr.sbin/dtrace/tests/common/proc/Makefile b/cddl/usr.sbin/dtrace/tests/common/proc/Makefile index 92491ab55acf..6009b0dddd07 100644 --- a/cddl/usr.sbin/dtrace/tests/common/proc/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/proc/Makefile @@ -1,4 +1,3 @@ - # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # diff --git a/cddl/usr.sbin/dtrace/tests/common/profile-n/Makefile b/cddl/usr.sbin/dtrace/tests/common/profile-n/Makefile index 0e5439792b20..84f4706b61ee 100644 --- a/cddl/usr.sbin/dtrace/tests/common/profile-n/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/profile-n/Makefile @@ -1,4 +1,3 @@ - # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # diff --git a/cddl/usr.sbin/dtrace/tests/common/providers/Makefile b/cddl/usr.sbin/dtrace/tests/common/providers/Makefile index 31304c1bea7d..e1c38944e3ff 100644 --- a/cddl/usr.sbin/dtrace/tests/common/providers/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/providers/Makefile @@ -1,4 +1,3 @@ - # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # diff --git a/cddl/usr.sbin/dtrace/tests/common/raise/Makefile b/cddl/usr.sbin/dtrace/tests/common/raise/Makefile index 653d545eb5e0..61de9b115cc1 100644 --- a/cddl/usr.sbin/dtrace/tests/common/raise/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/raise/Makefile @@ -1,4 +1,3 @@ - # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # diff --git a/cddl/usr.sbin/dtrace/tests/common/rates/Makefile b/cddl/usr.sbin/dtrace/tests/common/rates/Makefile index 4710339fe9ac..7cce698dd37c 100644 --- a/cddl/usr.sbin/dtrace/tests/common/rates/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/rates/Makefile @@ -1,4 +1,3 @@ - # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # diff --git a/cddl/usr.sbin/dtrace/tests/common/safety/Makefile b/cddl/usr.sbin/dtrace/tests/common/safety/Makefile index d3ce7c97abec..5d7bd3b0dd77 100644 --- a/cddl/usr.sbin/dtrace/tests/common/safety/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/safety/Makefile @@ -1,4 +1,3 @@ - # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # diff --git a/cddl/usr.sbin/dtrace/tests/common/scalars/Makefile b/cddl/usr.sbin/dtrace/tests/common/scalars/Makefile index 0d78e9b7117f..a1942e1653cd 100644 --- a/cddl/usr.sbin/dtrace/tests/common/scalars/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/scalars/Makefile @@ -1,4 +1,3 @@ - # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # diff --git a/cddl/usr.sbin/dtrace/tests/common/sched/Makefile b/cddl/usr.sbin/dtrace/tests/common/sched/Makefile index 79791b6affb6..abd2a4bdc904 100644 --- a/cddl/usr.sbin/dtrace/tests/common/sched/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/sched/Makefile @@ -1,4 +1,3 @@ - # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # diff --git a/cddl/usr.sbin/dtrace/tests/common/scripting/Makefile b/cddl/usr.sbin/dtrace/tests/common/scripting/Makefile index 200668c94d50..d46b1bb12546 100644 --- a/cddl/usr.sbin/dtrace/tests/common/scripting/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/scripting/Makefile @@ -1,4 +1,3 @@ - # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # diff --git a/cddl/usr.sbin/dtrace/tests/common/sdt/Makefile b/cddl/usr.sbin/dtrace/tests/common/sdt/Makefile index cc856e43924e..fca9f42ddd97 100644 --- a/cddl/usr.sbin/dtrace/tests/common/sdt/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/sdt/Makefile @@ -1,4 +1,3 @@ - # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # diff --git a/cddl/usr.sbin/dtrace/tests/common/sizeof/Makefile b/cddl/usr.sbin/dtrace/tests/common/sizeof/Makefile index 3dc50694e7b7..72238f2b1436 100644 --- a/cddl/usr.sbin/dtrace/tests/common/sizeof/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/sizeof/Makefile @@ -1,4 +1,3 @@ - # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # diff --git a/cddl/usr.sbin/dtrace/tests/common/speculation/Makefile b/cddl/usr.sbin/dtrace/tests/common/speculation/Makefile index 9726906660f9..f39f9772bcc9 100644 --- a/cddl/usr.sbin/dtrace/tests/common/speculation/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/speculation/Makefile @@ -1,4 +1,3 @@ - # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # diff --git a/cddl/usr.sbin/dtrace/tests/common/stability/Makefile b/cddl/usr.sbin/dtrace/tests/common/stability/Makefile index 3eada9ad78ed..5becc2451938 100644 --- a/cddl/usr.sbin/dtrace/tests/common/stability/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/stability/Makefile @@ -1,4 +1,3 @@ - # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # diff --git a/cddl/usr.sbin/dtrace/tests/common/stack/Makefile b/cddl/usr.sbin/dtrace/tests/common/stack/Makefile index 350ab18e8a03..413bc56f57d8 100644 --- a/cddl/usr.sbin/dtrace/tests/common/stack/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/stack/Makefile @@ -1,4 +1,3 @@ - # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # diff --git a/cddl/usr.sbin/dtrace/tests/common/stackdepth/Makefile b/cddl/usr.sbin/dtrace/tests/common/stackdepth/Makefile index 3dc20ffa2f16..2cbdc34d5c35 100644 --- a/cddl/usr.sbin/dtrace/tests/common/stackdepth/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/stackdepth/Makefile @@ -1,4 +1,3 @@ - # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # diff --git a/cddl/usr.sbin/dtrace/tests/common/stop/Makefile b/cddl/usr.sbin/dtrace/tests/common/stop/Makefile index 8583c29bf1a5..eb55979f3449 100644 --- a/cddl/usr.sbin/dtrace/tests/common/stop/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/stop/Makefile @@ -1,4 +1,3 @@ - # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # diff --git a/cddl/usr.sbin/dtrace/tests/common/strlen/Makefile b/cddl/usr.sbin/dtrace/tests/common/strlen/Makefile index 4eea0b538b16..ff61302bf8a5 100644 --- a/cddl/usr.sbin/dtrace/tests/common/strlen/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/strlen/Makefile @@ -1,4 +1,3 @@ - # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # diff --git a/cddl/usr.sbin/dtrace/tests/common/strtoll/Makefile b/cddl/usr.sbin/dtrace/tests/common/strtoll/Makefile index a45315d01e33..80a6fd17082e 100644 --- a/cddl/usr.sbin/dtrace/tests/common/strtoll/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/strtoll/Makefile @@ -1,4 +1,3 @@ - # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # diff --git a/cddl/usr.sbin/dtrace/tests/common/struct/Makefile b/cddl/usr.sbin/dtrace/tests/common/struct/Makefile index e35235dc2b6d..93c2a1cd94c0 100644 --- a/cddl/usr.sbin/dtrace/tests/common/struct/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/struct/Makefile @@ -1,4 +1,3 @@ - # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # diff --git a/cddl/usr.sbin/dtrace/tests/common/sugar/Makefile b/cddl/usr.sbin/dtrace/tests/common/sugar/Makefile index 4c9621e6c3c7..595c05b85fce 100644 --- a/cddl/usr.sbin/dtrace/tests/common/sugar/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/sugar/Makefile @@ -1,4 +1,3 @@ - # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # diff --git a/cddl/usr.sbin/dtrace/tests/common/syscall/Makefile b/cddl/usr.sbin/dtrace/tests/common/syscall/Makefile index 2d3aaf1236cf..e0d8f4d85ec0 100644 --- a/cddl/usr.sbin/dtrace/tests/common/syscall/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/syscall/Makefile @@ -1,4 +1,3 @@ - # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # diff --git a/cddl/usr.sbin/dtrace/tests/common/sysevent/Makefile b/cddl/usr.sbin/dtrace/tests/common/sysevent/Makefile index 2c6b909acfaf..980d8a587a08 100644 --- a/cddl/usr.sbin/dtrace/tests/common/sysevent/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/sysevent/Makefile @@ -1,4 +1,3 @@ - # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # diff --git a/cddl/usr.sbin/dtrace/tests/common/tick-n/Makefile b/cddl/usr.sbin/dtrace/tests/common/tick-n/Makefile index 76e8f4282813..455782bfc823 100644 --- a/cddl/usr.sbin/dtrace/tests/common/tick-n/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/tick-n/Makefile @@ -1,4 +1,3 @@ - # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # diff --git a/cddl/usr.sbin/dtrace/tests/common/trace/Makefile b/cddl/usr.sbin/dtrace/tests/common/trace/Makefile index be7c86bca876..182e460410a5 100644 --- a/cddl/usr.sbin/dtrace/tests/common/trace/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/trace/Makefile @@ -1,4 +1,3 @@ - # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # diff --git a/cddl/usr.sbin/dtrace/tests/common/tracemem/Makefile b/cddl/usr.sbin/dtrace/tests/common/tracemem/Makefile index 3006ec1ff4a5..accb6959b775 100644 --- a/cddl/usr.sbin/dtrace/tests/common/tracemem/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/tracemem/Makefile @@ -1,4 +1,3 @@ - # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # diff --git a/cddl/usr.sbin/dtrace/tests/common/translators/Makefile b/cddl/usr.sbin/dtrace/tests/common/translators/Makefile index 57cedb2cbcce..f0f8f4db8970 100644 --- a/cddl/usr.sbin/dtrace/tests/common/translators/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/translators/Makefile @@ -1,4 +1,3 @@ - # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # diff --git a/cddl/usr.sbin/dtrace/tests/common/typedef/Makefile b/cddl/usr.sbin/dtrace/tests/common/typedef/Makefile index 3bbc8fa3344d..100538f4b867 100644 --- a/cddl/usr.sbin/dtrace/tests/common/typedef/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/typedef/Makefile @@ -1,4 +1,3 @@ - # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # diff --git a/cddl/usr.sbin/dtrace/tests/common/types/Makefile b/cddl/usr.sbin/dtrace/tests/common/types/Makefile index 553037dd91d1..e4a7a2b1479d 100644 --- a/cddl/usr.sbin/dtrace/tests/common/types/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/types/Makefile @@ -1,4 +1,3 @@ - # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # diff --git a/cddl/usr.sbin/dtrace/tests/common/uctf/Makefile b/cddl/usr.sbin/dtrace/tests/common/uctf/Makefile index 0a50173d3a84..4847feccc770 100644 --- a/cddl/usr.sbin/dtrace/tests/common/uctf/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/uctf/Makefile @@ -1,4 +1,3 @@ - # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # diff --git a/cddl/usr.sbin/dtrace/tests/common/union/Makefile b/cddl/usr.sbin/dtrace/tests/common/union/Makefile index 4bb51f899a16..e11f4831e7d9 100644 --- a/cddl/usr.sbin/dtrace/tests/common/union/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/union/Makefile @@ -1,4 +1,3 @@ - # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # diff --git a/cddl/usr.sbin/dtrace/tests/common/usdt/Makefile b/cddl/usr.sbin/dtrace/tests/common/usdt/Makefile index edf3c451e9cf..8717fc68173c 100644 --- a/cddl/usr.sbin/dtrace/tests/common/usdt/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/usdt/Makefile @@ -1,4 +1,3 @@ - # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # diff --git a/cddl/usr.sbin/dtrace/tests/common/ustack/Makefile b/cddl/usr.sbin/dtrace/tests/common/ustack/Makefile index 75931649250b..68a690df76aa 100644 --- a/cddl/usr.sbin/dtrace/tests/common/ustack/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/ustack/Makefile @@ -1,4 +1,3 @@ - # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # diff --git a/cddl/usr.sbin/dtrace/tests/common/vars/Makefile b/cddl/usr.sbin/dtrace/tests/common/vars/Makefile index 29cf09bd1a49..db7f4df5e405 100644 --- a/cddl/usr.sbin/dtrace/tests/common/vars/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/vars/Makefile @@ -1,4 +1,3 @@ - # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # diff --git a/cddl/usr.sbin/dtrace/tests/common/version/Makefile b/cddl/usr.sbin/dtrace/tests/common/version/Makefile index ccce43d023fa..c472ecec588c 100644 --- a/cddl/usr.sbin/dtrace/tests/common/version/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/version/Makefile @@ -1,4 +1,3 @@ - # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # diff --git a/cddl/usr.sbin/dtrace/tests/i386/arrays/Makefile b/cddl/usr.sbin/dtrace/tests/i386/arrays/Makefile index 1cf9fdac093a..d6025751a877 100644 --- a/cddl/usr.sbin/dtrace/tests/i386/arrays/Makefile +++ b/cddl/usr.sbin/dtrace/tests/i386/arrays/Makefile @@ -1,4 +1,3 @@ - # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # diff --git a/cddl/usr.sbin/dtrace/tests/i386/funcs/Makefile b/cddl/usr.sbin/dtrace/tests/i386/funcs/Makefile index 231db7bb146d..1d8fed1849ac 100644 --- a/cddl/usr.sbin/dtrace/tests/i386/funcs/Makefile +++ b/cddl/usr.sbin/dtrace/tests/i386/funcs/Makefile @@ -1,4 +1,3 @@ - # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # diff --git a/cddl/usr.sbin/dtrace/tests/i386/pid/Makefile b/cddl/usr.sbin/dtrace/tests/i386/pid/Makefile index 41f31d287fbb..fac69dae8306 100644 --- a/cddl/usr.sbin/dtrace/tests/i386/pid/Makefile +++ b/cddl/usr.sbin/dtrace/tests/i386/pid/Makefile @@ -1,4 +1,3 @@ - # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # diff --git a/cddl/usr.sbin/dtrace/tests/i386/ustack/Makefile b/cddl/usr.sbin/dtrace/tests/i386/ustack/Makefile index 0df96490d438..e1d274cb17a8 100644 --- a/cddl/usr.sbin/dtrace/tests/i386/ustack/Makefile +++ b/cddl/usr.sbin/dtrace/tests/i386/ustack/Makefile @@ -1,4 +1,3 @@ - # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # From nobody Sat Jun 1 18:41: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 4Vs82X1gj2z5JsX7; Sat, 01 Jun 2024 18:41: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 4Vs82X13V0z4cbh; Sat, 1 Jun 2024 18:41:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717267268; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6PmTtAZacl5OvrxJfeDh4TcBdg8sVmu0pz8vVNg33BI=; b=Ws4Wxcygkj0R5hWSf8s7BT5gr0TRZHyKMqRFzh7CZOjsrg9eLORlxFxPwrWtn/WGd7Y75P mmp5LWe9kPEZw/kxsB06C/05TGF5fnkybcsCfSMVMnngHlw0IJ5MMCuBuw0hHXyke7urHi w4By4oMRusW14+8rfljq45O8nnpRyjyi7ouMpKpZw1cxLKVewYJjeYNM4DpfrIpTsRVCXw 2h/GI3Kq1YAzW/6Mb2QhNaN/sMXBT979krEb4K4+3FJDzB/c1Jwf7nLQUvANHBNNsELeYQ Chs3npLdv+mtUMGgXKcKtXjCI10C0R3iV8aEFeRtL8xL0d3o4kxHarxZlvFZdw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1717267268; a=rsa-sha256; cv=none; b=Cv3wT7lcFmEOHSr75Ao2qEZFX+JQrfc8hhaCMXVKdZYGTQEbJwFify88qHNeMC0wSajCsm LyKL4NFOK4U9AunUE8OEJRlKPMVs2Ua9hodGxgSwFgrHFZmnFnkeEWFah9X+WJ/TrSNWqD 1hvjO6GevlNkbW/r/kCJ/aMUOEvXTOmrnUmmsRjR8ixRN7WrjuiwhMN4UyFKH1S89v4JuS qehZYfz15oBFxCdlAXwKoH2Mkmt2RCjJ61NMpjYXYP1cF7QpIBU/fxUvfZdLR9zk6lGKea jslMQ2yq8TeQztQARp3l+p6dw7zniHGmzgCc2Hg8/6CV1umHGoTdzQfgdUwsSw== 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=1717267268; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6PmTtAZacl5OvrxJfeDh4TcBdg8sVmu0pz8vVNg33BI=; b=tK4cvh1rNgVSJq+hFynym0tYqtblzAOphI+8vtHmc8dkStOFC/axB2ByQm66nqpWx1lXHe dkr8H+1h6DXD54K0XBMPH9WvhWDEcUAkK0Ceq0KXkPaPce4CPvJa2gG3yplQjEQMn+Tj9t Swu/Ex3G1Azcv8qfD4DlzqF77y62Ax+oE56PIQFAZMK0dHe6Uyt13zxIdQwVDH/Ll25ica +/Oe6kHl/viTrzIgnTT9lJiFkwoLHP29VpAnBn3uDP5OcG8B5uDx3gT+AbiGnkp3KxzXb8 MjvLqsH+/n/MX4ItMoEZbqr58k0DmkBKZuOBYp0aBSMj5ReQnvZ5fwcnLTi4bg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Vs82X0gbzzJqC; Sat, 1 Jun 2024 18:41: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 451If8FS009431; Sat, 1 Jun 2024 18:41:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 451If8ME009428; Sat, 1 Jun 2024 18:41:08 GMT (envelope-from git) Date: Sat, 1 Jun 2024 18:41:08 GMT Message-Id: <202406011841.451If8ME009428@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: 9d449caddd4f - main - md: round-trip the MUSTDEALLOC and RESERVE options List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: 9d449caddd4f442ba4ebfd2edafa1aef4fcba4c8 Auto-Submitted: auto-generated The branch main has been updated by asomers: URL: https://cgit.FreeBSD.org/src/commit/?id=9d449caddd4f442ba4ebfd2edafa1aef4fcba4c8 commit 9d449caddd4f442ba4ebfd2edafa1aef4fcba4c8 Author: Alan Somers AuthorDate: 2024-06-01 18:00:03 +0000 Commit: Alan Somers CommitDate: 2024-06-01 18:40:19 +0000 md: round-trip the MUSTDEALLOC and RESERVE options If those options are requested when the device is created, ensure that they will be reported by MDIOCQUERY. MFC after: 2 weeks Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/1270 --- sys/dev/md/md.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/dev/md/md.c b/sys/dev/md/md.c index 267554031f23..af05373ae1d8 100644 --- a/sys/dev/md/md.c +++ b/sys/dev/md/md.c @@ -1345,7 +1345,7 @@ mdcreate_malloc(struct md_s *sc, struct md_req *mdr) sc->fwsectors = mdr->md_fwsectors; if (mdr->md_fwheads != 0) sc->fwheads = mdr->md_fwheads; - sc->flags = mdr->md_options & (MD_COMPRESS | MD_FORCE); + sc->flags = mdr->md_options & (MD_COMPRESS | MD_FORCE | MD_RESERVE); sc->indir = dimension(sc->mediasize / sc->sectorsize); sc->uma = uma_zcreate(sc->name, sc->sectorsize, NULL, NULL, NULL, NULL, 0x1ff, 0); @@ -1470,7 +1470,7 @@ mdcreate_vnode(struct md_s *sc, struct md_req *mdr, struct thread *td) snprintf(sc->ident, sizeof(sc->ident), "MD-DEV%ju-INO%ju", (uintmax_t)vattr.va_fsid, (uintmax_t)vattr.va_fileid); sc->flags = mdr->md_options & (MD_ASYNC | MD_CACHE | MD_FORCE | - MD_VERIFY); + MD_VERIFY | MD_MUSTDEALLOC); if (!(flags & FWRITE)) sc->flags |= MD_READONLY; sc->vnode = nd.ni_vp; From nobody Sat Jun 1 20:25: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 4VsBMC52smz5LH1N; Sat, 01 Jun 2024 20:25: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 4VsBMC4Ps4z4mGX; Sat, 1 Jun 2024 20:25:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717273543; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wzhDxJbs9bwVvkTAQKV7j2HXCh2Nx2P6kG9IEDtX4u0=; b=TJEduMGXfD4J+fxvQKnCDyYikgZpXYTN2GHO/zbXh7IQmep6LAC7MkG1l7iLtOqMjy3bLX misgGrqj03AdvVVsut5loOzrKSeXzaBKJdMn5nv8k/SZBvpvaNLcuZP2jBZgZHydaGrCQF LKLynIIJM62OWzvOmAipUsVeInW+xqlmgMSiDiY0Jv83GBrTpyQqGQ2TpYty7pxWdWIUbC oIVnkyYTBOHujNzZpEp1EPoDuso7+pdpzhn71D1vrdXIBrr0dHkR0sxv9TtnM0u84IdiSm p29/IRHDuOR3VQPcplsoM8RS55qJSiWCZ3qsGo+loNnLWT30TlSQUNtk8sAS0g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1717273543; a=rsa-sha256; cv=none; b=KsyvH6hu+aEWXq4tKgVPwXC1K9bz7tJrIaRLcHDEcvzkfDrKVeumAQtP+7i4dz/viwgpvO Mwx8ye0LgY00eGud5j997CLp0zRROnSiNQZN7bkbWypocQDDLPXHQppsdTxAMfFKKgE/0C ZV9Ug0yLjt4sX30XeFntyjepAeGBfEJT+4qOG/5ZxjxX27m4eY0tDbg6YPWKYtTL026F4y b2hwCBLfX5I0RYRvsBLzLby1e0UxYxLQ9fAirR0bdvk0xMJwQ5JRsU+YcdmTZGlBgVwpNj 7NwKBLiWjzggyE7mnvtX24WzsK0sps/K3DDdEJq6GhO0oTBfTBcFkaFsWmvZwA== 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=1717273543; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wzhDxJbs9bwVvkTAQKV7j2HXCh2Nx2P6kG9IEDtX4u0=; b=tj7xKxao8V2FYGxEfonfKP2pQ2a6pzbuQyWY+Lqm7M6Rx2zRDb3PEtKsxz7MyVdEQoiu7r iALIjMqBVYbjPUjKhsAK1rPqlph7dA1Nb8nrY+tmHhd2HB3lazvyIA5CcD1AjZLuxYZU5q RiGFz0F/CX1LgFpdHa75vKBL/3SXnqJHRdchf3FZ4M3enUNrl12HE4plp7Su+bdm7AAsjc IE6TZnJRWX9fomVhT2x5jfna4M2hdXAOPiXaZhjWX11IiU7tuZQSvQyGnQT635pnkqZBeC qT5/5BHDwSY0q2wAcOHNQsbrRz9zqaeaLvHjjDF7slv0CMeK1BM/XlQYijRwMw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VsBMC3w9ZzMWJ; Sat, 1 Jun 2024 20:25: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 451KPhm5084473; Sat, 1 Jun 2024 20:25:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 451KPh08084470; Sat, 1 Jun 2024 20:25:43 GMT (envelope-from git) Date: Sat, 1 Jun 2024 20:25:43 GMT Message-Id: <202406012025.451KPh08084470@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 0f1d148cfd15 - main - pci: Use kobj typedefs for new-bus method prototypes List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0f1d148cfd1503eb5c4bcc4c4689c4219dbb605f Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=0f1d148cfd1503eb5c4bcc4c4689c4219dbb605f commit 0f1d148cfd1503eb5c4bcc4c4689c4219dbb605f Author: John Baldwin AuthorDate: 2024-06-01 20:24:29 +0000 Commit: John Baldwin CommitDate: 2024-06-01 20:24:29 +0000 pci: Use kobj typedefs for new-bus method prototypes Reviewed by: kp, imp Differential Revision: https://reviews.freebsd.org/D45405 --- sys/dev/pci/pci.c | 22 +++---- sys/dev/pci/pci_private.h | 156 +++++++++++++++++++--------------------------- 2 files changed, 75 insertions(+), 103 deletions(-) diff --git a/sys/dev/pci/pci.c b/sys/dev/pci/pci.c index cbab4b50392f..2cb8b4ce9fcc 100644 --- a/sys/dev/pci/pci.c +++ b/sys/dev/pci/pci.c @@ -88,6 +88,16 @@ (((cfg)->hdrtype == PCIM_HDRTYPE_NORMAL && reg == PCIR_BIOS) || \ ((cfg)->hdrtype == PCIM_HDRTYPE_BRIDGE && reg == PCIR_BIOS_1)) +static device_probe_t pci_probe; + +static bus_reset_post_t pci_reset_post; +static bus_reset_prepare_t pci_reset_prepare; +static bus_reset_child_t pci_reset_child; +static bus_hint_device_unit_t pci_hint_device_unit; +static bus_remap_intr_t pci_remap_intr_method; + +static pci_get_id_t pci_get_id_method; + static int pci_has_quirk(uint32_t devid, int quirk); static pci_addr_t pci_mapbase(uint64_t mapreg); static const char *pci_maptype(uint64_t mapreg); @@ -103,7 +113,6 @@ static void pci_assign_interrupt(device_t bus, device_t dev, int force_route); static int pci_add_map(device_t bus, device_t dev, int reg, struct resource_list *rl, int force, int prefetch); -static int pci_probe(device_t dev); static void pci_load_vendor_data(void); static int pci_describe_parse_line(char **ptr, int *vendor, int *device, char **desc); @@ -125,17 +134,6 @@ static int pci_msi_blacklisted(void); static int pci_msix_blacklisted(void); static void pci_resume_msi(device_t dev); static void pci_resume_msix(device_t dev); -static int pci_remap_intr_method(device_t bus, device_t dev, - u_int irq); -static void pci_hint_device_unit(device_t acdev, device_t child, - const char *name, int *unitp); -static int pci_reset_post(device_t dev, device_t child); -static int pci_reset_prepare(device_t dev, device_t child); -static int pci_reset_child(device_t dev, device_t child, - int flags); - -static int pci_get_id_method(device_t dev, device_t child, - enum pci_id_type type, uintptr_t *rid); static struct pci_devinfo * pci_fill_devinfo(device_t pcib, device_t bus, int d, int b, int s, int f, uint16_t vid, uint16_t did); diff --git a/sys/dev/pci/pci_private.h b/sys/dev/pci/pci_private.h index 6645488d4929..f97a4df5471b 100644 --- a/sys/dev/pci/pci_private.h +++ b/sys/dev/pci/pci_private.h @@ -48,6 +48,71 @@ struct pci_softc { extern int pci_do_power_resume; extern int pci_do_power_suspend; + +device_attach_t pci_attach; +device_detach_t pci_detach; +device_resume_t pci_resume; + +bus_print_child_t pci_print_child; +bus_probe_nomatch_t pci_probe_nomatch; +bus_read_ivar_t pci_read_ivar; +bus_write_ivar_t pci_write_ivar; +bus_driver_added_t pci_driver_added; +bus_setup_intr_t pci_setup_intr; +bus_teardown_intr_t pci_teardown_intr; + +bus_get_dma_tag_t pci_get_dma_tag; +bus_get_resource_list_t pci_get_resource_list; +bus_delete_resource_t pci_delete_resource; +bus_alloc_resource_t pci_alloc_resource; +bus_release_resource_t pci_release_resource; +bus_activate_resource_t pci_activate_resource; +bus_deactivate_resource_t pci_deactivate_resource; +bus_child_deleted_t pci_child_deleted; +bus_child_detached_t pci_child_detached; +bus_child_pnpinfo_t pci_child_pnpinfo_method; +bus_child_location_t pci_child_location_method; +bus_get_device_path_t pci_get_device_path_method; +bus_suspend_child_t pci_suspend_child; +bus_resume_child_t pci_resume_child; +bus_rescan_t pci_rescan_method; + +pci_read_config_t pci_read_config_method; +pci_write_config_t pci_write_config_method; +pci_enable_busmaster_t pci_enable_busmaster_method; +pci_disable_busmaster_t pci_disable_busmaster_method; +pci_enable_io_t pci_enable_io_method; +pci_disable_io_t pci_disable_io_method; +pci_get_vpd_ident_t pci_get_vpd_ident_method; +pci_get_vpd_readonly_t pci_get_vpd_readonly_method; +pci_get_powerstate_t pci_get_powerstate_method; +pci_set_powerstate_t pci_set_powerstate_method; +pci_assign_interrupt_t pci_assign_interrupt_method; +pci_find_cap_t pci_find_cap_method; +pci_find_next_cap_t pci_find_next_cap_method; +pci_find_extcap_t pci_find_extcap_method; +pci_find_next_extcap_t pci_find_next_extcap_method; +pci_find_htcap_t pci_find_htcap_method; +pci_find_next_htcap_t pci_find_next_htcap_method; +pci_alloc_msi_t pci_alloc_msi_method; +pci_alloc_msix_t pci_alloc_msix_method; +pci_enable_msi_t pci_enable_msi_method; +pci_enable_msix_t pci_enable_msix_method; +pci_disable_msi_t pci_disable_msi_method; +pci_remap_msix_t pci_remap_msix_method; +pci_release_msi_t pci_release_msi_method; +pci_msi_count_t pci_msi_count_method; +pci_msix_count_t pci_msix_count_method; +pci_msix_pba_bar_t pci_msix_pba_bar_method; +pci_msix_table_bar_t pci_msix_table_bar_method; +pci_alloc_devinfo_t pci_alloc_devinfo_method; +pci_child_added_t pci_child_added_method; +#ifdef PCI_IOV +pci_iov_attach_t pci_iov_attach_method; +pci_iov_detach_t pci_iov_detach_method; +pci_create_iov_child_t pci_create_iov_child_method; +#endif + void pci_add_children(device_t dev, int domain, int busno); void pci_add_child(device_t bus, struct pci_devinfo *dinfo); device_t pci_add_iov_child(device_t bus, device_t pf, uint16_t rid, @@ -55,95 +120,12 @@ device_t pci_add_iov_child(device_t bus, device_t pf, uint16_t rid, void pci_add_resources(device_t bus, device_t dev, int force, uint32_t prefetchmask); void pci_add_resources_ea(device_t bus, device_t dev, int alloc_iov); -struct pci_devinfo *pci_alloc_devinfo_method(device_t dev); -int pci_attach(device_t dev); int pci_attach_common(device_t dev); -int pci_detach(device_t dev); -int pci_rescan_method(device_t dev); -void pci_driver_added(device_t dev, driver_t *driver); int pci_ea_is_enabled(device_t dev, int rid); -int pci_print_child(device_t dev, device_t child); -void pci_probe_nomatch(device_t dev, device_t child); -int pci_read_ivar(device_t dev, device_t child, int which, - uintptr_t *result); -int pci_write_ivar(device_t dev, device_t child, int which, - uintptr_t value); -int pci_setup_intr(device_t dev, device_t child, - struct resource *irq, int flags, driver_filter_t *filter, - driver_intr_t *intr, void *arg, void **cookiep); -int pci_teardown_intr(device_t dev, device_t child, - struct resource *irq, void *cookie); -int pci_get_vpd_ident_method(device_t dev, device_t child, - const char **identptr); -int pci_get_vpd_readonly_method(device_t dev, device_t child, - const char *kw, const char **vptr); -int pci_set_powerstate_method(device_t dev, device_t child, - int state); -int pci_get_powerstate_method(device_t dev, device_t child); -uint32_t pci_read_config_method(device_t dev, device_t child, - int reg, int width); -void pci_write_config_method(device_t dev, device_t child, - int reg, uint32_t val, int width); -int pci_enable_busmaster_method(device_t dev, device_t child); -int pci_disable_busmaster_method(device_t dev, device_t child); -int pci_enable_io_method(device_t dev, device_t child, int space); -int pci_disable_io_method(device_t dev, device_t child, int space); -int pci_find_cap_method(device_t dev, device_t child, - int capability, int *capreg); -int pci_find_next_cap_method(device_t dev, device_t child, - int capability, int start, int *capreg); -int pci_find_extcap_method(device_t dev, device_t child, - int capability, int *capreg); -int pci_find_next_extcap_method(device_t dev, device_t child, - int capability, int start, int *capreg); -int pci_find_htcap_method(device_t dev, device_t child, - int capability, int *capreg); -int pci_find_next_htcap_method(device_t dev, device_t child, - int capability, int start, int *capreg); -int pci_alloc_msi_method(device_t dev, device_t child, int *count); -int pci_alloc_msix_method(device_t dev, device_t child, int *count); -void pci_enable_msi_method(device_t dev, device_t child, - uint64_t address, uint16_t data); -void pci_enable_msix_method(device_t dev, device_t child, - u_int index, uint64_t address, uint32_t data); -void pci_disable_msi_method(device_t dev, device_t child); -int pci_remap_msix_method(device_t dev, device_t child, - int count, const u_int *vectors); -int pci_release_msi_method(device_t dev, device_t child); -int pci_msi_count_method(device_t dev, device_t child); -int pci_msix_count_method(device_t dev, device_t child); -int pci_msix_pba_bar_method(device_t dev, device_t child); -int pci_msix_table_bar_method(device_t dev, device_t child); -struct resource *pci_alloc_resource(device_t dev, device_t child, - int type, int *rid, rman_res_t start, rman_res_t end, - rman_res_t count, u_int flags); -int pci_release_resource(device_t dev, device_t child, - struct resource *r); -int pci_activate_resource(device_t dev, device_t child, - struct resource *r); -int pci_deactivate_resource(device_t dev, device_t child, - struct resource *r); -void pci_delete_resource(device_t dev, device_t child, - int type, int rid); -struct resource_list *pci_get_resource_list (device_t dev, device_t child); struct pci_devinfo *pci_read_device(device_t pcib, device_t bus, int d, int b, int s, int f); void pci_print_verbose(struct pci_devinfo *dinfo); int pci_freecfg(struct pci_devinfo *dinfo); -void pci_child_deleted(device_t dev, device_t child); -void pci_child_detached(device_t dev, device_t child); -int pci_child_location_method(device_t cbdev, device_t child, - struct sbuf *sb); -int pci_child_pnpinfo_method(device_t cbdev, device_t child, - struct sbuf *sb); -int pci_get_device_path_method(device_t dev, device_t child, - const char *locator, struct sbuf *sb); -int pci_assign_interrupt_method(device_t dev, device_t child); -int pci_resume(device_t dev); -int pci_resume_child(device_t dev, device_t child); -int pci_suspend_child(device_t dev, device_t child); -bus_dma_tag_t pci_get_dma_tag(device_t bus, device_t dev); -void pci_child_added_method(device_t dev, device_t child); /** Restore the config register state. The state must be previously * saved with pci_cfg_save. However, the pci bus driver takes care of @@ -171,14 +153,6 @@ struct resource *pci_alloc_multi_resource(device_t dev, device_t child, int type, int *rid, rman_res_t start, rman_res_t end, rman_res_t count, u_long num, u_int flags); -int pci_iov_attach_method(device_t bus, device_t dev, - struct nvlist *pf_schema, struct nvlist *vf_schema, - const char *name); -int pci_iov_detach_method(device_t bus, device_t dev); - -device_t pci_create_iov_child_method(device_t bus, device_t pf, - uint16_t rid, uint16_t vid, uint16_t did); - struct resource *pci_vf_alloc_mem_resource(device_t dev, device_t child, int *rid, rman_res_t start, rman_res_t end, rman_res_t count, u_int flags); From nobody Sat Jun 1 20:25: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 4VsBMF0Dmsz5LGyJ; Sat, 01 Jun 2024 20:25: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 4VsBMD5wpzz4mYH; Sat, 1 Jun 2024 20:25:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717273544; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9/Q779GxqXvXI9CvuGt/40bwKy4ikcZBaECZX/a/nrM=; b=WSkK/CPla5iL6KUQhbWcZqWQvKcrcu1+f4t95AHqUwMIKHiqLqur9SeTKCd3rvgb3OGcCY CM4CGNimC2iuOPguvpgZRMcdQbfgF8coHuttVEww+W4IFKJKOyCm4IzPAKQ2WXIYS5k/UP HKVx4wkGIV4uY/xNjwGopVB5T0zjppUTGIzIPb3DBLa3kDOLguuVTa2cmXSc/g+ExK2S7X 7PLpGhGjI4GULc/unGeG4Mt2VDZSj57CfP6D5RYaihJ3KKTxMHbI79Pzkpf2pYex0YhcaB aJ5QElVjVIUXb4AFdzlJmXCDiHZqdgXVTaeUWYPKM1lkBlJQxS7dshyDVuQxgw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1717273544; a=rsa-sha256; cv=none; b=vsX1B7u+m6US8pWSBDbM814BfqCk8TrL/3l9WjRubAVYpJ1G1BsTe0MShABEvjXri5VJsf zjMVYSRvUPYyDAMWVqQ55J67gQRSN/nuYts/2Wwv+A5g+JepGuBEsU3P1MskrkBM3IDRmq S1+jIjb7cetOiAeJxCUO4ILBMs/OptWYoWS+HEDqnWnSCS22/oFREBfNpL3YaJGuE7yXmn F01dEL1LU8/KMSl9pLSJ+VarXwM4OBC68PteEHXsesbkd7lOMCmUXQuapC2xqo2JH5HU7l dUvIvTYoD+UF226zro6luhw3JUOohodJShVZyDLfBmwop5CDw6z09jt7h8iSaQ== 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=1717273544; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9/Q779GxqXvXI9CvuGt/40bwKy4ikcZBaECZX/a/nrM=; b=r1gzaqU4qrAFEpypuNr0rkun+Tfv2mqDrXfWP3+S+sOq9zMo/ms3HxkJi7vAOI1ztFa5b1 2veS0/2YOAP2JRMauayNl43inJQxiAujUsW//5wmxkh2qNJn+XtYpZ5rLpjYKYfL8Sy4Dv FpPqlLJdW4rmBXqsvDANF5fv2utn1vnWd0kVs0SOLOsORfs+sQZFnJDFB4yOQho9u24RWS N/XVtgRkWj67ZSwHqq/rdAba2+YOzjAdRY7xMY+w9j91w1HXrsmtKsilkdtL/5gpmGFHxe 7+ZANgWCs+wa2tbT1oQyMqpGLnRXPhcZ/fuZ4loRZQuJ96Whj/IpcCwid1uMiQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VsBMD4kP6zMrL; Sat, 1 Jun 2024 20:25: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 451KPigk084527; Sat, 1 Jun 2024 20:25:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 451KPiqT084524; Sat, 1 Jun 2024 20:25:44 GMT (envelope-from git) Date: Sat, 1 Jun 2024 20:25:44 GMT Message-Id: <202406012025.451KPiqT084524@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: c7c037fad186 - main - bhnd: Remove orphaned driver for the BHND USB core List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c7c037fad1862c18e3e9635b06194a4ca00ac3c1 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=c7c037fad1862c18e3e9635b06194a4ca00ac3c1 commit c7c037fad1862c18e3e9635b06194a4ca00ac3c1 Author: John Baldwin AuthorDate: 2024-06-01 20:25:12 +0000 Commit: John Baldwin CommitDate: 2024-06-01 20:25:12 +0000 bhnd: Remove orphaned driver for the BHND USB core This was only connected to the build for MIPS and has been disconnected from the build since MIPS was removed. Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D45432 --- sys/dev/bhnd/cores/usb/bhnd_ehci.c | 258 ---------------- sys/dev/bhnd/cores/usb/bhnd_ohci.c | 220 -------------- sys/dev/bhnd/cores/usb/bhnd_usb.c | 549 ----------------------------------- sys/dev/bhnd/cores/usb/bhnd_usbvar.h | 60 ---- 4 files changed, 1087 deletions(-) diff --git a/sys/dev/bhnd/cores/usb/bhnd_ehci.c b/sys/dev/bhnd/cores/usb/bhnd_ehci.c deleted file mode 100644 index 765d7eaaa144..000000000000 --- a/sys/dev/bhnd/cores/usb/bhnd_ehci.c +++ /dev/null @@ -1,258 +0,0 @@ -/*- - * SPDX-License-Identifier: BSD-3-Clause - * - * Copyright (C) 2008 MARVELL INTERNATIONAL LTD. - * Copyright (c) 2010, Aleksandr Rybalko - * All rights reserved. - * - * Developed by Semihalf. - * - * 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. - * 3. Neither the name of MARVELL nor the names of contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY 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 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 -/* - * BHND attachment driver for the USB Enhanced Host Controller. - * Ported from ZRouter with insignificant adaptations for FreeBSD11. - */ - -#include "opt_bus.h" - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include - -#include -#include -#include -#include - -#include -#include -#include -#include - -#include - -#define EHCI_HC_DEVSTR "Broadcom EHCI" - -#define USB_BRIDGE_INTR_CAUSE 0x210 -#define USB_BRIDGE_INTR_MASK 0x214 - -static device_attach_t bhnd_ehci_attach; -static device_detach_t bhnd_ehci_detach; - -static int bhnd_ehci_probe(device_t self); -static void bhnd_ehci_post_reset(struct ehci_softc *ehci_softc); - -static int -bhnd_ehci_probe(device_t self) -{ - - device_set_desc(self, EHCI_HC_DEVSTR); - - return (BUS_PROBE_DEFAULT); -} - -static void -bhnd_ehci_post_reset(struct ehci_softc *ehci_softc) -{ - uint32_t usbmode; - - /* Force HOST mode */ - usbmode = EOREAD4(ehci_softc, EHCI_USBMODE_NOLPM); - usbmode &= ~EHCI_UM_CM; - usbmode |= EHCI_UM_CM_HOST; - EOWRITE4(ehci_softc, EHCI_USBMODE_NOLPM, usbmode); -} - -static int -bhnd_ehci_attach(device_t self) -{ - ehci_softc_t *sc; - int err; - int rid; - - sc = device_get_softc(self); - /* initialise some bus fields */ - sc->sc_bus.parent = self; - sc->sc_bus.devices = sc->sc_devices; - sc->sc_bus.devices_max = EHCI_MAX_DEVICES; - sc->sc_bus.usbrev = USB_REV_2_0; - sc->sc_bus.dma_bits = 32; - - /* get all DMA memory */ - if ((err = usb_bus_mem_alloc_all(&sc->sc_bus, USB_GET_DMA_TAG(self), - &ehci_iterate_hw_softc)) != 0) { - BHND_ERROR_DEV(self, "can't allocate DMA memory: %d", err); - return (ENOMEM); - } - - rid = 0; - sc->sc_io_res = bus_alloc_resource_any(self, SYS_RES_MEMORY, &rid, - RF_ACTIVE); - if (!sc->sc_io_res) { - BHND_ERROR_DEV(self, "Could not map memory"); - goto error; - } - sc->sc_io_tag = rman_get_bustag(sc->sc_io_res); - sc->sc_io_hdl = rman_get_bushandle(sc->sc_io_res); - sc->sc_io_size = rman_get_size(sc->sc_io_res); - - rid = 0; - sc->sc_irq_res = bus_alloc_resource_any(self, SYS_RES_IRQ, &rid, - RF_SHAREABLE | RF_ACTIVE); - - if (sc->sc_irq_res == NULL) { - BHND_ERROR_DEV(self, "Could not allocate error irq"); - bhnd_ehci_detach(self); - return (ENXIO); - } - - sc->sc_bus.bdev = device_add_child(self, "usbus", -1); - if (!sc->sc_bus.bdev) { - BHND_ERROR_DEV(self, "Could not add USB device"); - goto error; - } - device_set_ivars(sc->sc_bus.bdev, &sc->sc_bus); - device_set_desc(sc->sc_bus.bdev, EHCI_HC_DEVSTR); - - sprintf(sc->sc_vendor, "Broadcom"); - - err = bus_setup_intr(self, sc->sc_irq_res, INTR_TYPE_BIO | INTR_MPSAFE, - NULL, (driver_intr_t *)ehci_interrupt, sc, &sc->sc_intr_hdl); - if (err) { - BHND_ERROR_DEV(self, "Could not setup irq, %d", err); - sc->sc_intr_hdl = NULL; - goto error; - } - - sc->sc_flags |= EHCI_SCFLG_LOSTINTRBUG; - sc->sc_vendor_post_reset = bhnd_ehci_post_reset; - - err = ehci_init(sc); - if (!err) { - err = device_probe_and_attach(sc->sc_bus.bdev); - } - if (err) { - BHND_ERROR_DEV(self, "USB init failed err=%d", err); - goto error; - } - return (0); - -error: - bhnd_ehci_detach(self); - return (ENXIO); -} - -static int -bhnd_ehci_detach(device_t self) -{ - ehci_softc_t *sc; - int err; - - sc = device_get_softc(self); - - /* during module unload there are lots of children leftover */ - device_delete_children(self); - - /* - * disable interrupts that might have been switched on in ehci_init - */ -#ifdef notyet - if (sc->sc_io_res) { - EWRITE4(sc, EHCI_USBINTR, 0); - EWRITE4(sc, USB_BRIDGE_INTR_MASK, 0); - } -#endif - if (sc->sc_irq_res && sc->sc_intr_hdl) { - /* - * only call ehci_detach() after ehci_init() - */ - ehci_detach(sc); - - err = bus_teardown_intr(self, sc->sc_irq_res, sc->sc_intr_hdl); - - if (err) - /* XXX or should we panic? */ - BHND_ERROR_DEV(self, "Could not tear down irq, %d", err); - - sc->sc_intr_hdl = NULL; - } - if (sc->sc_irq_res) { - bus_release_resource(self, SYS_RES_IRQ, 0, sc->sc_irq_res); - sc->sc_irq_res = NULL; - } - if (sc->sc_io_res) { - bus_release_resource(self, SYS_RES_MEMORY, 0, sc->sc_io_res); - sc->sc_io_res = NULL; - } - usb_bus_mem_free_all(&sc->sc_bus, &ehci_iterate_hw_softc); - - return (0); -} - -static device_method_t ehci_methods[] = { - /* Device interface */ - DEVMETHOD(device_probe, bhnd_ehci_probe), - DEVMETHOD(device_attach, bhnd_ehci_attach), - DEVMETHOD(device_detach, bhnd_ehci_detach), - DEVMETHOD(device_suspend, bus_generic_suspend), - DEVMETHOD(device_resume, bus_generic_resume), - DEVMETHOD(device_shutdown, bus_generic_shutdown), - - /* Bus interface */ - DEVMETHOD(bus_print_child, bus_generic_print_child), - {0, 0} -}; - -static driver_t ehci_driver = { - "ehci", - ehci_methods, - sizeof(ehci_softc_t), -}; - -DRIVER_MODULE(ehci, bhnd_usb, ehci_driver, 0, 0); -MODULE_DEPEND(ehci, usb, 1, 1, 1); diff --git a/sys/dev/bhnd/cores/usb/bhnd_ohci.c b/sys/dev/bhnd/cores/usb/bhnd_ohci.c deleted file mode 100644 index c72c50be4675..000000000000 --- a/sys/dev/bhnd/cores/usb/bhnd_ohci.c +++ /dev/null @@ -1,220 +0,0 @@ -/*- - * SPDX-License-Identifier: BSD-2-Clause - * - * Copyright (c) 1998 The NetBSD Foundation, Inc. - * Copyright (c) 2010, Aleksandr Rybalko - * All rights reserved. - * - * This code is derived from software contributed to The NetBSD Foundation - * by Lennart Augustsson (augustss@carlstedt.se) at - * Carlstedt Research & Technology. - * - * 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 NETBSD FOUNDATION, INC. 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 FOUNDATION 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 -/* - * USB Open Host Controller driver. - * - * OHCI spec: http://www.intel.com/design/usb/ohci11d.pdf - */ - -/* The low level controller code for OHCI has been split into - * SIBA probes and OHCI specific code. This was done to facilitate the - * sharing of code between *BSD's - */ - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include - -#include -#include -#include -#include - -#include -#include -#include -#include - -static device_probe_t bhnd_ohci_probe; -static device_attach_t bhnd_ohci_attach; -static device_detach_t bhnd_ohci_detach; - -static int -bhnd_ohci_probe(device_t self) -{ - device_set_desc(self, "Broadcom OHCI"); - return (0); -} - -static int -bhnd_ohci_attach(device_t self) -{ - ohci_softc_t *sc; - int rid; - int err; - - sc = device_get_softc(self); - /* initialise some bus fields */ - sc->sc_bus.parent = self; - sc->sc_bus.devices = sc->sc_devices; - sc->sc_bus.devices_max = OHCI_MAX_DEVICES; - sc->sc_bus.dma_bits = 32; - - /* get all DMA memory */ - if (usb_bus_mem_alloc_all(&sc->sc_bus, USB_GET_DMA_TAG(self), - &ohci_iterate_hw_softc)) { - return (ENOMEM); - } - sc->sc_dev = self; - - rid = 0; - sc->sc_io_res = bus_alloc_resource_any(self, SYS_RES_MEMORY, &rid, - RF_ACTIVE); - if (!sc->sc_io_res) { - device_printf(self, "Could not map memory\n"); - goto error; - } - sc->sc_io_tag = rman_get_bustag(sc->sc_io_res); - sc->sc_io_hdl = rman_get_bushandle(sc->sc_io_res); - sc->sc_io_size = rman_get_size(sc->sc_io_res); - - rid = 0; - sc->sc_irq_res = bus_alloc_resource_any(self, SYS_RES_IRQ, &rid, - RF_SHAREABLE | RF_ACTIVE); - if (sc->sc_irq_res == NULL) { - device_printf(self, "Could not allocate irq\n"); - goto error; - } - sc->sc_bus.bdev = device_add_child(self, "usbus", -1); - if (!sc->sc_bus.bdev) { - device_printf(self, "Could not add USB device\n"); - goto error; - } - device_set_ivars(sc->sc_bus.bdev, &sc->sc_bus); - - strlcpy(sc->sc_vendor, "Broadcom", sizeof(sc->sc_vendor)); - - err = bus_setup_intr(self, sc->sc_irq_res, INTR_TYPE_BIO | INTR_MPSAFE, - NULL, (driver_intr_t *)ohci_interrupt, sc, &sc->sc_intr_hdl); - - if (err) { - device_printf(self, "Could not setup irq, %d\n", err); - sc->sc_intr_hdl = NULL; - goto error; - } - err = ohci_init(sc); - if (!err) { - err = device_probe_and_attach(sc->sc_bus.bdev); - } - if (err) { - device_printf(self, "USB init failed\n"); - goto error; - } - return (0); - -error: - bhnd_ohci_detach(self); - return (ENXIO); -} - -static int -bhnd_ohci_detach(device_t self) -{ - ohci_softc_t *sc; - - sc = device_get_softc(self); - - /* during module unload there are lots of children leftover */ - device_delete_children(self); - - if (sc->sc_irq_res && sc->sc_intr_hdl) { - /* - * only call ohci_detach() after ohci_init() - */ - ohci_detach(sc); - - int err = bus_teardown_intr(self, sc->sc_irq_res, sc->sc_intr_hdl); - - if (err) { - /* XXX or should we panic? */ - device_printf(self, "Could not tear down irq, %d\n", - err); - } - sc->sc_intr_hdl = NULL; - } - if (sc->sc_irq_res) { - bus_release_resource(self, SYS_RES_IRQ, 0, sc->sc_irq_res); - sc->sc_irq_res = NULL; - } - if (sc->sc_io_res) { - bus_release_resource(self, SYS_RES_MEMORY, 0, - sc->sc_io_res); - sc->sc_io_res = NULL; - } - usb_bus_mem_free_all(&sc->sc_bus, &ohci_iterate_hw_softc); - - return (0); -} - -static device_method_t bhnd_ohci_methods[] = { - /* Device interface */ - DEVMETHOD(device_probe, bhnd_ohci_probe), - DEVMETHOD(device_attach, bhnd_ohci_attach), - DEVMETHOD(device_detach, bhnd_ohci_detach), - DEVMETHOD(device_suspend, bus_generic_suspend), - DEVMETHOD(device_resume, bus_generic_resume), - DEVMETHOD(device_shutdown, bus_generic_shutdown), - - DEVMETHOD_END -}; - -static driver_t ohci_driver = { - .name = "ohci", - .methods = bhnd_ohci_methods, - .size = sizeof(struct ohci_softc), -}; - -DRIVER_MODULE(ohci, bhnd_usb, ohci_driver, 0, 0); -MODULE_DEPEND(ohci, usb, 1, 1, 1); diff --git a/sys/dev/bhnd/cores/usb/bhnd_usb.c b/sys/dev/bhnd/cores/usb/bhnd_usb.c deleted file mode 100644 index 7a86db79731f..000000000000 --- a/sys/dev/bhnd/cores/usb/bhnd_usb.c +++ /dev/null @@ -1,549 +0,0 @@ -/*- - * SPDX-License-Identifier: BSD-2-Clause - * - * Copyright (c) 2010, Aleksandr Rybalko - * 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 unmodified, 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 -/* - * Ported version of BroadCom USB core driver from ZRouter project - */ -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include - -#include - -#include - -#include "bhnd_usbvar.h" - -/****************************** Variables ************************************/ -static const struct bhnd_device bhnd_usb_devs[] = { - BHND_DEVICE(BCM, USB20H, "USB2.0 Host core", NULL), - BHND_DEVICE_END -}; - -/****************************** Prototypes ***********************************/ - -static int bhnd_usb_attach(device_t); -static int bhnd_usb_probe(device_t); -static device_t bhnd_usb_add_child(device_t dev, u_int order, const char *name, - int unit); -static int bhnd_usb_print_all_resources(device_t dev); -static int bhnd_usb_print_child(device_t bus, device_t child); - -static struct resource * bhnd_usb_alloc_resource(device_t bus, - device_t child, int type, int *rid, - rman_res_t start, rman_res_t end, - rman_res_t count, u_int flags); -static int bhnd_usb_release_resource(device_t dev, - device_t child, struct resource *r); - -static struct resource_list * bhnd_usb_get_reslist(device_t dev, - device_t child); - -static int -bhnd_usb_probe(device_t dev) -{ - const struct bhnd_device *id; - - id = bhnd_device_lookup(dev, bhnd_usb_devs, sizeof(bhnd_usb_devs[0])); - if (id == NULL) - return (ENXIO); - - device_set_desc(dev, id->desc); - return (BUS_PROBE_DEFAULT); -} - -static int -bhnd_usb_attach(device_t dev) -{ - struct bhnd_usb_softc *sc; - int rid; - uint32_t tmp; - int tries, err; - - sc = device_get_softc(dev); - - bhnd_reset_hw(dev, 0, 0); - - /* - * Allocate the resources which the parent bus has already - * determined for us. - * XXX: There are few windows (usually 2), RID should be chip-specific - */ - rid = 0; - sc->sc_mem = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &rid, RF_ACTIVE); - if (sc->sc_mem == NULL) { - BHND_ERROR_DEV(dev, "unable to allocate memory"); - return (ENXIO); - } - - sc->sc_bt = rman_get_bustag(sc->sc_mem); - sc->sc_bh = rman_get_bushandle(sc->sc_mem); - sc->sc_maddr = rman_get_start(sc->sc_mem); - sc->sc_msize = rman_get_size(sc->sc_mem); - - rid = 0; - sc->sc_irq = bus_alloc_resource_any(dev, SYS_RES_IRQ, &rid, - RF_SHAREABLE | RF_ACTIVE); - if (sc->sc_irq == NULL) { - BHND_ERROR_DEV(dev, "unable to allocate IRQ"); - return (ENXIO); - } - - sc->sc_irqn = rman_get_start(sc->sc_irq); - - sc->mem_rman.rm_start = sc->sc_maddr; - sc->mem_rman.rm_end = sc->sc_maddr + sc->sc_msize - 1; - sc->mem_rman.rm_type = RMAN_ARRAY; - sc->mem_rman.rm_descr = "BHND USB core I/O memory addresses"; - if (rman_init(&sc->mem_rman) != 0 || - rman_manage_region(&sc->mem_rman, sc->mem_rman.rm_start, - sc->mem_rman.rm_end) != 0) { - panic("%s: sc->mem_rman", __func__); - } - - /* TODO: macros for registers */ - bus_write_4(sc->sc_mem, 0x200, 0x7ff); - DELAY(100); - -#define OHCI_CONTROL 0x04 - bus_write_4(sc->sc_mem, OHCI_CONTROL, 0); - - if ( bhnd_get_device(dev) == BHND_COREID_USB20H) { - uint32_t rev = bhnd_get_hwrev(dev); - BHND_INFO_DEV(dev, "USB HOST 2.0 setup for rev %d", rev); - if (rev == 1/* ? == 2 */) { - /* SiBa code */ - - /* Change Flush control reg */ - tmp = bus_read_4(sc->sc_mem, 0x400) & ~0x8; - bus_write_4(sc->sc_mem, 0x400, tmp); - tmp = bus_read_4(sc->sc_mem, 0x400); - BHND_DEBUG_DEV(dev, "USB20H fcr: 0x%x", tmp); - - /* Change Shim control reg */ - tmp = bus_read_4(sc->sc_mem, 0x304) & ~0x100; - bus_write_4(sc->sc_mem, 0x304, tmp); - tmp = bus_read_4(sc->sc_mem, 0x304); - BHND_DEBUG_DEV(dev, "USB20H shim: 0x%x", tmp); - } else if (rev >= 5) { - /* BCMA code */ - err = bhnd_alloc_pmu(dev); - if(err) { - BHND_ERROR_DEV(dev, "can't alloc pmu: %d", err); - return (err); - } - - err = bhnd_request_ext_rsrc(dev, 1); - if(err) { - BHND_ERROR_DEV(dev, "can't req ext: %d", err); - return (err); - } - /* Take out of resets */ - bus_write_4(sc->sc_mem, 0x200, 0x4ff); - DELAY(25); - bus_write_4(sc->sc_mem, 0x200, 0x6ff); - DELAY(25); - - /* Make sure digital and AFE are locked in USB PHY */ - bus_write_4(sc->sc_mem, 0x524, 0x6b); - DELAY(50); - bus_read_4(sc->sc_mem, 0x524); - DELAY(50); - bus_write_4(sc->sc_mem, 0x524, 0xab); - DELAY(50); - bus_read_4(sc->sc_mem, 0x524); - DELAY(50); - bus_write_4(sc->sc_mem, 0x524, 0x2b); - DELAY(50); - bus_read_4(sc->sc_mem, 0x524); - DELAY(50); - bus_write_4(sc->sc_mem, 0x524, 0x10ab); - DELAY(50); - bus_read_4(sc->sc_mem, 0x524); - - tries = 10000; - for (;;) { - DELAY(10); - tmp = bus_read_4(sc->sc_mem, 0x528); - if (tmp & 0xc000) - break; - if (--tries != 0) - continue; - - tmp = bus_read_4(sc->sc_mem, 0x528); - BHND_ERROR_DEV(dev, "USB20H mdio_rddata 0x%08x", tmp); - } - - /* XXX: Puzzle code */ - bus_write_4(sc->sc_mem, 0x528, 0x80000000); - bus_read_4(sc->sc_mem, 0x314); - DELAY(265); - bus_write_4(sc->sc_mem, 0x200, 0x7ff); - DELAY(10); - - /* Take USB and HSIC out of non-driving modes */ - bus_write_4(sc->sc_mem, 0x510, 0); - } - } - - bus_generic_probe(dev); - - if (bhnd_get_device(dev) == BHND_COREID_USB20H && - ( bhnd_get_hwrev(dev) > 0)) - bhnd_usb_add_child(dev, 0, "ehci", -1); - bhnd_usb_add_child(dev, 1, "ohci", -1); - - bus_generic_attach(dev); - - return (0); -} - -static struct rman * -bhnd_usb_get_rman(device_t bus, int type, u_int flags) -{ - struct bhnd_usb_softc *sc = device_get_softc(bus); - - switch (type) { - case SYS_RES_MEMORY: - return (&sc->sc_mem_rman); - default: - return (NULL); - } -} - -static struct resource * -bhnd_usb_alloc_resource(device_t bus, device_t child, int type, int *rid, - rman_res_t start, rman_res_t end, rman_res_t count, u_int flags) -{ - struct resource *rv; - struct resource_list *rl; - struct resource_list_entry *rle; - int passthrough, isdefault; - - isdefault = RMAN_IS_DEFAULT_RANGE(start,end); - passthrough = (device_get_parent(child) != bus); - rle = NULL; - - if (!passthrough && isdefault) { - BHND_INFO_DEV(bus, "trying allocate def %d - %d for %s", type, - *rid, device_get_nameunit(child) ); - - rl = BUS_GET_RESOURCE_LIST(bus, child); - rle = resource_list_find(rl, type, *rid); - if (rle == NULL) - return (NULL); - if (rle->res != NULL) - panic("%s: resource entry is busy", __func__); - start = rle->start; - end = rle->end; - count = rle->count; - } else { - BHND_INFO_DEV(bus, "trying allocate %d - %d (%jx-%jx) for %s", type, - *rid, start, end, device_get_nameunit(child) ); - } - - /* - * If the request is for a resource which we manage, - * attempt to satisfy the allocation ourselves. - */ - if (type == SYS_RES_MEMORY) { - rv = bus_generic_rman_alloc_resource(bus, child, type, rid, - start, end, count, flags); - if (rv == NULL) { - BHND_ERROR_DEV(bus, "could not allocate resource"); - return (NULL); - } - - return (rv); - } - - /* - * Pass the request to the parent. - */ - return (bus_generic_rl_alloc_resource(bus, child, type, rid, start, end, - count, flags)); -} - -static struct resource_list * -bhnd_usb_get_reslist(device_t dev, device_t child) -{ - struct bhnd_usb_devinfo *sdi; - - sdi = device_get_ivars(child); - - return (&sdi->sdi_rl); -} - -static int -bhnd_usb_release_resource(device_t dev, device_t child, - struct resource *r) -{ - struct bhnd_usb_softc *sc; - struct resource_list_entry *rle; - bool passthrough; - int error; - - sc = device_get_softc(dev); - passthrough = (device_get_parent(child) != dev); - - /* Delegate to our parent device's bus if the requested resource type - * isn't handled locally. */ - if (type != SYS_RES_MEMORY) { - return (bus_generic_rl_release_resource(dev, child, r)); - } - - error = bus_generic_rman_release_resource(dev, child, r); - if (error != 0) - return (error); - - if (!passthrough) { - /* Clean resource list entry */ - rle = resource_list_find(BUS_GET_RESOURCE_LIST(dev, child), - rman_get_type(r), rman_get_rid(r)); - if (rle != NULL) - rle->res = NULL; - } - - return (0); -} - -static int -bhnd_usb_activate_resource(device_t dev, device_t child, struct resource *r) -{ - if (type != SYS_RES_MEMORY) - return (bus_generic_activate_resource(dev, child, r)); - return (bus_generic_rman_activate_resource(dev, child, r)); -} - -static int -bhnd_usb_deactivate_resource(device_t dev, device_t child, struct resource *r) -{ - if (type != SYS_RES_MEMORY) - return (bus_generic_deactivate_resource(dev, child, r)); - return (bus_generic_rman_deactivate_resource(dev, child, r)); -} - -static int -bhnd_usb_map_resource(device_t dev, device_t child, int type, - struct resource *r, struct resource_map_request *argsp, - struct resource_map *map) -{ - struct bhnd_usb_softc *sc = device_get_softc(dev); - struct resource_map_request args; - rman_res_t length, start; - int error; - - if (type != SYS_RES_MEMORY) - return (bus_generic_map_resource(dev, child, type, r, argsp, - map)); - - /* Resources must be active to be mapped. */ - if (!(rman_get_flags(r) & RF_ACTIVE)) - return (ENXIO); - - resource_init_map_request(&args); - error = resource_validate_map_request(r, argsp, &args, &start, &length); - if (error) - return (error); - - args.offset = start - rman_get_start(sc->sc_mem); - args.length = length; - return (bus_generic_map_resource(dev, child, type, sc->sc_mem, &args, - map)); -} - -static int -bhnd_usb_unmap_resource(device_t dev, device_t child, int type, - struct resource *r, struct resource_map *map) -{ - struct bhnd_usb_softc *sc = device_get_softc(dev); - - if (type == SYS_RES_MEMORY) - r = sc->sc_mem; - return (bus_generic_unmap_resource(dev, child, type, r, map)); -} - -static int -bhnd_usb_print_all_resources(device_t dev) -{ - struct bhnd_usb_devinfo *sdi; - struct resource_list *rl; - int retval; - - retval = 0; - sdi = device_get_ivars(dev); - rl = &sdi->sdi_rl; - - if (STAILQ_FIRST(rl)) - retval += printf(" at"); - - retval += resource_list_print_type(rl, "mem", SYS_RES_MEMORY, "%jx"); - retval += resource_list_print_type(rl, "irq", SYS_RES_IRQ, "%ld"); - - return (retval); -} - -static int -bhnd_usb_print_child(device_t bus, device_t child) -{ - int retval = 0; - - retval += bus_print_child_header(bus, child); - retval += bhnd_usb_print_all_resources(child); - if (device_get_flags(child)) - retval += printf(" flags %#x", device_get_flags(child)); - retval += printf(" on %s\n", device_get_nameunit(bus)); - - return (retval); -} - -static device_t -bhnd_usb_add_child(device_t dev, u_int order, const char *name, int unit) -{ - struct bhnd_usb_softc *sc; - struct bhnd_usb_devinfo *sdi; - device_t child; - int error; - - sc = device_get_softc(dev); - - sdi = malloc(sizeof(struct bhnd_usb_devinfo), M_DEVBUF, M_NOWAIT|M_ZERO); - if (sdi == NULL) - return (NULL); - - resource_list_init(&sdi->sdi_rl); - sdi->sdi_irq_mapped = false; - - if (strncmp(name, "ohci", 4) == 0) - { - sdi->sdi_maddr = sc->sc_maddr + 0x000; - sdi->sdi_msize = 0x200; - } - else if (strncmp(name, "ehci", 4) == 0) - { - sdi->sdi_maddr = sc->sc_maddr + 0x000; - sdi->sdi_msize = 0x1000; - } - else - { - panic("Unknown subdevice"); - } - *** 149 LINES SKIPPED *** From nobody Sat Jun 1 23:31: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 4VsGTZ2vTZz5LXp7; Sat, 01 Jun 2024 23:31: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 4VsGTZ2T71z42GF; Sat, 1 Jun 2024 23:31:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717284690; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=l7hjrJsXP78Xq49Hc4B+9H6gWbtkmekhn8RzMbLnwVg=; b=k2AgIg+dd5oQzhfhXwxG6oPHfnNzKN5sCvMo4uKiK4MBtqJHcI72eOg5i7JANU5lY45bDD 7rAQb8VclRcB2g0KGsMoy2MIbD1AUIu8eQdWSvD7oEApe98ERhQzReDiZ4zuyghsZ8cOoQ PB4f2GGbSnGnXTS7rt7DKBXkLsYUCcEiFGd4Lj31tE1Uhs/GU4PaJQBL8Va7ihPwHT5KXG 5RFE9e9OogC2D8lsbzsn0awMorcQJuTy+ViqBpUc6ETPQJmW+xpadPJUFZWL9v0zsGN5uC kEOduLid5F4PQs6v1qFgwlX4JZunjuPRT1N1j2Ghm3O1WW6TOku2kXVopTHfrw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1717284690; a=rsa-sha256; cv=none; b=R/QTM+xGTRgQv18sjCtV6UQ+5P0uzaEQ3VBetY8XBVcJgB4bc7BtUHwixUYHA3fZZ3vm6k 2tBFQe4REYlADj9afqnFhkRvxS0rTEj4DcF2HExJwPcBYnOFR32TCaNM624NcxWuYO9V5L PS6deGlX2fANCDl9hygQQKBBI0R0ICnufcqkMS51ev81PXW5t1Fr8NnCKvHRk79gKvbfd6 GUFZJ7lDXVvSc9PVagdGc/K5scgjFBTr05ZuzHGH7flMkYaKIchcGI0BjBygElX/2Ff84L /R3VVUET4Y0ToQTodORJDCbxb490oQ27HmkWfWfvSl2pbMOYiW6PIjbB+GHAow== 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=1717284690; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=l7hjrJsXP78Xq49Hc4B+9H6gWbtkmekhn8RzMbLnwVg=; b=n8l40PYOjFA4vNSz7hbr9oUHpR96M0NJ5Od5/BM2aZ1YneZgwTlkyN9kCVod+dmy8fMGFW pAcpnQTo+LRUvlis0z0yD1pPvh4E+ERlwKL67bbRNEW8im5hBIgnJbsSaAKMG2CBaA6SCH c+pQ7Co7ZALejZloankfBqQP+NnZQr6iSnbvxckHm8CoQlgDyj2/ItzPbEXS4jfhcNFh4F O/HqVn9chz4Fwq7D88ajotyrtXqD89k6f9vTNGYehwZ0CaPFqQk5W2QloGEl2WriK/eu7S tHGaeQODcgI+meg9wgnHtUO6cjaLgvRH5X0ntNFJojPnWddqt2asO8HLj/WgQQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VsGTZ259mzS6t; Sat, 1 Jun 2024 23:31: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 451NVUT5003256; Sat, 1 Jun 2024 23:31:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 451NVUDj003253; Sat, 1 Jun 2024 23:31:30 GMT (envelope-from git) Date: Sat, 1 Jun 2024 23:31:30 GMT Message-Id: <202406012331.451NVUDj003253@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: e461c7bc7dde - main - mdconfig: remove the "cluster" option. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: e461c7bc7dde5dc84dc9e04cb623c6f567bfe6e5 Auto-Submitted: auto-generated The branch main has been updated by asomers: URL: https://cgit.FreeBSD.org/src/commit/?id=e461c7bc7dde5dc84dc9e04cb623c6f567bfe6e5 commit e461c7bc7dde5dc84dc9e04cb623c6f567bfe6e5 Author: Alan Somers AuthorDate: 2024-06-01 18:38:16 +0000 Commit: Alan Somers CommitDate: 2024-06-01 23:31:04 +0000 mdconfig: remove the "cluster" option. It's never had any effect. The kernel ignores it. Remove it from the documentation. But continue to parse it on the command line, for backwards-compatibility. Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/1271 --- sbin/mdconfig/mdconfig.8 | 4 +--- sbin/mdconfig/mdconfig.c | 31 +++++++++++++++---------------- 2 files changed, 16 insertions(+), 19 deletions(-) diff --git a/sbin/mdconfig/mdconfig.8 b/sbin/mdconfig/mdconfig.8 index 73d4b30aac35..9a86a9c686fd 100644 --- a/sbin/mdconfig/mdconfig.8 +++ b/sbin/mdconfig/mdconfig.8 @@ -33,7 +33,7 @@ .\" SUCH DAMAGE. .\" from: src/usr.sbin/vnconfig/vnconfig.8,v 1.19 2000/12/27 15:30:29 .\" -.Dd August 27, 2021 +.Dd June 1, 2024 .Dt MDCONFIG 8 .Os .Sh NAME @@ -230,8 +230,6 @@ option tends to waste memory by giving unwanted double caching, but it saves time if there is memory to spare. .It Oo Cm no Oc Ns Cm reserve Allocate and reserve all needed storage from the start, rather than as needed. -.It Oo Cm no Oc Ns Cm cluster -Enable clustering on this disk. .It Oo Cm no Oc Ns Cm compress Enable/disable compression features to reduce memory usage. .It Oo Cm no Oc Ns Cm force diff --git a/sbin/mdconfig/mdconfig.c b/sbin/mdconfig/mdconfig.c index abcb34c1fed1..4b03dd81e591 100644 --- a/sbin/mdconfig/mdconfig.c +++ b/sbin/mdconfig/mdconfig.c @@ -87,7 +87,7 @@ usage(void) " mdconfig -l [-v] [-n] [-f file] [-u unit]\n" " mdconfig file\n"); fprintf(stderr, "\t\ttype = {malloc, vnode, swap}\n"); - fprintf(stderr, "\t\toption = {async, cache, cluster, compress,\n"); + fprintf(stderr, "\t\toption = {async, cache, compress,\n"); fprintf(stderr, "\t\t force, mustdealloc, readonly, ro,\n"); fprintf(stderr, "\t\t reserve, verify}\n"); fprintf(stderr, "\t\tsize = %%d (512 byte blocks), %%db (B),\n"); @@ -156,13 +156,13 @@ main(int argc, char **argv) mdio.md_options |= MD_AUTOUNIT | MD_COMPRESS; } else if (!strcmp(optarg, "vnode")) { mdio.md_type = MD_VNODE; - mdio.md_options |= MD_CLUSTER | MD_AUTOUNIT | MD_COMPRESS; + mdio.md_options |= MD_AUTOUNIT | MD_COMPRESS; } else if (!strcmp(optarg, "swap")) { mdio.md_type = MD_SWAP; - mdio.md_options |= MD_CLUSTER | MD_AUTOUNIT | MD_COMPRESS; + mdio.md_options |= MD_AUTOUNIT | MD_COMPRESS; } else if (!strcmp(optarg, "null")) { mdio.md_type = MD_NULL; - mdio.md_options |= MD_CLUSTER | MD_AUTOUNIT | MD_COMPRESS; + mdio.md_options |= MD_AUTOUNIT | MD_COMPRESS; } else errx(1, "unknown type: %s", optarg); break; @@ -182,10 +182,15 @@ main(int argc, char **argv) mdio.md_options |= MD_CACHE; else if (!strcmp(optarg, "nocache")) mdio.md_options &= ~MD_CACHE; - else if (!strcmp(optarg, "cluster")) - mdio.md_options |= MD_CLUSTER; - else if (!strcmp(optarg, "nocluster")) - mdio.md_options &= ~MD_CLUSTER; + /* + * For backwards-compatibility, continue to recognize + * "cluster" + */ + else if (!strcmp(optarg, "cluster") || + !strcmp(optarg, "nocluster")) + { + warnx("Option cluster is ignored"); + } else if (!strcmp(optarg, "compress")) mdio.md_options |= MD_COMPRESS; else if (!strcmp(optarg, "nocompress")) @@ -282,13 +287,11 @@ main(int argc, char **argv) if (fflag != NULL || argc > 0) { /* Imply ``-t vnode'' */ mdio.md_type = MD_VNODE; - mdio.md_options |= MD_CLUSTER | MD_AUTOUNIT | - MD_COMPRESS; + mdio.md_options |= MD_AUTOUNIT | MD_COMPRESS; } else if (sflag != NULL) { /* Imply ``-t swap'' */ mdio.md_type = MD_SWAP; - mdio.md_options |= MD_CLUSTER | MD_AUTOUNIT | - MD_COMPRESS; + mdio.md_options |= MD_AUTOUNIT | MD_COMPRESS; } else errx(1, "unable to determine type"); } @@ -434,10 +437,6 @@ print_options(const char *dev, const char *file) printf("%scache", sep); sep = ","; } - if (mdiox.md_options & MD_CLUSTER) { - printf("%scluster", sep); - sep = ","; - } if (mdiox.md_options & MD_COMPRESS) { printf("%scompress", sep); sep = ","; From nobody Sun Jun 2 05:40: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 4VsQgv6RMhz5M66l; Sun, 02 Jun 2024 05:40:59 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Received: from omta002.cacentral1.a.cloudfilter.net (omta002.cacentral1.a.cloudfilter.net [3.97.99.33]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "Client", Issuer "CA" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VsQgv4PLRz4X0Z; Sun, 2 Jun 2024 05:40:59 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Authentication-Results: mx1.freebsd.org; none Received: from shw-obgw-4002a.ext.cloudfilter.net ([10.228.9.250]) by cmsmtp with ESMTPS id DPXlscXWQdrxEDdxisK16l; Sun, 02 Jun 2024 05:40:58 +0000 Received: from spqr.komquats.com ([70.66.152.170]) by cmsmtp with ESMTPSA id DdxgsbisB9Cr4DdxhsYF1J; Sun, 02 Jun 2024 05:40:58 +0000 X-Auth-User: cschuber X-Authority-Analysis: v=2.4 cv=etl8zZpX c=1 sm=1 tr=0 ts=665c05ea a=y8EK/9tc/U6QY+pUhnbtgQ==:117 a=y8EK/9tc/U6QY+pUhnbtgQ==:17 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=T1WGqf2p2xoA:10 a=YxBL1-UpAAAA:8 a=6I5d2MoRAAAA:8 a=EkcXrb_YAAAA:8 a=pQs5aej7AAAA:8 a=-wuKhKTYAAAA:8 a=TUg3-ww4CDUyCMY4IvIA:9 a=QEXdDO2ut3YA:10 a=Ia-lj3WSrqcvXOmTRaiG:22 a=IjZwj45LgO3ly-622nXo:22 a=LK5xJRSDVpKd5WXXoEvA:22 Received: from slippy.cwsent.com (slippy [10.1.1.91]) by spqr.komquats.com (Postfix) with ESMTP id 2C2FB1BF6; Sat, 01 Jun 2024 22:40:56 -0700 (PDT) Received: from slippy (localhost [IPv6:::1]) by slippy.cwsent.com (Postfix) with ESMTP id 0DBD3B7; Sat, 01 Jun 2024 22:40:56 -0700 (PDT) Date: Sat, 1 Jun 2024 22:40:55 -0700 From: Cy Schubert To: Nuno Teixeira Cc: Warner Losh , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 108de784513d - main - Redefine CLOCK_BOOTTIME to alias CLOCK_MONOTONIC, not CLOCK_UPTIME Message-ID: <20240601224055.6a6cac10@slippy> In-Reply-To: References: <202405311447.44VEl1G1078199@gitrepo.freebsd.org> Organization: KOMQUATS X-Mailer: Claws Mail 3.19.1 (GTK+ 2.24.33; amd64-portbld-freebsd15.0) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-CMAE-Envelope: MS4xfEvjU7mqDBMGToVPqyfNf0PfbuZqD0Tv7zzzQOeM+KdzXlOYW0bkH/vV7+Vuz9VVO+j6YPxyXkWkCybOwmBMbmM7en4n02NL0vxRKBvdBtxL2VDT6sdV znCrYIbZvVd6r2LVvORpwOj/NQQVwIL8NneVtojEYV+O3eDa2dmzTltCpRt050poy9+6vlxiPGMMtG+aRmgdlZltzZ0snzb+tTVakYS+9jFwdfBSICNnLLfJ qtrTsDMTFX5gYri6rZYQ/MfPIcwfBfxQvZdHvkjD6FfDnMhgZhk6XpKCYq3ABA+26fH7n4OhYHTZFJ4lw+eSJngmvZuv6PPQfUuFGOPBJyMdzPQ9nwF8VbZm ND3PgwHx X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:16509, ipnet:3.96.0.0/15, country:US] X-Rspamd-Queue-Id: 4VsQgv4PLRz4X0Z Hi eduardo@, Patches for mesa-dri, wpa-supplicant* and hostapd* have been pushed. These ports are no longer broken under the latest 15-CURRENT now. --=20 Cheers, Cy Schubert FreeBSD UNIX: Web: https://FreeBSD.org NTP: Web: https://nwtime.org e^(i*pi)+1=3D0 On Sat, 1 Jun 2024 09:37:00 +0100 Nuno Teixeira wrote: > Hello, >=20 > Having issues building graphics/mesa-dri: >=20 > ../src/intel/common/xe/intel_gem.c:72:9: error: duplicate case value '4' > 72 | case CLOCK_BOOTTIME: > | ^ > /usr/include/sys/_clock_id.h:81:25: note: expanded from macro > 'CLOCK_BOOTTIME' > 81 | #define CLOCK_BOOTTIME CLOCK_MONOTONIC > | ^ > /usr/include/sys/_clock_id.h:56:26: note: expanded from macro > 'CLOCK_MONOTONIC' > 56 | #define CLOCK_MONOTONIC 4 > | ^ > ../src/intel/common/xe/intel_gem.c:66:9: note: previous case defined here > 66 | case CLOCK_MONOTONIC: > | ^ > /usr/include/sys/_clock_id.h:56:26: note: expanded from macro > 'CLOCK_MONOTONIC' > 56 | #define CLOCK_MONOTONIC 4 > | ^ > 1 error generated. >=20 > Thanks >=20 > Warner Losh escreveu (sexta, 31/05/2024 =C3=A0(s) 15:47= ): >=20 > > The branch main has been updated by imp: > > > > URL: > > https://cgit.FreeBSD.org/src/commit/?id=3D108de784513d87bbe850e7b003a73= e26b5b54caa > > > > commit 108de784513d87bbe850e7b003a73e26b5b54caa > > Author: Val Packett > > AuthorDate: 2024-05-31 14:45:02 +0000 > > Commit: Warner Losh > > CommitDate: 2024-05-31 14:45:02 +0000 > > > > Redefine CLOCK_BOOTTIME to alias CLOCK_MONOTONIC, not CLOCK_UPTIME > > > > The suspend-awareness situation with monotonic clocks across platfo= rms > > is kind of a mess, let's try not making it worse. > > > > On Linux, CLOCK_MONOTONIC does NOT count suspended time, and > > CLOCK_BOOTTIME was introduced to INCLUDE suspended time. > > > > On OpenBSD, CLOCK_MONOTONIC DOES count suspended time, and CLOCK_UP= TIME > > was introduced to EXCLUDE suspended time. > > > > On macOS, it's the same as OpenBSD, but with CLOCK_UPTIME_RAW. > > > > Right now, we do not have a monotonic clock that counts suspended t= ime. > > We have CLOCK_UPTIME as a distinct ID alias, and CLOCK_BOOTTIME as a > > preprocessor alias, both being effectively `CLOCK_MONOTONIC` for no= w. > > > > When we introduce a suspend-aware clock in the future, it would mak= e a > > lot more sense to do it the OpenBSD/macOS way, i.e. to make > > CLOCK_MONOTONIC include suspended time and make CLOCK_UPTIME exclude > > it, > > because that's what the name CLOCK_UPTIME implies: a deviation from= the > > default intended for the uptime command to allow it to only show the > > time the system was actually up and not suspended. > > > > Let's change the define right now to make sure software using the > > define > > would not end up using the ID of the wrong clock in the future, and= fix > > the IDs in the Linux compat code to match the expected changes too. > > > > See https://bugzilla.mozilla.org/show_bug.cgi?id=3D1824084 > > for more discussion. > > > > Fixes: 155f15118a77 ("clock_gettime: Add Linux aliases for > > CLOCK_*") > > Fixes: 25ada637362d ("Map Linux CLOCK_BOOTTIME to native > > CLOCK_UPTIME.") > > Sponsored by: https://www.patreon.com/valpackett > > Reviewed by: kib, imp > > Differential Revision: https://reviews.freebsd.org/D39270 > > --- > > sys/compat/linux/linux_time.c | 6 +++--- > > sys/sys/_clock_id.h | 2 +- > > 2 files changed, 4 insertions(+), 4 deletions(-) > > > > diff --git a/sys/compat/linux/linux_time.c b/sys/compat/linux/linux_tim= e.c > > index e9e5cf075210..f4dd26dd3d2a 100644 > > --- a/sys/compat/linux/linux_time.c > > +++ b/sys/compat/linux/linux_time.c > > @@ -287,7 +287,7 @@ linux_to_native_clockid(clockid_t *n, clockid_t l) > > *n =3D CLOCK_REALTIME; > > break; > > case LINUX_CLOCK_MONOTONIC: > > - *n =3D CLOCK_MONOTONIC; > > + *n =3D CLOCK_UPTIME; > > break; > > case LINUX_CLOCK_PROCESS_CPUTIME_ID: > > *n =3D CLOCK_PROCESS_CPUTIME_ID; > > @@ -300,10 +300,10 @@ linux_to_native_clockid(clockid_t *n, clockid_t l) > > break; > > case LINUX_CLOCK_MONOTONIC_COARSE: > > case LINUX_CLOCK_MONOTONIC_RAW: > > - *n =3D CLOCK_MONOTONIC_FAST; > > + *n =3D CLOCK_UPTIME_FAST; > > break; > > case LINUX_CLOCK_BOOTTIME: > > - *n =3D CLOCK_UPTIME; > > + *n =3D CLOCK_MONOTONIC; > > break; > > case LINUX_CLOCK_REALTIME_ALARM: > > case LINUX_CLOCK_BOOTTIME_ALARM: > > diff --git a/sys/sys/_clock_id.h b/sys/sys/_clock_id.h > > index 47a551428dc3..728346a0f0ab 100644 > > --- a/sys/sys/_clock_id.h > > +++ b/sys/sys/_clock_id.h > > @@ -78,7 +78,7 @@ > > * Linux compatible names. > > */ > > #if __BSD_VISIBLE > > -#define CLOCK_BOOTTIME CLOCK_UPTIME > > +#define CLOCK_BOOTTIME CLOCK_MONOTONIC > > #define CLOCK_REALTIME_COARSE CLOCK_REALTIME_FAST > > #define CLOCK_MONOTONIC_COARSE CLOCK_MONOTONIC_FAST > > #endif > > > > >=20 From nobody Sun Jun 2 07:47: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 4VsTVg6PX6z5MJBk; Sun, 02 Jun 2024 07:48:11 +0000 (UTC) (envelope-from eduardo@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 4VsTVg61zCz4h48; Sun, 2 Jun 2024 07:48:11 +0000 (UTC) (envelope-from eduardo@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717314491; 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=o3acO/t2ych00gn7QBPDz0Y5BjFgSqYsUtaB6UTUeM0=; b=GOXL/1li5ELbJrp9cB/bqmBOObIjZUeRiDxEFPJQ3jn5V2U367c+i8vLrDHafIAnCvsZqj xMXwM+r2nGJq1kH/tBPmbBF144YQgH+qb2js5TNiDyt1Q5RmdIzZ+S9i4UG88CjZDfNdHk o7CptU9dI/TT5GGuI5yXmj+nvjjAPVbW6lTj/LJNT/h1TrteGqDR5rG2c+eXNmY8HM6Jo7 Ss5GK2Da80i/Tth/PlRIE+1LsQHCtZqjjHiKJH17Kz4c0EC5/C2cPtz2X528Bdj0ncUwy1 iCgfowLQMKUNZVpkNm0LtdRHgpuORxIziAcWaK7nO9KpO6ClnNAeQn2HNZO3FQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1717314491; a=rsa-sha256; cv=none; b=DqEN72dqgFCBtbpo6NmZhYj2feejfKhrrPZW+/zWRAtj7Qsb2cYpqrPPY+kI5YvlhDQR3m 8NGtvLBWuNqWhmkz5K9+CCmS5f0OECl90idaQGxLHxZGZuxG8RiKy28XFaXRuY0bKd3avh JpFWoh5/Oslmby61faUN2MJnTOhEU0yfkaEKgwOQAHM0BjuI5oUR01c72ErclSuUXt96dV Kg7glTQ2aqJ5yC9G3yj6SHN4AK9Xeb/KTJOI/QjHii6LJV6jt/KxoR6DxhjVE/ISQBIIOB mEgqCa1nqEfGEX1SVz9sofziBe0eBNKg1wZBX1XW6K0hQm5pqz7DTxNE+aA/UQ== 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=1717314491; 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=o3acO/t2ych00gn7QBPDz0Y5BjFgSqYsUtaB6UTUeM0=; b=gj10MquIELGb1AqCJrlpM3RjBnUrIC3rBjXiEHveycmi080FoxQFDlYzEY5GoJIPuCDX9u LPH40vS7fRPGsFe7aa22o6UsgI8fmSTSEqgUHmaVjROo9S9biCiJsS+KdhRw5oc5Yp81yE huxbrvK8p4PNHTxGTWfldX6R7Lz4zpmefZEZopYZltRFQqBm0l2J3JAIwpiSDNpCvRTREn H/QhO35nPoB7KgPvKJlXtr8ScihT6qDtAaTzmG4O4GucdQc53r7PfIJuH1IBL5Aqta+WhA 29EHfNwuYhEDswYvL4+V8G9jyb23TtVlh5wMBKb4FxhkLgS6Jm0q71s9Cu38PA== Received: from mail-oi1-f173.google.com (mail-oi1-f173.google.com [209.85.167.173]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "WR4" (verified OK)) (Authenticated sender: eduardo) by smtp.freebsd.org (Postfix) with ESMTPSA id 4VsTVg5PXCz1K4Z; Sun, 2 Jun 2024 07:48:11 +0000 (UTC) (envelope-from eduardo@freebsd.org) Received: by mail-oi1-f173.google.com with SMTP id 5614622812f47-3d19dfb3dceso1868567b6e.1; Sun, 02 Jun 2024 00:48:11 -0700 (PDT) X-Forwarded-Encrypted: i=1; AJvYcCUTgYUMo1V2H/rubhgdR6rXmPgca7hRL2v8Zco1ZG6mELxkx3sQWTAO+VYDtuQ4Yu3LhHiuH2p44vcDT86FYNySo0kgjBjLg7YVcML4c0/0Q2NtJrBWB7+GlRpbhYvayUyhG16bUg/Up4OTes4oVSREHkEXQbnuEb8+1qJeO2dRg0UJdWTeK5fV7YXbEas= X-Gm-Message-State: AOJu0YwCIKlf8JOBVRzRUSbbjatYv9qfPud3iTO1X7Z9bcAln8hzDDdx TqlXgMnUIoEt1iOBVuTOUQNk4aQL3kQsE8o7cLqUb0La0gcGAp7bIfCqWLImhYMaKDcrFgmn0GE GWopS6p9BwN2zYWf07m1csLha4UI= X-Google-Smtp-Source: AGHT+IGbARQOdqoAbI0KOGLfHPau0GNI37KnWK6VhslK0qfvL9ecBFL3+U509x9QLfjJVDDsj9PW/Py2En3I5lnpAxw= X-Received: by 2002:a05:6808:181f:b0:3d1:be9f:c9a3 with SMTP id 5614622812f47-3d1e31ee10fmr8320737b6e.0.1717314490686; Sun, 02 Jun 2024 00:48:10 -0700 (PDT) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 References: <202405311447.44VEl1G1078199@gitrepo.freebsd.org> <20240601224055.6a6cac10@slippy> In-Reply-To: <20240601224055.6a6cac10@slippy> From: Nuno Teixeira Date: Sun, 2 Jun 2024 08:47:57 +0100 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: git: 108de784513d - main - Redefine CLOCK_BOOTTIME to alias CLOCK_MONOTONIC, not CLOCK_UPTIME To: Cy Schubert Cc: Warner Losh , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Content-Type: multipart/alternative; boundary="0000000000002f69bf0619e3707c" --0000000000002f69bf0619e3707c Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Hello! Thank you for quick fix. Cheers, Cy Schubert escreveu (domingo, 2/06/2024 =C3=A0= (s) 06:41): > Hi eduardo@, > > Patches for mesa-dri, wpa-supplicant* and hostapd* have been pushed. > These ports are no longer broken under the latest 15-CURRENT now. > > -- > Cheers, > Cy Schubert > FreeBSD UNIX: Web: https://FreeBSD.org > NTP: Web: https://nwtime.org > > e^(i*pi)+1=3D0 > > > On Sat, 1 Jun 2024 09:37:00 +0100 > Nuno Teixeira wrote: > > > Hello, > > > > Having issues building graphics/mesa-dri: > > > > ../src/intel/common/xe/intel_gem.c:72:9: error: duplicate case value '4= ' > > 72 | case CLOCK_BOOTTIME: > > | ^ > > /usr/include/sys/_clock_id.h:81:25: note: expanded from macro > > 'CLOCK_BOOTTIME' > > 81 | #define CLOCK_BOOTTIME CLOCK_MONOTONIC > > | ^ > > /usr/include/sys/_clock_id.h:56:26: note: expanded from macro > > 'CLOCK_MONOTONIC' > > 56 | #define CLOCK_MONOTONIC 4 > > | ^ > > ../src/intel/common/xe/intel_gem.c:66:9: note: previous case defined he= re > > 66 | case CLOCK_MONOTONIC: > > | ^ > > /usr/include/sys/_clock_id.h:56:26: note: expanded from macro > > 'CLOCK_MONOTONIC' > > 56 | #define CLOCK_MONOTONIC 4 > > | ^ > > 1 error generated. > > > > Thanks > > > > Warner Losh escreveu (sexta, 31/05/2024 =C3=A0(s) 15:= 47): > > > > > The branch main has been updated by imp: > > > > > > URL: > > > > https://cgit.FreeBSD.org/src/commit/?id=3D108de784513d87bbe850e7b003a73e2= 6b5b54caa > > > > > > commit 108de784513d87bbe850e7b003a73e26b5b54caa > > > Author: Val Packett > > > AuthorDate: 2024-05-31 14:45:02 +0000 > > > Commit: Warner Losh > > > CommitDate: 2024-05-31 14:45:02 +0000 > > > > > > Redefine CLOCK_BOOTTIME to alias CLOCK_MONOTONIC, not CLOCK_UPTIM= E > > > > > > The suspend-awareness situation with monotonic clocks across > platforms > > > is kind of a mess, let's try not making it worse. > > > > > > On Linux, CLOCK_MONOTONIC does NOT count suspended time, and > > > CLOCK_BOOTTIME was introduced to INCLUDE suspended time. > > > > > > On OpenBSD, CLOCK_MONOTONIC DOES count suspended time, and > CLOCK_UPTIME > > > was introduced to EXCLUDE suspended time. > > > > > > On macOS, it's the same as OpenBSD, but with CLOCK_UPTIME_RAW. > > > > > > Right now, we do not have a monotonic clock that counts suspended > time. > > > We have CLOCK_UPTIME as a distinct ID alias, and CLOCK_BOOTTIME a= s > a > > > preprocessor alias, both being effectively `CLOCK_MONOTONIC` for > now. > > > > > > When we introduce a suspend-aware clock in the future, it would > make a > > > lot more sense to do it the OpenBSD/macOS way, i.e. to make > > > CLOCK_MONOTONIC include suspended time and make CLOCK_UPTIME > exclude > > > it, > > > because that's what the name CLOCK_UPTIME implies: a deviation > from the > > > default intended for the uptime command to allow it to only show > the > > > time the system was actually up and not suspended. > > > > > > Let's change the define right now to make sure software using the > > > define > > > would not end up using the ID of the wrong clock in the future, > and fix > > > the IDs in the Linux compat code to match the expected changes to= o. > > > > > > See https://bugzilla.mozilla.org/show_bug.cgi?id=3D1824084 > > > for more discussion. > > > > > > Fixes: 155f15118a77 ("clock_gettime: Add Linux aliases f= or > > > CLOCK_*") > > > Fixes: 25ada637362d ("Map Linux CLOCK_BOOTTIME to native > > > CLOCK_UPTIME.") > > > Sponsored by: https://www.patreon.com/valpackett > > > Reviewed by: kib, imp > > > Differential Revision: https://reviews.freebsd.org/D39270 > > > --- > > > sys/compat/linux/linux_time.c | 6 +++--- > > > sys/sys/_clock_id.h | 2 +- > > > 2 files changed, 4 insertions(+), 4 deletions(-) > > > > > > diff --git a/sys/compat/linux/linux_time.c > b/sys/compat/linux/linux_time.c > > > index e9e5cf075210..f4dd26dd3d2a 100644 > > > --- a/sys/compat/linux/linux_time.c > > > +++ b/sys/compat/linux/linux_time.c > > > @@ -287,7 +287,7 @@ linux_to_native_clockid(clockid_t *n, clockid_t l= ) > > > *n =3D CLOCK_REALTIME; > > > break; > > > case LINUX_CLOCK_MONOTONIC: > > > - *n =3D CLOCK_MONOTONIC; > > > + *n =3D CLOCK_UPTIME; > > > break; > > > case LINUX_CLOCK_PROCESS_CPUTIME_ID: > > > *n =3D CLOCK_PROCESS_CPUTIME_ID; > > > @@ -300,10 +300,10 @@ linux_to_native_clockid(clockid_t *n, clockid_t > l) > > > break; > > > case LINUX_CLOCK_MONOTONIC_COARSE: > > > case LINUX_CLOCK_MONOTONIC_RAW: > > > - *n =3D CLOCK_MONOTONIC_FAST; > > > + *n =3D CLOCK_UPTIME_FAST; > > > break; > > > case LINUX_CLOCK_BOOTTIME: > > > - *n =3D CLOCK_UPTIME; > > > + *n =3D CLOCK_MONOTONIC; > > > break; > > > case LINUX_CLOCK_REALTIME_ALARM: > > > case LINUX_CLOCK_BOOTTIME_ALARM: > > > diff --git a/sys/sys/_clock_id.h b/sys/sys/_clock_id.h > > > index 47a551428dc3..728346a0f0ab 100644 > > > --- a/sys/sys/_clock_id.h > > > +++ b/sys/sys/_clock_id.h > > > @@ -78,7 +78,7 @@ > > > * Linux compatible names. > > > */ > > > #if __BSD_VISIBLE > > > -#define CLOCK_BOOTTIME CLOCK_UPTIME > > > +#define CLOCK_BOOTTIME CLOCK_MONOTONIC > > > #define CLOCK_REALTIME_COARSE CLOCK_REALTIME_FAST > > > #define CLOCK_MONOTONIC_COARSE CLOCK_MONOTONIC_FAST > > > #endif > > > > > > > > > > --=20 Nuno Teixeira FreeBSD UNIX: Web: https://FreeBSD.org --0000000000002f69bf0619e3707c Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
Hello!

Thank you for quick f= ix.

Cheers,

Cy Schubert <Cy.Schubert@cschubert.com> escreveu = (domingo, 2/06/2024 =C3=A0(s) 06:41):
Hi eduardo@,

Patches for mesa-dri, wpa-supplicant* and hostapd* have been pushed.
These ports are no longer broken under the latest 15-CURRENT now.

--
Cheers,
Cy Schubert <Cy.Schubert@cschubert.com>
FreeBSD UNIX:=C2=A0 <cy@FreeBSD.org>=C2=A0 =C2=A0Web:=C2=A0 https://FreeB= SD.org
NTP:=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0<cy@nwtime.org>=C2=A0 =C2=A0 Web:=C2=A0 https://nwt= ime.org

=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 e^(i*pi)+1=3D0


On Sat, 1 Jun 2024 09:37:00 +0100
Nuno Teixeira <= eduardo@freebsd.org> wrote:

> Hello,
>
> Having issues building graphics/mesa-dri:
>
> ../src/intel/common/xe/intel_gem.c:72:9: error: duplicate case value &= #39;4'
>=C2=A0 =C2=A0 72 |=C2=A0 =C2=A0 case CLOCK_BOOTTIME:
>=C2=A0 =C2=A0 =C2=A0 =C2=A0|=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0^
> /usr/include/sys/_clock_id.h:81:25: note: expanded from macro
> 'CLOCK_BOOTTIME'
>=C2=A0 =C2=A0 81 | #define CLOCK_BOOTTIME=C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 CLOCK_MONOTONIC
>=C2=A0 =C2=A0 =C2=A0 =C2=A0|=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0^
> /usr/include/sys/_clock_id.h:56:26: note: expanded from macro
> 'CLOCK_MONOTONIC'
>=C2=A0 =C2=A0 56 | #define CLOCK_MONOTONIC=C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A04
>=C2=A0 =C2=A0 =C2=A0 =C2=A0|=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0^
> ../src/intel/common/xe/intel_gem.c:66:9: note: previous case defined h= ere
>=C2=A0 =C2=A0 66 |=C2=A0 =C2=A0 case CLOCK_MONOTONIC:
>=C2=A0 =C2=A0 =C2=A0 =C2=A0|=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0^
> /usr/include/sys/_clock_id.h:56:26: note: expanded from macro
> 'CLOCK_MONOTONIC'
>=C2=A0 =C2=A0 56 | #define CLOCK_MONOTONIC=C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A04
>=C2=A0 =C2=A0 =C2=A0 =C2=A0|=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0^
> 1 error generated.
>
> Thanks
>
> Warner Losh <i= mp@freebsd.org> escreveu (sexta, 31/05/2024 =C3=A0(s) 15:47):
>
> > The branch main has been updated by imp:
> >
> > URL:
> > https://= cgit.FreeBSD.org/src/commit/?id=3D108de784513d87bbe850e7b003a73e26b5b54caa<= /a>
> >
> > commit 108de784513d87bbe850e7b003a73e26b5b54caa
> > Author:=C2=A0 =C2=A0 =C2=A0Val Packett <val@packett.cool> > > AuthorDate: 2024-05-31 14:45:02 +0000
> > Commit:=C2=A0 =C2=A0 =C2=A0Warner Losh <imp@FreeBSD.org> > > CommitDate: 2024-05-31 14:45:02 +0000
> >
> >=C2=A0 =C2=A0 =C2=A0Redefine CLOCK_BOOTTIME to alias CLOCK_MONOTON= IC, not CLOCK_UPTIME
> >
> >=C2=A0 =C2=A0 =C2=A0The suspend-awareness situation with monotonic= clocks across platforms
> >=C2=A0 =C2=A0 =C2=A0is kind of a mess, let's try not making it= worse.
> >
> >=C2=A0 =C2=A0 =C2=A0On Linux, CLOCK_MONOTONIC does NOT count suspe= nded time, and
> >=C2=A0 =C2=A0 =C2=A0CLOCK_BOOTTIME was introduced to INCLUDE suspe= nded time.
> >
> >=C2=A0 =C2=A0 =C2=A0On OpenBSD, CLOCK_MONOTONIC DOES count suspend= ed time, and CLOCK_UPTIME
> >=C2=A0 =C2=A0 =C2=A0was introduced to EXCLUDE suspended time.
> >
> >=C2=A0 =C2=A0 =C2=A0On macOS, it's the same as OpenBSD, but wi= th CLOCK_UPTIME_RAW.
> >
> >=C2=A0 =C2=A0 =C2=A0Right now, we do not have a monotonic clock th= at counts suspended time.
> >=C2=A0 =C2=A0 =C2=A0We have CLOCK_UPTIME as a distinct ID alias, a= nd CLOCK_BOOTTIME as a
> >=C2=A0 =C2=A0 =C2=A0preprocessor alias, both being effectively `CL= OCK_MONOTONIC` for now.
> >
> >=C2=A0 =C2=A0 =C2=A0When we introduce a suspend-aware clock in the= future, it would make a
> >=C2=A0 =C2=A0 =C2=A0lot more sense to do it the OpenBSD/macOS way,= i.e. to make
> >=C2=A0 =C2=A0 =C2=A0CLOCK_MONOTONIC include suspended time and mak= e CLOCK_UPTIME exclude
> > it,
> >=C2=A0 =C2=A0 =C2=A0because that's what the name CLOCK_UPTIME = implies: a deviation from the
> >=C2=A0 =C2=A0 =C2=A0default intended for the uptime command to all= ow it to only show the
> >=C2=A0 =C2=A0 =C2=A0time the system was actually up and not suspen= ded.
> >
> >=C2=A0 =C2=A0 =C2=A0Let's change the define right now to make = sure software using the
> > define
> >=C2=A0 =C2=A0 =C2=A0would not end up using the ID of the wrong clo= ck in the future, and fix
> >=C2=A0 =C2=A0 =C2=A0the IDs in the Linux compat code to match the = expected changes too.
> >
> >=C2=A0 =C2=A0 =C2=A0See https://bugzi= lla.mozilla.org/show_bug.cgi?id=3D1824084
> >=C2=A0 =C2=A0 =C2=A0for more discussion.
> >
> >=C2=A0 =C2=A0 =C2=A0Fixes:=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 155f1= 5118a77 ("clock_gettime: Add Linux aliases for
> > CLOCK_*")
> >=C2=A0 =C2=A0 =C2=A0Fixes:=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 25ada= 637362d ("Map Linux CLOCK_BOOTTIME to native
> > CLOCK_UPTIME.")
> >=C2=A0 =C2=A0 =C2=A0Sponsored by:=C2=A0 =C2=A0https://www= .patreon.com/valpackett
> >=C2=A0 =C2=A0 =C2=A0Reviewed by:=C2=A0 =C2=A0 kib, imp
> >=C2=A0 =C2=A0 =C2=A0Differential Revision:=C2=A0 https://= reviews.freebsd.org/D39270
> > ---
> >=C2=A0 sys/compat/linux/linux_time.c | 6 +++---
> >=C2=A0 sys/sys/_clock_id.h=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0| 2 +-
> >=C2=A0 2 files changed, 4 insertions(+), 4 deletions(-)
> >
> > diff --git a/sys/compat/linux/linux_time.c b/sys/compat/linux/lin= ux_time.c
> > index e9e5cf075210..f4dd26dd3d2a 100644
> > --- a/sys/compat/linux/linux_time.c
> > +++ b/sys/compat/linux/linux_time.c
> > @@ -287,7 +287,7 @@ linux_to_native_clockid(clockid_t *n, clockid= _t l)
> >=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0*n = =3D CLOCK_REALTIME;
> >=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0brea= k;
> >=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0case LINUX_CLOCK_MONOTONIC:
> > -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0*n =3D CL= OCK_MONOTONIC;
> > +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0*n =3D CL= OCK_UPTIME;
> >=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0brea= k;
> >=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0case LINUX_CLOCK_PROCESS_CPUTIME= _ID:
> >=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0*n = =3D CLOCK_PROCESS_CPUTIME_ID;
> > @@ -300,10 +300,10 @@ linux_to_native_clockid(clockid_t *n, clock= id_t l)
> >=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0brea= k;
> >=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0case LINUX_CLOCK_MONOTONIC_COARS= E:
> >=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0case LINUX_CLOCK_MONOTONIC_RAW:<= br> > > -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0*n =3D CL= OCK_MONOTONIC_FAST;
> > +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0*n =3D CL= OCK_UPTIME_FAST;
> >=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0brea= k;
> >=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0case LINUX_CLOCK_BOOTTIME:
> > -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0*n =3D CL= OCK_UPTIME;
> > +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0*n =3D CL= OCK_MONOTONIC;
> >=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0brea= k;
> >=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0case LINUX_CLOCK_REALTIME_ALARM:=
> >=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0case LINUX_CLOCK_BOOTTIME_ALARM:=
> > diff --git a/sys/sys/_clock_id.h b/sys/sys/_clock_id.h
> > index 47a551428dc3..728346a0f0ab 100644
> > --- a/sys/sys/_clock_id.h
> > +++ b/sys/sys/_clock_id.h
> > @@ -78,7 +78,7 @@
> >=C2=A0 =C2=A0* Linux compatible names.
> >=C2=A0 =C2=A0*/
> >=C2=A0 #if __BSD_VISIBLE
> > -#define=C2=A0 =C2=A0 =C2=A0 =C2=A0 CLOCK_BOOTTIME=C2=A0 =C2=A0 = =C2=A0 =C2=A0 =C2=A0 CLOCK_UPTIME
> > +#define=C2=A0 =C2=A0 =C2=A0 =C2=A0 CLOCK_BOOTTIME=C2=A0 =C2=A0 = =C2=A0 =C2=A0 =C2=A0 CLOCK_MONOTONIC
> >=C2=A0 #define=C2=A0 =C2=A0 =C2=A0 =C2=A0 CLOCK_REALTIME_COARSE=C2= =A0 =C2=A0CLOCK_REALTIME_FAST
> >=C2=A0 #define=C2=A0 =C2=A0 =C2=A0 =C2=A0 CLOCK_MONOTONIC_COARSE= =C2=A0 CLOCK_MONOTONIC_FAST
> >=C2=A0 #endif
> >
> >
>



--
Nuno Teixeira
FreeBSD UNIX:=C2=A0 <eduardo@FreeBSD.org>=C2=A0 =C2=A0Web:=C2=A0 https://Fr= eeBSD.org
--0000000000002f69bf0619e3707c-- From nobody Sun Jun 2 09:30: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 4VsWnH6Fzdz5MRMG; Sun, 02 Jun 2024 09:30:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VsWnH5mRgz4q3j; Sun, 2 Jun 2024 09:30:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717320659; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Dq1k46bA7XIwtgdaDOtmlaZEGg050EXnRc42ztwW8pM=; b=QKCoq+Z+pljY9SdvcHICJjb2BDQYaDs94gm4/eUE9fEHrhYvurMVCxKeS68ANMgKvkgGG7 p9WMDOoNtY8gA14NsA6ItIbiuX4Z+cwE77vi98Mei+cWfUUAXFoKFS2VviSnWai7ByswzI NNOWfGdCUOdx6f3a3G9Q2kChjmcoCmKrduKztVU2UkNZTMTCAZwNCWz3eow1qyACNn1/3c A902WUfMopRZ4RkV8qBnFyfEXwZXM2uxRw7vG+MIE9qUaYd0gAc4Sbg4t3l87yvwcEK4Pv H2BoKTKjSqxSiPzOCStRwA9Ypdn2ZYeO0NmMAH6PTH3MfombolyAGbavx2VDpg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1717320659; a=rsa-sha256; cv=none; b=K4bA0pSxjRBStp3ggQ7iz+439jMpArUR40jJ4RBBHf+kLsT5Rpi2pS7XsaaFpRnhC8keGq XVO+vBHPGGBFlIeYyrw5NjxfH5whJvTZCaYE9XZ5D3sFdVL9esC/XfrlGxxU6WvEiD0K2l qJbhko3FD/s1c8ST5NgDSx0RkBGmyaPGuM1F9Yuim8/+Xw4HBx20LgtG29nGVevHVg3SnH hByYElRlfpsnkIrdNPc+DPXAoBH9021uyFzRtb6vSBAgjV+RXwUhoPNQ8Rwfp7v8EgUOs8 L0cOLI9UEIcKO9mXNcRYJGdL+BlrkI6tD31GcW628UQbJ8wOnaVJmq9Q1UtaMA== 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=1717320659; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Dq1k46bA7XIwtgdaDOtmlaZEGg050EXnRc42ztwW8pM=; b=WG6xDfDmM/dn5aRnyk0+ZgPXdw4DZ/WdqV+gMN8FdJehVtUpEev/ezwxbANP7HkrPzEdwY 46U6Xh3LuNYsNU4saoq/2T0bW/SDD/AYlMpbnKWkXNEK5LBGcxB7HwXAI/0M3x6SRLWlIk 2XTdLMxWbEZWgzOlKM7Uk7vboC23IbSGO/Lfzx0ZMxXuZWDeE1PcARLEMydTJC0v3xW2rJ eS5ryKke6tJk/SVp5EfQNLShMdzE6ct6MHDo3dweDE7u2Ks7T3nuAHbchLWhbpMv78FBE6 Ed6+zGLNYgppLzc9zTzy28KiCtmBocbxGLcKjcQKp78fDUHfCFigAbnRSzgbwg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VsWnH5NwKzm42; Sun, 2 Jun 2024 09:30: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 4529Ux5F016040; Sun, 2 Jun 2024 09:30:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4529UxrI016037; Sun, 2 Jun 2024 09:30:59 GMT (envelope-from git) Date: Sun, 2 Jun 2024 09:30:59 GMT Message-Id: <202406020930.4529UxrI016037@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: f5fb251a553e - stable/14 - Merge commit 9f85bc834b07 from llvm-project (by Nikita Popov): List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: f5fb251a553e95a84fcff8ed4a79a9659582019a Auto-Submitted: auto-generated The branch stable/14 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=f5fb251a553e95a84fcff8ed4a79a9659582019a commit f5fb251a553e95a84fcff8ed4a79a9659582019a Author: Dimitry Andric AuthorDate: 2024-05-30 15:35:15 +0000 Commit: Dimitry Andric CommitDate: 2024-06-02 09:30:42 +0000 Merge commit 9f85bc834b07 from llvm-project (by Nikita Popov): [PPCMergeStringPool] Only replace constant once (#92996) In #88846 I changed this code to use RAUW to perform the replacement instead of manual updates -- but kept the outer loop, which means we try to perform RAUW once per user. However, some of the users might be freed by the RAUW operation, resulting in use-after-free. The case where this happens is constant users where the replacement might result in the destruction of the original constant. Fixes https://github.com/llvm/llvm-project/issues/92991. This fixes a possible crash when building crypto/openssh/sshkey.c for PowerPC targets. Reported by: cperciva PR: 276104 MFC after: 3 days (cherry picked from commit f30188c4680a85126e793de157b851bf5ee47529) --- .../llvm/lib/Target/PowerPC/PPCMergeStringPool.cpp | 37 ++++------------------ 1 file changed, 7 insertions(+), 30 deletions(-) diff --git a/contrib/llvm-project/llvm/lib/Target/PowerPC/PPCMergeStringPool.cpp b/contrib/llvm-project/llvm/lib/Target/PowerPC/PPCMergeStringPool.cpp index ebd876d50c44..0830b02370cd 100644 --- a/contrib/llvm-project/llvm/lib/Target/PowerPC/PPCMergeStringPool.cpp +++ b/contrib/llvm-project/llvm/lib/Target/PowerPC/PPCMergeStringPool.cpp @@ -290,13 +290,6 @@ bool PPCMergeStringPool::mergeModuleStringPool(Module &M) { return true; } -static bool userHasOperand(User *TheUser, GlobalVariable *GVOperand) { - for (Value *Op : TheUser->operands()) - if (Op == GVOperand) - return true; - return false; -} - // For pooled strings we need to add the offset into the pool for each string. // This is done by adding a Get Element Pointer (GEP) before each user. This // function adds the GEP. @@ -307,29 +300,13 @@ void PPCMergeStringPool::replaceUsesWithGEP(GlobalVariable *GlobalToReplace, Indices.push_back(ConstantInt::get(Type::getInt32Ty(*Context), 0)); Indices.push_back(ConstantInt::get(Type::getInt32Ty(*Context), ElementIndex)); - // Need to save a temporary copy of each user list because we remove uses - // as we replace them. - SmallVector Users; - for (User *CurrentUser : GlobalToReplace->users()) - Users.push_back(CurrentUser); - - for (User *CurrentUser : Users) { - // The user was not found so it must have been replaced earlier. - if (!userHasOperand(CurrentUser, GlobalToReplace)) - continue; - - // We cannot replace operands in globals so we ignore those. - if (isa(CurrentUser)) - continue; - - Constant *ConstGEP = ConstantExpr::getInBoundsGetElementPtr( - PooledStructType, GPool, Indices); - LLVM_DEBUG(dbgs() << "Replacing this global:\n"); - LLVM_DEBUG(GlobalToReplace->dump()); - LLVM_DEBUG(dbgs() << "with this:\n"); - LLVM_DEBUG(ConstGEP->dump()); - GlobalToReplace->replaceAllUsesWith(ConstGEP); - } + Constant *ConstGEP = + ConstantExpr::getInBoundsGetElementPtr(PooledStructType, GPool, Indices); + LLVM_DEBUG(dbgs() << "Replacing this global:\n"); + LLVM_DEBUG(GlobalToReplace->dump()); + LLVM_DEBUG(dbgs() << "with this:\n"); + LLVM_DEBUG(ConstGEP->dump()); + GlobalToReplace->replaceAllUsesWith(ConstGEP); } } // namespace From nobody Sun Jun 2 09:31: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 4VsWnV3kxLz5MR5T; Sun, 02 Jun 2024 09:31:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VsWnV3Cd3z4qR3; Sun, 2 Jun 2024 09:31:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717320670; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TmPk6T4NT02nw689cefW5S+jdxD9Zzb3RyHxRjOmR00=; b=hrF9ws7io/UM4bMr9PlmQIYKs75G4TdULUuuvdie8Zh0cqAlag4Ipk7+k+TAvTS/TwVrUK nPsbJtDB/SUPdNoQYNe28kDprA5+lEWbmf5iuLVJIaojmt+hDDu1JyUxUgi0EPG7teWju6 vAb3uTTfMK5qXuaPvxdWfDmmWvon1wqRBCqZs7U6rGQAwoL2TIxRM7nTIMaA0p1P5uq8XX NS2qTLfvLZQEekE5ixKZRzAGRWpLDVL62eTT4XLp0ZUG3XpDJy63jppQN569LZWC6mMX4h LaAlmeFeh0bvRriNF3RgDFlIf2gIovopEEjPHM//P1gh1x2D5sqtShV/bvyZZA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1717320670; a=rsa-sha256; cv=none; b=nbKr0wF1khpL5FRmt3XlGIpwlGcRwxvmlrmRrJu0uL8kF91CeY4O9n2Qwcp6WN2sQf9bZs pc2iKiiac6x+nhw/cq0CWwAe2C0oROq/LmpWL6QnxSw2s8xk6ZbG41ybrJAb/ukTfUhiRd afCI8DDSlOjztqYqcGMEpPJLV2XhNluD1IZuVbs1xGjMkFpFmkUsjwfiqmBbhWAJr2kTo6 3hWr7i9h1Z5XzDDEW+E4hbPgub5DXPhMjFkSMH985ItEhW3DMEy3UW5EIbIKivYcuEVA9O BjcpSB/wrT1OtHQV5kMkfO+HvdN43h1Xjjx11NB173upHden0tZt7XUEqPSepw== 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=1717320670; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TmPk6T4NT02nw689cefW5S+jdxD9Zzb3RyHxRjOmR00=; b=VQAqwxjX1FnuVOHXoKuqZJ9ZVbmHjP4lqa2c1Hk4CqgcV9E2LX2ttGdnZ2yZx2d6vlszz7 Sfv6zMEtY6I3A9xnBFZusqQdxBiEe76olIMK0+bwgtu4eY3j4rHLShthl/7Kq+Xf90wfQD NHH12LI5kMFFNaO2/IRfDFz82B1Kk7qtzEmFsolO4O98jW4rAlRTyqyiPR9RNyyLf/d7w/ mPQ8IaWq34K482i7Ba+rz4K/v34fRg6F/ofGfTrDHXdJKCMvBcSWHpxQUX1jV0m+hQONcA VwxhtDkPK/JdCWHMJLHMkmKWEoUCnNm9SCsibbpr08Obs8sIHMVEr6zsVa8fCg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VsWnV2qKmzmLT; Sun, 2 Jun 2024 09:31: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 4529VABr016220; Sun, 2 Jun 2024 09:31:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4529VAEE016217; Sun, 2 Jun 2024 09:31:10 GMT (envelope-from git) Date: Sun, 2 Jun 2024 09:31:10 GMT Message-Id: <202406020931.4529VAEE016217@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: c7f08a11dfbc - stable/13 - Merge commit 9f85bc834b07 from llvm-project (by Nikita Popov): List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: c7f08a11dfbc4a49f7f11a2a4a92f41bfa5ec622 Auto-Submitted: auto-generated The branch stable/13 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=c7f08a11dfbc4a49f7f11a2a4a92f41bfa5ec622 commit c7f08a11dfbc4a49f7f11a2a4a92f41bfa5ec622 Author: Dimitry Andric AuthorDate: 2024-05-30 15:35:15 +0000 Commit: Dimitry Andric CommitDate: 2024-06-02 09:30:46 +0000 Merge commit 9f85bc834b07 from llvm-project (by Nikita Popov): [PPCMergeStringPool] Only replace constant once (#92996) In #88846 I changed this code to use RAUW to perform the replacement instead of manual updates -- but kept the outer loop, which means we try to perform RAUW once per user. However, some of the users might be freed by the RAUW operation, resulting in use-after-free. The case where this happens is constant users where the replacement might result in the destruction of the original constant. Fixes https://github.com/llvm/llvm-project/issues/92991. This fixes a possible crash when building crypto/openssh/sshkey.c for PowerPC targets. Reported by: cperciva PR: 276104 MFC after: 3 days (cherry picked from commit f30188c4680a85126e793de157b851bf5ee47529) --- .../llvm/lib/Target/PowerPC/PPCMergeStringPool.cpp | 37 ++++------------------ 1 file changed, 7 insertions(+), 30 deletions(-) diff --git a/contrib/llvm-project/llvm/lib/Target/PowerPC/PPCMergeStringPool.cpp b/contrib/llvm-project/llvm/lib/Target/PowerPC/PPCMergeStringPool.cpp index ebd876d50c44..0830b02370cd 100644 --- a/contrib/llvm-project/llvm/lib/Target/PowerPC/PPCMergeStringPool.cpp +++ b/contrib/llvm-project/llvm/lib/Target/PowerPC/PPCMergeStringPool.cpp @@ -290,13 +290,6 @@ bool PPCMergeStringPool::mergeModuleStringPool(Module &M) { return true; } -static bool userHasOperand(User *TheUser, GlobalVariable *GVOperand) { - for (Value *Op : TheUser->operands()) - if (Op == GVOperand) - return true; - return false; -} - // For pooled strings we need to add the offset into the pool for each string. // This is done by adding a Get Element Pointer (GEP) before each user. This // function adds the GEP. @@ -307,29 +300,13 @@ void PPCMergeStringPool::replaceUsesWithGEP(GlobalVariable *GlobalToReplace, Indices.push_back(ConstantInt::get(Type::getInt32Ty(*Context), 0)); Indices.push_back(ConstantInt::get(Type::getInt32Ty(*Context), ElementIndex)); - // Need to save a temporary copy of each user list because we remove uses - // as we replace them. - SmallVector Users; - for (User *CurrentUser : GlobalToReplace->users()) - Users.push_back(CurrentUser); - - for (User *CurrentUser : Users) { - // The user was not found so it must have been replaced earlier. - if (!userHasOperand(CurrentUser, GlobalToReplace)) - continue; - - // We cannot replace operands in globals so we ignore those. - if (isa(CurrentUser)) - continue; - - Constant *ConstGEP = ConstantExpr::getInBoundsGetElementPtr( - PooledStructType, GPool, Indices); - LLVM_DEBUG(dbgs() << "Replacing this global:\n"); - LLVM_DEBUG(GlobalToReplace->dump()); - LLVM_DEBUG(dbgs() << "with this:\n"); - LLVM_DEBUG(ConstGEP->dump()); - GlobalToReplace->replaceAllUsesWith(ConstGEP); - } + Constant *ConstGEP = + ConstantExpr::getInBoundsGetElementPtr(PooledStructType, GPool, Indices); + LLVM_DEBUG(dbgs() << "Replacing this global:\n"); + LLVM_DEBUG(GlobalToReplace->dump()); + LLVM_DEBUG(dbgs() << "with this:\n"); + LLVM_DEBUG(ConstGEP->dump()); + GlobalToReplace->replaceAllUsesWith(ConstGEP); } } // namespace From nobody Sun Jun 2 12:27: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 4VsbjW1wqmz5MhND; Sun, 02 Jun 2024 12:27:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VsbjW1MDDz570D; Sun, 2 Jun 2024 12:27:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717331279; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=X+OnCZ2Ttibxa6hZpf4CknuUWkpROCUq912a+wjSlH0=; b=FeVRVvTJu7Q9+yb76RgzCfHxUbUBFDmiPssd+OGUG4tiaSDvSlT7DIECOYCpiD5M7Nx3hp FhTGZLVAJrHB2xHrR/qydWcpOQ2qjSCs4/QBJs4llxBJfGl7XnnpSZ7U6xI+vhW4bE1ySr 9V7tQ1CZoo5Xsb8yF13AtkqJmWl9JOHVd6muHatv6Zfdq6S3vT1qwboPV1LXL+IsCpOKMF CFovc5eEUOEk9UjL3jBzgGJn+xnZvbuyEGw9LT4S0JjDXN8jfn6i0IoeD+W9pmSKwxpE1x +Ii8/ys/bvJ0Tb48yOl8Su894QlKxVTlkIbrNBZfBA5GvysevTmjX3qZZGRkjA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1717331279; a=rsa-sha256; cv=none; b=X6zP8KuA0zhLEFUmQYDHEXgIxY2/PfaCTEh5wr3D+iASXOZiXeIp0rDpAxoQkErDGtP87z /3R+fMK3Sy/7pm99aLhi7L+WVc8YN/u6LsFDAWZhuI7MG9bKEjz14g9+VDVxUwCcEQtKIa uiPWHiAfgSyG0gi4h4HEZGB09Yjl6v7bAQfCgOWWqPSZJKqthf3HLJ6lgFF4nF3EQcEwUK bQFNfe7FO9fMG2iMhIZuZ77fWjlqchNTlyU0PApBlEF1mIiAIeVb7Vyl4KajOQF48Tq9Pa 2b9jtexRd/BS5qoFeqXxa4M+HCkmKgTXiD7HaCgcRdjKlU52CVbyogUfqeTIow== 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=1717331279; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=X+OnCZ2Ttibxa6hZpf4CknuUWkpROCUq912a+wjSlH0=; b=XIEdm3bsXANjQbrrRXm/6W0CUL034qILewoWh7N+RmjVjdI1W1dJ9jmf0tUrsFmqlM2p/5 b9cbT/zBzGLRSX/8dJfe/a8P7bNLNvbm38vMycevbS35kTHw3NnaHL9ypc2YFl2MOpcE0z yGdSf6lg3gMSODkPagkQFaIyzKsPIOMmusZRCvUKkfNE9jjyxrBfBaNkuDFksjcFFJcH14 42VFeOyTaTrr9fMhLfHcyERJMpQSyPGOUNWzbkIFJN16JNv/oAW1k7niXwEDYxrH1qmxqr Y14gzKrbykWQ905Wb+9i0VyuoqxfmKN2Necg58w7nJpoanGPlOT7gd+k5+//wg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VsbjW0yWyzrZg; Sun, 2 Jun 2024 12:27: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 452CRx7r007473; Sun, 2 Jun 2024 12:27:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 452CRx8I007470; Sun, 2 Jun 2024 12:27:59 GMT (envelope-from git) Date: Sun, 2 Jun 2024 12:27:59 GMT Message-Id: <202406021227.452CRx8I007470@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Stefan =?utf-8?Q?E=C3=9Fer?= Subject: git: 077f757d72e5 - main - newfs_msdos: align data area to VM page boundary 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: se X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 077f757d72e561eb84193d8e58f63e96e69b8096 Auto-Submitted: auto-generated The branch main has been updated by se: URL: https://cgit.FreeBSD.org/src/commit/?id=077f757d72e561eb84193d8e58f63e96e69b8096 commit 077f757d72e561eb84193d8e58f63e96e69b8096 Author: Stefan Eßer AuthorDate: 2024-06-02 12:07:52 +0000 Commit: Stefan Eßer CommitDate: 2024-06-02 12:07:52 +0000 newfs_msdos: align data area to VM page boundary by default Without alignment, the data area will not be aligned with the buffer cache, leading to overhead, higher write multiplication on SSD devices and issues with very large cluster sizes (see PR 277414). The -A option used to align the start of the root directory to a multiple of the cluster size, which happens to align the start of the data area with a buffer page boundary in case of large clusters and the default number of directory entries (512 entries requiring 16 KB for FAT12 or FAT16, FAT32 puts the root directory into the data area). This commit aligns the start of the data area with the page size, if neither -A nor -r is used. It changes -A to align the start of the data area (end of the root directory) to a multiple of the cluster size, since this is the alignment that prevents write multiplication due to clusters crossing erase block boundaries of a SSD device. The -r option is unchanged and will prevent any automatic alignment from occuring. Approved by: kib MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D45436 --- sbin/newfs_msdos/mkfs_msdos.c | 26 ++++++++++++++++++-------- sbin/newfs_msdos/newfs_msdos.8 | 16 ++++++++++++++-- 2 files changed, 32 insertions(+), 10 deletions(-) diff --git a/sbin/newfs_msdos/mkfs_msdos.c b/sbin/newfs_msdos/mkfs_msdos.c index 065e3c5f4192..423fbbcadcc5 100644 --- a/sbin/newfs_msdos/mkfs_msdos.c +++ b/sbin/newfs_msdos/mkfs_msdos.c @@ -249,7 +249,7 @@ mkfs_msdos(const char *fname, const char *dtype, const struct msdos_options *op) ssize_t n; time_t now; u_int fat, bss, rds, cls, dir, lsn, x, x1, x2; - u_int extra_res, alignment, saved_x, attempts=0; + u_int extra_res, alignment, alignto, saved_x, attempts=0; bool set_res, set_spf, set_spc; int fd, fd1, rv; struct msdos_options o = *op; @@ -412,8 +412,12 @@ mkfs_msdos(const char *fname, const char *dtype, const struct msdos_options *op) } bpb.bpbFATs = o.num_FAT; } - if (o.directory_entries) - bpb.bpbRootDirEnts = o.directory_entries; + if (o.directory_entries) { + bpb.bpbRootDirEnts = roundup(o.directory_entries, + bpb.bpbBytesPerSec / sizeof(struct de)); + if (bpb.bpbBytesPerSec == 0 || o.directory_entries >= MAXU16) + bpb.bpbRootDirEnts = MAXU16; + } if (o.media_descriptor_set) { if (o.media_descriptor < 0xf0) { warnx("illegal media descriptor (%#x)", o.media_descriptor); @@ -564,14 +568,20 @@ mkfs_msdos(const char *fname, const char *dtype, const struct msdos_options *op) x1 += (bpb.bpbBigFATsecs - 1) * bpb.bpbFATs; } if (set_res) { - /* attempt to align root directory */ - alignment = (bpb.bpbResSectors + bpb.bpbBigFATsecs * bpb.bpbFATs) % - bpb.bpbSecPerClust; if (o.align) - extra_res += bpb.bpbSecPerClust - alignment; + alignto = bpb.bpbSecPerClust; + else + alignto = PAGE_SIZE / bpb.bpbBytesPerSec; + if (alignto > 1) { + /* align data clusters */ + alignment = (bpb.bpbResSectors + bpb.bpbBigFATsecs * bpb.bpbFATs + rds) % + alignto; + if (alignment != 0) + extra_res += alignto - alignment; + } } attempts++; - } while (o.align && alignment != 0 && attempts < 2); + } while (alignment != 0 && attempts < 2); if (o.align && alignment != 0) warnx("warning: Alignment failed."); diff --git a/sbin/newfs_msdos/newfs_msdos.8 b/sbin/newfs_msdos/newfs_msdos.8 index efa69c058453..816b5fc867b4 100644 --- a/sbin/newfs_msdos/newfs_msdos.8 +++ b/sbin/newfs_msdos/newfs_msdos.8 @@ -23,7 +23,7 @@ .\" OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN .\" IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.Dd January 12, 2024 +.Dd June 2, 2024 .Dt NEWFS_MSDOS 8 .Os .Sh NAME @@ -91,7 +91,13 @@ A suffix s, k, m, g (lower or upper case) appended to the offset specifies that the number is in sectors, kilobytes, megabytes or gigabytes, respectively. .It Fl A -Attempt to cluster align root directory, useful for SD card. +Attempt to cluster align the data area, useful for SD card. +If neither the +.Fl A +nor +.Fl r +option is used, the number of reserved sectors is set to a value that aligns +the start of the data area to a multiple of the page size of the host. .It Fl B Ar boot Get bootstrap from file. .It Fl C Ar create-size @@ -167,6 +173,12 @@ is 2. Number of hidden sectors. .It Fl r Ar reserved Number of reserved sectors. +If neither the +.Fl A +nor +.Fl r +option is used, the number of reserved sectors is set to a value that aligns +the start of the data area to a multiple of the page size of the host. .It Fl s Ar total File system size. .It Fl u Ar track-size From nobody Sun Jun 2 14:07: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 4Vsdww1HZPz5Mqws; Sun, 02 Jun 2024 14: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 4Vsdww0h08z43vH; Sun, 2 Jun 2024 14: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=1717337280; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vOtaoxcN+TkL6e/FFq2nZyBwkDTkFNM6yYOyJfUsvL0=; b=OgWWLb5RnKjard9/8/TzBgMh7zuVP6lF6H+qq5BobxAgq6qNZwAroPQDJhrGzjy2zluH+B QlzNizo/aOB8RSx6UEqX4fG2vXADSwN4oidGK3e3UZrhyE3SxbYIxY4SCref1Ozm6DY87n g0CJbiaJgmz+vaguTW+necItbn3Eb3Pep/aEZdct1azVJqK1TArTFx1dy6cypT5qdD/XsJ Ugpmq9ebF/iy0xq/hMZ/rlO4f+0YDFP9qqYVf83vHNfGXxTZqknmY+Kb2IR7qHvmOWOMt2 rRKLvOeX4LOG2pw1+9f5r+8WS/8yOD4b7cAthPsPMxG5xs11gMe5KYw/JecIHw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1717337280; a=rsa-sha256; cv=none; b=JXOUt/sNxNcpMJXHLpQPpygbd52VxFleJ5/X+xCy2WNP3eejPY+y3HzGeCQFk2xF5RVtVz m8NfUoZUjUoqQqxG+fXjHCc8MQvMykvoFDMqsuifM2+DPY3OsDRrbXzHsWq0ZriDnVouGl SEkZvTNMgP5CaRttSyNDCDYib4xSIHpIW2YpujbgTHrT9vgfFJn+uo78LE7p6EkAzuQ9x/ rZXQHPMcrS7RFtnTw5rRYALay9PPQApcseLRtRrFzFT6iAO2g5UBP466qqqJ76i8M7yt5c 6VMlOUNWuaMJNu8IiCc3+4uTsuIsGI0+TkEkO7VYAnZmDyY6BdZ7v6Y5/j8ZWA== 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=1717337280; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vOtaoxcN+TkL6e/FFq2nZyBwkDTkFNM6yYOyJfUsvL0=; b=sd4UKsmCcfuy2PUCTkjpNLivfegFkZWFjM+kHw8k5OaSqSYzBpb+RR4iEEvHxPdPqnLmS4 UPb38xx9a/v4ynPZ6htROX/KcNZ9KJfU49hzwMJnisr4UZSePZEyAK5Pcs9fspVPM7rQSB QTA3yFncQLhxaJ+yy9ep5E7bPLGILX96cKgRiHCTJnpSLC+f6Zm1wSdDD1q8BI+lZPqsc6 mqCagQVzgcvGrL5DAQKOTbi3mjfiJgyNhPIqfnjpgtq8rbd3+rJpxgJaoYVCh9WGPihniB qJbCnslAp+1od3xaq0iLxVnMRaIulxlzWmVrZoNdqGrJia+nMNDR/NVb39IG1g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Vsdww09tDzvGv; Sun, 2 Jun 2024 14: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 452E7xsN075685; Sun, 2 Jun 2024 14:07:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 452E7x24075682; Sun, 2 Jun 2024 14:07:59 GMT (envelope-from git) Date: Sun, 2 Jun 2024 14:07:59 GMT Message-Id: <202406021407.452E7x24075682@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Colin Percival Subject: git: e50fec56bfa2 - main - Revert "release/Makefile.vm: Use qemu-user-static-devel" List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e50fec56bfa2c9673417513062de5969307fe8ed Auto-Submitted: auto-generated The branch main has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=e50fec56bfa2c9673417513062de5969307fe8ed commit e50fec56bfa2c9673417513062de5969307fe8ed Author: Colin Percival AuthorDate: 2024-06-02 14:07:03 +0000 Commit: Colin Percival CommitDate: 2024-06-02 14:07:52 +0000 Revert "release/Makefile.vm: Use qemu-user-static-devel" This breaks the weekly snapshot builds. We'll try again once Warner has some time to debug the qemu-user-static-devel port. This reverts commit a04ecddfc721427fd97fd1fcc27492ebd19ad183. --- release/Makefile.vm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/release/Makefile.vm b/release/Makefile.vm index b5c1470a6eac..548b4c1cca3b 100644 --- a/release/Makefile.vm +++ b/release/Makefile.vm @@ -75,16 +75,16 @@ ${_V}!= eval $$(awk '/^${_V}=/{print}' ${.CURDIR}/../sys/conf/newvers.sh); echo emulator-portinstall: .if !exists(/usr/local/bin/qemu-${TARGET_ARCH}-static) -.if exists(${PORTSDIR}/emulators/qemu-user-static-devel/Makefile) +.if exists(${PORTSDIR}/emulators/qemu-user-static/Makefile) env - UNAME_r=${UNAME_r} PATH=$$PATH \ - make -C ${PORTSDIR}/emulators/qemu-user-static-devel \ + make -C ${PORTSDIR}/emulators/qemu-user-static \ BATCH=1 WRKDIRPREFIX=/tmp/ports DISTDIR=/tmp/distfiles \ all install clean .else .if !exists(/usr/local/sbin/pkg-static) env ASSUME_ALWAYS_YES=yes pkg bootstrap -y .endif - env ASSUME_ALWAYS_YES=yes pkg install -y emulators/qemu-user-static-devel + env ASSUME_ALWAYS_YES=yes pkg install -y emulators/qemu-user-static .endif .endif touch ${.TARGET} From nobody Sun Jun 2 18:05: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 4VslC23xwzz5N8QN; Sun, 02 Jun 2024 18:05:34 +0000 (UTC) (envelope-from olce@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 4VslC23Q6yz4Qwj; Sun, 2 Jun 2024 18:05:34 +0000 (UTC) (envelope-from olce@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717351534; 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=zQQqhbXA/XgC+OPOZH0LllN1bVN0llY2a6/NxmCUbok=; b=o+6TbkaGPLjPF80kKPYE74DKwtet9lbEFzvFxQ0MiVeS2XRU3VYsjf53hy3WER0LhFRhFw nR1PT9QEz5Z4ja35sBQEpNRqSHw04uV3IWV2HGwVwYGNeH2nhbuUxP8ZrXRqql2RNtgxh6 f1emlNqq+F6A70QZdUmO0s96eFPhbXu27n6xWMxlT5arpI3NKTiqMDXLRQbFRqYmge1X2D MV+EGdpCczC2G+XN4+1rnBgbA4XnDSE4tgixVkLo9H3zoUZctRcv/oSZXrd+F3VNyC4HW5 GGkF0/+eXP6qPilD0E3mUdHeL4KZlrsyVehCpIKKk2bF7/TdGF1p1vLBVyjfmA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1717351534; a=rsa-sha256; cv=none; b=J2aQcnOp+XdMsxBURVar/wcp/VAT+u0yurH/brV52LmDep+V6m1rmklE4Hlk0cbUxcW6Kg 2aQUvbpmHADIhXhVRvluzhLd3/IlruafPbtkpOajUm0PDRnlxO5kMTNmQx+ZCNNmzNwbE5 q1oSG6H1/nEKamHxKZ+fCfBeczsktch0LMDYD4XgZI7GltGU3oiWuwkunnziLhMW8tK3Pd NPFmB9IAw32jDB5S5ncSyK3iaPzJFtw06jay0z4jHtcUwRNNx3sXKeGlXb6t28biTFWg/u FzG/jvNeh72SzLqUYqcpXa1bIlNZa9ohMd/Iy2yxAj67Ag1zs6rihgMqA4YPfA== 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=1717351534; 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=zQQqhbXA/XgC+OPOZH0LllN1bVN0llY2a6/NxmCUbok=; b=VCm0big4ayzZwJFKYXhb8q075IUFwnP88H0yf2prOANTbgxCbUg9vRPhjjW4ut8giiUWl/ mLIxq/Bu5E5SPE7AKQuQC6lUSh46XU4JZLedO4bX05XPUzgW+gY1Az5njmCV47b9CpF0Y4 onDwE3KG7XWumcQ44rzU4kU3s5MakU1R4lCpSsaFyx53VD+VI5XwfzwK1VuskTRrRGdhgN n7QIruICItfnN6sZa3faRNQXIG27skkoi+/gp9X8oJBRsZlJ3Vc1c11oIkn2KdU+qePAZk 3dih7DN6nwZgWMoSzrnSVMYGJ9CIG8lOWZ1/AhT3RegBCBn/zaGQYFqqR8Fgzw== Received: from francois.localnet (92-184-97-89.mobile.fr.orangecustomers.net [92.184.97.89]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: olce/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4VslC054MqzGZ6; Sun, 2 Jun 2024 18:05:32 +0000 (UTC) (envelope-from olce@freebsd.org) From: Olivier Certner To: Warner Losh , Nuno Teixeira , Cy Schubert Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 108de784513d - main - Redefine CLOCK_BOOTTIME to alias CLOCK_MONOTONIC, not CLOCK_UPTIME Date: Sun, 02 Jun 2024 14:05:18 -0400 Message-ID: <3049031.hHqAuc6tWs@francois> Organization: FreeBSD In-Reply-To: <20240601224055.6a6cac10@slippy> References: <202405311447.44VEl1G1078199@gitrepo.freebsd.org> <20240601224055.6a6cac10@slippy> List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: multipart/signed; boundary="nextPart2418096.THHZn3L5Ee"; micalg="pgp-sha384"; protocol="application/pgp-signature" --nextPart2418096.THHZn3L5Ee Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii"; protected-headers="v1" From: Olivier Certner Date: Sun, 02 Jun 2024 14:05:18 -0400 Message-ID: <3049031.hHqAuc6tWs@francois> Organization: FreeBSD In-Reply-To: <20240601224055.6a6cac10@slippy> MIME-Version: 1.0 Hi, Some food for thought. Given the (minor?) fallout, I wonder if we should have instead just added a distinct numerical value for CLOCK_BOOTTIME, which didn't occur to me while doing the review. This would have the benefit of allowing all these 'case' labels to coexist, which makes the interface more predictable and thus easier on applications. The patches below obviously only can cover the precise applications that we noticed failed to compile, and not other existing ones nor future ones to be written. I don't see any real drawback for such an approach because, to read clock information, applications always have to specify the clock ID and, AFAIK, cannot, e.g., request a list of clocks and times, where we would have to be careful to output the same time for all the aliased clock IDs. Thanks. -- Olivier Certner --nextPart2418096.THHZn3L5Ee Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part. Content-Transfer-Encoding: 7Bit -----BEGIN PGP SIGNATURE----- iQIzBAABCQAdFiEEmNCxHjkosai0LYIujKEwQJceJicFAmZctF4ACgkQjKEwQJce JidbYQ/+IscfV9GyJbYl3pvI6m8KbEd8UzX5Z6Pm/udJM3xCa9mKysIzDgQkDAMQ Oc9xEH/dMCLzbIlp2r4p53RLfGTnvEVzPzIWcAFWOnxaBXK+uFKhul4WURdRl97B C2Vxvp0H258Eg76PxDT9Ljgvs/kCPLsp+AD2XeNc51iZ04TXNFaGQqn7wv7TdCL0 DYXUX91Qwum7W8EZGpdRy5XyXkMFW3qEUKmGy61QTQ4DH03yeZhE52nxx/1mF0HJ /b3sRLwAnqZ3L7ZdEwE6I/vG7GTfbIzZi3lv/aSID1Wa3t1iNU9Yr4m3s+Nq57XK 2LdqjdULT8RsQ0woRE0XVq1ndQJ57xZuUnBh/Qd+63BlqVc6xcB2ZKoiF98Csj0Q LCTf5qvPVvOuxpmiUYPmRwZTJOsE3d7U2pPsIDy56ynTUIzRfYqzueNas3CqDXjg MkMfsgYjisrSiHgOF9KPg8oWmRnxiX6AjFhcf2JwaWgK6dAXuSqWZ36Ulo+HL1lB EmAUlaBK/M7bPejYaQ75/r80VK3mRL5xsMs2TH4wvtQvTG6q0Wss7QtrHfXfix9m fLyGCXMpGswLY6XdKxDkXjN/55eefxh0Xsz6WqU27TM4p0Rw/LToQdS5qL3nBqLR rqxK5vH2kGKuH2EY4CzNYi5gLaI+F3vAmO+QPGM+BxcMdO1wDq0= =KwGd -----END PGP SIGNATURE----- --nextPart2418096.THHZn3L5Ee-- From nobody Sun Jun 2 18:36:38 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Vslv86ntpz5JkZs for ; Sun, 02 Jun 2024 18:36:52 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-pj1-x102a.google.com (mail-pj1-x102a.google.com [IPv6:2607:f8b0:4864:20::102a]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "WR4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Vslv764wWz4Tt2 for ; Sun, 2 Jun 2024 18:36:51 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-pj1-x102a.google.com with SMTP id 98e67ed59e1d1-2c19bba897bso2765509a91.2 for ; Sun, 02 Jun 2024 11:36:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20230601.gappssmtp.com; s=20230601; t=1717353410; x=1717958210; darn=freebsd.org; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=vnt9Y1PBS3pzvK/jx4g+XoUASUEUlAb8XjWBSUR1bTI=; b=SvD6eFNVjaCIvuQtY248CGwdC7GPVbGf291IYv9saFDAwsyW4Yzq8DYc10DJgBvtSE YyJDMa6xnQklST285bhcvbiz/L3t1kzs1L4XEtVPKahpsij9zrAGRvRQO9fCknJCY34q wiccTcAUBmZgkut6ali1UJnQ6N2xZyTfSJH4j9hoeTS9unoDJzJH6GPHC/WS05ooeVCX 355H/uqRR4E5QT4khgpvxF0UFlb9aTQkm2JVs1bDlm1cv+QMMpr52YopGWf/cHhFZ/Oo TijaezoHbItPwXBGytocjbxQvHElRlONliSYI4T13q9PnkelPynlEmUSn5HLY+SokWyg z15Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1717353410; x=1717958210; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=vnt9Y1PBS3pzvK/jx4g+XoUASUEUlAb8XjWBSUR1bTI=; b=LPhX32oqFSWu6rTNDpqttr/j+2hf0QCVvQofZxkyVbMQ0oHCPfbFGmayVKjy2xrtmN jftthDHW4C3yH4tEFViGGMTtUFQZ8J2EP61sdHbR8PHF+TaMGJ1a3rUkvBJI4hde09Gx SkXQuUcdbUntfPYdgC3PmltimE6k/fASVNQSdTq/y43JhapqlgyYnYbpVnS/AdprfTrU SMpdlo4Xb9Rqa4YAt1ze6L061oOuIB17BDs9W8IMYZk8isyNGWbvB2QQR41kJC0i5qVD +m39Xrfpvk+gbXDN0yBOSoe+eIA8bAits5mcA9KwfUE/AFrIzWMacjmBXBStURie5yV/ lvxA== X-Forwarded-Encrypted: i=1; AJvYcCX/3NckAU0xMZXUXhn8L2sVd3Xnq5bT5ZbJ2CHeZzcDeNwk1t8EA5Tj7W60a8VM5pEZlIjmzLUXil+SEdsFCLwVQMshirm7qy8olwlEyeEO X-Gm-Message-State: AOJu0YzSonRguG3gN1dq8GB7zpTo2zWiaPbXy9t3edmOn4BIowR/IDhF eEPOcggh4RVi5FvjnNUHtXNvvknzsM1pAMWeraxRD5dXAhVrA+h4GxzdBWOSQAmy6CpuHQB+cpQ MbdV4XX/HRf9gZubiDR+cFGjv+MjVpzq/n3qpMA== X-Google-Smtp-Source: AGHT+IHiB4j7g8h6mvqM7OdjClDPxOuieVJPgY2xyVbalgv92cn+6KJRh6l0r39YqZY8Nv2FQvGnatfjRUGjWoWwJZI= X-Received: by 2002:a17:90b:218c:b0:2b9:78b9:fefe with SMTP id 98e67ed59e1d1-2c1dc5cd72bmr5428129a91.47.1717353409931; Sun, 02 Jun 2024 11:36:49 -0700 (PDT) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 References: <202405311447.44VEl1G1078199@gitrepo.freebsd.org> <20240601224055.6a6cac10@slippy> <3049031.hHqAuc6tWs@francois> In-Reply-To: <3049031.hHqAuc6tWs@francois> From: Warner Losh Date: Sun, 2 Jun 2024 14:36:38 -0400 Message-ID: Subject: Re: git: 108de784513d - main - Redefine CLOCK_BOOTTIME to alias CLOCK_MONOTONIC, not CLOCK_UPTIME To: Olivier Certner Cc: Warner Losh , Nuno Teixeira , Cy Schubert , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Content-Type: multipart/alternative; boundary="000000000000f405e00619ec7fa2" X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US] X-Rspamd-Queue-Id: 4Vslv764wWz4Tt2 --000000000000f405e00619ec7fa2 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Sun, Jun 2, 2024 at 2:05=E2=80=AFPM Olivier Certner w= rote: > Hi, > > Some food for thought. > > Given the (minor?) fallout, I wonder if we should have instead just added > a distinct numerical value for CLOCK_BOOTTIME, which didn't occur to me > while doing the review. This would have the benefit of allowing all thes= e > 'case' labels to coexist, which makes the interface more predictable and > thus easier on applications. The patches below obviously only can cover > the precise applications that we noticed failed to compile, and not other > existing ones nor future ones to be written. I don't see any real drawba= ck > for such an approach because, to read clock information, applications > always have to specify the clock ID and, AFAIK, cannot, e.g., request a > list of clocks and times, where we would have to be careful to output the > same time for all the aliased clock IDs. > Maybe in the future. This issue is completely solved the way that it is now and I think this is over-engineering. It *WAS* an alias for CLOCK_UPTIME and now it's an alias for CLOCK_MONOTONIC. When it went in, other minor changes were also needed, as were changes before it went in. Its semantics and values are implementation defined. Linux happened to define it to have a subtly different meaning than their CLOCK_MOTONIC, and when we adopted it, there was a critical detail I misunderstood. There were at least a dozen applications that were ported to FreeBSD that needed to have the #ifdef added in the days before I added the alias, for example. The new value might have averted this breakage, but it might also have introduced subtle breakage where a program thought these were distinct that we're not seeing. It's hard to say if it's a good or bad idea to adopt a value that's unique to avoid one set of breakage, only to maybe introduce other breakage which would be harder to detect (things compile, but they misbehave, vs this solution where compilation may break, but then you know you have the issue).a So if you want to drive it, drive the exp run, etc, knock yourself out. But given the absolutely trivial amount of fallout, I'm on to the hundreds of more important things that are in my backlog. I consider the problem solved, unless there's new information. But maybe I'm still feeling burned out by the 12 months of iteration that it took to fix all the compatibility issues with something as simple as endian.h.... only to discover 30 months later a new, different subtle breakage. Warner > Thanks. > > -- > Olivier Certner > --000000000000f405e00619ec7fa2 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable


=
On Sun, Jun 2, 2024 at 2:05=E2=80=AFP= M Olivier Certner <olce@freebsd.org<= /a>> wrote:
H= i,

Some food for thought.

Given the (minor?) fallout, I wonder if we should have instead just added a= distinct numerical value for CLOCK_BOOTTIME, which didn't occur to me = while doing the review.=C2=A0 This would have the benefit of allowing all t= hese 'case' labels to coexist, which makes the interface more predi= ctable and thus easier on applications.=C2=A0 The patches below obviously o= nly can cover the precise applications that we noticed failed to compile, a= nd not other existing ones nor future ones to be written.=C2=A0 I don't= see any real drawback for such an approach because, to read clock informat= ion, applications always have to specify the clock ID and, AFAIK, cannot, e= .g., request a list of clocks and times, where we would have to be careful = to output the same time for all the aliased clock IDs.

Maybe in the future. This issue is completely solved the wa= y that it is now and I think this is over-engineering. It *WAS* an alias fo= r CLOCK_UPTIME and now it's an alias for CLOCK_MONOTONIC. When it went = in, other minor changes were also needed, as were changes before it went in= . Its semantics and values are implementation defined. Linux happened to de= fine it to have a subtly different meaning than their CLOCK_MOTONIC, and wh= en we adopted it, there was a critical detail I misunderstood. There were a= t least a dozen applications that were ported to FreeBSD that needed to hav= e the #ifdef added in the days before I added the alias, for example. The n= ew value might have averted this breakage, but it might also have introduce= d subtle breakage where a program thought these were distinct that we'r= e not seeing. It's hard to say if it's a good or bad idea to adopt = a value that's unique to avoid one set of breakage, only to maybe intro= duce other breakage which would be harder to detect (things compile, but th= ey misbehave, vs this solution where compilation may break, but then you kn= ow you have the issue).a


--000000000000f405e00619ec7fa2-- From nobody Sun Jun 2 18:43:09 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Vsm2Q0ylVz5Jl8y; Sun, 02 Jun 2024 18:43:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Vsm2Q0136z4Vkw; Sun, 2 Jun 2024 18:43:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717353790; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aMGQHYmNoEG67nwhGUBIMa4zVNfqr8ebN4F8OZ65sXo=; b=Ns2dp+A8rdlWxS4f4tPzyPi1mAijKc9h4N5DjI5Mz+EmF9NZRHm6RnVz11Abe69gUxe+dg EBntqx+cz4X3daoqHXuZJ0FuJdo862rVu0c8HIoTRLJkaPnBds23FsRHp1bZJwOXdR9ARe ml4C845bxLHVwPyWtleY+PgkQYbBJ7kjrzCqKZh2KT+JFgvFkoqdfIFYuEHhORA37+1f3q DznOiRi/qnFxIdZnV/R67Yb0WRztj6S8WisUYmZk9BMGU/6FF6bLp1FclBs9pVFr6caMQ6 CWZ9/E60U1NiReElLopVil6C11AOmj2iZmN1eqhbBNBXDNQ513LzK+eDc30vDQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1717353790; a=rsa-sha256; cv=none; b=cDO+gEnp61EB0XiuFkPVCOm1HhmEu4k34oGxIiUYwy9Hz3idQaRTQRyuZjY/KQ8+3SHpP+ TGs6aEBv0Td8vkXMRqlN6UZdy7rkhy1CzhQgmcjg4IfLEIVucFaHZEKSdPFSPxQlP1f5PW vFZVPrTi9TkEZyReP4nLpyCvmKWlwlJYtiQPplcZ9s2eCXZuke4x4FUFRR+p+tRAYeSpyv FXrkbLBK2sCHOxyUqERDB1QvQEy4quXl9pkTY9dCzZ/inSQhnwpqtTCXcgG9J3LWkOGkKM MdulIq1EvuPRBkcWPjnBOd9YE8x+M463kjRxlihfuxWLduujk/kg5DV6srMZww== 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=1717353790; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aMGQHYmNoEG67nwhGUBIMa4zVNfqr8ebN4F8OZ65sXo=; b=Rp0M30h5QED1zhaf7mzYMI2KzPrU9eztTomESnJbOWAwvkIksN32wR3NVQyDrx87hL9zQI s0+H7U+M2H/ZpFQr5X1l8f2IkoQjRs5xrzh8nk9Wf014PzmMz5/GXVaWjQ+tQhk559U0rb 5jb5ZFljzarpJBIij6vpLTLMQdCZNdKJZYXUl0cn0qHsP9qdpGKfFE+B4vaGZzmHifgYdP V/OjcTe5tTSY8zI/0d4CHrbldNNkSZcjOaqFZWS8HMKDoy0o9Oku1QDEhNCogOMV7cGInc s0orAoX6tf6ap6jmq4m2urJvXgbW4Cc5O7eJ4d2oDBL4P/5rNcOVoHCkz6kCwg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Vsm2P6k4sz137L; Sun, 2 Jun 2024 18:43: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 452Ih9AK047108; Sun, 2 Jun 2024 18:43:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 452Ih9Us047105; Sun, 2 Jun 2024 18:43:09 GMT (envelope-from git) Date: Sun, 2 Jun 2024 18:43:09 GMT Message-Id: <202406021843.452Ih9Us047105@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: af8cafb2a380 - main - iovec: macros to manipulate len and base together List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: af8cafb2a38070907ed5c4d872599617ce9d6d48 Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=af8cafb2a38070907ed5c4d872599617ce9d6d48 commit af8cafb2a38070907ed5c4d872599617ce9d6d48 Author: Brooks Davis AuthorDate: 2024-06-02 18:36:55 +0000 Commit: Brooks Davis CommitDate: 2024-06-02 18:41:22 +0000 iovec: macros to manipulate len and base together A set of convenience macros to initialize struct iovec's and increment the base and length together. IOVEC_INIT - sets iov_base and iov_len IOVEC_INIT_CSTR - takes a string and sets iov_len to strlen + 1 IOVEC_INIT_OBJ - takes an object and sets iov_len to sizeof obj IOVEC_ADVANCE - increments iov_base and decrements iov_len On CheriBSD these present the opportunity to insert more precise bounds on some objects and hide differences in casts in hybrid kernels (where some, but not all pointers are capabilities and require annotation). Here in FreeBSD the resulting code is tidier, particularly in the IOVEC_ADVANCE case where the need to cast iov_base to (char *) is avoided. Reviewed by: kib Feedback from: des, jrtc27 MFC after: 1 week Sponsored by: AFRL, DARPA Differential Revision: https://reviews.freebsd.org/D45422 --- sys/sys/_iovec.h | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/sys/sys/_iovec.h b/sys/sys/_iovec.h index 72642e5227c5..9a4eedc80b4f 100644 --- a/sys/sys/_iovec.h +++ b/sys/sys/_iovec.h @@ -44,4 +44,28 @@ struct iovec { size_t iov_len; /* Length. */ }; +#ifdef _KERNEL +#define IOVEC_INIT(iovp, base, len) \ + *(iovp) = (struct iovec){ .iov_base = (base), .iov_len = (len) } + +/* String with length including NUL terminator */ +#define IOVEC_INIT_CSTR(iovp, str) do { \ + void *__str = (str); \ + IOVEC_INIT(iovp, __str, strlen(__str) + 1); \ +} while(0) + +/* Object with size from sizeof() */ +#define IOVEC_INIT_OBJ(iovp, obj) \ + IOVEC_INIT(iovp, &(obj), sizeof(obj)) + +#define IOVEC_ADVANCE(iovp, amt) do { \ + struct iovec *__iovp = (iovp); \ + size_t __amt = (amt); \ + KASSERT(__amt <= __iovp->iov_len, ("%s: amount %zu > iov_len \ + %zu", __func__, __amt, __iovp->iov_len)); \ + __iovp->iov_len -= __amt; \ + __iovp->iov_base = (char *)__iovp->iov_base + __amt; \ +} while(0) +#endif /* _KERNEL */ + #endif /* !_SYS__IOVEC_H_ */ From nobody Sun Jun 2 18:43: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 4Vsm2R1pDQz5Jl6Y; Sun, 02 Jun 2024 18:43: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 4Vsm2R11Q3z4Vjm; Sun, 2 Jun 2024 18:43:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717353791; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CVwpSbzEm4D6XaGAS+JqQPFv53TXuun9mRsqaz0NlvA=; b=u2qVjoimyKHCFwy1N+LgbIyY52RGAtDq2rFsRnJAlavFIJILsR2Nt9yJ8SMf4RWEyyU27H 2Y55wyWGM1Oesm5doLuPJGUVcFEJf3EbnzLNlX8NJuBjzU4Eio4SVrwy9RfAFTkoTBI13Z kZrvhdFcmguVKrduw3f9JGQsVanjLoTQM19nU0P6MpL0SkrVvIZAMzGJzA2CiQeP1mSJ/7 30s6AIInS5AQya7jyK0f5PTJ5GEUFLs3m/dstBWF0sQzoimuxtKXLckVE08IiuCyplsz98 E1gbfnYZjHWlxMXcm5gm7Hy+wt28vb5BjGF6OwrKlFccapSBbPA5QJ3vdt8t0w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1717353791; a=rsa-sha256; cv=none; b=n/QTEBL4H90+VtXKkIeXr+hKGxFKrS+M6DQXDxh9/L91AQ44Wf4REfMT1x6xwqIsvjVyOM CaRFn/WkLfPlfyGjdbxzWdjmwrr3DEOUQHJfoWSlUJV2qExeX7F8WCnYJSKTzDIHp0hcVZ 3dspul8j+bTLspieBer5fImUpgL5yWRorCxDvOyflvi/MkIpDATFrlnVb+srUwaHeD0VHy Fzc1taRlleAUsv/fnQ0hAkqDbdcOs2eA+1O6v46fhMZa9Q7R8K/uXohyC3BkrwLi8E7b65 696O9ifUVHB01r6aoNdW2qI6iyE4MocFjcTPDvpXLKejO8qkv+FXOyvIw6E/bw== 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=1717353791; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CVwpSbzEm4D6XaGAS+JqQPFv53TXuun9mRsqaz0NlvA=; b=LrolEPQlA0tx48GYKyISxdeHXkmOKzSVuo/pGF01Be3J78hTTdPl3bTX8Ce6pJGAdYAIDn Sv+CM9OGv25KpacovlPPpAp37y+IcOtiQTeuBi/WVnmTGlsSCFqmBPMG1Xj+3ja4R4l/U9 12JJ5VgT2HMb/jhaPanrl2fZ3gakrln3f/+YNiiPoI7tH4QoHO9IFMOtY5RC7aBzgO0vYr 42UNP6B0TKiZ3m+rwyppX2GRWGoSOIllAZyDdJCpOjL4bKOVx8WT9wuxQ4huaoaz8XiIAy 0LQN4tKs99EDFYreAlONJ9kfc7+2nS7XTTfE/RilwUdGtS3WDhlR4XXlEKq2eA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Vsm2R0cDLz137M; Sun, 2 Jun 2024 18:43: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 452IhArQ047150; Sun, 2 Jun 2024 18:43:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 452IhApL047147; Sun, 2 Jun 2024 18:43:10 GMT (envelope-from git) Date: Sun, 2 Jun 2024 18:43:10 GMT Message-Id: <202406021843.452IhApL047147@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: 39c4f65c72c7 - main - stddef.h/stdlib.h: Remove unused rune_t List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 39c4f65c72c7bd00546b4571b3bbe0432162efa3 Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=39c4f65c72c7bd00546b4571b3bbe0432162efa3 commit 39c4f65c72c7bd00546b4571b3bbe0432162efa3 Author: Brooks Davis AuthorDate: 2024-06-02 18:39:30 +0000 Commit: Brooks Davis CommitDate: 2024-06-02 18:41:22 +0000 stddef.h/stdlib.h: Remove unused rune_t This non-standard type is unused in the base system (__ct_rune_t or __rune_t are used instead) and ports. It has been around as long as our current source repo, but we have avoided using it. In sys/_types.h where the __*rune_t typedefs are defined, the following appears in a comment: NOTE: rune_t is not covered by ANSI nor other standards, and should not be instantiated outside of lib/libc/locale. Use wchar_t. The definition of this unused type meant we gratutiously differed from standards compliant stddef.h/stdlib.h. PR: 279357 (exp-run by antoine) Reviewed by: imp, emaste Differential Revision: https://reviews.freebsd.org/D45426 --- include/stddef.h | 7 ------- include/stdlib.h | 7 ------- 2 files changed, 14 deletions(-) diff --git a/include/stddef.h b/include/stddef.h index b695ae7a07a7..2255ea47a49a 100644 --- a/include/stddef.h +++ b/include/stddef.h @@ -41,13 +41,6 @@ typedef __ptrdiff_t ptrdiff_t; #define _PTRDIFF_T_DECLARED #endif -#if __BSD_VISIBLE -#ifndef _RUNE_T_DECLARED -typedef __rune_t rune_t; -#define _RUNE_T_DECLARED -#endif -#endif - #ifndef _SIZE_T_DECLARED typedef __size_t size_t; #define _SIZE_T_DECLARED diff --git a/include/stdlib.h b/include/stdlib.h index 7a934dfa306d..c1c8ab5eebb3 100644 --- a/include/stdlib.h +++ b/include/stdlib.h @@ -38,13 +38,6 @@ __NULLABILITY_PRAGMA_PUSH -#if __BSD_VISIBLE -#ifndef _RUNE_T_DECLARED -typedef __rune_t rune_t; -#define _RUNE_T_DECLARED -#endif -#endif - #ifndef _SIZE_T_DECLARED typedef __size_t size_t; #define _SIZE_T_DECLARED From nobody Sun Jun 2 19:29: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 4Vsn4564wfz5Jp3S; Sun, 02 Jun 2024 19:29:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Vsn455ZWVz4bJB; Sun, 2 Jun 2024 19:29:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717356581; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hP2LvK3/7QUNy9/RZWvInAxF5AfyiDRnHENddPBTBwE=; b=IUGUbdGnkFjelIJ9mm5WD1/PJkuPCwvb1CDTnK+todh0BeiKMg9YLYwzmXEhkLxkBFcxOP kBzVW3aeDzm4rZOwWqWVbSQSb/YRIFduTqa9huaMIDo6AzlVnFF3/botn6XH4HUz3YuqkK uqHkLU6vnHCzM/Hn6TAZ2xNRERpyjBmRmeF13pyRQKBCmeJ6hAdcPvFGMYSCMT7DCt7kPU mOh5h/YGc5UiIdtb3q4NT70A6JK4kvfPJIgjGGsjGCd9Uvt8QHLxbzhSsSu8KWRIlJA87o UiBYfTStydO24ChL75SmenoaP6RvWrT9+8pbEGqvRWqwr2ein58IXiW4zqTNUg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1717356581; a=rsa-sha256; cv=none; b=jJ0cZcv+hVQ7/JbtWdPYWoXrr0QoR2yhcxHD7XZtbxp+wXi3qaPPIIjbD9gH4d4MOzYU5z zUMIMOruAdnVClUB2pVkJB5ujKOxMVb4filb1pzjdaNdO8wo1LxXbTtZXr6/C6a7YuvdWg RrkXlB+JP2Y2g1VFHgxBLMN2+tbGIPO3oeBIVxD9ZllCFiN/ZeV8OqsXXyAShqjm6gFOuw keLYgBKKdbp0qLg1ZABShbVFzZl/7ImkuIxeW2ykS0u89TYFwic4sbXfKr2Z/t+KnA8toi wSP3T2wUZir2gL198ueW6Vh/vS2qMH9JsnHwrWrPRf2Ub+gWKYVQ5VKvvSqsNQ== 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=1717356581; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hP2LvK3/7QUNy9/RZWvInAxF5AfyiDRnHENddPBTBwE=; b=ttazMhzTJBN7SXhPdXJJVaqWooGTQDYVmeRrP0EEPMpi862NDVdPAk+BYckQBymGS5JFmA MbIPasaObWpuqvd2WvrHkD6uNgXEPuD9I/k9YprKm3d98lwJs/ERTlUzaEm76JNzs3dWHr RDq6arTNh9lr35EldETPofjcbf7ai3DyPWNOVfWl5ofLn6oCLTeaJnqcJWCTDS/u3qrw6l fpfaU2373j2xkY4LBEGfww9oK/pXQSVfij4s4JvGecTqi6k5k/NvIQW6m2HSO01+1ayr3A Do91jxdD5DDQJ2pVMht4DfPAag4lvPo/pOHHq3+UKs3gzTaoqdq/x9Jf2wvtGA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Vsn455B5bz143M; Sun, 2 Jun 2024 19:29:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 452JTfcI015754; Sun, 2 Jun 2024 19:29:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 452JTfce015751; Sun, 2 Jun 2024 19:29:41 GMT (envelope-from git) Date: Sun, 2 Jun 2024 19:29:41 GMT Message-Id: <202406021929.452JTfce015751@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: 32a579e4fc69 - main - rc.subr(8): introduce ${name}_offcmd List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: 32a579e4fc69a65e8901111ad5f65ec56a97dfab Auto-Submitted: auto-generated The branch main has been updated by eugen: URL: https://cgit.FreeBSD.org/src/commit/?id=32a579e4fc69a65e8901111ad5f65ec56a97dfab commit 32a579e4fc69a65e8901111ad5f65ec56a97dfab Author: Eugene Grosbein AuthorDate: 2024-06-02 19:13:42 +0000 Commit: Eugene Grosbein CommitDate: 2024-06-02 19:29:22 +0000 rc.subr(8): introduce ${name}_offcmd New variable ${name}_offcmd may be used to supply commands executed if named service is not enabled. Previously start_precmd could be used for such a task but now rc.subr(8) does not call it if a service is not enabled. Fix devd startup script to use it instead of start_precmd. PR: 279198 MFC after: 2 weeks Reported by: Dmitry S. Lukhtionov Tested by: Dmitry S. Lukhtionov --- libexec/rc/rc.d/devd | 7 +++---- libexec/rc/rc.subr | 25 +++++++++++++++++++++---- share/man/man8/rc.subr.8 | 4 +++- 3 files changed, 27 insertions(+), 9 deletions(-) diff --git a/libexec/rc/rc.d/devd b/libexec/rc/rc.d/devd index 47326662339c..98f2068c2075 100755 --- a/libexec/rc/rc.d/devd +++ b/libexec/rc/rc.d/devd @@ -14,7 +14,8 @@ desc="Device state change daemon" rcvar="devd_enable" command="/sbin/${name}" -start_precmd=${name}_prestart +devd_offcmd=devd_off +start_precmd=find_pidfile stop_precmd=find_pidfile find_pidfile() @@ -26,10 +27,8 @@ find_pidfile() fi } -devd_prestart() +devd_off() { - find_pidfile - # If devd is disabled, turn it off in the kernel to avoid unnecessary # memory usage. if ! checkyesno ${rcvar}; then diff --git a/libexec/rc/rc.subr b/libexec/rc/rc.subr index 2fd4796b569f..9eead30790e2 100644 --- a/libexec/rc/rc.subr +++ b/libexec/rc/rc.subr @@ -982,6 +982,8 @@ startmsg() # # ${name}_limits n limits(1) to apply to ${command}. # +# ${name}_offcmd n If set, run if a service is not enabled. +# # ${rc_arg}_cmd n If set, use this as the method when invoked; # Otherwise, use default command (see below) # @@ -1270,13 +1272,13 @@ run_rc_command() -a "$rc_arg" != "describe" -a "$rc_arg" != "status" ] || [ -n "${rcvar}" -a "$rc_arg" = "stop" -a -z "${rc_pid}" ]; then if ! checkyesno ${rcvar}; then - if [ -n "${rc_quiet}" ]; then - return 0 - fi + [ "$rc_arg" = "start" ] && _run_rc_offcmd + if [ -z "${rc_quiet}" ]; then echo -n "Cannot '${rc_arg}' $name. Set ${rcvar} to " echo -n "YES in /etc/rc.conf or use 'one${rc_arg}' " echo "instead of '${rc_arg}'." - return 0 + fi + return 0 fi fi @@ -1643,11 +1645,26 @@ $_cpusetcmd $command $rc_flags $command_args" # # name R/W # ------------------ +# _offcmd R # _precmd R # _postcmd R # _return W # _setup R # +_run_rc_offcmd() +{ + eval _offcmd=\$${name}_offcmd + if [ -n "$_offcmd" ]; then + if [ -n "$_env" ]; then + eval "export -- $_env" + fi + debug "run_rc_command: ${rc_arg}_offcmd: $_offcmd $rc_extra_args" + eval "$_offcmd $rc_extra_args" + _return=$? + fi + return 0 +} + _run_rc_precmd() { check_required_before "$rc_arg" || return 1 diff --git a/share/man/man8/rc.subr.8 b/share/man/man8/rc.subr.8 index 8f7b72e96dc5..4e3fa6771bf4 100644 --- a/share/man/man8/rc.subr.8 +++ b/share/man/man8/rc.subr.8 @@ -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 May 28, 2024 +.Dd June 2, 2024 .Dt RC.SUBR 8 .Os .Sh NAME @@ -773,6 +773,8 @@ Login class to use with .Va ${name}_limits . Defaults to .Dq Li daemon . +.It Va ${name}_offcmd +Shell commands to run if a service is not enabled. .It Va ${name}_oomprotect .Xr protect 1 .Va command From nobody Sun Jun 2 19:42: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 4VsnLw1227z5JqwN; Sun, 02 Jun 2024 19:42: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 4VsnLv65R3z4cnf; Sun, 2 Jun 2024 19:42:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717357351; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PPh9aflExYhjQACZ7XKdMw0dUq5yKa2hLdT/hD0bA6g=; b=vKH4C0So43bjStj/8yKm07r82ZqHPZUSzZf/LnyhM7CYGMC4T+Dgh8hLbFhGz8CFkgJLvI q6lXeL6ev07PHHMqf1/OlzJ3Fmzp0oNcE5aKBBd9vlDi6kHQY5IhCxvNf6sRkR0nJf481e Ve/fYQ2Qf62gU9Y/2h11fPYHYu0OsyuDZ4YY/yCm/whqXcOi3os7CDFIBG3GYT2BcU7HwK eiczJn4seIJIxveJ3fWtBCQPlTV4iX8jXYLgkbGyXb+pOhbXxOgfh8FW7Mzycg9OPuqsq0 OfAk1FUc7mGIYCgYAL6yBi5P/QsjyDHjlenIarbJqk0OeEaYJ+QakJZENRl17w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1717357351; a=rsa-sha256; cv=none; b=YA/OI/ZcKlcypyuRmvNlfOrFyNWamhwkVy0bNMMdZ4hNRJbUhuy+A/bQk7+bxQJO/RFkzm cDn+aG56GaZxYhy3jL7jr4ng93z4Wd8gq5hDDy5SjkZmNjQY0vvxnwJoW752Ks9yRhchyW /A7LBtnWfZIMz/T7IwgKBsdyiGv5ETir2kGDMtvhrEDxH+fDzHsB6UDORPuMTzxc3HqPdj hevf7bGZiPYKVyC4LZYdIicsUeCCpU6c06iYdsrh6LMCOK+hHxT1ezBHaJ+wEC6VpSsh+s j7zrDMuOeRBNQtBkYE7LXFILx26oCDCnHyksxVDJIFtmAoYAAjc1kHuuvJI3Dg== 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=1717357351; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PPh9aflExYhjQACZ7XKdMw0dUq5yKa2hLdT/hD0bA6g=; b=IEXj96/64b+WqzzTbwZRkhj7R3MxFh2nSgCCzk+ZjEo6r9e0FdFh/s0TNorVVhcL8Zij8a VeBZNXwHT8vRNsK+OkbHZ8aHQyQAjNEyvi3BrhR5ISgyOm8UwJtUjO518WntDnfbPHHDtD DOd52L1AphwyQNM2i47Xg+C2mVcm7K7fXjoVIPjdeh1vsRffmtmJsqafdiIaUtMKUIZBA1 auNOeWDTXj1R4rP+EsVIr/kjCb/3IfteJTURt4bgrXsEyCnSMU1KMwHt1zPU7oJCWsw55L 3xXanSMT9vI/sR68VUqPMtx1bJXXWKyTwYhbeRfCOG/zr1aCjS5W/5haCFsXaQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VsnLv5j8fz13kw; Sun, 2 Jun 2024 19:42: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 452JgVqm048119; Sun, 2 Jun 2024 19:42:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 452JgVsh048116; Sun, 2 Jun 2024 19:42:31 GMT (envelope-from git) Date: Sun, 2 Jun 2024 19:42:31 GMT Message-Id: <202406021942.452JgVsh048116@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: c2db3a0c7d31 - main - rc.subr(8): fix debugging message after previous commit List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: c2db3a0c7d31116028b38b426a9b139d26cbc7e5 Auto-Submitted: auto-generated The branch main has been updated by eugen: URL: https://cgit.FreeBSD.org/src/commit/?id=c2db3a0c7d31116028b38b426a9b139d26cbc7e5 commit c2db3a0c7d31116028b38b426a9b139d26cbc7e5 Author: Eugene Grosbein AuthorDate: 2024-06-02 19:41:10 +0000 Commit: Eugene Grosbein CommitDate: 2024-06-02 19:41:10 +0000 rc.subr(8): fix debugging message after previous commit Fixes: 32a579e4fc69a65e8901111ad5f65ec56a97dfab --- libexec/rc/rc.subr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libexec/rc/rc.subr b/libexec/rc/rc.subr index 9eead30790e2..2380d1aeabc3 100644 --- a/libexec/rc/rc.subr +++ b/libexec/rc/rc.subr @@ -1658,7 +1658,7 @@ _run_rc_offcmd() if [ -n "$_env" ]; then eval "export -- $_env" fi - debug "run_rc_command: ${rc_arg}_offcmd: $_offcmd $rc_extra_args" + debug "run_rc_command: ${name}_offcmd: $_offcmd $rc_extra_args" eval "$_offcmd $rc_extra_args" _return=$? fi From nobody Sun Jun 2 20:43: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 4Vspjc6Hwxz5JwM0; Sun, 02 Jun 2024 20:43: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 4Vspjc3MB7z4kPy; Sun, 2 Jun 2024 20:43:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717361028; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cG13m6o6nN7JpoEZCLfJ4Rg0z5qkxrVXxiuepgYKMWo=; b=CdW1uCovDehuDrxMSMtQjydiMgcBkA4J/RN9iyQJ3K3kmZixDvySgTgmY/GKzOaFzFJn/a qiNkRZku9NyCPLfoIDstwsYsntu7ZmJ6nuKFWi9NHZKrOE6nWzWbvuZ7rqg6XjfMCNf0gm 0mi4k0p4i1q+ryZ8BPJgu7Ds/iy6+RBSzWg1IX1KGKCQzLIqJ7WR4M+NQX4FbA/CrQb8bB 3ajtJ/E7kQP88iIqVXgK9sUOOcTDCSQA1jUSlAFVNWojApWgW2KW5I/vGZ6uF9R+Bq1kH2 1NtL3z33KL89IdUgFxf73xza+i9YBxi51Y5rT2GkCWdBvhxr+XYCwId5yPuCjg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1717361028; a=rsa-sha256; cv=none; b=qMyiFIKAD+uHh+pVejNDwJeKWPPcaGwQN7y+XyfBBCja2Gj1E82mz93Ibtwtsm5Ets00g2 Qs+O9+r64vHBzSw7pSzMJ6InXApoMri1OVg7RGJlG1nQqpoVQyHlmRkgSV3t0SCPGuUeGN Fg1AG5SIOTap/qtp/sRC0D8igpjYkX5fKotMXDxssvpMUjUCfy5TvDjY4eHfJV2e4+vQmW u5/kW2sqjB5hGv+Gn3nJkrd9hkd4OGFaLuBVJmeBX0tLc4Q4el63NHOamNrQ+E+KIY0IyS J1sQfarlWyj2wB+R1FfMfgtN5/l8+K2SZp+Q1eb2P9VPtSCwew8Kc5Xe8LIKtw== 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=1717361028; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cG13m6o6nN7JpoEZCLfJ4Rg0z5qkxrVXxiuepgYKMWo=; b=ZXs8yGPVm31AcTj4F1x4tgugSeMLaU6n5j6vFDkRgKIBERTt89ezchxEakiN+iY29fIfCK S89vTjIYFvObjIlaV8Fi4iZRiRFla43yO2xItmG8cWdyH7QJjyeIXX7NjLD9893VSq6/6i j7gDnbyW06rBx8n+sqH5ooEXiDqSpD29Ga9s9Du9MKtB13eaGoDW+SCqr8sqUJ3ERQcfYj 4zbbAOV/hRI8ei54rwTSRCWmc9p5bQwcU5PzJyYgTXRzMZHEqlwJh5tS3Mp4mznf2YzPfJ cJVLpmIZlCyXm/iza20Fi48grtmgl+YdxGGZfv7owLujA/1mZ/T6HqmxerzGaw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Vspjc2vjNz15dm; Sun, 2 Jun 2024 20:43: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 452KhmIf050142; Sun, 2 Jun 2024 20:43:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 452Khmjb050139; Sun, 2 Jun 2024 20:43:48 GMT (envelope-from git) Date: Sun, 2 Jun 2024 20:43:48 GMT Message-Id: <202406022043.452Khmjb050139@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jessica Clarke Subject: git: 28aaa58fa64e - main - fu740_pci_dw: Fix PERST delay and keep asserted for rest of reset sequence List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 28aaa58fa64ecb89d47f0a8396954ad8ca82d8ef Auto-Submitted: auto-generated The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=28aaa58fa64ecb89d47f0a8396954ad8ca82d8ef commit 28aaa58fa64ecb89d47f0a8396954ad8ca82d8ef Author: Jessica Clarke AuthorDate: 2024-06-02 20:42:18 +0000 Commit: Jessica Clarke CommitDate: 2024-06-02 20:42:18 +0000 fu740_pci_dw: Fix PERST delay and keep asserted for rest of reset sequence DELAY takes microseconds not milliseconds, so 100 was too low. Moreover, when enabling hw.pci.clear_pcib, PCI emeration would still stop at one of the first bridges, but by asserting PERST for the rest of the reset sequence that appears to be reliably addressed. Fixes: 896e217a0eae ("fu740_pci_dw: Add SiFive FU740 PCIe controller driver") --- sys/riscv/sifive/fu740_pci_dw.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/sys/riscv/sifive/fu740_pci_dw.c b/sys/riscv/sifive/fu740_pci_dw.c index 13937e283042..d0490d6548f2 100644 --- a/sys/riscv/sifive/fu740_pci_dw.c +++ b/sys/riscv/sifive/fu740_pci_dw.c @@ -215,12 +215,6 @@ fupci_phy_init(struct fupci_softc *sc) return (error); } - /* Hold PERST for 100ms as per the PCIe spec */ - DELAY(100); - - /* Deassert PERST_N */ - FUDW_MGMT_WRITE(sc, FUDW_MGMT_PERST_N, 1); - /* Deassert core power-on reset (active low) */ error = gpio_pin_set_active(sc->porst_pin, true); if (error != 0) { @@ -280,6 +274,12 @@ fupci_phy_init(struct fupci_softc *sc) /* Put the controller in Root Complex mode */ FUDW_MGMT_WRITE(sc, FUDW_MGMT_DEVICE_TYPE, FUDW_MGMT_DEVICE_TYPE_RC); + /* Hold PERST for 100ms as per the PCIe spec */ + DELAY(100000); + + /* Deassert PERST_N */ + FUDW_MGMT_WRITE(sc, FUDW_MGMT_PERST_N, 1); + return (0); } From nobody Sun Jun 2 21:01: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 4Vsq6N4LTPz5LCXM for ; Sun, 02 Jun 2024 21:01:48 +0000 (UTC) (envelope-from 0100018fdac2227f-f93f315e-cd78-45f4-aefb-8b334ea3da3e-000000@amazonses.com) Received: from a8-56.smtp-out.amazonses.com (a8-56.smtp-out.amazonses.com [54.240.8.56]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4Vsq6N1Tjyz4qPR for ; Sun, 2 Jun 2024 21:01:48 +0000 (UTC) (envelope-from 0100018fdac2227f-f93f315e-cd78-45f4-aefb-8b334ea3da3e-000000@amazonses.com) Authentication-Results: mx1.freebsd.org; none DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=dqtolf56kk3wpt62c3jnwboqvr7iedax; d=tarsnap.com; t=1717362107; h=Message-ID:Date:MIME-Version:Subject:To:References:From:In-Reply-To:Content-Type:Content-Transfer-Encoding; bh=q1FfmDJk/6NYgaLartg9F5mP42oV9tvRtF/5nJl8sGY=; b=Z44a0VS1RpKmI1OANmAFU8dqQXakNlb6zAnP+vvq+C57+TjbXSakXt3yX7Auwt6w FMKwgWxFfeqLP/KjLUGmRbajnfX4wfWu2xBgBG1ER/gra1duzOwgxQVNm2Bu3pAiT/Q ZusP0PoemD2F1pmTZ5uy65ofrROG6tX7MYSijDkI= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=ug7nbtf4gccmlpwj322ax3p6ow6yfsug; d=amazonses.com; t=1717362107; h=Message-ID:Date:MIME-Version:Subject:To:References:From:In-Reply-To:Content-Type:Content-Transfer-Encoding:Feedback-ID; bh=q1FfmDJk/6NYgaLartg9F5mP42oV9tvRtF/5nJl8sGY=; b=lO9JRbB7Tl8dhJycO33NdGioZ1vI4DJEzo0KLopvGNV2gr/oyuvP02Jvjbgx8/38 r/T7E3y2e4+I4YiEfNlBRch4LA2T6/vk9HkIteGY0d+GdKV/osyRx/bY1GdzjPmGO5v MUjC+jMqWfCBm5KO31AslSKiadQbQew247t7hQMo= Message-ID: <0100018fdac2227f-f93f315e-cd78-45f4-aefb-8b334ea3da3e-000000@email.amazonses.com> Date: Sun, 2 Jun 2024 21:01:47 +0000 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: git: 28aaa58fa64e - main - fu740_pci_dw: Fix PERST delay and keep asserted for rest of reset sequence To: Jessica Clarke , src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org References: <202406022043.452Khmjb050139@gitrepo.freebsd.org> Content-Language: en-US From: Colin Percival Autocrypt: addr=cperciva@tarsnap.com; keydata= xsFNBGWMSrYBEACdWRqDn3B3SKO7IG0/fGHYtfs26f3Q5QeAcasy1fQLniwGQWn5rlILhbCD K/jdNoDm5Zxq20eqyffoDNObCjnHgg4tGANdi+RmDy+7CDpE789H8dss9y7Pt5DlGGAXQQnt hxush3EYS/Ctprd9UUL/lzOOLOU1aNtzB84tNrJBtcJmL7OYHfyTSNFxvedqJrrasejIQOLI t/DQ89BPzz+vsKHz7FJPXh3fsVkzLA00DJYcfkgxyABfJNA7U6yMwd4DVSdx/SsvfIDMVXnu UXCXswo106WPZbYGlZPpq0wW6iibtTerJix+8AeuwXvl9O1p8yESK4ErkIxCnmghTSz+pdzj z/6xBRkdDM9VdZ0r+CzsaNXMpDOzFuKyjaiYBdgCLljbDnXIHFcqXenrZ7Xwkm09g/M4uVSh pIUG2RYa6tsHSQoGCp3f2RZv1znfViKQFbbL83QjtPA20AhseZSYbHp1FPhXyy9J0wkGL16L e99g6gdGeIRE82BZjBjKGDkoyDPq+oDRSFl8NtzmIKy+cfz00nViqcTF4bREXEawFGhlpO0X O9q8mijI9iFB6zaPBiSdJGBL5ML5qLTNCl8Zlf4m1TBvmRTqF/lzMHVXHidDoUhpSh/y3AFZ 1KrYc27ztJQywDJPJPWPbtY8YhFLFs377gfP8WldsZjzp8nvoQARAQABzSVDb2xpbiBQZXJj aXZhbCA8Y3BlcmNpdmFAdGFyc25hcC5jb20+wsGRBBMBCAA7FiEEglY7hNBiDtwN+4ZBOJfy 4i5lrT8FAmWMSyYCGwMICwkNCAwHCwMFFQoJCAsFFgMCAQACHgUCF4AACgkQOJfy4i5lrT+i Yg/+PYyJNoFuygtV5t/skcjYmvEC93mnazEvh+x99vGYZnGKeJ8NDOF4QCUzeHquOWxDi8Zl reXyswKcrIquPxxX6+YyGe97VbvLnez3ksfzOYRj1F4qV0Rq8ZNK51+bvIrbcS3SfDaRioAk D7WWwFor8y/hSwxYkfsKbtP5PRcem20JUxuC085zqWLaKv5t5n2CBzAGMjwJaQ3tM3AXVwWJ uJaHA6ot/6fntJlmkfcyCYyyr0D6b0guRj3STbZ2hNn5o2AI+f6LJJ31s2sPFjl6rs7fORf3 hFSNOHDd2HxfVBXFdQy24ROkC4orBBz2xh9GScjxxT/hbXkfufkubFubw7n0HkvHzA3UF+Qq A8JiI3n+d7ocsP0/5BQ2sZdeqPGJgHx6RkAMuW1tJ29wSvCN1qMgFwhYkpQdfvHlociQrimU fvlRfSrBEe8o7tvIuEdpvwvCZSTJqQbVoMw8UHFE7nzyCXUSab5h6PbjakCqim13ekVO2KFF TTPcz5o5jEeUY75tzbIwcDfFbT5KqNjWy06TVdM9VEJDHSfOfxHR3kSEwZ+tT2aTvL3grsUn gFwSNcj4Cl4CRFfUw8zVZY+7O7RiMlhBqykikvUurrdGKc1Scwa0yuppdA6eVvylyTWSQGrQ +uLWtV1LUKN7ZqKJWBkLPt9nS4XZWGyBvxOHYqjOwU0EZYxKtgEQANYfgbtUMVnhjxDHhWLp g5kLHK3YW0TfJKzpXqDB7NiqxHofn4OcbZnVC3MKggcbs9o1/UtsjnlsG8550PfiYkDXvPiO RJwgbGs6MGIDK797C6cnBLQ8xwBa9SL4cl5iQFnhWmt6vwnJ+an/cm5JpYves3wL7jV09qU9 57hkHXEUcl38r4FssZzVcLKPUVTa3Un+QGRTGDGe/f4ctjMaqv0ZCM+l2ixPhf/vqESrfSLv V/+T3dmtUfXjazO3SABvsHwxgGuTTYOlKoPCaebr+BRdqm0xeIShoIlhvTI8y4clchqx/Uxg UG5X2kvU13k3DS3Q8uLE4Et9x1CcZT6WGgBZSR6R0WfD0SDnzufNnRWJ0dEPA2MtJHE7+85R Vi9j/IgZV+y5Ur+bnPkjDG1s2SVciX5v9HQ0oilcBhvx0j5lGE9hhurD9F+fCvkr4KdbCknE 6Y8ce8pCNBUoB/DqibJivOzTk9K9MGB5x0De5TerIrFiaw3/mQC9nGeO9dtE7wvDJetWeoTq 4BEaCzpufNqbkpOaTQILr4V6Gp7M6v97g83TVAwZntz/q8ptwuKQPZ2JaSFLZn7oWUpYXA5s +SIODFHLn6iMoYpBQskHQjnj4lEPJadl4qj+ZKA89iDAKsniyoFXsbJe2CPbMS1yzBxKZq6K D/jpt7BOnuHr/JrXABEBAAHCwXYEGAEIACAWIQSCVjuE0GIO3A37hkE4l/LiLmWtPwUCZYxK tgIbDAAKCRA4l/LiLmWtP3jmEACQrh9gWe8F1Tkw3m6VoHKwLc5he4tX3WpQa//soPO6iGG3 S3WPruQ46NrAaAojoOcKI9UONDO5rxG0ZTX53S+lu2EO47jbcLwOCjaEpjKpDRt9ZXBQE8Xl mtBE9Bp3W9gpjB1nE3KNM1mJYgsK0QdRpwwfh4pVgGpOj8j23I6MCK+v99zEBnpgCn2GX8W/ kctRXHqWwndHysOJtRP/zrl7dDaABF1f9efUl0LL3TD3GJ9VDz+DNOin/uK2a1hiJo8QzTRk PpfUQ2ebzDsrd1i/pOWkMSkdH+rEu4AGrXWtaBwrMyrGkL6Icb6yO+P9/z0W2wlgBf3P1YRt JPgQt/Dj3yvA/UnaV/QmuVQPjl13o24UnJGsZM8XGnNdfWBKkC1Q6VXC4QT+dyBHYH9MuE9d 6oGl8pFM1+cTfEfbM62/rRoPkF1yHMsI/903VxEvuUIKfhEZAVLFyHldooNxuchntHQP9y8J 8Ou9bWYQP7MnEn+kwSwrZkjurfPkan+xQvp6dDYnj3V0GwA5pprBMaB928VIDVOv+1PNQI3t Cvk5VPv/skq+TJRMHW7bFSt8PRa91cUf1FOLIz9APDiJOzXkwxUEHGV3zPSaUhs1JYjyBeGT wDAvtLUdjOnRhEUOwlnIrztmvyciutjJoVzKEEjj5WXnHk9L9kQ1bpAjkjTONw== In-Reply-To: <202406022043.452Khmjb050139@gitrepo.freebsd.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Feedback-ID: ::1.us-east-1.Lv9FVjaNvvR5llaqfLoOVbo2VxOELl7cjN0AOyXnPlk=:AmazonSES X-SES-Outgoing: 2024.06.02-54.240.8.56 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:14618, ipnet:54.240.8.0/21, country:US] X-Rspamd-Queue-Id: 4Vsq6N1Tjyz4qPR On 6/2/24 13:43, Jessica Clarke wrote: > fu740_pci_dw: Fix PERST delay and keep asserted for rest of reset sequence > > DELAY takes microseconds not milliseconds, so 100 was too low. Moreover, > when enabling hw.pci.clear_pcib, PCI emeration would still stop at one > of the first bridges, but by asserting PERST for the rest of the reset > sequence that appears to be reliably addressed. Does this need to be a DELAY as opposed to something asynchronous? We try to avoid lengthy DELAYs in the boot process. -- Colin Percival FreeBSD Release Engineering Lead & EC2 platform maintainer Founder, Tarsnap | www.tarsnap.com | Online backups for the truly paranoid From nobody Sun Jun 2 21:15: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 4VsqPz3xYBz5LDPw for ; Sun, 02 Jun 2024 21:15:19 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Received: from mail-wr1-f46.google.com (mail-wr1-f46.google.com [209.85.221.46]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "WR4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VsqPz0QHGz4s7M for ; Sun, 2 Jun 2024 21:15:19 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-wr1-f46.google.com with SMTP id ffacd0b85a97d-35e573c0334so266177f8f.1 for ; Sun, 02 Jun 2024 14:15:19 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1717362917; x=1717967717; 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=upH1qr1ZquRZ8sYsU5HDwE5NQE1U/kP5xoHd/4Ro2oY=; b=D5Ji0mbfKzwkTWngzrp+xGZ8v6LpBpDAdMXR0ZPjHvdX84xuSkRMk0KV1gLU8AzuNr sl+1xpulgVfzSzfiaYPQPtd8ZGfhieQOIu1IVXa0MFMkFfVnE1CtlPc3+KRsCEGUO/Jp eDr73ANXtYQqGLvO20ITGEg2GTtLGDNu4+fL81dSDuPkFFl/vpsXEX4OR2lmZR71F/5w hu+XRGIhSFkokh+4cLs0av5Mxpts8QRaBtNnFFpiJOxeVvWwH7/MlJaW5eFj9+Hl5CGd br9CUgcjQFhxQB+O698BB4GAg6mk3oTDsh17jUVY/vSM2zj3pPC8uQzyBF5hHAs3VZvq 9k7g== X-Forwarded-Encrypted: i=1; AJvYcCUBjk8DgOq5/3/VqkIcZicMAXoe6jez6caEUowT3pfBQ+phtpRK7CU4Ruy7ig1YZo0y48UD4qOJCfyXjxNQZNjqPDC4EJLvA4lvJmxr9TNw X-Gm-Message-State: AOJu0Yx/uJfWTd6BdPyPjZ3urw5ha8t0cWTD0rs7BByO8vpIhJcpGUQY xPl/0TraZiyY0i6SoVNiqooEevP1wiGglrs2BNVpy9sb3EL0HwwCsM2+fJ3Di66YH6XGR9yq3Yj R X-Google-Smtp-Source: AGHT+IEJ+nGwB89hfWJirrXTFYqOGZuXUjc2uOmn8n5g2VzttJYRbvyxjq6qOSIyPFARQBeggx1NBg== X-Received: by 2002:a5d:640e:0:b0:34d:8ed4:ca3b with SMTP id ffacd0b85a97d-35e0e523c46mr7097215f8f.0.1717362917192; Sun, 02 Jun 2024 14:15:17 -0700 (PDT) Received: from smtpclient.apple ([131.111.5.246]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-35dd064aa6csm6926901f8f.93.2024.06.02.14.15.16 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 02 Jun 2024 14:15:16 -0700 (PDT) Content-Type: text/plain; charset=utf-8 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3774.500.171.1.1\)) Subject: Re: git: 28aaa58fa64e - main - fu740_pci_dw: Fix PERST delay and keep asserted for rest of reset sequence From: Jessica Clarke In-Reply-To: <0100018fdac22280-97d0bb7c-c35e-4017-aeb8-9c9f2413094c-000000@email.amazonses.com> Date: Sun, 2 Jun 2024 22:15:06 +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: <6489FC3C-5B0E-4B07-A6EF-92EA3B353423@freebsd.org> References: <202406022043.452Khmjb050139@gitrepo.freebsd.org> <0100018fdac22280-97d0bb7c-c35e-4017-aeb8-9c9f2413094c-000000@email.amazonses.com> To: Colin Percival X-Mailer: Apple Mail (2.3774.500.171.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: 4VsqPz0QHGz4s7M On 2 Jun 2024, at 22:01, Colin Percival wrote: >=20 > On 6/2/24 13:43, Jessica Clarke wrote: >> fu740_pci_dw: Fix PERST delay and keep asserted for rest of reset = sequence >> DELAY takes microseconds not milliseconds, so 100 was too = low. Moreover, >> when enabling hw.pci.clear_pcib, PCI emeration would still stop = at one >> of the first bridges, but by asserting PERST for the rest of the = reset >> sequence that appears to be reliably addressed. >=20 > Does this need to be a DELAY as opposed to something asynchronous? We = try to > avoid lengthy DELAYs in the boot process. It=E2=80=99s in the middle of device_attach, so you=E2=80=99d need to = break it up into two stages. I don=E2=80=99t know if we have a good way of doing that for delays; I=E2=80=99ve seen other glue code drivers do things like this, = but there may well be a better way, and if so I=E2=80=99m all ears. Though = given you won=E2=80=99t have working PCI (so no USB nor NVMe) until this is = done there=E2=80=99s probably not much more you can do during boot whilst you = wait, so it may not be worth pursuing. Also, given the performance of the SoC in question, 100ms isn=E2=80=99t something you=E2=80=99d be close to = noticing... Jess From nobody Sun Jun 2 21:37:18 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VsqvM36kBz5LHKB for ; Sun, 02 Jun 2024 21:37:19 +0000 (UTC) (envelope-from 0100018fdae2a7e7-470d6248-71a4-4116-817f-056f2194046d-000000@amazonses.com) Received: from a8-13.smtp-out.amazonses.com (a8-13.smtp-out.amazonses.com [54.240.8.13]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4VsqvM1BrPz4vVr for ; Sun, 2 Jun 2024 21:37:19 +0000 (UTC) (envelope-from 0100018fdae2a7e7-470d6248-71a4-4116-817f-056f2194046d-000000@amazonses.com) Authentication-Results: mx1.freebsd.org; none DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=dqtolf56kk3wpt62c3jnwboqvr7iedax; d=tarsnap.com; t=1717364238; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From:In-Reply-To:Content-Type:Content-Transfer-Encoding; bh=To3Iie604R9NsQ88VjkQ9/7VdErqT1vCkSAJNuvrkhU=; b=cV+TtJuRu1xWVh1RCW1R/EOIpWtr+if+T+HxqPePCgTPbEcFAt1t9HiKvssNU9jY 1WP9mm+//VFegzNoXBQVivlHFXxIzrHsVWcqUd7go50NVLMfcxBzX1ju4FKwVD6c4Dh Ic8RYx7H0tREq0I5dgbBcrUjQ/Jf3oOZtpRe9Bus= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=ug7nbtf4gccmlpwj322ax3p6ow6yfsug; d=amazonses.com; t=1717364238; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From:In-Reply-To:Content-Type:Content-Transfer-Encoding:Feedback-ID; bh=To3Iie604R9NsQ88VjkQ9/7VdErqT1vCkSAJNuvrkhU=; b=hlXcVeFByKsJizf3SINONBncFoUQe3CX9WcsnvdZLe2EYAlA2+hFogGrc/wA+20s zqbBsDgEFNtFZNAsDxSk0vfo8QQMuocpkPI0/QAGH/o9GIGkZwqgTQcEhZCJ2PlsKrc r2DoQYE1i2dnUBqVBJpCuTF7ja8ibuURh0M2CXOc= Message-ID: <0100018fdae2a7e7-470d6248-71a4-4116-817f-056f2194046d-000000@email.amazonses.com> Date: Sun, 2 Jun 2024 21:37:18 +0000 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: git: 28aaa58fa64e - main - fu740_pci_dw: Fix PERST delay and keep asserted for rest of reset sequence To: Jessica Clarke Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" References: <202406022043.452Khmjb050139@gitrepo.freebsd.org> <0100018fdac22280-97d0bb7c-c35e-4017-aeb8-9c9f2413094c-000000@email.amazonses.com> <6489FC3C-5B0E-4B07-A6EF-92EA3B353423@freebsd.org> Content-Language: en-US From: Colin Percival Autocrypt: addr=cperciva@tarsnap.com; keydata= xsFNBGWMSrYBEACdWRqDn3B3SKO7IG0/fGHYtfs26f3Q5QeAcasy1fQLniwGQWn5rlILhbCD K/jdNoDm5Zxq20eqyffoDNObCjnHgg4tGANdi+RmDy+7CDpE789H8dss9y7Pt5DlGGAXQQnt hxush3EYS/Ctprd9UUL/lzOOLOU1aNtzB84tNrJBtcJmL7OYHfyTSNFxvedqJrrasejIQOLI t/DQ89BPzz+vsKHz7FJPXh3fsVkzLA00DJYcfkgxyABfJNA7U6yMwd4DVSdx/SsvfIDMVXnu UXCXswo106WPZbYGlZPpq0wW6iibtTerJix+8AeuwXvl9O1p8yESK4ErkIxCnmghTSz+pdzj z/6xBRkdDM9VdZ0r+CzsaNXMpDOzFuKyjaiYBdgCLljbDnXIHFcqXenrZ7Xwkm09g/M4uVSh pIUG2RYa6tsHSQoGCp3f2RZv1znfViKQFbbL83QjtPA20AhseZSYbHp1FPhXyy9J0wkGL16L e99g6gdGeIRE82BZjBjKGDkoyDPq+oDRSFl8NtzmIKy+cfz00nViqcTF4bREXEawFGhlpO0X O9q8mijI9iFB6zaPBiSdJGBL5ML5qLTNCl8Zlf4m1TBvmRTqF/lzMHVXHidDoUhpSh/y3AFZ 1KrYc27ztJQywDJPJPWPbtY8YhFLFs377gfP8WldsZjzp8nvoQARAQABzSVDb2xpbiBQZXJj aXZhbCA8Y3BlcmNpdmFAdGFyc25hcC5jb20+wsGRBBMBCAA7FiEEglY7hNBiDtwN+4ZBOJfy 4i5lrT8FAmWMSyYCGwMICwkNCAwHCwMFFQoJCAsFFgMCAQACHgUCF4AACgkQOJfy4i5lrT+i Yg/+PYyJNoFuygtV5t/skcjYmvEC93mnazEvh+x99vGYZnGKeJ8NDOF4QCUzeHquOWxDi8Zl reXyswKcrIquPxxX6+YyGe97VbvLnez3ksfzOYRj1F4qV0Rq8ZNK51+bvIrbcS3SfDaRioAk D7WWwFor8y/hSwxYkfsKbtP5PRcem20JUxuC085zqWLaKv5t5n2CBzAGMjwJaQ3tM3AXVwWJ uJaHA6ot/6fntJlmkfcyCYyyr0D6b0guRj3STbZ2hNn5o2AI+f6LJJ31s2sPFjl6rs7fORf3 hFSNOHDd2HxfVBXFdQy24ROkC4orBBz2xh9GScjxxT/hbXkfufkubFubw7n0HkvHzA3UF+Qq A8JiI3n+d7ocsP0/5BQ2sZdeqPGJgHx6RkAMuW1tJ29wSvCN1qMgFwhYkpQdfvHlociQrimU fvlRfSrBEe8o7tvIuEdpvwvCZSTJqQbVoMw8UHFE7nzyCXUSab5h6PbjakCqim13ekVO2KFF TTPcz5o5jEeUY75tzbIwcDfFbT5KqNjWy06TVdM9VEJDHSfOfxHR3kSEwZ+tT2aTvL3grsUn gFwSNcj4Cl4CRFfUw8zVZY+7O7RiMlhBqykikvUurrdGKc1Scwa0yuppdA6eVvylyTWSQGrQ +uLWtV1LUKN7ZqKJWBkLPt9nS4XZWGyBvxOHYqjOwU0EZYxKtgEQANYfgbtUMVnhjxDHhWLp g5kLHK3YW0TfJKzpXqDB7NiqxHofn4OcbZnVC3MKggcbs9o1/UtsjnlsG8550PfiYkDXvPiO RJwgbGs6MGIDK797C6cnBLQ8xwBa9SL4cl5iQFnhWmt6vwnJ+an/cm5JpYves3wL7jV09qU9 57hkHXEUcl38r4FssZzVcLKPUVTa3Un+QGRTGDGe/f4ctjMaqv0ZCM+l2ixPhf/vqESrfSLv V/+T3dmtUfXjazO3SABvsHwxgGuTTYOlKoPCaebr+BRdqm0xeIShoIlhvTI8y4clchqx/Uxg UG5X2kvU13k3DS3Q8uLE4Et9x1CcZT6WGgBZSR6R0WfD0SDnzufNnRWJ0dEPA2MtJHE7+85R Vi9j/IgZV+y5Ur+bnPkjDG1s2SVciX5v9HQ0oilcBhvx0j5lGE9hhurD9F+fCvkr4KdbCknE 6Y8ce8pCNBUoB/DqibJivOzTk9K9MGB5x0De5TerIrFiaw3/mQC9nGeO9dtE7wvDJetWeoTq 4BEaCzpufNqbkpOaTQILr4V6Gp7M6v97g83TVAwZntz/q8ptwuKQPZ2JaSFLZn7oWUpYXA5s +SIODFHLn6iMoYpBQskHQjnj4lEPJadl4qj+ZKA89iDAKsniyoFXsbJe2CPbMS1yzBxKZq6K D/jpt7BOnuHr/JrXABEBAAHCwXYEGAEIACAWIQSCVjuE0GIO3A37hkE4l/LiLmWtPwUCZYxK tgIbDAAKCRA4l/LiLmWtP3jmEACQrh9gWe8F1Tkw3m6VoHKwLc5he4tX3WpQa//soPO6iGG3 S3WPruQ46NrAaAojoOcKI9UONDO5rxG0ZTX53S+lu2EO47jbcLwOCjaEpjKpDRt9ZXBQE8Xl mtBE9Bp3W9gpjB1nE3KNM1mJYgsK0QdRpwwfh4pVgGpOj8j23I6MCK+v99zEBnpgCn2GX8W/ kctRXHqWwndHysOJtRP/zrl7dDaABF1f9efUl0LL3TD3GJ9VDz+DNOin/uK2a1hiJo8QzTRk PpfUQ2ebzDsrd1i/pOWkMSkdH+rEu4AGrXWtaBwrMyrGkL6Icb6yO+P9/z0W2wlgBf3P1YRt JPgQt/Dj3yvA/UnaV/QmuVQPjl13o24UnJGsZM8XGnNdfWBKkC1Q6VXC4QT+dyBHYH9MuE9d 6oGl8pFM1+cTfEfbM62/rRoPkF1yHMsI/903VxEvuUIKfhEZAVLFyHldooNxuchntHQP9y8J 8Ou9bWYQP7MnEn+kwSwrZkjurfPkan+xQvp6dDYnj3V0GwA5pprBMaB928VIDVOv+1PNQI3t Cvk5VPv/skq+TJRMHW7bFSt8PRa91cUf1FOLIz9APDiJOzXkwxUEHGV3zPSaUhs1JYjyBeGT wDAvtLUdjOnRhEUOwlnIrztmvyciutjJoVzKEEjj5WXnHk9L9kQ1bpAjkjTONw== In-Reply-To: <6489FC3C-5B0E-4B07-A6EF-92EA3B353423@freebsd.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit Feedback-ID: ::1.us-east-1.Lv9FVjaNvvR5llaqfLoOVbo2VxOELl7cjN0AOyXnPlk=:AmazonSES X-SES-Outgoing: 2024.06.02-54.240.8.13 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:14618, ipnet:54.240.8.0/21, country:US] X-Rspamd-Queue-Id: 4VsqvM1BrPz4vVr On 6/2/24 14:15, Jessica Clarke wrote: > On 2 Jun 2024, at 22:01, Colin Percival wrote: >> On 6/2/24 13:43, Jessica Clarke wrote: >>> fu740_pci_dw: Fix PERST delay and keep asserted for rest of reset sequence >>> DELAY takes microseconds not milliseconds, so 100 was too low. Moreover, >>> when enabling hw.pci.clear_pcib, PCI emeration would still stop at one >>> of the first bridges, but by asserting PERST for the rest of the reset >>> sequence that appears to be reliably addressed. >> >> Does this need to be a DELAY as opposed to something asynchronous? We try to >> avoid lengthy DELAYs in the boot process. > > It’s in the middle of device_attach, so you’d need to break it up into > two stages. I don’t know if we have a good way of doing that for > delays; I’ve seen other glue code drivers do things like this, but > there may well be a better way, and if so I’m all ears. I don't think there's any good mechanism for doing that, unfortunately. Part of the problem is that our device probing scheme is designed around the idea that by the time you return from device_attach, you know if the device has successfully attached; if you discover that the device is broken at a later time it's too late to assign the unit number to a different device. I remember talking to Warner about this a while back in the context of nvme, but the problem of "the spec says we have to wait a long time and we don't want to do that serially for every disk" was resolved by our driver learning to be opportunistic and ask the disks if they were ready yet instead of simply waiting the time stipulated by the spec. Maybe something to consider when someone decides to write newnewbus. ;-) > Though given > you won’t have working PCI (so no USB nor NVMe) until this is done > there’s probably not much more you can do during boot whilst you wait, > so it may not be worth pursuing. Also, given the performance of the SoC > in question, 100ms isn’t something you’d be close to noticing... Fair enough, I wasn't sure what sort of hardware this was. Sounds like we're fine here; it just caught my eye so I thought I'd ask. -- Colin Percival FreeBSD Release Engineering Lead & EC2 platform maintainer Founder, Tarsnap | www.tarsnap.com | Online backups for the truly paranoid From nobody Sun Jun 2 21:45: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 4Vsr5J4Lp6z5LJ7Y for ; Sun, 02 Jun 2024 21:45:56 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-pf1-x42b.google.com (mail-pf1-x42b.google.com [IPv6:2607:f8b0:4864:20::42b]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "WR4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Vsr5H4qK1z3xBP for ; Sun, 2 Jun 2024 21:45:55 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-pf1-x42b.google.com with SMTP id d2e1a72fcca58-70264bcb631so511033b3a.2 for ; Sun, 02 Jun 2024 14:45:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20230601.gappssmtp.com; s=20230601; t=1717364754; x=1717969554; darn=freebsd.org; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=qKbSMcF/7cx+xKspk3F6qSb3zNzW5tWriYUsVNgH8OA=; b=r2P5BOYmq2AZiWDUO9yCoeXgCL1bQo5jgO5XgnQESjFwsK6obn3o60GDx1QQs8zIL8 h7C7jqWa8Fb3dP2yravQ08Vyg1fDwEn81e9CAQXvc4RPfBhrHpoyaUwVvMbIiQpoaW+J AtVL7Nhpi8Z7dMhI0hnf+QaJI+dy9Niie0p8W85wZHxplTHwHEUduLFD/k6JO66qZKRq XyIHJ36a73qhESbqKat6GH7zFpnzJ6OT1y0L4N8T2PmJqq0UW2gseZ+iE6j5zGs9hY2+ KKS8qHLfF8IQOgD/USmETR8NIn0gm7wBz7qUOY0E1Q9aoHmVC26P5mD6en4VT2lEKDyI /h1g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1717364754; x=1717969554; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=qKbSMcF/7cx+xKspk3F6qSb3zNzW5tWriYUsVNgH8OA=; b=b8zaTAurzaYxPe+5qyrtPyuxYbDmo8IowZoBm9rfwersGaluSqLwWrzhyVutpEuOKl SNZZgvT3YBBtBPNTQY5irJmxko+nuHNhoAgtQZQqhWr+8Zd03110JMsoyX2UF656x4gJ WO3se6KIYVXVlrSCq1CayVUPJm2IvQ49lL3dh9s13+0cSmcl5JMYL1SbsN1lRAwbZU2E tBZOsuuJ8T6lb7utMkcYLT3phNDcr3Tg+/YFc8nKziPQMvcOdtNKtc3TVpdJ5XOpjVEf MAgtbxKOgdP685UTjTzcFd0tUz7tSR9/3SF91vudYGAbfcEexiuqkt+Di/ousOd1gvc7 M5mg== X-Forwarded-Encrypted: i=1; AJvYcCWwJA5U9RY3Qsga3JNys1kHGQDyot745/3hpDoPA9gmZgc5yz/vlBBmo+XERqyLhyfqci/7T9lV/bKSqG0atbZGKu4TqbEjsEy204vS8obt X-Gm-Message-State: AOJu0YyZMaaryi4CA59WvCRcaay0wTzngLdeS8csJydzMGxwUVhIpxWH up/HA4rZklF4/82QQDnQta6JkVflAlUgkKfqkFMHlK6VzP1x21YAloUjNl2Vcn9VT9wBEJuVGI2 QbcD6pPOmjb8KIoga8waUkfeSAHczcGQoDDzDLA== X-Google-Smtp-Source: AGHT+IHe/elu18YzGvzqQwn/sJR58xLYQEfX2+VyUhslNW08R3m21/MnGQh+IIW5nCjpU1EQ1Cht6Cv/gmv4DKjC2sE= X-Received: by 2002:a05:6a20:9716:b0:1af:a9ad:fbb9 with SMTP id adf61e73a8af0-1b26f29dfa3mr5989049637.59.1717364753653; Sun, 02 Jun 2024 14:45:53 -0700 (PDT) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 References: <202406022043.452Khmjb050139@gitrepo.freebsd.org> <0100018fdac22280-97d0bb7c-c35e-4017-aeb8-9c9f2413094c-000000@email.amazonses.com> <6489FC3C-5B0E-4B07-A6EF-92EA3B353423@freebsd.org> <0100018fdae2a7fd-b81325da-c255-478f-b7a0-efc0ae77ed43-000000@email.amazonses.com> In-Reply-To: <0100018fdae2a7fd-b81325da-c255-478f-b7a0-efc0ae77ed43-000000@email.amazonses.com> From: Warner Losh Date: Sun, 2 Jun 2024 17:45:41 -0400 Message-ID: Subject: Re: git: 28aaa58fa64e - main - fu740_pci_dw: Fix PERST delay and keep asserted for rest of reset sequence To: Colin Percival Cc: Jessica Clarke , src-committers , "" , "" Content-Type: multipart/alternative; boundary="000000000000177f780619ef24a8" X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US] X-Rspamd-Queue-Id: 4Vsr5H4qK1z3xBP --000000000000177f780619ef24a8 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Sun, Jun 2, 2024, 3:37=E2=80=AFPM Colin Percival = wrote: > On 6/2/24 14:15, Jessica Clarke wrote: > > On 2 Jun 2024, at 22:01, Colin Percival wrote: > >> On 6/2/24 13:43, Jessica Clarke wrote: > >>> fu740_pci_dw: Fix PERST delay and keep asserted for rest of rese= t > sequence > >>> DELAY takes microseconds not milliseconds, so 100 was too > low. Moreover, > >>> when enabling hw.pci.clear_pcib, PCI emeration would still stop > at one > >>> of the first bridges, but by asserting PERST for the rest of the > reset > >>> sequence that appears to be reliably addressed. > >> > >> Does this need to be a DELAY as opposed to something asynchronous? We > try to > >> avoid lengthy DELAYs in the boot process. > > > > It=E2=80=99s in the middle of device_attach, so you=E2=80=99d need to b= reak it up into > > two stages. I don=E2=80=99t know if we have a good way of doing that fo= r > > delays; I=E2=80=99ve seen other glue code drivers do things like this, = but > > there may well be a better way, and if so I=E2=80=99m all ears. > > I don't think there's any good mechanism for doing that, unfortunately. > Part > of the problem is that our device probing scheme is designed around the > idea > that by the time you return from device_attach, you know if the device ha= s > successfully attached; if you discover that the device is broken at a lat= er > time it's too late to assign the unit number to a different device. > This is false. We assign unit in probe, and once assigned you don't want to reassign it. I remember talking to Warner about this a while back in the context of nvme= , > but the problem of "the spec says we have to wait a long time and we don'= t > want to do that serially for every disk" was resolved by our driver > learning > to be opportunistic and ask the disks if they were ready yet instead of > simply > waiting the time stipulated by the spec. > If there's no status register to read, you can't do much. And in an SoC there's only going to be one. So between yhe two, i don't see much benefit to be had. And even if we could do this wait asynchronously, there is nothing else to do in parallel. Maybe something to consider when someone decides to write newnewbus. ;-) > Parallel discovery is something we've talked about, but there's a number of logistical issues to sort out first. Warner > Though given > > you won=E2=80=99t have working PCI (so no USB nor NVMe) until this is d= one > > there=E2=80=99s probably not much more you can do during boot whilst yo= u wait, > > so it may not be worth pursuing. Also, given the performance of the SoC > > in question, 100ms isn=E2=80=99t something you=E2=80=99d be close to no= ticing... > > Fair enough, I wasn't sure what sort of hardware this was. Sounds like > we're > fine here; it just caught my eye so I thought I'd ask. > > -- > Colin Percival > FreeBSD Release Engineering Lead & EC2 platform maintainer > Founder, Tarsnap | www.tarsnap.com | Online backups for the truly paranoi= d > --000000000000177f780619ef24a8 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable


On Sun, Jun 2, 2024, 3:37=E2=80=AFPM Colin Percival &l= t;cperciva@tarsnap.com> wrot= e:
On 6/2/24 14:15, Jessica Clarke = wrote:
> On 2 Jun 2024, at 22:01, Colin Percival <cperciva@tarsnap.com= > wrote:
>> On 6/2/24 13:43, Jessica Clarke wrote:
>>>=C2=A0 =C2=A0 =C2=A0 fu740_pci_dw: Fix PERST delay and keep ass= erted for rest of reset sequence
>>>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0DELAY takes microsecon= ds not milliseconds, so 100 was too low. Moreover,
>>>=C2=A0 =C2=A0 =C2=A0 when enabling hw.pci.clear_pcib, PCI emera= tion would still stop at one
>>>=C2=A0 =C2=A0 =C2=A0 of the first bridges, but by asserting PER= ST for the rest of the reset
>>>=C2=A0 =C2=A0 =C2=A0 sequence that appears to be reliably addre= ssed.
>>
>> Does this need to be a DELAY as opposed to something asynchronous?= =C2=A0 We try to
>> avoid lengthy DELAYs in the boot process.
>
> It=E2=80=99s in the middle of device_attach, so you=E2=80=99d need to = break it up into
> two stages. I don=E2=80=99t know if we have a good way of doing that f= or
> delays; I=E2=80=99ve seen other glue code drivers do things like this,= but
> there may well be a better way, and if so I=E2=80=99m all ears.

I don't think there's any good mechanism for doing that, unfortunat= ely.=C2=A0 Part
of the problem is that our device probing scheme is designed around the ide= a
that by the time you return from device_attach, you know if the device has<= br> successfully attached; if you discover that the device is broken at a later=
time it's too late to assign the unit number to a different device.
=

This= is false. We assign unit in probe, and once assigned you don't want to= reassign it.=C2=A0

I remember talking to Warner about this a while back in the context of nvme= ,
but the problem of "the spec says we have to wait a long time and we d= on't
want to do that serially for every disk" was resolved by our driver le= arning
to be opportunistic and ask the disks if they were ready yet instead of sim= ply
waiting the time stipulated by the spec.

If there's no status register t= o read, you can't do much. And in an SoC there's only going to be o= ne. So between yhe two, i don't see much benefit to be had. And even if= we could do this wait asynchronously, there is nothing else to do in paral= lel.=C2=A0

Maybe something to consider when someone decides to write newnewbus. ;-)

Par= allel discovery is something we've talked about, but there's a numb= er of logistical issues to sort out first.

Warner=C2=A0

> Though given
> you won=E2=80=99t have working PCI (so no USB nor NVMe) until this is = done
> there=E2=80=99s probably not much more you can do during boot whilst y= ou wait,
> so it may not be worth pursuing. Also, given the performance of the So= C
> in question, 100ms isn=E2=80=99t something you=E2=80=99d be close to n= oticing...

Fair enough, I wasn't sure what sort of hardware this was.=C2=A0 Sounds= like we're
fine here; it just caught my eye so I thought I'd ask.

--
Colin Percival
FreeBSD Release Engineering Lead & EC2 platform maintainer
Founder, Tarsnap | www.tarsnap.com | Online backups for the tru= ly paranoid
--000000000000177f780619ef24a8-- From nobody Sun Jun 2 21:51: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 4VsrD70tTTz5LK2S for ; Sun, 02 Jun 2024 21:51:51 +0000 (UTC) (envelope-from 0100018fdaeff6b2-ac98493d-f43e-4e60-afd9-deea517b451b-000000@amazonses.com) Received: from a8-56.smtp-out.amazonses.com (a8-56.smtp-out.amazonses.com [54.240.8.56]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4VsrD70Ds4z3xsq for ; Sun, 2 Jun 2024 21:51:51 +0000 (UTC) (envelope-from 0100018fdaeff6b2-ac98493d-f43e-4e60-afd9-deea517b451b-000000@amazonses.com) Authentication-Results: mx1.freebsd.org; none DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=dqtolf56kk3wpt62c3jnwboqvr7iedax; d=tarsnap.com; t=1717365110; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From:In-Reply-To:Content-Type:Content-Transfer-Encoding; bh=ABYmsEiqBCLB1OBpb7HzFcpU8kMUIzNUfVPnqfz6d68=; b=eqsD+qxZ2roblBiIFBB2gWokGuOyPDczrXbtKdePoepvQxLQp0GQGxb7lQSv8lx/ DwJoKeCurlV6dlza+f1PAo9cZ4ATXSpYD+/0wZb46qQsD6hUWMdEy4fypLrs2uWxyKk rOf38nrhTm5cutsNCRHinlRjR9RP5rTF+YnS8/vg= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=ug7nbtf4gccmlpwj322ax3p6ow6yfsug; d=amazonses.com; t=1717365110; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From:In-Reply-To:Content-Type:Content-Transfer-Encoding:Feedback-ID; bh=ABYmsEiqBCLB1OBpb7HzFcpU8kMUIzNUfVPnqfz6d68=; b=Ec07hsG5e16iLg+UR+VJ+OvGvPUd328umxb+WKjfs1k2fTXg043flabWzI8/LyQL d9AwvxMeS9gxWFg9x77flWdKZBgr1R1V7/YUqSTzt6OTp9XyNgn9Lqj1UHE5hVkfU7j g/go0y/AMmW6Q0ZQhfSmaUkYxyRZrc+loQTCFQLU= Message-ID: <0100018fdaeff6b2-ac98493d-f43e-4e60-afd9-deea517b451b-000000@email.amazonses.com> Date: Sun, 2 Jun 2024 21:51:50 +0000 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: git: 28aaa58fa64e - main - fu740_pci_dw: Fix PERST delay and keep asserted for rest of reset sequence To: Warner Losh Cc: Jessica Clarke , src-committers , dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org References: <202406022043.452Khmjb050139@gitrepo.freebsd.org> <0100018fdac22280-97d0bb7c-c35e-4017-aeb8-9c9f2413094c-000000@email.amazonses.com> <6489FC3C-5B0E-4B07-A6EF-92EA3B353423@freebsd.org> <0100018fdae2a7fd-b81325da-c255-478f-b7a0-efc0ae77ed43-000000@email.amazonses.com> Content-Language: en-US From: Colin Percival Autocrypt: addr=cperciva@tarsnap.com; keydata= xsFNBGWMSrYBEACdWRqDn3B3SKO7IG0/fGHYtfs26f3Q5QeAcasy1fQLniwGQWn5rlILhbCD K/jdNoDm5Zxq20eqyffoDNObCjnHgg4tGANdi+RmDy+7CDpE789H8dss9y7Pt5DlGGAXQQnt hxush3EYS/Ctprd9UUL/lzOOLOU1aNtzB84tNrJBtcJmL7OYHfyTSNFxvedqJrrasejIQOLI t/DQ89BPzz+vsKHz7FJPXh3fsVkzLA00DJYcfkgxyABfJNA7U6yMwd4DVSdx/SsvfIDMVXnu UXCXswo106WPZbYGlZPpq0wW6iibtTerJix+8AeuwXvl9O1p8yESK4ErkIxCnmghTSz+pdzj z/6xBRkdDM9VdZ0r+CzsaNXMpDOzFuKyjaiYBdgCLljbDnXIHFcqXenrZ7Xwkm09g/M4uVSh pIUG2RYa6tsHSQoGCp3f2RZv1znfViKQFbbL83QjtPA20AhseZSYbHp1FPhXyy9J0wkGL16L e99g6gdGeIRE82BZjBjKGDkoyDPq+oDRSFl8NtzmIKy+cfz00nViqcTF4bREXEawFGhlpO0X O9q8mijI9iFB6zaPBiSdJGBL5ML5qLTNCl8Zlf4m1TBvmRTqF/lzMHVXHidDoUhpSh/y3AFZ 1KrYc27ztJQywDJPJPWPbtY8YhFLFs377gfP8WldsZjzp8nvoQARAQABzSVDb2xpbiBQZXJj aXZhbCA8Y3BlcmNpdmFAdGFyc25hcC5jb20+wsGRBBMBCAA7FiEEglY7hNBiDtwN+4ZBOJfy 4i5lrT8FAmWMSyYCGwMICwkNCAwHCwMFFQoJCAsFFgMCAQACHgUCF4AACgkQOJfy4i5lrT+i Yg/+PYyJNoFuygtV5t/skcjYmvEC93mnazEvh+x99vGYZnGKeJ8NDOF4QCUzeHquOWxDi8Zl reXyswKcrIquPxxX6+YyGe97VbvLnez3ksfzOYRj1F4qV0Rq8ZNK51+bvIrbcS3SfDaRioAk D7WWwFor8y/hSwxYkfsKbtP5PRcem20JUxuC085zqWLaKv5t5n2CBzAGMjwJaQ3tM3AXVwWJ uJaHA6ot/6fntJlmkfcyCYyyr0D6b0guRj3STbZ2hNn5o2AI+f6LJJ31s2sPFjl6rs7fORf3 hFSNOHDd2HxfVBXFdQy24ROkC4orBBz2xh9GScjxxT/hbXkfufkubFubw7n0HkvHzA3UF+Qq A8JiI3n+d7ocsP0/5BQ2sZdeqPGJgHx6RkAMuW1tJ29wSvCN1qMgFwhYkpQdfvHlociQrimU fvlRfSrBEe8o7tvIuEdpvwvCZSTJqQbVoMw8UHFE7nzyCXUSab5h6PbjakCqim13ekVO2KFF TTPcz5o5jEeUY75tzbIwcDfFbT5KqNjWy06TVdM9VEJDHSfOfxHR3kSEwZ+tT2aTvL3grsUn gFwSNcj4Cl4CRFfUw8zVZY+7O7RiMlhBqykikvUurrdGKc1Scwa0yuppdA6eVvylyTWSQGrQ +uLWtV1LUKN7ZqKJWBkLPt9nS4XZWGyBvxOHYqjOwU0EZYxKtgEQANYfgbtUMVnhjxDHhWLp g5kLHK3YW0TfJKzpXqDB7NiqxHofn4OcbZnVC3MKggcbs9o1/UtsjnlsG8550PfiYkDXvPiO RJwgbGs6MGIDK797C6cnBLQ8xwBa9SL4cl5iQFnhWmt6vwnJ+an/cm5JpYves3wL7jV09qU9 57hkHXEUcl38r4FssZzVcLKPUVTa3Un+QGRTGDGe/f4ctjMaqv0ZCM+l2ixPhf/vqESrfSLv V/+T3dmtUfXjazO3SABvsHwxgGuTTYOlKoPCaebr+BRdqm0xeIShoIlhvTI8y4clchqx/Uxg UG5X2kvU13k3DS3Q8uLE4Et9x1CcZT6WGgBZSR6R0WfD0SDnzufNnRWJ0dEPA2MtJHE7+85R Vi9j/IgZV+y5Ur+bnPkjDG1s2SVciX5v9HQ0oilcBhvx0j5lGE9hhurD9F+fCvkr4KdbCknE 6Y8ce8pCNBUoB/DqibJivOzTk9K9MGB5x0De5TerIrFiaw3/mQC9nGeO9dtE7wvDJetWeoTq 4BEaCzpufNqbkpOaTQILr4V6Gp7M6v97g83TVAwZntz/q8ptwuKQPZ2JaSFLZn7oWUpYXA5s +SIODFHLn6iMoYpBQskHQjnj4lEPJadl4qj+ZKA89iDAKsniyoFXsbJe2CPbMS1yzBxKZq6K D/jpt7BOnuHr/JrXABEBAAHCwXYEGAEIACAWIQSCVjuE0GIO3A37hkE4l/LiLmWtPwUCZYxK tgIbDAAKCRA4l/LiLmWtP3jmEACQrh9gWe8F1Tkw3m6VoHKwLc5he4tX3WpQa//soPO6iGG3 S3WPruQ46NrAaAojoOcKI9UONDO5rxG0ZTX53S+lu2EO47jbcLwOCjaEpjKpDRt9ZXBQE8Xl mtBE9Bp3W9gpjB1nE3KNM1mJYgsK0QdRpwwfh4pVgGpOj8j23I6MCK+v99zEBnpgCn2GX8W/ kctRXHqWwndHysOJtRP/zrl7dDaABF1f9efUl0LL3TD3GJ9VDz+DNOin/uK2a1hiJo8QzTRk PpfUQ2ebzDsrd1i/pOWkMSkdH+rEu4AGrXWtaBwrMyrGkL6Icb6yO+P9/z0W2wlgBf3P1YRt JPgQt/Dj3yvA/UnaV/QmuVQPjl13o24UnJGsZM8XGnNdfWBKkC1Q6VXC4QT+dyBHYH9MuE9d 6oGl8pFM1+cTfEfbM62/rRoPkF1yHMsI/903VxEvuUIKfhEZAVLFyHldooNxuchntHQP9y8J 8Ou9bWYQP7MnEn+kwSwrZkjurfPkan+xQvp6dDYnj3V0GwA5pprBMaB928VIDVOv+1PNQI3t Cvk5VPv/skq+TJRMHW7bFSt8PRa91cUf1FOLIz9APDiJOzXkwxUEHGV3zPSaUhs1JYjyBeGT wDAvtLUdjOnRhEUOwlnIrztmvyciutjJoVzKEEjj5WXnHk9L9kQ1bpAjkjTONw== In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit Feedback-ID: ::1.us-east-1.Lv9FVjaNvvR5llaqfLoOVbo2VxOELl7cjN0AOyXnPlk=:AmazonSES X-SES-Outgoing: 2024.06.02-54.240.8.56 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:14618, ipnet:54.240.8.0/21, country:US] X-Rspamd-Queue-Id: 4VsrD70Ds4z3xsq On 6/2/24 14:45, Warner Losh wrote: > On Sun, Jun 2, 2024, 3:37 PM Colin Percival > wrote: > I don't think there's any good mechanism for doing that, unfortunately.  Part > of the problem is that our device probing scheme is designed around the idea > that by the time you return from device_attach, you know if the device has > successfully attached; if you discover that the device is broken at a later > time it's too late to assign the unit number to a different device. > > This is false. We assign unit in probe, and once assigned you don't want to > reassign it. Ah, I misremembered. It's a while since I was thinking about these details. > I remember talking to Warner about this a while back in the context of nvme, > but the problem of "the spec says we have to wait a long time and we don't > want to do that serially for every disk" was resolved by our driver learning > to be opportunistic and ask the disks if they were ready yet instead of simply > waiting the time stipulated by the spec. > > If there's no status register to read, you can't do much. And in an SoC > there's only going to be one. So between yhe two, i don't see much benefit to > be had. And even if we could do this wait asynchronously, there is nothing > else to do in parallel. I suppose it's unlikely that an SoC would have two PCI buses... > Maybe something to consider when someone decides to write newnewbus. ;-) > > Parallel discovery is something we've talked about, but there's a number of > logistical issues to sort out first. Yep, definitely nontrivial. -- Colin Percival FreeBSD Release Engineering Lead & EC2 platform maintainer Founder, Tarsnap | www.tarsnap.com | Online backups for the truly paranoid From nobody Sun Jun 2 22:55: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 4Vssdw1W06z5LQF0; Sun, 02 Jun 2024 22:55: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 4Vssdw0rzVz45BB; Sun, 2 Jun 2024 22:55:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717368948; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KWTkgGPz2T2zdG2XEQcKXCU9d9FXqiMl+QDWdZEYn1g=; b=eebB9DYCeHEDSnX44sTMv/D+nFFFTxRJQPtU8e7C+ozlwnKmNIN4IBBkEbNzIPH1q/z2Pk sryCgRroFpirXX7O05xYsBQC7Bj6sQmwJSHO1e7T26PsM3kgQoh02lmFKn6I2+IEQgDdm/ bxxyAlT6Cb9CVN6/KSmgsYwUtxCYJuD9+FVumtXOgZiak7mAmq6bvk/lB4Kpl6JiDmjZIG qrJw2VMBUR+Rgt1/X+GWWsFAbgNckES/js5VkgE/+jROlNg8jlpknO+UeNWDR+AU20HNRi jGgIcIro0ZiYHatWV/zz4LF+V3/1ofJgwmjqo5v2FddzfGv3FskVWff9jJJ1ew== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1717368948; a=rsa-sha256; cv=none; b=Viu6khbxtdLUPV3h8BeYdGOLOnJVUafvaJkPdr7YFUwey4jI1A20Jjtf0iEDAUVq9W8iDS 9Ohu80msUE6LfRXdj3bSdd6brGgM+qPqzqNxGxIkp+s1Y4lXE6aQZM1Jtpe70WBztNpiQ6 5s628aLjeKRHbfHOe1WXBNB7Gu4uDLAy5a7BrNt2SoMu6vMBAgK3juaIQDiJMUrTWwk2ml NfpXTq8B3LPc0ZQMXPD8SVWNaRi/7GAcrViqKFujIvdwDQs2N1PHuiGe/cirOQmdK4Vnqc e24bdziw/IwbaQMIPkBNAqx1vlcOD8wPYOetrB4FvDr/HHGy2cPXNAOv0/1XKA== 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=1717368948; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KWTkgGPz2T2zdG2XEQcKXCU9d9FXqiMl+QDWdZEYn1g=; b=HJQBKcUq51iWTJu4P19vzowxmyCe9wQk0/+eDpaif16GG+eWlaHy/5IbrWqDLlQICwEzzP 2cUUqm1r0p9eu8JoCKd0LP8Wfq+S5o87zLD5D3ysjdsMWH7QKT0dJ/cttB2djeDwv63kCE XOKidJH1cPMnQQWCPpIw0dDgtVbLrQm0brv4mWJ6/HwF7wn6U8hoGnLMQDcShTWKMq6vdD 2aFZGaKcoA2DIcBKjnwwTf6Yog8ay7e9EWKIWyBCWLlpQ/YzFO88dAks8UbLmQKt2r45Ys FN0KLOyffwmJmgKAjYOTmjDT5jBltrCTXAJnFzLRDbhqkWueDTLhKr27nuhXxw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Vssdw0KHMz18s6; Sun, 2 Jun 2024 22:55: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 452Mtlvg070427; Sun, 2 Jun 2024 22:55:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 452MtlmZ070424; Sun, 2 Jun 2024 22:55:47 GMT (envelope-from git) Date: Sun, 2 Jun 2024 22:55:47 GMT Message-Id: <202406022255.452MtlmZ070424@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jessica Clarke Subject: git: 25a33bfe9ce2 - main - ee: Fix use of uninitialised pointer in ispell_op List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 25a33bfe9ce2b55812201f475e9d3e64009b40dc Auto-Submitted: auto-generated The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=25a33bfe9ce2b55812201f475e9d3e64009b40dc commit 25a33bfe9ce2b55812201f475e9d3e64009b40dc Author: Jessica Clarke AuthorDate: 2024-06-02 22:53:09 +0000 Commit: Jessica Clarke CommitDate: 2024-06-02 22:53:09 +0000 ee: Fix use of uninitialised pointer in ispell_op This used to be name = mktemp followed by fd = open downstream, replacing upstream's crude PID-based sprintf, but in 1.4.7 this was changed upstream to this buggy code, which we then picked up in the 1.5.0 import. Presumably nobody's actually used ee's ispell function in the past 15 years; that or it's just ended up using junk file names as temporary files if name's happened to be a valid address to something that can be interpreted as a string. Reported by: Dapeng Gao Fixes: 96b676e99984 ("Update ee(1) in the base system to version 1.5.0.") MFC after: 1 week --- contrib/ee/ee.c | 1 + 1 file changed, 1 insertion(+) diff --git a/contrib/ee/ee.c b/contrib/ee/ee.c index 072d26519f4c..5576537f3fad 100644 --- a/contrib/ee/ee.c +++ b/contrib/ee/ee.c @@ -4431,6 +4431,7 @@ ispell_op(void) } (void)sprintf(template, "/tmp/ee.XXXXXXXX"); fd = mkstemp(template); + name = template; if (fd < 0) { wmove(com_win, 0, 0); wprintw(com_win, create_file_fail_msg, name); From nobody Sun Jun 2 23:04: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 4VssrR000Tz5LRHY; Sun, 02 Jun 2024 23:04:54 +0000 (UTC) (envelope-from markjdb@gmail.com) Received: from mail-ot1-x329.google.com (mail-ot1-x329.google.com [IPv6:2607:f8b0:4864:20::329]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "WR4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VssrP49nbz45WQ; Sun, 2 Jun 2024 23:04:53 +0000 (UTC) (envelope-from markjdb@gmail.com) Authentication-Results: mx1.freebsd.org; dkim=pass header.d=gmail.com header.s=20230601 header.b="Z/vEvspW"; dmarc=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=freebsd.org (policy=none); spf=pass (mx1.freebsd.org: domain of markjdb@gmail.com designates 2607:f8b0:4864:20::329 as permitted sender) smtp.mailfrom=markjdb@gmail.com Received: by mail-ot1-x329.google.com with SMTP id 46e09a7af769-6f8e9d4dff3so2374450a34.0; Sun, 02 Jun 2024 16:04:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1717369492; x=1717974292; darn=freebsd.org; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:sender:from:to:cc:subject:date:message-id :reply-to; bh=g0Qe3UCsBvlFwOvPO7C5k/GNBl5Y1PK6kgAYChSCRfA=; b=Z/vEvspWQPUxp1rD2LPho6aBeoXonld5RneIdI7vM6Xm/XjtD59vLz3VCUXfOrKO/O R5X6gBz/J3FX6e14d0TZnsUKs50yfQ89SuSbasi2+LXFpaalDB3YFxTzCwNLiy1eti3S 6fFe8gDRSZQE8cigkViMJCCrPG3YQW0I0j5cXicwuZmy3yLytckvKiFS4w4XJnHcVmrt w0KXhmrRJW+/ZAZ8E7gc40C5l2P4fDqaU8NYO2et7hIZpVl0pEUsB/ouj/JtqwA/yCii ytCN/Bf9s9XCwcBbGDqQ0Rp7I9pv78k9YLHsNZ5cOVdJiD84OZv05LpekI08MifrKtKK hhuQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1717369492; x=1717974292; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:sender:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=g0Qe3UCsBvlFwOvPO7C5k/GNBl5Y1PK6kgAYChSCRfA=; b=g1v5s8iGlwMBLefTiR0O60vfhNEcy9Wmt7yomSfThcjWHwNO0mQHzdC1HlBqJVLEr2 PP5ZQAKm9fPeIcmsfFnwHlKQ79C1LSIVIt6rBoH4OThEY5GDGgK/3UPCvXYCWD7QRh41 CN63m+uGTv7MQ0MdTJPxDRfszi+XliqBT/i/MoOk/fFUYroM5XCGYulUux6T1asb+3Mi EegEWLWF10v8ftc55xPgZyD09KdOJYc8eTotWIhUowDX+tBlw+s8QSOd+kfNRnVHVYNR 2sbMuq1GBSmjoApRUCF5y3rybWJgHYwI1GxWslUm8R9ZE7jOKUH5VLwYdFpYkHKE2IST CcwA== X-Forwarded-Encrypted: i=1; AJvYcCVB0qPtbh2qzlGWaSOLs4LhnAD8vFtcWXb4HpFC++aLV+ZrybbXVMvlpe61YdggVB6m33Ng+KjWa+pjCWhFEVmamocSL7OTtdm3U1FfgAjXiGTwcH0EpFEW/hLdO9seZV5mvtPe6Ef8NHstR+fjnfM2eQ== X-Gm-Message-State: AOJu0Yy4Hal4O9nF3qZlnYfK2hFBwYoDUUw0JBNlYakYQMCEvDvDUZM2 Wfp+WpHUdto5U5kKT7mSeIEeO3aGE9I9gxBlzfqhwcPnSIhQYWmWXtJ/ZA== X-Google-Smtp-Source: AGHT+IHRooS/GCmQF9/H5x6wknszOMwA+XLkoAAveAUmEeZR9U4lpcQp4tkDOee1UvGre/csrN3Trg== X-Received: by 2002:a05:6830:1d4:b0:6f9:726:3b8f with SMTP id 46e09a7af769-6f911f317c2mr8386043a34.11.1717369491402; Sun, 02 Jun 2024 16:04:51 -0700 (PDT) Received: from nuc (192-0-220-237.cpe.teksavvy.com. [192.0.220.237]) by smtp.gmail.com with ESMTPSA id d75a77b69052e-43ff23e269bsm33620891cf.46.2024.06.02.16.04.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 02 Jun 2024 16:04:50 -0700 (PDT) Date: Sun, 2 Jun 2024 19:04:40 -0400 From: Mark Johnston To: "Simon J. Gerraty" Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 2b7c1402f96b - main - src.sys.obj.mk: Export OBJTOP Message-ID: References: <202405281852.44SIqo71094994@gitrepo.freebsd.org> List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <202405281852.44SIqo71094994@gitrepo.freebsd.org> X-Spamd-Bar: -- X-Spamd-Result: default: False [-2.59 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_SHORT(-0.99)[-0.986]; MID_RHS_NOT_FQDN(0.50)[]; FORGED_SENDER(0.30)[markj@freebsd.org,markjdb@gmail.com]; R_DKIM_ALLOW(-0.20)[gmail.com:s=20230601]; R_SPF_ALLOW(-0.20)[+ip6:2607:f8b0:4000::/36]; MIME_GOOD(-0.10)[text/plain]; DMARC_POLICY_SOFTFAIL(0.10)[freebsd.org : SPF not aligned (relaxed), DKIM not aligned (relaxed),none]; ARC_NA(0.00)[]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; MIME_TRACE(0.00)[0:+]; FREEMAIL_ENVFROM(0.00)[gmail.com]; RCVD_TLS_LAST(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; DKIM_TRACE(0.00)[gmail.com:+]; MLMMJ_DEST(0.00)[dev-commits-src-all@freebsd.org,dev-commits-src-main@freebsd.org]; RCVD_COUNT_TWO(0.00)[2]; FROM_NEQ_ENVFROM(0.00)[markj@freebsd.org,markjdb@gmail.com]; TO_MATCH_ENVRCPT_ALL(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; MISSING_XM_UA(0.00)[]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US]; RCVD_IN_DNSWL_NONE(0.00)[2607:f8b0:4864:20::329:from]; DWL_DNSWL_NONE(0.00)[gmail.com:dkim] X-Rspamd-Queue-Id: 4VssrP49nbz45WQ On Tue, May 28, 2024 at 06:52:50PM +0000, Simon J. Gerraty wrote: > The branch main has been updated by sjg: > > URL: https://cgit.FreeBSD.org/src/commit/?id=2b7c1402f96be2d2986738e32706dab7b5691ef0 > > commit 2b7c1402f96be2d2986738e32706dab7b5691ef0 > Author: Simon J. Gerraty > AuthorDate: 2024-05-28 18:51:31 +0000 > Commit: Simon J. Gerraty > CommitDate: 2024-05-28 18:51:31 +0000 > > src.sys.obj.mk: Export OBJTOP > > If we had to set OBJTOP we want to .export it (if .MAKE.LEVEL > 0) > for the benefit of things like x!= ${.MAKE} -r ... and similar. > > Without OBJTOP, the default MAKEOBJDIR setting will result in > attempting to use an objdir like /lib or /bin etc in some cases. > > This patch is based on D30990 > with the addition of the check for level > 0. > > Reviewed by: jrtc27 > Differential Revision: Hi Simon, This breaks "make -j kernels" for me. The parallel kernel builds appear to share an object directory and step all over each other. This happens with and without the level > 0 check. > --- > share/mk/src.sys.obj.mk | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/share/mk/src.sys.obj.mk b/share/mk/src.sys.obj.mk > index 708559edcdb8..e4c31f746f3d 100644 > --- a/share/mk/src.sys.obj.mk > +++ b/share/mk/src.sys.obj.mk > @@ -94,6 +94,9 @@ OBJTOP:= ${OBJROOT}${MACHINE}.${MACHINE_ARCH} > # TARGET.TARGET_ARCH handled in OBJROOT already. > OBJTOP:= ${OBJROOT:H} > .endif # ${MK_UNIFIED_OBJDIR} == "yes" > +.if ${.MAKE.LEVEL} > 0 > +.export OBJTOP > +.endif > .endif # empty(OBJTOP) > > # Fixup OBJROOT/OBJTOP if using MAKEOBJDIRPREFIX. > From nobody Sun Jun 2 23:35: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 4VstX65VJfz5LTNb; Sun, 02 Jun 2024 23:35: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 4VstX64zKsz47c5; Sun, 2 Jun 2024 23:35:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717371350; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Tf6BgMfPaZbQizIxGJxvVsMb4DMI+Xj2gNlHW0pAi6U=; b=in9JNJlakb+dLZHLWChwDJhZx+Ty0Iz41H5QerOuDw1iYFz2eL6tTxXwq6AT68u9T0ZIgb MYfl0OB0uFeMQ3DXhZK0HUh9WJklPs4vzUloHCSM7Jhh+FjAgTYH/o2BKzhHl9RbA/fiRf zFOWfnnViIO+5K+Ds41S5APGDJofwIs6obCbezFpMBcQAnchxzZSlrPGICDNPqQXzaD/0t YGrcvTRAS6is7Fm3Ar9+4NEcwV7lG67QvsW92vzQOJCe048clXeyfY5ruHF4Rd67sOdy4T OYvluFo43PcdrA0zBTlSk6ybaBBWpl40BHjrAqAquHi6/mHazqQpFXIUju2g9w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1717371350; a=rsa-sha256; cv=none; b=A+csNHYNu9CHrfqNu/PlEisNngN9psbHv88Qt97RTpBOlPznPQ6DD2XG/PO8qoDNo9Rs53 wJ2/uTTY8xRJoX4SX5oUMqPNMwtedCWpCR2H63KtAxvvWo5dWakXUjfycrqbR3pks8oRrQ KXLmkN1otiVzSeXgVoQYu3/r2t9/cQ+QZqtvGktsfbYbFkTLW+NFroq6VnAR5OmGyJXCnM OontGmBicAeTXRw2UB1Iogc/XjVdzZV2zYaALsJUvlApcuYRgCur0Z/eZx9losfhe1/k4F GtL7HD8COOrTnk2utk/5nIi0tAIghyq0yi6gkgsImVB8Iz5DdqYVtxaIpGESdg== 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=1717371350; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Tf6BgMfPaZbQizIxGJxvVsMb4DMI+Xj2gNlHW0pAi6U=; b=gTKWJ5CghSnmpJ+e2NqN90sPmVg5HupzZVt/HqxXaKjYqM8TU00L9aaj69Q7UszV/nQRue TzaVmr9Quy7sxl535Iy/UMasykl1OyGiE5S9NUzqaA2OVdHbT9l/9tXf/4otImk+kPgDHP yHPaUVvm7LbFMQUOiQJ5tRyCDZsEWbmegq8Oo5ifO8tLoDOTZDO/UA+4IT32Di9XC99BVn FBDnUIeceiBvpZtJU8rDVhr7hXBD0CsEnVIWuE3Z/CpBXZdHk3P2vsOBv+JfQUrR/NPJVs KQ2y9JC5+evxIH4B/22SY+grSiyhclT2vYhYsUaYiswXLVE4/2d0jFGHNen0Tg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VstX64ZHSz1BS1; Sun, 2 Jun 2024 23:35: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 452NZoVH038447; Sun, 2 Jun 2024 23:35:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 452NZoAY038444; Sun, 2 Jun 2024 23:35:50 GMT (envelope-from git) Date: Sun, 2 Jun 2024 23:35:50 GMT Message-Id: <202406022335.452NZoAY038444@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jessica Clarke Subject: git: a20a903b167c - main - Makefile.inc1: Allow showconfig and test-system-* if (X)CC is GCC List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a20a903b167c80a35b83f10c9035d9dc99071b06 Auto-Submitted: auto-generated The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=a20a903b167c80a35b83f10c9035d9dc99071b06 commit a20a903b167c80a35b83f10c9035d9dc99071b06 Author: Jessica Clarke AuthorDate: 2024-06-02 23:16:58 +0000 Commit: Jessica Clarke CommitDate: 2024-06-02 23:16:58 +0000 Makefile.inc1: Allow showconfig and test-system-* if (X)CC is GCC This case gets hit in make universe on Linux, since we will first run make test-system-compiler to determine whether to use the system or universe toolchain, during which time CC is the host's, GCC, and XCC isn't set, so defaults to the same. Fixes: 4c0dfd5959bd ("arm: fail early on gcc builds") --- Makefile.inc1 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Makefile.inc1 b/Makefile.inc1 index 90439adcbc09..28ab291928ff 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -172,6 +172,7 @@ LIBCOMPAT_INCLUDE_DIRS+= i386 LIBCOMPAT_INCLUDE_DIRS+= arm .endif +.if !defined(_MKSHOWCONFIG) .if ((defined(X_COMPILER_TYPE) && ${X_COMPILER_TYPE} == "gcc") || \ (!defined(X_COMPILER_TYPE) && ${COMPILER_TYPE} == "gcc")) .if ${TARGET} == "arm" @@ -195,6 +196,7 @@ _GCC_BROKEN=boot code linker script issues. .endif .endif .endif +.endif .if ${.MAKE.OS} != "FreeBSD" CROSSBUILD_HOST=${.MAKE.OS} From nobody Sun Jun 2 23:35: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 4VstX80gc1z5LTqg; Sun, 02 Jun 2024 23:35: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 4VstX75vzdz47Yn; Sun, 2 Jun 2024 23:35:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717371351; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=u1/lTTmm+Om2xDhTin5hj3A1mDmZ5ZKH1jAcSNKbSmc=; b=CxXQeJZtKmzCx9Iextjnz8FWPh2kwrdvuc3aAsEKe2sGlWx+goWldC2mxpbTwpBh6aAZUu cHpWaOoCgiwI/E2Xii2qmGvfSpYPnvt0O/f1fboEAOIrSgnMTILMxVX9zu6s1jaItR6PjS 0H2YAAlMdqTvcBhkOZ2+p772EluY6LO/KLLnhMU3hRsp2rgS0Ww8veQuGS9dogUvmA6mWE fMWQKutlpRpc1P/3rJLNmvwi83LIEU2Vl6E1hWa8iBL36qXvtPZjR8bk4nCTzMNbuzsiqa iDhwcrcfiuNKDrL9EcRCBcfd/rilfaOTN16tA/USMWgDXul0adAtkkxDJQ7GjQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1717371351; a=rsa-sha256; cv=none; b=rJxH6g0gP8A+BeqgoRmv1xglhy0TfWLpw3nWStOvw4QDd13E+p6j8PolNUXneoASyHFm40 jq0qWlVByg7D50sMkWzk0CcG5S1USf4oYInTOoHTU+aplWtjL8Abva1osw2v+LqszSFoZU EcDOYQhMabJhD/MVYROK3YKcrolBT+ZJXBxJzU5RczxQ54gPI8GPzxvnJAKdjH6hLTot1D xO9QAmR4udS7UC73SqrnOIVRhkdMp678ZpuJAi3mnmsq7Q/E9opRxerqQ7PmRA6twNNutR 0UpOseXu38TC+bBl4LAd3oyI17LP7ge1FP/VZInBtu8f3ab7z1UF+S/59Cr6XA== 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=1717371351; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=u1/lTTmm+Om2xDhTin5hj3A1mDmZ5ZKH1jAcSNKbSmc=; b=Nxwfm38SXrxqZ/9SOI4j/Cjob8R0xLipoEP18QZH2FYz0/x7FgbVhU+5D20E2ppgqQ1c6X egLsXiA6bigCanU7SPlO5cLY4sAki/rk6bGvD1Y0AhbDY6FhmJWv2eXzfkgp5GZNbp/YH+ 3OPsJWPiosLWLEnImeUfgSp/n6BafsOnXZ+oYzBlSwUiT0eUdIwVB3ezoLImuOUn3+DbSZ LlmQQsWfnNOChbfnNYcoYbhHJHEaKvtuvSVAWN8qXppzlUdzc9X7PYV9pbYESDAFs50oBS hQcwWseBF2cHb6ObYgSVNrrUiNJdCq+DlYqsR5RvrByqzysruyuTWmAfvfyKyQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VstX75WRDz1B2L; Sun, 2 Jun 2024 23:35: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 452NZpKe038486; Sun, 2 Jun 2024 23:35:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 452NZpsH038483; Sun, 2 Jun 2024 23:35:51 GMT (envelope-from git) Date: Sun, 2 Jun 2024 23:35:51 GMT Message-Id: <202406022335.452NZpsH038483@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jessica Clarke Subject: git: 3cc91b77514d - main - Revert "src.sys.obj.mk: Export OBJTOP" List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3cc91b77514de209d7e6c2217cda2e44809280d3 Auto-Submitted: auto-generated The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=3cc91b77514de209d7e6c2217cda2e44809280d3 commit 3cc91b77514de209d7e6c2217cda2e44809280d3 Author: Jessica Clarke AuthorDate: 2024-06-02 23:33:52 +0000 Commit: Jessica Clarke CommitDate: 2024-06-02 23:33:52 +0000 Revert "src.sys.obj.mk: Export OBJTOP" Unfortunately this results in make universe's environment, i.e. corresponding to the host, being used for every one of its sub-makes, so they're in the wrong place and trample over each other. This reverts commit 2b7c1402f96be2d2986738e32706dab7b5691ef0. --- share/mk/src.sys.obj.mk | 3 --- 1 file changed, 3 deletions(-) diff --git a/share/mk/src.sys.obj.mk b/share/mk/src.sys.obj.mk index e4c31f746f3d..708559edcdb8 100644 --- a/share/mk/src.sys.obj.mk +++ b/share/mk/src.sys.obj.mk @@ -94,9 +94,6 @@ OBJTOP:= ${OBJROOT}${MACHINE}.${MACHINE_ARCH} # TARGET.TARGET_ARCH handled in OBJROOT already. OBJTOP:= ${OBJROOT:H} .endif # ${MK_UNIFIED_OBJDIR} == "yes" -.if ${.MAKE.LEVEL} > 0 -.export OBJTOP -.endif .endif # empty(OBJTOP) # Fixup OBJROOT/OBJTOP if using MAKEOBJDIRPREFIX. From nobody Sun Jun 2 23:47: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 4VstnC1qqJz5LVPm; Sun, 02 Jun 2024 23:47: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 4VstnC11mLz49rv; Sun, 2 Jun 2024 23:47:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717372031; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jzs4It4qI1+alyLTUXVADWrJAlfae+hiTEvdZYi+u/s=; b=HAHnqpQhPERtg8In3x//8/f7QAFbxSZYRfJl1YuGfDCoU6egBoy8tfS21bEkLBJbpjC2uU iJCaSYpTkXcgYcmorRA3+JhzJU3xpRic42lQnRJyYAa5Yql+iawsCZveT+8dF7AIifCxst /BsE7nrCW6GfdCy/HniOX8QQCNgSR/ffTexXP9wFeRwwUp4uCbbHDt4FK4JSp1Bv6KFPfB V/xJCy5sXoRR7Lq5vcoVDr2UbJkX2ulepodpeSlvSa3n91E9lM42Eb4+AFqfDPfSXcy0KT dPLkj0djMX8niAQyaY2SwxcO9ie/+yIRZLIqhkfuyI47QXpOx9NskNRkBfNR7A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1717372031; a=rsa-sha256; cv=none; b=Kbcr1nQwHjrwrKxEhimaf3ysQVJGbibO9p7ys77uDbNaYAnsDJf9MI07X3kgtm0+hBSjXv UNBAXxhRtZMgUHZV/tZ4Aj9uhPQjAYnFubPtgRfkBawKf7Ly9HYc5gxP+rvqvi22Ya9TKR yZcDfg3fbjzFVoqbgrMABeC5dO5WrqDUYU+Jk+b1HS3vzzBDdzaUPPaM1y5Q4/CkEsEjtY TbUBkM9E5j3jafskh3HDJTSnL9mIDW0PTTCZb8xySkdh56JB7GfZ437LB5ExvCKyBd3UdI he+m5CaPpzAX+j3TMdbV8JfLHdjOurZ1DQuvDrhwgaT4UGFyaNlGNNhxj69Kew== 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=1717372031; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jzs4It4qI1+alyLTUXVADWrJAlfae+hiTEvdZYi+u/s=; b=lDFSNaDN3q75MUBRs0u/2fRxQj1RZHx+3oGVQcWRQhClylPB6yO2eDU1NiX35BERYWzdPZ cLZyGyqDhMCcJ2yL8OEZ/kYmlepkLNQW/x8HIJ9K7bbP3K8QkgvGRpOacvtgtgHyLcWGo7 RGgxzu6dnVcrK9TojQLSDjlI4aIGRxP6JUlhcvMTocTScD00Ni/2c4pBGyflLgzObnPglL hnVAVODTKN9rMlxF7KaFVaAQSlqi6edUmgN/W4zdUgfn5Zz6wEQ4sfCpUNZ3wLxeXK6OFx HPF2O7yL9I6cNby8jXC4+oNozgY6IG8eVpt5lpGpoSvaXu1ppY+bYjbJ3Vjk1A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VstnC0dkCz1Bj6; Sun, 2 Jun 2024 23:47: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 452NlAZE056398; Sun, 2 Jun 2024 23:47:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 452NlAgX056395; Sun, 2 Jun 2024 23:47:10 GMT (envelope-from git) Date: Sun, 2 Jun 2024 23:47:10 GMT Message-Id: <202406022347.452NlAgX056395@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: 459dc61c8b05 - main - arm: Convert drivers to use device_set_desc(f)() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: 459dc61c8b05dedb61a2774348ffda7d7f8ea7c6 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=459dc61c8b05dedb61a2774348ffda7d7f8ea7c6 commit 459dc61c8b05dedb61a2774348ffda7d7f8ea7c6 Author: Mark Johnston AuthorDate: 2024-02-04 23:23:00 +0000 Commit: Mark Johnston CommitDate: 2024-06-02 23:38:40 +0000 arm: Convert drivers to use device_set_desc(f)() No functional change intended. MFC after: 1 week --- sys/arm/nvidia/tegra_ahci.c | 2 +- sys/arm/ti/am335x/am335x_dmtimer.c | 4 +--- sys/arm/ti/am335x/am335x_dmtpps.c | 5 +---- 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/sys/arm/nvidia/tegra_ahci.c b/sys/arm/nvidia/tegra_ahci.c index c5d4dbff977c..30e28dd33235 100644 --- a/sys/arm/nvidia/tegra_ahci.c +++ b/sys/arm/nvidia/tegra_ahci.c @@ -651,7 +651,7 @@ tegra_ahci_probe(device_t dev) if (!ofw_bus_search_compatible(dev, compat_data)->ocd_data) return (ENXIO); - device_set_desc_copy(dev, "AHCI SATA controller"); + device_set_desc(dev, "AHCI SATA controller"); return (BUS_PROBE_DEFAULT); } diff --git a/sys/arm/ti/am335x/am335x_dmtimer.c b/sys/arm/ti/am335x/am335x_dmtimer.c index a4ca188bd83b..fde5f04875cc 100644 --- a/sys/arm/ti/am335x/am335x_dmtimer.c +++ b/sys/arm/ti/am335x/am335x_dmtimer.c @@ -248,7 +248,6 @@ am335x_dmtimer_tc_init(struct am335x_dmtimer_softc *sc) static int am335x_dmtimer_probe(device_t dev) { - char strbuf[32]; int tmr_num; uint64_t rev_address; @@ -276,8 +275,7 @@ am335x_dmtimer_probe(device_t dev) return (ENXIO); } - snprintf(strbuf, sizeof(strbuf), "AM335x DMTimer%d", tmr_num); - device_set_desc_copy(dev, strbuf); + device_set_descf("AM335x DMTimer%d", tmr_num); return(BUS_PROBE_DEFAULT); } diff --git a/sys/arm/ti/am335x/am335x_dmtpps.c b/sys/arm/ti/am335x/am335x_dmtpps.c index f3e4386e4837..5a19d3ad0dc3 100644 --- a/sys/arm/ti/am335x/am335x_dmtpps.c +++ b/sys/arm/ti/am335x/am335x_dmtpps.c @@ -383,7 +383,6 @@ static struct cdevsw dmtpps_cdevsw = { static int dmtpps_probe(device_t dev) { - char strbuf[64]; int tmr_num; uint64_t rev_address; @@ -435,9 +434,7 @@ dmtpps_probe(device_t dev) if (dmtpps_tmr_num != tmr_num) return (ENXIO); - snprintf(strbuf, sizeof(strbuf), "AM335x PPS-Capture DMTimer%d", - tmr_num); - device_set_desc_copy(dev, strbuf); + device_set_descf("AM335x PPS-Capture DMTimer%d", tmr_num); return(BUS_PROBE_DEFAULT); } From nobody Sun Jun 2 23:47: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 4VstnD2F0Xz5LVVL; Sun, 02 Jun 2024 23:47: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 4VstnD1gNzz49k6; Sun, 2 Jun 2024 23:47:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717372032; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EeM7BoAxOt7Jdtp/FEgR6pqV6OpJAoJ6MgxQ4ge5JQM=; b=Kk+rgBH7PtFJ51prgLUSjkeGE3Bb67ZABU97Bvuk3LP+KUkMHkSt5jUrgVvt/spQhfr2R1 G842/woT7WESGbL6luGyFama5FeabA/hYk49tRQwc0nBfNHj1OwfJVy/hVN2kajCoSy9P8 j2DmzAtu0yDanZs2Xqk/Omm8YS0Ew+duyuo9yhZr9bisKVTapBsjbPCVrio6F5GKINp5Zc sOesgVIu5eQ/Gk8aqZRupPPChAZPBKSWgvAs+2/Vwb2OjTUL+rH3xWea9TP/cK126WLOP+ 419gTFX+gjLrDuICyPRPcFaN1IqORtkzHsyKyxxyp32d7G1qEJ1tXYaGgrt2hw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1717372032; a=rsa-sha256; cv=none; b=NZ+8AaKtnTOOI9fPDAPNhJ5jDFtt9aBD4IzHGKEoqzr6iR386ogL4S+VV1QWC4o5ffO3kD WO2uP616MlI0Qlz14C66m2m9O6+ws2bWWJ9VMbx0JpXkgsjH7TkKmb2leD6ERrn8e7K8je UXR4lO6VV5VO2wkvUgVWeEfbZv9ydJs+OF0Q9XzzWnzMfW8UFCxC7b8ViI0n/XS2TcM6se X4v7LISNJ8Bh9JCsepx54LCBB+6JntpzcErzs0x2CzBeEX5oPSIVAxOBRSJEwHC0eEWPt5 tFHpUOVkUyHfXQJjhf+KubAgIqlqZHod3SZKwUKX10/yAaoTjKZB1fbjugYl6Q== 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=1717372032; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EeM7BoAxOt7Jdtp/FEgR6pqV6OpJAoJ6MgxQ4ge5JQM=; b=S5bpZMhVVIsD7fQ7L9yTp51MNQS16XZ9tmEPv5balmOyiuj2mRTDaKZJX6fPXEmQpgSBSG FRtU5dU3XEWUqiNwfZEmPjRggJxgh8ITruHdXvF4lyJsfZ1+n4hc32GQfd/HtgqEe49ffh lz2fcK+CdFoiucmGGUpu2VH2tdGpjaMaqGt9gyJudT2l0ngy37BwKxVnk7PA1Q2WLveanT ryagOPwOXOdYSnpBTq7GUEQeRNH0Oe5LqnP44bBsV4TpUtRuzOS4dbEj+BuCfHHtXw4Mo9 +ZMVKR6yYc0XFu6i95EwUiZthDfwjsJ7vV9wYmlcHbJbDTzA5JdgUuZfgiI5MQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VstnD1GRmz1B33; Sun, 2 Jun 2024 23:47: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 452NlCoc056437; Sun, 2 Jun 2024 23:47:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 452NlC0W056434; Sun, 2 Jun 2024 23:47:12 GMT (envelope-from git) Date: Sun, 2 Jun 2024 23:47:12 GMT Message-Id: <202406022347.452NlC0W056434@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: a74b49650732 - main - ahci: Use device_set_desc(f)() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: a74b496507329665c6aa8d0ef2ea42c2fbd88c48 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=a74b496507329665c6aa8d0ef2ea42c2fbd88c48 commit a74b496507329665c6aa8d0ef2ea42c2fbd88c48 Author: Mark Johnston AuthorDate: 2024-02-04 23:32:53 +0000 Commit: Mark Johnston CommitDate: 2024-06-02 23:38:40 +0000 ahci: Use device_set_desc(f)() No functional change intended. MFC after: 1 week --- sys/dev/ahci/ahci.c | 2 +- sys/dev/ahci/ahci_generic.c | 4 ++-- sys/dev/ahci/ahci_pci.c | 12 ++++-------- sys/dev/ahci/ahciem.c | 2 +- 4 files changed, 8 insertions(+), 12 deletions(-) diff --git a/sys/dev/ahci/ahci.c b/sys/dev/ahci/ahci.c index b1f9c85141bb..b8cca377e47f 100644 --- a/sys/dev/ahci/ahci.c +++ b/sys/dev/ahci/ahci.c @@ -765,7 +765,7 @@ static int ahci_ch_probe(device_t dev) { - device_set_desc_copy(dev, "AHCI channel"); + device_set_desc(dev, "AHCI channel"); return (BUS_PROBE_DEFAULT); } diff --git a/sys/dev/ahci/ahci_generic.c b/sys/dev/ahci/ahci_generic.c index 90487b4622eb..2d4babb17645 100644 --- a/sys/dev/ahci/ahci_generic.c +++ b/sys/dev/ahci/ahci_generic.c @@ -76,7 +76,7 @@ ahci_fdt_probe(device_t dev) if (!ofw_bus_search_compatible(dev, compat_data)->ocd_data) return (ENXIO); - device_set_desc_copy(dev, "AHCI SATA controller"); + device_set_desc(dev, "AHCI SATA controller"); node = ofw_bus_get_node(dev); ctlr->dma_coherent = OF_hasprop(node, "dma-coherent"); return (BUS_PROBE_DEFAULT); @@ -107,7 +107,7 @@ ahci_acpi_probe(device_t dev) if (pci_get_class(dev) == PCIC_STORAGE && pci_get_subclass(dev) == PCIS_STORAGE_SATA && pci_get_progif(dev) == PCIP_STORAGE_SATA_AHCI_1_0) { - device_set_desc_copy(dev, "AHCI SATA controller"); + device_set_desc(dev, "AHCI SATA controller"); if (ACPI_FAILURE(acpi_GetInteger(h, "_CCA", &ctlr->dma_coherent))) ctlr->dma_coherent = 0; diff --git a/sys/dev/ahci/ahci_pci.c b/sys/dev/ahci/ahci_pci.c index 7cc3ce18c8ae..69587da2226a 100644 --- a/sys/dev/ahci/ahci_pci.c +++ b/sys/dev/ahci/ahci_pci.c @@ -399,7 +399,6 @@ ahci_pci_ctlr_reset(device_t dev) static int ahci_probe(device_t dev) { - char buf[64]; int i, valid = 0; uint32_t devid = pci_get_devid(dev); uint8_t revid = pci_get_revid(dev); @@ -430,22 +429,20 @@ ahci_probe(device_t dev) (ahci_ids[i].quirks & AHCI_Q_NOFORCE) && (pci_read_config(dev, 0xdf, 1) & 0x40) == 0) return (ENXIO); - snprintf(buf, sizeof(buf), "%s AHCI SATA controller", + device_set_descf(dev, "%s AHCI SATA controller", ahci_ids[i].name); - device_set_desc_copy(dev, buf); return (BUS_PROBE_DEFAULT); } } if (valid != 1) return (ENXIO); - device_set_desc_copy(dev, "AHCI SATA controller"); + device_set_desc(dev, "AHCI SATA controller"); return (BUS_PROBE_DEFAULT); } static int ahci_ata_probe(device_t dev) { - char buf[64]; int i; uint32_t devid = pci_get_devid(dev); uint8_t revid = pci_get_revid(dev); @@ -456,13 +453,12 @@ ahci_ata_probe(device_t dev) for (i = 0; ahci_ids[i].id != 0; i++) { if (ahci_ids[i].id == devid && ahci_ids[i].rev <= revid) { - snprintf(buf, sizeof(buf), "%s AHCI SATA controller", + device_set_descf(dev, "%s AHCI SATA controller", ahci_ids[i].name); - device_set_desc_copy(dev, buf); return (BUS_PROBE_DEFAULT); } } - device_set_desc_copy(dev, "AHCI SATA controller"); + device_set_desc(dev, "AHCI SATA controller"); return (BUS_PROBE_DEFAULT); } diff --git a/sys/dev/ahci/ahciem.c b/sys/dev/ahci/ahciem.c index 8b941a73a4e0..97963784b561 100644 --- a/sys/dev/ahci/ahciem.c +++ b/sys/dev/ahci/ahciem.c @@ -63,7 +63,7 @@ static int ahci_em_probe(device_t dev) { - device_set_desc_copy(dev, "AHCI enclosure management bridge"); + device_set_desc(dev, "AHCI enclosure management bridge"); return (BUS_PROBE_DEFAULT); } From nobody Sun Jun 2 23:47: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 4VstnF5vMTz5LVPt; Sun, 02 Jun 2024 23:47: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 4VstnF2tr0z49mm; Sun, 2 Jun 2024 23:47:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717372033; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NMDiuda9aUBSOj8uwiztn4+fxb7XE2DxYXFV5vV/PvY=; b=PNw2dHXRM49bvBhO4mfGZ2PTxghxyDAd2I9FMA8l6TEn6DQAVgB6NIrqnb9gITgQ3nInSb mtv2FtptJzk5mLQt8lr5S+2zQLI8ZsK9DIhJODlffSVdlo4wjVfUYIZ+P6l/3quYDBVRPB wBd3jnZH/a1xMZk/oNTPdlO4B705VMp45oAG0U6ZfccJr2SOAa/gudPjjn0nKn1an63Sc3 1+213af/H9HA4U/MOFdRcgg/SlNXiFQVnTz5JOAAjfqyJDLJ4h0OVYooScDCroY5va13fe eDNRS4LcSTjWKRani12C02YcKl71LbeVn6c78hwuP2rvDVhOLyuc95DxMJOWqw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1717372033; a=rsa-sha256; cv=none; b=GviHbGkwI2e6rV8oUSGmkcOL0f9TnF0euCLiAqg+rIl0Xb1kES5gDIoyRKdMA70u/hqcou PorNksx9mGE75uzes0gxk/X1M59tGde8wLomoFuFRBgFaMhkDUAKBVsGAiG0IUCmxNAUL3 EyQiD3bIo2HDrjCD2dv5EHk+8Hq4bEg4EA/bblKxk5caQ1bw14E0Y7c6Oc+E3oOh19iaqF Wf/gtd/xZTwIHSlAJwSc6non4mObc84mGag6fY0DATJIHoPP4Vwaio4j/GXPpEUD67kpC1 kndA5KpQ3eSwWPGjFZIj52z6owGLAllkBW+Q0OR7Ksq4L/kwRp1BZTljprbzPw== 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=1717372033; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NMDiuda9aUBSOj8uwiztn4+fxb7XE2DxYXFV5vV/PvY=; b=YbKiBSQ2vo8P1KdRCay1FdR8Z0mt8BvyD7mPxlsPAIPSw7EGh29RzA24J4baHoFGjiYQtZ VK/VYnQxs646rpbalQlJy3uoI1bXcL/M8VtGS8rVfYb9Wo0cf0DUMVKQwglriK2VKm2u4R 5clgtwQTZH9tVI7qhESs2eYjkdGcldUZ9IfqDCm00CnyYazTbB7CZ/DFiZzZiR6oaxIQsp w0CbD2e92ArxokCboGjAQYhXdvK82HVgVLpdeXXXq4L8IHBk7cLQOFxlfR/Z8+z1/QGaqh 3527cip4w4DZd6cOWrlqhlNQouFjn79qwl2mOH6WQ1xXxWhVNHaOMMtvl50VXA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VstnF2HfHz1BfT; Sun, 2 Jun 2024 23:47: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 452NlDEJ056473; Sun, 2 Jun 2024 23:47:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 452NlDqf056470; Sun, 2 Jun 2024 23:47:13 GMT (envelope-from git) Date: Sun, 2 Jun 2024 23:47:13 GMT Message-Id: <202406022347.452NlDqf056470@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: 25b839dfd2aa - main - ata: Use device_set_descf() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: 25b839dfd2aa60640c7b92abc69b11c107a95020 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=25b839dfd2aa60640c7b92abc69b11c107a95020 commit 25b839dfd2aa60640c7b92abc69b11c107a95020 Author: Mark Johnston AuthorDate: 2024-02-04 23:33:05 +0000 Commit: Mark Johnston CommitDate: 2024-06-02 23:38:40 +0000 ata: Use device_set_descf() No functional change intended. MFC after: 1 week --- sys/dev/ata/ata-pci.c | 8 ++------ sys/dev/ata/chipsets/ata-highpoint.c | 15 +++++++-------- sys/dev/ata/chipsets/ata-jmicron.c | 4 +--- sys/dev/ata/chipsets/ata-promise.c | 14 ++++++-------- sys/dev/ata/chipsets/ata-sis.c | 13 ++++++------- 5 files changed, 22 insertions(+), 32 deletions(-) diff --git a/sys/dev/ata/ata-pci.c b/sys/dev/ata/ata-pci.c index 9cc815150665..436601267012 100644 --- a/sys/dev/ata/ata-pci.c +++ b/sys/dev/ata/ata-pci.c @@ -60,7 +60,6 @@ int ata_pci_probe(device_t dev) { struct ata_pci_controller *ctlr = device_get_softc(dev); - char buffer[64]; /* is this a storage class device ? */ if (pci_get_class(dev) != PCIC_STORAGE) @@ -70,8 +69,7 @@ ata_pci_probe(device_t dev) if (pci_get_subclass(dev) != PCIS_STORAGE_IDE) return (ENXIO); - sprintf(buffer, "%s ATA controller", ata_pcivendor2str(dev)); - device_set_desc_copy(dev, buffer); + device_set_descf(dev, "%s ATA controller", ata_pcivendor2str(dev)); ctlr->chipinit = ata_generic_chipinit; /* we are a low priority handler */ @@ -831,12 +829,10 @@ void ata_set_desc(device_t dev) { struct ata_pci_controller *ctlr = device_get_softc(dev); - char buffer[128]; - sprintf(buffer, "%s %s %s controller", + device_set_descf(dev, "%s %s %s controller", ata_pcivendor2str(dev), ctlr->chip->text, ata_mode2str(ctlr->chip->max_dma)); - device_set_desc_copy(dev, buffer); } const struct ata_chip_id * diff --git a/sys/dev/ata/chipsets/ata-highpoint.c b/sys/dev/ata/chipsets/ata-highpoint.c index bf9dfd22e6ad..23ddf05a5f51 100644 --- a/sys/dev/ata/chipsets/ata-highpoint.c +++ b/sys/dev/ata/chipsets/ata-highpoint.c @@ -81,7 +81,7 @@ ata_highpoint_probe(device_t dev) { ATA_HPT366, 0x00, HPT_366, HPT_OLD, ATA_UDMA4, "HPT366" }, { ATA_HPT302, 0x01, HPT_372, 0, ATA_UDMA6, "HPT302" }, { 0, 0, 0, 0, 0, 0}}; - char buffer[64]; + const char *channel; if (pci_get_vendor(dev) != ATA_HIGHPOINT_ID) return ENXIO; @@ -89,16 +89,15 @@ ata_highpoint_probe(device_t dev) if (!(idx = ata_match_chip(dev, ids))) return ENXIO; - strcpy(buffer, "HighPoint "); - strcat(buffer, idx->text); + channel = ""; if (idx->cfg1 == HPT_374) { if (pci_get_function(dev) == 0) - strcat(buffer, " (channel 0+1)"); - if (pci_get_function(dev) == 1) - strcat(buffer, " (channel 2+3)"); + channel = " (channel 0+1)"; + else if (pci_get_function(dev) == 1) + channel = " (channel 2+3)"; } - sprintf(buffer, "%s %s controller", buffer, ata_mode2str(idx->max_dma)); - device_set_desc_copy(dev, buffer); + device_set_descf(dev, "Highpoint %s%s %s controller", + idx->text, channel, ata_mode2str(idx->max_dma)); ctlr->chip = idx; ctlr->chipinit = ata_highpoint_chipinit; return (BUS_PROBE_LOW_PRIORITY); diff --git a/sys/dev/ata/chipsets/ata-jmicron.c b/sys/dev/ata/chipsets/ata-jmicron.c index a24eb18f59da..0ae80d2a85a1 100644 --- a/sys/dev/ata/chipsets/ata-jmicron.c +++ b/sys/dev/ata/chipsets/ata-jmicron.c @@ -72,7 +72,6 @@ ata_jmicron_probe(device_t dev) { ATA_JMB368, 0, 0, 1, ATA_UDMA6, "JMB368" }, { ATA_JMB368_2, 0, 0, 1, ATA_UDMA6, "JMB368" }, { 0, 0, 0, 0, 0, 0}}; - char buffer[64]; if (pci_get_vendor(dev) != ATA_JMICRON_ID) return ENXIO; @@ -80,9 +79,8 @@ ata_jmicron_probe(device_t dev) if (!(idx = ata_match_chip(dev, ids))) return ENXIO; - sprintf(buffer, "JMicron %s %s controller", + device_set_descf(dev, "JMicron %s %s controller", idx->text, ata_mode2str(idx->max_dma)); - device_set_desc_copy(dev, buffer); ctlr->chip = idx; ctlr->chipinit = ata_jmicron_chipinit; return (BUS_PROBE_LOW_PRIORITY); diff --git a/sys/dev/ata/chipsets/ata-promise.c b/sys/dev/ata/chipsets/ata-promise.c index 86cb0c4fe6c4..15c6ae84c1bb 100644 --- a/sys/dev/ata/chipsets/ata-promise.c +++ b/sys/dev/ata/chipsets/ata-promise.c @@ -166,7 +166,7 @@ ata_promise_probe(device_t dev) { ATA_PDC40719, 0, PR_MIO, PR_SATA2, ATA_SA300, "PDC40719" }, { ATA_PDC40779, 0, PR_MIO, PR_SATA2, ATA_SA300, "PDC40779" }, { 0, 0, 0, 0, 0, 0}}; - char buffer[64]; + const char *channel; uintptr_t devid = 0; if (pci_get_vendor(dev) != ATA_PROMISE_ID) @@ -182,10 +182,8 @@ ata_promise_probe(device_t dev) devid == ATA_I960RM) return ENXIO; - strcpy(buffer, "Promise "); - strcat(buffer, idx->text); - /* if we are on a FastTrak TX4, adjust the interrupt resource */ + channel = NULL; if ((idx->cfg2 & PR_TX4) && pci_get_class(GRANDPARENT(dev))==PCIC_BRIDGE && !BUS_READ_IVAR(device_get_parent(GRANDPARENT(dev)), GRANDPARENT(dev), PCI_IVAR_DEVID, &devid) && @@ -194,18 +192,18 @@ ata_promise_probe(device_t dev) if (pci_get_slot(dev) == 1) { bus_get_resource(dev, SYS_RES_IRQ, 0, &start, &end); - strcat(buffer, " (channel 0+1)"); + channel = " (channel 0+1)"; } else if (pci_get_slot(dev) == 2 && start && end) { bus_set_resource(dev, SYS_RES_IRQ, 0, start, end); - strcat(buffer, " (channel 2+3)"); + channel = " (channel 2+3)"; } else { start = end = 0; } } - sprintf(buffer, "%s %s controller", buffer, ata_mode2str(idx->max_dma)); - device_set_desc_copy(dev, buffer); + device_set_descf(dev, "Promise %s%s %s controller", idx->text, + channel == NULL ? "" : channel, ata_mode2str(idx->max_dma)); ctlr->chip = idx; ctlr->chipinit = ata_promise_chipinit; return (BUS_PROBE_LOW_PRIORITY); diff --git a/sys/dev/ata/chipsets/ata-sis.c b/sys/dev/ata/chipsets/ata-sis.c index bf4c5c744289..b31d76fe3f7c 100644 --- a/sys/dev/ata/chipsets/ata-sis.c +++ b/sys/dev/ata/chipsets/ata-sis.c @@ -101,7 +101,6 @@ ata_sis_probe(device_t dev) { 0, 0, 0, 0, 0, 0 }}; static struct ata_chip_id id[] = {{ ATA_SISSOUTH, 0x10, 0, 0, 0, "" }, { 0, 0, 0, 0, 0, 0 }}; - char buffer[64]; int found = 0; if (pci_get_class(dev) != PCIC_STORAGE) @@ -122,8 +121,8 @@ ata_sis_probe(device_t dev) memcpy(&id[0], idx, sizeof(id[0])); id[0].cfg1 = SIS_133NEW; id[0].max_dma = ATA_UDMA6; - sprintf(buffer, "SiS 962/963 %s controller", - ata_mode2str(idx->max_dma)); + device_set_descf(dev, "SiS 962/963 %s controller", + ata_mode2str(idx->max_dma)); } pci_write_config(dev, 0x57, reg57, 1); } @@ -140,17 +139,17 @@ ata_sis_probe(device_t dev) id[0].cfg1 = SIS_100NEW; id[0].max_dma = ATA_UDMA5; } - sprintf(buffer, "SiS 961 %s controller",ata_mode2str(idx->max_dma)); + device_set_descf(dev, "SiS 961 %s controller", + ata_mode2str(idx->max_dma)); } pci_write_config(dev, 0x4a, reg4a, 1); } if (!found) - sprintf(buffer,"SiS %s %s controller", - idx->text, ata_mode2str(idx->max_dma)); + device_set_descf(dev, "SiS %s %s controller", + idx->text, ata_mode2str(idx->max_dma)); else idx = &id[0]; - device_set_desc_copy(dev, buffer); ctlr->chip = idx; ctlr->chipinit = ata_sis_chipinit; return (BUS_PROBE_LOW_PRIORITY); From nobody Sun Jun 2 23:47: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 4VstnH1Pglz5LVjt; Sun, 02 Jun 2024 23:47: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 4VstnG3phGz49n3; Sun, 2 Jun 2024 23:47:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717372034; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GhxvWvwXvjy8zTPszkzZLvxE+lS5wMwBXIN9hwWaDCI=; b=f86taatETEwX9vg6PEzaVx4qiHBwXQOmQDG3OCbZJgkapEbJUIzLVTE4lsUVNvXHG5TAQQ /AZYAaOlrBzbi0kh5NPOSkoxlUOMDuBFc0CS3R/qJGjaDzlF3dZ4gddDJVIsOKvj/waBcy 34WsKTsAzXXwRr0zu8MEVO6EBPJc3BBAEVF5xpFPCoXanVc72N5ywgOXhtFIH71aEyodgK Bc2kiGl9IXWlh/pJuPcLPZpciGOK4SA5/eAGuf6szGeK6g7RWdO0/hTVI/+MnC0aaRUdNr lVx8JLUrK3hVL4z5BpHxU/XcbTLuiLFStfmbnsRXSnKIvIKUbt1KGgNZWgphWQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1717372034; a=rsa-sha256; cv=none; b=s6A5ZRw7Y/a+0HHZhkir7SIJgTf6GwDDE6EurudVIP0iUgmctKpIRP3Q2g6QtHuN6MlUSI IL2vjPWng9lRTSLF0hu7vrmtomAMFSL9e9/Q55UQ/v0e+JTozx0TMcBqUOobjNCSqArPOt FmzlWI+Vb9kmTCS+B/NvychS4wlpHxN25anpgYFJyvheNRagMKHQCkZ+T646s71KA2sYrZ lUP/8iyUDbCACaGMfEJ6H8x/6qoiXgZLWu6pNwAq174n8VgdT1ZuXBaymZieNIPFYRehJ/ kwmSi7BAG3mNhxaKGdI1mdcZ8ZRTjYGameeHYURHLMVCaeum8dDHhmo8spKLhA== 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=1717372034; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GhxvWvwXvjy8zTPszkzZLvxE+lS5wMwBXIN9hwWaDCI=; b=qmOaljH1PbhC7RfX2lvIl60z4UyFBMRlVex4XGjRmfGXVGnn/uKf7zDqdlEleqlOb4KOTh tBli43BYIlat0FnjHKoNOgp2/ouPe4A1jHoPJm+MYOAi8eJfRr1Oa7J4zj7gdDRSSDn0Ab ilbbsP76lyogp4wwXzDSDStaZC6FluMe1ttMmOp8wV6PKoNawYCjWOCMD49ZwVFFtcFzEM Vgld6AiFoHgynb6YZmw62lyK3Lxlz4N4GekHVZWuW4cwYO70+71wSPwjGc/gEjkjdKlLtj wskLqnT7RRF1AZYaKv/ME+BpJk1+YreD12bu5uzaWTXgz69lLjpBqbMg1nURLg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VstnG3Jk4z1BSS; Sun, 2 Jun 2024 23:47: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 452NlEHq056509; Sun, 2 Jun 2024 23:47:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 452NlEvM056506; Sun, 2 Jun 2024 23:47:14 GMT (envelope-from git) Date: Sun, 2 Jun 2024 23:47:14 GMT Message-Id: <202406022347.452NlEvM056506@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: a866a40b9b80 - main - bhnd: Use device_set_descf() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: a866a40b9b8095a1a31eb22d575535c1f5fbc080 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=a866a40b9b8095a1a31eb22d575535c1f5fbc080 commit a866a40b9b8095a1a31eb22d575535c1f5fbc080 Author: Mark Johnston AuthorDate: 2024-02-04 23:35:02 +0000 Commit: Mark Johnston CommitDate: 2024-06-02 23:38:40 +0000 bhnd: Use device_set_descf() Here we are in a device probe routine with no locks held. M_WAITOK allocations are ok. No functional change intended. MFC after: 1 week --- sys/dev/bhnd/bhnd_subr.c | 20 ++------------------ sys/dev/bhnd/cores/chipc/bhnd_pmu_chipc.c | 4 +--- 2 files changed, 3 insertions(+), 21 deletions(-) diff --git a/sys/dev/bhnd/bhnd_subr.c b/sys/dev/bhnd/bhnd_subr.c index 0d38c1ca8a24..1c456ed1cddf 100644 --- a/sys/dev/bhnd/bhnd_subr.c +++ b/sys/dev/bhnd/bhnd_subr.c @@ -1765,18 +1765,10 @@ void bhnd_set_custom_core_desc(device_t dev, const char *dev_name) { const char *vendor_name; - char *desc; vendor_name = bhnd_get_vendor_name(dev); - asprintf(&desc, M_BHND, "%s %s, rev %hhu", vendor_name, dev_name, + device_set_descf(dev, "%s %s, rev %hhu", vendor_name, dev_name, bhnd_get_hwrev(dev)); - - if (desc != NULL) { - device_set_desc_copy(dev, desc); - free(desc, M_BHND); - } else { - device_set_desc(dev, dev_name); - } } /** @@ -1802,7 +1794,6 @@ void bhnd_set_default_bus_desc(device_t dev, const struct bhnd_chipid *chip_id) { const char *bus_name; - char *desc; char chip_name[BHND_CHIPID_MAX_NAMELEN]; /* Determine chip type's bus name */ @@ -1827,14 +1818,7 @@ bhnd_set_default_bus_desc(device_t dev, const struct bhnd_chipid *chip_id) chip_id->chip_id); /* Format and set device description */ - asprintf(&desc, M_BHND, "%s %s", chip_name, bus_name); - if (desc != NULL) { - device_set_desc_copy(dev, desc); - free(desc, M_BHND); - } else { - device_set_desc(dev, bus_name); - } - + device_set_descf(dev, "%s %s", chip_name, bus_name); } /** diff --git a/sys/dev/bhnd/cores/chipc/bhnd_pmu_chipc.c b/sys/dev/bhnd/cores/chipc/bhnd_pmu_chipc.c index 95b19d973e26..ce50fcd0ee1f 100644 --- a/sys/dev/bhnd/cores/chipc/bhnd_pmu_chipc.c +++ b/sys/dev/bhnd/cores/chipc/bhnd_pmu_chipc.c @@ -62,7 +62,6 @@ bhnd_pmu_chipc_probe(device_t dev) struct chipc_caps *ccaps; struct chipc_softc *chipc_sc; device_t chipc; - char desc[34]; int error; uint32_t pcaps; uint8_t rev; @@ -87,8 +86,7 @@ bhnd_pmu_chipc_probe(device_t dev) /* Set description */ rev = BHND_PMU_GET_BITS(pcaps, BHND_PMU_CAP_REV); - snprintf(desc, sizeof(desc), "Broadcom ChipCommon PMU, rev %hhu", rev); - device_set_desc_copy(dev, desc); + device_set_descf(dev, "Broadcom ChipCommon PMU, rev %hhu", rev); return (BUS_PROBE_NOWILDCARD); } From nobody Sun Jun 2 23:47: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 4VstnJ47T2z5LVd7; Sun, 02 Jun 2024 23:47:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VstnJ14RSz49vs; Sun, 2 Jun 2024 23:47:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717372036; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YK32W9gIQK201cQuKO9SzoB1ozKTUCoglFluCqaKGi8=; b=NzEjdF7iotx95vvJ+sSO8EpC5wWbF2PFv95niC6ht8Jm6BBkZuR0BiAzpG9fn4zqmTQM96 Bhh90gW/Y6k4G8ojbD0/zaGUOyLhM1yvonaYWVB+WhMF3zFBzUzHrSjeoqMxdvCrnabczL ZkK+w2wbC81jz5iU7jA3o7DOK/COwYrSLxfkyrwn2ZaCRqDuScrGoEkeGZYKM+cOhr6t2L KRoV6GB34JMZpdV/hWRi6hrAzAjOKWXHS+8IcLLNgmrogFoykqTSAgZ+aMm1xX2UadB3Fc hLJ8zrnE1YPIvD/O+8b+7iDjITwww1qPC9CPcNSQhoL1hNCB0VqO02EAZoBkWw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1717372036; a=rsa-sha256; cv=none; b=LxC9vOiahLV06WoHs/sh/1cMwNIJzBL6UKTeCfZBbmLkGNS/JEFzZM4nXjPNMKJs3UoRZ7 ziG2UxJsqllKx3GgWZ+pbYK/qfIWjko8opVXTYH19dPgFuIuhPM6C+Q+pt6UVvSmpU3FiM pq/7cF7QQkX7JEr9OUUuEfn+kzwBwXLlGVoyqRJ9hxl1nyXk7JqZqWpDhANHJ2CPjA7csR PlsXkiMF8zWp31gWoGfOtn+VZ/hHRWXHB0MxRSvXXylOmPkIsx/TFwa0ngpCEoYEQYmmVC FJx7BsN6H+H6N7EpJxrseQboFubx9zTAz9tsHVmS0NvUX6b7YE1AZTcV6eC4gA== 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=1717372036; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YK32W9gIQK201cQuKO9SzoB1ozKTUCoglFluCqaKGi8=; b=rP2O/odQD+vq/ZdjxzWyD8fnfNU+RjgPd0lczBcdnn/LEAadNtUPDw8j9d9t57oysKsM/w Zq5oru5R+CxiquHEwPBwHlb3NXnqFenwUng35uWn+5fKVHyYGrLcQQbmK04jJ8BTe+GLJY 4S5WQd+SZsLDDkB/YPfgbyDk2RaAOnbPQIk1g4p2aqfaIA43jCMaLmxYj4jNQYr8JKUGWM tZqtYWYd/wRrGt/g6lCNF11dr/mPUpn7awZ0gPLNOpQ4JDIxndzhtAvHEcZuy5EJ6lc/d4 mI+1OHGdK3/CQVoYYdbD9Ui4cIIUOkyi9VkMJBHQlCfl2x/O8jRtwxIwWGitDw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VstnH4YpPz1Bj7; Sun, 2 Jun 2024 23:47:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 452NlFJS056545; Sun, 2 Jun 2024 23:47:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 452NlFc3056542; Sun, 2 Jun 2024 23:47:15 GMT (envelope-from git) Date: Sun, 2 Jun 2024 23:47:15 GMT Message-Id: <202406022347.452NlFc3056542@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: 796bcf184518 - main - cxgb: Use device_set_descf() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: 796bcf184518ad7ac75b4abfd2bd351ea417fdb6 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=796bcf184518ad7ac75b4abfd2bd351ea417fdb6 commit 796bcf184518ad7ac75b4abfd2bd351ea417fdb6 Author: Mark Johnston AuthorDate: 2024-02-04 23:36:54 +0000 Commit: Mark Johnston CommitDate: 2024-06-02 23:38:40 +0000 cxgb: Use device_set_descf() No functional change intended. MFC after: 1 week --- sys/dev/cxgb/cxgb_main.c | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/sys/dev/cxgb/cxgb_main.c b/sys/dev/cxgb/cxgb_main.c index 1a088cdf0abe..c5fc067f8312 100644 --- a/sys/dev/cxgb/cxgb_main.c +++ b/sys/dev/cxgb/cxgb_main.c @@ -360,7 +360,7 @@ static int cxgb_controller_probe(device_t dev) { const struct adapter_info *ai; - char *ports, buf[80]; + const char *ports; int nports; ai = cxgb_get_adapter_info(dev); @@ -373,8 +373,7 @@ cxgb_controller_probe(device_t dev) else ports = "ports"; - snprintf(buf, sizeof(buf), "%s, %d %s", ai->desc, nports, ports); - device_set_desc_copy(dev, buf); + device_set_descf(dev, "%s, %d %s", ai->desc, nports, ports); return (BUS_PROBE_DEFAULT); } @@ -447,7 +446,6 @@ cxgb_controller_attach(device_t dev) uint32_t vers; int port_qsets = 1; int msi_needed, reg; - char buf[80]; sc = device_get_softc(dev); sc->dev = dev; @@ -659,10 +657,9 @@ cxgb_controller_attach(device_t dev) G_FW_VERSION_MAJOR(vers), G_FW_VERSION_MINOR(vers), G_FW_VERSION_MICRO(vers)); - snprintf(buf, sizeof(buf), "%s %sNIC\t E/C: %s S/N: %s", - ai->desc, is_offload(sc) ? "R" : "", - sc->params.vpd.ec, sc->params.vpd.sn); - device_set_desc_copy(dev, buf); + device_set_descf(dev, "%s %sNIC\t E/C: %s S/N: %s", + ai->desc, is_offload(sc) ? "R" : "", + sc->params.vpd.ec, sc->params.vpd.sn); snprintf(&sc->port_types[0], sizeof(sc->port_types), "%x%x%x%x", sc->params.vpd.port_type[0], sc->params.vpd.port_type[1], @@ -966,13 +963,11 @@ static int cxgb_port_probe(device_t dev) { struct port_info *p; - char buf[80]; const char *desc; p = device_get_softc(dev); desc = p->phy.desc; - snprintf(buf, sizeof(buf), "Port %d %s", p->port_id, desc); - device_set_desc_copy(dev, buf); + device_set_descf(dev, "Port %d %s", p->port_id, desc); return (0); } From nobody Sun Jun 2 23:47: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 4VstnK0P52z5LVXy; Sun, 02 Jun 2024 23:47:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VstnJ5fMnz49yk; Sun, 2 Jun 2024 23:47:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717372036; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ia7iSExN+oR9AVRq0mjHxske05HyHefYTCvLDXdXCyM=; b=hg84EFCg7laby+pb8Nunt7dCbiE3/9XbDQGSa4wXX1s7EkeBEA38Wl98SgeQJ5e+Z/MPei 1veDsExS90X1j6LECSDEYp74mSL/LuDcHlvl+5qQ/s56Y7sDQdq7sh6/CztGAjSDkIddLM onRbkw7NvtwlJGDuFbDyskGAVjiZeR9QQ8SUMg72LSXf87j54WjwGsY1JnSE5b3oqIZStA r8a05ieiFDCb2PTfff5GqEG82FDkBe+/VJh3a7PbMtAFQf8iKGkpjV+OU4CV33fXWqVF0d Q6NiQooLAkvDBz0K0odRtZe2mX9BGolUvbYFWtrB99H1j4Fdi6HzSwFhNvfC/g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1717372036; a=rsa-sha256; cv=none; b=VaAVIjHlWVrKQUQPn0H/Jg7ThVG4QicD1bVv9T8zgTTiGQ6cMQkdsBCDCnUnImCzpyYIHn CBsMcF5zNcNCb3HqSu+Hej73MXaxdu59yGlzXuF8mx8n/Jds2J/DghkeAfiw8oS602hKpr l11FKR9OklyWh5mpZ8zU5xqM/T1B0yNKb+yUwjzPoeoO8BisRf3B0TbVhygNu9M5XLxHPG s1ixT6OA54TS7JPkgu2ZAPeX6bGi5ABBxYHndaEVQ6vMXbNf/PHQkwniz5TocYG/mD6wRD wJg1YW93IGud19HiPNBG/nbvIzIxlAfPRLMFgncqWPyzSS2GNTiUvDc20It8Gw== 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=1717372036; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ia7iSExN+oR9AVRq0mjHxske05HyHefYTCvLDXdXCyM=; b=ce/u99Swx/qxM4JEj4/cfLwXHL+mfntUf/NyGMj/85/gyjgnRhXRbD5bXU+OjHqVR1HYcV FV5Y7H3gKGS681Y8HCHnP81x9EpVdfT79ibddCfegQq5wiTWVYtEkvipEPe79QnwKLgBEf 4SYKDJAJ93W55JIpY7olJozjkITBTsDIUqPgYunvWUu88nQEaByxwOTzQ5acioTv4TVEfi 0eTA3eZucywV+ddZhF53k2bs38l4igImjqK+0sCBoEyZvErKTAkSfm1jhUS6I1znELJfjz M4/8Dse8LQm5sCzWclIe3xAXLXHOE85OjT/jvx3nWZR9vcaiV8Fd7LxokC5nLQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VstnJ50Fhz1B4w; Sun, 2 Jun 2024 23:47: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 452NlGPj056589; Sun, 2 Jun 2024 23:47:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 452NlGsT056586; Sun, 2 Jun 2024 23:47:16 GMT (envelope-from git) Date: Sun, 2 Jun 2024 23:47:16 GMT Message-Id: <202406022347.452NlGsT056586@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: a1b84451159f - main - cxgbe: Use device_set_descf() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: a1b84451159fbad069ccaa4b5197a3fde7eae902 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=a1b84451159fbad069ccaa4b5197a3fde7eae902 commit a1b84451159fbad069ccaa4b5197a3fde7eae902 Author: Mark Johnston AuthorDate: 2024-02-04 23:38:04 +0000 Commit: Mark Johnston CommitDate: 2024-06-02 23:38:40 +0000 cxgbe: Use device_set_descf() No functional change intended. MFC after: 1 week --- sys/dev/cxgbe/t4_main.c | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/sys/dev/cxgbe/t4_main.c b/sys/dev/cxgbe/t4_main.c index 185cc1140486..03b674cb9241 100644 --- a/sys/dev/cxgbe/t4_main.c +++ b/sys/dev/cxgbe/t4_main.c @@ -2522,11 +2522,9 @@ reset_adapter_task(void *arg, int pending) static int cxgbe_probe(device_t dev) { - char buf[128]; struct port_info *pi = device_get_softc(dev); - snprintf(buf, sizeof(buf), "port %d", pi->port_id); - device_set_desc_copy(dev, buf); + device_set_descf(dev, "port %d", pi->port_id); return (BUS_PROBE_DEFAULT); } @@ -3499,12 +3497,10 @@ done: static int vcxgbe_probe(device_t dev) { - char buf[128]; struct vi_info *vi = device_get_softc(dev); - snprintf(buf, sizeof(buf), "port %d vi %td", vi->pi->port_id, + device_set_descf(dev, "port %d vi %td", vi->pi->port_id, vi - vi->pi->vi); - device_set_desc_copy(dev, buf); return (BUS_PROBE_DEFAULT); } @@ -5768,12 +5764,9 @@ set_params__post_init(struct adapter *sc) static void t4_set_desc(struct adapter *sc) { - char buf[128]; struct adapter_params *p = &sc->params; - snprintf(buf, sizeof(buf), "Chelsio %s", p->vpd.id); - - device_set_desc_copy(sc->dev, buf); + device_set_descf(sc->dev, "Chelsio %s", p->vpd.id); } static inline void From nobody Sun Jun 2 23:47: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 4VstnL5CzMz5LVQ3; Sun, 02 Jun 2024 23:47: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 4VstnL12nkz4B1r; Sun, 2 Jun 2024 23:47:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717372038; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BQWPwAemv+3K3wvdxVa4qAXEjnSTCFi1akE6kmc2Uvk=; b=HCDSrVId6A+MTTBBf5f2WnfF9RoJEErsWQaS+VHaW+JbiRpLnPNKcafhRJpsQcSKNIkvIv 4g2ql66tuTCatBbrZHBGNNgKDhbuaquSniN53YK0Lp/cmbogNo3Tb6brHr1XEb1+we3BOP Q93CFF5AmlXMboe833YBabzBkuykjJ+IuSg04/FEkhcbq79EvfWEowmX6csszCUqC0Jc05 NDrVmfCp2ZiTe4C07lSNzwFYYGXv3zW40TxyvNbIhUBOfpEriQ9vw5ybbz8ictuS+ilM7x sTydd8CysxdUOffVDUWg+dLSUc6o9vwDS2llANvNihpo9uxNSxNQNrpFOOilqw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1717372038; a=rsa-sha256; cv=none; b=QPQtI2F5b8VEp0M4EGO+wf9gNjD7vrXnGiOAeI42ndNWfwWYbKmtF6vxXBaxHDni3Ouap9 PPNGZA5EnWULfz/yzFkUoW0jB3Iv9j25SEhNstZrV5G5CzoMKoaBklp16T5+eHJseCVRa0 9REO24a+Ab3v7x3Q7/Qo3Hb8A41EEmroctkH9D5T4wQZLLdCWD64KisAW6VrgoaKDlHGKu nUJ3qmLr5SHs0a7fj+kwEOeI3Ln8yjq81AktvYj6wbA9+7F59Ng7JDNHm3fm2R014PgVr1 VadJrjrrimu4upvqiRU2YocvBuJgJpWWMWZFJswTImhQUZk+Zbik5zAMjBfcNQ== 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=1717372038; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BQWPwAemv+3K3wvdxVa4qAXEjnSTCFi1akE6kmc2Uvk=; b=CVn9gaTQ094BynoGDRLWHiLqTRJYZtS1CVtEtGOKVQcSO8mj2k7s2xl3gn22c3gybh8bCG cgy93NCqEUo12ACqyHAmjI6B7GQrtULW/+8IAUlWlxlNUl6NtIveQStndBHi4n+aBkmy0y SmcAvxTeG22jZEHnx5/79VpEe2uxU91dx2P0fUuTUFknNRkAvm+pPVj7PLPNpz9EaiMWQV f2NB/L8ec9TN3jed0qRvIEdxZHX19f1F3jy9f+fEil6z4c8Hb79MD4BRgvA0yeOb0lZLlj d3erRwoL9ND7Z2mqJv+b093gMjIMV4I5WOrazSQy/Q+wuKPSj0XGUEEjxTepdQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VstnK6Nchz1Bj8; Sun, 2 Jun 2024 23:47: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 452NlHdf056627; Sun, 2 Jun 2024 23:47:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 452NlHRY056624; Sun, 2 Jun 2024 23:47:17 GMT (envelope-from git) Date: Sun, 2 Jun 2024 23:47:17 GMT Message-Id: <202406022347.452NlHRY056624@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: 54482989d34c - main - etherswitch: Use device_set_desc(f)() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: 54482989d34c94c6894cb51f65250a4d5946eb1b Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=54482989d34c94c6894cb51f65250a4d5946eb1b commit 54482989d34c94c6894cb51f65250a4d5946eb1b Author: Mark Johnston AuthorDate: 2024-02-04 23:41:22 +0000 Commit: Mark Johnston CommitDate: 2024-06-02 23:38:41 +0000 etherswitch: Use device_set_desc(f)() No functional change intended. MFC after: 1 week --- sys/dev/etherswitch/arswitch/arswitch.c | 9 +++------ sys/dev/etherswitch/e6000sw/e6060sw.c | 4 +--- sys/dev/etherswitch/infineon/adm6996fc.c | 2 +- sys/dev/etherswitch/ip17x/ip17x.c | 2 +- sys/dev/etherswitch/micrel/ksz8995ma.c | 2 +- sys/dev/etherswitch/mtkswitch/mtkswitch.c | 2 +- sys/dev/etherswitch/ukswitch/ukswitch.c | 2 +- 7 files changed, 9 insertions(+), 14 deletions(-) diff --git a/sys/dev/etherswitch/arswitch/arswitch.c b/sys/dev/etherswitch/arswitch/arswitch.c index 1c2bcefdfe91..70f3ad501d5d 100644 --- a/sys/dev/etherswitch/arswitch/arswitch.c +++ b/sys/dev/etherswitch/arswitch/arswitch.c @@ -95,7 +95,7 @@ arswitch_probe(device_t dev) { struct arswitch_softc *sc; uint32_t id; - char *chipname, desc[256]; + char *chipname; sc = device_get_softc(dev); bzero(sc, sizeof(*sc)); @@ -132,12 +132,9 @@ arswitch_probe(device_t dev) DPRINTF(sc, ARSWITCH_DBG_ANY, "chipname=%s, id=%08x\n", chipname, id); if (chipname != NULL) { - snprintf(desc, sizeof(desc), + device_set_descf(dev, "Atheros %s Ethernet Switch (ver %d rev %d)", - chipname, - sc->chip_ver, - sc->chip_rev); - device_set_desc_copy(dev, desc); + chipname, sc->chip_ver, sc->chip_rev); return (BUS_PROBE_DEFAULT); } return (ENXIO); diff --git a/sys/dev/etherswitch/e6000sw/e6060sw.c b/sys/dev/etherswitch/e6000sw/e6060sw.c index 19744f5e44a5..8bc482af24e8 100644 --- a/sys/dev/etherswitch/e6000sw/e6060sw.c +++ b/sys/dev/etherswitch/e6000sw/e6060sw.c @@ -162,7 +162,6 @@ e6060sw_probe(device_t dev) struct e6060sw_softc *sc; int devid, i; char *devname; - char desc[80]; sc = device_get_softc(dev); bzero(sc, sizeof(*sc)); @@ -193,9 +192,8 @@ e6060sw_probe(device_t dev) else return (ENXIO); - sprintf(desc, "Marvell %s MDIO switch driver at 0x%02x", + device_set_descf(dev, "Marvell %s MDIO switch driver at 0x%02x", devname, sc->smi_offset); - device_set_desc_copy(dev, desc); return (BUS_PROBE_DEFAULT); } diff --git a/sys/dev/etherswitch/infineon/adm6996fc.c b/sys/dev/etherswitch/infineon/adm6996fc.c index cc67616d9fdf..95a24a2fb37a 100644 --- a/sys/dev/etherswitch/infineon/adm6996fc.c +++ b/sys/dev/etherswitch/infineon/adm6996fc.c @@ -153,7 +153,7 @@ adm6996fc_probe(device_t dev) return (ENXIO); } - device_set_desc_copy(dev, "Infineon ADM6996FC/M/MX MDIO switch driver"); + device_set_desc(dev, "Infineon ADM6996FC/M/MX MDIO switch driver"); return (BUS_PROBE_DEFAULT); } diff --git a/sys/dev/etherswitch/ip17x/ip17x.c b/sys/dev/etherswitch/ip17x/ip17x.c index 65e548ba293b..45119ded83a9 100644 --- a/sys/dev/etherswitch/ip17x/ip17x.c +++ b/sys/dev/etherswitch/ip17x/ip17x.c @@ -152,7 +152,7 @@ ip17x_probe(device_t dev) (void) resource_int_value(device_get_name(dev), device_get_unit(dev), "mii-poll", &sc->miipoll); #endif - device_set_desc_copy(dev, "IC+ IP17x switch driver"); + device_set_desc(dev, "IC+ IP17x switch driver"); return (BUS_PROBE_DEFAULT); } diff --git a/sys/dev/etherswitch/micrel/ksz8995ma.c b/sys/dev/etherswitch/micrel/ksz8995ma.c index 43292d3b2007..2b5af2a5625a 100644 --- a/sys/dev/etherswitch/micrel/ksz8995ma.c +++ b/sys/dev/etherswitch/micrel/ksz8995ma.c @@ -197,7 +197,7 @@ ksz8995ma_probe(device_t dev) return (ENXIO); } - device_set_desc_copy(dev, "Micrel KSZ8995MA SPI switch driver"); + device_set_desc(dev, "Micrel KSZ8995MA SPI switch driver"); return (BUS_PROBE_DEFAULT); } diff --git a/sys/dev/etherswitch/mtkswitch/mtkswitch.c b/sys/dev/etherswitch/mtkswitch/mtkswitch.c index 6e235097f189..75f7cbfa6941 100644 --- a/sys/dev/etherswitch/mtkswitch/mtkswitch.c +++ b/sys/dev/etherswitch/mtkswitch/mtkswitch.c @@ -100,7 +100,7 @@ mtkswitch_probe(device_t dev) bzero(sc, sizeof(*sc)); sc->sc_switchtype = switch_type; - device_set_desc_copy(dev, "MTK Switch Driver"); + device_set_desc(dev, "MTK Switch Driver"); return (0); } diff --git a/sys/dev/etherswitch/ukswitch/ukswitch.c b/sys/dev/etherswitch/ukswitch/ukswitch.c index 88726422bd01..c1e23f7c0f65 100644 --- a/sys/dev/etherswitch/ukswitch/ukswitch.c +++ b/sys/dev/etherswitch/ukswitch/ukswitch.c @@ -106,7 +106,7 @@ ukswitch_probe(device_t dev) sc = device_get_softc(dev); bzero(sc, sizeof(*sc)); - device_set_desc_copy(dev, "Generic MDIO switch driver"); + device_set_desc(dev, "Generic MDIO switch driver"); return (BUS_PROBE_DEFAULT); } From nobody Sun Jun 2 23:47: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 4VstnM3klRz5LVY3; Sun, 02 Jun 2024 23:47: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 4VstnM0c9Mz49wg; Sun, 2 Jun 2024 23:47:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717372039; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=juX78QiyXjDZ+orMvDrJLqnUbyd2UavMUvwkPM4sjXQ=; b=qiNLb+xw4CPf7I4ocGeDhOKTSz6ARBIOWGTdRrVsW1lgW5pnku1p6ypLAFPPs03dVz3x12 3ConBPf1BEv4GRWolSA+xYRZA66GFc0DPRy27BM/QWMlosvZ72Aq90NrM3gHOo4VZNqU1/ aw6o5CwvQ1R220kQtpRA7DCPD0G2Q0yvbKnU3eS07f0cGuc0it4VAO2V4EI9IZOxZF0Okd kZ5iI/eFDvpXVw4j97znixkb/N+QZCtdnkJZcuN/Q/lIdxtuz/Om6Wp5qdW2FfV/jCCHlU xCJntm9PdA3w0QKCyKAIaGRRvhJzNAJNdnaPs9KLPyioDANOgrnjdyoPrs/saQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1717372039; a=rsa-sha256; cv=none; b=oS4kIm+vo72kpaajV7bK+BaD18LdcjHByZ/+SfSX1GLHBxFh3PMYvZ/3Pvlux5SfeDpVWM txSgBRWrYwEFP8n5mqzyLzO58Q3uGEXqne/NbTLuNRlOu9rgI8bp5lhLW5hkFx5i21GKLA c6tbq5jDETuVA+UgYLs32YwuqSnXBOfuXjVujSgjcquo8GwreeoGdCRTwyHUF9zq/fuhZL fvmjwG0POQeMjZXhpoZBsoGfAHry5yR5R6wXOqjqs9qqjxOfQ1q/9wHml8NWpWLTEq9Y8Y O9NAnOwItm9iPazztOUoHnup6qGTFuL9QIo3sYePiV5ALZRTl51x7MA4c2Ejsw== 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=1717372039; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=juX78QiyXjDZ+orMvDrJLqnUbyd2UavMUvwkPM4sjXQ=; b=vIbzW7mgGA59tGYmLtwuwB2DsfpzarAgYQa2c3Ipec12ELHyTN1jm2OEOKx/v3aeKUIV4f 6Vly8chIDjhLvPg4vnMf5BvAQ1L/M3HKp9IhIMlKlufukisiakxdOry/AiY1kg7/KwuHK8 KxaSYwbxyctQLMLxJbsuvsSmNLVZmFHHk43D68vROJzA6e8la7qN6PQAbzUG3aBs92iNcb VCgRlCOBrhJ88FxRi/XQOrsBgr9gVln2pJUH5EK0b6ygfLEA1XNgUeJyBwHgcNe0JPvE+x hzCKwdCBAs7ncYfRkV1buPcoozj2xNZcHdgXpXaVn2ji+G5sEZkNTi7YdoyEIg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VstnM09FWz1BlJ; Sun, 2 Jun 2024 23:47: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 452NlIVZ056663; Sun, 2 Jun 2024 23:47:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 452NlIPw056660; Sun, 2 Jun 2024 23:47:18 GMT (envelope-from git) Date: Sun, 2 Jun 2024 23:47:18 GMT Message-Id: <202406022347.452NlIPw056660@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: 17bfbc400f53 - main - siis: Use device_set_desc(f)() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: 17bfbc400f53ff1768c907b35c9cf045d540b8ab Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=17bfbc400f53ff1768c907b35c9cf045d540b8ab commit 17bfbc400f53ff1768c907b35c9cf045d540b8ab Author: Mark Johnston AuthorDate: 2024-02-04 23:44:11 +0000 Commit: Mark Johnston CommitDate: 2024-06-02 23:38:41 +0000 siis: Use device_set_desc(f)() No functional change intended. MFC after: 1 week --- sys/dev/siis/siis.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/sys/dev/siis/siis.c b/sys/dev/siis/siis.c index 54ef7ff440aa..ad370c99f85e 100644 --- a/sys/dev/siis/siis.c +++ b/sys/dev/siis/siis.c @@ -120,15 +120,13 @@ static struct { static int siis_probe(device_t dev) { - char buf[64]; int i; uint32_t devid = pci_get_devid(dev); for (i = 0; siis_ids[i].id != 0; i++) { if (siis_ids[i].id == devid) { - snprintf(buf, sizeof(buf), "%s SATA controller", + device_set_descf(dev, "%s SATA controller", siis_ids[i].name); - device_set_desc_copy(dev, buf); return (BUS_PROBE_DEFAULT); } } @@ -449,7 +447,7 @@ static int siis_ch_probe(device_t dev) { - device_set_desc_copy(dev, "SIIS channel"); + device_set_desc(dev, "SIIS channel"); return (BUS_PROBE_DEFAULT); } From nobody Sun Jun 2 23:47: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 4VstnP0qTwz5LVk0; Sun, 02 Jun 2024 23:47: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 4VstnN1tbQz4B9T; Sun, 2 Jun 2024 23:47:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717372040; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oazrpWWlWT7bL7LwbsMPzHbE5vqteOn9Z+yQZ7LeE7I=; b=A76EwUSlSUGEJCVcOdxKf+g9007IzO0ATSbCfrs1Er62INfv24FSXPOJZmBnSHAD1vSUlF XZZAlDTMOSpkH1SxAi/y81CvNFEg2LW87holKeutXGNRFu10AO2l6f3wo3C1E7PzDJ1pN+ QU+8uy85xLee+dP3U80sTj4h4m8YmAKpSLR9tCRF0UmCoFrusiTTJXno6zLzW+/gpWsog+ /Erh6aFDDrqprlnJSSAdIuFrMMptc1BuJfaRwePS4Zd9ku32YQmEGkOeAv3f8u8D1YLval KXadY8NOHCUdAILedsgeymE3UUY2MbM9qj/pVuEMwRIRVSOmLqRLmdOhK+DUXQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1717372040; a=rsa-sha256; cv=none; b=VNZdDd/xaxcsneaPNByA21m7MUvuByZ43sxT73NlbULyT3z13FbvVzjtl2uNa2X1kZr1YV hMbs8qZ0AUUg2aV9FaaJlFs1o57eeTtEjWMzzL63enrTYI/GOhM6Hk1JRKaxIEhcOPXz/U 4plwZtSM6Ns0uQ7WggG1QnlDpSYx98dpgbYiieVHlC/RH8puz0c8ySzgxAmpP1Bu1aQXHp KE0Qudytpz7L6PswPaNLaOi6A9FqfSYvWUfalFKRHs9yM8n8F0kdEMCMPcW7nSh5E7Y3Uj +Xnjwn5YwYrkWpc+MGVNbThsRqUYRnyXsvHcndhisdYGHW4ZM7p4FBo47fAgqg== 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=1717372040; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oazrpWWlWT7bL7LwbsMPzHbE5vqteOn9Z+yQZ7LeE7I=; b=hdfWhxYUCDhJja5q4xDzuY/2xe4P7OAR/H94zOsPf9U44UTAQYF8HtryDruF3nGrPCvLkZ kZuP3XfiJHdjWzZAsxtEiSJPTI/3FYoqoQmkbk96lI1QHRz86uP4xqoSpfYOg9ZyKft/do yyNhT0L33WzoxtxsmDkqrgTKQLqCx46y5oia1rqfmAvpwmfOnFVQKEFgmcuYBq29yMe4yY PYWIwGtcHMI0x7mKrtkF1V6ShtTlna05qQyZ0klokL03c4GRkyQaKAz0sUtQhOc+NKJZV+ /fLGoL4rsVBg769K0P0Z2OFv1D34oV/1CKHRt+yoJjMzLDYC2DjjszXLQev2nw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VstnN1BBjz1BnR; Sun, 2 Jun 2024 23:47: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 452NlKXd056699; Sun, 2 Jun 2024 23:47:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 452NlKGu056696; Sun, 2 Jun 2024 23:47:20 GMT (envelope-from git) Date: Sun, 2 Jun 2024 23:47:20 GMT Message-Id: <202406022347.452NlKGu056696@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: 801b12ba89af - main - qlnx: Use device_set_descf() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: 801b12ba89af6377e30c15b9b68443f0d60d50bf Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=801b12ba89af6377e30c15b9b68443f0d60d50bf commit 801b12ba89af6377e30c15b9b68443f0d60d50bf Author: Mark Johnston AuthorDate: 2024-02-04 23:46:51 +0000 Commit: Mark Johnston CommitDate: 2024-06-02 23:38:41 +0000 qlnx: Use device_set_descf() No functional change intended. MFC after: 1 week --- sys/dev/qlnx/qlnxe/qlnx_os.c | 25 ++++++------------------- 1 file changed, 6 insertions(+), 19 deletions(-) diff --git a/sys/dev/qlnx/qlnxe/qlnx_os.c b/sys/dev/qlnx/qlnxe/qlnx_os.c index 2b3732e748fd..21d39e809cc8 100644 --- a/sys/dev/qlnx/qlnxe/qlnx_os.c +++ b/sys/dev/qlnx/qlnxe/qlnx_os.c @@ -227,7 +227,6 @@ MODULE_DEPEND(if_qlnxev, ether, 1, 1, 1); MALLOC_DEFINE(M_QLNXBUF, "qlnxbuf", "Buffers for qlnx driver"); -char qlnx_dev_str[128]; char qlnx_ver_str[VER_SIZE]; char qlnx_name_str[NAME_SIZE]; @@ -374,60 +373,48 @@ qlnx_pci_probe(device_t dev) #ifndef QLNX_VF case QLOGIC_PCI_DEVICE_ID_1644: - snprintf(qlnx_dev_str, sizeof(qlnx_dev_str), "%s v%d.%d.%d", + device_set_descf(dev, "%s v%d.%d.%d", "Qlogic 100GbE PCI CNA Adapter-Ethernet Function", QLNX_VERSION_MAJOR, QLNX_VERSION_MINOR, QLNX_VERSION_BUILD); - device_set_desc_copy(dev, qlnx_dev_str); - break; case QLOGIC_PCI_DEVICE_ID_1634: - snprintf(qlnx_dev_str, sizeof(qlnx_dev_str), "%s v%d.%d.%d", + device_set_descf(dev, "%s v%d.%d.%d", "Qlogic 40GbE PCI CNA Adapter-Ethernet Function", QLNX_VERSION_MAJOR, QLNX_VERSION_MINOR, QLNX_VERSION_BUILD); - device_set_desc_copy(dev, qlnx_dev_str); - break; case QLOGIC_PCI_DEVICE_ID_1656: - snprintf(qlnx_dev_str, sizeof(qlnx_dev_str), "%s v%d.%d.%d", + device_set_descf(dev, "%s v%d.%d.%d", "Qlogic 25GbE PCI CNA Adapter-Ethernet Function", QLNX_VERSION_MAJOR, QLNX_VERSION_MINOR, QLNX_VERSION_BUILD); - device_set_desc_copy(dev, qlnx_dev_str); - break; case QLOGIC_PCI_DEVICE_ID_1654: - snprintf(qlnx_dev_str, sizeof(qlnx_dev_str), "%s v%d.%d.%d", + device_set_descf(dev, "%s v%d.%d.%d", "Qlogic 50GbE PCI CNA Adapter-Ethernet Function", QLNX_VERSION_MAJOR, QLNX_VERSION_MINOR, QLNX_VERSION_BUILD); - device_set_desc_copy(dev, qlnx_dev_str); - break; case QLOGIC_PCI_DEVICE_ID_8070: - snprintf(qlnx_dev_str, sizeof(qlnx_dev_str), "%s v%d.%d.%d", + device_set_descf(dev, "%s v%d.%d.%d", "Qlogic 10GbE/25GbE/40GbE PCI CNA (AH)" " Adapter-Ethernet Function", QLNX_VERSION_MAJOR, QLNX_VERSION_MINOR, QLNX_VERSION_BUILD); - device_set_desc_copy(dev, qlnx_dev_str); - break; #else case QLOGIC_PCI_DEVICE_ID_8090: - snprintf(qlnx_dev_str, sizeof(qlnx_dev_str), "%s v%d.%d.%d", + device_set_descf(dev, "%s v%d.%d.%d", "Qlogic SRIOV PCI CNA (AH) " "Adapter-Ethernet Function", QLNX_VERSION_MAJOR, QLNX_VERSION_MINOR, QLNX_VERSION_BUILD); - device_set_desc_copy(dev, qlnx_dev_str); - break; #endif /* #ifndef QLNX_VF */ From nobody Sun Jun 2 23:47: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 4VstnQ2jgDz5LVVg; Sun, 02 Jun 2024 23:47:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VstnP2RdBz49tb; Sun, 2 Jun 2024 23:47:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717372041; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yyhKXp27biv457HA8u+o7WmiUrC/8U1a05Tw2UE+OvQ=; b=sJI2oYPOeKA/ZLD2omhcXYOlwbByTSGW4tD1p+luz9XAg/nt8IZFokr55i9Cs/tiCIHLke S8HojIoskAgCeh3mS+rgQZun6LtXP3C1X0L2iuo2fYRX1KezrDu759Tq9rxm7ANedGbdOT XAPsCXex2KkP1XJWrpf/KmTe0jEaW3osSLFtsqwfZLx63anl//cQmgb5vPei6dgSk327TY 1QwrBXqd+tXII/d0KPVNy1kKG5PtPbmXyOz9XH2bmy6ougT3aVTTCVWItG9zXwShPNhyG8 taPMW9hO++MLFyS+JULSmq5IzI0gkYxv/446vtlW+z61FfLw2HS8PednAEYPTQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1717372041; a=rsa-sha256; cv=none; b=L7UE5zYC/ahLpbkshWaOwqvHDNs9LLWx5AzyQw4ffapjWLNt9kvRayR8WnfXPu0iXaa19h 3FeTfljQB3uSk+nUQCTUIv2G6SEu6OJ5jjuXdo/nwGZ2YYLS3ky32b5u7GLI7txT3Fr+aY p6EZillO2B7IDotFsUprw7WV7yCPveJA4syzEzDgLRV6hvqHx7pUcXdSORYUVJ8n4SGb4I XH6E18rpxOTghrp8R2t2llKMT/SXUNIB9sDoEjbRScWNL1kAkMCIR7C8cK/HDoaC4OlHv3 N1WtTwc3NfZ0oFuuREzYymhz93szVzT9vUtKNM4ZYmqAhdAcVrxlOn5i+ECSZA== 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=1717372041; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yyhKXp27biv457HA8u+o7WmiUrC/8U1a05Tw2UE+OvQ=; b=sxw1vjG5X+mxsARy/RaOYbTr6/Vk9AkecDFVmIR+hXom8glJ7dTOyfqTMOV72Hr744t/VK K2xaFDwqi62WTZ5ZYdICIiy2YUek0HJU5UyFDcvGPq+Uk879wCH5sZQxGUt+tVBBv3cyF0 v2DBv56NUaw+wORn7oo6SIl7EBCixStAA/Ma6FPmL6CAk86jc9VSw7Zroxls1Yn9CxpgLY 79qdFfxti8i6LD+VCes66MPLoYxyN9GnsIrfFFyWWmkBcKIrScBy/xf+GYd+VAP9l7YnGc P4eZsDkW5GH3GiC3QCj8G9nj4XrukLnBaTkXm6ubuc134diQ2BTp66lklKiXdQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VstnP1s3bz1BnS; Sun, 2 Jun 2024 23:47: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 452NlLkE056735; Sun, 2 Jun 2024 23:47:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 452NlLE6056732; Sun, 2 Jun 2024 23:47:21 GMT (envelope-from git) Date: Sun, 2 Jun 2024 23:47:21 GMT Message-Id: <202406022347.452NlLE6056732@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: bad36a49985c - main - acpi: Use device_set_descf() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: bad36a49985c3cd7bfcb1b35ce3ae37f007843ce Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=bad36a49985c3cd7bfcb1b35ce3ae37f007843ce commit bad36a49985c3cd7bfcb1b35ce3ae37f007843ce Author: Mark Johnston AuthorDate: 2024-02-04 23:51:27 +0000 Commit: Mark Johnston CommitDate: 2024-06-02 23:38:41 +0000 acpi: Use device_set_descf() No functional change intended. MFC after: 1 week --- sys/dev/acpi_support/acpi_asus.c | 22 +++++----------------- sys/dev/acpi_support/acpi_fujitsu.c | 4 +--- sys/dev/acpica/acpi_ec.c | 8 +++----- sys/dev/acpica/acpi_pci_link.c | 9 ++++----- sys/dev/acpica/acpi_timer.c | 4 +--- 5 files changed, 14 insertions(+), 33 deletions(-) diff --git a/sys/dev/acpi_support/acpi_asus.c b/sys/dev/acpi_support/acpi_asus.c index 6e63d8fabab1..b9ba6650d2b7 100644 --- a/sys/dev/acpi_support/acpi_asus.c +++ b/sys/dev/acpi_support/acpi_asus.c @@ -43,7 +43,6 @@ #include #include #include -#include #include #include @@ -535,7 +534,6 @@ acpi_asus_probe(device_t dev) { struct acpi_asus_model *model; struct acpi_asus_softc *sc; - struct sbuf *sb; ACPI_BUFFER Buf; ACPI_OBJECT Arg, *Obj; ACPI_OBJECT_LIST Args; @@ -599,24 +597,17 @@ acpi_asus_probe(device_t dev) } } - sb = sbuf_new_auto(); - if (sb == NULL) - return (ENOMEM); - /* * Asus laptops are simply identified by name, easy! */ for (model = acpi_asus_models; model->name != NULL; model++) { if (strncmp(Obj->String.Pointer, model->name, 3) == 0) { good: - sbuf_printf(sb, "Asus %s Laptop Extras", - Obj->String.Pointer); - sbuf_finish(sb); - sc->model = model; - device_set_desc_copy(dev, sbuf_data(sb)); - sbuf_delete(sb); + device_set_descf(dev, "Asus %s Laptop Extras", + Obj->String.Pointer); + AcpiOsFree(Buf.Pointer); return (rv); } @@ -695,12 +686,9 @@ good: } } - sbuf_printf(sb, "Unsupported Asus laptop: %s\n", Obj->String.Pointer); - sbuf_finish(sb); - - device_printf(dev, "%s", sbuf_data(sb)); + device_printf(dev, "Unsupported Asus laptop: %s\n", + Obj->String.Pointer); - sbuf_delete(sb); AcpiOsFree(Buf.Pointer); return (ENXIO); diff --git a/sys/dev/acpi_support/acpi_fujitsu.c b/sys/dev/acpi_support/acpi_fujitsu.c index 2d3c6f17dfe2..1649f74d873c 100644 --- a/sys/dev/acpi_support/acpi_fujitsu.c +++ b/sys/dev/acpi_support/acpi_fujitsu.c @@ -222,14 +222,12 @@ static int acpi_fujitsu_probe(device_t dev) { char *name; - char buffer[64]; int rv; rv = ACPI_ID_PROBE(device_get_parent(dev), dev, fujitsu_ids, &name); if (acpi_disabled("fujitsu") || rv > 0 || device_get_unit(dev) > 1) return (ENXIO); - sprintf(buffer, "Fujitsu Function Hotkeys %s", name); - device_set_desc_copy(dev, buffer); + device_set_descf(dev, "Fujitsu Function Hotkeys %s", name); return (rv); } diff --git a/sys/dev/acpica/acpi_ec.c b/sys/dev/acpica/acpi_ec.c index d27b7caee9e6..8ee7bc54f304 100644 --- a/sys/dev/acpica/acpi_ec.c +++ b/sys/dev/acpica/acpi_ec.c @@ -339,7 +339,6 @@ acpi_ec_probe(device_t dev) ACPI_OBJECT *obj; ACPI_STATUS status; device_t peer; - char desc[64]; int ecdt; int ret, rc; struct acpi_ec_params *params; @@ -444,10 +443,9 @@ acpi_ec_probe(device_t dev) ret = rc; out: if (ret <= 0) { - snprintf(desc, sizeof(desc), "Embedded Controller: GPE %#x%s%s", - params->gpe_bit, (params->glk) ? ", GLK" : "", - ecdt ? ", ECDT" : ""); - device_set_desc_copy(dev, desc); + device_set_descf(dev, "Embedded Controller: GPE %#x%s%s", + params->gpe_bit, (params->glk) ? ", GLK" : "", + ecdt ? ", ECDT" : ""); } else free(params, M_TEMP); diff --git a/sys/dev/acpica/acpi_pci_link.c b/sys/dev/acpica/acpi_pci_link.c index dac07a07ae7d..d9807876c443 100644 --- a/sys/dev/acpica/acpi_pci_link.c +++ b/sys/dev/acpica/acpi_pci_link.c @@ -143,7 +143,7 @@ acpi_short_name(ACPI_HANDLE handle, char *buffer, size_t buflen) static int acpi_pci_link_probe(device_t dev) { - char descr[28], name[12]; + char name[12]; int rv; /* @@ -157,10 +157,9 @@ acpi_pci_link_probe(device_t dev) return (rv); if (ACPI_SUCCESS(acpi_short_name(acpi_get_handle(dev), name, - sizeof(name)))) { - snprintf(descr, sizeof(descr), "ACPI PCI Link %s", name); - device_set_desc_copy(dev, descr); - } else + sizeof(name)))) + device_set_descf(dev, "ACPI PCI Link %s", name); + else device_set_desc(dev, "ACPI PCI Link"); device_quiet(dev); return (rv); diff --git a/sys/dev/acpica/acpi_timer.c b/sys/dev/acpica/acpi_timer.c index 8b362f52047a..e78b4728749a 100644 --- a/sys/dev/acpica/acpi_timer.c +++ b/sys/dev/acpica/acpi_timer.c @@ -159,7 +159,6 @@ acpi_timer_identify(driver_t *driver, device_t parent) static int acpi_timer_probe(device_t dev) { - char desc[40]; int i, j, rid, rtype; ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__); @@ -219,10 +218,9 @@ acpi_timer_probe(device_t dev) } tc_init(&acpi_timer_timecounter); - sprintf(desc, "%d-bit timer at %u.%06uMHz", + device_set_descf(dev, "%d-bit timer at %u.%06uMHz", (AcpiGbl_FADT.Flags & ACPI_FADT_32BIT_TIMER) != 0 ? 32 : 24, acpi_timer_frequency / 1000000, acpi_timer_frequency % 1000000); - device_set_desc_copy(dev, desc); /* Release the resource, we'll allocate it again during attach. */ bus_release_resource(dev, rtype, rid, acpi_timer_reg); From nobody Sun Jun 2 23:47: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 4VstnR35zNz5LVdR; Sun, 02 Jun 2024 23:47:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VstnQ4Ky8z4BYg; Sun, 2 Jun 2024 23:47:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717372042; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BA6bfyqZPVcVyZcVdfQ4Sh8NnkI37QlTxsnwMskVxfw=; b=K6uJ+GLyuolmd8Z/Esca6/XHvmxTpwIjNXvreXPFpu4k2/9FGQE/sGlnav2EneDi8JFfFN vcYnJDmZXp4cNOxPe/Yyk/Q3dFxdhmGStAusEJu1xD9scSBg2WAM4yoC257c8vWG2iiSza amwNXpLCodUZKQ6ZpByczIbu0TM3vApBuxiR1GdNYvRrih7LlyieO97IjkORQg7lkzRGMe OUw4EsqyONssmiMcj0vaJNpI4U6vVrvD3eB8dmr//b/cipT0ObzVmuw/07y/bLVrHWiZ3X 8J79I5B+YgSFd3gTVrFTI66x0jKJhsx6UmsGrfenFcb1YN4GHAcnDwGJ/g+ebg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1717372042; a=rsa-sha256; cv=none; b=KUrT3WmxvJUlgl7a8U+7w8W6yAz4/ufHZodDQQpH/nsAduKnMsu4/Aqv/DKr2RFS9XU4tY cvZDIhEGASriZfcWJebzY4PAQtefZQsn3PByjozOoONXHpgyhDZmwdiXAsNaL4yLW5j5rd uI39EuDwTF8k9zogqHxC14iB65Wup0mdJ6jMd+9i9elfAlsQC0/+HfnwGOPpFRMR9DgNKI QUMVG1tFwybPWkfaKpBBrbHYD7BtyMm9sAuFx956+4AhSnNEI8SBBOqBGHcDQRos5JegxM f9LZy/TaZ7RYyYpNMnv7vr2UexyxFY1vOX+ZzJoRdAcJ3orAjzLAgb5w1Dja2w== 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=1717372042; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BA6bfyqZPVcVyZcVdfQ4Sh8NnkI37QlTxsnwMskVxfw=; b=DC09Fzwn7MS9dOilowWgPWskDSJvou9HQl1kpr0RDUSNQ/KexSK+TytL0tOQuxgaFmcACg IqdxJDdy+2C7lw5JJTLpe3s+7tjKI/aUi/WGWqrR/oFy7xgAPr6idhRacVeV7YEtkldUlx IszUJ+iv83RnWNTS+Gp4AVL7OKlm1W7PGa0Co+F59yMwtSVDSHwsroTbARs+b/wvJR/W4h hNmq/FBFYta8FF1OgyyoEQfPNPQzupa7NAR/dSIIzguDWoqNDfe6kWAT/Tp+EIZCurnBRX r+0uIR0WNyEUkyDYkkDw9fY0iKWPtr/EAib3Kc1fpaJQkhSaZJN55z6JjV0pjA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VstnQ2X13z1BfV; Sun, 2 Jun 2024 23:47:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 452NlMHu056776; Sun, 2 Jun 2024 23:47:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 452NlM2Z056772; Sun, 2 Jun 2024 23:47:22 GMT (envelope-from git) Date: Sun, 2 Jun 2024 23:47:22 GMT Message-Id: <202406022347.452NlM2Z056772@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: de140d60d528 - main - virtio: Use device_set_descf() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: de140d60d5282b0dbf79979d04d5b6b11511e25d Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=de140d60d5282b0dbf79979d04d5b6b11511e25d commit de140d60d5282b0dbf79979d04d5b6b11511e25d Author: Mark Johnston AuthorDate: 2024-02-04 23:52:23 +0000 Commit: Mark Johnston CommitDate: 2024-06-02 23:38:41 +0000 virtio: Use device_set_descf() No functional change intended. MFC after: 1 week --- sys/dev/virtio/pci/virtio_pci_legacy.c | 4 +--- sys/dev/virtio/pci/virtio_pci_modern.c | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/sys/dev/virtio/pci/virtio_pci_legacy.c b/sys/dev/virtio/pci/virtio_pci_legacy.c index 238434c350fb..18dbb00e0d8c 100644 --- a/sys/dev/virtio/pci/virtio_pci_legacy.c +++ b/sys/dev/virtio/pci/virtio_pci_legacy.c @@ -190,7 +190,6 @@ DRIVER_MODULE(virtio_pci_legacy, pci, vtpci_legacy_driver, 0, 0); static int vtpci_legacy_probe(device_t dev) { - char desc[64]; const char *name; if (pci_get_vendor(dev) != VIRTIO_PCI_VENDORID) @@ -207,8 +206,7 @@ vtpci_legacy_probe(device_t dev) if (name == NULL) name = "Unknown"; - snprintf(desc, sizeof(desc), "VirtIO PCI (legacy) %s adapter", name); - device_set_desc_copy(dev, desc); + device_set_descf(dev, "VirtIO PCI (legacy) %s adapter", name); /* Prefer transitional modern VirtIO PCI. */ return (BUS_PROBE_LOW_PRIORITY); diff --git a/sys/dev/virtio/pci/virtio_pci_modern.c b/sys/dev/virtio/pci/virtio_pci_modern.c index 8f9b1f21aeab..eb1d5a1e6989 100644 --- a/sys/dev/virtio/pci/virtio_pci_modern.c +++ b/sys/dev/virtio/pci/virtio_pci_modern.c @@ -244,7 +244,6 @@ DRIVER_MODULE(virtio_pci_modern, pci, vtpci_modern_driver, 0, 0); static int vtpci_modern_probe(device_t dev) { - char desc[64]; const char *name; uint16_t devid; @@ -269,8 +268,7 @@ vtpci_modern_probe(device_t dev) if (name == NULL) name = "Unknown"; - snprintf(desc, sizeof(desc), "VirtIO PCI (modern) %s adapter", name); - device_set_desc_copy(dev, desc); + device_set_descf(dev, "VirtIO PCI (modern) %s adapter", name); return (BUS_PROBE_DEFAULT); } From nobody Sun Jun 2 23:47: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 4VstnR5xCFz5LVgS; Sun, 02 Jun 2024 23:47:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VstnR47rQz4BN5; Sun, 2 Jun 2024 23:47:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717372043; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=11U1Ka7vpDVex2nj9QMYTuaxAwRZ8dr+kKahSCNcqN8=; b=WR6VLJStMREajnHZGym4Hd2kxHskAA4xJLgAVkTN6ZfAntkdKDnDGb6Uos/W7OJpoaSDuQ IqQcDVg7s/p6ITqQIzwlZeD75/MlJBVURjtoEqEhocn/MPzz3mtC+qiZovGnI01fziSRYh D4usywJFprNnTCV9KV3u2dY+6fhLmuouTpHglJI9pPL1QDvxxKdvwQn2eZ37syluSiMPEf y9smVG2mmYjdZSPfhiTwI2XQ/llElEQ4J7LwPSGr2JvK19Q7ReiqZ0/DpsmOdchTaVyhoh xmBRW76d63nTGvuFPL+vxzvbybIiCgwFkmc6Zc6PdAYq8G1/PWu7wK5f9v06GQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1717372043; a=rsa-sha256; cv=none; b=ctFfK+PSz3MHgDJBnEoq1I8c9YMSI4VBXYhm/Kvli9QGaMRzydQdhvrODe/l14Z5gyPZ5I ovXlx4sDmgybi9Hm1dIHuOPZRR/Wwu6X0hN8sgDrGFj+fHF91ykp8RcmJvjxaomR5Y+BSF UwBUpHcj+Pw1l0coQ/gGrOQ7wq2gKs6dJ3JXb1yxtSt+qfm320NMTpIRMMG3FRBlDw2neo Jp4eR5VG24FHw+EVdABLfPyAbcQdjQQSlw/CN09a3uuMiKr0KiRAPzoFtEe1Zz8jzDNrwa +juDkva9f7bhsY+4RJzaUkMr0x6+u7UU94TxK+feHkCtBTabm61H3z8wXSEthQ== 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=1717372043; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=11U1Ka7vpDVex2nj9QMYTuaxAwRZ8dr+kKahSCNcqN8=; b=hFYbSGXSo+7ynUD5bwf0vdZuZEOBaYWFc/epy83SP4Slpn2xbCztN+G9NFuSKzS+ybRgFq GnyjI/G9sCslBZPiTg8WsbRxlU74gfGVtGJqKx7tJcwXzTSrOVRIYLmNYOvePfMlYyaNs7 cMdXZE8VxEcGQ9Bh5eoS9oJTGSWZj46mbm/QcHemSX9NRLj/cP4E62j6b7ST13Q1YBNJVQ G8WxBBtQ4kZlagDD3+wmKevM8ATpQFFg41JJKUa7R2yzX7QvOshz0qSZxQf2lsvELzZ5up 277GtvqXOXIz8nsIbmVfamZXapDNluGoDpLo6jDhQaT5cqvTLEv1ib0iQ4qyrw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VstnR3bXFz1BlK; Sun, 2 Jun 2024 23:47:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 452NlN9T056813; Sun, 2 Jun 2024 23:47:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 452NlNpH056810; Sun, 2 Jun 2024 23:47:23 GMT (envelope-from git) Date: Sun, 2 Jun 2024 23:47:23 GMT Message-Id: <202406022347.452NlNpH056810@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: a3b460d499a9 - main - mvs: Use device_set_desc(f)() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: a3b460d499a995eaf5a79d1b84e22b0d4eda8f2a Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=a3b460d499a995eaf5a79d1b84e22b0d4eda8f2a commit a3b460d499a995eaf5a79d1b84e22b0d4eda8f2a Author: Mark Johnston AuthorDate: 2024-02-04 23:53:28 +0000 Commit: Mark Johnston CommitDate: 2024-06-02 23:38:41 +0000 mvs: Use device_set_desc(f)() No functional change intended. MFC after: 1 week --- sys/dev/mvs/mvs.c | 2 +- sys/dev/mvs/mvs_pci.c | 4 +--- sys/dev/mvs/mvs_soc.c | 4 +--- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/sys/dev/mvs/mvs.c b/sys/dev/mvs/mvs.c index a98a59259581..253fdc096475 100644 --- a/sys/dev/mvs/mvs.c +++ b/sys/dev/mvs/mvs.c @@ -105,7 +105,7 @@ static int mvs_ch_probe(device_t dev) { - device_set_desc_copy(dev, "Marvell SATA channel"); + device_set_desc(dev, "Marvell SATA channel"); return (BUS_PROBE_DEFAULT); } diff --git a/sys/dev/mvs/mvs_pci.c b/sys/dev/mvs/mvs_pci.c index be9351403a0d..1dfd43ae6b1e 100644 --- a/sys/dev/mvs/mvs_pci.c +++ b/sys/dev/mvs/mvs_pci.c @@ -77,7 +77,6 @@ static struct { static int mvs_probe(device_t dev) { - char buf[64]; int i; uint32_t devid = pci_get_devid(dev); uint8_t revid = pci_get_revid(dev); @@ -85,9 +84,8 @@ mvs_probe(device_t dev) for (i = 0; mvs_ids[i].id != 0; i++) { if (mvs_ids[i].id == devid && mvs_ids[i].rev <= revid) { - snprintf(buf, sizeof(buf), "%s SATA controller", + device_set_descf(dev, "%s SATA controller", mvs_ids[i].name); - device_set_desc_copy(dev, buf); return (BUS_PROBE_DEFAULT); } } diff --git a/sys/dev/mvs/mvs_soc.c b/sys/dev/mvs/mvs_soc.c index 696b65d54359..00a868140a0e 100644 --- a/sys/dev/mvs/mvs_soc.c +++ b/sys/dev/mvs/mvs_soc.c @@ -74,7 +74,6 @@ static struct { static int mvs_probe(device_t dev) { - char buf[64]; int i; uint32_t devid, revid; @@ -88,9 +87,8 @@ mvs_probe(device_t dev) for (i = 0; mvs_ids[i].id != 0; i++) { if (mvs_ids[i].id == devid && mvs_ids[i].rev <= revid) { - snprintf(buf, sizeof(buf), "%s SATA controller", + device_set_descf(dev, "%s SATA controller", mvs_ids[i].name); - device_set_desc_copy(dev, buf); return (BUS_PROBE_DEFAULT); } } From nobody Sun Jun 2 23:47: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 4VstnV1DsKz5LVpd; Sun, 02 Jun 2024 23:47:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VstnT5qysz4BNR; Sun, 2 Jun 2024 23:47:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717372045; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3sO0a23fM9usdM0irrs8YN8R7oBgRMElovGf2+ycnRA=; b=ONltVaXDQhV46/RbB++3d4mkZdGyk8H6qKc6yQAs0zUpaBg5mDuE74K9dh7axTQK/CbT1T wICIxJoC4ItzO++YIvoqu6YObmB2NLl20MAmBSa+fLg70JmNS9Fk7jGnkZxkhrkecARTeh mPCGsogpUmM1et0zB62DIPSKrIkBo3tClE9p9CmP1KO+dmyVtwtuwMFr1M+NJQU2lEbp6h vKOqUqTJDsJt95dI/UyvYIml6NDDAM1np1oh/cy+vihlVC6VB9evbzIkaAASEP+bmYAc63 wb/Z0hFGyhCiRO/DuDXP3za1tOxXxiUOpLaaOYjBRc9bzgQJfgYP8HKTg7ZX5A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1717372045; a=rsa-sha256; cv=none; b=XfguSyVFX91E6BeyeJj76FxB9TtJ03YDREM0l9CsnrOEqeIew8vTK5TIe3iIQ2ts8mjjE1 /0Luo+xVzw5tBkG26D39biZFJlarwjAZSK0FqCpyVPR7R6z5G9z8gEIvEzGcdu5hU+ZxSD d7gFrpzQCwwGHHM0GdjRolmw8WQIk+d2bZwUGVJpSG5e3N57ucDgOXkT2xMT+8Vbg9MI1q f7sPXeFwfl5ZVvaGCZ5lPxRHK5FS2mc3bFGnbJqtOpoKZUa+DuH8cjQmooWEw8ViCJ7su3 e220eB5EbhZfl/PAX1V60M+KPVSsEcbQReh/UwIpUad4JHUntHOfSXYAm5cvoA== 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=1717372045; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3sO0a23fM9usdM0irrs8YN8R7oBgRMElovGf2+ycnRA=; b=ogVEVp6KXHANaqI4A5TsoqH+s1m++9hawDcQj6uNXpCrIa13rdEv5hry5zkJo8Xb8tLNzT p9TbZubJufrkLSmfG+4gmvEEtlUqYfkksDguXr9Y776RCXCeMr8dInU5ahPMjtxB2ErCtJ ff6rI/rvQ7DDIGnz75a5NRwVRio2iPUmv+RXeXxOYZYw4jKSQsLhO93e0qSuTsWB2OLCs+ SlozD3wrq6/Z3VK4WddOxZzZT02WY90fG6To8FpqcnVPFtBRx0t/roDwgx0pf02fqEIeIw HF6T9sBRPy5pUbwQEcXmzEv3JtXtRtO7PgkGWxdkLPkn9DA8NV+M/Rz9fhI+QQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VstnT5PDVz1B4x; Sun, 2 Jun 2024 23:47:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 452NlP2T056887; Sun, 2 Jun 2024 23:47:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 452NlPgO056884; Sun, 2 Jun 2024 23:47:25 GMT (envelope-from git) Date: Sun, 2 Jun 2024 23:47:25 GMT Message-Id: <202406022347.452NlPgO056884@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: 542f9494b747 - main - proto: Use device_set_descf() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: 542f9494b747079b13f3ed672cd01fa902e98ff2 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=542f9494b747079b13f3ed672cd01fa902e98ff2 commit 542f9494b747079b13f3ed672cd01fa902e98ff2 Author: Mark Johnston AuthorDate: 2024-02-04 23:58:30 +0000 Commit: Mark Johnston CommitDate: 2024-06-02 23:38:41 +0000 proto: Use device_set_descf() No functional change intended. MFC after: 1 week --- sys/dev/proto/proto_bus_isa.c | 8 +------- sys/dev/proto/proto_bus_pci.c | 12 +++--------- 2 files changed, 4 insertions(+), 16 deletions(-) diff --git a/sys/dev/proto/proto_bus_isa.c b/sys/dev/proto/proto_bus_isa.c index 0e4f2a29b429..39ad126bf7b7 100644 --- a/sys/dev/proto/proto_bus_isa.c +++ b/sys/dev/proto/proto_bus_isa.c @@ -32,7 +32,6 @@ #include #include #include -#include #include #include @@ -62,7 +61,6 @@ static char **proto_isa_devnames; static int proto_isa_probe(device_t dev) { - struct sbuf *sb; struct resource *res; int rid, type; @@ -76,11 +74,7 @@ proto_isa_probe(device_t dev) if (res == NULL) return (ENODEV); - sb = sbuf_new_auto(); - sbuf_printf(sb, "%s:%#jx", proto_isa_prefix, rman_get_start(res)); - sbuf_finish(sb); - device_set_desc_copy(dev, sbuf_data(sb)); - sbuf_delete(sb); + device_set_descf(dev, "%s:%#jx", proto_isa_prefix, rman_get_start(res)); bus_release_resource(dev, type, rid, res); return (proto_probe(dev, proto_isa_prefix, &proto_isa_devnames)); } diff --git a/sys/dev/proto/proto_bus_pci.c b/sys/dev/proto/proto_bus_pci.c index 9a98443845f5..ebcfd6d4711c 100644 --- a/sys/dev/proto/proto_bus_pci.c +++ b/sys/dev/proto/proto_bus_pci.c @@ -32,7 +32,6 @@ #include #include #include -#include #include #include @@ -62,17 +61,12 @@ static char **proto_pci_devnames; static int proto_pci_probe(device_t dev) { - struct sbuf *sb; - if ((pci_read_config(dev, PCIR_HDRTYPE, 1) & PCIM_HDRTYPE) != 0) return (ENXIO); - sb = sbuf_new_auto(); - sbuf_printf(sb, "%s%d:%d:%d:%d", proto_pci_prefix, pci_get_domain(dev), - pci_get_bus(dev), pci_get_slot(dev), pci_get_function(dev)); - sbuf_finish(sb); - device_set_desc_copy(dev, sbuf_data(sb)); - sbuf_delete(sb); + device_set_descf(dev, "%s%d:%d:%d:%d", proto_pci_prefix, + pci_get_domain(dev), pci_get_bus(dev), pci_get_slot(dev), + pci_get_function(dev)); return (proto_probe(dev, proto_pci_prefix, &proto_pci_devnames)); } From nobody Sun Jun 2 23:47: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 4VstnT4652z5LVgV; Sun, 02 Jun 2024 23:47:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VstnS50vKz4B7d; Sun, 2 Jun 2024 23:47:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717372044; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=G4ciPALW4kkVPdLhZvg64aYwpX7EiVDhRWuW4yutOIo=; b=K3605/mUtiNbDOY9Kxr7pIJljIIEAymX2RLE9sIvHEJddctqozg6O0OxwMesbOhLICoOiR zffxSRLpXMUBmBvLn5eM7aewqOR/Til1kvab939K2HU7PniyEvIy0S2gJ6NJ+J9PfK5Pop p+AcGlZZFY74N5uIiaRKlvIIvoGBuDLAsmEQUF3O7A+kKEQoeaim1V+B5y042JSTQtQDt9 +D6ovWPdKg9I+IjEzZlcCl714LBUnloFizAMArz8tApkKt/+TeuOfVpGk5lB3SRx/JAOMv tQWXVnfIyzKN+fxQ3juX/jkPIXEf2iH6VU6G9yLBy8u4K3mvDWZ5ye+Ceek0jQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1717372044; a=rsa-sha256; cv=none; b=iaEUu0FL3/48vu90UOJwmjUm0HJTZYRb8nHjbBxPUueFSJ/PVhtocyIzDvfqoSkY+jT12l ip3UDs/ha4AP2lzxGt0jgbuenMJEQg67YfApG554EM3YWq0trRx8/ZzDqWoIZcIZ1I16mE Iuu0kgWNbdZ/5uXBor1S6KgDLj3qjoBIs3mKlUkxA2Ng6SoHmah3igHqY7r//UodtiPu0q p/souztkAtYKDBua04cS4DOgYvw5pZyaoKa9vFxaFrz+9gQmppRvnlUSPiCgFzMhIQQil6 7SUg1HZAahpYfmcFIUmq6v9ipUdFiBuIfDI0iumJB1Di1H1Q1iGAa9sn9ah1xg== 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=1717372044; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=G4ciPALW4kkVPdLhZvg64aYwpX7EiVDhRWuW4yutOIo=; b=r+TiDXhT8CUTkJVVTUJ59TvaAscBgUoWHphI7KqqmceJVPJ0rhEITIabKyMmNvtOz234km k5gRw3GD0jGDHy/ul/aOr01xn+aZsPQQLOTL/2G41hQXcLtxlkR8fMHerLkD8z6w7cYwug 3FIKOTZ1ECrEy7ZNBC/PzT+o7r40+G+On3BD5W/5rD4mPz4jo8uZTcxAh8F0AbVuHaP+RP eufWZUDDk1v5dostDj7ITctMfqan2XO/NWab2qAa6SxvodeQQteHA93uTwm6bPTaNqcAFx GSEX+OCYREyOVkGP/GP2eXnxSpf4HbuaEs9s+srNOOqTzwpkpQo1EdeLaE+tWg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VstnS4Klcz1B34; Sun, 2 Jun 2024 23:47:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 452NlO8a056851; Sun, 2 Jun 2024 23:47:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 452NlOjR056848; Sun, 2 Jun 2024 23:47:24 GMT (envelope-from git) Date: Sun, 2 Jun 2024 23:47:24 GMT Message-Id: <202406022347.452NlOjR056848@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: 66d2d42a1f26 - main - uart: Use device_set_descf() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: 66d2d42a1f26a6ef868d7d46f87d6fad0bc099aa Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=66d2d42a1f26a6ef868d7d46f87d6fad0bc099aa commit 66d2d42a1f26a6ef868d7d46f87d6fad0bc099aa Author: Mark Johnston AuthorDate: 2024-02-04 23:55:00 +0000 Commit: Mark Johnston CommitDate: 2024-06-02 23:38:41 +0000 uart: Use device_set_descf() No functional change intended. MFC after: 1 week --- sys/dev/uart/uart_dev_quicc.c | 4 +--- sys/dev/uart/uart_dev_z8530.c | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/sys/dev/uart/uart_dev_quicc.c b/sys/dev/uart/uart_dev_quicc.c index bd735f2da6f4..d6a8846b874e 100644 --- a/sys/dev/uart/uart_dev_quicc.c +++ b/sys/dev/uart/uart_dev_quicc.c @@ -412,7 +412,6 @@ quicc_bus_param(struct uart_softc *sc, int baudrate, int databits, static int quicc_bus_probe(struct uart_softc *sc) { - char buf[80]; int error; error = quicc_probe(&sc->sc_bas); @@ -422,8 +421,7 @@ quicc_bus_probe(struct uart_softc *sc) sc->sc_rxfifosz = 1; sc->sc_txfifosz = 1; - snprintf(buf, sizeof(buf), "quicc, channel %d", sc->sc_bas.chan); - device_set_desc_copy(sc->sc_dev, buf); + device_set_descf(sc->sc_dev, "quicc, channel %d", sc->sc_bas.chan); return (0); } diff --git a/sys/dev/uart/uart_dev_z8530.c b/sys/dev/uart/uart_dev_z8530.c index 2ca480a5690d..45bf63f20bb2 100644 --- a/sys/dev/uart/uart_dev_z8530.c +++ b/sys/dev/uart/uart_dev_z8530.c @@ -509,7 +509,6 @@ z8530_bus_param(struct uart_softc *sc, int baudrate, int databits, static int z8530_bus_probe(struct uart_softc *sc) { - char buf[80]; int error; char ch; @@ -522,8 +521,7 @@ z8530_bus_probe(struct uart_softc *sc) ch = sc->sc_bas.chan - 1 + 'A'; - snprintf(buf, sizeof(buf), "z8530, channel %c", ch); - device_set_desc_copy(sc->sc_dev, buf); + device_set_descf(sc->sc_dev, "z8530, channel %c", ch); return (0); }