From nobody Sun Oct 22 01:34:56 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SCgqP0q5xz4xr9C; Sun, 22 Oct 2023 01: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 4SCgqP0GFdz4GKT; Sun, 22 Oct 2023 01: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=1697938497; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nXx7t+mkrS+CXVfi7KoSeYKC2rqQhJYPxW5mwdTe5js=; b=vSedZJ6HCum0WbZ258XGnjIrT/Sb4/z6AEyLHgPqClb6xWeToGFrcf2e9Jk/w+EVhkUMZU RQSFsUcJ8YOXgzh2qyYac0d+nr6xoKR6hRsx5+dqWtu13++DeAuxW14DTi2H+EoSBElcDK nyTw3RM7AuB2ovwlUGNFpZqJZYBjqCCDdR0d9gQi7q52MjAAUWyN7osqVmsQHSoGA9rI7e PKAonkeDJhu3qEVB8ou9w5ypjXzNnvF9WQiJKB3Z07k6XQG3AGQsCWlA2/+qIoTJzFJ+n8 3BX2eFvkn6OxVXQnZyuTdOMIjHOVpWbkRp0HwqWTwOhFlfbIvjCKr6Dbmz0f5w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697938497; a=rsa-sha256; cv=none; b=QHGo6hg0HWXOZoIld/5ZQd6lOyHorx1sIEfqf9uED4U8n8ajfO3+2uP3DoRdBRn49dmcdV B/aCgwrQ9Raa8mO1rbZxmRisNwrMSTpJcoeZUaTVtbIdnoZHtHjcuOZb5uu6pBFlQSxZSB HUVLvqglpHTfxgk65AGUmZEysttT1odMS47SGe7aCCND1IHzAMHJ4kHJ5RVtF8CZLLX8t1 IHLUApLTZlBRFnR9wZmJnLx4+bU/7cUQF6tqX3+Hrrrfq9YjxhoH9iUPJLJZyvG40kYQgq 9LA+q6kKS6a1ogukWkzdjTEZHYroeCjFSbMNjb7xs7wt6+wFWKnGc/wuo7DSsg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697938497; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nXx7t+mkrS+CXVfi7KoSeYKC2rqQhJYPxW5mwdTe5js=; b=v9FFtGO8PXXlNOVyZl8yyAG//p5BV8sUjr+zGr83AGUxUIRmisl2r44qYk6Y/xLFpD6KEV Otzk3hvwIBg9akpF0/tY5Pm896ksa09s32ExVYHo4uz61rWQSX/TAIRXIVkSVJ1TYy5pap LzvyBBLOsWINlCMb757wQd69vjV3LaIUNfrLO5+RBdsjFH4ziTQjodkOfuNPqO358h3xVv QRPi1tSt6Yg5M9yHAiv+27kIeZScowS8fd7ZZlRzONsICp/ZFGRz72DRxJUTAMiLljlVhC 9by1HIgdD+RM2++UqMES+vYvWVKOw6XJGU1QbJPz8plZ2mbnecUuYC9pTzZjgQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SCgqN6Qjhzdpv; Sun, 22 Oct 2023 01:34: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 39M1YuBt083870; Sun, 22 Oct 2023 01:34:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39M1YuIl083867; Sun, 22 Oct 2023 01:34:56 GMT (envelope-from git) Date: Sun, 22 Oct 2023 01:34:56 GMT Message-Id: <202310220134.39M1YuIl083867@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: 14bbf4fe5abb - main - nfscl: Handle a Getattr failure with NFSERR_DELAY following Open List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 14bbf4fe5abb20f1126168e66b03127ae920f78e Auto-Submitted: auto-generated The branch main has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=14bbf4fe5abb20f1126168e66b03127ae920f78e commit 14bbf4fe5abb20f1126168e66b03127ae920f78e Author: Rick Macklem AuthorDate: 2023-10-22 01:33:33 +0000 Commit: Rick Macklem CommitDate: 2023-10-22 01:33:33 +0000 nfscl: Handle a Getattr failure with NFSERR_DELAY following Open During testing at a recent IETF NFSv4 Bakeathon, a non-FreeBSD server was rebooted. After the reboot, the FreeBSD client sent an Open/Claim_previous with a Getattr after the Open in the same compound. The Open/Claim_previous was done to recover the Open and a Delegation for for a file. The Open succeeded, but the Getattr after the Open failed with NFSERR_DELAY. This resulted in the FreeBSD client retrying the entire RPC over and over again, until the server's recovery grace period ended. Since the Open succeeded, there was no need to retry the entire RPC. This patch modifies the NFSv4 client side recovery Open/Claim_previous RPC reply handling to deal with this case. With this patch, the Getattr reply of NFSERR_DELAY is ignored and the successful Open reply is processed. This bug will not normally affect users, since this non-FreeBSD server is not widely used (it may not even have shipped to any customers). MFC after: 1 month --- sys/fs/nfsclient/nfs_clrpcops.c | 32 +++++++++++++++++++++++--------- 1 file changed, 23 insertions(+), 9 deletions(-) diff --git a/sys/fs/nfsclient/nfs_clrpcops.c b/sys/fs/nfsclient/nfs_clrpcops.c index 2276e09f6e7e..87362f2e744f 100644 --- a/sys/fs/nfsclient/nfs_clrpcops.c +++ b/sys/fs/nfsclient/nfs_clrpcops.c @@ -609,7 +609,8 @@ nfsrpc_openrpc(struct nfsmount *nmp, vnode_t vp, u_int8_t *nfhp, int fhlen, if (error) return (error); NFSCL_INCRSEQID(op->nfso_own->nfsow_seqid, nd); - if (!nd->nd_repstat) { + if (nd->nd_repstat == 0 || (nd->nd_repstat == NFSERR_DELAY && + reclaim != 0 && (nd->nd_flag & ND_NOMOREDATA) == 0)) { NFSM_DISSECT(tl, u_int32_t *, NFSX_STATEID + 6 * NFSX_UNSIGNED); op->nfso_stateid.seqid = *tl++; @@ -681,16 +682,29 @@ nfsrpc_openrpc(struct nfsmount *nmp, vnode_t vp, u_int8_t *nfhp, int fhlen, goto nfsmout; } NFSM_DISSECT(tl, u_int32_t *, 2 * NFSX_UNSIGNED); - error = nfsv4_loadattr(nd, NULL, &nfsva, NULL, - NULL, 0, NULL, NULL, NULL, NULL, NULL, 0, - NULL, NULL, NULL, p, cred); - if (error) - goto nfsmout; + /* If the 2nd element == NFS_OK, the Getattr succeeded. */ + if (*++tl == 0) { + KASSERT(nd->nd_repstat == 0, + ("nfsrpc_openrpc: Getattr repstat")); + error = nfsv4_loadattr(nd, NULL, &nfsva, NULL, + NULL, 0, NULL, NULL, NULL, NULL, NULL, 0, + NULL, NULL, NULL, p, cred); + if (error) + goto nfsmout; + } if (ndp != NULL) { - ndp->nfsdl_change = nfsva.na_filerev; - ndp->nfsdl_modtime = nfsva.na_mtime; - ndp->nfsdl_flags |= NFSCLDL_MODTIMESET; + if (reclaim != 0 && dp != NULL) { + ndp->nfsdl_change = dp->nfsdl_change; + ndp->nfsdl_modtime = dp->nfsdl_modtime; + ndp->nfsdl_flags |= NFSCLDL_MODTIMESET; + } else if (nd->nd_repstat == 0) { + ndp->nfsdl_change = nfsva.na_filerev; + ndp->nfsdl_modtime = nfsva.na_mtime; + ndp->nfsdl_flags |= NFSCLDL_MODTIMESET; + } else + ndp->nfsdl_flags |= NFSCLDL_RECALL; } + nd->nd_repstat = 0; if (!reclaim && (rflags & NFSV4OPEN_RESULTCONFIRM)) { do { ret = nfsrpc_openconfirm(vp, newfhp, newfhlen, op, From nobody Sun Oct 22 06:56:05 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SCpxx3w7Fz4y9gj; Sun, 22 Oct 2023 06:56: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 4SCpxx3GCQz4cK4; Sun, 22 Oct 2023 06:56:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697957765; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4w9HyzfoqW39d/DEIqdmnQ8uQay0UGOj4p/DjY3ya4o=; b=XqkOoEeHyfzjAqPs/6V/8HyH9Cpfd2MpfB0DmZiT5T1vhod3CljVyYxhfZwMQL/QDHf8N4 OBzWYBlVw2Y0Cj4CWF9AO0nebMiIZ5uIlydE6pVHhr1ENFXhsXdPl5n8jR5PgE5aFP1Uay lAV+JiHLBdDGY1eQ/6cQqEuAc/5jfm8KtIYMbpD2Nb0KR/Xq9fKK6JyhgCaK5OSEab7w97 r6ILWbfQ9EQixNaq2ZFeJv5Nm3uhu4qiXGF2gHLUw9zOeo4AQ7h66C9SOcXIDgt/Qe8zpK 2uZstlqkUryVQlV4XJTTuFBjBpCJQablPzkX7BmJ8M3RRS/TacQN1CqPklOJrA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697957765; a=rsa-sha256; cv=none; b=EgW+qcDe8Dydud8yqIFBPQYcK5h0J9me2Z1pG4p9ZZ7x9ClBiFItBkvLN1GeDfdKU8LIIw oAM8CysFmgSnZvliG+c2LaFBB5cfWh06GrnyFkfLmu75n+dXffBdOn+xo8cMjY8OdNj4Zw 03/bSTlWNXIwqa0OKFvLnE+62L2jNFEgyjaKEdttWg6g5hUHJO3KPIoSVvN5euiucD+eX8 mVpTT+rb7lVfjpNdue3idRqqq2KJEMJRsycN7ZWKtW2/euh/ufPA4eq80lywLA5tIWPIQi wdNC+uUW1usCO6/316w+nc57ycrclb2+hONkZFnQZnyzviDfwgqRKk1daU39Jg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697957765; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4w9HyzfoqW39d/DEIqdmnQ8uQay0UGOj4p/DjY3ya4o=; b=OR6QySKMbudHO0Q4oc/RfzBmtZvbnVOy1PauFQ59UjBql3PH1zze82dfhvg6m65IyN3L07 +B9O/L3PvwGOag9WSSyakjmKj4vxR8oLJ+pQJHffUw96xhuyc+ER6lLDyxdB8A4qYcf+o2 slq/+WnmdixEtnvlsdY0jX+7aQXqoNu4Fe9rIWGdx/RALCDNzI3elT2BiCwbzTp1ny4y9l /QSqhzXCSUEBC7MWrSFO3mEO9IktRg3iAHMDQjgIs43xRjz/LCwJyXY3FxQS5QGrAH6OQH 9qDCYYdRyBUaCxz2TElzU52pd+HWi9ICjLyVfhDn6AgW+oT5FA68zynDxhXA3Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SCpxx2JQDzp0g; Sun, 22 Oct 2023 06:56: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 39M6u5F9016218; Sun, 22 Oct 2023 06:56:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39M6u5XZ016215; Sun, 22 Oct 2023 06:56:05 GMT (envelope-from git) Date: Sun, 22 Oct 2023 06:56:05 GMT Message-Id: <202310220656.39M6u5XZ016215@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dmitry Chagin Subject: git: b84a836ef02d - stable/14 - vfs cache: Fallback to namei to resolve symlinks with leading / in target for non-native ABI List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: b84a836ef02de42e262ce44d46c859be288df4b0 Auto-Submitted: auto-generated The branch stable/14 has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=b84a836ef02de42e262ce44d46c859be288df4b0 commit b84a836ef02de42e262ce44d46c859be288df4b0 Author: Dmitry Chagin AuthorDate: 2023-10-19 10:33:58 +0000 Commit: Dmitry Chagin CommitDate: 2023-10-22 06:55:53 +0000 vfs cache: Fallback to namei to resolve symlinks with leading / in target for non-native ABI This is a temporary solution to fix PR before release. During 15.0 it's necessary to refactor symlinks handling between vfs & namecache. PR: 273414 Reported by: Vincent Milum Jr, Dan Kotowski, glebius Tested by: Dan Kotowski, glebius Reviewed by: Differential Revision: https://reviews.freebsd.org/D41806 MFC after: 3 days (cherry picked from commit bb8ecf259f96510b9c2146d846403393543061b7) --- sys/kern/vfs_cache.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/sys/kern/vfs_cache.c b/sys/kern/vfs_cache.c index 115d0bdd3993..8917666950c1 100644 --- a/sys/kern/vfs_cache.c +++ b/sys/kern/vfs_cache.c @@ -5337,12 +5337,14 @@ cache_fplookup_symlink(struct cache_fpl *fpl) struct nameidata *ndp; struct componentname *cnp; struct vnode *dvp, *tvp; + struct pwd *pwd; int error; ndp = fpl->ndp; cnp = fpl->cnp; dvp = fpl->dvp; tvp = fpl->tvp; + pwd = *(fpl->pwd); if (cache_fpl_islastcn(ndp)) { if ((cnp->cn_flags & FOLLOW) == 0) { @@ -5398,6 +5400,9 @@ cache_fplookup_symlink(struct cache_fpl *fpl) cache_fpl_checkpoint(fpl); return (cache_fpl_partial(fpl)); } + if (__predict_false(pwd->pwd_adir != pwd->pwd_rdir)) { + return (cache_fpl_aborted(fpl)); + } } return (0); } From nobody Sun Oct 22 07:26:00 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SCqcT1bTSz4yBwG for ; Sun, 22 Oct 2023 07:26: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 4SCqcT1639z4dyH; Sun, 22 Oct 2023 07:26:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697959561; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jS3m+W8SzHtrKDMiLP0+YbtfXFfqC+IOLA2BaRHpszc=; b=xzYZHLWHiw02NFttw+rKI3SmEnYPm566oF2/I7BmAD7O23t/yVaQbj2HWjfqbdXDieg7rC 2OtX8b5subAQPc43l6u0kedJy1/ybyPeqqkYDI+fU4Y+7QhBH2HoybgmLkbSn5hAQoarAE FZLUfxDOKVoJ3KuQG7fk7blM9KGUsnWBENnH1DNp6e5TK/fTp9hI8EnmxrhIQPfl6jJIw6 /1xdzagYY2ROYORL1A50MjzFwHeqOGw1qSceNocz/uxaoQmUpdCcUOS5/HxG+hb5ljzycz H9k/DG4HVvHFWaFK1SpUFeejhfP2vEpQPZFUOIfdSe4rWpsiy+P3mCOCHDraaw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697959561; a=rsa-sha256; cv=none; b=lG9F+RZCOXPBI8mX4AQdKFhVVJPDoTvCWL+ERlFXjLeYqejOvnDRKbw8CluImK9zHc2DT/ FuVHPyqToJHqviCiG74j7Sr4DO41dVDJPN6VVc00Syg5IyRGgGQLAFvXcxAoaOVNPqQTRY +FqXzTVDprG5x0v+v8Yl/o5q7pnuWYlhenp7hNFJd6f7Q4+nkJf90Mpg7uXMnyWAohLnzo NN343WijzgfhjcE1OdF+Jx9ENWOekP7MMcTej0eyAlA4G13JnUqacXM+ZsMxmUtz7HSFRB XBtkfCwCQPlIaMouB9ahj0aM5m5lDE4CmATYT62oqk36iwbi7hBddjQSVOHe7w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697959561; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jS3m+W8SzHtrKDMiLP0+YbtfXFfqC+IOLA2BaRHpszc=; b=lXDltLh5MVZNAQ7t7CC3FZAeKoX9RuC4G4NpisknPhh03Pz6oYfgMdBSGOxNfyh7u4QdOn OPKoi1aW3VDs9U9u4YS/cRvVjhtIg9rHfGIu7s68O0gi5A2Y+miFoNG4ko8uXHlifKAjZB z7O9nJ+rDO5eFDkKrpHIWGPU+ecwzh+sP1rxTZnRqlYMj7By3WKAGM6XQ8hdRX2x835hxw ivMSaQ8X6/JcvSKBuEW5BP83yaIumIuy+bDbxrxNu9J0tKCgY6X/QuyFZCrCOng8avCxkq nq8O1eBCe1HItK5f3y0XLAvtNOHeOpD4XSd7DbVzJLb49cPz2iZg/ZrwDzQQ4w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SCqcT09zMzpbb; Sun, 22 Oct 2023 07:26: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 39M7Q072066682; Sun, 22 Oct 2023 07:26:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39M7Q0pM066681; Sun, 22 Oct 2023 07:26:00 GMT (envelope-from git) Date: Sun, 22 Oct 2023 07:26:00 GMT Message-Id: <202310220726.39M7Q0pM066681@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: Martin Matuska Subject: git: 8a7407012834..797f55ef12d7 - vendor/openzfs/master - vendor branch updated List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mm X-Git-Repository: src X-Git-Refname: refs/heads/vendor/openzfs/master X-Git-Reftype: branch X-Git-Commit: 797f55ef12d752d2a7fb04fae5d24e019adf2a1d X-Git-Oldrev: 8a740701283495e59944839bb2607f80907d950e X-Git-Newrev: 797f55ef12d752d2a7fb04fae5d24e019adf2a1d Auto-Submitted: auto-generated The branch vendor/openzfs/master has been updated by mm: URL: https://cgit.FreeBSD.org/src/log/?id=8a7407012834..797f55ef12d7 380c25f6402d FreeBSD: Improve taskq wrapper c0e58995e334 Large sync writes perform worse with slog f0f330e1212e Fix ZED auto-replace for VDEVs using by-id paths ea30b5a9e0d2 Set spa_ccw_fail_time=0 when expanding a vdev. b9384b94988c FreeBSD: taskq: Remove unused declaration 0d6cec418e10 Fix typo in tests/zfs-tests/tests/functional/cli_user/misc/misc.cfg b29e98fa8dfc Properly pad struct tx_cpu to cache line de7b1ae30ab8 run-zts test procfs/pool_state failed with uncorrectable I/O failure 4fbc52495552 Remove lock from dsl_pool_need_dirty_delay() 57b409856265 Trust ARC_BUF_SHARED() more 797f55ef12d7 Do not persist user/group/project quota zap objects when unneeded From nobody Sun Oct 22 11:57:34 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SCxdq0R8Dz4xC3D; Sun, 22 Oct 2023 11:57: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 4SCxdp6t1Wz3W0F; Sun, 22 Oct 2023 11:57:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697975855; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8uie+XyN6+B7Hu+qYlXV3K54/Iq5enmU6I/S/O/OYIs=; b=Z1D6wCllzSsyeK8L94jYkZ2RVMU/Q4C+KxR9JDqCLqxk0L77BcS4g+4Ys/25rpoXi+Pey5 uAuIryVziwuHuZCzaEMVDLhDc3bE5eIBCeyXY2c7WZaxz5CAsF2AIJVJbbbqQZDh2kMUQ6 JoacNTf/uKWzNImN4DZf8zhxR80Avpc1RXFXrlUw0tVog4JSO4lFuEafEeV9/3D3RK7MlV umn2WtdzLWaPxwYmD+DDXrJf9kOn4yaOH5g1AMrRwROhmARNdN/dRd6d4Y/oXm71PLg6Ip iJDthAlWrQkhPhH7Bh4gX6942UYpwxybXKqRejl6EZjaujKjG7InpW34eIA2lw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697975855; a=rsa-sha256; cv=none; b=Ncr4oZyD9BWz+F4Aj7DtEmWV+Wf3/3y+SVfVKKhO1q/yPYmG4b0gKg1Ry8rejLmHmj3MZL F9eBUOuAUb/ZRDgRM9Glf+iSqHVYZrhXa73QN8K4rP6RdBC0YvHdkNaA/yTvH1fa8sTAbV 8ZxRNhM0bis+b0g2b4oQyftVy0Fr3llw91DnhJenFNwsnOXTijPUGgC1uF6ql6f8F6PJZl SDWWlo8ifGz3C0ndtBvcHQFG1cZA8wtl2fOqcS/jZ+y7mi+yFul+rbB0h7+RJ5aGpO4rqp LksTEfFhkBBlEe2/whrK4vyJumgl/goWXi+xsWy2vRRd910GtTajI2DO7U2nXg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697975855; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8uie+XyN6+B7Hu+qYlXV3K54/Iq5enmU6I/S/O/OYIs=; b=RndUlYecj2aRcu5zHDswTJcAmgBQmzwDJDOG0U1V3DtrupJzz2PiWq2+dIoloNTs6vKmTK BiIEak1A7oFJfFUYTGs9PjVpoKU3DIehhlDYBS9lGvpa9t0AE89Ahj+7n8K2jv0/ZxeXVE IcoEqb3kehqzNd96F+PZbZtI/COS5h6/l39aXiuefkX4lZEhSw+yg/R7lMO17f9lOsD7HK pGz2MT7xCgyHMeOt6I5I68FPSGQh+a3DOAtZuNqGHqBS4Axz+z/0yIwtKsqFHC5u4Q6NW1 JRN7GYX7IvlxSMq1LFuA9dzHsEDHu2LdG8kpxF0TJLHXc1Ez6CaIzEhuFltXcA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SCxdp5wl1zx0T; Sun, 22 Oct 2023 11:57: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 39MBvYmh015185; Sun, 22 Oct 2023 11:57:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39MBvYw6015182; Sun, 22 Oct 2023 11:57:34 GMT (envelope-from git) Date: Sun, 22 Oct 2023 11:57:34 GMT Message-Id: <202310221157.39MBvYw6015182@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: ad8c7f909e33 - releng/14.0 - (s)tty: add support for IUTF8 input flag List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.0 X-Git-Reftype: branch X-Git-Commit: ad8c7f909e3315a31f654ab7dca75840a4561cb0 Auto-Submitted: auto-generated The branch releng/14.0 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=ad8c7f909e3315a31f654ab7dca75840a4561cb0 commit ad8c7f909e3315a31f654ab7dca75840a4561cb0 Author: Bojan Novković AuthorDate: 2023-10-07 17:59:57 +0000 Commit: Christos Margiolis CommitDate: 2023-10-22 11:56:32 +0000 (s)tty: add support for IUTF8 input flag This patch adds the necessary kernel and stty code to support setting the IUTF8 flag for ttys. It is the first of two patches that fix backspace behaviour for UTF-8 encoded characters when in canonical mode. Reported by: christos Reviewed by: christos, imp MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D42066 (cherry picked from commit 128f63cedc14ae21b35f74e11e2fe1a5659c58e8) Approved by: re (gjb) --- bin/stty/modes.c | 2 ++ bin/stty/print.c | 1 + bin/stty/stty.1 | 3 +++ share/man/man4/termios.4 | 2 ++ sys/kern/tty.c | 4 ++-- sys/sys/_termios.h | 1 + 6 files changed, 11 insertions(+), 2 deletions(-) diff --git a/bin/stty/modes.c b/bin/stty/modes.c index ce39083d7d63..3818677ddc4e 100644 --- a/bin/stty/modes.c +++ b/bin/stty/modes.c @@ -126,6 +126,8 @@ static const struct modes imodes[] = { { "-decctlq", IXANY, 0 }, { "imaxbel", IMAXBEL, 0 }, { "-imaxbel", 0, IMAXBEL }, + { "iutf8", IUTF8, 0 }, + { "-iutf8", 0, IUTF8 }, { NULL, 0, 0 }, }; diff --git a/bin/stty/print.c b/bin/stty/print.c index 07a3c2058474..33472bbccea1 100644 --- a/bin/stty/print.c +++ b/bin/stty/print.c @@ -127,6 +127,7 @@ print(struct termios *tp, struct winsize *wp, int ldisc, enum FMT fmt) put("-inpck", INPCK, 0); put("-ignpar", IGNPAR, 0); put("-parmrk", PARMRK, 0); + put("-iutf8", IUTF8, 1); /* output flags */ tmp = tp->c_oflag; diff --git a/bin/stty/stty.1 b/bin/stty/stty.1 index 9e9405928c67..c572a657a997 100644 --- a/bin/stty/stty.1 +++ b/bin/stty/stty.1 @@ -224,6 +224,9 @@ if .Cm imaxbel is unset and the input queue is full, the next input character causes the entire input and output queues to be discarded. +.It Cm iutf8 Pq Fl iutf8 +Assume that input characters are UTF-8 encoded. Setting this flag +causes backspace to properly delete multibyte characters in canonical mode. .El .Ss Output Modes: This corresponds to the c_oflag of the termios structure. diff --git a/share/man/man4/termios.4 b/share/man/man4/termios.4 index d3a5c8fa582d..80015025345e 100644 --- a/share/man/man4/termios.4 +++ b/share/man/man4/termios.4 @@ -884,6 +884,8 @@ following masks: /* any char will restart after stop */ .It Dv IMAXBEL /* ring bell on input queue full */ +.It Dv IUTF8 +/* assume input is UTF-8 encoded */ .El .Pp In the context of asynchronous serial data transmission, a break diff --git a/sys/kern/tty.c b/sys/kern/tty.c index 134c1dfba98b..620233947410 100644 --- a/sys/kern/tty.c +++ b/sys/kern/tty.c @@ -85,8 +85,8 @@ static const char *dev_console_filename; /* * Flags that are supported and stored by this implementation. */ -#define TTYSUP_IFLAG (IGNBRK|BRKINT|IGNPAR|PARMRK|INPCK|ISTRIP|\ - INLCR|IGNCR|ICRNL|IXON|IXOFF|IXANY|IMAXBEL) +#define TTYSUP_IFLAG (IGNBRK|BRKINT|IGNPAR|PARMRK|INPCK|ISTRIP|INLCR|\ + IGNCR|ICRNL|IXON|IXOFF|IXANY|IMAXBEL|IUTF8) #define TTYSUP_OFLAG (OPOST|ONLCR|TAB3|ONOEOT|OCRNL|ONOCR|ONLRET) #define TTYSUP_LFLAG (ECHOKE|ECHOE|ECHOK|ECHO|ECHONL|ECHOPRT|\ ECHOCTL|ISIG|ICANON|ALTWERASE|IEXTEN|TOSTOP|\ diff --git a/sys/sys/_termios.h b/sys/sys/_termios.h index 327ffcb2f98b..823752732ee2 100644 --- a/sys/sys/_termios.h +++ b/sys/sys/_termios.h @@ -97,6 +97,7 @@ #endif #if __BSD_VISIBLE #define IMAXBEL 0x00002000 /* ring bell on input queue full */ +#define IUTF8 0x00004000 /* assume input is utf-8 encoded */ #endif /* From nobody Sun Oct 22 11:57:35 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SCxdr1qDZz4xC71; Sun, 22 Oct 2023 11:57: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 4SCxdr107Qz3WKG; Sun, 22 Oct 2023 11:57:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697975856; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hYazf5EwR2Ja57OAOh5esuI40liwBCpYd38j5Tii9rk=; b=ZbFyqcV3Mgkog0slfbSQmYtqX9Yg2jSSSiE5ue3PbQfcBBZPMgw17Mr36CF/znXP4GJBvS 5v/WPSHLpUD3TP34knaZC8jL5c9l20185hfvwCkixyhBpNU66XsmsXXGg6kJxLkZGDfRFV qSmS3aRz6EhVOE38Qo0Onfuv0k4b5cDEFQxKrwBQCMDw+oFaVoYOy5fIP6HJiYc5ELD2GN xMjUZJnVVf68SETD334PkaJE/4ONeqnHHhPfKGcqJcRlOMY0JfEaGmVhrWJu40VjZjd59W Y2uw0k0qFp9E+dCCI4pJcHehOS9cBwwLMBF29shg6xC/LtLFWAPvhp/dh2fUHw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697975856; a=rsa-sha256; cv=none; b=ri8Rv/Rw5gdko7ZRHTdXxyFKQUI9Wkhlm/d7kWaYSsNWKGNLO9ckXsnurJPN6jH0wBriU0 9W0935IyIxkKT/lS43viQB2PeSs3Ztb8Uv9NXSsWgaieGOyxfmTNFRO0mxmwAcJ/REkO9W pnQTJlz2FNX94hSE9rJ0yIC6ZmMEk4hoLl+v1fmnTt4NP+srQmqyEg4y+Ed5HZjjI341Lt 33TaGcj3KD7ViI/a2v9AJL+KLFjUhufApMO9BUA3SeDr4F1iowp169bU56H+7PWH0c4SaV NlNpqXqLwUnIDdnhbgEA5+/Lbn2qJ0fGb0ypgdGb54SeuvRZnZZA/LuJR0mzbg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697975856; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hYazf5EwR2Ja57OAOh5esuI40liwBCpYd38j5Tii9rk=; b=acJUHLvjSyU294T/BNOs1yhfXsBl2TDz6O2UrP4Pxm75Xrbc/S2gocBGOSYjUgXUKyqOQU JP5bMHYBdwtajE9Mm1e0F6P7m2yo/pCvn38z4ez3xNMtn/fHR8lh0akEsyVUihvb+vAw71 xkRw3h2+OxEBoQx/UoyW5j3GL3RrzJuknPls9z47GnR72I4GVZ3CwW5KiK9Tifl7HCII7f u827vtsVMGAV/QqtQpo+xo1SNW6G4X3Ja6bkyJOKM1nLTtXWbw3kKsdBVaXwYGmempJiGc QeBDA2yKTqV4EmCoWxFNnR7aefiP6JBJmwCVQ6CI2C10mYqCkPGDLaFJ6V1gFw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SCxdq6ygbzx0V; Sun, 22 Oct 2023 11:57: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 39MBvZDa015251; Sun, 22 Oct 2023 11:57:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39MBvZle015248; Sun, 22 Oct 2023 11:57:35 GMT (envelope-from git) Date: Sun, 22 Oct 2023 11:57:35 GMT Message-Id: <202310221157.39MBvZle015248@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: dbe9ba41bbd7 - releng/14.0 - tty: fix improper backspace behaviour for UTF8 characters when in canonical 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.0 X-Git-Reftype: branch X-Git-Commit: dbe9ba41bbd76e7579683cd69b3235d0b02aca1e Auto-Submitted: auto-generated The branch releng/14.0 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=dbe9ba41bbd76e7579683cd69b3235d0b02aca1e commit dbe9ba41bbd76e7579683cd69b3235d0b02aca1e Author: Bojan Novković AuthorDate: 2023-10-07 18:00:11 +0000 Commit: Christos Margiolis CommitDate: 2023-10-22 11:56:44 +0000 tty: fix improper backspace behaviour for UTF8 characters when in canonical mode This patch adds additional logic in ttydisc_rubchar() to properly handle backspace behaviour for UTF-8 characters. Currently, typing in a backspace after a UTF8 character will delete only one byte from the byte sequence, leaving garbled output in the tty's output queue. With this change all of the character's bytes are deleted. This change is only active when the IUTF8 flag is set (see 19054eb6053189144aa962b2ecc1bf5087758a3e "(s)tty: add support for IUTF8 input flag") The code uses the teken_wcwidth() function to properly handle character column widths for different code points, and adds the teken_utf8_bytes_to_codepoint() function that converts a UTF-8 byte sequence to a codepoint, as specified in RFC3629. Reported by: christos Reviewed by: christos, imp MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D42067 (cherry picked from commit 9e589b0938579f3f4d89fa5c051f845bf754184d) Approved by: re (gjb) --- sys/kern/tty_ttydisc.c | 74 +++++++++++++++++++++++++++++++++++++++++++++++ sys/teken/teken_wcwidth.h | 30 +++++++++++++++++++ 2 files changed, 104 insertions(+) diff --git a/sys/kern/tty_ttydisc.c b/sys/kern/tty_ttydisc.c index 665275ee93e7..eae7162e31c0 100644 --- a/sys/kern/tty_ttydisc.c +++ b/sys/kern/tty_ttydisc.c @@ -43,6 +43,9 @@ #include #include +#include +#include + /* * Standard TTYDISC `termios' line discipline. */ @@ -78,8 +81,13 @@ SYSCTL_ULONG(_kern, OID_AUTO, tty_nout, CTLFLAG_RD, /* Character is alphanumeric. */ #define CTL_ALNUM(c) (((c) >= '0' && (c) <= '9') || \ ((c) >= 'a' && (c) <= 'z') || ((c) >= 'A' && (c) <= 'Z')) +/* Character is UTF8-encoded. */ +#define CTL_UTF8(c) (!!((c) & 0x80)) +/* Character is a UTF8 continuation byte. */ +#define CTL_UTF8_CONT(c) (((c) & 0xc0) == 0x80) #define TTY_STACKBUF 256 +#define UTF8_STACKBUF 4 void ttydisc_open(struct tty *tp) @@ -800,6 +808,72 @@ ttydisc_rubchar(struct tty *tp) ttyoutq_write_nofrag(&tp->t_outq, "\b\b\b\b\b\b\b\b", tablen); return (0); + } else if ((tp->t_termios.c_iflag & IUTF8) != 0 && + CTL_UTF8(c)) { + uint8_t bytes[UTF8_STACKBUF] = { 0 }; + int curidx = UTF8_STACKBUF - 1, cwidth = 1, + nb = 0; + teken_char_t codepoint; + + /* Save current byte. */ + bytes[curidx] = c; + curidx--; + nb++; + /* Loop back through inq until we hit the + * leading byte. */ + while (CTL_UTF8_CONT(c) && nb < UTF8_STACKBUF) { + ttyinq_peekchar(&tp->t_inq, &c, "e); + ttyinq_unputchar(&tp->t_inq); + bytes[curidx] = c; + curidx--; + nb++; + } + /* + * Shift array so that the leading + * byte ends up at idx 0. + */ + if (nb < UTF8_STACKBUF) + memmove(&bytes[0], &bytes[curidx + 1], + nb * sizeof(uint8_t)); + /* Check for malformed UTF8 characters. */ + if (nb == UTF8_STACKBUF && + CTL_UTF8_CONT(bytes[0])) { + /* + * Place all bytes back into the inq and + * delete the last byte only. + */ + ttyinq_write(&tp->t_inq, bytes, + UTF8_STACKBUF, 0); + } else { + /* Find codepoint and width. */ + codepoint = + teken_utf8_bytes_to_codepoint(bytes, + nb); + if (codepoint != + TEKEN_UTF8_INVALID_CODEPOINT) { + cwidth = teken_wcwidth( + codepoint); + } else { + /* + * Place all bytes back into the + * inq and fall back to + * default behaviour. + */ + ttyinq_write(&tp->t_inq, bytes, + nb, 0); + } + } + tp->t_column -= cwidth; + /* + * Delete character by punching + * 'cwidth' spaces over it. + */ + if (cwidth == 1) + ttyoutq_write_nofrag(&tp->t_outq, + "\b \b", 3); + else if (cwidth == 2) + ttyoutq_write_nofrag(&tp->t_outq, + "\b\b \b\b", 6); } else { /* * Remove a regular character by diff --git a/sys/teken/teken_wcwidth.h b/sys/teken/teken_wcwidth.h index f57a185c2433..f5a23dbc9679 100644 --- a/sys/teken/teken_wcwidth.h +++ b/sys/teken/teken_wcwidth.h @@ -8,6 +8,8 @@ * Latest version: http://www.cl.cam.ac.uk/~mgk25/ucs/wcwidth.c */ +#define TEKEN_UTF8_INVALID_CODEPOINT -1 + struct interval { teken_char_t first; teken_char_t last; @@ -116,3 +118,31 @@ static int teken_wcwidth(teken_char_t ucs) (ucs >= 0x20000 && ucs <= 0x2fffd) || (ucs >= 0x30000 && ucs <= 0x3fffd))); } + +/* + * Converts an UTF-8 byte sequence to a codepoint as specified in + * https://datatracker.ietf.org/doc/html/rfc3629#section-3 . The function + * expects the 'bytes' array to start with the leading character. + */ +static teken_char_t +teken_utf8_bytes_to_codepoint(uint8_t bytes[4], int nbytes) +{ + + /* Check for malformed characters. */ + if (bitcount(bytes[0] & 0xf0) != nbytes) + return (TEKEN_UTF8_INVALID_CODEPOINT); + + switch (nbytes) { + case 1: + return (bytes[0] & 0x7f); + case 2: + return (bytes[0] & 0xf) << 6 | (bytes[1] & 0x3f); + case 3: + return (bytes[0] & 0xf) << 12 | (bytes[1] & 0x3f) << 6 | (bytes[2] & 0x3f); + case 4: + return (bytes[0] & 0x7) << 18 | (bytes[1] & 0x3f) << 12 | + (bytes[2] & 0x3f) << 6 | (bytes[3] & 0x3f); + default: + return (TEKEN_UTF8_INVALID_CODEPOINT); + } +} From nobody Sun Oct 22 11:57:37 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SCxds2XG9z4xC3H; Sun, 22 Oct 2023 11: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 4SCxds1l71z3WS1; Sun, 22 Oct 2023 11: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=1697975857; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rjaTXB9NT4TYLasYquLVs+ZaluHFxYCgTDnqSMfOiI4=; b=q/SlXjoToWVqtsWDIJcBEIbYDOpMZAeJsnxSOYY0NX/qe5/SadzTJbyE/LIbi4yQzSzgXP d0O4ZzHApHsNN11Gy+OBrWVyn+Zau2gqVpRswzlAz2hROCmK5AWAlg4cmKYLn/ON9571gx x+DI5xJbrZMopTQEJp5Ir4RtAK2FjGp73qQAAwi+7s0Ga0128VL0YEr3b/Bv4RDQtB2PAE F7eg/QL/D1CoLfnpDmrxCe8dGdHsVyKcntqyDgq+q5RbHHKLhcEhrn/wZHiKb0CACK5dLv lLwTPAgWQ3c/5M6PAstP6gVGmQyHcKoDgEFVlS0ZB4tmh85Delqz6+RNv9xdfA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697975857; a=rsa-sha256; cv=none; b=YpPCSlkXNCu0wth1ZXQE9N6Rels5HOXg3sAfWSpl6CD5GNfH62rbIc2DMGL2/QoFq50TOg 6QyaFfHqUS3v9jLKr40PHEbpx7a69mwgQrP7m+zPkwKPCpEKgUwtsB/G0M49AgiIaklHdy stTffUuUSaI7mbvYf5hOdSQ3PsHHkh11XCExOPftzYEmvGs0SSInuALArNxR6XQu8EVLIY +whWXdswiefv1g7dIjgD3acNhTM7El4lWCM4AJeRsk5/l1tjWA+2xmk1gGCeAo2V+2pZpd drbtKn9rmer1vpH652Mv8FJCgxdC791Ai/hLz4TFYzKxIPvSpuZUZvbs1QTD8w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697975857; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rjaTXB9NT4TYLasYquLVs+ZaluHFxYCgTDnqSMfOiI4=; b=b2WSkagYoXySFelo6W32oYVMgDeMLD+28WwM1GzfJD1hElsgz1sV7wBokj7/1cAc4WhIB0 Wd7Q2Tz12h7q/O3CSj9gSGzQqLspVfhE7Nj2xwGwMrysuaDyhspuDYmI6oOd9AQJBZ/MAu 63VyiVH2OLtMHVFn4DbMqH4WB/8DsHNQo6jJQeodBD7qalwV59+mksg6xLNdmaqMQziqK1 HVo7XiiFa4MXb72VBEz+wqTgInLau8HG/+nykqj/ZR3evgeXtkSNh29ewzWP5CLaUWkSWU koe9StQoL04dheHbR5HuSAfWJOzM8rBJ3IS5N52ohTdx2J+quH8duScJ9vTvUQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SCxds0rxRzwnG; Sun, 22 Oct 2023 11: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 39MBvb3e015298; Sun, 22 Oct 2023 11: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 39MBvb1I015295; Sun, 22 Oct 2023 11:57:37 GMT (envelope-from git) Date: Sun, 22 Oct 2023 11:57:37 GMT Message-Id: <202310221157.39MBvb1I015295@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: e76fb470ab34 - releng/14.0 - teken: use __bitcount() instead of bitcount() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.0 X-Git-Reftype: branch X-Git-Commit: e76fb470ab34c035b78d2dcc5f346db1b72b19a6 Auto-Submitted: auto-generated The branch releng/14.0 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=e76fb470ab34c035b78d2dcc5f346db1b72b19a6 commit e76fb470ab34c035b78d2dcc5f346db1b72b19a6 Author: Christos Margiolis AuthorDate: 2023-10-07 21:36:59 +0000 Commit: Christos Margiolis CommitDate: 2023-10-22 11:56:49 +0000 teken: use __bitcount() instead of bitcount() The use of bitcount() triggered a build error because it couldn't be located. __bitcount() on the other hand is defined in sys/types.h, which is included in teken/teken.h. MFC after: 2 weeks (cherry picked from commit 6d3296f16a06bcaa49918799e683936711dcf9c9) Approved by: re (gjb) --- sys/teken/teken_wcwidth.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/teken/teken_wcwidth.h b/sys/teken/teken_wcwidth.h index f5a23dbc9679..bc992e1ef5d8 100644 --- a/sys/teken/teken_wcwidth.h +++ b/sys/teken/teken_wcwidth.h @@ -129,7 +129,7 @@ teken_utf8_bytes_to_codepoint(uint8_t bytes[4], int nbytes) { /* Check for malformed characters. */ - if (bitcount(bytes[0] & 0xf0) != nbytes) + if (__bitcount(bytes[0] & 0xf0) != nbytes) return (TEKEN_UTF8_INVALID_CODEPOINT); switch (nbytes) { From nobody Sun Oct 22 11:57:38 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SCxdt2tTqz4xCM7; Sun, 22 Oct 2023 11:57: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 4SCxdt2D1rz3WMp; Sun, 22 Oct 2023 11:57:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697975858; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KI7XKGVTSqWZGzTanAs472bHFOFP2DUFJZp8gl3UGjc=; b=rjulVhnTNrcIDDd5jVHO29a9PETx25akXC1CM8pglyAP7B6sYZfUIeMEBU9rvoDeIow26A E+4yK6b6UTZqh142wna+cUau4hEIqlXv3FqEd1inhJoVJ9fCv/bB3oq1bRQqsACZ+/xz4h Y5ysXZ8nOnrHy1OSoTmbj7comscVHpmv3qLnzYi0+TqUcHKeapS82UKD82W4UhmGGYTWB3 Twh/QSzsJ3RQDSwsdGk5p4fk2qZKfs2LIH+ilxhcH7QkZDNbWu7rSZEwRiwGW1aEzdWJGM w6x+I5m8RD4Kws+h397x0SXF+apr/uTUP9qp8rYOMQtOPlWD+YNBDCeJ1m1rXg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697975858; a=rsa-sha256; cv=none; b=LWVRCLmbhDL2VLbWDfZsaH5U/GhcmPm89cKniKnzyC5yohXbUooWl8vuh2hDJkmVh38HSt YE5MFRY/K0vQx5ZcvV4lWbxpKHCRfc4MB7w26lpZrZv5BHLTaJEs/hRQC7woox6yPBfnUC mMyJEMriKVUniTG8clkfPszOYzpyvF1rx4JJxGE1yW7O9Xhu7hkqMUfFUaURvoZFtj1HyE FPm0f0azJavoZsWgI1DPe0F7lSGb8CZPMFPKhP1oQor2O1dwbONwoMOsj/K9pjF2BgynMn EWEgu6khd3fGEdhKkGcMAxBuJvfqslBJTmbvU/FadoOG+z3celeRVw67n4qHQg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697975858; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KI7XKGVTSqWZGzTanAs472bHFOFP2DUFJZp8gl3UGjc=; b=AvOvQJjriLQznJowq1Li0RspBKjX4nx6utnjINvay9+N0QIm7svl8/V/OKC5MVUmSpWUmh Pv6sFbBgsjVThmqaxlw88m+jdQn9U4rRH84+XXN4cdMdnn32ftKrZU8qm3RIAbjwq+DWcS qiUFCLUUkgHqaycY4mQdaH/xTGdbWP+0i1S79IcJrnuIycDihXiCnNllyKX0jaGl/tkNT+ 7iBD0/D3qvy6T5Cc/8X50CH1G4qKgeo7N9x9jjsumLO4Uf5djZ/x/ymLn1oCYkJ9rIOdxS 7hFHGNpLnf1dTUoYgqxNABi2x81dflosDZ7btP0BqKn6G2QYeibSRDgiba4NLA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SCxdt1HZtzwnH; Sun, 22 Oct 2023 11:57: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 39MBvcJ0015348; Sun, 22 Oct 2023 11:57:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39MBvcpn015345; Sun, 22 Oct 2023 11:57:38 GMT (envelope-from git) Date: Sun, 22 Oct 2023 11:57:38 GMT Message-Id: <202310221157.39MBvcpn015345@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: cee081ebf86a - releng/14.0 - teken: fix up unused func warnings List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.0 X-Git-Reftype: branch X-Git-Commit: cee081ebf86a8fee396742238811b9880d8f9ace Auto-Submitted: auto-generated The branch releng/14.0 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=cee081ebf86a8fee396742238811b9880d8f9ace commit cee081ebf86a8fee396742238811b9880d8f9ace Author: Mateusz Guzik AuthorDate: 2023-10-08 13:54:11 +0000 Commit: Christos Margiolis CommitDate: 2023-10-22 11:56:56 +0000 teken: fix up unused func warnings Sponsored by: Rubicon Communications, LLC ("Netgate") (cherry picked from commit 4b9aa38ef0e5bedcdd90b6627cc1c215037a1121) Approved by: re (gjb) --- sys/teken/teken_wcwidth.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/teken/teken_wcwidth.h b/sys/teken/teken_wcwidth.h index bc992e1ef5d8..bc40c23a6eb7 100644 --- a/sys/teken/teken_wcwidth.h +++ b/sys/teken/teken_wcwidth.h @@ -16,7 +16,7 @@ struct interval { }; /* auxiliary function for binary search in interval table */ -static int bisearch(teken_char_t ucs, const struct interval *table, int max) { +static inline int bisearch(teken_char_t ucs, const struct interval *table, int max) { int min = 0; int mid; @@ -35,7 +35,7 @@ static int bisearch(teken_char_t ucs, const struct interval *table, int max) { return 0; } -static int teken_wcwidth(teken_char_t ucs) +static inline int teken_wcwidth(teken_char_t ucs) { /* sorted list of non-overlapping intervals of non-spacing characters */ /* generated by "uniset +cat=Me +cat=Mn +cat=Cf -00AD +1160-11FF +200B c" */ @@ -124,7 +124,7 @@ static int teken_wcwidth(teken_char_t ucs) * https://datatracker.ietf.org/doc/html/rfc3629#section-3 . The function * expects the 'bytes' array to start with the leading character. */ -static teken_char_t +static inline teken_char_t teken_utf8_bytes_to_codepoint(uint8_t bytes[4], int nbytes) { From nobody Sun Oct 22 11:57:39 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SCxdv4Ms9z4xCM9; Sun, 22 Oct 2023 11:57: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 4SCxdv3YW5z3WbQ; Sun, 22 Oct 2023 11:57:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697975859; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Mh2TxfTxz7YEQDdrp4VXQgYGpwXWkX0LmAutcHISj54=; b=pDtPXAKi6nVishM0aadcQ28wNaJuWonqZHSSezjZtI27QuVPQm7PPxBb0vAZGWR7nZgoJ3 Wiek1JN7+zGjGKVEMZNn9bLdD4hMMJqPz7bbMK0+sckWAHOfGUZ4x7iZcbvf0lDSafqILJ nmMjkjzEQWp4RY/KIR6PPQP+gKy931GSjzynisxr8nf+CI+wEkeBraJ1KNDxZ0vCC2ZVhT 2bhAIKw3jIiaN2FACfKxCvMNDmxxyefa1Hvy7ekAQm4aU1Vsv/fXB2Ge/1GaFFO4iYC2I/ RgiPkSCZrt8L/JillGqfNLzs/zFsZy+bxx5QoUgc78NaQck1knhKI7e8gx7R2g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697975859; a=rsa-sha256; cv=none; b=lrLx32MABBdVWnl8jHpWk2eGfJbnlhimKFaNmrnFI8D8oMlcz7Yfn7s+264qBb2pYRDa9g dUi9jn/pWZ0aegW5bQk+fzAEhKOxzSeOESnC2WT93tSgGKxGYteRG3SclgWK9f15Kz4kAZ CiraiwNQmVIG97farVBOQWuUl5ode/WJqWTijjdcRzZSQUrxhO8wxgrQtKpNbexdD1HAF+ 6tcnT4KWsWaZLoOJpOOD2XuH7ExtgJqeTUFk8G9HShW5kstHAteSLbGkkuNkg9l9Q6vfZU 5WS18K8rmqxByfiDAhYV4+vjCnDicbepUhKD38fZprokZqqTBRwPoZ0s4gVmSg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697975859; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Mh2TxfTxz7YEQDdrp4VXQgYGpwXWkX0LmAutcHISj54=; b=a9aW7QO7nGP8ecRSr+wDFiSTvfRTiZPkV0FxEKCEzkESifiEi6SznpTkGxCXT+qKzbu6sZ oFTr9IAfhPR1jJLfmKBW0B7HRgsl5U/V5TSdiam/3H310FWsCAT9p96lvapwRYOLLqkD+W uxDOH9aZNm11/5LL+AapStlHOy2cwc2YY03rKRDX98AA+d6ZR9m5araNefc0bOviQuqPzY xl8wu+Drs/4XFP6Qili9UUSnJatoaTlWFFUrTYTcjb9U974sVc0q7z6OUnbnu6cynm34lG GY5qteCCgylVEiWrpCBYQW86FmJgOv9TjLTLP2F7nquX+yGQMmaxlZmz7jN7qA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SCxdv2XXrzwV9; Sun, 22 Oct 2023 11:57: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 39MBvdOB015395; Sun, 22 Oct 2023 11:57:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39MBvdGU015392; Sun, 22 Oct 2023 11:57:39 GMT (envelope-from git) Date: Sun, 22 Oct 2023 11:57:39 GMT Message-Id: <202310221157.39MBvdGU015392@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: b80d4b2f93e5 - releng/14.0 - tty/teken: fix UTF8 sequence validation logic List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.0 X-Git-Reftype: branch X-Git-Commit: b80d4b2f93e54b81041a518ea4c0a8be2985a658 Auto-Submitted: auto-generated The branch releng/14.0 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=b80d4b2f93e54b81041a518ea4c0a8be2985a658 commit b80d4b2f93e54b81041a518ea4c0a8be2985a658 Author: Bojan Novković AuthorDate: 2023-10-13 05:14:36 +0000 Commit: Christos Margiolis CommitDate: 2023-10-22 11:57:00 +0000 tty/teken: fix UTF8 sequence validation logic This patch fixes UTF-8 sequence validation logic in teken_utf8_bytes_to_codepoint() and fixes fallback behaviour in ttydisc_rubchar() when an invalid UTF8 sequence is encountered. The code previously used __bitcount() to extract sequence length information from the leading byte. However, this assumption breaks for certain code points that have additional bits set in the first half of the leading byte (e.g. Cyrillic characters). This lead to incorrect behaviour when deleting those characters using backspaces. The code now checks the number of consecutive set bits in the leading byte starting from the MSB, as per RFC 3629. Reviewed by: christos MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D42147 (cherry picked from commit 2fed1c579c52d63b72fc08ffcc652ba0183f9254) Approved by: re (gjb) --- sys/kern/tty_ttydisc.c | 12 +++++++----- sys/teken/teken_wcwidth.h | 23 ++++++++++++++++++++--- 2 files changed, 27 insertions(+), 8 deletions(-) diff --git a/sys/kern/tty_ttydisc.c b/sys/kern/tty_ttydisc.c index eae7162e31c0..c46579cefbb1 100644 --- a/sys/kern/tty_ttydisc.c +++ b/sys/kern/tty_ttydisc.c @@ -844,23 +844,25 @@ ttydisc_rubchar(struct tty *tp) */ ttyinq_write(&tp->t_inq, bytes, UTF8_STACKBUF, 0); + ttyinq_unputchar(&tp->t_inq); } else { /* Find codepoint and width. */ codepoint = teken_utf8_bytes_to_codepoint(bytes, nb); - if (codepoint != - TEKEN_UTF8_INVALID_CODEPOINT) { - cwidth = teken_wcwidth( - codepoint); - } else { + if (codepoint == + TEKEN_UTF8_INVALID_CODEPOINT || + (cwidth = teken_wcwidth( + codepoint)) == -1) { /* * Place all bytes back into the * inq and fall back to * default behaviour. */ + cwidth = 1; ttyinq_write(&tp->t_inq, bytes, nb, 0); + ttyinq_unputchar(&tp->t_inq); } } tp->t_column -= cwidth; diff --git a/sys/teken/teken_wcwidth.h b/sys/teken/teken_wcwidth.h index bc40c23a6eb7..14af2c6f9530 100644 --- a/sys/teken/teken_wcwidth.h +++ b/sys/teken/teken_wcwidth.h @@ -128,15 +128,32 @@ static inline teken_char_t teken_utf8_bytes_to_codepoint(uint8_t bytes[4], int nbytes) { - /* Check for malformed characters. */ - if (__bitcount(bytes[0] & 0xf0) != nbytes) + /* + * Check for malformed characters by comparing 'nbytes' + * to the byte length of the character. + * + * The table in section 3 of RFC 3629 defines 4 different + * values indicating the length of a UTF-8 byte sequence. + * + * 0xxxxxxx -> 1 byte + * 110xxxxx -> 2 bytes + * 1110xxxx -> 3 bytes + * 11110xxx -> 4 bytes + * + * The length is determined by the higher-order bits in + * the leading octet (except in the first case, where an MSB + * of 0 means a byte length of 1). Here we flip the 4 upper + * bits and count the leading zeros using __builtin_clz() + * to determine the number of bytes. + */ + if (__builtin_clz(~(bytes[0] & 0xf0) << 24) != nbytes) return (TEKEN_UTF8_INVALID_CODEPOINT); switch (nbytes) { case 1: return (bytes[0] & 0x7f); case 2: - return (bytes[0] & 0xf) << 6 | (bytes[1] & 0x3f); + return (bytes[0] & 0x1f) << 6 | (bytes[1] & 0x3f); case 3: return (bytes[0] & 0xf) << 12 | (bytes[1] & 0x3f) << 6 | (bytes[2] & 0x3f); case 4: From nobody Sun Oct 22 11:57:40 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SCxdw5G6yz4xBrF; Sun, 22 Oct 2023 11:57: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 4SCxdw4HYLz3WQp; Sun, 22 Oct 2023 11:57:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697975860; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yaTLKnlkJSSGTrlhH1a678kOc1CNgT43Vt4WfivNHvk=; b=bm2NhRGjYAbGAXirFS7ksD20BXbdtCGh034hwfMrCAwiN8TqQ/Y5JYjfNwhnVj3nZ1ekRn KxEzU+l2dysoVJAznVtRox+fueSQjVxLqRWmlGCno8/T71AuJR3273XX/zOU84mtC85MYW IL8LCBU4o+z+oOr0JX//ww6LUPfzOY6gG+rEwD7TClbrfDWXEe3rdG5TiIkMRyzdjd1FmE +IgZDC3FQ1qCAsqXYagcJ8Gy23LSHm8IDfAZqG0JsGKw1h/9oI78OLifa1dunlkCBgBr3T JV84MamnHy/k+vnjH9UM4sOQUHev6UofmcPEgrOnJSrq+si7BZbrN6j4qEnNzg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697975860; a=rsa-sha256; cv=none; b=shkH/4jQlq9HX0PrWfSnEIzBIqPKzEfUe0blmaBXQEflyVKMgTS2BOAPZZTHTVr77/C8mi U7qihcu8B+bpU8FNnyk3VXPnzVLJmevdZiQb3A1caXFCzik4n7orlkeqVg55EYFRMyzMSd fo1Bta6fUt25z8OQ0Dqe7S7xHXs8RNLgLsc89jUh/xB/PJ0QFZ36QZaAD+US5Ngm5H68hn srk6A3TsvkqAbNok1I/aCnQlU54vnCsf6qU/xSU5yOJ5b6YTqtkU3RwPqFjWjBxK7LtBRE 7mT889uDWecghBHUhYEw31CEeFcIrnPgQWz1ShfbacCcuppKDxsMClmGrGUw0g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697975860; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yaTLKnlkJSSGTrlhH1a678kOc1CNgT43Vt4WfivNHvk=; b=hmiAD+Q5bfQ8hH4Qgzy2l7YmDdUIa4GlQd81DgF724oaQpvoBVouLQ8s0wbP0Usj2zDGq5 5IRdwWboQTug0eJjs+rgWWihjmmHAkoyCQeYEVXrR5xXMGcZKstIPwnpKAHVjELsfB/VSj 6lPK/TowtmvowO8eMCJCFxzh9x0JHkZtmIxXM4mcM8f4NII/L0Lf9wKz4X0vIQUIGobPAv SI2qWvaStYs9ylEfZu+vNlHo4jdG4yqk2+C9NZbIOKdYdNrQ4XEdC0vxLEyOIFGIDY62AK 6ONjaiSBRr9PxVgzUkYPlx3fsh5uQyFGwyuPuo42AQV/wus5IZ++M3QL8YX4pQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SCxdw38pbzws0; Sun, 22 Oct 2023 11:57: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 39MBvevQ015440; Sun, 22 Oct 2023 11:57:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39MBve5V015437; Sun, 22 Oct 2023 11:57:40 GMT (envelope-from git) Date: Sun, 22 Oct 2023 11:57:40 GMT Message-Id: <202310221157.39MBve5V015437@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: f5951b13246a - releng/14.0 - teken: fix style in teken_wcwidth.h List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.0 X-Git-Reftype: branch X-Git-Commit: f5951b13246a97824c481b66a0ad900c67f0a950 Auto-Submitted: auto-generated The branch releng/14.0 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=f5951b13246a97824c481b66a0ad900c67f0a950 commit f5951b13246a97824c481b66a0ad900c67f0a950 Author: Christos Margiolis AuthorDate: 2023-10-13 05:14:57 +0000 Commit: Christos Margiolis CommitDate: 2023-10-22 11:57:06 +0000 teken: fix style in teken_wcwidth.h Reviewed by: bojan.novkovic_fer.hr MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D42164 (cherry picked from commit 90367ba750bcbf3f9ac4609c3ec8df4ab95a22af) Approved by: re (gjb) --- sys/teken/teken_wcwidth.h | 265 +++++++++++++++++++++++----------------------- 1 file changed, 135 insertions(+), 130 deletions(-) diff --git a/sys/teken/teken_wcwidth.h b/sys/teken/teken_wcwidth.h index 14af2c6f9530..72df62704d73 100644 --- a/sys/teken/teken_wcwidth.h +++ b/sys/teken/teken_wcwidth.h @@ -11,112 +11,118 @@ #define TEKEN_UTF8_INVALID_CODEPOINT -1 struct interval { - teken_char_t first; - teken_char_t last; + teken_char_t first; + teken_char_t last; }; -/* auxiliary function for binary search in interval table */ -static inline int bisearch(teken_char_t ucs, const struct interval *table, int max) { - int min = 0; - int mid; +/* Auxiliary function for binary search in interval table */ +static inline int +bisearch(teken_char_t ucs, const struct interval *table, int max) +{ + int min = 0; + int mid; - if (ucs < table[0].first || ucs > table[max].last) - return 0; - while (max >= min) { - mid = (min + max) / 2; - if (ucs > table[mid].last) - min = mid + 1; - else if (ucs < table[mid].first) - max = mid - 1; - else - return 1; - } + if (ucs < table[0].first || ucs > table[max].last) + return (0); + while (max >= min) { + mid = (min + max) / 2; + if (ucs > table[mid].last) + min = mid + 1; + else if (ucs < table[mid].first) + max = mid - 1; + else + return (1); + } - return 0; + return (0); } -static inline int teken_wcwidth(teken_char_t ucs) +static inline int +teken_wcwidth(teken_char_t ucs) { - /* sorted list of non-overlapping intervals of non-spacing characters */ - /* generated by "uniset +cat=Me +cat=Mn +cat=Cf -00AD +1160-11FF +200B c" */ - static const struct interval combining[] = { - { 0x0300, 0x036F }, { 0x0483, 0x0486 }, { 0x0488, 0x0489 }, - { 0x0591, 0x05BD }, { 0x05BF, 0x05BF }, { 0x05C1, 0x05C2 }, - { 0x05C4, 0x05C5 }, { 0x05C7, 0x05C7 }, { 0x0600, 0x0603 }, - { 0x0610, 0x0615 }, { 0x064B, 0x065E }, { 0x0670, 0x0670 }, - { 0x06D6, 0x06E4 }, { 0x06E7, 0x06E8 }, { 0x06EA, 0x06ED }, - { 0x070F, 0x070F }, { 0x0711, 0x0711 }, { 0x0730, 0x074A }, - { 0x07A6, 0x07B0 }, { 0x07EB, 0x07F3 }, { 0x0901, 0x0902 }, - { 0x093C, 0x093C }, { 0x0941, 0x0948 }, { 0x094D, 0x094D }, - { 0x0951, 0x0954 }, { 0x0962, 0x0963 }, { 0x0981, 0x0981 }, - { 0x09BC, 0x09BC }, { 0x09C1, 0x09C4 }, { 0x09CD, 0x09CD }, - { 0x09E2, 0x09E3 }, { 0x0A01, 0x0A02 }, { 0x0A3C, 0x0A3C }, - { 0x0A41, 0x0A42 }, { 0x0A47, 0x0A48 }, { 0x0A4B, 0x0A4D }, - { 0x0A70, 0x0A71 }, { 0x0A81, 0x0A82 }, { 0x0ABC, 0x0ABC }, - { 0x0AC1, 0x0AC5 }, { 0x0AC7, 0x0AC8 }, { 0x0ACD, 0x0ACD }, - { 0x0AE2, 0x0AE3 }, { 0x0B01, 0x0B01 }, { 0x0B3C, 0x0B3C }, - { 0x0B3F, 0x0B3F }, { 0x0B41, 0x0B43 }, { 0x0B4D, 0x0B4D }, - { 0x0B56, 0x0B56 }, { 0x0B82, 0x0B82 }, { 0x0BC0, 0x0BC0 }, - { 0x0BCD, 0x0BCD }, { 0x0C3E, 0x0C40 }, { 0x0C46, 0x0C48 }, - { 0x0C4A, 0x0C4D }, { 0x0C55, 0x0C56 }, { 0x0CBC, 0x0CBC }, - { 0x0CBF, 0x0CBF }, { 0x0CC6, 0x0CC6 }, { 0x0CCC, 0x0CCD }, - { 0x0CE2, 0x0CE3 }, { 0x0D41, 0x0D43 }, { 0x0D4D, 0x0D4D }, - { 0x0DCA, 0x0DCA }, { 0x0DD2, 0x0DD4 }, { 0x0DD6, 0x0DD6 }, - { 0x0E31, 0x0E31 }, { 0x0E34, 0x0E3A }, { 0x0E47, 0x0E4E }, - { 0x0EB1, 0x0EB1 }, { 0x0EB4, 0x0EB9 }, { 0x0EBB, 0x0EBC }, - { 0x0EC8, 0x0ECD }, { 0x0F18, 0x0F19 }, { 0x0F35, 0x0F35 }, - { 0x0F37, 0x0F37 }, { 0x0F39, 0x0F39 }, { 0x0F71, 0x0F7E }, - { 0x0F80, 0x0F84 }, { 0x0F86, 0x0F87 }, { 0x0F90, 0x0F97 }, - { 0x0F99, 0x0FBC }, { 0x0FC6, 0x0FC6 }, { 0x102D, 0x1030 }, - { 0x1032, 0x1032 }, { 0x1036, 0x1037 }, { 0x1039, 0x1039 }, - { 0x1058, 0x1059 }, { 0x1160, 0x11FF }, { 0x135F, 0x135F }, - { 0x1712, 0x1714 }, { 0x1732, 0x1734 }, { 0x1752, 0x1753 }, - { 0x1772, 0x1773 }, { 0x17B4, 0x17B5 }, { 0x17B7, 0x17BD }, - { 0x17C6, 0x17C6 }, { 0x17C9, 0x17D3 }, { 0x17DD, 0x17DD }, - { 0x180B, 0x180D }, { 0x18A9, 0x18A9 }, { 0x1920, 0x1922 }, - { 0x1927, 0x1928 }, { 0x1932, 0x1932 }, { 0x1939, 0x193B }, - { 0x1A17, 0x1A18 }, { 0x1B00, 0x1B03 }, { 0x1B34, 0x1B34 }, - { 0x1B36, 0x1B3A }, { 0x1B3C, 0x1B3C }, { 0x1B42, 0x1B42 }, - { 0x1B6B, 0x1B73 }, { 0x1DC0, 0x1DCA }, { 0x1DFE, 0x1DFF }, - { 0x200B, 0x200F }, { 0x202A, 0x202E }, { 0x2060, 0x2063 }, - { 0x206A, 0x206F }, { 0x20D0, 0x20EF }, { 0x302A, 0x302F }, - { 0x3099, 0x309A }, { 0xA806, 0xA806 }, { 0xA80B, 0xA80B }, - { 0xA825, 0xA826 }, { 0xFB1E, 0xFB1E }, { 0xFE00, 0xFE0F }, - { 0xFE20, 0xFE23 }, { 0xFEFF, 0xFEFF }, { 0xFFF9, 0xFFFB }, - { 0x10A01, 0x10A03 }, { 0x10A05, 0x10A06 }, { 0x10A0C, 0x10A0F }, - { 0x10A38, 0x10A3A }, { 0x10A3F, 0x10A3F }, { 0x1D167, 0x1D169 }, - { 0x1D173, 0x1D182 }, { 0x1D185, 0x1D18B }, { 0x1D1AA, 0x1D1AD }, - { 0x1D242, 0x1D244 }, { 0xE0001, 0xE0001 }, { 0xE0020, 0xE007F }, - { 0xE0100, 0xE01EF } - }; - - /* test for 8-bit control characters */ - if (ucs == 0) - return 0; - if (ucs < 32 || (ucs >= 0x7f && ucs < 0xa0)) - return -1; + /* + * Sorted list of non-overlapping intervals of non-spacing characters. + * Generated by "uniset +cat=Me +cat=Mn +cat=Cf -00AD +1160-11FF +200B c" + */ + static const struct interval combining[] = { + { 0x0300, 0x036F }, { 0x0483, 0x0486 }, { 0x0488, 0x0489 }, + { 0x0591, 0x05BD }, { 0x05BF, 0x05BF }, { 0x05C1, 0x05C2 }, + { 0x05C4, 0x05C5 }, { 0x05C7, 0x05C7 }, { 0x0600, 0x0603 }, + { 0x0610, 0x0615 }, { 0x064B, 0x065E }, { 0x0670, 0x0670 }, + { 0x06D6, 0x06E4 }, { 0x06E7, 0x06E8 }, { 0x06EA, 0x06ED }, + { 0x070F, 0x070F }, { 0x0711, 0x0711 }, { 0x0730, 0x074A }, + { 0x07A6, 0x07B0 }, { 0x07EB, 0x07F3 }, { 0x0901, 0x0902 }, + { 0x093C, 0x093C }, { 0x0941, 0x0948 }, { 0x094D, 0x094D }, + { 0x0951, 0x0954 }, { 0x0962, 0x0963 }, { 0x0981, 0x0981 }, + { 0x09BC, 0x09BC }, { 0x09C1, 0x09C4 }, { 0x09CD, 0x09CD }, + { 0x09E2, 0x09E3 }, { 0x0A01, 0x0A02 }, { 0x0A3C, 0x0A3C }, + { 0x0A41, 0x0A42 }, { 0x0A47, 0x0A48 }, { 0x0A4B, 0x0A4D }, + { 0x0A70, 0x0A71 }, { 0x0A81, 0x0A82 }, { 0x0ABC, 0x0ABC }, + { 0x0AC1, 0x0AC5 }, { 0x0AC7, 0x0AC8 }, { 0x0ACD, 0x0ACD }, + { 0x0AE2, 0x0AE3 }, { 0x0B01, 0x0B01 }, { 0x0B3C, 0x0B3C }, + { 0x0B3F, 0x0B3F }, { 0x0B41, 0x0B43 }, { 0x0B4D, 0x0B4D }, + { 0x0B56, 0x0B56 }, { 0x0B82, 0x0B82 }, { 0x0BC0, 0x0BC0 }, + { 0x0BCD, 0x0BCD }, { 0x0C3E, 0x0C40 }, { 0x0C46, 0x0C48 }, + { 0x0C4A, 0x0C4D }, { 0x0C55, 0x0C56 }, { 0x0CBC, 0x0CBC }, + { 0x0CBF, 0x0CBF }, { 0x0CC6, 0x0CC6 }, { 0x0CCC, 0x0CCD }, + { 0x0CE2, 0x0CE3 }, { 0x0D41, 0x0D43 }, { 0x0D4D, 0x0D4D }, + { 0x0DCA, 0x0DCA }, { 0x0DD2, 0x0DD4 }, { 0x0DD6, 0x0DD6 }, + { 0x0E31, 0x0E31 }, { 0x0E34, 0x0E3A }, { 0x0E47, 0x0E4E }, + { 0x0EB1, 0x0EB1 }, { 0x0EB4, 0x0EB9 }, { 0x0EBB, 0x0EBC }, + { 0x0EC8, 0x0ECD }, { 0x0F18, 0x0F19 }, { 0x0F35, 0x0F35 }, + { 0x0F37, 0x0F37 }, { 0x0F39, 0x0F39 }, { 0x0F71, 0x0F7E }, + { 0x0F80, 0x0F84 }, { 0x0F86, 0x0F87 }, { 0x0F90, 0x0F97 }, + { 0x0F99, 0x0FBC }, { 0x0FC6, 0x0FC6 }, { 0x102D, 0x1030 }, + { 0x1032, 0x1032 }, { 0x1036, 0x1037 }, { 0x1039, 0x1039 }, + { 0x1058, 0x1059 }, { 0x1160, 0x11FF }, { 0x135F, 0x135F }, + { 0x1712, 0x1714 }, { 0x1732, 0x1734 }, { 0x1752, 0x1753 }, + { 0x1772, 0x1773 }, { 0x17B4, 0x17B5 }, { 0x17B7, 0x17BD }, + { 0x17C6, 0x17C6 }, { 0x17C9, 0x17D3 }, { 0x17DD, 0x17DD }, + { 0x180B, 0x180D }, { 0x18A9, 0x18A9 }, { 0x1920, 0x1922 }, + { 0x1927, 0x1928 }, { 0x1932, 0x1932 }, { 0x1939, 0x193B }, + { 0x1A17, 0x1A18 }, { 0x1B00, 0x1B03 }, { 0x1B34, 0x1B34 }, + { 0x1B36, 0x1B3A }, { 0x1B3C, 0x1B3C }, { 0x1B42, 0x1B42 }, + { 0x1B6B, 0x1B73 }, { 0x1DC0, 0x1DCA }, { 0x1DFE, 0x1DFF }, + { 0x200B, 0x200F }, { 0x202A, 0x202E }, { 0x2060, 0x2063 }, + { 0x206A, 0x206F }, { 0x20D0, 0x20EF }, { 0x302A, 0x302F }, + { 0x3099, 0x309A }, { 0xA806, 0xA806 }, { 0xA80B, 0xA80B }, + { 0xA825, 0xA826 }, { 0xFB1E, 0xFB1E }, { 0xFE00, 0xFE0F }, + { 0xFE20, 0xFE23 }, { 0xFEFF, 0xFEFF }, { 0xFFF9, 0xFFFB }, + { 0x10A01, 0x10A03 }, { 0x10A05, 0x10A06 }, { 0x10A0C, 0x10A0F }, + { 0x10A38, 0x10A3A }, { 0x10A3F, 0x10A3F }, { 0x1D167, 0x1D169 }, + { 0x1D173, 0x1D182 }, { 0x1D185, 0x1D18B }, { 0x1D1AA, 0x1D1AD }, + { 0x1D242, 0x1D244 }, { 0xE0001, 0xE0001 }, { 0xE0020, 0xE007F }, + { 0xE0100, 0xE01EF } + }; - /* binary search in table of non-spacing characters */ - if (bisearch(ucs, combining, - sizeof(combining) / sizeof(struct interval) - 1)) - return 0; + /* Test for 8-bit control characters */ + if (ucs == 0) + return (0); + if (ucs < 32 || (ucs >= 0x7f && ucs < 0xa0)) + return (-1); - /* if we arrive here, ucs is not a combining or C0/C1 control character */ + /* Binary search in table of non-spacing characters */ + if (bisearch(ucs, combining, sizeof(combining) / + sizeof(struct interval) - 1)) + return (0); - return 1 + - (ucs >= 0x1100 && - (ucs <= 0x115f || /* Hangul Jamo init. consonants */ - ucs == 0x2329 || ucs == 0x232a || - (ucs >= 0x2e80 && ucs <= 0xa4cf && - ucs != 0x303f) || /* CJK ... Yi */ - (ucs >= 0xac00 && ucs <= 0xd7a3) || /* Hangul Syllables */ - (ucs >= 0xf900 && ucs <= 0xfaff) || /* CJK Compatibility Ideographs */ - (ucs >= 0xfe10 && ucs <= 0xfe19) || /* Vertical forms */ - (ucs >= 0xfe30 && ucs <= 0xfe6f) || /* CJK Compatibility Forms */ - (ucs >= 0xff00 && ucs <= 0xff60) || /* Fullwidth Forms */ - (ucs >= 0xffe0 && ucs <= 0xffe6) || - (ucs >= 0x20000 && ucs <= 0x2fffd) || - (ucs >= 0x30000 && ucs <= 0x3fffd))); + /* + * If we arrive here, ucs is not a combining or C0/C1 control character + */ + return (1 + + (ucs >= 0x1100 && + (ucs <= 0x115f || /* Hangul Jamo init. consonants */ + ucs == 0x2329 || ucs == 0x232a || + (ucs >= 0x2e80 && ucs <= 0xa4cf && + ucs != 0x303f) || /* CJK ... Yi */ + (ucs >= 0xac00 && ucs <= 0xd7a3) || /* Hangul Syllables */ + (ucs >= 0xf900 && ucs <= 0xfaff) || /* CJK Compatibility Ideographs */ + (ucs >= 0xfe10 && ucs <= 0xfe19) || /* Vertical forms */ + (ucs >= 0xfe30 && ucs <= 0xfe6f) || /* CJK Compatibility Forms */ + (ucs >= 0xff00 && ucs <= 0xff60) || /* Fullwidth Forms */ + (ucs >= 0xffe0 && ucs <= 0xffe6) || + (ucs >= 0x20000 && ucs <= 0x2fffd) || + (ucs >= 0x30000 && ucs <= 0x3fffd)))); } /* @@ -127,39 +133,38 @@ static inline int teken_wcwidth(teken_char_t ucs) static inline teken_char_t teken_utf8_bytes_to_codepoint(uint8_t bytes[4], int nbytes) { + /* + * Check for malformed characters by comparing 'nbytes' to the byte + * length of the character. + * + * The table in section 3 of RFC 3629 defines 4 different values + * indicating the length of a UTF-8 byte sequence. + * + * 0xxxxxxx -> 1 byte + * 110xxxxx -> 2 bytes + * 1110xxxx -> 3 bytes + * 11110xxx -> 4 bytes + * + * The length is determined by the higher-order bits in the leading + * octet (except in the first case, where an MSB of 0 means a byte + * length of 1). Here we flip the 4 upper bits and count the leading + * zeros using __builtin_clz() to determine the number of bytes. + */ + if (__builtin_clz(~(bytes[0] & 0xf0) << 24) != nbytes) + return (TEKEN_UTF8_INVALID_CODEPOINT); - /* - * Check for malformed characters by comparing 'nbytes' - * to the byte length of the character. - * - * The table in section 3 of RFC 3629 defines 4 different - * values indicating the length of a UTF-8 byte sequence. - * - * 0xxxxxxx -> 1 byte - * 110xxxxx -> 2 bytes - * 1110xxxx -> 3 bytes - * 11110xxx -> 4 bytes - * - * The length is determined by the higher-order bits in - * the leading octet (except in the first case, where an MSB - * of 0 means a byte length of 1). Here we flip the 4 upper - * bits and count the leading zeros using __builtin_clz() - * to determine the number of bytes. - */ - if (__builtin_clz(~(bytes[0] & 0xf0) << 24) != nbytes) - return (TEKEN_UTF8_INVALID_CODEPOINT); - - switch (nbytes) { - case 1: - return (bytes[0] & 0x7f); - case 2: - return (bytes[0] & 0x1f) << 6 | (bytes[1] & 0x3f); - case 3: - return (bytes[0] & 0xf) << 12 | (bytes[1] & 0x3f) << 6 | (bytes[2] & 0x3f); - case 4: - return (bytes[0] & 0x7) << 18 | (bytes[1] & 0x3f) << 12 | - (bytes[2] & 0x3f) << 6 | (bytes[3] & 0x3f); - default: - return (TEKEN_UTF8_INVALID_CODEPOINT); - } + switch (nbytes) { + case 1: + return (bytes[0] & 0x7f); + case 2: + return (bytes[0] & 0x1f) << 6 | (bytes[1] & 0x3f); + case 3: + return (bytes[0] & 0xf) << 12 | (bytes[1] & 0x3f) << 6 | + (bytes[2] & 0x3f); + case 4: + return (bytes[0] & 0x7) << 18 | (bytes[1] & 0x3f) << 12 | + (bytes[2] & 0x3f) << 6 | (bytes[3] & 0x3f); + default: + return (TEKEN_UTF8_INVALID_CODEPOINT); + } } From nobody Sun Oct 22 14:59:52 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SD1h85zhqz4xQZ8; Sun, 22 Oct 2023 14:59: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 4SD1h85Pw3z4JqP; Sun, 22 Oct 2023 14:59:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697986792; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5G6aJzkFcoFsMgsALNJc2g78i2Wg9M4PsAqsLCgZaYU=; b=VTCRCnLTIVfj3QBeiBqWEZqVHMaH1gEcC/6QzZnIwtoFNms23NE5g0blElYZTJNi3yvEL8 HoqS6wIpegZV25lA5HlBBPftV0PEYGxh1WrNtaXzpY3ecpNfDXB3+/9LYOJaDFZ4wWcKxH lA0DggUe74qvjudVGd3FGd+Ab2rNnCBnMGdM4EczcEhzSW4YAWEhDimAs6IWIYvZPIPTnF uNoQxrskeXaLzk3NT9Orx+Bjm0HeYCK2oDk7x+RgirfT8tb9YLpinc18+zaCVwA7nSqXkE ixdCJCWzss2o2Zgc6RmlSbr6vbDhctqTZlsdZM4XWZd4DtL0TBaWdKT9XirQCA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697986792; a=rsa-sha256; cv=none; b=p1OO80ds0OFhnhAgR8vPMjt1DwBhJuAPlSsxaf5njLJu/Ub6RKzUWPNj+2o1cw8sKQc1QC OstVt6KzSrtBS/w0We4pnB/cmcLOAE1LyfxqTDPEUyLknfe3/Lfm/wjm2/bDp24rco/+HY ou05X3Bb8ik0jpW5nGF9lhIHyTjAOABFiBDbQ71z5NBPXZB/Pw7uHo8A85xhk/iVGGL/JY eaL59SwbkcV+68Dk+Kl+a+Ty8APAvO43+LPCwbVlRfP7vDd2rlzVMjwmyb9K2LRn7cjcvN WhQRB94UQAMLTPlKvicAco19kMmPzj6NRdFEeRUetEYi3Y5BIEn16qz/iDdGeA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697986792; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5G6aJzkFcoFsMgsALNJc2g78i2Wg9M4PsAqsLCgZaYU=; b=qVCsZDWOAMc6pqWtuIz40s3RqNXwj86XtLLo+J4Uww6l7MqLEErFOs/hkU0tnZp9A7r+L+ S9rv1ihaYqlcAwKEhp1Zw3EDhDA7bmIBgVuj9T7r6XQSwH5r7MCxhyUGAt8dXuCNYvV611 Iaq8rI7XC2ULUpVBvoMuDQnCsZTWnVUnM43OtU+x5bkzFpXINYPWpwgvsOMpaTEEYWyfZi arEC9HoHss04MKKW/VuEd4BIv3jq1XW7cUQFtSNNMUVcE6YO3uFQmoD8CS0V43qjrFV8gZ nZdy4uYeatW9cU6QMqhxkHjOupFS5IPOjR+zJTmzxxLizs5EPNYUi/1E1VJJ/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 4SD1h84Qc3z11RM; Sun, 22 Oct 2023 14:59: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 39MExqSw016343; Sun, 22 Oct 2023 14:59:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39MExqgm016340; Sun, 22 Oct 2023 14:59:52 GMT (envelope-from git) Date: Sun, 22 Oct 2023 14:59:52 GMT Message-Id: <202310221459.39MExqgm016340@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: 63f537551380 - main - Add expected failure for tmpfs atime test failing on FreeBSD List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 63f537551380d2dab29fa402ad1269feae17e594 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=63f537551380d2dab29fa402ad1269feae17e594 commit 63f537551380d2dab29fa402ad1269feae17e594 Author: Ed Maste AuthorDate: 2023-10-21 15:15:14 +0000 Commit: Ed Maste CommitDate: 2023-10-22 14:58:52 +0000 Add expected failure for tmpfs atime test failing on FreeBSD PR: 274615 Reviewed by: ngie Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D42321 --- contrib/netbsd-tests/fs/tmpfs/t_times.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/contrib/netbsd-tests/fs/tmpfs/t_times.sh b/contrib/netbsd-tests/fs/tmpfs/t_times.sh index f83dfe8f5929..f7676814fa71 100755 --- a/contrib/netbsd-tests/fs/tmpfs/t_times.sh +++ b/contrib/netbsd-tests/fs/tmpfs/t_times.sh @@ -36,6 +36,10 @@ empty_head() { atf_set "require.user" "root" } empty_body() { + # Begin FreeBSD + atf_expect_fail "Incorrect atime on FreeBSD: PR274615" + # End FreeBSD + test_mount atf_check -s eq:0 -o empty -e empty touch a From nobody Sun Oct 22 15:04:47 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SD1nq46fHz4xR4T; Sun, 22 Oct 2023 15:04:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SD1nq3Zw2z4Lvm; Sun, 22 Oct 2023 15:04:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697987087; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JS6em8wa5TN3H3zLI+nJsDYyYUS01dkEdLMERT3ZnXo=; b=eOEPC4jVTrXfmb09H9DClyBZCvsEcBpQYtZ0nKVllHwHuXctjzoyCmsqOaQEiafvtCmkZN sM23HL+6kXy9oymwn3pEIgnXmaUVPvQZ6vIAW44YsuGWjwXyxpQQTx1pt39Z7VMiuy9AHN o6E1G65wa1SAJNusSz8COZ/4GF10GFdVwB/qVfBOgQcUAZShST6u4X+vwryHeeUiPkp/C6 MYTlIL42kztGKUSkOOfmNmPH++xfUG4/PtQZM3HfDPGTr6jUpLB1bDv7EH749kMzp9vSmj SdqEo3vIL1m0ZhysuLpN7c+YKaeyGUT4GQ1ZfJ2pyjAPMSCXW1aiLApDvVczNA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697987087; a=rsa-sha256; cv=none; b=LLA2PThIwgKvenrtSm5049AbG0fxcRUdkBoC92NeUFs/aFWzgCt6WSfskmOs8KJQMz5o1Z gEzr9Sl/PBENmC6abWhy0kEShzittNhnpFEtAmWCheE83KYwZhBTSRlQl/DY/yoqHhcvgc hZUpnlTaD4RmZemQE9y/KrkqbVF0yx8OBRGnugXGVSa06SCj0Y5NaFKsD76wn4+kTfu9Ih F94m7qlEzav/0zBks1m2yNl41zWXyqZMotCM8WLPJGipk2skzxFoKMqphoPtw4TUQ7TXMA pC35k9v4U5kwgAMXuVDiDE9g9fYrkwQJV2hijE3Ojm1ONkF7Ht/CUESP65+Uvw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697987087; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JS6em8wa5TN3H3zLI+nJsDYyYUS01dkEdLMERT3ZnXo=; b=VvMedqk3pfYLl1CyGLredW9ZnilL4w0BSQBw/BAv2br1rwfXFZcIixz6nBo3tn799U0LsH sapbPz445W/7v9rbOipRvV4iGYI1huYNPCeENAbhzUfJy6SsEW7BnUl8uxnsmtsuLYK02K 9QaysdJY3C5E6sEoQ/f/ZOoM6ONyp7XKfyW0cIW8X/usr4iZTJAKIpJ9oehV6hSeytNoyO gtx/mQtvtV802nODKxOx6x0v2N5gOoSWSrwIMZ/ZzfelkoDYpV4TO5HX316TGoP2JAstzo 2YUvn8I2YgeS9sUKaf1vF+G5QdRbpNXxzlxDB6IIPGckOJMGOYFoa4rvxWPJqw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SD1nq2fxRz12Cj; Sun, 22 Oct 2023 15:04:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39MF4loS033550; Sun, 22 Oct 2023 15:04:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39MF4lJu033547; Sun, 22 Oct 2023 15:04:47 GMT (envelope-from git) Date: Sun, 22 Oct 2023 15:04:47 GMT Message-Id: <202310221504.39MF4lJu033547@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 41d1dc7005f0 - releng/14.0 - kmsan: Set -fno-sanitize-memory-param-retval for now List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.0 X-Git-Reftype: branch X-Git-Commit: 41d1dc7005f010074c1e6f7fc8adf44dcbd473cf Auto-Submitted: auto-generated The branch releng/14.0 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=41d1dc7005f010074c1e6f7fc8adf44dcbd473cf commit 41d1dc7005f010074c1e6f7fc8adf44dcbd473cf Author: Mark Johnston AuthorDate: 2023-10-16 19:45:42 +0000 Commit: Mark Johnston CommitDate: 2023-10-22 15:01:26 +0000 kmsan: Set -fno-sanitize-memory-param-retval for now As of LLVM 16, -fsanitize-memory-param-retval is the default. It yields significantly smaller code, but the KMSAN runtime interceptors need to be updated to stop checking shadow state of parameters. Apply a minimal workaround for now. Approved by: re (gjb) MFC after: 3 days Sponsored by: Klara, Inc. Sponsored by: Juniper Networks, Inc. (cherry picked from commit b6c653c9746342b373af01979319b3cb123b2872) (cherry picked from commit c89523d1c4be8f3408fb591261f3093b65dbb675) --- sys/conf/files | 2 +- sys/conf/kern.pre.mk | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sys/conf/files b/sys/conf/files index 8d38b9cc8a2e..b9763d167812 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -3871,7 +3871,7 @@ kern/subr_mchain.c optional libmchain kern/subr_memdesc.c standard kern/subr_module.c standard kern/subr_msan.c optional kmsan \ - compile-with "${NORMAL_C:N-fsanitize*:N-fstack-protector*}" + compile-with "${NORMAL_C:N-fsanitize*:N-fno-sanitize*:N-fstack-protector*}" kern/subr_msgbuf.c standard kern/subr_param.c standard kern/subr_pcpu.c standard diff --git a/sys/conf/kern.pre.mk b/sys/conf/kern.pre.mk index 4d37cd4156f0..158175eb6899 100644 --- a/sys/conf/kern.pre.mk +++ b/sys/conf/kern.pre.mk @@ -122,8 +122,11 @@ SAN_CFLAGS+= -DSAN_NEEDS_INTERCEPTORS -DSAN_INTERCEPTOR_PREFIX=kcsan \ KMSAN_ENABLED!= grep KMSAN opt_global.h || true ; echo .if !empty(KMSAN_ENABLED) +# Disable -fno-sanitize-memory-param-retval until interceptors have been +# updated to work properly with it. SAN_CFLAGS+= -DSAN_NEEDS_INTERCEPTORS -DSAN_INTERCEPTOR_PREFIX=kmsan \ - -fsanitize=kernel-memory + -fsanitize=kernel-memory \ + -fno-sanitize-memory-param-retval .endif KUBSAN_ENABLED!= grep KUBSAN opt_global.h || true ; echo From nobody Sun Oct 22 15:04:48 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SD1nr5392z4xQxK; Sun, 22 Oct 2023 15:04: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 4SD1nr4Cp6z4Ly8; Sun, 22 Oct 2023 15:04:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697987088; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=v0/U0zFU9pelTb+lC5sjpit2EHUhvbKeavxoSLNfvOM=; b=EmFn+t0AKXLlfF3NJg63nZIjWZ06PqnVtY5Oz1hhOjHO4+fMStBEz2juQ/wBWKbw9iZ7km 3qm1caNzjAfTKALaF8ARaE/vvuxIUdtNQVlm0kDr/Y9cLHplnTau8sGNkVYSQ1Trk1PQ6F kNUtgWGr5XSAlf+uytu5QdLRLguexjRdq6JyEA/bIuE/VXooEfhp79+lHJNJiAQC9sdyft gVjJaNNKb0YPNWpxdtFXqkywxH4f8OJBTRA9jWiMSlWDI65C1NANR4cwmXerGn7+Wii3pL 5ljFyf0hbYEmTaUSf3fOxs6Bl73BGDacwuAfpMWN+BNmqZbiK/N+clAD8MTLlA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697987088; a=rsa-sha256; cv=none; b=QePwuXb9UDvcJMdQvcChOKSS0tB6AUC69QeNyJp5h9ZkzoEmCM4gf4QV56VssMBZUQ7fAH iK6P8uS8PJ/juuM11JIYw9xU/X5i/7y7DDLnATh7Bc08a7D4FKnbqg3c+LoExLlkfFBTR4 ZinvmgEfRPoWsnaq8fYa94jRseCR1LO53f/8FXR7TGLM/rzv2g28nPlKiyMpjN/6m20hoO VmBQhwm27v7WMvZBeK49Cidh6eVPLN3s4lf/3ISWXsUTwCDDRxgJ1h5w7pp9/9Tu8fD7sI fZnK8we0lT8hja3KNNOFV7/ieJ1q1OSDeiN7FUioc2SOUw5MGmYKUu+pIIg3tQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697987088; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=v0/U0zFU9pelTb+lC5sjpit2EHUhvbKeavxoSLNfvOM=; b=woGoIw/qd/3Bz49Y//SQhnOIWnrMeHXFY50S/XKaNBTiI865Xs7ZrjLO8FzKX7FgIRe0Fh E8u6CJ2XXUt+jeyhUf4jKjnQ6+93KGXQf3XfVGbBn/IC6A8F9CVDELrNv7qhjZH9p1LuiR RlVdxxUt9GS09p5MrZ4NhIvFrnG3EZHPRtFMOti5eOxvZT1c0Wf+BaqQgMnMFMEPN5MRfP WWpB0seGwxprkmXTs3TTHOZY5uEGtuFbmwVruovWNqKjCNv5TVxj4pGM0dQUMszTPsV91C 7q7KGnJQH1KRkcDrc2101K7dPIMJwY7fet0EC6xDL5HqIV9chI0dyvAMpKwHgw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SD1nr377tz11w6; Sun, 22 Oct 2023 15:04: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 39MF4mGH033595; Sun, 22 Oct 2023 15:04:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39MF4mr2033592; Sun, 22 Oct 2023 15:04:48 GMT (envelope-from git) Date: Sun, 22 Oct 2023 15:04:48 GMT Message-Id: <202310221504.39MF4mr2033592@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 315dd7f2e12a - releng/14.0 - ktrace: Handle uio_resid underflow via MSG_TRUNC List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.0 X-Git-Reftype: branch X-Git-Commit: 315dd7f2e12a21e47da75f0ce8c1c5a1611810b8 Auto-Submitted: auto-generated The branch releng/14.0 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=315dd7f2e12a21e47da75f0ce8c1c5a1611810b8 commit 315dd7f2e12a21e47da75f0ce8c1c5a1611810b8 Author: Mark Johnston AuthorDate: 2023-10-16 20:11:55 +0000 Commit: Mark Johnston CommitDate: 2023-10-22 15:01:31 +0000 ktrace: Handle uio_resid underflow via MSG_TRUNC When recvmsg(2) is used with MSG_TRUNC on an atomic socket type (DGRAM or SEQPACKET), soreceive_generic() and uipc_peek_dgram() may intentionally underflow uio_resid so that userspace can find out how many bytes it should have asked for. If this happens, and KTR_GENIO is enabled, ktrgenio() will attempt to copy in beyond the end of the output buffer's iovec. In general this will silently cause the ktrace operation to fail since it'll result in EFAULT from uiomove(). Let's be more careful and make sure not to try and copy more bytes than we have. Approved by: re (gjb) Fixes: be1f485d7d6b ("sockets: add MSG_TRUNC flag handling for recvfrom()/recvmsg().") Reported by: syzbot+30b4bb0c0bc0f53ac198@syzkaller.appspotmail.com Reviewed by: kib MFC after: 3 days Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D42099 (cherry picked from commit 761ae1ce798add862d78728cc5ac5240ce7db779) (cherry picked from commit eb965d4f0309514893745e6cfae998495e76d941) --- sys/kern/uipc_syscalls.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/kern/uipc_syscalls.c b/sys/kern/uipc_syscalls.c index 2dad9d487290..c7c2e6544902 100644 --- a/sys/kern/uipc_syscalls.c +++ b/sys/kern/uipc_syscalls.c @@ -948,7 +948,8 @@ kern_recvit(struct thread *td, int s, struct msghdr *mp, enum uio_seg fromseg, AUDIT_ARG_SOCKADDR(td, AT_FDCWD, fromsa); #ifdef KTRACE if (ktruio != NULL) { - ktruio->uio_resid = len - auio.uio_resid; + /* MSG_TRUNC can trigger underflow of uio_resid. */ + ktruio->uio_resid = MIN(len - auio.uio_resid, len); ktrgenio(s, UIO_READ, ktruio, error); } #endif From nobody Sun Oct 22 15:04:49 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SD1nt2Vwrz4xR1t; Sun, 22 Oct 2023 15:04: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 4SD1ns5T9yz4M1g; Sun, 22 Oct 2023 15:04:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697987089; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ym7FCM7+7H4HGRV1Re3OzvfWsrZvgeLuAZbZ25Ci8sU=; b=ZQDLeU4oVNPrYom0jzdGAPTPUgf7/wP7dN0g3zj1lNCA6uueeKw83ngr2yZ9q0UHVitgwp teQXNkupYZTaazrQJKxUctzaeT3E/PVgY4WTy5yI3tZrfDo3x0rPdZqY9aoCqYlTJDlAH0 pQhkdbIuhIkvmGbsbaYreQnycrg2NnSSKHZv82bqK8ujtSeQmc8WLlistxM17+OUVwyPa5 k+LjF28MppbpXKEFAUfmxuAkmsDDHqKHZDskgYi2F7s2RDihHutZkWcqVUD50Z1KFBduzZ T6z/xgVCb5DUnkbkv8kaIHG/KxifKbWqof8WioPGxGMM76mrNMKdvqrqlaCDUg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697987089; a=rsa-sha256; cv=none; b=OGzbBiH0hfd2iKSbi7OvkZNXGTk5ONp8QkbETVf8a2tOwf+u3/yNoMmDW67j2GX5aqsPEr rP4jeYJLotIj+qGJPc6yJjbPs5Xrve5GPIvPjjwuUeeNh7h/g3FXNzxDjjwp1JlWV7DvQP 1HN+A++eZ/yqcjo424wbz4k2FAeEC8zTTjVeCDKoh7TVZRc5y9g5uEd3a/j4j1tlSxH38q 9YnP+3YdS2nvYUWBsAddzFXzJ/r/k1ihs7TmfECjYcdeA7blMeA+rYV3kFeJIGyyi+kswp we8zGDWiyKrnSa6jyk00WqITEpPZq54nYqnqEGg0cQ1un4yt1fzUYEgyKmQaaA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697987089; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ym7FCM7+7H4HGRV1Re3OzvfWsrZvgeLuAZbZ25Ci8sU=; b=UzzFfkwmgiOVkXrYyYz2kfNeuDCYvDdmZVfRk8Gc6NI2XJZ7Kfcr7mJvNsiiuCulyN30pp AhSyns1w7Go2UalT5XFkE7VM9cn92TYKw5EYoAV3nLlqX7DH14L7t0UIP8gf44A3bFqRjH ++gmVVXVkzbmd6wN/8RP8hAYqYb43XgePnYbNToc0o8wnx5SuIfVK5MeVYyncITeIelBuV TqLRLWZRXA55beOyBDTydM3tMqTSGI+r7mKDkJjOgzMY1bAWEJg7gGbA9GSgv2zDeWGZWU Pqn2QrM5iO8tK/clBTlKl4nzmm4sx1/UIXXnKEsRgpomohBrahBXDBa1BvXJEw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SD1ns4NcWz12Ck; Sun, 22 Oct 2023 15:04: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 39MF4nhO033639; Sun, 22 Oct 2023 15:04:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39MF4nrs033636; Sun, 22 Oct 2023 15:04:49 GMT (envelope-from git) Date: Sun, 22 Oct 2023 15:04:49 GMT Message-Id: <202310221504.39MF4nrs033636@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: e4d86dda3413 - releng/14.0 - amd64: Zero-fill AP PCPU pages List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.0 X-Git-Reftype: branch X-Git-Commit: e4d86dda34133fdeb8674fc8774be3c311a374b1 Auto-Submitted: auto-generated The branch releng/14.0 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=e4d86dda34133fdeb8674fc8774be3c311a374b1 commit e4d86dda34133fdeb8674fc8774be3c311a374b1 Author: Mark Johnston AuthorDate: 2023-10-16 22:40:21 +0000 Commit: Mark Johnston CommitDate: 2023-10-22 15:01:36 +0000 amd64: Zero-fill AP PCPU pages At least KMSAN relies on zero-initialization of AP PCPU regions, see commit 4b136ef259ce. Prior to commit af1c6d3f3013 these were allocated with allocpages() in the amd64 pmap, which always returns zero-initialized memory. Approved by: re (gjb) Reviewed by: kib Fixes: af1c6d3f3013 ("amd64: do not leak pcpu pages") MFC after: 3 days Sponsored by: Klara, Inc. Sponsored by: Juniper Networks, Inc. Differential Revision: https://reviews.freebsd.org/D42241 (cherry picked from commit a37e484d049758c70f2d61be0d28a115b6f2f01e) (cherry picked from commit 4533fa42ad912537a15d72068f2cfca46a465521) --- sys/amd64/amd64/mp_machdep.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sys/amd64/amd64/mp_machdep.c b/sys/amd64/amd64/mp_machdep.c index ec4501c3aeed..d506ffada4b9 100644 --- a/sys/amd64/amd64/mp_machdep.c +++ b/sys/amd64/amd64/mp_machdep.c @@ -300,11 +300,12 @@ amd64_mp_alloc_pcpu(void) m = NULL; if (vm_ndomains > 1) { m = vm_page_alloc_noobj_domain( - acpi_pxm_get_cpu_locality(cpu_apic_ids[cpu]), 0); + acpi_pxm_get_cpu_locality(cpu_apic_ids[cpu]), + VM_ALLOC_ZERO); } if (m == NULL) #endif - m = vm_page_alloc_noobj(0); + m = vm_page_alloc_noobj(VM_ALLOC_ZERO); if (m == NULL) panic("cannot alloc pcpu page for cpu %d", cpu); pmap_qenter((vm_offset_t)&__pcpu[cpu], &m, 1); From nobody Sun Oct 22 17:04:13 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SD4Rf4q5Hz4xZ8p; Sun, 22 Oct 2023 17:04: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 4SD4Rf4T4lz4b9Y; Sun, 22 Oct 2023 17:04:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697994254; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Q4mDcpYQ1KBm823Vy1OiV5KSRxZvWWXHjZggLrq7AYw=; b=ifTqVB16VZ2gglwtQoukPDxbWXgGKzofMNfzN5l0qLVZ8wJ1/rWe+Dr8gyH9TGFQUEplbo al7UxwbzTSCGGC6xYwdcfCrkAlAqh6jbI9lP4IyWs8Db4Rmzdwj/ecaxw8bvdSk0Hmzd6P KbEuGqjKGDwhP+7h03hInjsyYCYnhPM40xlcHgZF1QrmOtXIC5mlpvkCaqkBlzrNvx50ys V8W+XI7IAMf0Hn2kXLixErkhJlNfsW+rz0qFr3RwBfbcp1QAh2mH+MzzVQNqXAHb3nsWKO iR6l02ZYa/VgKbh4x/MM4dLMx4pZx9K6t+FDglQlB6XZe6BPzABy9O84r+HWQA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697994254; a=rsa-sha256; cv=none; b=EBzHp2cUqJ3qdW9Mc9nTiacHNIyg1rz4yh/gWDoE4Bg+lOeIJE5oNiU0Y51/PWfvknhYZ0 5vXWxOFerEe6OdiPAlBQ83/JoRDgDG3MOt/EA52xphdQW2sy8ktj+17ow10sLTe7i5iOIt 8qdo2I3eNvnbmhLFoRVw6wRCBfsusXMRZWndFAtZqqmfe6gBDdydzhjCMectdcforXxxWE 6cf4jsWBwWhUdXib6aARq5aOzMLDoEhsWcRvPoiNlY6X6G2qP0TkMNxjbmm0Pnfpb5/O75 3CJNXEMxhsCRU+L/arD0vWLXvQZBLZbpHVkUAcFgpm64a0Qm87dLxHUmtalzrg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697994254; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Q4mDcpYQ1KBm823Vy1OiV5KSRxZvWWXHjZggLrq7AYw=; b=nevHlPmb2WMxDnE6xzCQ1PAPLxLDl6g2grxNxU+U/pIYr0ICAKApyYFxDRbzRlM5pKJujN r0yM2pa3ue2GlHkM7m/G5GC8Xly9HeayaTu4q9UPztJUS1xKCoXDYL4KKrDVHyOcClBj3Q 2dgWhmEuzHPGNL87R3hDDpz8UCZNwa2lm+zcDb3E3pSVmryAMw4y19oh4sV0z3c3XZ5q+7 BXD+TSwcjz8cTTU/2aoHSm72v9ArtARiEmR3ABC6HZVPJTK6uWF73BFPpHkikpvBIHSvRp sNAzV69TWk0RxlbqrThLk3juEcK08arudOAim/P6LSU4nCMeZCs57QgcMs/uFA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SD4Rf3V3yz15SD; Sun, 22 Oct 2023 17:04: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 39MH4EDZ034112; Sun, 22 Oct 2023 17:04:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39MH4D7a034109; Sun, 22 Oct 2023 17:04:13 GMT (envelope-from git) Date: Sun, 22 Oct 2023 17:04:13 GMT Message-Id: <202310221704.39MH4D7a034109@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: 22b267e82371 - main - zfs: merge openzfs/zfs@797f55ef1 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 22b267e823719ef22790ed548fb11da8aa81d1ae Auto-Submitted: auto-generated The branch main has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=22b267e823719ef22790ed548fb11da8aa81d1ae commit 22b267e823719ef22790ed548fb11da8aa81d1ae Merge: 63f537551380 797f55ef12d7 Author: Martin Matuska AuthorDate: 2023-10-22 16:25:23 +0000 Commit: Martin Matuska CommitDate: 2023-10-22 16:26:16 +0000 zfs: merge openzfs/zfs@797f55ef1 Notable upstream pull request merges: #14378 c0e58995e Large sync writes perform worse with slog #14721 797f55ef1 Do not persist user/group/project quota zap objects when unneeded #15356 380c25f64 FreeBSD: Improve taskq wrapper #15390 4fbc52495 Remove lock from dsl_pool_need_dirty_delay() #15397 57b409856 Trust ARC_BUF_SHARED() more #15402 b29e98fa8 Properly pad struct tx_cpu to cache line #15405 ea30b5a9e Set spa_ccw_fail_time=0 when expanding a vdev #15416 b9384b949 FreeBSD: taskq: Remove unused declaration Obtained from: OpenZFS OpenZFS commit: 797f55ef12d752d2a7fb04fae5d24e019adf2a1d sys/contrib/openzfs/cmd/zed/agents/zfs_mod.c | 55 ++++-- sys/contrib/openzfs/include/libzutil.h | 2 +- .../openzfs/include/os/freebsd/spl/sys/taskq.h | 18 +- sys/contrib/openzfs/include/sys/txg_impl.h | 3 +- .../lib/libzutil/os/linux/zutil_import_os.c | 5 +- sys/contrib/openzfs/man/man4/zfs.4 | 2 +- .../openzfs/module/os/freebsd/spl/spl_taskq.c | 76 ++++---- sys/contrib/openzfs/module/zfs/arc.c | 41 +++-- sys/contrib/openzfs/module/zfs/dsl_pool.c | 14 +- sys/contrib/openzfs/module/zfs/vdev.c | 1 + sys/contrib/openzfs/module/zfs/zfs_quota.c | 18 +- sys/contrib/openzfs/module/zfs/zil.c | 2 +- sys/contrib/openzfs/tests/runfiles/linux.run | 8 +- .../openzfs/tests/test-runner/bin/zts-report.py.in | 1 + .../openzfs/tests/zfs-tests/include/commands.cfg | 9 +- .../openzfs/tests/zfs-tests/tests/Makefile.am | 1 + .../tests/functional/cli_user/misc/misc.cfg | 4 +- .../functional/fault/auto_replace_001_pos.ksh | 41 ++++- .../functional/fault/auto_replace_002_pos.ksh | 192 +++++++++++++++++++++ .../tests/functional/procfs/pool_state.ksh | 6 +- sys/modules/zfs/zfs_config.h | 4 +- sys/modules/zfs/zfs_gitrev.h | 2 +- 22 files changed, 386 insertions(+), 119 deletions(-) diff --cc sys/contrib/openzfs/tests/zfs-tests/tests/functional/fault/auto_replace_002_pos.ksh index 000000000000,2259e604317b..2259e604317b mode 000000,100755..100755 --- a/sys/contrib/openzfs/tests/zfs-tests/tests/functional/fault/auto_replace_002_pos.ksh +++ b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/fault/auto_replace_002_pos.ksh diff --cc sys/modules/zfs/zfs_config.h index a41af071ec5d,000000000000..e91cf5f22368 mode 100644,000000..100644 --- a/sys/modules/zfs/zfs_config.h +++ b/sys/modules/zfs/zfs_config.h @@@ -1,1149 -1,0 +1,1149 @@@ +/* + */ + +/* zfs_config.h. Generated from zfs_config.h.in by configure. */ +/* zfs_config.h.in. Generated from configure.ac by autoheader. */ + +/* Define to 1 if translation of program messages to the user's native + language is requested. */ +/* #undef ENABLE_NLS */ + +/* bio_end_io_t wants 1 arg */ +/* #undef HAVE_1ARG_BIO_END_IO_T */ + +/* lookup_bdev() wants 1 arg */ +/* #undef HAVE_1ARG_LOOKUP_BDEV */ + +/* submit_bio() wants 1 arg */ +/* #undef HAVE_1ARG_SUBMIT_BIO */ + +/* bdi_setup_and_register() wants 2 args */ +/* #undef HAVE_2ARGS_BDI_SETUP_AND_REGISTER */ + +/* vfs_getattr wants 2 args */ +/* #undef HAVE_2ARGS_VFS_GETATTR */ + +/* zlib_deflate_workspacesize() wants 2 args */ +/* #undef HAVE_2ARGS_ZLIB_DEFLATE_WORKSPACESIZE */ + +/* bdi_setup_and_register() wants 3 args */ +/* #undef HAVE_3ARGS_BDI_SETUP_AND_REGISTER */ + +/* vfs_getattr wants 3 args */ +/* #undef HAVE_3ARGS_VFS_GETATTR */ + +/* vfs_getattr wants 4 args */ +/* #undef HAVE_4ARGS_VFS_GETATTR */ + +/* kernel has access_ok with 'type' parameter */ +/* #undef HAVE_ACCESS_OK_TYPE */ + +/* posix_acl has refcount_t */ +/* #undef HAVE_ACL_REFCOUNT */ + +/* add_disk() returns int */ +/* #undef HAVE_ADD_DISK_RET */ + +/* Define if host toolchain supports AES */ +#define HAVE_AES 1 + +/* Define if you have [rt] */ +#define HAVE_AIO_H 1 + +#ifdef __amd64__ +#ifndef RESCUE +/* Define if host toolchain supports AVX */ +#define HAVE_AVX 1 +#endif + +/* Define if host toolchain supports AVX2 */ +#define HAVE_AVX2 1 + +/* Define if host toolchain supports AVX512BW */ +#define HAVE_AVX512BW 1 + +/* Define if host toolchain supports AVX512CD */ +#define HAVE_AVX512CD 1 + +/* Define if host toolchain supports AVX512DQ */ +#define HAVE_AVX512DQ 1 + +/* Define if host toolchain supports AVX512ER */ +#define HAVE_AVX512ER 1 + +/* Define if host toolchain supports AVX512F */ +#define HAVE_AVX512F 1 + +/* Define if host toolchain supports AVX512IFMA */ +#define HAVE_AVX512IFMA 1 + +/* Define if host toolchain supports AVX512PF */ +#define HAVE_AVX512PF 1 + +/* Define if host toolchain supports AVX512VBMI */ +#define HAVE_AVX512VBMI 1 + +/* Define if host toolchain supports AVX512VL */ +#define HAVE_AVX512VL 1 +#endif + +/* bdevname() is available */ +/* #undef HAVE_BDEVNAME */ + +/* bdev_check_media_change() exists */ +/* #undef HAVE_BDEV_CHECK_MEDIA_CHANGE */ + +/* bdev_*_io_acct() available */ +/* #undef HAVE_BDEV_IO_ACCT_63 */ + +/* bdev_*_io_acct() available */ +/* #undef HAVE_BDEV_IO_ACCT_OLD */ + +/* bdev_kobj() exists */ +/* #undef HAVE_BDEV_KOBJ */ + +/* bdev_max_discard_sectors() is available */ +/* #undef HAVE_BDEV_MAX_DISCARD_SECTORS */ + +/* bdev_max_secure_erase_sectors() is available */ +/* #undef HAVE_BDEV_MAX_SECURE_ERASE_SECTORS */ + +/* block_device_operations->submit_bio() returns void */ +/* #undef HAVE_BDEV_SUBMIT_BIO_RETURNS_VOID */ + +/* bdev_whole() is available */ +/* #undef HAVE_BDEV_WHOLE */ + +/* bio_alloc() takes 4 arguments */ +/* #undef HAVE_BIO_ALLOC_4ARG */ + +/* bio->bi_bdev->bd_disk exists */ +/* #undef HAVE_BIO_BDEV_DISK */ + +/* bio->bi_opf is defined */ +/* #undef HAVE_BIO_BI_OPF */ + +/* bio->bi_status exists */ +/* #undef HAVE_BIO_BI_STATUS */ + +/* bio has bi_iter */ +/* #undef HAVE_BIO_BVEC_ITER */ + +/* bio_*_io_acct() available */ +/* #undef HAVE_BIO_IO_ACCT */ + +/* bio_max_segs() is implemented */ +/* #undef HAVE_BIO_MAX_SEGS */ + +/* bio_set_dev() is available */ +/* #undef HAVE_BIO_SET_DEV */ + +/* bio_set_dev() GPL-only */ +/* #undef HAVE_BIO_SET_DEV_GPL_ONLY */ + +/* bio_set_dev() is a macro */ +/* #undef HAVE_BIO_SET_DEV_MACRO */ + +/* bio_set_op_attrs is available */ +/* #undef HAVE_BIO_SET_OP_ATTRS */ + +/* blkdev_get_by_path() exists and takes 4 args */ +/* #undef HAVE_BLKDEV_GET_BY_PATH_4ARG */ + +/* blkdev_get_by_path() handles ERESTARTSYS */ +/* #undef HAVE_BLKDEV_GET_ERESTARTSYS */ + +/* blkdev_issue_discard() is available */ +/* #undef HAVE_BLKDEV_ISSUE_DISCARD */ + +/* blkdev_issue_secure_erase() is available */ +/* #undef HAVE_BLKDEV_ISSUE_SECURE_ERASE */ + +/* blkdev_put() accepts void* as arg 2 */ +/* #undef HAVE_BLKDEV_PUT_HOLDER */ + +/* blkdev_reread_part() exists */ +/* #undef HAVE_BLKDEV_REREAD_PART */ + +/* blkg_tryget() is available */ +/* #undef HAVE_BLKG_TRYGET */ + +/* blkg_tryget() GPL-only */ +/* #undef HAVE_BLKG_TRYGET_GPL_ONLY */ + +/* blk_alloc_disk() exists */ +/* #undef HAVE_BLK_ALLOC_DISK */ + +/* blk_alloc_queue() expects request function */ +/* #undef HAVE_BLK_ALLOC_QUEUE_REQUEST_FN */ + +/* blk_alloc_queue_rh() expects request function */ +/* #undef HAVE_BLK_ALLOC_QUEUE_REQUEST_FN_RH */ + +/* blk_cleanup_disk() exists */ +/* #undef HAVE_BLK_CLEANUP_DISK */ + +/* blk_mode_t is defined */ +/* #undef HAVE_BLK_MODE_T */ + +/* block multiqueue is available */ +/* #undef HAVE_BLK_MQ */ + +/* blk queue backing_dev_info is dynamic */ +/* #undef HAVE_BLK_QUEUE_BDI_DYNAMIC */ + +/* blk_queue_discard() is available */ +/* #undef HAVE_BLK_QUEUE_DISCARD */ + +/* blk_queue_flag_clear() exists */ +/* #undef HAVE_BLK_QUEUE_FLAG_CLEAR */ + +/* blk_queue_flag_set() exists */ +/* #undef HAVE_BLK_QUEUE_FLAG_SET */ + +/* blk_queue_flush() is available */ +/* #undef HAVE_BLK_QUEUE_FLUSH */ + +/* blk_queue_flush() is GPL-only */ +/* #undef HAVE_BLK_QUEUE_FLUSH_GPL_ONLY */ + +/* blk_queue_secdiscard() is available */ +/* #undef HAVE_BLK_QUEUE_SECDISCARD */ + +/* blk_queue_secure_erase() is available */ +/* #undef HAVE_BLK_QUEUE_SECURE_ERASE */ + +/* blk_queue_update_readahead() exists */ +/* #undef HAVE_BLK_QUEUE_UPDATE_READAHEAD */ + +/* blk_queue_write_cache() exists */ +/* #undef HAVE_BLK_QUEUE_WRITE_CACHE */ + +/* blk_queue_write_cache() is GPL-only */ +/* #undef HAVE_BLK_QUEUE_WRITE_CACHE_GPL_ONLY */ + +/* BLK_STS_RESV_CONFLICT is defined */ +/* #undef HAVE_BLK_STS_RESV_CONFLICT */ + +/* Define if release() in block_device_operations takes 1 arg */ +/* #undef HAVE_BLOCK_DEVICE_OPERATIONS_RELEASE_1ARG */ + +/* Define if revalidate_disk() in block_device_operations */ +/* #undef HAVE_BLOCK_DEVICE_OPERATIONS_REVALIDATE_DISK */ + +/* Define to 1 if you have the Mac OS X function CFLocaleCopyCurrent in the + CoreFoundation framework. */ +/* #undef HAVE_CFLOCALECOPYCURRENT */ + +/* Define to 1 if you have the Mac OS X function + CFLocaleCopyPreferredLanguages in the CoreFoundation framework. */ +/* #undef HAVE_CFLOCALECOPYPREFERREDLANGUAGES */ + +/* Define to 1 if you have the Mac OS X function CFPreferencesCopyAppValue in + the CoreFoundation framework. */ +/* #undef HAVE_CFPREFERENCESCOPYAPPVALUE */ + +/* check_disk_change() exists */ +/* #undef HAVE_CHECK_DISK_CHANGE */ + +/* clear_inode() is available */ +/* #undef HAVE_CLEAR_INODE */ + +/* dentry uses const struct dentry_operations */ +/* #undef HAVE_CONST_DENTRY_OPERATIONS */ + +/* copy_from_iter() is available */ +/* #undef HAVE_COPY_FROM_ITER */ + +/* copy_splice_read exists */ +/* #undef HAVE_COPY_SPLICE_READ */ + +/* copy_to_iter() is available */ +/* #undef HAVE_COPY_TO_ITER */ + +/* cpu_has_feature() is GPL-only */ +/* #undef HAVE_CPU_HAS_FEATURE_GPL_ONLY */ + +/* yes */ +/* #undef HAVE_CPU_HOTPLUG */ + +/* current_time() exists */ +/* #undef HAVE_CURRENT_TIME */ + +/* Define if the GNU dcgettext() function is already present or preinstalled. + */ +/* #undef HAVE_DCGETTEXT */ + +/* DECLARE_EVENT_CLASS() is available */ +/* #undef HAVE_DECLARE_EVENT_CLASS */ + +/* dentry aliases are in d_u member */ +/* #undef HAVE_DENTRY_D_U_ALIASES */ + +/* dequeue_signal() takes 4 arguments */ +/* #undef HAVE_DEQUEUE_SIGNAL_4ARG */ + +/* lookup_bdev() wants dev_t arg */ +/* #undef HAVE_DEVT_LOOKUP_BDEV */ + +/* sops->dirty_inode() wants flags */ +/* #undef HAVE_DIRTY_INODE_WITH_FLAGS */ + +/* disk_check_media_change() exists */ +/* #undef HAVE_DISK_CHECK_MEDIA_CHANGE */ + +/* disk_*_io_acct() available */ +/* #undef HAVE_DISK_IO_ACCT */ + +/* disk_update_readahead() exists */ +/* #undef HAVE_DISK_UPDATE_READAHEAD */ + +/* Define to 1 if you have the header file. */ +#define HAVE_DLFCN_H 1 + +/* d_make_root() is available */ +/* #undef HAVE_D_MAKE_ROOT */ + +/* d_prune_aliases() is available */ +/* #undef HAVE_D_PRUNE_ALIASES */ + +/* dops->d_revalidate() operation takes nameidata */ +/* #undef HAVE_D_REVALIDATE_NAMEIDATA */ + +/* eops->encode_fh() wants child and parent inodes */ +/* #undef HAVE_ENCODE_FH_WITH_INODE */ + +/* sops->evict_inode() exists */ +/* #undef HAVE_EVICT_INODE */ + +/* FALLOC_FL_ZERO_RANGE is defined */ +/* #undef HAVE_FALLOC_FL_ZERO_RANGE */ + +/* fault_in_iov_iter_readable() is available */ +/* #undef HAVE_FAULT_IN_IOV_ITER_READABLE */ + +/* filemap_range_has_page() is available */ +/* #undef HAVE_FILEMAP_RANGE_HAS_PAGE */ + +/* fops->aio_fsync() exists */ +/* #undef HAVE_FILE_AIO_FSYNC */ + +/* file_dentry() is available */ +/* #undef HAVE_FILE_DENTRY */ + +/* fops->fadvise() exists */ +/* #undef HAVE_FILE_FADVISE */ + +/* file_inode() is available */ +/* #undef HAVE_FILE_INODE */ + +/* flush_dcache_page() is GPL-only */ +/* #undef HAVE_FLUSH_DCACHE_PAGE_GPL_ONLY */ + +/* iops->follow_link() cookie */ +/* #undef HAVE_FOLLOW_LINK_COOKIE */ + +/* iops->follow_link() nameidata */ +/* #undef HAVE_FOLLOW_LINK_NAMEIDATA */ + +/* Define if compiler supports -Wformat-overflow */ +/* #undef HAVE_FORMAT_OVERFLOW */ + +/* fsync_bdev() is declared in include/blkdev.h */ +/* #undef HAVE_FSYNC_BDEV */ + +/* fops->fsync() with range */ +/* #undef HAVE_FSYNC_RANGE */ + +/* fops->fsync() without dentry */ +/* #undef HAVE_FSYNC_WITHOUT_DENTRY */ + +/* yes */ +/* #undef HAVE_GENERIC_FADVISE */ + +/* generic_fillattr requires struct mnt_idmap* */ +/* #undef HAVE_GENERIC_FILLATTR_IDMAP */ + +/* generic_fillattr requires struct mnt_idmap* and u32 request_mask */ +/* #undef HAVE_GENERIC_FILLATTR_IDMAP_REQMASK */ + +/* generic_fillattr requires struct user_namespace* */ +/* #undef HAVE_GENERIC_FILLATTR_USERNS */ + +/* generic_*_io_acct() 3 arg available */ +/* #undef HAVE_GENERIC_IO_ACCT_3ARG */ + +/* generic_*_io_acct() 4 arg available */ +/* #undef HAVE_GENERIC_IO_ACCT_4ARG */ + +/* generic_readlink is global */ +/* #undef HAVE_GENERIC_READLINK */ + +/* generic_setxattr() exists */ +/* #undef HAVE_GENERIC_SETXATTR */ + +/* generic_write_checks() takes kiocb */ +/* #undef HAVE_GENERIC_WRITE_CHECKS_KIOCB */ + +/* Define if the GNU gettext() function is already present or preinstalled. */ +/* #undef HAVE_GETTEXT */ + +/* iops->get_acl() exists */ +/* #undef HAVE_GET_ACL */ + +/* iops->get_acl() takes rcu */ +/* #undef HAVE_GET_ACL_RCU */ + +/* has iops->get_inode_acl() */ +/* #undef HAVE_GET_INODE_ACL */ + +/* iops->get_link() cookie */ +/* #undef HAVE_GET_LINK_COOKIE */ + +/* iops->get_link() delayed */ +/* #undef HAVE_GET_LINK_DELAYED */ + +/* group_info->gid exists */ +/* #undef HAVE_GROUP_INFO_GID */ + +/* has_capability() is available */ +/* #undef HAVE_HAS_CAPABILITY */ + +/* iattr->ia_vfsuid and iattr->ia_vfsgid exist */ +/* #undef HAVE_IATTR_VFSID */ + +/* Define if you have the iconv() function and it works. */ +#define HAVE_ICONV 1 + +/* iops->getattr() takes struct mnt_idmap* */ +/* #undef HAVE_IDMAP_IOPS_GETATTR */ + +/* iops->setattr() takes struct mnt_idmap* */ +/* #undef HAVE_IDMAP_IOPS_SETATTR */ + +/* APIs for idmapped mount are present */ +/* #undef HAVE_IDMAP_MNT_API */ + +/* Define if compiler supports -Wimplicit-fallthrough */ +/* #undef HAVE_IMPLICIT_FALLTHROUGH */ + +/* Define if compiler supports -Winfinite-recursion */ +/* #undef HAVE_INFINITE_RECURSION */ + +/* inode_get_ctime() exists in linux/fs.h */ +/* #undef HAVE_INODE_GET_CTIME */ + +/* yes */ +/* #undef HAVE_INODE_LOCK_SHARED */ + +/* inode_owner_or_capable() exists */ +/* #undef HAVE_INODE_OWNER_OR_CAPABLE */ + +/* inode_owner_or_capable() takes mnt_idmap */ +/* #undef HAVE_INODE_OWNER_OR_CAPABLE_IDMAP */ + +/* inode_owner_or_capable() takes user_ns */ +/* #undef HAVE_INODE_OWNER_OR_CAPABLE_USERNS */ + +/* inode_set_ctime_to_ts() exists in linux/fs.h */ +/* #undef HAVE_INODE_SET_CTIME_TO_TS */ + +/* inode_set_flags() exists */ +/* #undef HAVE_INODE_SET_FLAGS */ + +/* inode_set_iversion() exists */ +/* #undef HAVE_INODE_SET_IVERSION */ + +/* inode->i_*time's are timespec64 */ +/* #undef HAVE_INODE_TIMESPEC64_TIMES */ + +/* timestamp_truncate() exists */ +/* #undef HAVE_INODE_TIMESTAMP_TRUNCATE */ + +/* Define to 1 if you have the header file. */ +#define HAVE_INTTYPES_H 1 + +/* in_compat_syscall() is available */ +/* #undef HAVE_IN_COMPAT_SYSCALL */ + +/* iops->create() takes struct mnt_idmap* */ +/* #undef HAVE_IOPS_CREATE_IDMAP */ + +/* iops->create() takes struct user_namespace* */ +/* #undef HAVE_IOPS_CREATE_USERNS */ + +/* iops->mkdir() takes struct mnt_idmap* */ +/* #undef HAVE_IOPS_MKDIR_IDMAP */ + +/* iops->mkdir() takes struct user_namespace* */ +/* #undef HAVE_IOPS_MKDIR_USERNS */ + +/* iops->mknod() takes struct mnt_idmap* */ +/* #undef HAVE_IOPS_MKNOD_IDMAP */ + +/* iops->mknod() takes struct user_namespace* */ +/* #undef HAVE_IOPS_MKNOD_USERNS */ + +/* iops->permission() takes struct mnt_idmap* */ +/* #undef HAVE_IOPS_PERMISSION_IDMAP */ + +/* iops->permission() takes struct user_namespace* */ +/* #undef HAVE_IOPS_PERMISSION_USERNS */ + +/* iops->rename() takes struct mnt_idmap* */ +/* #undef HAVE_IOPS_RENAME_IDMAP */ + +/* iops->rename() takes struct user_namespace* */ +/* #undef HAVE_IOPS_RENAME_USERNS */ + +/* iops->setattr() exists */ +/* #undef HAVE_IOPS_SETATTR */ + +/* iops->symlink() takes struct mnt_idmap* */ +/* #undef HAVE_IOPS_SYMLINK_IDMAP */ + +/* iops->symlink() takes struct user_namespace* */ +/* #undef HAVE_IOPS_SYMLINK_USERNS */ + +/* iov_iter_advance() is available */ +/* #undef HAVE_IOV_ITER_ADVANCE */ + +/* iov_iter_count() is available */ +/* #undef HAVE_IOV_ITER_COUNT */ + +/* iov_iter_fault_in_readable() is available */ +/* #undef HAVE_IOV_ITER_FAULT_IN_READABLE */ + +/* iov_iter_revert() is available */ +/* #undef HAVE_IOV_ITER_REVERT */ + +/* iov_iter_type() is available */ +/* #undef HAVE_IOV_ITER_TYPE */ + +/* iov_iter types are available */ +/* #undef HAVE_IOV_ITER_TYPES */ + +/* yes */ +/* #undef HAVE_IO_SCHEDULE_TIMEOUT */ + +/* Define to 1 if you have the `issetugid' function. */ +#define HAVE_ISSETUGID 1 + +/* iter_iov() is available */ +/* #undef HAVE_ITER_IOV */ + +/* kernel has kernel_fpu_* functions */ +/* #undef HAVE_KERNEL_FPU */ + +/* kernel has asm/fpu/api.h */ +/* #undef HAVE_KERNEL_FPU_API_HEADER */ + +/* kernel fpu internal */ +/* #undef HAVE_KERNEL_FPU_INTERNAL */ + +/* kernel has asm/fpu/internal.h */ +/* #undef HAVE_KERNEL_FPU_INTERNAL_HEADER */ + +/* uncached_acl_sentinel() exists */ +/* #undef HAVE_KERNEL_GET_ACL_HANDLE_CACHE */ + +/* Define if compiler supports -Winfinite-recursion */ +/* #undef HAVE_KERNEL_INFINITE_RECURSION */ + +/* kernel does stack verification */ +/* #undef HAVE_KERNEL_OBJTOOL */ + +/* kernel has linux/objtool.h */ +/* #undef HAVE_KERNEL_OBJTOOL_HEADER */ + +/* kernel_read() take loff_t pointer */ +/* #undef HAVE_KERNEL_READ_PPOS */ + +/* timer_list.function gets a timer_list */ +/* #undef HAVE_KERNEL_TIMER_FUNCTION_TIMER_LIST */ + +/* struct timer_list has a flags member */ +/* #undef HAVE_KERNEL_TIMER_LIST_FLAGS */ + +/* timer_setup() is available */ +/* #undef HAVE_KERNEL_TIMER_SETUP */ + +/* kernel_write() take loff_t pointer */ +/* #undef HAVE_KERNEL_WRITE_PPOS */ + +/* kmem_cache_create_usercopy() exists */ +/* #undef HAVE_KMEM_CACHE_CREATE_USERCOPY */ + +/* kstrtoul() exists */ +/* #undef HAVE_KSTRTOUL */ + +/* ktime_get_coarse_real_ts64() exists */ +/* #undef HAVE_KTIME_GET_COARSE_REAL_TS64 */ + +/* ktime_get_raw_ts64() exists */ +/* #undef HAVE_KTIME_GET_RAW_TS64 */ + +/* kvmalloc exists */ +/* #undef HAVE_KVMALLOC */ + +/* Define if you have [aio] */ +/* #undef HAVE_LIBAIO */ + +/* Define if you have [blkid] */ +/* #undef HAVE_LIBBLKID */ + +/* Define if you have [crypto] */ +#define HAVE_LIBCRYPTO 1 + +/* Define if you have [tirpc] */ +/* #undef HAVE_LIBTIRPC */ + +/* Define if you have [udev] */ +/* #undef HAVE_LIBUDEV */ + +/* Define if you have [uuid] */ +/* #undef HAVE_LIBUUID */ + +/* linux/blk-cgroup.h exists */ +/* #undef HAVE_LINUX_BLK_CGROUP_HEADER */ + +/* lseek_execute() is available */ +/* #undef HAVE_LSEEK_EXECUTE */ + +/* makedev() is declared in sys/mkdev.h */ +/* #undef HAVE_MAKEDEV_IN_MKDEV */ + +/* makedev() is declared in sys/sysmacros.h */ +/* #undef HAVE_MAKEDEV_IN_SYSMACROS */ + +/* Noting that make_request_fn() returns blk_qc_t */ +/* #undef HAVE_MAKE_REQUEST_FN_RET_QC */ + +/* Noting that make_request_fn() returns void */ +/* #undef HAVE_MAKE_REQUEST_FN_RET_VOID */ + +/* iops->mkdir() takes umode_t */ +/* #undef HAVE_MKDIR_UMODE_T */ + +/* Define to 1 if you have the `mlockall' function. */ +#define HAVE_MLOCKALL 1 + +/* lookup_bdev() wants mode arg */ +/* #undef HAVE_MODE_LOOKUP_BDEV */ + +/* Define if host toolchain supports MOVBE */ +#define HAVE_MOVBE 1 + +/* new_sync_read()/new_sync_write() are available */ +/* #undef HAVE_NEW_SYNC_READ */ + +/* folio_wait_bit() exists */ +/* #undef HAVE_PAGEMAP_FOLIO_WAIT_BIT */ + +/* part_to_dev() exists */ +/* #undef HAVE_PART_TO_DEV */ + +/* iops->getattr() takes a path */ +/* #undef HAVE_PATH_IOPS_GETATTR */ + +/* Define if host toolchain supports PCLMULQDQ */ +#define HAVE_PCLMULQDQ 1 + +/* percpu_counter_add_batch() is defined */ +/* #undef HAVE_PERCPU_COUNTER_ADD_BATCH */ + +/* percpu_counter_init() wants gfp_t */ +/* #undef HAVE_PERCPU_COUNTER_INIT_WITH_GFP */ + +/* posix_acl_chmod() exists */ +/* #undef HAVE_POSIX_ACL_CHMOD */ + +/* posix_acl_from_xattr() needs user_ns */ +/* #undef HAVE_POSIX_ACL_FROM_XATTR_USERNS */ + +/* posix_acl_release() is available */ +/* #undef HAVE_POSIX_ACL_RELEASE */ + +/* posix_acl_release() is GPL-only */ +/* #undef HAVE_POSIX_ACL_RELEASE_GPL_ONLY */ + +/* posix_acl_valid() wants user namespace */ +/* #undef HAVE_POSIX_ACL_VALID_WITH_NS */ + +/* proc_ops structure exists */ +/* #undef HAVE_PROC_OPS_STRUCT */ + +/* iops->put_link() cookie */ +/* #undef HAVE_PUT_LINK_COOKIE */ + +/* iops->put_link() delayed */ +/* #undef HAVE_PUT_LINK_DELAYED */ + +/* iops->put_link() nameidata */ +/* #undef HAVE_PUT_LINK_NAMEIDATA */ + +/* If available, contains the Python version number currently in use. */ +#define HAVE_PYTHON "3.7" + +/* qat is enabled and existed */ +/* #undef HAVE_QAT */ + +/* struct reclaim_state has reclaimed */ +/* #undef HAVE_RECLAIM_STATE_RECLAIMED */ + +/* register_shrinker is vararg */ +/* #undef HAVE_REGISTER_SHRINKER_VARARG */ + +/* register_sysctl_table exists */ +/* #undef HAVE_REGISTER_SYSCTL_TABLE */ + +/* iops->rename2() exists */ +/* #undef HAVE_RENAME2 */ + +/* struct inode_operations_wrapper takes .rename2() */ +/* #undef HAVE_RENAME2_OPERATIONS_WRAPPER */ + +/* iops->rename() wants flags */ +/* #undef HAVE_RENAME_WANTS_FLAGS */ + +/* REQ_DISCARD is defined */ +/* #undef HAVE_REQ_DISCARD */ + +/* REQ_FLUSH is defined */ +/* #undef HAVE_REQ_FLUSH */ + +/* REQ_OP_DISCARD is defined */ +/* #undef HAVE_REQ_OP_DISCARD */ + +/* REQ_OP_FLUSH is defined */ +/* #undef HAVE_REQ_OP_FLUSH */ + +/* REQ_OP_SECURE_ERASE is defined */ +/* #undef HAVE_REQ_OP_SECURE_ERASE */ + +/* REQ_PREFLUSH is defined */ +/* #undef HAVE_REQ_PREFLUSH */ + +/* revalidate_disk() is available */ +/* #undef HAVE_REVALIDATE_DISK */ + +/* revalidate_disk_size() is available */ +/* #undef HAVE_REVALIDATE_DISK_SIZE */ + +/* struct rw_semaphore has member activity */ +/* #undef HAVE_RWSEM_ACTIVITY */ + +/* struct rw_semaphore has atomic_long_t member count */ +/* #undef HAVE_RWSEM_ATOMIC_LONG_COUNT */ + +/* linux/sched/signal.h exists */ +/* #undef HAVE_SCHED_SIGNAL_HEADER */ + +/* Define to 1 if you have the header file. */ +#define HAVE_SECURITY_PAM_MODULES_H 1 + +/* setattr_prepare() accepts mnt_idmap */ +/* #undef HAVE_SETATTR_PREPARE_IDMAP */ + +/* setattr_prepare() is available, doesn't accept user_namespace */ +/* #undef HAVE_SETATTR_PREPARE_NO_USERNS */ + +/* setattr_prepare() accepts user_namespace */ +/* #undef HAVE_SETATTR_PREPARE_USERNS */ + +/* iops->set_acl() exists, takes 3 args */ +/* #undef HAVE_SET_ACL */ + +/* iops->set_acl() takes 4 args, arg1 is struct mnt_idmap * */ +/* #undef HAVE_SET_ACL_IDMAP_DENTRY */ + +/* iops->set_acl() takes 4 args */ +/* #undef HAVE_SET_ACL_USERNS */ + +/* iops->set_acl() takes 4 args, arg2 is struct dentry * */ +/* #undef HAVE_SET_ACL_USERNS_DENTRY_ARG2 */ + +/* set_cached_acl() is usable */ +/* #undef HAVE_SET_CACHED_ACL_USABLE */ + +/* set_special_state() exists */ +/* #undef HAVE_SET_SPECIAL_STATE */ + +/* struct shrink_control exists */ +/* #undef HAVE_SHRINK_CONTROL_STRUCT */ + +/* kernel_siginfo_t exists */ +/* #undef HAVE_SIGINFO */ + +/* signal_stop() exists */ +/* #undef HAVE_SIGNAL_STOP */ + +/* new shrinker callback wants 2 args */ +/* #undef HAVE_SINGLE_SHRINKER_CALLBACK */ + +/* cs->count_objects exists */ +/* #undef HAVE_SPLIT_SHRINKER_CALLBACK */ + +#if defined(__amd64__) || defined(__i386__) +/* Define if host toolchain supports SSE */ +#define HAVE_SSE 1 + +/* Define if host toolchain supports SSE2 */ +#define HAVE_SSE2 1 + +/* Define if host toolchain supports SSE3 */ +#define HAVE_SSE3 1 + +/* Define if host toolchain supports SSE4.1 */ +#define HAVE_SSE4_1 1 + +/* Define if host toolchain supports SSE4.2 */ +#define HAVE_SSE4_2 1 + +/* Define if host toolchain supports SSSE3 */ +#define HAVE_SSSE3 1 +#endif + +/* STACK_FRAME_NON_STANDARD is defined */ +/* #undef HAVE_STACK_FRAME_NON_STANDARD */ + +/* standalone exists */ +/* #undef HAVE_STANDALONE_LINUX_STDARG */ + +/* Define to 1 if you have the header file. */ +#define HAVE_STDINT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STDIO_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STDLIB_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STRINGS_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STRING_H 1 + +/* Define to 1 if you have the `strlcat' function. */ +#define HAVE_STRLCAT 1 + +/* Define to 1 if you have the `strlcpy' function. */ +#define HAVE_STRLCPY 1 + +/* submit_bio is member of struct block_device_operations */ +/* #undef HAVE_SUBMIT_BIO_IN_BLOCK_DEVICE_OPERATIONS */ + +/* super_setup_bdi_name() exits */ +/* #undef HAVE_SUPER_SETUP_BDI_NAME */ + +/* super_block->s_user_ns exists */ +/* #undef HAVE_SUPER_USER_NS */ + +/* sync_blockdev() is declared in include/blkdev.h */ +/* #undef HAVE_SYNC_BLOCKDEV */ + +/* struct kobj_type has default_groups */ +/* #undef HAVE_SYSFS_DEFAULT_GROUPS */ + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_STAT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_TYPES_H 1 + +/* i_op->tmpfile() exists */ +/* #undef HAVE_TMPFILE */ + +/* i_op->tmpfile() uses old dentry signature */ +/* #undef HAVE_TMPFILE_DENTRY */ + +/* i_op->tmpfile() has mnt_idmap */ +/* #undef HAVE_TMPFILE_IDMAP */ + +/* i_op->tmpfile() has userns */ +/* #undef HAVE_TMPFILE_USERNS */ + +/* totalhigh_pages() exists */ +/* #undef HAVE_TOTALHIGH_PAGES */ + +/* kernel has totalram_pages() */ +/* #undef HAVE_TOTALRAM_PAGES_FUNC */ + +/* Define to 1 if you have the `udev_device_get_is_initialized' function. */ +/* #undef HAVE_UDEV_DEVICE_GET_IS_INITIALIZED */ + +/* kernel has __kernel_fpu_* functions */ +/* #undef HAVE_UNDERSCORE_KERNEL_FPU */ + +/* Define to 1 if you have the header file. */ +#define HAVE_UNISTD_H 1 + +/* iops->getattr() takes struct user_namespace* */ +/* #undef HAVE_USERNS_IOPS_GETATTR */ + +/* iops->setattr() takes struct user_namespace* */ +/* #undef HAVE_USERNS_IOPS_SETATTR */ + +/* user_namespace->ns.inum exists */ +/* #undef HAVE_USER_NS_COMMON_INUM */ + +/* iops->getattr() takes a vfsmount */ +/* #undef HAVE_VFSMOUNT_IOPS_GETATTR */ + +/* fops->clone_file_range() is available */ +/* #undef HAVE_VFS_CLONE_FILE_RANGE */ + +/* fops->copy_file_range() is available */ +/* #undef HAVE_VFS_COPY_FILE_RANGE */ + +/* fops->dedupe_file_range() is available */ +/* #undef HAVE_VFS_DEDUPE_FILE_RANGE */ + +/* aops->direct_IO() uses iovec */ +/* #undef HAVE_VFS_DIRECT_IO_IOVEC */ + +/* aops->direct_IO() uses iov_iter without rw */ +/* #undef HAVE_VFS_DIRECT_IO_ITER */ + +/* aops->direct_IO() uses iov_iter with offset */ +/* #undef HAVE_VFS_DIRECT_IO_ITER_OFFSET */ + +/* aops->direct_IO() uses iov_iter with rw and offset */ +/* #undef HAVE_VFS_DIRECT_IO_ITER_RW_OFFSET */ + +/* filemap_dirty_folio exists */ +/* #undef HAVE_VFS_FILEMAP_DIRTY_FOLIO */ + +/* file_operations_extend takes .copy_file_range() and .clone_file_range() */ +/* #undef HAVE_VFS_FILE_OPERATIONS_EXTEND */ + +/* generic_copy_file_range() is available */ +/* #undef HAVE_VFS_GENERIC_COPY_FILE_RANGE */ + +/* All required iov_iter interfaces are available */ +/* #undef HAVE_VFS_IOV_ITER */ *** 234 LINES SKIPPED *** From nobody Sun Oct 22 17:09:48 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SD4Z51q8Gz4xYtX; Sun, 22 Oct 2023 17:09: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 4SD4Z51HcVz4bJZ; Sun, 22 Oct 2023 17:09:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697994589; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qawgRSZ14sd+Ll3V1bYeFMzeVS03KSRYTRrocxvv0yw=; b=IwqvBY9wW1AP+DxHv91o0youZ2C7CzzLGESRcBy7U2AZVRwgs5fuXmDmzL+XYiqXCKSrUL hvKL2mcT2lSO74Cx54s/+wcSwdmJi6o3HKz9f5O2hA0hhDaqyHqSuSg1sGmQ7JGWONDie4 UmOz7JwyHYO1wTJgoDgU74q+/ba9RZTdfo7+KcgkhSUurflZoenHhAoXRNlBwxumKYmXKt cB9WXBYZcwSsTuSd4IUndTmcmsjjQnR3oHhic6bspxDzdreKp/n0vZ2iV2TBHf/D6VTJK1 XmBuGPI2VrvIBmqkX3curZvonWito8Ou/Z0di02x4OW+2E3qbCW+ozgnJP6fsQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697994589; a=rsa-sha256; cv=none; b=H92oqaI7V8utjxqUoX7pWHoGc+WywK0p1gYyhen0FwpVaSFzIO6hXs7XByLkeTW1zt4p+P Am93j7K3YbYjYox57o9BHHJk3gudXCzpN/RjXHK3G+SsDY6B7IjGfmeJbMYG2rwrgMQ4ne GtTLRYN9EwMTnsO0MqaZVq9URiY9StpbeTLQCTTUY+3hS2dgBBF3lDY3XSNVRS3FotlY73 ZVukI3mRaEDyiZIYw5FuPMzIvL3ucI68e6uYxqgZVb4J/2GYAXbVBruhWzq1N61W90I+C6 PCA43iPEEl6n2yu+jkz1eASFdq3MIbkHUEfGQKSVV8vmIAyboMmAoZT4ZLBuWg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697994589; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qawgRSZ14sd+Ll3V1bYeFMzeVS03KSRYTRrocxvv0yw=; b=XkLpewf0C8tjGXNhkiUxXzjJ+QhagT1jw5vyBqAgqjgYLZCBaKBSOzs6AEbMYcGDKU01bL p16Sp9dF5+4+hJdgzLRWleMNpEtfKooNWr9uSxr499Wf2abY4EAINPite7phUP6AW3SdHY BpTnsHqKkJGzHu58KEFcuy2h3TYH/OQQNTvOrFaTVc/prziqfE9yPrJIs0pBvdSVkIj70e 7nDdTmVYmuTZPBW4lZVujgmAhKenyb1/pXyalGw9ltyz+cTeAW2de+W9vSunYXFQXdA/Om nCGmUlUIZMIjj2kFKaK6+VlnCYKi4Misl0ahtr2CX8shQjWnBCbSQT0SW0cFTw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SD4Z50KwFz1570; Sun, 22 Oct 2023 17:09: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 39MH9mcE034993; Sun, 22 Oct 2023 17:09:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39MH9mOA034990; Sun, 22 Oct 2023 17:09:48 GMT (envelope-from git) Date: Sun, 22 Oct 2023 17:09:48 GMT Message-Id: <202310221709.39MH9mOA034990@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mateusz Guzik Subject: git: 5d29ead2e2de - main - thread: reorder td_no_sleeping to plug two 4-byte holes on LP64 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mjg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5d29ead2e2decba1940cda805ec9ceb06deb7f0f Auto-Submitted: auto-generated The branch main has been updated by mjg: URL: https://cgit.FreeBSD.org/src/commit/?id=5d29ead2e2decba1940cda805ec9ceb06deb7f0f commit 5d29ead2e2decba1940cda805ec9ceb06deb7f0f Author: Mateusz Guzik AuthorDate: 2023-10-22 15:39:25 +0000 Commit: Mateusz Guzik CommitDate: 2023-10-22 17:09:44 +0000 thread: reorder td_no_sleeping to plug two 4-byte holes on LP64 Sponsored by: Rubicon Communications, LLC ("Netgate") --- sys/kern/kern_thread.c | 2 +- sys/sys/proc.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/kern/kern_thread.c b/sys/kern/kern_thread.c index 4175d1594af4..dcebb08956e6 100644 --- a/sys/kern/kern_thread.c +++ b/sys/kern/kern_thread.c @@ -87,7 +87,7 @@ _Static_assert(offsetof(struct thread, td_flags) == 0x108, "struct thread KBI td_flags"); _Static_assert(offsetof(struct thread, td_pflags) == 0x114, "struct thread KBI td_pflags"); -_Static_assert(offsetof(struct thread, td_frame) == 0x4b8, +_Static_assert(offsetof(struct thread, td_frame) == 0x4b0, "struct thread KBI td_frame"); _Static_assert(offsetof(struct thread, td_emuldata) == 0x6c0, "struct thread KBI td_emuldata"); diff --git a/sys/sys/proc.h b/sys/sys/proc.h index 0b91b2a1a0b5..8c916173b4ef 100644 --- a/sys/sys/proc.h +++ b/sys/sys/proc.h @@ -314,8 +314,8 @@ struct thread { struct osd td_osd; /* (k) Object specific data. */ struct vm_map_entry *td_map_def_user; /* (k) Deferred entries. */ pid_t td_dbg_forked; /* (c) Child pid for debugger. */ - struct vnode *td_vp_reserved;/* (k) Preallocated vnode. */ u_int td_no_sleeping; /* (k) Sleeping disabled count. */ + struct vnode *td_vp_reserved;/* (k) Preallocated vnode. */ void *td_su; /* (k) FFS SU private */ sbintime_t td_sleeptimo; /* (t) Sleep timeout. */ int td_rtcgen; /* (s) rtc_generation of abs. sleep */ From nobody Sun Oct 22 17:09:50 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SD4Z63FcQz4xZRl; Sun, 22 Oct 2023 17:09: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 4SD4Z62NlYz4bfm; Sun, 22 Oct 2023 17:09:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697994590; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bp11gjNZnR3CzsQ5CCcgTNfdJnHVitFPV8dla4zsmi4=; b=ogpSZUu6RBKjK2hwsb7Ny2jzZq3h2fWnFwYIeHvc0zLpJu663EF93EIGMXcuyFt7m7qcFt 8fvSE3KUof6ogUJZyJDIn0GH3ildYD9D7FHFLXd8ScOKrO3OWs+XVwwlWj19m4b9k8ZNBW wdF9I72VuaKv3wW9j6u3KrJiuRsC3kjhAa4+jMFMv4By7+ZJrqMA1rLGIozsRiRP6yFrKx wzkTOOP2RPI2+g0I7n6bIfNTZF2xNXU3WDwNk4LY4To5rrNCCmwCvDcpd+xneldyCexE5b 62e1m7MDgLt7afI+40K1UwAkc+jap2zckcSR8oR8BBRTJeF7F0Agv+SSncBwyA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697994590; a=rsa-sha256; cv=none; b=ej3MvhQWOBGRIKQHLrCheGBi2XgDxVh2djvnQ96xHOWkXxASqTfQWVr0iq35faG2cYGLjZ yMGF8St4HIxtL65JDXQcOHfBLZiCFYZycb3RTcvstNxaI5OamaqYIEuAcFASraZNeMOz7K UYg+/WqlTapa/lt+o9zEh3wkz+7JWmLOoazvr4R/FlwatBrNo8m74VnZVkfCOF2jrkSEfh alyk7Xr7zbMkarIRlIYnfw08WZ0tV56Yj8MbcGtbY+N4HTlBz5adl+1w0W8x6/hT8uuDdv v8r0PpoyWmTpmRQdFCQ8pd7vaRdSKGvfWHGgpTD1fEMtQU2ol/7ZLpeFNaf66Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697994590; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bp11gjNZnR3CzsQ5CCcgTNfdJnHVitFPV8dla4zsmi4=; b=QTQ1LDc001NqaGsG/s7o06j7JDc2PdDS6WgLFBfWimPRZU6OBknflqITeYuPl1I6P9vVyV V8kAE0q2L6YJ0jhUq4h5UVcjq2b1XKtrRtpv0ZgKXtlbTIr8ae2MNlGWMIU/OiRbFsWIdB qAFfpsP0t9cXd6Zkta7OT1ofS1oet/sGpCNRzrgQuHou5ELnBrabmV9S1d76mbAmfPlhvh pJ1cN7IAzyMyLDpaR7FkqzYg06JWvckLPzGRGBM3HdBKFxW7vbd7UN2aQOvEO1DjDeBy05 RLwq9yXpLOgrtZgTHWxTmDiH9qsvaQzfKaVoR0PgZgRJTxVb5czTTlZvxq+eUg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SD4Z61GTSz15Gg; Sun, 22 Oct 2023 17:09: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 39MH9oVj035029; Sun, 22 Oct 2023 17:09:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39MH9o58035026; Sun, 22 Oct 2023 17:09:50 GMT (envelope-from git) Date: Sun, 22 Oct 2023 17:09:50 GMT Message-Id: <202310221709.39MH9o58035026@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mateusz Guzik Subject: git: 7530de77f539 - main - thread: add td_wantedlock List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mjg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7530de77f539678847edd29489b7635f8f58b574 Auto-Submitted: auto-generated The branch main has been updated by mjg: URL: https://cgit.FreeBSD.org/src/commit/?id=7530de77f539678847edd29489b7635f8f58b574 commit 7530de77f539678847edd29489b7635f8f58b574 Author: Mateusz Guzik AuthorDate: 2023-10-22 15:46:39 +0000 Commit: Mateusz Guzik CommitDate: 2023-10-22 17:09:45 +0000 thread: add td_wantedlock This enables obtaining lock information threads are actively waiting for while sampling. Without the change one would only see a bunch of calls to lock_delay(), where the stacktrace often does not reveal what the lock might be. Note this is not the same as lock profiling, which only produces data for cases which wait for locks. struct thread already has a td_lockname field, but I did not use it because it has different semantics -- denotes when the thread is off cpu. At the same time it could not be converted to hold a lock_object pointer because non-curthread access would no longer be guaranteed to be safe -- by the time it reads the pointer the lock might have been taken, released and the object containing it freed. Sample usage with dtrace: rm /tmp/out.kern_stacks ; dtrace -x stackframes=100 -n 'profile-997 { @[curthread->td_wantedlock != NULL ? stringof(curthread->td_wantedlock->lo_name) : stringof("\n"), stack()] = count(); }' -o /tmp/out.kern_stacks This also facilitates addition of lock information to traces produced by hwpmc. Note: spinlocks are not supported at the moment. Sponsored by: Rubicon Communications, LLC ("Netgate") --- sys/kern/kern_mutex.c | 3 +++ sys/kern/kern_rwlock.c | 6 ++++++ sys/kern/kern_sx.c | 6 ++++++ sys/kern/kern_thread.c | 6 +++--- sys/sys/proc.h | 11 +++++++++++ 5 files changed, 29 insertions(+), 3 deletions(-) diff --git a/sys/kern/kern_mutex.c b/sys/kern/kern_mutex.c index 7f348530ed31..6071ac7fd6f1 100644 --- a/sys/kern/kern_mutex.c +++ b/sys/kern/kern_mutex.c @@ -574,6 +574,8 @@ __mtx_lock_sleep(volatile uintptr_t *c, uintptr_t v) "_mtx_lock_sleep: %s contested (lock=%p) at %s:%d", m->lock_object.lo_name, (void *)m->mtx_lock, file, line); + THREAD_CONTENDS_ON_LOCK(&m->lock_object); + for (;;) { if (v == MTX_UNOWNED) { if (_mtx_obtain_lock_fetch(m, &v, tid)) @@ -670,6 +672,7 @@ retry_turnstile: #endif v = MTX_READ_VALUE(m); } + THREAD_CONTENTION_DONE(&m->lock_object); #if defined(KDTRACE_HOOKS) || defined(LOCK_PROFILING) if (__predict_true(!doing_lockprof)) return; diff --git a/sys/kern/kern_rwlock.c b/sys/kern/kern_rwlock.c index 5705de0f311f..83d5862a6667 100644 --- a/sys/kern/kern_rwlock.c +++ b/sys/kern/kern_rwlock.c @@ -482,6 +482,8 @@ __rw_rlock_hard(struct rwlock *rw, struct thread *td, uintptr_t v lock_profile_obtain_lock_failed(&rw->lock_object, false, &contested, &waittime); + THREAD_CONTENDS_ON_LOCK(&rw->lock_object); + for (;;) { if (__rw_rlock_try(rw, td, &v, false LOCK_FILE_LINE_ARG)) break; @@ -628,6 +630,7 @@ retry_ts: __func__, rw); v = RW_READ_VALUE(rw); } + THREAD_CONTENTION_DONE(&rw->lock_object); #if defined(KDTRACE_HOOKS) || defined(LOCK_PROFILING) if (__predict_true(!doing_lockprof)) return; @@ -976,6 +979,8 @@ __rw_wlock_hard(volatile uintptr_t *c, uintptr_t v LOCK_FILE_LINE_ARG_DEF) lock_profile_obtain_lock_failed(&rw->lock_object, false, &contested, &waittime); + THREAD_CONTENDS_ON_LOCK(&rw->lock_object); + for (;;) { if (v == RW_UNLOCKED) { if (_rw_write_lock_fetch(rw, &v, tid)) @@ -1161,6 +1166,7 @@ retry_ts: #endif v = RW_READ_VALUE(rw); } + THREAD_CONTENTION_DONE(&rw->lock_object); if (__predict_true(!extra_work)) return; #ifdef ADAPTIVE_RWLOCKS diff --git a/sys/kern/kern_sx.c b/sys/kern/kern_sx.c index 81e46fceed5e..bc8a1214689f 100644 --- a/sys/kern/kern_sx.c +++ b/sys/kern/kern_sx.c @@ -653,6 +653,8 @@ _sx_xlock_hard(struct sx *sx, uintptr_t x, int opts LOCK_FILE_LINE_ARG_DEF) GIANT_SAVE(extra_work); #endif + THREAD_CONTENDS_ON_LOCK(&sx->lock_object); + for (;;) { if (x == SX_LOCK_UNLOCKED) { if (atomic_fcmpset_acq_ptr(&sx->sx_lock, &x, tid)) @@ -872,6 +874,7 @@ retry_sleepq: __func__, sx); x = SX_READ_VALUE(sx); } + THREAD_CONTENTION_DONE(&sx->lock_object); if (__predict_true(!extra_work)) return (error); #ifdef ADAPTIVE_SX @@ -1074,6 +1077,8 @@ _sx_slock_hard(struct sx *sx, int opts, uintptr_t x LOCK_FILE_LINE_ARG_DEF) GIANT_SAVE(extra_work); #endif + THREAD_CONTENDS_ON_LOCK(&sx->lock_object); + /* * As with rwlocks, we don't make any attempt to try to block * shared locks once there is an exclusive waiter. @@ -1224,6 +1229,7 @@ retry_sleepq: __func__, sx); x = SX_READ_VALUE(sx); } + THREAD_CONTENTION_DONE(&sx->lock_object); #if defined(KDTRACE_HOOKS) || defined(LOCK_PROFILING) if (__predict_true(!extra_work)) return (error); diff --git a/sys/kern/kern_thread.c b/sys/kern/kern_thread.c index dcebb08956e6..3bc8546db594 100644 --- a/sys/kern/kern_thread.c +++ b/sys/kern/kern_thread.c @@ -87,7 +87,7 @@ _Static_assert(offsetof(struct thread, td_flags) == 0x108, "struct thread KBI td_flags"); _Static_assert(offsetof(struct thread, td_pflags) == 0x114, "struct thread KBI td_pflags"); -_Static_assert(offsetof(struct thread, td_frame) == 0x4b0, +_Static_assert(offsetof(struct thread, td_frame) == 0x4b8, "struct thread KBI td_frame"); _Static_assert(offsetof(struct thread, td_emuldata) == 0x6c0, "struct thread KBI td_emuldata"); @@ -107,9 +107,9 @@ _Static_assert(offsetof(struct thread, td_flags) == 0x9c, "struct thread KBI td_flags"); _Static_assert(offsetof(struct thread, td_pflags) == 0xa8, "struct thread KBI td_pflags"); -_Static_assert(offsetof(struct thread, td_frame) == 0x314, +_Static_assert(offsetof(struct thread, td_frame) == 0x318, "struct thread KBI td_frame"); -_Static_assert(offsetof(struct thread, td_emuldata) == 0x358, +_Static_assert(offsetof(struct thread, td_emuldata) == 0x35c, "struct thread KBI td_emuldata"); _Static_assert(offsetof(struct proc, p_flag) == 0x6c, "struct proc KBI p_flag"); diff --git a/sys/sys/proc.h b/sys/sys/proc.h index 8c916173b4ef..dc94d12d16c4 100644 --- a/sys/sys/proc.h +++ b/sys/sys/proc.h @@ -277,6 +277,7 @@ struct thread { int td_rw_rlocks; /* (k) Count of rwlock read locks. */ int td_sx_slocks; /* (k) Count of sx shared locks. */ int td_lk_slocks; /* (k) Count of lockmgr shared locks. */ + struct lock_object *td_wantedlock; /* (k) Lock we are contending on */ struct turnstile *td_blocked; /* (t) Lock thread is blocked on. */ const char *td_lockname; /* (t) Name of lock blocked on. */ LIST_HEAD(, turnstile) td_contested; /* (q) Contested locks. */ @@ -1074,6 +1075,16 @@ extern pid_t pid_max; #define THREAD_CAN_SLEEP() ((curthread)->td_no_sleeping == 0) +#define THREAD_CONTENDS_ON_LOCK(lo) do { \ + MPASS(curthread->td_wantedlock == NULL); \ + curthread->td_wantedlock = lo; \ +} while (0) + +#define THREAD_CONTENTION_DONE(lo) do { \ + MPASS(curthread->td_wantedlock == lo); \ + curthread->td_wantedlock = NULL; \ +} while (0) + #define PIDHASH(pid) (&pidhashtbl[(pid) & pidhash]) #define PIDHASHLOCK(pid) (&pidhashtbl_lock[((pid) & pidhashlock)]) extern LIST_HEAD(pidhashhead, proc) *pidhashtbl; From nobody Sun Oct 22 17:13:29 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SD4fK33w7z4xZMm; Sun, 22 Oct 2023 17:13: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 4SD4fK2ZYpz4cZZ; Sun, 22 Oct 2023 17:13:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697994809; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hAj5bokSyyznfz+I+31ATS70q5XWa3HyLcoZBn21t5U=; b=hV6Ar1yRHhO7UsBd6z03QeiyrEYIaC1pYiT8cKidsmye/aU7/FuHIF3+pTAl1ufkGrj67C PMU9j/xspX3FlezYnIKWatrMeO5ZFhmeotQ8C9ZOOv9izbsyMfx4jVwu3Zci3tlKudWoL0 SdQbG6zlBxxOwVNfitfMPN6a/xokQF4al8A3eILMivLMZ6yHZi3lp9Q7YN7CSTwBoFnjQ+ 80oGiOMdsKlL6SLuQ/h0BzIuCsX1wA04Fowlf40aG4liDIV2fIMBBs0ZH9hpzyFBDJj5n6 7nVunLDDC80L6Nn0Bj2ji5K+LgLiH5zWw4Ow2ZVp12LClDCoGZqSTgMwq2yqTw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697994809; a=rsa-sha256; cv=none; b=btptJt1gmGX1JtozASPR/10oblx7qQHf7ZmYh7XXFoEJM7OqmqTowP3cKuHb1aJ4yrEY+s woUT7jliUvRJaWLOnVYwy26EeBbk66zsqA7IUBZjoTv7Bcvz3Gux7sEb0Xn11S7NJMeiSX 58HNEwNcjHSdCNk/pJb5jWqJ0xseKy9bkQ0e92+2BZYaJG3QUCFQ+oX0yvdwy++Ke3/NWl LF33pLLU6mFfTuT3vEb9vV7bKmaXkSE8xaqItRo/hZrqunSyiA7w5aqcLFtCpYpKRse7Dp 0XzZH1G/LJYlN5r3RGXxXAa7rhojcZqzxgsJlfVxF+PdyOfV4STukjK3znLjqw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697994809; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hAj5bokSyyznfz+I+31ATS70q5XWa3HyLcoZBn21t5U=; b=u03fANgY5wJnwTeay5dMIPGP6Ow27J5+GjDkbz2Ri8YPmw9dJ8MVxQzNhT63BpxqGPNOA4 vdH8JOMWuEavR1dFVhEs2eezq+iOj2mDMT4oXSGEee2cPJ/QiGh9p7M6aQuCdEo2/LWMtB G3MQwhUy+nIpdLGgYkhJwP1SelQDAQYBtI7TbpFWqs2av1JXIJemo3YSBaEnbAMoo3ZKZY oz3vK2XS+G7YJNCVU5k9z/THZxWlQ3UADAwq8/Sg54P/ylTsQT2UFNfnwqRYBBnFJ61UA+ eGpKM6GPT7s/WQNMFUhUNOXKOozc+Xe8mYgam6yQ6uvpQj94bpbAqXqyB1HrYg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SD4fK1fQhz15T7; Sun, 22 Oct 2023 17:13: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 39MHDTvn050298; Sun, 22 Oct 2023 17:13:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39MHDTa5050295; Sun, 22 Oct 2023 17:13:29 GMT (envelope-from git) Date: Sun, 22 Oct 2023 17:13:29 GMT Message-Id: <202310221713.39MHDTa5050295@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: ea9a7058f93f - main - bsd.man.mk guard against empty vars in MLINKS List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: ea9a7058f93f1bd533efadb592843bbfa26293a1 Auto-Submitted: auto-generated The branch main has been updated by sjg: URL: https://cgit.FreeBSD.org/src/commit/?id=ea9a7058f93f1bd533efadb592843bbfa26293a1 commit ea9a7058f93f1bd533efadb592843bbfa26293a1 Author: Simon J. Gerraty AuthorDate: 2023-10-22 17:13:20 +0000 Commit: Simon J. Gerraty CommitDate: 2023-10-22 17:13:20 +0000 bsd.man.mk guard against empty vars in MLINKS share/man/man4/Makefile adds a number of variables to MAN and MLINKS, which are only set for certain architectures. The empty variables wreak havoc when := is used. Add :M*.[1-9] to MLINKS reference for STAGE_LINKS.mlinks to avoid invalid results. Reviewed by: stevek --- share/mk/bsd.man.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/mk/bsd.man.mk b/share/mk/bsd.man.mk index 444144e6d626..25a0edcc7bc5 100644 --- a/share/mk/bsd.man.mk +++ b/share/mk/bsd.man.mk @@ -141,7 +141,7 @@ STAGE_DIR.man${_page:T:E}?= ${STAGE_OBJTOP}${MANDIR}${_page:T:E}${MANSUBDIR} .if !empty(MLINKS) STAGE_SETS+= mlinks STAGE_TARGETS+= stage_links -STAGE_LINKS.mlinks:= ${MLINKS:@f@${f:S,^,${MANDIR}${f:E}${MANSUBDIR}/,}@} +STAGE_LINKS.mlinks:= ${MLINKS:M*.[1-9]:@f@${f:S,^,${MANDIR}${f:E}${MANSUBDIR}/,}@} stage_links.mlinks: ${_mansets:@s@stage_files.$s@} .endif .endif From nobody Sun Oct 22 17:14:48 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SD4gr5GJkz4xZR7; Sun, 22 Oct 2023 17:14: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 4SD4gr4j6mz4d0j; Sun, 22 Oct 2023 17:14:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697994888; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lCnj0/h7KNJmKG6Wg8jWrW7hJkxxandbG7K2Cmb+OKM=; b=jz6hVGngPDaK5QSk6IpkDmX+1mNV9Az8CEMj7614WxWcSCYChFq1aZ6kkUfuGQWejtKZIT c583gi4vmzY+bXYOTl2LvtechZV/8qNMY8MadZTWX4uzNVNJoEPCv83/hIeQ8BYjoZNJ5B GzMpTyUia2YhoSxC0iYzK9RA6OdNEw1kFPbXnKmh4P3tF7BVEGYcfpq6xIe2B60R28HAqb dIR6hbTPA/z2dc+XIliSRukjRlokAlVb4WM39zOoXxMlS7XPQUowtCWiaHtVa7Zh9yvHYk SsCoMwCCSaMn0pTmc23rZirUcR8/ie1XaUzIhvHHTM0j78CESZJc5+MXOtITtQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697994888; a=rsa-sha256; cv=none; b=Ltt22SWeydgtoVLohZIJHJ1+WFEMqxIeDy/qAGeZOywg91S5jS4UeWTJBTkVnazM1Hu/OL 3XC89KYl84516y7yq9IlcL1n3Iwfu4Mo/Od6pWrqCHn4OAxxgjZju/4UgXroHgNwgB8syM xjQXKD7p1YP3vbtcuLxNv+BuRr05G2YPVVLD32qvCSO62Xnkl00euQpUEca4b2r4JxacYc uBZ8vyNHZSFdt4SHf7ECiUPCfQw7Aq3J5BmLiJWJq/X8dqG0SwauM5zPshf/u8UQbJWXpi bGy9t0yPju28Ufgqwb7Dnh63gUg5LHbZkT+VssDruohBCUNVlDx4lhfbSJ30dQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697994888; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lCnj0/h7KNJmKG6Wg8jWrW7hJkxxandbG7K2Cmb+OKM=; b=gYlsZZSCPP5ry05B+QDYUj/SqruYLE3/8f+lt2DvZPuXTFsZufeUHKVwfjkLefilz0L5LY HjPZVQrcmv2AHQZ2EwhrcdbwQ7SuWUHUMMQ6zJEWnGqNUbT5NWFLFEhxX0yYvEzI9DxqcK f6kUJx69IUKfZf7Jh83+w8rUTsC8G50VyA41ll67HIhv750ui7LB2hYxmmGxHZ2y+KTrPe tAYDWjZnhGPyZwzrwCijnYtYJE4yiP4XiFKRHbgbr/hvAyR6ZKRmK7gAG2M1JDbFzYNrni irUsxO4GHiSyVR4zzV+nxNjeXRP/gKLRT0UXQG/BhNEeuPLXMBHf4YFVhuWljQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SD4gr3lVFz15V2; Sun, 22 Oct 2023 17:14: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 39MHEmpV050647; Sun, 22 Oct 2023 17:14:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39MHEmrN050644; Sun, 22 Oct 2023 17:14:48 GMT (envelope-from git) Date: Sun, 22 Oct 2023 17:14:48 GMT Message-Id: <202310221714.39MHEmrN050644@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: e8f035763083 - main - Revert "tests: fix ATF_TESTS_PYTEST no clean build" List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e8f035763083c902a54e91f1999daaec628e9ebf Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=e8f035763083c902a54e91f1999daaec628e9ebf commit e8f035763083c902a54e91f1999daaec628e9ebf Author: Mark Johnston AuthorDate: 2023-10-22 17:13:31 +0000 Commit: Mark Johnston CommitDate: 2023-10-22 17:14:13 +0000 Revert "tests: fix ATF_TESTS_PYTEST no clean build" This reverts commit 6120673f7566c35023921540d2d682572d1bf1ce, which appears to break a clean buildworld. --- share/mk/atf.test.mk | 30 +++++++++++++++++++++++++----- 1 file changed, 25 insertions(+), 5 deletions(-) diff --git a/share/mk/atf.test.mk b/share/mk/atf.test.mk index bbc76b7fd97f..4b8ac8dedc27 100644 --- a/share/mk/atf.test.mk +++ b/share/mk/atf.test.mk @@ -111,19 +111,39 @@ ${_T}: ${ATF_TESTS_KSH93_SRC_${_T}} .endif .if !empty(ATF_TESTS_PYTEST) -SCRIPTS+= ${ATF_TESTS_PYTEST} +# bsd.prog.mk SCRIPTS interface removes file extension unless +# SCRIPTSNAME is set, which is not possible to do here. +# Workaround this by appending another extension (.xtmp) to the +# file name. Use separate loop to avoid dealing with explicitly +# stating expansion for each and every variable. +# +# ATF_TESTS_PYTEST -> contains list of files as is (test_something.py ..) +# _ATF_TESTS_PYTEST -> (test_something.py.xtmp ..) +# +# Former array is iterated to construct Kyuafile, where original file +# names need to be written. +# Latter array is iterated to enable bsd.prog.mk scripts framework - +# namely, installing scripts without .xtmp prefix. Note: this allows to +# not bother about the fact that make target needs to be different from +# the source file. +_TESTS+= ${ATF_TESTS_PYTEST} +_ATF_TESTS_PYTEST= .for _T in ${ATF_TESTS_PYTEST} -SCRIPTSDIR_${_T}= ${TESTSDIR} -SCRIPTSNAME_${_T}= ${_T} +_ATF_TESTS_PYTEST += ${_T}.xtmp TEST_INTERFACE.${_T}= atf TEST_METADATA.${_T}+= required_programs="pytest" +.endfor + +SCRIPTS+= ${_ATF_TESTS_PYTEST} +.for _T in ${_ATF_TESTS_PYTEST} +SCRIPTSDIR_${_T}= ${TESTSDIR} CLEANFILES+= ${_T} ${_T}.tmp # TODO(jmmv): It seems to me that this SED and SRC functionality should # exist in bsd.prog.mk along the support for SCRIPTS. Move it there if # this proves to be useful within the tests. ATF_TESTS_PYTEST_SED_${_T}?= # empty -ATF_TESTS_PYTEST_SRC_${_T}?= ${.CURDIR}/${_T} -${_T}: ${.CURDIR}/${_T} +ATF_TESTS_PYTEST_SRC_${_T}?= ${.CURDIR}/${_T:S,.xtmp$,,} +${_T}: echo "#! /usr/libexec/atf_pytest_wrapper -P ${TESTSBASE}" > ${.TARGET}.tmp .if empty(ATF_TESTS_PYTEST_SED_${_T}) cat ${ATF_TESTS_PYTEST_SRC_${_T}} >>${.TARGET}.tmp From nobody Sun Oct 22 17:19:04 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SD4ms5SJtz4xZrV; Sun, 22 Oct 2023 17:19:09 +0000 (UTC) (envelope-from markjdb@gmail.com) Received: from mail-qv1-xf29.google.com (mail-qv1-xf29.google.com [IPv6:2607:f8b0:4864:20::f29]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SD4mr6nq2z4dGF; Sun, 22 Oct 2023 17:19:08 +0000 (UTC) (envelope-from markjdb@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-qv1-xf29.google.com with SMTP id 6a1803df08f44-66cfef11a25so14164736d6.3; Sun, 22 Oct 2023 10:19:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1697995147; x=1698599947; 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=DFx1JS0TAOEFkvo9S+C5kK7kce+ncRqruM3Rn4EU3a0=; b=icSL06yhnrP9Qomk9G+SH5zCCi3yGJjlJGK9t9kcXPIYm3vLOmvTvXNxT3U7teJWw5 HVagZt0R0SbYIHpw3Gghx8nQmtCHJuDRqSN0hGa1cJizc0ESta+8MnWrGi96lG8hFz6/ l4kl/2jceH1dai/Tu2Bk1ysIn9vGey1Y4QnLMOaw+Z4ePdrhegAqPHDlf4Ml6jlLqqu4 d0xTXT2oyyxpQvNypvliWF+BfDDuSG0lnGZq5sKAg6rAhY3pkl5BuOTsX+EfT6S9XZr9 shiyhdrJYrn2PsU/fe/FwNIb/hhWQrDYmw2jyvwvrbnrmssgf9mSiseXtSLgiLLX6Zuu q7Zg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697995147; x=1698599947; 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=DFx1JS0TAOEFkvo9S+C5kK7kce+ncRqruM3Rn4EU3a0=; b=iZym5gfOClpPNYcUV+8T4HOYL8iKvdO5pBbiROHd0PK30txhlMi1nSxupEe8HI66j3 +P7qaPx268BJ4ru4bOjx9rKqhkFOpt7JiZ2/FtTyTGGIlzFUUJbJMnC9KfF3JNL9XI9c FQ8bZKlwrBnV6aw/1wkiJHfdpUQQrXUexvQ8hMnIlXp4RWYUGrmM3+jYfPVTcsZmptY1 IBrwJZ6bZXWSdRJgAFHLPGGoY/K5MTPKr0sbcpKxgcT7hNdrdOohhhtI2fvZ+ue/iHxP A+inixT9dy2W31846WyNjMym+0Bpucv98wnh87LFQDfWYisNCoecP6VyGriCa0cnx0PV jM0g== X-Gm-Message-State: AOJu0YwFh2CV6uh8rruCcbWzvntcBBPaqMwmUOfIGtWAon762qOop8NX bebFsk3ak5fTvPkCIGUwGBVf6bx2rrg= X-Google-Smtp-Source: AGHT+IEktmujZCf/dPdw4/kKFSy9tGyrqSlXEXGXx0EQ28HUx0WdxJo/C4lxv1CK4IzRKb1xDKccNg== X-Received: by 2002:a05:6214:250a:b0:65d:56c:5177 with SMTP id gf10-20020a056214250a00b0065d056c5177mr7463970qvb.57.1697995147139; Sun, 22 Oct 2023 10:19:07 -0700 (PDT) Received: from nuc (192-0-220-237.cpe.teksavvy.com. [192.0.220.237]) by smtp.gmail.com with ESMTPSA id dj19-20020a056214091300b0065af71585b5sm2308355qvb.58.2023.10.22.10.19.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 22 Oct 2023 10:19:06 -0700 (PDT) Date: Sun, 22 Oct 2023 13:19:04 -0400 From: Mark Johnston To: Dimitry Andric Cc: Gleb Smirnoff , "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Subject: Re: git: 6120673f7566 - main - tests: fix ATF_TESTS_PYTEST no clean build Message-ID: References: <202310201747.39KHlUgB005433@gitrepo.freebsd.org> List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: 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: 4SD4mr6nq2z4dGF On Sat, Oct 21, 2023 at 09:07:26PM +0200, Dimitry Andric wrote: > On 20 Oct 2023, at 19:47, Gleb Smirnoff wrote: > > > > The branch main has been updated by glebius: > > > > URL: https://cgit.FreeBSD.org/src/commit/?id=6120673f7566c35023921540d2d682572d1bf1ce > > > > commit 6120673f7566c35023921540d2d682572d1bf1ce > > Author: Gleb Smirnoff > > AuthorDate: 2023-10-20 17:47:08 +0000 > > Commit: Gleb Smirnoff > > CommitDate: 2023-10-20 17:47:08 +0000 > > > > tests: fix ATF_TESTS_PYTEST no clean build > > > > The hack with .xtmp file was effectively making the make to > > ignore changes to the sources, breaking NO_CLEAN builds. The > > hack can be actually omitted as setting SCRIPTSNAME_${_T} for > > every test is sufficient to prevent renaming by bsd.prog.mk. > > > > Reviewed by: melifaro > > Differential Revision: https://reviews.freebsd.org/D42283 > > This appears to break clean builds, in that it now deletes files > mentioned in ATF_TESTS_PYTEST in the _source_ directories, leaving your > git checkout looking as follows: > > Changes not staged for commit: > (use "git add/rm ..." to update what will be committed) > (use "git restore ..." to discard changes in working directory) > deleted: sbin/ping/tests/test_ping.py > deleted: tests/examples/test_examples.py > deleted: tests/examples/test_ktest_example.py > deleted: tests/sys/net/routing/test_routing_l3.py > deleted: tests/sys/net/routing/test_rtsock_multipath.py > deleted: tests/sys/netinet/carp.py > deleted: tests/sys/netinet6/test_ip6_output.py > deleted: tests/sys/netlink/test_netlink_message_writer.py > deleted: tests/sys/netlink/test_nl_core.py > deleted: tests/sys/netlink/test_rtnl_iface.py > deleted: tests/sys/netlink/test_rtnl_ifaddr.py > deleted: tests/sys/netlink/test_rtnl_neigh.py > deleted: tests/sys/netlink/test_rtnl_route.py > deleted: tests/sys/netpfil/pf/frag6.py > deleted: tests/sys/netpfil/pf/sctp.py > > Then of course when buildworld arrives at the point where the tests are > built, it errors out with "don't know how to make > sbin/ping/tests/test_ping.py", and similar. > > Do you mind if I revert this for now? I went ahead and reverted the commit since this problem is biting me too in some cases. From nobody Sun Oct 22 18:11:05 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SD5wn33M8z4xdPw; Sun, 22 Oct 2023 18:11:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SD5wn2Z5qz4jql; Sun, 22 Oct 2023 18:11:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697998265; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=67/052OdsMRcVlMwMV9lywEhymtMgpKyRIkrkQrtRLU=; b=UUSWrUzyI0fhW+2dje2WXqwegig4F+6iU9POfsTqbHp30rvBceBM76k5FUdZJpCQLFsiik kGXJmnGvvDP29ClCI9n//ElI8aOEO+weqcj54Eel4LlViUqUsjzjrb+52TOThDe5lL27mB uQei85wP5W5YQ2oTsOO6doR6l242bha0kRGN3ScK2h+IRJc325zILsQZrFL61gZctO1rjx FgWVmXeJJq5mgpKtCInfe4qUi9kIjkog+6umCsMyJ4fR+2/WxG14wmiNxiBFzwKnWQS36r 92wpG1esAWkOdATqtkORAklN5Xs2i3mJfNqp1T/jYLyxdHZ1Zs34W+V7+KcMWQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697998265; a=rsa-sha256; cv=none; b=uwMZ/P6a88HLIJwiMm3U72uQvJm63mVkqGPA/bKwHkvXvJouqr6RBtQB86v54dvGNHuxO+ vqC/Km4cc5BcWI2EodFyMNA8a9eI2H1xcNV90QhrqBV3/ujoTXE+vruG1QQixL9CWaYPjb iQFhAaDuWRyomi4CsROM79N0ENDFfcqAqkW/w0cHovyG7NU30Cyd8w9cNUnsS5bbqqFCgS 2FNnNTwRF6F0kO54RveZKJg+eqoyo6O1JFL+FUCAia2svUx3r8CR50qG8IonRJIf11wXtB Jr/HxR6umH9skUJKaBsjhlUyRsyB8+M4MSUMDryt7CYcrVN+gidEB8Q1vxe/8A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697998265; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=67/052OdsMRcVlMwMV9lywEhymtMgpKyRIkrkQrtRLU=; b=EaSPz3WngEjnefhGf/Ssmuc2OBsTfW/XAKfrm1CLUv8WfTiKl8y4Kgts4XfxvK8bl6Mohc F2iAQC1jTXpKBrtq6zAgRs9dzVXqUzgfSjTvVuvVNF/siA1JGPtTKLXRiXQEcfY9dnQA8+ pfgrJ9UoyVtir6bEa1UKsdY4LzLzrbbA/EmcKKKxnHa1BoCelz0QQqIHMvvrJKTdQ+fnB8 /20fF267Toz+6ol0wysAr7f6epV/MSaOtDwzEtLVixDAUiBdccHuRs/GXQz1kcOzrWEIiE jMTBzLrnLUUju9CjW7QUJlQD6akTdHCemJa9B/fzGcqXWPVJ59xxdOXBWi9yfA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SD5wn1fb9z16vV; Sun, 22 Oct 2023 18:11:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39MIB5LK045862; Sun, 22 Oct 2023 18:11:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39MIB5fr045859; Sun, 22 Oct 2023 18:11:05 GMT (envelope-from git) Date: Sun, 22 Oct 2023 18:11:05 GMT Message-Id: <202310221811.39MIB5fr045859@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: ed1535b37cc4 - stable/14 - Add WITHOUT_MANSPLITPKG 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: ed1535b37cc476720e2bf0017afea6f927dc030f Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=ed1535b37cc476720e2bf0017afea6f927dc030f commit ed1535b37cc476720e2bf0017afea6f927dc030f Author: Ed Maste AuthorDate: 2023-09-16 15:28:28 +0000 Commit: Ed Maste CommitDate: 2023-10-22 18:10:50 +0000 Add WITHOUT_MANSPLITPKG description Fixes: 74da9c39c346 ("pkgbase: Split out manpages by default") Sponsored by: The FreeBSD Foundation (cherry picked from commit d3a9d605a8963b7833936fd9679b734871facab4) --- tools/build/options/WITHOUT_MANSPLITPKG | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/build/options/WITHOUT_MANSPLITPKG b/tools/build/options/WITHOUT_MANSPLITPKG new file mode 100644 index 000000000000..a9913308d411 --- /dev/null +++ b/tools/build/options/WITHOUT_MANSPLITPKG @@ -0,0 +1 @@ +Do not split man pages into their own packages during make package. From nobody Sun Oct 22 18:47:15 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SD6kX0n4Zz4xgfj; Sun, 22 Oct 2023 18: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 4SD6kX0DCpz4mHq; Sun, 22 Oct 2023 18: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=1698000436; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5dpRTHTzWt5TxXAf3qddw9sEsUBwXcm9kPRLNCfaeVA=; b=tVbT+34o8IRsgjNb2FSw2hvF0KH8q3iqcDxDJ0NJVmU/TLrT9IT2u1vfDahveTETEEFYl7 UyQkEIYsz5P3irvBLuD5IWmJtF3jhpV6S/NxubgsVP6MvXBimdLzCAkU5hhmSt7D7DwCNB qG7aeJ6E+zZc6wE6NGV12nQoe7IXTs58rjP/vJJItLS82di3t9LKJ6jHfjQwjDzwyELbtx 6nKE/+FBcJ4ND/CaHU9pbupqNaXX0VMrjKdXB269L2nvrNgODhHz3ON2AEDb4k5KhyYEig j/hyxOVJytLL7AOz5tsBW3j5yvDq4/n3qlz5asd7gdf/374/W50qONgS45BjBw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698000436; a=rsa-sha256; cv=none; b=jVtWGCuCNCAu9+JhvGtf0gn185FWzn7FU62hkKRLo9g/Hf3itZhM9g9Ia/OVqNZOzhq6WN lvAX6Z070uMV+QSQSKU9Cpjy7N6pfV/vl6c7OHjmzXm/aK5XCR1HJg+2873ECeH29gGPCR tqpxCeszsyNlD7CaNzy1JscYRVDdgeMX89Zwx6XgczCBoAvV0//On8p0xCJWNMKeP1vEVR INuMiPoUOU/qDZHzRYuPfu1EqeydnBxnKHWEtyFlXMDCFdqJQICU6GP86y2qHQvX118S2O DaGcobT03ran2CSJ/Ghu+XNelc2tw40iV7KcKkPwPVkVANSXKrNKU/2CLVaukw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698000436; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5dpRTHTzWt5TxXAf3qddw9sEsUBwXcm9kPRLNCfaeVA=; b=pyNEwHPWEywcAnqimbZPfa4067F8nzI4pcaVQdECpubMejITjWpOJ99w3i2abX6ALvr3rX gNaHJ9VNnXe35nBGFTP1TrB+TGmq/duHRiVHKBtVbVmmkC0esmUo7XwBVupCudGsT78pTU B83Z/o6qBNww4hYVlfBNHXtziMOjTq8tbcKEx2TrSH5GMvL6gXP7QGRcNVrJT+h9mYrjmD yv1oWi7h0Y3CiGGslg/aKCJQ6LcAJIxWnh/HqjmFYJ0FDeV6uyunGrozdmelOwxgsss4xZ R37CCTXbehGV+RKFBNgyx2AeIJ9AUJwh4xmCRJRx6mTwI1+E2oQ23r+bTFlmAg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SD6kW6Hh7z17st; Sun, 22 Oct 2023 18: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 39MIlFIZ000873; Sun, 22 Oct 2023 18: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 39MIlFJI000870; Sun, 22 Oct 2023 18:47:15 GMT (envelope-from git) Date: Sun, 22 Oct 2023 18:47:15 GMT Message-Id: <202310221847.39MIlFJI000870@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dmitry Chagin Subject: git: accbd5ad06c3 - releng/14.0 - vfs cache: Fallback to namei to resolve symlinks with leading / in target for non-native ABI List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.0 X-Git-Reftype: branch X-Git-Commit: accbd5ad06c3eeb17d75cde05597f70f1fedb061 Auto-Submitted: auto-generated The branch releng/14.0 has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=accbd5ad06c3eeb17d75cde05597f70f1fedb061 commit accbd5ad06c3eeb17d75cde05597f70f1fedb061 Author: Dmitry Chagin AuthorDate: 2023-10-19 10:33:58 +0000 Commit: Dmitry Chagin CommitDate: 2023-10-22 18:46:22 +0000 vfs cache: Fallback to namei to resolve symlinks with leading / in target for non-native ABI This is a temporary solution to fix PR before release. During 15.0 it's necessary to refactor symlinks handling between vfs & namecache. Approved by: re (gjb) PR: 273414 Reported by: Vincent Milum Jr, Dan Kotowski, glebius Tested by: Dan Kotowski, glebius Reviewed by: Differential Revision: https://reviews.freebsd.org/D41806 MFC after: 3 days (cherry picked from commit bb8ecf259f96510b9c2146d846403393543061b7) (cherry picked from commit b84a836ef02de42e262ce44d46c859be288df4b0) --- sys/kern/vfs_cache.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/sys/kern/vfs_cache.c b/sys/kern/vfs_cache.c index 115d0bdd3993..8917666950c1 100644 --- a/sys/kern/vfs_cache.c +++ b/sys/kern/vfs_cache.c @@ -5337,12 +5337,14 @@ cache_fplookup_symlink(struct cache_fpl *fpl) struct nameidata *ndp; struct componentname *cnp; struct vnode *dvp, *tvp; + struct pwd *pwd; int error; ndp = fpl->ndp; cnp = fpl->cnp; dvp = fpl->dvp; tvp = fpl->tvp; + pwd = *(fpl->pwd); if (cache_fpl_islastcn(ndp)) { if ((cnp->cn_flags & FOLLOW) == 0) { @@ -5398,6 +5400,9 @@ cache_fplookup_symlink(struct cache_fpl *fpl) cache_fpl_checkpoint(fpl); return (cache_fpl_partial(fpl)); } + if (__predict_false(pwd->pwd_adir != pwd->pwd_rdir)) { + return (cache_fpl_aborted(fpl)); + } } return (0); } From nobody Sun Oct 22 18:49:55 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SD6nb4qkwz4xgZd; Sun, 22 Oct 2023 18:49:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SD6nb4Gq9z4n0H; Sun, 22 Oct 2023 18:49:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698000595; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GGEioyb2P7wvI5iv13FF6sUbpTSoOQlKlIgT3c46KWM=; b=D0v0667s+D+N96Bp5b8Ra/1D2+7zvjxz42mFGWcvzAZkU6F+xKULp4Ftsf51BbOB2GsDjw 2f+jA9WjEcwq68YxipkNHgcTdU38gNEtgaJKbJbnG2EZSUhsPvyuIPuyv6Hv/cggMf1feX DbSEu9NvdXL+csLkOHNCtjga4oxa7+9bziP8VWazvSgQo55FHoa8ObvhO2UP85HjwlSAND ULKmqnm0mSyMASmLlh3gJCy4Zkpw26ar37aH38BbvhyeFluSeJ3dm9XXXXPygdeBYREAJF 0aoc1uX/2BSa8tn1Hf3P2hCkggsG46RzW+6epJg+qd2yqMj+H2xWDM7YjmaydA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698000595; a=rsa-sha256; cv=none; b=OH7+jm+hlm49qhWcTesugLia4OIbvtlr7uZ3w1tNM0KW6EM7RY2GZnCiyyPpKQB+514nDq 93LI4IntiZDhMpqj1OYOgtNTnvu4927oiK8rAbwu51RD6mXswbDi/kei434ZuIoHk0euTB YD2gLygaNanNhQO7h9IJn28u1HFpcrnKRLNjzv6oJlB9DTtfKpXKg2MxBIitoGg67P4vv2 jPv78GK7iMkFJC3rwDBAFqIFXkjdEU3Y42eOG5A04f1jxTswDwjf4krDW3jtqS8UcxAL+b lr7aH2qoCTFNBxVeVgiczY2XQzJuhypQ9BxdXa3n5CU+1LxoLize+INou4phew== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698000595; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GGEioyb2P7wvI5iv13FF6sUbpTSoOQlKlIgT3c46KWM=; b=DRsUog5gU+70DpePiEq/+Qiq7eN4tNhRkrdW3cjPGVG0+JcGNGT5Ii68uid+Lp4cLZrTBA dm/U96mwsyG8mR/jUW5usT1TwpL+MP3LUAVmALoNEdv+bmPvHI0r2cB8XO5aWF7b/vyNEe ToDhHDb69p9ck6oPOSZ4cME0tjCJLnfwtvXw5M4xYav5CEaCIxVQ7ahtbIuWgbDiNfdoAc rMi+CEDQ7ADwibvjF1eqZaCh3+awvktRxh7XfwBpLCFB5dCD5WhwHu0YAllfKLWxUSn86n 8LDvVRdge+3F77VS70z/wIdCN3AgT0h7BLjMql7b3lriV8inXfomnIeld8vo/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 4SD6nb3KFWz17dy; Sun, 22 Oct 2023 18:49:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39MIntfs001334; Sun, 22 Oct 2023 18:49:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39MIntgh001331; Sun, 22 Oct 2023 18:49:55 GMT (envelope-from git) Date: Sun, 22 Oct 2023 18:49:55 GMT Message-Id: <202310221849.39MIntgh001331@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Devin Teske Subject: git: 608da65de955 - main - bsdconfig: Add `network' keyword List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dteske X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 608da65de9552d5678c1000776ed69da04a45983 Auto-Submitted: auto-generated The branch main has been updated by dteske: URL: https://cgit.FreeBSD.org/src/commit/?id=608da65de9552d5678c1000776ed69da04a45983 commit 608da65de9552d5678c1000776ed69da04a45983 Author: Devin Teske AuthorDate: 2023-10-22 18:45:36 +0000 Commit: Devin Teske CommitDate: 2023-10-22 18:45:36 +0000 bsdconfig: Add `network' keyword Configuring a FreeBSD laptop, my fingers kept wanting to type `bsdconfig network' and I could not figure out why this was not working. Took me a second to realize that the shortcut was `bsdconfig networking' for where I wanted to go. Reviewed by: jhb Approved by: jhb Differential Revision: https://reviews.freebsd.org/D42242 --- usr.sbin/bsdconfig/networking/INDEX | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/usr.sbin/bsdconfig/networking/INDEX b/usr.sbin/bsdconfig/networking/INDEX index fc4e6793aa5d..0b80c163e1fd 100644 --- a/usr.sbin/bsdconfig/networking/INDEX +++ b/usr.sbin/bsdconfig/networking/INDEX @@ -1,5 +1,5 @@ # Copyright (c) 2012 Ron McDowell -# Copyright (c) 2012-2016 Devin Teske +# Copyright (c) 2012-2023 Devin Teske # All rights reserved. # # Redistribution and use in source and binary forms, with or without @@ -45,6 +45,7 @@ menu_help="Setup Networking interfaces, services, etc." # can be i18n'ed but `command' is the name of a script. # menu_selection="networking|networking" +menu_selection="network|networking" menu_selection="defaultrouter|defaultrouter" menu_selection="hostname|hostname" menu_selection="nameservers|nameservers" From nobody Sun Oct 22 22:13:15 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SDCJN4bnjz4xtgV; Sun, 22 Oct 2023 22:13:24 +0000 (UTC) (envelope-from glebius@freebsd.org) Received: from glebi.us (glebi.us [162.251.186.162]) by mx1.freebsd.org (Postfix) with ESMTP id 4SDCJM5Q91z3RgM; Sun, 22 Oct 2023 22:13:23 +0000 (UTC) (envelope-from glebius@freebsd.org) Authentication-Results: mx1.freebsd.org; dkim=none; spf=softfail (mx1.freebsd.org: 162.251.186.162 is neither permitted nor denied by domain of glebius@freebsd.org) smtp.mailfrom=glebius@freebsd.org; dmarc=none Received: by glebi.us (Postfix, from userid 1000) id D9C786EBB8; Sun, 22 Oct 2023 15:13:15 -0700 (PDT) Date: Sun, 22 Oct 2023 15:13:15 -0700 From: Gleb Smirnoff To: Dimitry Andric , markj@freebsd.org Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Subject: Re: git: 6120673f7566 - main - tests: fix ATF_TESTS_PYTEST no clean build Message-ID: References: <202310201747.39KHlUgB005433@gitrepo.freebsd.org> List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: X-Spamd-Bar: / X-Spamd-Result: default: False [0.63 / 15.00]; VIOLATED_DIRECT_SPF(3.50)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_SHORT(-0.97)[-0.974]; ONCE_RECEIVED(0.10)[]; RCVD_NO_TLS_LAST(0.10)[]; MIME_GOOD(-0.10)[text/plain]; ASN(0.00)[asn:27348, ipnet:162.251.186.0/24, country:US]; MLMMJ_DEST(0.00)[dev-commits-src-all@freebsd.org,dev-commits-src-main@freebsd.org]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; RCVD_COUNT_ONE(0.00)[1]; MIME_TRACE(0.00)[0:+]; RCPT_COUNT_FIVE(0.00)[5]; R_SPF_SOFTFAIL(0.00)[~all:c]; FREEFALL_USER(0.00)[glebius]; TO_DN_EQ_ADDR_SOME(0.00)[]; MID_RHS_MATCH_FROM(0.00)[]; FROM_HAS_DN(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; TO_DN_SOME(0.00)[]; DMARC_NA(0.00)[freebsd.org]; ARC_NA(0.00)[] X-Rspamd-Queue-Id: 4SDCJM5Q91z3RgM On Sat, Oct 21, 2023 at 09:07:26PM +0200, Dimitry Andric wrote: D> > commit 6120673f7566c35023921540d2d682572d1bf1ce D> > Author: Gleb Smirnoff D> > AuthorDate: 2023-10-20 17:47:08 +0000 D> > Commit: Gleb Smirnoff D> > CommitDate: 2023-10-20 17:47:08 +0000 D> > D> > tests: fix ATF_TESTS_PYTEST no clean build D> > D> > The hack with .xtmp file was effectively making the make to D> > ignore changes to the sources, breaking NO_CLEAN builds. The D> > hack can be actually omitted as setting SCRIPTSNAME_${_T} for D> > every test is sufficient to prevent renaming by bsd.prog.mk. D> > D> > Reviewed by: melifaro D> > Differential Revision: https://reviews.freebsd.org/D42283 D> D> This appears to break clean builds, in that it now deletes files D> mentioned in ATF_TESTS_PYTEST in the _source_ directories, leaving your D> git checkout looking as follows: Oh shit... Sorry. :( When I come up with a better change, who would be a good reviewer for the change? Mark, thanks for reverting promptly. -- Gleb Smirnoff From nobody Sun Oct 22 22:45:27 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SDD1M51xwz4xwjq; Sun, 22 Oct 2023 22:45: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 4SDD1M3DPYz3TSR; Sun, 22 Oct 2023 22:45:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698014727; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZZL9ojAZXhEeLcNG9JNlOknvL3c6Vnmkx7tWlnPNmFg=; b=Y8uRzSiNcYnFPdJDVd+0vMj7kzVzCxCmZBMb7i3AZkqhaYRsOVav7z9PAMFtX+tKQZpVhx YJ9ZMcFnEnC5WhynDFFeAP/jJC8wf5yHOGPwt7mi90zIpcvwYsYtKW/xOIbIVkETyfbVmb /mQUUuvc6Tj1TGIlE2BhV+RZerX7+KTT4tqgcdtjYJLHAC80zqJKznProbbqhlEoJKanfn cApactxLhCMv+fjOJ27+P9yh97BsTkMXF2uInlJ4h7stAiCXDia0VkSK/2Txj+gHy3HMnl YEWQ7CA+vY8ASYsR/CmOdEb67s3KTmwlfJnfmEfx1gdhZn5fpPAOHrMqnCFKMA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698014727; a=rsa-sha256; cv=none; b=Pz6FD5wRCg5OygGBf4Z3cEJs+TW5wb+AzT1Lwa+dv8VX96ccX7T1YdEpF72We7OW6G3KdB WzuFqYvhALAzuECX3zyHlr/ZfRYYLbw8s90BpTRHTbocR29168CNK2HbDgshvrlGxU5B7z 30Z0E9RfoTvQ+OAUE9BotG22+oib66FPGv/KkzoSe1rJpdTA0KzYnRKBpqREae2hQf2ezq Dopa6g47gdKgoECBQRF0Eol5mu48cnchYq4Tnr5RMHvNOrWXDmqS2x3NG4xVNu3svg5257 kGZbauNHIfbvq2b7BGpPl0ijTg/S9qYOUiWAvLkKyVVHmECLbbkkgWjMmFqW4A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698014727; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZZL9ojAZXhEeLcNG9JNlOknvL3c6Vnmkx7tWlnPNmFg=; b=ZoGvWlN5qVEaxKY6MPLd/2O2kTfJpjOI07GqJckrDhzumAc1t60Q8i9CMFoC5NHYl6fhye t7kZIj+CatRG1tig9vrN3KeIniKfjgE1t2pi5+ON3ewPTfsSxk5zPra4IN/UI79wGIxUYd zCoAd7KFNot/Ul6tcqrXjKVF7rJtO3a01djhnDai8zmPW8Sz3ycDbQdWmqE9bNklWSB4pC zj8TQ0phdzllH2gnvMqJ2ERKvL2dstk1uchUzG5Fz/uHOB2dL6b/ApL3eFKzMsiJZd8hc8 yLxehWRFmIrZaGL3Bx393XidKtKRvDal02XbsIhdz/DC2R8jbKhbUeOev7n4Vg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SDD1M2HYxz1Nc; Sun, 22 Oct 2023 22:45: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 39MMjR8Z098907; Sun, 22 Oct 2023 22:45:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39MMjRcN098904; Sun, 22 Oct 2023 22:45:27 GMT (envelope-from git) Date: Sun, 22 Oct 2023 22:45:27 GMT Message-Id: <202310222245.39MMjRcN098904@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Martin Matuska Subject: git: c458bf557d66 - stable/14 - zfs: cherry-pick change from master List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mm X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: c458bf557d66161730ce644af840e968397a377b Auto-Submitted: auto-generated The branch stable/14 has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=c458bf557d66161730ce644af840e968397a377b commit c458bf557d66161730ce644af840e968397a377b Author: Martin Matuska AuthorDate: 2023-10-20 17:30:32 +0000 Commit: Martin Matuska CommitDate: 2023-10-22 22:45:03 +0000 zfs: cherry-pick change from master #15405 ea30b5a9e Set spa_ccw_fail_time=0 when expanding a vdev Fixes 5-minute autoexpand delay on ZFS-root VM images. Requested by: cperciva Co-Authored-By: Colin Percival Obtained from: OpenZFS OpenZFS commit: ea30b5a9e0d266baa13398ed8f9435de050f4b25 --- sys/contrib/openzfs/module/zfs/vdev.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/contrib/openzfs/module/zfs/vdev.c b/sys/contrib/openzfs/module/zfs/vdev.c index 87c145593237..afb01c0ef7fd 100644 --- a/sys/contrib/openzfs/module/zfs/vdev.c +++ b/sys/contrib/openzfs/module/zfs/vdev.c @@ -4215,6 +4215,7 @@ vdev_online(spa_t *spa, uint64_t guid, uint64_t flags, vdev_state_t *newstate) /* XXX - L2ARC 1.0 does not support expansion */ if (vd->vdev_aux) return (spa_vdev_state_exit(spa, vd, ENOTSUP)); + spa->spa_ccw_fail_time = 0; spa_async_request(spa, SPA_ASYNC_CONFIG_UPDATE); } From nobody Mon Oct 23 10:13:01 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SDWGj5J7gz4xs8J; Mon, 23 Oct 2023 10:13: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 4SDWGj4g6sz3JQj; Mon, 23 Oct 2023 10:13:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698055981; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JHUhbk/ZBl2x3BZSPHTidn/lfQ8KLGYo7Gz+rTjGx+4=; b=NnoBxuLzEa40r+FYiyzjMHlJ0i37BweykL7Q23RgXVYAJbyYahHcM0wkMhoXAg61nXXahs zdD/L+nL+cGrIHxUHNnm+KXodGCIokI1CGOqxELk/joYLTP97BIRBkSt9+UKjGPpc6xXCc wfyhKweqOOO4ejc7PQAIZWiEveg2gcrjr2+oEtIFl0ikb1r0OxDpj1t1Z8VtKUu4BMLTto CKwkNKEwiRulT7z9Jci6nfAjIC+JIlKnYA6GrDl8LPsMqn4j0QJ1yroxnMw3o6m/Zx+NUE px9U0vZEc5To6phs1p8Gdls1lw9fYAA2njYESG7odM8Q4EHwRzaRaa54WLt6xw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698055981; a=rsa-sha256; cv=none; b=ggZREdv2YbOnogeiwvWtEytw7CXIVX1atVsKi8VXrMl9g+waqE9ru0dA2qey4bmGAQCx6s ruREftiZskxLzAOck05tBT2FpkbTYi6WZFbJ6bDyMEgfY2t2M8H2ZuAkAYRiSBZeVD1SOJ 6I3aw0bOSDRxI4k3YcJCaKfT3vIl3zo5hWzYp1TyIY972lgtTKfTC0aGGOJiMIWx7BhFjc PvooPJB3dzjtjZWNqLggJAZlvVjDbYzd7mhsvow3aDw47VSSsgvwhylzVwZOq+nIJQpT+y D4RKf5EQSxEoZRJIxfS/tFW6zem0C5HKVmYHUpFFEVGDubOvcokpBOVKKBwy8Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698055981; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JHUhbk/ZBl2x3BZSPHTidn/lfQ8KLGYo7Gz+rTjGx+4=; b=PgW1Lcbtk0nfcUCwlfd9Tjh/hDgUc+Y0L5NzzqSxY6cvQLOcNOjqmBojfjqWmSpLN027wL Cw42RlBua2F3pB3/t0/p2ifLgvjCpyuf/GiH7QQMl4c9ELSaEDbF3TRfXhStxvX9+VNVzP kpDbbtwA8zmxB+qtX/kpgcQkPyKYDc3CpkSd5mUqW9rbm1KJt4Qw5wFnC1ZVJx8T2gfq6t MUlp8lWUdkbzZLkXoCRhbE9qSOc6DXj4NxEsbG2U6dzfitLU5OxoEH2XGYcGCTxpulp7Wk HlopUFsQUpxatjTFSHZNXvj89xkZodKQsICTIEUZKQ4emPGP18p03+kqKlpItw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SDWGj3jWLzbdw; Mon, 23 Oct 2023 10:13: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 39NAD178045992; Mon, 23 Oct 2023 10:13:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39NAD1gd045989; Mon, 23 Oct 2023 10:13:01 GMT (envelope-from git) Date: Mon, 23 Oct 2023 10:13:01 GMT Message-Id: <202310231013.39NAD1gd045989@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: d8aaf0979233 - stable/14 - veriexec: Correctly export symbols List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: d8aaf09792338fae07b9618665ea9612b7b92a6e Auto-Submitted: auto-generated The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=d8aaf09792338fae07b9618665ea9612b7b92a6e commit d8aaf09792338fae07b9618665ea9612b7b92a6e Author: Zhenlei Huang AuthorDate: 2023-10-15 14:29:18 +0000 Commit: Zhenlei Huang CommitDate: 2023-10-23 10:12:21 +0000 veriexec: Correctly export symbols There's no symbol named 'mac_veriexec_get_executable_flags', the right one should be the function 'mac_veriexec_metadata_get_executable_flags()'. Reviewed by: stevek MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D42133 (cherry picked from commit f34c9c4e3bdc2b8bffae4ac26897e0e847e9f76f) --- sys/modules/mac_veriexec/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/modules/mac_veriexec/Makefile b/sys/modules/mac_veriexec/Makefile index a165daeec043..82cf468fec50 100644 --- a/sys/modules/mac_veriexec/Makefile +++ b/sys/modules/mac_veriexec/Makefile @@ -18,7 +18,7 @@ SRCS += \ EXPORT_SYMS+= ve_mutex \ mac_veriexec_in_state \ - mac_veriexec_get_executable_flags + mac_veriexec_metadata_get_executable_flags .if defined(KERNBUILDDIR) MKDEP= -include ${KERNBUILDDIR}/opt_global.h From nobody Mon Oct 23 10:13:02 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SDWGk6qSpz4xs58; Mon, 23 Oct 2023 10:13:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SDWGk63NTz3JXF; Mon, 23 Oct 2023 10:13:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698055982; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+tVO3r0rFuP5lp76kAvmKSXzni5iqrs+dA2f7lkAkDc=; b=kgsjveDSMaLMAbaDohqmR6tekY5J9EkHpvRlPDrGA0HMypDIQh75rQLJuvbNd8HqVttPvb 9UVvSETmsud9TVNT1KVvO2xZTYe2br3LnBacXjGALRTrld7JLQoYXaeoN67yBIN3TQK+3L T/TIj39332G75RJaFmhnMf6gJ07WBPVYsKrPjbTHOOSHOi9+50HSqiqzqQTrQmRvcSX0hk N8mszpx80a8U1xVMD/tMRWfA/NVR0bxOT9FZlHmWoM/346gwyyhGBy5DYyTgxkmnR1tmjj BgjbxVKCPCsj7lMPesC1tNoy+l9kCXajUoyCQj6tzL4f4jqiHxJEsrWfdU//bw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698055982; a=rsa-sha256; cv=none; b=MHRoGnpuJP4x6QqaSTHqnQybo+mcmnwAH09iQhFRSimTBR+KslTWmX6MvBxdUsniHEYszg ASMzKcGlhBBJOUcR5g+lClalb6SZYcxp9h9LH6JjhAELbIXzNNEIM1xb0o/pOjyqSa17qw Fd9SGhuv+69o5wnONDceYgupErbK8FYatzs0Da0Hj13N/guAHQh2M8xR5F/YmpfAUt3Dp7 Iuq+L9nzRK4eGavzAqjQ2LFY6YXa5VVreTZVEj5o4GE/l+wobC4Iv7A8F1Ak08eEgJ4N96 TQDenVZS1xzDjRNNcABJ6qXXO5IZ+zHTpi/hj47QnHwYBqs2naZE9EwEsHwpVQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698055982; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+tVO3r0rFuP5lp76kAvmKSXzni5iqrs+dA2f7lkAkDc=; b=KqEdSYEFqM+h0alYcU4VxZnH/rLn/BnHGCWFDaY1u9bbc5HrgecesgbFNbN33CE9UrjfQ4 R6hXjrR0KT+eXXTpK8QV9QFyFeHUv3QC2WGEe5oOvrY2+WMO1RhHsCyYd6B0jefjQLShjL fmCAFJfokBtM5bZROVNsnLJ9vBIxxq/vwlyVULPqpmOxJfHkPY8BLGeMgGCKZYesrP0O4X TvJY9q+GHz4UB8Exyql7X4ODFvkupGB7RpQLP2ZONb2+F2jxWQATlEsKt9KDiD+YIczKYA 26cpM6ggxkZpzdHQI5KDtJY+GNKRQqCjTLWZcM0lfrMbcr9ZiNxl8QGfFVrQug== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SDWGk4nsbzbhc; Mon, 23 Oct 2023 10:13:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39NAD2R7046040; Mon, 23 Oct 2023 10:13:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39NAD20V046037; Mon, 23 Oct 2023 10:13:02 GMT (envelope-from git) Date: Mon, 23 Oct 2023 10:13:02 GMT Message-Id: <202310231013.39NAD20V046037@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: e53f8ca323e8 - stable/14 - pmap: Prefer consistent naming for loader tunable List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: e53f8ca323e8e563d4b55883fc3544bea75aab29 Auto-Submitted: auto-generated The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=e53f8ca323e8e563d4b55883fc3544bea75aab29 commit e53f8ca323e8e563d4b55883fc3544bea75aab29 Author: Zhenlei Huang AuthorDate: 2023-10-19 17:00:31 +0000 Commit: Zhenlei Huang CommitDate: 2023-10-23 10:12:21 +0000 pmap: Prefer consistent naming for loader tunable The sysctl knob 'vm.pmap.pv_entry_max' becomes a loader tunable since 7ff48af7040f (Allow a specific setting for pv entries) but is fetched from system environment 'vm.pmap.pv_entries'. That is inconsistent and obscure. This reverts 36e1b9702e21 (Correct the tunable name in the message). PR: 231577 Reviewed by: jhibbits, alc, kib MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D42274 (cherry picked from commit 02320f64209563e35fa371fc5eac94067f688f7f) --- sys/arm/arm/pmap-v6.c | 4 ++-- sys/i386/i386/pmap.c | 4 ++-- sys/powerpc/booke/pmap.c | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/sys/arm/arm/pmap-v6.c b/sys/arm/arm/pmap-v6.c index 719851432203..92e992a4b25e 100644 --- a/sys/arm/arm/pmap-v6.c +++ b/sys/arm/arm/pmap-v6.c @@ -1750,7 +1750,7 @@ pmap_init(void) */ TUNABLE_INT_FETCH("vm.pmap.shpgperproc", &shpgperproc); pv_entry_max = shpgperproc * maxproc + vm_cnt.v_page_count; - TUNABLE_INT_FETCH("vm.pmap.pv_entries", &pv_entry_max); + TUNABLE_INT_FETCH("vm.pmap.pv_entry_max", &pv_entry_max); pv_entry_max = roundup(pv_entry_max, _NPCPV); pv_entry_high_water = 9 * (pv_entry_max / 10); @@ -3012,7 +3012,7 @@ get_pv_entry(pmap_t pmap, boolean_t try) if (ratecheck(&lastprint, &printinterval)) printf("Approaching the limit on PV entries, consider " "increasing either the vm.pmap.shpgperproc or the " - "vm.pmap.pv_entries tunable.\n"); + "vm.pmap.pv_entry_max tunable.\n"); retry: pc = TAILQ_FIRST(&pmap->pm_pvchunk); if (pc != NULL) { diff --git a/sys/i386/i386/pmap.c b/sys/i386/i386/pmap.c index 4198849b1a5a..67810700e6ef 100644 --- a/sys/i386/i386/pmap.c +++ b/sys/i386/i386/pmap.c @@ -1006,7 +1006,7 @@ __CONCAT(PMTYPE, init)(void) */ TUNABLE_INT_FETCH("vm.pmap.shpgperproc", &shpgperproc); pv_entry_max = shpgperproc * maxproc + vm_cnt.v_page_count; - TUNABLE_INT_FETCH("vm.pmap.pv_entries", &pv_entry_max); + TUNABLE_INT_FETCH("vm.pmap.pv_entry_max", &pv_entry_max); pv_entry_max = roundup(pv_entry_max, _NPCPV); pv_entry_high_water = 9 * (pv_entry_max / 10); @@ -2515,7 +2515,7 @@ get_pv_entry(pmap_t pmap, boolean_t try) if (ratecheck(&lastprint, &printinterval)) printf("Approaching the limit on PV entries, consider " "increasing either the vm.pmap.shpgperproc or the " - "vm.pmap.pv_entries tunable.\n"); + "vm.pmap.pv_entry_max tunable.\n"); retry: pc = TAILQ_FIRST(&pmap->pm_pvchunk); if (pc != NULL) { diff --git a/sys/powerpc/booke/pmap.c b/sys/powerpc/booke/pmap.c index fe6b95eda085..f41ea24cd30c 100644 --- a/sys/powerpc/booke/pmap.c +++ b/sys/powerpc/booke/pmap.c @@ -1069,7 +1069,7 @@ mmu_booke_init(void) TUNABLE_INT_FETCH("vm.pmap.shpgperproc", &shpgperproc); pv_entry_max = shpgperproc * maxproc + vm_cnt.v_page_count; - TUNABLE_INT_FETCH("vm.pmap.pv_entries", &pv_entry_max); + TUNABLE_INT_FETCH("vm.pmap.pv_entry_max", &pv_entry_max); pv_entry_high_water = 9 * (pv_entry_max / 10); uma_zone_reserve_kva(pvzone, pv_entry_max); From nobody Mon Oct 23 10:15:55 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SDWL4126Pz4xsYD; Mon, 23 Oct 2023 10:15:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SDWL40RKZz3Kc0; Mon, 23 Oct 2023 10:15:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698056156; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BzjRw6B1R7nm4oLpHUkjC4zEOGPSscyFTpDwAlkJ/B8=; b=IcTWrT8Jfl4xveBhiqYGRzqrx84bo/E/4nAlVNKZeMzoc6kr6UY/B/jTOOsBdYCNPZfjJi Jk7kf5XIL4o1FJbJ1cpWYqc35/vrx8Hdv37/GqrWIVu3Efx9pXPhpuMEzcEsnO8qDZKy/Y Gw3LbGDZ5L1f7JUWDi86xdzXMSYZl9ZkML5atC14k4Akk1npTWWRKW4MMz0TI/HNCGmPL8 8+4RvDXB6NViqKMHNmhmg+laDw5mdGYqPmb5iRr0kzCjKhSHn4SmcEPccxEnbYMUxqV8gF fqDAX5iEw2E9DEOvXOrAyBQr508Se813EbmJBhTrSXpoGKLETRmKCZlZFVMK5Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698056156; a=rsa-sha256; cv=none; b=BQnw3h8tZjM9QWWnvRbC8ORzXdd37+f0so3MpnzOgWILXushi5IhWPQKY++QmEb6Kd20J3 S3unc7EuRCxDjz21T40xzDY2IEX++j9sWZopiMtnHJPwvvIJC+9wZy0/TNehOQAj5luCDc eAtdjhfI64okiDRgSg1/p+mUWE8GBzrFHO1QC6egvvuMZX5f2C0qzDt9mC/O7QPwfh0YnI gYilATQt486aHv9ze8MEqZ0SuNk5VqF09ANu7HnwZiz3STiIvwCfnr76inXv4E+SigUihQ 4Y2s2Yh4hWztLEKTA/yD6SlYCJ4jaVYUWIrl74yhfuUbjvvup/3LdwOr8G02mQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698056156; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BzjRw6B1R7nm4oLpHUkjC4zEOGPSscyFTpDwAlkJ/B8=; b=xck/+RC/cb4o+KHJWccACoyQ/TZ69BwSISE799rwlxRpMWjHQPPDxLH0vgRSIMeCoJ8Zfl RFlL+UI18BZNLd3ty6wEnlE4+hxkgO/FMKkG5lzLJe5EuEtVqqKJA7190hX5bgqZHNVHOn cEYb+pJ3EDaXRHuCEyAOD94MccQti3MMPKuwPFFaN+LGRC+B9u/9fcBYPizFYlkaZxrmar LpEvfSrkzY8zTLJMOzwXVPZlHhZJGDsAqgU4Km2uxae3DRDiUiMKSndw2OYDHOrcGh08x2 J0+WWCAQTQ4NYlv6rUQw8I+VezKiSu3/NfJrxkcfFtntlvzwIn/xx4S4W6W6NA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SDWL36cZpzbrD; Mon, 23 Oct 2023 10:15:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39NAFtZB046629; Mon, 23 Oct 2023 10:15:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39NAFt7k046626; Mon, 23 Oct 2023 10:15:55 GMT (envelope-from git) Date: Mon, 23 Oct 2023 10:15:55 GMT Message-Id: <202310231015.39NAFt7k046626@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: 36180ffe86fe - stable/13 - veriexec: Correctly export symbols List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 36180ffe86feddefe710f9e770563f14bb6bd203 Auto-Submitted: auto-generated The branch stable/13 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=36180ffe86feddefe710f9e770563f14bb6bd203 commit 36180ffe86feddefe710f9e770563f14bb6bd203 Author: Zhenlei Huang AuthorDate: 2023-10-15 14:29:18 +0000 Commit: Zhenlei Huang CommitDate: 2023-10-23 10:15:10 +0000 veriexec: Correctly export symbols There's no symbol named 'mac_veriexec_get_executable_flags', the right one should be the function 'mac_veriexec_metadata_get_executable_flags()'. Reviewed by: stevek MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D42133 (cherry picked from commit f34c9c4e3bdc2b8bffae4ac26897e0e847e9f76f) (cherry picked from commit d8aaf09792338fae07b9618665ea9612b7b92a6e) --- sys/modules/mac_veriexec/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/modules/mac_veriexec/Makefile b/sys/modules/mac_veriexec/Makefile index a165daeec043..82cf468fec50 100644 --- a/sys/modules/mac_veriexec/Makefile +++ b/sys/modules/mac_veriexec/Makefile @@ -18,7 +18,7 @@ SRCS += \ EXPORT_SYMS+= ve_mutex \ mac_veriexec_in_state \ - mac_veriexec_get_executable_flags + mac_veriexec_metadata_get_executable_flags .if defined(KERNBUILDDIR) MKDEP= -include ${KERNBUILDDIR}/opt_global.h From nobody Mon Oct 23 10:15:56 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SDWL51zjMz4xsPx; Mon, 23 Oct 2023 10:15: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 4SDWL51ShWz3Kck; Mon, 23 Oct 2023 10:15:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698056157; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YY+UOOoO/dS22vN3npm8hNk4o5mdouuGx7MU3lhUdTE=; b=cjANQAvrVAJTfHBZD7Rvh9CYIQdYmtHNr0gEnd94UXjm+LiGNmkPMxpVpB+4+e7wvGlGdG hfcEs4H4YpA7wQTHvA82QlNjg4JpEpxwUguJrpqPoC/W10AkszJWKa9hscyn9hIeFuZQct JWRM34KI38IVY/MhGMRlongGw+qarpodqH/p+hqiDySQeccksEVSfW9KINze7bLZh11j7S mKdn4CJjQimaLu4lRyi23DP8ue2lkXFnm9bFhKLAdcs/fGC+eScDCmw8w+bJ1jNbmO3fqi AVMrMw1ogM5majf35Glr7GLgI9at9j0NWRqPx0wFywMlU+WwU6QrvWKuJshZzA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698056157; a=rsa-sha256; cv=none; b=iT67ecvLKwTos4dPg+L3cJG/ikG3ErPGXIQmWVqq6cdL89CC2xnIBLSG2rQndtAVkY00Ls Nu4hmJGeCCaU8auGIATbv64QiquEZO3b+AZIUCjr2hVNQXPXQLbC39lqK9opkP66yHwAG5 R+nSakmUrxF9NwjdaYyDxrQ+CKTutIc/NPHqV804lUPN57VmG4PEgXaV12YriVQ0iKsUXX x1byUnXEguGx7x4f7I2LBPtERr8RZifr0VSyxqEjyaaZsoTm7KF8KCJ3Vx7jA3FDabbRlJ L3wDy9CsKvaFitLhXnnM4vJWpUKwBZ/tXno/WMeKEnAzmHH75ZhdOTLKZM9BwA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698056157; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YY+UOOoO/dS22vN3npm8hNk4o5mdouuGx7MU3lhUdTE=; b=TlT39HIiexPnsU6wcdWAcikyrJbZfThR0KfsuebSi67oQu92CKSt4GEmD4b0PKlJU+ed6v 23K4g36IUElJeJF9yePklIWhL4cSVQrXPVifC0p61qA+DdJZC8A/RkAPsGbNSeOAqM35j4 SkJVjK7yi/lYIojM2UVDY2X0P9xHEsA8LsTcQzs716SnBI3cP6sG0VrkFCuP9HR+dkLjeX ET/8v21YfEEygQbXrynkYqWpGDniL7cWni46fP+Wum8OZPguiG3viv0BHUXS1dNXH9D7fU 7nCRZE8qbF89Rg4rnxrAzHWI5ElrBySjefNMGJJlLev6NkEoPfp1ltAEDEYX9Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SDWL50MZdzbf3; Mon, 23 Oct 2023 10:15: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 39NAFu2D046684; Mon, 23 Oct 2023 10:15:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39NAFuR9046681; Mon, 23 Oct 2023 10:15:56 GMT (envelope-from git) Date: Mon, 23 Oct 2023 10:15:56 GMT Message-Id: <202310231015.39NAFuR9046681@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: 16afc2a4d9c5 - stable/13 - pmap: Prefer consistent naming for loader tunable List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 16afc2a4d9c581064aa32babc29c748ccd59863c Auto-Submitted: auto-generated The branch stable/13 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=16afc2a4d9c581064aa32babc29c748ccd59863c commit 16afc2a4d9c581064aa32babc29c748ccd59863c Author: Zhenlei Huang AuthorDate: 2023-10-19 17:00:31 +0000 Commit: Zhenlei Huang CommitDate: 2023-10-23 10:15:12 +0000 pmap: Prefer consistent naming for loader tunable The sysctl knob 'vm.pmap.pv_entry_max' becomes a loader tunable since 7ff48af7040f (Allow a specific setting for pv entries) but is fetched from system environment 'vm.pmap.pv_entries'. That is inconsistent and obscure. This reverts 36e1b9702e21 (Correct the tunable name in the message). PR: 231577 Reviewed by: jhibbits, alc, kib MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D42274 (cherry picked from commit 02320f64209563e35fa371fc5eac94067f688f7f) (cherry picked from commit e53f8ca323e8e563d4b55883fc3544bea75aab29) --- sys/arm/arm/pmap-v6.c | 4 ++-- sys/i386/i386/pmap.c | 4 ++-- sys/powerpc/booke/pmap.c | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/sys/arm/arm/pmap-v6.c b/sys/arm/arm/pmap-v6.c index 79adf395161a..f00589a75c6d 100644 --- a/sys/arm/arm/pmap-v6.c +++ b/sys/arm/arm/pmap-v6.c @@ -1750,7 +1750,7 @@ pmap_init(void) */ TUNABLE_INT_FETCH("vm.pmap.shpgperproc", &shpgperproc); pv_entry_max = shpgperproc * maxproc + vm_cnt.v_page_count; - TUNABLE_INT_FETCH("vm.pmap.pv_entries", &pv_entry_max); + TUNABLE_INT_FETCH("vm.pmap.pv_entry_max", &pv_entry_max); pv_entry_max = roundup(pv_entry_max, _NPCPV); pv_entry_high_water = 9 * (pv_entry_max / 10); @@ -3030,7 +3030,7 @@ get_pv_entry(pmap_t pmap, boolean_t try) if (ratecheck(&lastprint, &printinterval)) printf("Approaching the limit on PV entries, consider " "increasing either the vm.pmap.shpgperproc or the " - "vm.pmap.pv_entries tunable.\n"); + "vm.pmap.pv_entry_max tunable.\n"); retry: pc = TAILQ_FIRST(&pmap->pm_pvchunk); if (pc != NULL) { diff --git a/sys/i386/i386/pmap.c b/sys/i386/i386/pmap.c index 72596d364b60..5913ea927d75 100644 --- a/sys/i386/i386/pmap.c +++ b/sys/i386/i386/pmap.c @@ -1005,7 +1005,7 @@ __CONCAT(PMTYPE, init)(void) */ TUNABLE_INT_FETCH("vm.pmap.shpgperproc", &shpgperproc); pv_entry_max = shpgperproc * maxproc + vm_cnt.v_page_count; - TUNABLE_INT_FETCH("vm.pmap.pv_entries", &pv_entry_max); + TUNABLE_INT_FETCH("vm.pmap.pv_entry_max", &pv_entry_max); pv_entry_max = roundup(pv_entry_max, _NPCPV); pv_entry_high_water = 9 * (pv_entry_max / 10); @@ -2532,7 +2532,7 @@ get_pv_entry(pmap_t pmap, boolean_t try) if (ratecheck(&lastprint, &printinterval)) printf("Approaching the limit on PV entries, consider " "increasing either the vm.pmap.shpgperproc or the " - "vm.pmap.pv_entries tunable.\n"); + "vm.pmap.pv_entry_max tunable.\n"); retry: pc = TAILQ_FIRST(&pmap->pm_pvchunk); if (pc != NULL) { diff --git a/sys/powerpc/booke/pmap.c b/sys/powerpc/booke/pmap.c index 0501a0fe99a9..f85bb8d56f74 100644 --- a/sys/powerpc/booke/pmap.c +++ b/sys/powerpc/booke/pmap.c @@ -1067,7 +1067,7 @@ mmu_booke_init() TUNABLE_INT_FETCH("vm.pmap.shpgperproc", &shpgperproc); pv_entry_max = shpgperproc * maxproc + vm_cnt.v_page_count; - TUNABLE_INT_FETCH("vm.pmap.pv_entries", &pv_entry_max); + TUNABLE_INT_FETCH("vm.pmap.pv_entry_max", &pv_entry_max); pv_entry_high_water = 9 * (pv_entry_max / 10); uma_zone_reserve_kva(pvzone, pv_entry_max); From nobody Mon Oct 23 10:18:05 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SDWNY4bp1z4xsWW; Mon, 23 Oct 2023 10:18:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SDWNY3kPSz3L9j; Mon, 23 Oct 2023 10:18:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698056285; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rHbsLkH/OPd6LyT6N3uV0YpSJModerhewyw54gb06Pw=; b=BT4gEW4wnOCUOHgL2WVwDrP5a3smlNrlqlXf81kDlfakB2TBogdXVkjJF3NSVdESl4IW9x /5WJkJnVjvX8NmFmAcgoua8WAQ3yQb9LQ82zd/jTmDlNNjXhy+w8UH/3X8aTMujldve6SP BWWv0jQh4+0OQ8/o0PdauuNo2Phh75cAySpOo/yMyOkOeygQZKcvVE0YU9sSGKIqJ7T0YQ cB71aFXShcPsIvH67ZLjfH5e2Il5bTz2poRhz/S+RxnzhVtD4HIYNO5M4In8w6Gu0/4ZOl 221jA7MpsNwr9nVjO9MMM7laQJW90uNdrR7a65Tl5h+5DkPkzYQ5gjp1+1O/Aw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698056285; a=rsa-sha256; cv=none; b=Liy1bsMlNF6G5ZlXnjx82EQuxBtD736xI6kJhtMLu9cQeMUvNk0vwv9N07xUMu9AH+eZCE 9n8K1FzmDCw3DCeWgCCC4sHQ/akPKqJE45BcdHuTige37eHEjiQEfi3LnfAWejBO+EKYTh 9NE74BRBNFmLk/l56sL6OXaK+iKb11/QLfgmfgLO1jwIuVahPxU/+LnIrFxBsLYAbE3EpQ E/9Gw/2E0gKHqF3Sdp4BCgD9NkZMeZ+AX0NYnyw9NeKiJi4Mv5YJeqtEvzMVZto9UNQFE1 AiCWZb3knzBQyZsEELon0nRJHiKKmJBIErXXIia9UcR90QbDDTDuh4En4OrVFQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698056285; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rHbsLkH/OPd6LyT6N3uV0YpSJModerhewyw54gb06Pw=; b=WlDTfu8DM1eH/BR9+uQUcWx21dX3nJlU7WH+EyzAQsgnVaSkgQIvYiqGvspUe+vFukodJt UttC4CsY2jqVhaOqJFjVgX/eOikvOvsw0t2w1033DXAH1CafvUEWkv6A17ZMaP0QLovtpO wzOr5jDpbJkGSQVVaC157oSXBmxpWs0CpMEcvzZzagRT2FlupjCnUN0gP8Uwk0d/ogimKf KrX8YG43bT4ULBfPCiCs0kgms9hdEThrI6SYanhvt6E8SygTMpf8oYog4NMQPWnCA9u3TH fbY3YlSNVblpJs8TL9EcNn+xkXqxkHuqRMNj5GmmGqFf6iBktMB0irJCB5wrdQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SDWNY2n7Pzbnf; Mon, 23 Oct 2023 10:18:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39NAI5qR047108; Mon, 23 Oct 2023 10:18:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39NAI5gu047105; Mon, 23 Oct 2023 10:18:05 GMT (envelope-from git) Date: Mon, 23 Oct 2023 10:18:05 GMT Message-Id: <202310231018.39NAI5gu047105@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: 6be29d44ece1 - stable/12 - veriexec: Correctly export symbols List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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/12 X-Git-Reftype: branch X-Git-Commit: 6be29d44ece1600ee1dd604177f1adf3f5cf5e94 Auto-Submitted: auto-generated The branch stable/12 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=6be29d44ece1600ee1dd604177f1adf3f5cf5e94 commit 6be29d44ece1600ee1dd604177f1adf3f5cf5e94 Author: Zhenlei Huang AuthorDate: 2023-10-15 14:29:18 +0000 Commit: Zhenlei Huang CommitDate: 2023-10-23 10:17:42 +0000 veriexec: Correctly export symbols There's no symbol named 'mac_veriexec_get_executable_flags', the right one should be the function 'mac_veriexec_metadata_get_executable_flags()'. Reviewed by: stevek MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D42133 (cherry picked from commit f34c9c4e3bdc2b8bffae4ac26897e0e847e9f76f) (cherry picked from commit d8aaf09792338fae07b9618665ea9612b7b92a6e) (cherry picked from commit 36180ffe86feddefe710f9e770563f14bb6bd203) --- sys/modules/mac_veriexec/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/modules/mac_veriexec/Makefile b/sys/modules/mac_veriexec/Makefile index 7ec061b07528..2bea2cc002f2 100644 --- a/sys/modules/mac_veriexec/Makefile +++ b/sys/modules/mac_veriexec/Makefile @@ -19,7 +19,7 @@ SRCS += \ EXPORT_SYMS+= ve_mutex \ mac_veriexec_in_state \ - mac_veriexec_get_executable_flags + mac_veriexec_metadata_get_executable_flags .if defined(KERNBUILDDIR) MKDEP= -include ${KERNBUILDDIR}/opt_global.h From nobody Mon Oct 23 10:18:06 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SDWNZ557Tz4xs1R; Mon, 23 Oct 2023 10:18:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SDWNZ4Cqnz3LPb; Mon, 23 Oct 2023 10:18:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698056286; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yBMPpnH3q7iqtSZPHifbLvR+jbDtElrliwbrh/wAFa8=; b=PgTAVu4dw5+nqRpqn/33217XX9pgdurlcnIqYByzWZzz7cyqeBa14lzxf6VAalSCQVXRep /cVY0wAqKx9b6dxnpsa33TBd7L5N8F1Bkx48zt1+fNoF7oojD1qE+xnNhR/ETtCKLyMXA9 JWda956zz1VSN3B3FksJGqNA2uY8KL5uPEXhw2e/cfDgjyaGptWBFSqc4zorMQA07wEz9v 7PO3AO7dvS5tDJZNFXMcic6CcCbnfRq1WKcHUcy39rBE/bj25Az+kE5lYgAlgVVvNSwNsY ldrC+zjuFj/nWKsru+ps+D3B3Tf3b8GKNnmPkEWrTDLp+ywfUq6uRVN/X1LrrA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698056286; a=rsa-sha256; cv=none; b=Fci/eNHMI7ZFdjWcS3FDGXXoPRfhIsXgoonm4PWSydua5BWNE6A3I3zSo3dF5dvfE1FJzq 5joCd+Rm5QQ8oHuDzySJpbPyUuRPjMvt7HbpTmv2yyhhCBFjvew+XpfEwDCjTm1FBNUuEu a7JRgKpAtWKj88P/hTYPZm0WDwGsYWw7ombknihqAumoRbVgB0TMavJipv2km9oa87kkqA PjfaNQU0P50N5EzegkOpa3QFrN0kUhd+wx+dAQB2ee2hCd+Mw0M7vstZrxi/MTltnFRFUc l/b9+NQLDVGTU0xEeQvTeKsO+uQXvRitA7iImnmd4cKaEnJFAeHQn4RcaMi29A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698056286; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yBMPpnH3q7iqtSZPHifbLvR+jbDtElrliwbrh/wAFa8=; b=VH6BTOwM8QyVLgiWjFI0JnCdHnAlFdjGUCmPGC1cURzDD13ZqFgLs9RbEj/BEw4ICuRV4t HkQ6HTOjNzawqCNjBadR1hS0mwFYMF1o2+ChL1LJVnEhwRAr+5no3TO+eynaweNL+Gm7PR d4iEJJJLHFJZWoKELtH6ssVhG3nesAtiQiRHJ10v/rb95gkNTN+8l8zMF6+DeTxbn+dK3x LTjQp4hMpPrh04qKEwz+VkMA+mLlTaxVxT9fWO/aEsroeAZdroaVAIx8V7xenEncDjvels U4r/t4WlYVyt4xv7W//etAx8aLwjNXJsPs0byAfTpEbTgjmVrhkU8u9Rcb9bdQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SDWNZ38dFzc6v; Mon, 23 Oct 2023 10:18:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39NAI603047164; Mon, 23 Oct 2023 10:18:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39NAI6Ko047161; Mon, 23 Oct 2023 10:18:06 GMT (envelope-from git) Date: Mon, 23 Oct 2023 10:18:06 GMT Message-Id: <202310231018.39NAI6Ko047161@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: 0ceaf5d46282 - stable/12 - pmap: Prefer consistent naming for loader tunable List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 0ceaf5d4628210226d0bafc2650b494a07ca9aaf Auto-Submitted: auto-generated The branch stable/12 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=0ceaf5d4628210226d0bafc2650b494a07ca9aaf commit 0ceaf5d4628210226d0bafc2650b494a07ca9aaf Author: Zhenlei Huang AuthorDate: 2023-10-19 17:00:31 +0000 Commit: Zhenlei Huang CommitDate: 2023-10-23 10:17:44 +0000 pmap: Prefer consistent naming for loader tunable The sysctl knob 'vm.pmap.pv_entry_max' becomes a loader tunable since 7ff48af7040f (Allow a specific setting for pv entries) but is fetched from system environment 'vm.pmap.pv_entries'. That is inconsistent and obscure. This reverts 36e1b9702e21 (Correct the tunable name in the message). PR: 231577 Reviewed by: jhibbits, alc, kib MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D42274 (cherry picked from commit 02320f64209563e35fa371fc5eac94067f688f7f) (cherry picked from commit e53f8ca323e8e563d4b55883fc3544bea75aab29) (cherry picked from commit 16afc2a4d9c581064aa32babc29c748ccd59863c) --- sys/arm/arm/pmap-v6.c | 4 ++-- sys/i386/i386/pmap.c | 4 ++-- sys/powerpc/booke/pmap.c | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/sys/arm/arm/pmap-v6.c b/sys/arm/arm/pmap-v6.c index 11c2ba658b82..c94232f1c04b 100644 --- a/sys/arm/arm/pmap-v6.c +++ b/sys/arm/arm/pmap-v6.c @@ -1752,7 +1752,7 @@ pmap_init(void) */ TUNABLE_INT_FETCH("vm.pmap.shpgperproc", &shpgperproc); pv_entry_max = shpgperproc * maxproc + vm_cnt.v_page_count; - TUNABLE_INT_FETCH("vm.pmap.pv_entries", &pv_entry_max); + TUNABLE_INT_FETCH("vm.pmap.pv_entry_max", &pv_entry_max); pv_entry_max = roundup(pv_entry_max, _NPCPV); pv_entry_high_water = 9 * (pv_entry_max / 10); @@ -3035,7 +3035,7 @@ get_pv_entry(pmap_t pmap, boolean_t try) if (ratecheck(&lastprint, &printinterval)) printf("Approaching the limit on PV entries, consider " "increasing either the vm.pmap.shpgperproc or the " - "vm.pmap.pv_entries tunable.\n"); + "vm.pmap.pv_entry_max tunable.\n"); retry: pc = TAILQ_FIRST(&pmap->pm_pvchunk); if (pc != NULL) { diff --git a/sys/i386/i386/pmap.c b/sys/i386/i386/pmap.c index 611bfb414cb3..f1b1b9f3d0ca 100644 --- a/sys/i386/i386/pmap.c +++ b/sys/i386/i386/pmap.c @@ -974,7 +974,7 @@ pmap_init(void) */ TUNABLE_INT_FETCH("vm.pmap.shpgperproc", &shpgperproc); pv_entry_max = shpgperproc * maxproc + vm_cnt.v_page_count; - TUNABLE_INT_FETCH("vm.pmap.pv_entries", &pv_entry_max); + TUNABLE_INT_FETCH("vm.pmap.pv_entry_max", &pv_entry_max); pv_entry_max = roundup(pv_entry_max, _NPCPV); pv_entry_high_water = 9 * (pv_entry_max / 10); @@ -2590,7 +2590,7 @@ get_pv_entry(pmap_t pmap, boolean_t try) if (ratecheck(&lastprint, &printinterval)) printf("Approaching the limit on PV entries, consider " "increasing either the vm.pmap.shpgperproc or the " - "vm.pmap.pv_entries tunable.\n"); + "vm.pmap.pv_entry_max tunable.\n"); retry: pc = TAILQ_FIRST(&pmap->pm_pvchunk); if (pc != NULL) { diff --git a/sys/powerpc/booke/pmap.c b/sys/powerpc/booke/pmap.c index 79e774b33bf4..4c3e0754c010 100644 --- a/sys/powerpc/booke/pmap.c +++ b/sys/powerpc/booke/pmap.c @@ -2156,7 +2156,7 @@ mmu_booke_init(mmu_t mmu) TUNABLE_INT_FETCH("vm.pmap.shpgperproc", &shpgperproc); pv_entry_max = shpgperproc * maxproc + vm_cnt.v_page_count; - TUNABLE_INT_FETCH("vm.pmap.pv_entries", &pv_entry_max); + TUNABLE_INT_FETCH("vm.pmap.pv_entry_max", &pv_entry_max); pv_entry_high_water = 9 * (pv_entry_max / 10); uma_zone_reserve_kva(pvzone, pv_entry_max); From nobody Mon Oct 23 10:54:15 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SDXBJ0rlQz4xvNX; Mon, 23 Oct 2023 10:54: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 4SDXBJ0DJqz3PdN; Mon, 23 Oct 2023 10:54:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698058456; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NSB3bK7YU+p9FSZKfWREDOicLhl9L0Ktbz0ynHSnhnk=; b=d2wpKw+H8YagHVanvR0sBm5EVrgwq5BV2hFpMPZ0whHxod1F0+rmylfaGydRg/nMKNKgpm 24bRnXSOTh7FZy9a1OGL8mBUvuU35334mmUN3aGEVOHnCIuKf2Mw1ehCBuogSdp919NjSP d2y8zi7JanFXD4gJ3I3lkOpQ35BAQQyX258QooMr18U+6VpbRv3fTgCmgHPdYhFeJLosRq Vdg2drbM5l3WULNuRHIaZwFtUubiQRh4C2zi3R80k8hjUvhMZkhmx4tIs+YW03Zhz5Eaxm VJPmq8V/JZkPQHVAocbcPoAmeYDfxjerLxQ6JIOQY2WIo2urcGzzrzbiMBnUPw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698058456; a=rsa-sha256; cv=none; b=OUpBEV61CUe9roceqiZaPZONPJXR6UPW3/INo7dSWp+z1+9IjjbZZPxN5T3gvcole+NUUL aePNrIxCc1AOdqQbt+xDG+s5F+RbDYOo3mIfwkkSMSDGlvfXPjOlULVhxzDiA/R4yh8xfV o6b5R9rKL69c6akp42xFpGNhhGjnLzJKz5Q+q4sAb0gwKdb88INAgB2o8y/7/pCETHyGyz k9CGGSVjZI0pVpTK1NpohkyTeIQCg1lTQP7hSWQqHty2WQt/fhBUYhnXWywTTuozqaUon5 PoE33ERfiBCZwIJsoBOIEBKThC+WN6W2jwrMYEK90YV+tbAkrY7Ua2jb9nrt4w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698058456; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NSB3bK7YU+p9FSZKfWREDOicLhl9L0Ktbz0ynHSnhnk=; b=FTVbPzWmT9iST040RMRmYx4vaqWkkta6TsR/nDGpU4LQKlcdqXLqtS5YNbZJ+pY5DDYL0d E1Hh+wiX/DmRQ/ur6F5YXNZjVaY72FOFDog7qZWg/DTZZbNsvkqQaOSnPucn5deh91Biqa Vhj13v/WW+OEzRWcYaV261CeoE6beMsGFqd56pSHSQ7bHr68OeV6Gh9jmn/+Mr5kMAgrng srcl1VabXRN4WVCEIwoPCypU6uNsXw/XuEP9JMTx7twgyuHA8AQYA4vKkGNW6Gbz6RD1vE ERXYB7R3b3F+gEn1iosjz+XpBL++jNgAE97Rf9GUjwDWkv6e4IJMtB2KfD1edQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SDXBH6PVYzcdn; Mon, 23 Oct 2023 10:54: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 39NAsFsk012099; Mon, 23 Oct 2023 10:54:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39NAsFQa012096; Mon, 23 Oct 2023 10:54:15 GMT (envelope-from git) Date: Mon, 23 Oct 2023 10:54:15 GMT Message-Id: <202310231054.39NAsFQa012096@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: 26ac295c050d - main - arm64: Fix long lines in vm_machdep.c List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 26ac295c050d0cdaf9cc5b7e2bd1038bfcbec08e Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=26ac295c050d0cdaf9cc5b7e2bd1038bfcbec08e commit 26ac295c050d0cdaf9cc5b7e2bd1038bfcbec08e Author: Andrew Turner AuthorDate: 2023-09-12 13:45:07 +0000 Commit: Andrew Turner CommitDate: 2023-10-23 10:43:25 +0000 arm64: Fix long lines in vm_machdep.c Reviewed by: emaste Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D41828 --- sys/arm64/arm64/vm_machdep.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/sys/arm64/arm64/vm_machdep.c b/sys/arm64/arm64/vm_machdep.c index 5e45b45dc320..07df8e4d6805 100644 --- a/sys/arm64/arm64/vm_machdep.c +++ b/sys/arm64/arm64/vm_machdep.c @@ -214,11 +214,13 @@ cpu_set_upcall(struct thread *td, void (*entry)(void *), void *arg, /* 32bits processes use r13 for sp */ if (td->td_frame->tf_spsr & PSR_M_32) { - tf->tf_x[13] = STACKALIGN((uintptr_t)stack->ss_sp + stack->ss_size); + tf->tf_x[13] = STACKALIGN((uintptr_t)stack->ss_sp + + stack->ss_size); if ((register_t)entry & 1) tf->tf_spsr |= PSR_T; } else - tf->tf_sp = STACKALIGN((uintptr_t)stack->ss_sp + stack->ss_size); + tf->tf_sp = STACKALIGN((uintptr_t)stack->ss_sp + + stack->ss_size); tf->tf_elr = (register_t)entry; tf->tf_x[0] = (register_t)arg; tf->tf_x[29] = 0; From nobody Mon Oct 23 10:54:16 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SDXBK1zw2z4xvPQ; Mon, 23 Oct 2023 10:54: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 4SDXBK1JW2z3PhF; Mon, 23 Oct 2023 10:54:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698058457; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zm+PBKtowQo1KVIfsEQowGWl4TP73jaOFXdof9Bxerk=; b=f+j6fLTHPbqHEL37eDSxFf9CUf2ZWfGkP3LCR+x6xHMudrLM1VR5cZu7OJggNGChdInZIq LgTm0T+7T7O5Adggrt4a8zcpvZ5KYlbgfoFpRq5rZcJLBFP99prTbUxt3r7HA61QkozgJ4 E94Su2DnRL1AtXLgZtIArUKHGhFye1pHrVZ6+61b4RiEI1mQfiAjA52yoEwNTaXukvHTof 6ztOgUCgQCNVcXY3Xg+XoJUYBRmGZ6RepW8ok4xcdu5NWkBEdEhrhVtV1+qERAB9lv4Mjl C4eUfL6Rk04iBAISy1XjoXG4gVugIed+YxhlXQAzrTkfbtZOa2sEJOpR0Ukt/Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698058457; a=rsa-sha256; cv=none; b=likoGnguOCtChviHTSlzgTnuBFnz9ZTeU0xdWiQLlApaYo1jrW98N4EhkvNwnnFBpf4zEh UMMWIOfsLehsq+MLGHlheFO6PSQNvdLbpNmYKQVwmGylkmnClriZHVdyVAxgrwRtng6qj9 apFxEU4lqDMSzB6v3F9YcyMAz+riy7qTC1/mpKtFBPuFU5YQtRRxgVv7MVrfEn58v87j3Z nQ3gafgthJavTi7zRAGG0TbDI6/IacHTHsTfHra0xWK9qYfWJ2kIwJHSDHMd/U32MfzF6y duFbJx/thAxvucBfB1mgeQEyblyBBk/8/Wyb+rAssVIt+uWtr4DHCptqWcluQg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698058457; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zm+PBKtowQo1KVIfsEQowGWl4TP73jaOFXdof9Bxerk=; b=eLiyuE/+TS28Nk930ir4WkMjH11sKnExwigW9hPR1AoKmw7GL8O1BkBr9PnhuIeZG+duSW LsfGvvq+vW7fsawkbu3TmAY548mYprAE+rG3SWMu5e3IOo1AVgXw0IlPN+onXYmOr+FjdF bFXfPTwKdGpxM4wEoKbv8/PIkIkDXK+e3uI/2YYb6EJfl86JPgyKMw1D7KbYCN2UQvODrJ suWUIMGby+czV3WwMNhdPbaTJBFHtuM3HhNrRW4sX+OkY853oIVqM2JbwyQLR8rzhlIKh5 uvyKDC8EA/efGu9xHZjRwgS+IpbCaElvpBZMlfgGzl9ivxo7B8DWw48JsviTgw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SDXBK0Cg6zcdp; Mon, 23 Oct 2023 10:54: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 39NAsGmN012147; Mon, 23 Oct 2023 10:54:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39NAsGS0012144; Mon, 23 Oct 2023 10:54:16 GMT (envelope-from git) Date: Mon, 23 Oct 2023 10:54:16 GMT Message-Id: <202310231054.39NAsGS0012144@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: 271e669ed5e5 - main - arm64: Teach bus_dma on arm64 about NUMA List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 271e669ed5e55c95075b0dafaa58fded5b7556d0 Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=271e669ed5e55c95075b0dafaa58fded5b7556d0 commit 271e669ed5e55c95075b0dafaa58fded5b7556d0 Author: Andrew Turner AuthorDate: 2023-10-12 16:01:01 +0000 Commit: Andrew Turner CommitDate: 2023-10-23 10:45:22 +0000 arm64: Teach bus_dma on arm64 about NUMA When allocating memory we should try to allocate from the NUMA node closest to the device to reduce cross domain memory traffic. Teach the arm64 bus_dma code to do this. While here use mallocarray to guard against an unlikely integer overflow. Reviewed by: markj Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D42187 --- sys/arm64/arm64/busdma_bounce.c | 126 +++++++++++++++++++++++++-------------- sys/arm64/arm64/busdma_machdep.c | 13 +++- 2 files changed, 93 insertions(+), 46 deletions(-) diff --git a/sys/arm64/arm64/busdma_bounce.c b/sys/arm64/arm64/busdma_bounce.c index cfdfe62fecaf..c1028f35ba7f 100644 --- a/sys/arm64/arm64/busdma_bounce.c +++ b/sys/arm64/arm64/busdma_bounce.c @@ -34,6 +34,7 @@ #include #include #include +#include #include #include #include @@ -117,6 +118,7 @@ static void _bus_dmamap_count_phys(bus_dma_tag_t dmat, bus_dmamap_t map, static MALLOC_DEFINE(M_BUSDMA, "busdma", "busdma metadata"); #define dmat_alignment(dmat) ((dmat)->common.alignment) +#define dmat_domain(dmat) ((dmat)->common.domain) #define dmat_flags(dmat) ((dmat)->common.flags) #define dmat_lowaddr(dmat) ((dmat)->common.lowaddr) #define dmat_lockfunc(dmat) ((dmat)->common.lockfunc) @@ -124,6 +126,40 @@ static MALLOC_DEFINE(M_BUSDMA, "busdma", "busdma metadata"); #include "../../kern/subr_busdma_bounce.c" +static int +bounce_bus_dma_zone_setup(bus_dma_tag_t dmat) +{ + struct bounce_zone *bz; + bus_size_t maxsize; + int error; + + /* + * Round size up to a full page, and add one more page because + * there can always be one more boundary crossing than the + * number of pages in a transfer. + */ + maxsize = roundup2(dmat->common.maxsize, PAGE_SIZE) + PAGE_SIZE; + + /* Must bounce */ + if ((error = alloc_bounce_zone(dmat)) != 0) + return (error); + bz = dmat->bounce_zone; + + if (ptoa(bz->total_bpages) < maxsize) { + int pages; + + pages = atop(maxsize) + 1 - bz->total_bpages; + + /* Add pages to our bounce pool */ + if (alloc_bounce_pages(dmat, pages) < pages) + return (ENOMEM); + } + /* Performed initial allocation */ + dmat->bounce_flags |= BF_MIN_ALLOC_COMP; + + return (error); +} + /* * Return true if the DMA should bounce because the start or end does not fall * on a cacheline boundary (which would require a partial cacheline flush). @@ -257,34 +293,9 @@ bounce_bus_dma_tag_create(bus_dma_tag_t parent, bus_size_t alignment, newtag->common.alignment > 1) newtag->bounce_flags |= BF_COULD_BOUNCE; - if ((flags & BUS_DMA_ALLOCNOW) != 0) { - struct bounce_zone *bz; - /* - * Round size up to a full page, and add one more page because - * there can always be one more boundary crossing than the - * number of pages in a transfer. - */ - maxsize = roundup2(maxsize, PAGE_SIZE) + PAGE_SIZE; - - /* Must bounce */ - if ((error = alloc_bounce_zone(newtag)) != 0) { - free(newtag, M_DEVBUF); - return (error); - } - bz = newtag->bounce_zone; - - if (ptoa(bz->total_bpages) < maxsize) { - int pages; - - pages = atop(maxsize) + 1 - bz->total_bpages; - - /* Add pages to our bounce pool */ - if (alloc_bounce_pages(newtag, pages) < pages) - error = ENOMEM; - } - /* Performed initial allocation */ - newtag->bounce_flags |= BF_MIN_ALLOC_COMP; - } else + if ((flags & BUS_DMA_ALLOCNOW) != 0) + error = bounce_bus_dma_zone_setup(newtag); + else error = 0; if (error != 0) @@ -339,6 +350,23 @@ out: return (error); } +/* + * Update the domain for the tag. We may need to reallocate the zone and + * bounce pages. + */ +static int +bounce_bus_dma_tag_set_domain(bus_dma_tag_t dmat) +{ + + KASSERT(dmat->map_count == 0, + ("bounce_bus_dma_tag_set_domain: Domain set after use.\n")); + if ((dmat->bounce_flags & BF_COULD_BOUNCE) == 0 || + dmat->bounce_zone == NULL) + return (0); + dmat->bounce_flags &= ~BF_MIN_ALLOC_COMP; + return (bounce_bus_dma_zone_setup(dmat)); +} + static bool bounce_bus_dma_id_mapped(bus_dma_tag_t dmat, vm_paddr_t buf, bus_size_t buflen) { @@ -356,7 +384,8 @@ alloc_dmamap(bus_dma_tag_t dmat, int flags) mapsize = sizeof(*map); mapsize += sizeof(struct sync_list) * dmat->common.nsegments; - map = malloc(mapsize, M_DEVBUF, flags | M_ZERO); + map = malloc_domainset(mapsize, M_DEVBUF, + DOMAINSET_PREF(dmat->common.domain), flags | M_ZERO); if (map == NULL) return (NULL); @@ -379,9 +408,9 @@ bounce_bus_dmamap_create(bus_dma_tag_t dmat, int flags, bus_dmamap_t *mapp) error = 0; if (dmat->segments == NULL) { - dmat->segments = (bus_dma_segment_t *)malloc( - sizeof(bus_dma_segment_t) * dmat->common.nsegments, - M_DEVBUF, M_NOWAIT); + dmat->segments = mallocarray_domainset(dmat->common.nsegments, + sizeof(bus_dma_segment_t), M_DEVBUF, + DOMAINSET_PREF(dmat->common.domain), M_NOWAIT); if (dmat->segments == NULL) { CTR3(KTR_BUSDMA, "%s: tag %p error %d", __func__, dmat, ENOMEM); @@ -490,9 +519,9 @@ bounce_bus_dmamem_alloc(bus_dma_tag_t dmat, void** vaddr, int flags, mflags = M_WAITOK; if (dmat->segments == NULL) { - dmat->segments = (bus_dma_segment_t *)malloc( - sizeof(bus_dma_segment_t) * dmat->common.nsegments, - M_DEVBUF, mflags); + dmat->segments = mallocarray_domainset(dmat->common.nsegments, + sizeof(bus_dma_segment_t), M_DEVBUF, + DOMAINSET_PREF(dmat->common.domain), mflags); if (dmat->segments == NULL) { CTR4(KTR_BUSDMA, "%s: tag %p tag flags 0x%x error %d", __func__, dmat, dmat->common.flags, ENOMEM); @@ -536,9 +565,10 @@ bounce_bus_dmamem_alloc(bus_dma_tag_t dmat, void** vaddr, int flags, /* * Allocate the buffer from the malloc(9) allocator if... - * - It's small enough to fit into a single power of two sized bucket. - * - The alignment is less than or equal to the maximum size + * - It's small enough to fit into a single page. + * - Its alignment requirement is also smaller than the page size. * - The low address requirement is fulfilled. + * - Default cache attributes are requested (WB). * else allocate non-contiguous pages if... * - The page count that could get allocated doesn't exceed * nsegments also when the maximum segment size is less @@ -555,23 +585,28 @@ bounce_bus_dmamem_alloc(bus_dma_tag_t dmat, void** vaddr, int flags, * * In the meantime warn the user if malloc gets it wrong. */ - if ((dmat->alloc_size <= PAGE_SIZE) && - (dmat->alloc_alignment <= dmat->alloc_size) && + if (dmat->alloc_size <= PAGE_SIZE && + dmat->alloc_alignment <= PAGE_SIZE && dmat->common.lowaddr >= ptoa((vm_paddr_t)Maxmem) && attr == VM_MEMATTR_DEFAULT) { - *vaddr = malloc(dmat->alloc_size, M_DEVBUF, mflags); + *vaddr = malloc_domainset_aligned(dmat->alloc_size, + dmat->alloc_alignment, M_DEVBUF, + DOMAINSET_PREF(dmat->common.domain), mflags); } else if (dmat->common.nsegments >= howmany(dmat->alloc_size, MIN(dmat->common.maxsegsz, PAGE_SIZE)) && dmat->alloc_alignment <= PAGE_SIZE && (dmat->common.boundary % PAGE_SIZE) == 0) { /* Page-based multi-segment allocations allowed */ - *vaddr = kmem_alloc_attr(dmat->alloc_size, mflags, - 0ul, dmat->common.lowaddr, attr); + *vaddr = kmem_alloc_attr_domainset( + DOMAINSET_PREF(dmat->common.domain), dmat->alloc_size, + mflags, 0ul, dmat->common.lowaddr, attr); dmat->bounce_flags |= BF_KMEM_ALLOC; } else { - *vaddr = kmem_alloc_contig(dmat->alloc_size, mflags, - 0ul, dmat->common.lowaddr, dmat->alloc_alignment != 0 ? - dmat->alloc_alignment : 1ul, dmat->common.boundary, attr); + *vaddr = kmem_alloc_contig_domainset( + DOMAINSET_PREF(dmat->common.domain), dmat->alloc_size, + mflags, 0ul, dmat->common.lowaddr, + dmat->alloc_alignment != 0 ? dmat->alloc_alignment : 1ul, + dmat->common.boundary, attr); dmat->bounce_flags |= BF_KMEM_ALLOC; } if (*vaddr == NULL) { @@ -1147,6 +1182,7 @@ bounce_bus_dmamap_sync(bus_dma_tag_t dmat, bus_dmamap_t map, struct bus_dma_impl bus_dma_bounce_impl = { .tag_create = bounce_bus_dma_tag_create, .tag_destroy = bounce_bus_dma_tag_destroy, + .tag_set_domain = bounce_bus_dma_tag_set_domain, .id_mapped = bounce_bus_dma_id_mapped, .map_create = bounce_bus_dmamap_create, .map_destroy = bounce_bus_dmamap_destroy, diff --git a/sys/arm64/arm64/busdma_machdep.c b/sys/arm64/arm64/busdma_machdep.c index 14fd96ac919c..2b8dc179a909 100644 --- a/sys/arm64/arm64/busdma_machdep.c +++ b/sys/arm64/arm64/busdma_machdep.c @@ -44,6 +44,7 @@ #include #include #include +#include #include #include @@ -142,8 +143,11 @@ common_bus_dma_tag_create(struct bus_dma_tag_common *parent, common->filterarg = parent->filterarg; common->parent = parent->parent; } + common->domain = parent->domain; atomic_add_int(&parent->ref_count, 1); } + common->domain = vm_phys_domain_match(common->domain, 0ul, + common->lowaddr); *dmat = common; return (0); } @@ -209,6 +213,13 @@ bus_dma_tag_destroy(bus_dma_tag_t dmat) int bus_dma_tag_set_domain(bus_dma_tag_t dmat, int domain) { + struct bus_dma_tag_common *tc; - return (0); + tc = (struct bus_dma_tag_common *)dmat; + domain = vm_phys_domain_match(domain, 0ul, tc->lowaddr); + /* Only call the callback if it changes. */ + if (domain == tc->domain) + return (0); + tc->domain = domain; + return (tc->impl->tag_set_domain(dmat)); } From nobody Mon Oct 23 14:00:00 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SDcJc32lgz4y5dS; Mon, 23 Oct 2023 14:00: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 4SDcJc2XSyz3dwY; Mon, 23 Oct 2023 14:00:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698069600; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Es0lFyOUefH8zhVwmRRcZXEO1N8jxb4APzSsZ+xZAtk=; b=f1lzRKzgaVjVjYnOqql6/lmgBecRW3yALvrsCDld1rXTt7kd65RsHJ6Ko8VpAQC52NrGTO QxFY8khNEcf4Nznv67JiPxmPavNobSOVHg3yocXUL4y7aGoZ5gCD1He90VhkGwNEkjQb/t jGTGfFVl6e5fXu+v7gdsxaVX89JK4vO7bIWWoZKkvhGmYZUI3UuivVa7y3lX+pYEkKOAIN wxpSeJ9MKVvLNoRTFuFRm5JcxbF3tcZZXH/BVMelgJOxjPZAolHctCClHgvicw825KfexE wxXrQAPbuoa/19+2O+pl/8ryPivZVa1U55yf3k20EJdzcuCeaE5BNRJtP05oFg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698069600; a=rsa-sha256; cv=none; b=hOhetpOseHet03b7c17KspCdlhnsuxiDdYR6CyuuSX2VfHtkTAfgVt+n/IPSx858y1i336 2xi+fFFSLnHYa9R/gj4dguIjapue2yEViGXu/ms+xWEBV4pLo/4Ewnh07wAm7G+I/U0mQU bKZwN64j9aNouGRunUxzBkUUI/XwRsyPeo1Diq5XZ6L+LeLLaOjTBLGHl9tEHqK8oVIirM 4Kgl54PlrDQn4iabi4QyCTAMyIMxLhcGVPdRTsxaZ+qlQRODVeDS0gO4q3T0ZFBbSuH8FA f1wXhKbnKtut1sqidt9RBGUG6XswZ8FRdXwgSs5MR2CQUBbP6L+/6NVg8Y9ewg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698069600; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Es0lFyOUefH8zhVwmRRcZXEO1N8jxb4APzSsZ+xZAtk=; b=SIYQyEPRJNyOYjIwXkACwUGpH9TpPfje6YdlL//LK02WLyiEHu8JtK3z36vz0X0U2+nQXM gW34f55YRwgugfeiJ/VFu8bjYRwraX1M5C+KDPHf+5N7FdSH3xti1ljypeZfyKw0ZO0y4q xuDejK6tgMEfSb6zEq8lgpzRLPI1ugAs8E1ApoZg5EnTF1sZhprI1wZacq3U83ep4OiKmx 1z6H7aMXGUC10mf3kHR0zVOObFTFfdgRghPmX9oxw5YZ/IjG9JDie8PY6Y4vwDdnRN0Qk1 sWr75jQCu3YvpJN3A+QVw3IgcY0v6ixaRrgPOQm+PfMuvIKDC6IK7ZCAiJA+zg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SDcJc1CsZzjB6; Mon, 23 Oct 2023 14:00: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 39NE00FI012199; Mon, 23 Oct 2023 14:00:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39NE00x2012137; Mon, 23 Oct 2023 14:00:00 GMT (envelope-from git) Date: Mon, 23 Oct 2023 14:00:00 GMT Message-Id: <202310231400.39NE00x2012137@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: 0f8b2ba6c629 - main - bsdconfig: Revert bsddialog support List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: asiciliano X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0f8b2ba6c629237e4ddd7a72f7c22f687208060d Auto-Submitted: auto-generated The branch main has been updated by asiciliano: URL: https://cgit.FreeBSD.org/src/commit/?id=0f8b2ba6c629237e4ddd7a72f7c22f687208060d commit 0f8b2ba6c629237e4ddd7a72f7c22f687208060d Author: Alfonso S. Siciliano AuthorDate: 2023-10-23 13:52:56 +0000 Commit: Alfonso S. Siciliano CommitDate: 2023-10-23 13:59:31 +0000 bsdconfig: Revert bsddialog support This commit reverts "bsdconfig(8): add bsddialog(1) support" 30e9abf2fc462084b752064fa814d90ad3161352 because it is not intended for the current bsddialog 1.0 version. --- usr.sbin/bsdconfig/share/dialog.subr | 30 ++++++++---------------------- 1 file changed, 8 insertions(+), 22 deletions(-) diff --git a/usr.sbin/bsdconfig/share/dialog.subr b/usr.sbin/bsdconfig/share/dialog.subr index 0b6f11f39134..5b7ae9123073 100644 --- a/usr.sbin/bsdconfig/share/dialog.subr +++ b/usr.sbin/bsdconfig/share/dialog.subr @@ -51,7 +51,7 @@ f_include_lang $BSDCFG_LIBE/include/messages.subr # Default name of dialog(1) utility # NOTE: This is changed to "Xdialog" by the optional `-X' argument # -DIALOG="bsddialog" +DIALOG="dialog" # # Default dialog(1) title and backtitle text @@ -79,15 +79,9 @@ DIALOG_OK=${SUCCESS:-0} DIALOG_CANCEL=${FAILURE:-1} DIALOG_HELP=2 DIALOG_EXTRA=3 -if [ $DIALOG = "bsddialog" ]; then - DIALOG_ITEM_HELP=2 - DIALOG_ERROR=255 - DIALOG_ESC=5 -else - DIALOG_ITEM_HELP=4 - export DIALOG_ERROR=254 # sh(1) can't handle the default of `-1' - DIALOG_ESC=255 -fi +DIALOG_ITEM_HELP=4 +export DIALOG_ERROR=254 # sh(1) can't handle the default of `-1' +DIALOG_ESC=255 # # Default behavior is to call f_dialog_init() automatically when loaded. @@ -2227,14 +2221,7 @@ f_dialog_init() # # Process `-X' command-line option # - if [ "$USE_XDIALOG" ]; then - if [ $DIALOG = "bsddialog" ]; then - DIALOG_ESC=255 - # else it is already 255 like dialog(1) - fi - DIALOG=Xdialog - USE_DIALOG= - fi + [ "$USE_XDIALOG" ] && DIALOG=Xdialog USE_DIALOG= # # Sanity check, or die gracefully @@ -2242,7 +2229,7 @@ f_dialog_init() if ! f_have $DIALOG; then unset USE_XDIALOG local failed_dialog="$DIALOG" - DIALOG=bsddialog + DIALOG=dialog f_die 1 "$msg_no_such_file_or_directory" "$pgm" "$failed_dialog" fi @@ -2274,7 +2261,7 @@ f_dialog_init() if ! f_have xauth; then # Die gracefully, as we [likely] can't use Xdialog(1) unset USE_XDIALOG - DIALOG=bsddialog + DIALOG=dialog f_die 1 "$msg_no_such_file_or_directory" "$pgm" "xauth" fi HOSTNAME=$( hostname ) @@ -2296,13 +2283,12 @@ f_dialog_init() then # Xdialog(1) failed, fall back to dialog(1) unset USE_XDIALOG - DIALOG=bsddialog # Display the error message produced by Xdialog(1) local height width f_dialog_buttonbox_size height width \ "$DIALOG_TITLE" "$DIALOG_BACKTITLE" "$maxsize" - $DIALOG \ + dialog \ --title "$DIALOG_TITLE" \ --backtitle "$DIALOG_BACKTITLE" \ --ok-label "$msg_ok" \ From nobody Mon Oct 23 14:02:41 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SDcMk3CPyz4y5DV; Mon, 23 Oct 2023 14:02:42 +0000 (UTC) (envelope-from asiciliano@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 4SDcMk0nPvz3flb; Mon, 23 Oct 2023 14:02:42 +0000 (UTC) (envelope-from asiciliano@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698069762; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=nwK4zoYxIQthTKTmLpvLA8Cv814PaqMF0n4OP24SIQM=; b=Ne2AzvadxgmyM7rqsSi56dmEKVqusMOy9wV7OuzMYD+0W2EhTn4tkzNj7AJnuQ6Q2xTeW+ DQs5hOGkyvjbgoY9XcY/VvdR9Pe6kXOBr85RJptKrRxndDZkht/1+HDB03cT/Jo0DW+KXR ljOG3Z22CZJ2WxCegG6qwXaWVApdXClJ9qKsmvdvTzUHLDA5Ai7gWh3BWbP+JGbqRnfksq ophkHHlEhag4zKnFwjaef+BlXVgkf2hnYErB29YdKdBlH+EAu9Fqf45D9eXv9BTXpAP3Uo itQd4HtWz+pSU8VQf5/wHEkmvzypsrb1iNrTL7Xy+nr6RZUYCotnKAP9a8aaYA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698069762; a=rsa-sha256; cv=none; b=HZ99xVaH2L+nBKawnfVD7ab5Uq+X2h+9/ujEuFEEDZ69I6/mOKhQGsJpEWP5ofirFCh38P YDVsJ3pVP8Cssbw8lhagoSyPjgg76ez5w6J2CcCjJM3efOChr5rjqN/j650B02RGYASurT fQTmWs36Qi2IFVbR7Lvd9YEx8ALCFwnI45agwCFVGW9J6rTgzU+q2Cfg8VJdYtDvBayQ88 b9kzdNVt0gTHVtJkjrdM/wFmecZmx7MLN1A8rhgOTnj5u5ctKgOZtkg4Vag3jC3dszZ1zM GPzby8sg7pyGWKDEia2MORiMY6PWyaHS4awxFzqvG8l0Aw00PwiEzPRJ3ywGpw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698069762; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=nwK4zoYxIQthTKTmLpvLA8Cv814PaqMF0n4OP24SIQM=; b=WjBtuKG9wVV5G96V/Ozy00/sKwftw8RE2k9hZE4oZAJ/blGww1GENfZB0gjIDwxO+Eu6Ps liZMGuVSMwJU6ny1zh15Fr6W4QrjgxjbTtrLXwRgo0hmv71Ohs3boSED58M3fLxJC1aMSZ kAYm33cW9JT6AGPJrfKMQ+IZdig3rWtA5VKim3Y+SkV7gNVzs1insx9fMuHZ/3PbGgJO3q hJiZ45KHuVgG3q+A1zzOV/RHcJwzXwRy13rtu+M4dGr8HrRyKLRGiOcvmzuD/vofiYIF3p ZHnZaOqtLtvcWJ6l5Df9YgtBYxrSkliGkkHjtpUSb4SpfSNIAsMY9cOOjxuYPw== Received: from [192.168.1.9] (mob-5-91-113-109.net.vodafone.it [5.91.113.109]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: asiciliano) by smtp.freebsd.org (Postfix) with ESMTPSA id 4SDcMj3Qnbzxk2; Mon, 23 Oct 2023 14:02:41 +0000 (UTC) (envelope-from asiciliano@FreeBSD.org) Message-ID: <04a67092-cb7d-43ff-9e4b-948d5c0ed0af@FreeBSD.org> Date: Mon, 23 Oct 2023 16:02:41 +0200 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: git: 0f8b2ba6c629 - main - bsdconfig: Revert bsddialog support Content-Language: en-US From: "Alfonso S. Siciliano" To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org References: <202310231400.39NE00x2012137@gitrepo.freebsd.org> In-Reply-To: <202310231400.39NE00x2012137@gitrepo.freebsd.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 23/10/2023 16:00, Alfonso S. Siciliano wrote: > The branch main has been updated by asiciliano: > > URL: https://cgit.FreeBSD.org/src/commit/?id=0f8b2ba6c629237e4ddd7a72f7c22f687208060d > > commit 0f8b2ba6c629237e4ddd7a72f7c22f687208060d > Author: Alfonso S. Siciliano > AuthorDate: 2023-10-23 13:52:56 +0000 > Commit: Alfonso S. Siciliano > CommitDate: 2023-10-23 13:59:31 +0000 > > bsdconfig: Revert bsddialog support > > This commit reverts "bsdconfig(8): add bsddialog(1) support" > 30e9abf2fc462084b752064fa814d90ad3161352 because it is not intended for > the current bsddialog 1.0 version. > --- Actually this revert is not caused by a technical problem. I had a health problem so I wasn't able to update the review. I apologize for any inconvenience. I'll restore bsddialog(1) in bsdconfig(8) immediately. Alfonso > usr.sbin/bsdconfig/share/dialog.subr | 30 ++++++++---------------------- > 1 file changed, 8 insertions(+), 22 deletions(-) > > diff --git a/usr.sbin/bsdconfig/share/dialog.subr b/usr.sbin/bsdconfig/share/dialog.subr > index 0b6f11f39134..5b7ae9123073 100644 > --- a/usr.sbin/bsdconfig/share/dialog.subr > +++ b/usr.sbin/bsdconfig/share/dialog.subr > @@ -51,7 +51,7 @@ f_include_lang $BSDCFG_LIBE/include/messages.subr > # Default name of dialog(1) utility > # NOTE: This is changed to "Xdialog" by the optional `-X' argument > # > -DIALOG="bsddialog" > +DIALOG="dialog" > > # > # Default dialog(1) title and backtitle text > @@ -79,15 +79,9 @@ DIALOG_OK=${SUCCESS:-0} > DIALOG_CANCEL=${FAILURE:-1} > DIALOG_HELP=2 > DIALOG_EXTRA=3 > -if [ $DIALOG = "bsddialog" ]; then > - DIALOG_ITEM_HELP=2 > - DIALOG_ERROR=255 > - DIALOG_ESC=5 > -else > - DIALOG_ITEM_HELP=4 > - export DIALOG_ERROR=254 # sh(1) can't handle the default of `-1' > - DIALOG_ESC=255 > -fi > +DIALOG_ITEM_HELP=4 > +export DIALOG_ERROR=254 # sh(1) can't handle the default of `-1' > +DIALOG_ESC=255 > > # > # Default behavior is to call f_dialog_init() automatically when loaded. > @@ -2227,14 +2221,7 @@ f_dialog_init() > # > # Process `-X' command-line option > # > - if [ "$USE_XDIALOG" ]; then > - if [ $DIALOG = "bsddialog" ]; then > - DIALOG_ESC=255 > - # else it is already 255 like dialog(1) > - fi > - DIALOG=Xdialog > - USE_DIALOG= > - fi > + [ "$USE_XDIALOG" ] && DIALOG=Xdialog USE_DIALOG= > > # > # Sanity check, or die gracefully > @@ -2242,7 +2229,7 @@ f_dialog_init() > if ! f_have $DIALOG; then > unset USE_XDIALOG > local failed_dialog="$DIALOG" > - DIALOG=bsddialog > + DIALOG=dialog > f_die 1 "$msg_no_such_file_or_directory" "$pgm" "$failed_dialog" > fi > > @@ -2274,7 +2261,7 @@ f_dialog_init() > if ! f_have xauth; then > # Die gracefully, as we [likely] can't use Xdialog(1) > unset USE_XDIALOG > - DIALOG=bsddialog > + DIALOG=dialog > f_die 1 "$msg_no_such_file_or_directory" "$pgm" "xauth" > fi > HOSTNAME=$( hostname ) > @@ -2296,13 +2283,12 @@ f_dialog_init() > then > # Xdialog(1) failed, fall back to dialog(1) > unset USE_XDIALOG > - DIALOG=bsddialog > > # Display the error message produced by Xdialog(1) > local height width > f_dialog_buttonbox_size height width \ > "$DIALOG_TITLE" "$DIALOG_BACKTITLE" "$maxsize" > - $DIALOG \ > + dialog \ > --title "$DIALOG_TITLE" \ > --backtitle "$DIALOG_BACKTITLE" \ > --ok-label "$msg_ok" \ From nobody Mon Oct 23 14:14:40 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SDcdY3Kx1z4y65k; Mon, 23 Oct 2023 14:14: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 4SDcdY1bmCz3gHr; Mon, 23 Oct 2023 14:14:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698070481; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yGXgBpv4vlvWzOCboryjxC906Pm6lms5HJj3wXE5Sws=; b=EyWluc4RRMf2sm65gNiqwxNC7Rys4GX64C+fookyKv+eYxR0ePHLgbWHgHJxFeEOq6dsaQ kBdIeaxV1Gy5hw3M9DGmiAxdpneQ01x7OXuMjOvUjAMDWgpQEd5Ev0Tn+fHT2RWPoTSChf QIqniLjtsq0pXQQW7yOm+ElYd3wMRyBAsxaVsA33aybZskKthpLxoDlvzt+bTxNo4xHSz2 8FDtJrOHAZ3ZiK6hBBXWVpIlgU9zQzlR+NU0V/rM7c+VCmcWtotNa7h6VS7tIqJO6I+9Ph gzBw6zzybmxoXDtlnaG77WWenOgVBUBYRB3gWhu4HG0Z88iAIkidAvQNWgnvXg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698070481; a=rsa-sha256; cv=none; b=qiETXPtjC37vsg5D+KP3ORuCN6LJt4Rt2nWJqIDJHTlhV58sCe4efJhVC2tHWgHfRI4Q3n u/1MhWO9LEU5re5pH9dxWmtEC3mwfSbJRlJawylrmY+mK03eUoRvu2WiBiPdN7gFb9AkCb Iw0SUVE0p8jm+ONBC2mGCefmPNbmFeS0fsnEZBczcJRa0Z3e3aytzzTu9tF7sFi/NWRupe bUGGmw7+Wz2y8bluWXIJNn89Q/TSv4r7JJieMQrn3vxcf5NLEv2J1xVgaH8UdI6xlHVLSY RTaMA1J2/EnLG2XcjX05eGaysaDYUJe5hXv3UCQr9+VZE1pOTMI1IPi0jdEWDA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698070481; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yGXgBpv4vlvWzOCboryjxC906Pm6lms5HJj3wXE5Sws=; b=GKuhUNTVxe6Gh+seL4kNP5XORVdJp94g7CAMPusXBgHoCZNOW7sylAbBdMrmyHAtIO7/fo pJdJCWoOllcxRcT4UPS8+Sh8PeMe4gfptp5hdKP9splE2r9CtQUJtnu98JCvOkOVWmPBc7 EcuGCPSPn4mdV/3ZmMtAD9+PVjQogxAIXaBrLMjfAK2tia9IXIHeLZE0mlsCGbpIehigaV wzMQlRypyhQeu+o+b94D6EaIe0oilpPDmTFDPHIdRuWOh1w9NS3bSysNNLHOxPbucFel9i PBLWF23oUzVh7ZhmuFAxSqbgdwIUvKRM1M+C2a1MesqRc0gAwHjrg/8U3WambQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SDcdY0f10zjDq; Mon, 23 Oct 2023 14:14: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 39NEEegB045726; Mon, 23 Oct 2023 14:14:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39NEEeDt045723; Mon, 23 Oct 2023 14:14:40 GMT (envelope-from git) Date: Mon, 23 Oct 2023 14:14:40 GMT Message-Id: <202310231414.39NEEeDt045723@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: c36b3dbc99d1 - main - bsdconfig: Restore bsddialog List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: c36b3dbc99d1e6dfc658e9c20382abc75749af82 Auto-Submitted: auto-generated The branch main has been updated by asiciliano: URL: https://cgit.FreeBSD.org/src/commit/?id=c36b3dbc99d1e6dfc658e9c20382abc75749af82 commit c36b3dbc99d1e6dfc658e9c20382abc75749af82 Author: Alfonso S. Siciliano AuthorDate: 2023-10-23 14:11:54 +0000 Commit: Alfonso S. Siciliano CommitDate: 2023-10-23 14:11:54 +0000 bsdconfig: Restore bsddialog Readd bsddialog(1) to bsdconfig(8). This can be considered an increment not a replacement: `$DIALOG=dialog' restores dialog(1), no change for Xdialog(1). An exception is if an error occurs, bsddialog(1) replaces dialog. --- usr.sbin/bsdconfig/share/common.subr | 10 +++++----- usr.sbin/bsdconfig/share/dialog.subr | 17 +++++++++++++---- 2 files changed, 18 insertions(+), 9 deletions(-) diff --git a/usr.sbin/bsdconfig/share/common.subr b/usr.sbin/bsdconfig/share/common.subr index ba4d4fce4abb..830279168ff2 100644 --- a/usr.sbin/bsdconfig/share/common.subr +++ b/usr.sbin/bsdconfig/share/common.subr @@ -369,7 +369,7 @@ f_show_info() if f_have f_dialog_info; then f_dialog_info "$msg" else - dialog --infobox "$msg" 0 0 + bsddialog --infobox "$msg" 0 0 fi } @@ -390,7 +390,7 @@ f_show_msg() if f_have f_dialog_msgbox; then f_dialog_msgbox "$msg" else - dialog --msgbox "$msg" 0 0 + bsddialog --msgbox "$msg" 0 0 fi } @@ -433,7 +433,7 @@ f_yesno() if f_have f_dialog_yesno; then f_dialog_yesno "$msg" else - dialog --yesno "$msg" 0 0 + bsddialog --yesno "$msg" 0 0 fi } @@ -455,7 +455,7 @@ f_noyes() if f_have f_dialog_noyes; then f_dialog_noyes "$msg" else - dialog --defaultno --yesno "$msg" 0 0 + bsddialog --defaultno --yesno "$msg" 0 0 fi } @@ -486,7 +486,7 @@ f_show_help() if f_have f_dialog_textbox; then f_dialog_textbox "$file" else - dialog --msgbox "$( cat "$file" 2>&1 )" 0 0 + bsddialog --msgbox "$( cat "$file" 2>&1 )" 0 0 fi } diff --git a/usr.sbin/bsdconfig/share/dialog.subr b/usr.sbin/bsdconfig/share/dialog.subr index 5b7ae9123073..cac0a3e24e53 100644 --- a/usr.sbin/bsdconfig/share/dialog.subr +++ b/usr.sbin/bsdconfig/share/dialog.subr @@ -51,7 +51,7 @@ f_include_lang $BSDCFG_LIBE/include/messages.subr # Default name of dialog(1) utility # NOTE: This is changed to "Xdialog" by the optional `-X' argument # -DIALOG="dialog" +DIALOG="bsddialog" # # Default dialog(1) title and backtitle text @@ -83,6 +83,15 @@ DIALOG_ITEM_HELP=4 export DIALOG_ERROR=254 # sh(1) can't handle the default of `-1' DIALOG_ESC=255 +# +# Set bsddialog(1) compatibility with dialog(1): exit codes and use_shadow +# +export BSDDIALOG_TIMEOUT=0 +export BSDDIALOG_ITEM_HELP=4 +export BSDDIALOG_ERROR=254 +export BSDDIALOG_ESC=255 +export BSDDIALOG_COMPATRC=".dialogrc" + # # Default behavior is to call f_dialog_init() automatically when loaded. # @@ -2229,7 +2238,7 @@ f_dialog_init() if ! f_have $DIALOG; then unset USE_XDIALOG local failed_dialog="$DIALOG" - DIALOG=dialog + DIALOG=bsddialog f_die 1 "$msg_no_such_file_or_directory" "$pgm" "$failed_dialog" fi @@ -2261,7 +2270,7 @@ f_dialog_init() if ! f_have xauth; then # Die gracefully, as we [likely] can't use Xdialog(1) unset USE_XDIALOG - DIALOG=dialog + DIALOG=bsddialog f_die 1 "$msg_no_such_file_or_directory" "$pgm" "xauth" fi HOSTNAME=$( hostname ) @@ -2288,7 +2297,7 @@ f_dialog_init() local height width f_dialog_buttonbox_size height width \ "$DIALOG_TITLE" "$DIALOG_BACKTITLE" "$maxsize" - dialog \ + bsddialog \ --title "$DIALOG_TITLE" \ --backtitle "$DIALOG_BACKTITLE" \ --ok-label "$msg_ok" \ From nobody Mon Oct 23 15:10:32 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SDdt04LN6z4y9MP; Mon, 23 Oct 2023 15:10: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 4SDdt03qpvz4J7n; Mon, 23 Oct 2023 15:10:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698073832; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Yqc/ZtaaM89LfPMG7rjAWF0WEb8DR7dtn9o/c4pELtI=; b=hTLrnPMybazeRv0v69VfuAjh5Rx8UCx3U1X4P18GbknGEm5Ow1wAOlV0bqxK4Iv+Ley9Ti SAiO/8cBOCTkJlRW/tXz3kndEQvKFaQ3g9uHUdzHHBubGFb7+8YPDQ2vv0yw9OAm4eT+Nx w14Pjwfxx8as044606WVt1rfInuwxW3VqF9bEwxK3qT4vBUTPwIb6OheMBesllBCFlnDic D4pzM6M5K56PqgM7IjPZAt3fgQBrXgwN2l+HRVG+2bxgLtqHwIx//fyhSsDiZZ/9/6IwfO dQ1j/+/97U2pkHjIkG0klvSNffn9VV9/DvvAditFx6Bt0pVxEogsr77//IFyAw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698073832; a=rsa-sha256; cv=none; b=naPzpnXOuH5EJ4RRNBBRhUKily/CbVkrH1JeUkbNjyKLtwwonPYT0DwZDrxbeM6h/GlSSh +dn5r/4IxXe++gf6Sn3ZLh3t9TY/QIT5DSqawBuYSpSRlQWo+e8WKTAzGA0ialmu5vnjNd ZByekPWz4/K1fYCtwObgA3twaZBzF7f5dFb+Zyr2NmT0+mkxyJjPfQg/QBmGmuRZRYn8Uo LhJ1gJAJ4ZrkceNHMIf5BYLidcAip27CA6LZ7AJE7pIu38y8YEZHVwDIpKRcFW9GhRBhrN YWM3YhO5i9PBkLJ9CC+4fjxHWH3unBiJPS5raK4DhBWqOvBmBAC9dVRB9jwwIA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698073832; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Yqc/ZtaaM89LfPMG7rjAWF0WEb8DR7dtn9o/c4pELtI=; b=XmE97XblkB99zgBhfWk+39L17+TiapzvNI0TIOLXw+5kgXpUBuUeKKjYOZ/lUKlW4ddgCK j4yIDuoS0aoK8X4z9tJdla1XdnBZqQ2v+DPS3v5XwtvWXzH7Lj1rZ6tH6lDBQjqppAKsbv dYGFiAYMGVuwp1jeTlKijcr3IGryFYtr7XT02WO/bLE1PdH1hkNmf9fcQo7VnvvIZi6Kah CgBfjzI9dPz+GXb6j+RU2bXHzH08Spy3bwymQfx69STIJbAxSc0WvAmjezP9boOQMit+CC nmk3kjnpjqHj8tSI0mHJAxFObyrqc6UxpwgEYjcTXTUjQX8TcoAyDWyONTy9sQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SDdt02tbQzksP; Mon, 23 Oct 2023 15:10: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 39NFAWTK038434; Mon, 23 Oct 2023 15:10:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39NFAWWi038431; Mon, 23 Oct 2023 15:10:32 GMT (envelope-from git) Date: Mon, 23 Oct 2023 15:10:32 GMT Message-Id: <202310231510.39NFAWWi038431@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: ae2ca32781a9 - main - netlink: fix potential llentry lock leak in newneigh handler List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ae2ca32781a90abe987e128ca167ab400a87f369 Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=ae2ca32781a90abe987e128ca167ab400a87f369 commit ae2ca32781a90abe987e128ca167ab400a87f369 Author: R. Christian McDonald AuthorDate: 2023-10-23 11:23:55 +0000 Commit: Kristof Provost CommitDate: 2023-10-23 14:24:51 +0000 netlink: fix potential llentry lock leak in newneigh handler The netlink newneigh handler has the potential to leak the lock on llentry objects in the kernel. This patch reconciles several paths through the newneigh handler that could result in a lock leak. MFC after: 1 week Reviewed by: markj, kp Sponsored by: Rubicon Communications, LLC ("Netgate") Differential Revision: https://reviews.freebsd.org/D42307 --- sys/netlink/route/neigh.c | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/sys/netlink/route/neigh.c b/sys/netlink/route/neigh.c index 9914e7febf57..5be0c1f9d91f 100644 --- a/sys/netlink/route/neigh.c +++ b/sys/netlink/route/neigh.c @@ -436,17 +436,18 @@ rtnl_handle_newneigh(struct nlmsghdr *hdr, struct nlpcb *nlp, struct nl_pstate * struct llentry *lle_tmp = lla_lookup(llt, LLE_EXCLUSIVE, attrs.nda_dst); if (lle_tmp != NULL) { error = EEXIST; - if (hdr->nlmsg_flags & NLM_F_EXCL) { - LLE_WUNLOCK(lle_tmp); - lle_tmp = NULL; - } else if (hdr->nlmsg_flags & NLM_F_REPLACE) { + if (hdr->nlmsg_flags & NLM_F_REPLACE) { + error = EPERM; if ((lle_tmp->la_flags & LLE_IFADDR) == 0) { + error = 0; /* success */ lltable_unlink_entry(llt, lle_tmp); + llentry_free(lle_tmp); + lle_tmp = NULL; lltable_link_entry(llt, lle); - error = 0; - } else - error = EPERM; + } } + if (lle_tmp) + LLE_WUNLOCK(lle_tmp); } else { if (hdr->nlmsg_flags & NLM_F_CREATE) lltable_link_entry(llt, lle); @@ -456,14 +457,11 @@ rtnl_handle_newneigh(struct nlmsghdr *hdr, struct nlpcb *nlp, struct nl_pstate * IF_AFDATA_WUNLOCK(attrs.nda_ifp); if (error != 0) { - if (lle != NULL) - llentry_free(lle); + /* throw away the newly allocated llentry */ + llentry_free(lle); return (error); } - if (lle_tmp != NULL) - llentry_free(lle_tmp); - /* XXX: We're inside epoch */ EVENTHANDLER_INVOKE(lle_event, lle, LLENTRY_RESOLVED); LLE_WUNLOCK(lle); From nobody Mon Oct 23 15:10:33 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SDdt15BNmz4y9Y2; Mon, 23 Oct 2023 15:10: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 4SDdt14Ymbz4J89; Mon, 23 Oct 2023 15:10:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698073833; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hjDcpcX0PeM1PQyWeJyxWql6A8X74x+bA3tWC6W1Mlo=; b=lKYk8PnXdU+Tp94ZIaUz26pCV29y71qnatfggoh8VIkHjhgdOjAq2OUw5Jx8N7aj+zDtIe mpxa/W2vcefn+H/dqVV3sdFpZ7z8TeuYkTrjSxRaFrM4isXKFnGaKU0YG4sWT/u6jnM8Dv q+lScaLkVW70ijnWm5tuJVaYHqxOzHESPbb0Hi2xDlPY4+n9yWX51g4mp/WiD2iEtszJi5 7cwPkuFJmGSvowLe81MkuRnV+lpW3DzLijOAXXz3SBkdkQnOT1VwTA5bugTr9g3xUDkUVm TK0fq1XgVqWb01w+oWM8gb9casir528jTf8ARL2xrRg2T0+xn6JspzUUzbzvPg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698073833; a=rsa-sha256; cv=none; b=kp0A2cqnE/FlRC8rCoRusrSBoI3v3g2mhLfK6a1JwNfYYWh3pFEIiEdmSIeMjUa/xmGL9n J+WKWUms62WrgRqOER7372b3Mhgwh91B6L5nAmRjFo88sPddoZhhJSBhkcx4BE6JSfa07H hq50zDC0T69T1wJd6Nt9nHcs6tvdCW82wiCiqSTAH4D/mvNIuxmHf+OiBHD+3OOXPCRIhA AnaPQoswGwqxrEKWkeLszq4PJQKzeRgNMFJdobSslH4iM5xTrV+KXjBGV8k6kxsHcgXx1x rr0rm8oo/eXoeOWUy3g8T8nutzec5cZjj7B3PEVxlzOWb0Ku1KioFM3zTgL0Iw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698073833; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hjDcpcX0PeM1PQyWeJyxWql6A8X74x+bA3tWC6W1Mlo=; b=eY2v4UhW24Ben2uO5976uMQuWd2sudn6vex+oY0jrOpi5IvM5sy8OcIp5suoMzEwv8cj+u 9+4HUEQHC7JJ5yOwQNtJJBWazH9mqJV3CX7giPnmOt1eTvIW3w/pRjxQPJjd4PVfKmmuac QDmw+BWhbQNZVWDYpvwJaS9aZMkBU2NiTuSlrj/8br1ZeSMOYACWwU4AOtZ3mqUivQ+OpY aqUHhTABeC1ISwuWtRepUJ7gn6TD7+UQizXHvRD50OBxWeDsS/e6I+Qc1/N3Y1f1QPs15/ pZg/fGgS4tgrixRPCthtCSu9jNk99/uZjkxcGaOOHBXY7ptpqcia7IG/f1PeaA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SDdt13g1kzkqN; Mon, 23 Oct 2023 15:10: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 39NFAX8w038479; Mon, 23 Oct 2023 15:10:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39NFAXhc038476; Mon, 23 Oct 2023 15:10:33 GMT (envelope-from git) Date: Mon, 23 Oct 2023 15:10:33 GMT Message-Id: <202310231510.39NFAXhc038476@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: ffbf25951e7b - main - pf: convert rule addition to netlink List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: ffbf25951e7b7f867989b621b2c07e9dad9441fb Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=ffbf25951e7b7f867989b621b2c07e9dad9441fb commit ffbf25951e7b7f867989b621b2c07e9dad9441fb Author: Kristof Provost AuthorDate: 2023-10-14 13:10:03 +0000 Commit: Kristof Provost CommitDate: 2023-10-23 14:24:51 +0000 pf: convert rule addition to netlink The nvlist-based version will be removed in FreeBSD 16. Sponsored by: Rubicon Communications, LLC ("Netgate") Differential Revision: https://reviews.freebsd.org/D42279 --- lib/libpfctl/libpfctl.c | 385 ++++++++++++++++++++++++++-------------------- sys/net/pfvar.h | 4 + sys/netpfil/pf/pf_ioctl.c | 14 +- sys/netpfil/pf/pf_nl.c | 268 +++++++++++++++++++++++++++++++- sys/netpfil/pf/pf_nl.h | 132 ++++++++++++++++ 5 files changed, 626 insertions(+), 177 deletions(-) diff --git a/lib/libpfctl/libpfctl.c b/lib/libpfctl/libpfctl.c index 571fabae4359..3865dc85aea1 100644 --- a/lib/libpfctl/libpfctl.c +++ b/lib/libpfctl/libpfctl.c @@ -438,40 +438,6 @@ pf_nvrule_addr_to_rule_addr(const nvlist_t *nvl, struct pf_rule_addr *addr) addr->port_op = nvlist_get_number(nvl, "port_op"); } -static void -pfctl_nv_add_mape(nvlist_t *nvparent, const char *name, - const struct pf_mape_portset *mape) -{ - nvlist_t *nvl = nvlist_create(0); - - nvlist_add_number(nvl, "offset", mape->offset); - nvlist_add_number(nvl, "psidlen", mape->psidlen); - nvlist_add_number(nvl, "psid", mape->psid); - nvlist_add_nvlist(nvparent, name, nvl); - nvlist_destroy(nvl); -} - -static void -pfctl_nv_add_pool(nvlist_t *nvparent, const char *name, - const struct pfctl_pool *pool) -{ - uint64_t ports[2]; - nvlist_t *nvl = nvlist_create(0); - - nvlist_add_binary(nvl, "key", &pool->key, sizeof(pool->key)); - pfctl_nv_add_addr(nvl, "counter", &pool->counter); - nvlist_add_number(nvl, "tblidx", pool->tblidx); - - ports[0] = pool->proxy_port[0]; - ports[1] = pool->proxy_port[1]; - nvlist_add_number_array(nvl, "proxy_port", ports, 2); - nvlist_add_number(nvl, "opts", pool->opts); - pfctl_nv_add_mape(nvl, "mape", &pool->mape); - - nvlist_add_nvlist(nvparent, name, nvl); - nvlist_destroy(nvl); -} - static void pf_nvmape_to_mape(const nvlist_t *nvl, struct pf_mape_portset *mape) { @@ -500,22 +466,6 @@ pf_nvpool_to_pool(const nvlist_t *nvl, struct pfctl_pool *pool) pf_nvmape_to_mape(nvlist_get_nvlist(nvl, "mape"), &pool->mape); } -static void -pfctl_nv_add_uid(nvlist_t *nvparent, const char *name, - const struct pf_rule_uid *uid) -{ - uint64_t uids[2]; - nvlist_t *nvl = nvlist_create(0); - - uids[0] = uid->uid[0]; - uids[1] = uid->uid[1]; - nvlist_add_number_array(nvl, "uid", uids, 2); - nvlist_add_number(nvl, "op", uid->op); - - nvlist_add_nvlist(nvparent, name, nvl); - nvlist_destroy(nvl); -} - static void pf_nvrule_uid_to_rule_uid(const nvlist_t *nvl, struct pf_rule_uid *uid) { @@ -523,19 +473,6 @@ pf_nvrule_uid_to_rule_uid(const nvlist_t *nvl, struct pf_rule_uid *uid) uid->op = nvlist_get_number(nvl, "op"); } -static void -pfctl_nv_add_divert(nvlist_t *nvparent, const char *name, - const struct pfctl_rule *r) -{ - nvlist_t *nvl = nvlist_create(0); - - pfctl_nv_add_addr(nvl, "addr", &r->divert.addr); - nvlist_add_number(nvl, "port", r->divert.port); - - nvlist_add_nvlist(nvparent, name, nvl); - nvlist_destroy(nvl); -} - static void pf_nvdivert_to_divert(const nvlist_t *nvl, struct pfctl_rule *rule) { @@ -926,127 +863,235 @@ pfctl_add_eth_rule(int dev, const struct pfctl_eth_rule *r, const char *anchor, return (error); } -int -pfctl_add_rule(int dev, const struct pfctl_rule *r, const char *anchor, - const char *anchor_call, uint32_t ticket, uint32_t pool_ticket) +static void +snl_add_msg_attr_addr_wrap(struct snl_writer *nw, uint32_t type, const struct pf_addr_wrap *addr) { - struct pfioc_nv nv; - uint64_t timeouts[PFTM_MAX]; - uint64_t set_prio[2]; - nvlist_t *nvl, *nvlr; - size_t labelcount; - int ret; + int off; - nvl = nvlist_create(0); - nvlr = nvlist_create(0); + off = snl_add_msg_attr_nested(nw, type); - nvlist_add_number(nvl, "ticket", ticket); - nvlist_add_number(nvl, "pool_ticket", pool_ticket); - nvlist_add_string(nvl, "anchor", anchor); - nvlist_add_string(nvl, "anchor_call", anchor_call); + snl_add_msg_attr_ip6(nw, PF_AT_ADDR, &addr->v.a.addr.v6); + snl_add_msg_attr_ip6(nw, PF_AT_MASK, &addr->v.a.mask.v6); - nvlist_add_number(nvlr, "nr", r->nr); - pfctl_nv_add_rule_addr(nvlr, "src", &r->src); - pfctl_nv_add_rule_addr(nvlr, "dst", &r->dst); + if (addr->type == PF_ADDR_DYNIFTL) + snl_add_msg_attr_string(nw, PF_AT_IFNAME, addr->v.ifname); + if (addr->type == PF_ADDR_TABLE) + snl_add_msg_attr_string(nw, PF_AT_TABLENAME, addr->v.tblname); + snl_add_msg_attr_u8(nw, PF_AT_TYPE, addr->type); + snl_add_msg_attr_u8(nw, PF_AT_IFLAGS, addr->iflags); - labelcount = 0; - while (r->label[labelcount][0] != 0 && - labelcount < PF_RULE_MAX_LABEL_COUNT) { - nvlist_append_string_array(nvlr, "labels", - r->label[labelcount]); - labelcount++; + snl_end_attr_nested(nw, off); +} + +static void +snl_add_msg_attr_rule_addr(struct snl_writer *nw, uint32_t type, const struct pf_rule_addr *addr) +{ + int off; + + off = snl_add_msg_attr_nested(nw, type); + + snl_add_msg_attr_addr_wrap(nw, PF_RAT_ADDR, &addr->addr); + snl_add_msg_attr_u16(nw, PF_RAT_SRC_PORT, addr->port[0]); + snl_add_msg_attr_u16(nw, PF_RAT_DST_PORT, addr->port[1]); + snl_add_msg_attr_u8(nw, PF_RAT_NEG, addr->neg); + snl_add_msg_attr_u8(nw, PF_RAT_OP, addr->port_op); + + snl_end_attr_nested(nw, off); +} + +static void +snl_add_msg_attr_rule_labels(struct snl_writer *nw, uint32_t type, const char labels[PF_RULE_MAX_LABEL_COUNT][PF_RULE_LABEL_SIZE]) +{ + int off, i = 0; + + off = snl_add_msg_attr_nested(nw, type); + + while (labels[i][0] != 0 && + i < PF_RULE_MAX_LABEL_COUNT) { + snl_add_msg_attr_string(nw, PF_LT_LABEL, labels[i]); + i++; } - nvlist_add_number(nvlr, "ridentifier", r->ridentifier); - nvlist_add_string(nvlr, "ifname", r->ifname); - nvlist_add_string(nvlr, "qname", r->qname); - nvlist_add_string(nvlr, "pqname", r->pqname); - nvlist_add_string(nvlr, "tagname", r->tagname); - nvlist_add_string(nvlr, "match_tagname", r->match_tagname); - nvlist_add_string(nvlr, "overload_tblname", r->overload_tblname); + snl_end_attr_nested(nw, off); +} + +static void +snl_add_msg_attr_mape(struct snl_writer *nw, uint32_t type, const struct pf_mape_portset *me) +{ + int off; + + off = snl_add_msg_attr_nested(nw, type); + + snl_add_msg_attr_u8(nw, PF_MET_OFFSET, me->offset); + snl_add_msg_attr_u8(nw, PF_MET_PSID_LEN, me->psidlen); + snl_add_msg_attr_u16(nw, PF_MET_PSID, me->psid); + + snl_end_attr_nested(nw, off); +} + +static void +snl_add_msg_attr_rpool(struct snl_writer *nw, uint32_t type, const struct pfctl_pool *pool) +{ + int off; + + off = snl_add_msg_attr_nested(nw, type); - pfctl_nv_add_pool(nvlr, "rpool", &r->rpool); + snl_add_msg_attr(nw, PF_PT_KEY, sizeof(pool->key), &pool->key); + snl_add_msg_attr_ip6(nw, PF_PT_COUNTER, &pool->counter.v6); + snl_add_msg_attr_u32(nw, PF_PT_TBLIDX, pool->tblidx); + snl_add_msg_attr_u16(nw, PF_PT_PROXY_SRC_PORT, pool->proxy_port[0]); + snl_add_msg_attr_u16(nw, PF_PT_PROXY_DST_PORT, pool->proxy_port[1]); + snl_add_msg_attr_u8(nw, PF_PT_OPTS, pool->opts); + snl_add_msg_attr_mape(nw, PF_PT_MAPE, &pool->mape); - nvlist_add_number(nvlr, "os_fingerprint", r->os_fingerprint); + snl_end_attr_nested(nw, off); +} + +static void +snl_add_msg_attr_timeouts(struct snl_writer *nw, uint32_t type, const uint32_t *timeouts) +{ + int off; + + off = snl_add_msg_attr_nested(nw, type); - nvlist_add_number(nvlr, "rtableid", r->rtableid); for (int i = 0; i < PFTM_MAX; i++) - timeouts[i] = r->timeout[i]; - nvlist_add_number_array(nvlr, "timeout", timeouts, PFTM_MAX); - nvlist_add_number(nvlr, "max_states", r->max_states); - nvlist_add_number(nvlr, "max_src_nodes", r->max_src_nodes); - nvlist_add_number(nvlr, "max_src_states", r->max_src_states); - nvlist_add_number(nvlr, "max_src_conn", r->max_src_conn); - nvlist_add_number(nvlr, "max_src_conn_rate.limit", - r->max_src_conn_rate.limit); - nvlist_add_number(nvlr, "max_src_conn_rate.seconds", - r->max_src_conn_rate.seconds); - nvlist_add_number(nvlr, "dnpipe", r->dnpipe); - nvlist_add_number(nvlr, "dnrpipe", r->dnrpipe); - nvlist_add_number(nvlr, "dnflags", r->free_flags); - nvlist_add_number(nvlr, "prob", r->prob); - nvlist_add_number(nvlr, "cuid", r->cuid); - nvlist_add_number(nvlr, "cpid", r->cpid); - - nvlist_add_number(nvlr, "return_icmp", r->return_icmp); - nvlist_add_number(nvlr, "return_icmp6", r->return_icmp6); - - nvlist_add_number(nvlr, "max_mss", r->max_mss); - nvlist_add_number(nvlr, "scrub_flags", r->scrub_flags); - - pfctl_nv_add_uid(nvlr, "uid", &r->uid); - pfctl_nv_add_uid(nvlr, "gid", (const struct pf_rule_uid *)&r->gid); - - nvlist_add_number(nvlr, "rule_flag", r->rule_flag); - nvlist_add_number(nvlr, "action", r->action); - nvlist_add_number(nvlr, "direction", r->direction); - nvlist_add_number(nvlr, "log", r->log); - nvlist_add_number(nvlr, "logif", r->logif); - nvlist_add_number(nvlr, "quick", r->quick); - nvlist_add_number(nvlr, "ifnot", r->ifnot); - nvlist_add_number(nvlr, "match_tag_not", r->match_tag_not); - nvlist_add_number(nvlr, "natpass", r->natpass); - - nvlist_add_number(nvlr, "keep_state", r->keep_state); - nvlist_add_number(nvlr, "af", r->af); - nvlist_add_number(nvlr, "proto", r->proto); - nvlist_add_number(nvlr, "type", r->type); - nvlist_add_number(nvlr, "code", r->code); - nvlist_add_number(nvlr, "flags", r->flags); - nvlist_add_number(nvlr, "flagset", r->flagset); - nvlist_add_number(nvlr, "min_ttl", r->min_ttl); - nvlist_add_number(nvlr, "allow_opts", r->allow_opts); - nvlist_add_number(nvlr, "rt", r->rt); - nvlist_add_number(nvlr, "return_ttl", r->return_ttl); - nvlist_add_number(nvlr, "tos", r->tos); - nvlist_add_number(nvlr, "set_tos", r->set_tos); - nvlist_add_number(nvlr, "anchor_relative", r->anchor_relative); - nvlist_add_number(nvlr, "anchor_wildcard", r->anchor_wildcard); - - nvlist_add_number(nvlr, "flush", r->flush); - - nvlist_add_number(nvlr, "prio", r->prio); - set_prio[0] = r->set_prio[0]; - set_prio[1] = r->set_prio[1]; - nvlist_add_number_array(nvlr, "set_prio", set_prio, 2); - - pfctl_nv_add_divert(nvlr, "divert", r); - - nvlist_add_nvlist(nvl, "rule", nvlr); - nvlist_destroy(nvlr); - - /* Now do the call. */ - nv.data = nvlist_pack(nvl, &nv.len); - nv.size = nv.len; + snl_add_msg_attr_u32(nw, PF_TT_TIMEOUT, timeouts[i]); - ret = ioctl(dev, DIOCADDRULENV, &nv); - if (ret == -1) - ret = errno; + snl_end_attr_nested(nw, off); +} - free(nv.data); - nvlist_destroy(nvl); +static void +snl_add_msg_attr_uid(struct snl_writer *nw, uint32_t type, const struct pf_rule_uid *uid) +{ + int off; - return (ret); + off = snl_add_msg_attr_nested(nw, type); + + snl_add_msg_attr_u32(nw, PF_RUT_UID_LOW, uid->uid[0]); + snl_add_msg_attr_u32(nw, PF_RUT_UID_HIGH, uid->uid[1]); + snl_add_msg_attr_u8(nw, PF_RUT_OP, uid->op); + + snl_end_attr_nested(nw, off); +} + +static void +snl_add_msg_attr_pf_rule(struct snl_writer *nw, uint32_t type, const struct pfctl_rule *r) +{ + int off; + + off = snl_add_msg_attr_nested(nw, type); + + snl_add_msg_attr_rule_addr(nw, PF_RT_SRC, &r->src); + snl_add_msg_attr_rule_addr(nw, PF_RT_DST, &r->dst); + snl_add_msg_attr_rule_labels(nw, PF_RT_LABELS, r->label); + snl_add_msg_attr_u32(nw, PF_RT_RIDENTIFIER, r->ridentifier); + snl_add_msg_attr_string(nw, PF_RT_IFNAME, r->ifname); + snl_add_msg_attr_string(nw, PF_RT_QNAME, r->qname); + snl_add_msg_attr_string(nw, PF_RT_PQNAME, r->pqname); + snl_add_msg_attr_string(nw, PF_RT_TAGNAME, r->tagname); + snl_add_msg_attr_string(nw, PF_RT_MATCH_TAGNAME, r->match_tagname); + snl_add_msg_attr_string(nw, PF_RT_OVERLOAD_TBLNAME, r->overload_tblname); + snl_add_msg_attr_rpool(nw, PF_RT_RPOOL, &r->rpool); + snl_add_msg_attr_u32(nw, PF_RT_OS_FINGERPRINT, r->os_fingerprint); + snl_add_msg_attr_u32(nw, PF_RT_RTABLEID, r->rtableid); + snl_add_msg_attr_timeouts(nw, PF_RT_TIMEOUT, r->timeout); + snl_add_msg_attr_u32(nw, PF_RT_MAX_STATES, r->max_states); + snl_add_msg_attr_u32(nw, PF_RT_MAX_SRC_NODES, r->max_src_nodes); + snl_add_msg_attr_u32(nw, PF_RT_MAX_SRC_STATES, r->max_src_states); + snl_add_msg_attr_u32(nw, PF_RT_MAX_SRC_CONN_RATE_LIMIT, r->max_src_conn_rate.limit); + snl_add_msg_attr_u32(nw, PF_RT_MAX_SRC_CONN_RATE_SECS, r->max_src_conn_rate.seconds); + + snl_add_msg_attr_u16(nw, PF_RT_DNPIPE, r->dnpipe); + snl_add_msg_attr_u16(nw, PF_RT_DNRPIPE, r->dnrpipe); + snl_add_msg_attr_u32(nw, PF_RT_DNFLAGS, r->free_flags); + + snl_add_msg_attr_u32(nw, PF_RT_NR, r->nr); + snl_add_msg_attr_u32(nw, PF_RT_PROB, r->prob); + snl_add_msg_attr_u32(nw, PF_RT_CUID, r->cuid); + snl_add_msg_attr_u32(nw, PF_RT_CPID, r->cpid); + + snl_add_msg_attr_u16(nw, PF_RT_RETURN_ICMP, r->return_icmp); + snl_add_msg_attr_u16(nw, PF_RT_RETURN_ICMP6, r->return_icmp6); + snl_add_msg_attr_u16(nw, PF_RT_MAX_MSS, r->max_mss); + snl_add_msg_attr_u16(nw, PF_RT_SCRUB_FLAGS, r->scrub_flags); + + snl_add_msg_attr_uid(nw, PF_RT_UID, &r->uid); + snl_add_msg_attr_uid(nw, PF_RT_GID, (const struct pf_rule_uid *)&r->gid); + + snl_add_msg_attr_u32(nw, PF_RT_RULE_FLAG, r->rule_flag); + snl_add_msg_attr_u8(nw, PF_RT_ACTION, r->action); + snl_add_msg_attr_u8(nw, PF_RT_DIRECTION, r->direction); + snl_add_msg_attr_u8(nw, PF_RT_LOG, r->log); + snl_add_msg_attr_u8(nw, PF_RT_LOGIF, r->logif); + snl_add_msg_attr_u8(nw, PF_RT_QUICK, r->quick); + snl_add_msg_attr_u8(nw, PF_RT_IF_NOT, r->ifnot); + snl_add_msg_attr_u8(nw, PF_RT_MATCH_TAG_NOT, r->match_tag_not); + snl_add_msg_attr_u8(nw, PF_RT_NATPASS, r->natpass); + snl_add_msg_attr_u8(nw, PF_RT_KEEP_STATE, r->keep_state); + snl_add_msg_attr_u8(nw, PF_RT_AF, r->af); + snl_add_msg_attr_u8(nw, PF_RT_PROTO, r->proto); + snl_add_msg_attr_u8(nw, PF_RT_TYPE, r->type); + snl_add_msg_attr_u8(nw, PF_RT_CODE, r->code); + snl_add_msg_attr_u8(nw, PF_RT_FLAGS, r->flags); + snl_add_msg_attr_u8(nw, PF_RT_FLAGSET, r->flagset); + snl_add_msg_attr_u8(nw, PF_RT_MIN_TTL, r->min_ttl); + snl_add_msg_attr_u8(nw, PF_RT_ALLOW_OPTS, r->allow_opts); + snl_add_msg_attr_u8(nw, PF_RT_RT, r->rt); + snl_add_msg_attr_u8(nw, PF_RT_RETURN_TTL, r->return_ttl); + snl_add_msg_attr_u8(nw, PF_RT_TOS, r->tos); + snl_add_msg_attr_u8(nw, PF_RT_SET_TOS, r->set_tos); + + snl_add_msg_attr_u8(nw, PF_RT_ANCHOR_RELATIVE, r->anchor_relative); + snl_add_msg_attr_u8(nw, PF_RT_ANCHOR_WILDCARD, r->anchor_wildcard); + snl_add_msg_attr_u8(nw, PF_RT_FLUSH, r->flush); + snl_add_msg_attr_u8(nw, PF_RT_PRIO, r->prio); + snl_add_msg_attr_u8(nw, PF_RT_SET_PRIO, r->set_prio[0]); + snl_add_msg_attr_u8(nw, PF_RT_SET_PRIO_REPLY, r->set_prio[1]); + + snl_add_msg_attr_ip6(nw, PF_RT_DIVERT_ADDRESS, &r->divert.addr.v6); + snl_add_msg_attr_u16(nw, PF_RT_DIVERT_PORT, r->divert.port); + + snl_end_attr_nested(nw, off); +} + +int +pfctl_add_rule(int dev __unused, const struct pfctl_rule *r, const char *anchor, + const char *anchor_call, uint32_t ticket, uint32_t pool_ticket) +{ + struct snl_writer nw; + struct snl_state ss = {}; + struct snl_errmsg_data e = {}; + struct nlmsghdr *hdr; + uint32_t seq_id; + int family_id; + + snl_init(&ss, NETLINK_GENERIC); + family_id = snl_get_genl_family(&ss, PFNL_FAMILY_NAME); + + snl_init_writer(&ss, &nw); + hdr = snl_create_genl_msg_request(&nw, family_id, PFNL_CMD_ADDRULE); + hdr->nlmsg_flags |= NLM_F_DUMP; + snl_add_msg_attr_u32(&nw, PF_ART_TICKET, ticket); + snl_add_msg_attr_u32(&nw, PF_ART_POOL_TICKET, pool_ticket); + snl_add_msg_attr_string(&nw, PF_ART_ANCHOR, anchor); + snl_add_msg_attr_string(&nw, PF_ART_ANCHOR_CALL, anchor_call); + + snl_add_msg_attr_pf_rule(&nw, PF_ART_RULE, r); + + if ((hdr = snl_finalize_msg(&nw)) == NULL) + return (ENXIO); + + seq_id = hdr->nlmsg_seq; + + if (! snl_send_message(&ss, hdr)) { + printf("Send failed\n"); + return (ENXIO); + } + + while ((hdr = snl_read_reply_multi(&ss, seq_id, &e)) != NULL) { + } + + return (e.error); } int diff --git a/sys/net/pfvar.h b/sys/net/pfvar.h index ec8f8293945b..b2aa1c450c50 100644 --- a/sys/net/pfvar.h +++ b/sys/net/pfvar.h @@ -2465,6 +2465,10 @@ int pf_keth_anchor_nvcopyout( struct pf_keth_ruleset *pf_find_or_create_keth_ruleset(const char *); void pf_keth_anchor_remove(struct pf_keth_rule *); +int pf_ioctl_addrule(struct pf_krule *, uint32_t, + uint32_t, const char *, const char *, uid_t uid, + pid_t); + void pf_krule_free(struct pf_krule *); #endif diff --git a/sys/netpfil/pf/pf_ioctl.c b/sys/netpfil/pf/pf_ioctl.c index 38c09303a543..2eae03a908ec 100644 --- a/sys/netpfil/pf/pf_ioctl.c +++ b/sys/netpfil/pf/pf_ioctl.c @@ -2016,10 +2016,10 @@ pf_rule_to_krule(const struct pf_rule *rule, struct pf_krule *krule) return (0); } -static int +int pf_ioctl_addrule(struct pf_krule *rule, uint32_t ticket, uint32_t pool_ticket, const char *anchor, const char *anchor_call, - struct thread *td) + uid_t uid, pid_t pid) { struct pf_kruleset *ruleset; struct pf_krule *tail; @@ -2045,8 +2045,8 @@ pf_ioctl_addrule(struct pf_krule *rule, uint32_t ticket, rule->states_cur = counter_u64_alloc(M_WAITOK); rule->states_tot = counter_u64_alloc(M_WAITOK); rule->src_nodes = counter_u64_alloc(M_WAITOK); - rule->cuid = td->td_ucred->cr_ruid; - rule->cpid = td->td_proc ? td->td_proc->p_pid : 0; + rule->cuid = uid; + rule->cpid = pid; TAILQ_INIT(&rule->rpool.list); PF_CONFIG_LOCK(); @@ -3076,7 +3076,8 @@ DIOCGETETHRULESET_error: /* Frees rule on error */ error = pf_ioctl_addrule(rule, ticket, pool_ticket, anchor, - anchor_call, td); + anchor_call, td->td_ucred->cr_ruid, + td->td_proc ? td->td_proc->p_pid : 0); nvlist_destroy(nvl); free(nvlpacked, M_NVLIST); @@ -3104,7 +3105,8 @@ DIOCADDRULENV_error: /* Frees rule on error */ error = pf_ioctl_addrule(rule, pr->ticket, pr->pool_ticket, - pr->anchor, pr->anchor_call, td); + pr->anchor, pr->anchor_call, td->td_ucred->cr_ruid, + td->td_proc ? td->td_proc->p_pid : 0); break; } diff --git a/sys/netpfil/pf/pf_nl.c b/sys/netpfil/pf/pf_nl.c index e079edcc166d..d5d294134b1f 100644 --- a/sys/netpfil/pf/pf_nl.c +++ b/sys/netpfil/pf/pf_nl.c @@ -348,7 +348,265 @@ pf_handle_stop(struct nlmsghdr *hdr __unused, struct nl_pstate *npt __unused) return (pf_stop()); } -static const struct nlhdr_parser *all_parsers[] = { &state_parser }; +#define _OUT(_field) offsetof(struct pf_addr_wrap, _field) +static const struct nlattr_parser nla_p_addr_wrap[] = { + { .type = PF_AT_ADDR, .off = _OUT(v.a.addr), .cb = nlattr_get_in6_addr }, + { .type = PF_AT_MASK, .off = _OUT(v.a.mask), .cb = nlattr_get_in6_addr }, + { .type = PF_AT_IFNAME, .off = _OUT(v.ifname), .arg = (void *)IFNAMSIZ,.cb = nlattr_get_chara }, + { .type = PF_AT_TABLENAME, .off = _OUT(v.tblname), .arg = (void *)PF_TABLE_NAME_SIZE, .cb = nlattr_get_chara }, + { .type = PF_AT_TYPE, .off = _OUT(type), .cb = nlattr_get_uint8 }, + { .type = PF_AT_IFLAGS, .off = _OUT(iflags), .cb = nlattr_get_uint8 }, +}; +NL_DECLARE_ATTR_PARSER(addr_wrap_parser, nla_p_addr_wrap); +#undef _OUT + +#define _OUT(_field) offsetof(struct pf_rule_addr, _field) +static const struct nlattr_parser nla_p_ruleaddr[] = { + { .type = PF_RAT_ADDR, .off = _OUT(addr), .arg = &addr_wrap_parser, .cb = nlattr_get_nested }, + { .type = PF_RAT_SRC_PORT, .off = _OUT(port[0]), .cb = nlattr_get_uint16 }, + { .type = PF_RAT_DST_PORT, .off = _OUT(port[1]), .cb = nlattr_get_uint16 }, + { .type = PF_RAT_NEG, .off = _OUT(neg), .cb = nlattr_get_uint8 }, + { .type = PF_RAT_OP, .off = _OUT(port_op), .cb = nlattr_get_uint8 }, +}; +NL_DECLARE_ATTR_PARSER(rule_addr_parser, nla_p_ruleaddr); +#undef _OUT + +#define _OUT(_field) offsetof(struct pf_mape_portset, _field) +static const struct nlattr_parser nla_p_mape_portset[] = { + { .type = PF_MET_OFFSET, .off = _OUT(offset), .cb = nlattr_get_uint8 }, + { .type = PF_MET_PSID_LEN, .off = _OUT(psidlen), .cb = nlattr_get_uint8 }, + {. type = PF_MET_PSID, .off = _OUT(psid), .cb = nlattr_get_uint16 }, +}; +NL_DECLARE_ATTR_PARSER(mape_portset_parser, nla_p_mape_portset); +#undef _OUT + +struct nl_parsed_labels +{ + char labels[PF_RULE_MAX_LABEL_COUNT][PF_RULE_LABEL_SIZE]; + uint32_t i; +}; + +static int +nlattr_get_pf_rule_labels(struct nlattr *nla, struct nl_pstate *npt, + const void *arg, void *target) +{ + struct nl_parsed_labels *l = (struct nl_parsed_labels *)target; + int ret; + + if (l->i >= PF_RULE_MAX_LABEL_COUNT) + return (E2BIG); + + ret = nlattr_get_chara(nla, npt, (void *)PF_RULE_LABEL_SIZE, + l->labels[l->i]); + if (ret == 0) + l->i++; + + return (ret); +} + +#define _OUT(_field) offsetof(struct nl_parsed_labels, _field) +static const struct nlattr_parser nla_p_labels[] = { + { .type = PF_LT_LABEL, .off = 0, .cb = nlattr_get_pf_rule_labels }, +}; +NL_DECLARE_ATTR_PARSER(rule_labels_parser, nla_p_labels); +#undef _OUT + +static int +nlattr_get_nested_pf_rule_labels(struct nlattr *nla, struct nl_pstate *npt, const void *arg, void *target) +{ + struct nl_parsed_labels parsed_labels = { }; + int error; + + /* Assumes target points to the beginning of the structure */ + error = nl_parse_header(NLA_DATA(nla), NLA_DATA_LEN(nla), &rule_labels_parser, npt, &parsed_labels); + if (error != 0) + return (error); + + memcpy(target, parsed_labels.labels, sizeof(parsed_labels)); + + return (0); +} + +#define _OUT(_field) offsetof(struct pf_kpool, _field) +static const struct nlattr_parser nla_p_pool[] = { + { .type = PF_PT_KEY, .off = _OUT(key), .arg = (void *)sizeof(struct pf_poolhashkey), .cb = nlattr_get_bytes }, + { .type = PF_PT_COUNTER, .off = _OUT(counter), .cb = nlattr_get_in6_addr }, + { .type = PF_PT_TBLIDX, .off = _OUT(tblidx), .cb = nlattr_get_uint32 }, + { .type = PF_PT_PROXY_SRC_PORT, .off = _OUT(proxy_port[0]), .cb = nlattr_get_uint16 }, + { .type = PF_PT_PROXY_DST_PORT, .off = _OUT(proxy_port[1]), .cb = nlattr_get_uint16 }, + { .type = PF_PT_OPTS, .off = _OUT(opts), .cb = nlattr_get_uint8 }, + { .type = PF_PT_MAPE, .off = _OUT(mape), .arg = &mape_portset_parser, .cb = nlattr_get_nested }, +}; +NL_DECLARE_ATTR_PARSER(pool_parser, nla_p_pool); +#undef _OUT + +#define _OUT(_field) offsetof(struct pf_rule_uid, _field) +static const struct nlattr_parser nla_p_rule_uid[] = { + { .type = PF_RUT_UID_LOW, .off = _OUT(uid[0]), .cb = nlattr_get_uint32 }, + { .type = PF_RUT_UID_HIGH, .off = _OUT(uid[1]), .cb = nlattr_get_uint32 }, + { .type = PF_RUT_OP, .off = _OUT(op), .cb = nlattr_get_uint8 }, +}; +NL_DECLARE_ATTR_PARSER(rule_uid_parser, nla_p_rule_uid); +#undef _OUT + +struct nl_parsed_timeouts +{ + uint32_t timeouts[PFTM_MAX]; + uint32_t i; +}; + +static int +nlattr_get_pf_timeout(struct nlattr *nla, struct nl_pstate *npt, + const void *arg, void *target) +{ + struct nl_parsed_timeouts *t = (struct nl_parsed_timeouts *)target; + int ret; + + if (t->i >= PFTM_MAX) + return (E2BIG); + + ret = nlattr_get_uint32(nla, npt, NULL, &t->timeouts[t->i]); + if (ret == 0) + t->i++; + + return (ret); +} + +#define _OUT(_field) offsetof(struct nl_parsed_timeout, _field) +static const struct nlattr_parser nla_p_timeouts[] = { + { .type = PF_TT_TIMEOUT, .off = 0, .cb = nlattr_get_pf_timeout }, +}; +NL_DECLARE_ATTR_PARSER(timeout_parser, nla_p_timeouts); +#undef _OUT + +static int +nlattr_get_nested_timeouts(struct nlattr *nla, struct nl_pstate *npt, const void *arg, void *target) +{ + struct nl_parsed_timeouts parsed_timeouts = { }; + int error; + + /* Assumes target points to the beginning of the structure */ + error = nl_parse_header(NLA_DATA(nla), NLA_DATA_LEN(nla), &timeout_parser, npt, &parsed_timeouts); + if (error != 0) + return (error); + + memcpy(target, parsed_timeouts.timeouts, sizeof(parsed_timeouts.timeouts)); + + return (0); +} + +#define _OUT(_field) offsetof(struct pf_krule, _field) +static const struct nlattr_parser nla_p_rule[] = { + { .type = PF_RT_SRC, .off = _OUT(src), .arg = &rule_addr_parser,.cb = nlattr_get_nested }, + { .type = PF_RT_DST, .off = _OUT(dst), .arg = &rule_addr_parser,.cb = nlattr_get_nested }, + { .type = PF_RT_RIDENTIFIER, .off = _OUT(ridentifier), .cb = nlattr_get_uint32 }, + { .type = PF_RT_LABELS, .off = _OUT(label), .arg = &rule_labels_parser,.cb = nlattr_get_nested_pf_rule_labels }, + { .type = PF_RT_IFNAME, .off = _OUT(ifname), .arg = (void *)IFNAMSIZ, .cb = nlattr_get_chara }, + { .type = PF_RT_QNAME, .off = _OUT(qname), .arg = (void *)PF_QNAME_SIZE, .cb = nlattr_get_chara }, + { .type = PF_RT_PQNAME, .off = _OUT(pqname), .arg = (void *)PF_QNAME_SIZE, .cb = nlattr_get_chara }, + { .type = PF_RT_TAGNAME, .off = _OUT(tagname), .arg = (void *)PF_TAG_NAME_SIZE, .cb = nlattr_get_chara }, + { .type = PF_RT_MATCH_TAGNAME, .off = _OUT(match_tagname), .arg = (void *)PF_TAG_NAME_SIZE, .cb = nlattr_get_chara }, + { .type = PF_RT_OVERLOAD_TBLNAME, .off = _OUT(overload_tblname), .arg = (void *)PF_TABLE_NAME_SIZE, .cb = nlattr_get_chara }, + { .type = PF_RT_RPOOL, .off = _OUT(rpool), .arg = &pool_parser, .cb = nlattr_get_nested }, + { .type = PF_RT_OS_FINGERPRINT, .off = _OUT(os_fingerprint), .cb = nlattr_get_uint32 }, + { .type = PF_RT_RTABLEID, .off = _OUT(rtableid), .cb = nlattr_get_uint32 }, + { .type = PF_RT_TIMEOUT, .off = _OUT(timeout), .arg = &timeout_parser, .cb = nlattr_get_nested_timeouts }, + { .type = PF_RT_MAX_STATES, .off = _OUT(max_states), .cb = nlattr_get_uint32 }, + { .type = PF_RT_MAX_SRC_NODES, .off = _OUT(max_src_nodes), .cb = nlattr_get_uint32 }, + { .type = PF_RT_MAX_SRC_STATES, .off = _OUT(max_src_states), .cb = nlattr_get_uint32 }, + { .type = PF_RT_MAX_SRC_CONN_RATE_LIMIT, .off = _OUT(max_src_conn_rate.limit), .cb = nlattr_get_uint32 }, + { .type = PF_RT_MAX_SRC_CONN_RATE_SECS, .off = _OUT(max_src_conn_rate.seconds), .cb = nlattr_get_uint32 }, + { .type = PF_RT_DNPIPE, .off = _OUT(dnpipe), .cb = nlattr_get_uint16 }, + { .type = PF_RT_DNRPIPE, .off = _OUT(dnrpipe), .cb = nlattr_get_uint16 }, + { .type = PF_RT_DNFLAGS, .off = _OUT(free_flags), .cb = nlattr_get_uint32 }, + { .type = PF_RT_NR, .off = _OUT(nr), .cb = nlattr_get_uint32 }, + { .type = PF_RT_PROB, .off = _OUT(prob), .cb = nlattr_get_uint32 }, + { .type = PF_RT_CUID, .off = _OUT(cuid), .cb = nlattr_get_uint32 }, + {. type = PF_RT_CPID, .off = _OUT(cpid), .cb = nlattr_get_uint32 }, + { .type = PF_RT_RETURN_ICMP, .off = _OUT(return_icmp), .cb = nlattr_get_uint16 }, + { .type = PF_RT_RETURN_ICMP6, .off = _OUT(return_icmp6), .cb = nlattr_get_uint16 }, + { .type = PF_RT_MAX_MSS, .off = _OUT(max_mss), .cb = nlattr_get_uint16 }, + { .type = PF_RT_SCRUB_FLAGS, .off = _OUT(scrub_flags), .cb = nlattr_get_uint16 }, + { .type = PF_RT_UID, .off = _OUT(uid), .arg = &rule_uid_parser, .cb = nlattr_get_nested }, + { .type = PF_RT_GID, .off = _OUT(gid), .arg = &rule_uid_parser, .cb = nlattr_get_nested }, + { .type = PF_RT_RULE_FLAG, .off = _OUT(rule_flag), .cb = nlattr_get_uint32 }, + { .type = PF_RT_ACTION, .off = _OUT(action), .cb = nlattr_get_uint8 }, + { .type = PF_RT_DIRECTION, .off = _OUT(direction), .cb = nlattr_get_uint8 }, + { .type = PF_RT_LOG, .off = _OUT(log), .cb = nlattr_get_uint8 }, + { .type = PF_RT_LOGIF, .off = _OUT(logif), .cb = nlattr_get_uint8 }, + { .type = PF_RT_QUICK, .off = _OUT(quick), .cb = nlattr_get_uint8 }, + { .type = PF_RT_IF_NOT, .off = _OUT(ifnot), .cb = nlattr_get_uint8 }, + { .type = PF_RT_MATCH_TAG_NOT, .off = _OUT(match_tag_not), .cb = nlattr_get_uint8 }, + { .type = PF_RT_NATPASS, .off = _OUT(natpass), .cb = nlattr_get_uint8 }, + { .type = PF_RT_KEEP_STATE, .off = _OUT(keep_state), .cb = nlattr_get_uint8 }, + { .type = PF_RT_AF, .off = _OUT(af), .cb = nlattr_get_uint8 }, + { .type = PF_RT_PROTO, .off = _OUT(proto), .cb = nlattr_get_uint8 }, + { .type = PF_RT_TYPE, .off = _OUT(type), .cb = nlattr_get_uint8 }, + { .type = PF_RT_CODE, .off = _OUT(code), .cb = nlattr_get_uint8 }, + { .type = PF_RT_FLAGS, .off = _OUT(flags), .cb = nlattr_get_uint8 }, + { .type = PF_RT_FLAGSET, .off = _OUT(flagset), .cb = nlattr_get_uint8 }, + { .type = PF_RT_MIN_TTL, .off = _OUT(min_ttl), .cb = nlattr_get_uint8 }, + { .type = PF_RT_ALLOW_OPTS, .off = _OUT(allow_opts), .cb = nlattr_get_uint8 }, + { .type = PF_RT_RT, .off = _OUT(rt), .cb = nlattr_get_uint8 }, + { .type = PF_RT_RETURN_TTL, .off = _OUT(return_ttl), .cb = nlattr_get_uint8 }, + { .type = PF_RT_TOS, .off = _OUT(tos), .cb = nlattr_get_uint8 }, + { .type = PF_RT_SET_TOS, .off = _OUT(set_tos), .cb = nlattr_get_uint8 }, + { .type = PF_RT_ANCHOR_RELATIVE, .off = _OUT(anchor_relative), .cb = nlattr_get_uint8 }, + { .type = PF_RT_ANCHOR_WILDCARD, .off = _OUT(anchor_wildcard), .cb = nlattr_get_uint8 }, + { .type = PF_RT_FLUSH, .off = _OUT(flush), .cb = nlattr_get_uint8 }, + { .type = PF_RT_PRIO, .off = _OUT(prio), .cb = nlattr_get_uint8 }, + { .type = PF_RT_SET_PRIO, .off = _OUT(set_prio[0]), .cb = nlattr_get_uint8 }, + { .type = PF_RT_SET_PRIO_REPLY, .off = _OUT(set_prio[1]), .cb = nlattr_get_uint8 }, + { .type = PF_RT_DIVERT_ADDRESS, .off = _OUT(divert.addr), .cb = nlattr_get_in6_addr }, + { .type = PF_RT_DIVERT_PORT, .off = _OUT(divert.port), .cb = nlattr_get_uint16 }, +}; +NL_DECLARE_ATTR_PARSER(rule_parser, nla_p_rule); +#undef _OUT +struct nl_parsed_addrule { + struct pf_krule *rule; + uint32_t ticket; + uint32_t pool_ticket; + char *anchor; + char *anchor_call; +}; +#define _IN(_field) offsetof(struct genlmsghdr, _field) +#define _OUT(_field) offsetof(struct nl_parsed_addrule, _field) +static const struct nlattr_parser nla_p_addrule[] = { + { .type = PF_ART_TICKET, .off = _OUT(ticket), .cb = nlattr_get_uint32 }, + { .type = PF_ART_POOL_TICKET, .off = _OUT(pool_ticket), .cb = nlattr_get_uint32 }, + { .type = PF_ART_ANCHOR, .off = _OUT(anchor), .cb = nlattr_get_string }, + { .type = PF_ART_ANCHOR_CALL, .off = _OUT(anchor_call), .cb = nlattr_get_string }, + { .type = PF_ART_RULE, .off = _OUT(rule), .arg = &rule_parser, .cb = nlattr_get_nested_ptr } +}; +static const struct nlfield_parser nlf_p_addrule[] = { +}; +#undef _IN +#undef _OUT +NL_DECLARE_PARSER(addrule_parser, struct genlmsghdr, nlf_p_addrule, nla_p_addrule); + +static int +pf_handle_addrule(struct nlmsghdr *hdr, struct nl_pstate *npt) +{ + int error; + struct nl_parsed_addrule attrs = {}; + + attrs.rule = pf_krule_alloc(); + + error = nl_parse_nlmsg(hdr, &addrule_parser, npt, &attrs); + if (error != 0) + return (error); + + error = pf_ioctl_addrule(attrs.rule, attrs.ticket, attrs.pool_ticket, + attrs.anchor, attrs.anchor_call, nlp_get_cred(npt->nlp)->cr_uid, + hdr->nlmsg_pid); + + if (error != 0) + pf_krule_free(attrs.rule); + + return (error); +} + +static const struct nlhdr_parser *all_parsers[] = { &state_parser, &addrule_parser }; static int family_id; @@ -377,12 +635,20 @@ static const struct genl_cmd pf_cmds[] = { .cmd_cb = pf_handle_stop, .cmd_flags = GENL_CMD_CAP_DO | GENL_CMD_CAP_HASPOL, }, + { + .cmd_num = PFNL_CMD_ADDRULE, + .cmd_name = "ADDRULE", + .cmd_cb = pf_handle_addrule, + .cmd_flags = GENL_CMD_CAP_DO | GENL_CMD_CAP_DUMP | GENL_CMD_CAP_HASPOL, + }, + }; void pf_nl_register(void) { NL_VERIFY_PARSERS(all_parsers); + family_id = genl_register_family(PFNL_FAMILY_NAME, 0, 2, PFNL_CMD_MAX); genl_register_cmds(PFNL_FAMILY_NAME, pf_cmds, NL_ARRAY_LEN(pf_cmds)); } diff --git a/sys/netpfil/pf/pf_nl.h b/sys/netpfil/pf/pf_nl.h index 3c8c6d3b8ed4..d936044c0d7d 100644 --- a/sys/netpfil/pf/pf_nl.h +++ b/sys/netpfil/pf/pf_nl.h @@ -40,6 +40,7 @@ enum { PFNL_CMD_GETCREATORS = 2, PFNL_CMD_START = 3, PFNL_CMD_STOP = 4, + PFNL_CMD_ADDRULE = 5, __PFNL_CMD_MAX, }; #define PFNL_CMD_MAX (__PFNL_CMD_MAX -1) @@ -98,6 +99,137 @@ enum pfstate_type_t { PF_ST_VERSION = 28, /* u64 */ }; +enum pf_addr_type_t { + PF_AT_UNSPEC, + PF_AT_ADDR = 1, /* in6_addr */ + PF_AT_MASK = 2, /* in6_addr */ + PF_AT_IFNAME = 3, /* string */ + PF_AT_TABLENAME = 4, /* string */ + PF_AT_TYPE = 5, /* u8 */ + PF_AT_IFLAGS = 6, /* u8 */ +}; + +enum pfrule_addr_type_t { + PF_RAT_UNSPEC, + PF_RAT_ADDR = 1, /* nested, pf_addr_type_t */ + PF_RAT_SRC_PORT = 2, /* u16 */ + PF_RAT_DST_PORT = 3, /* u16 */ + PF_RAT_NEG = 4, /* u8 */ + PF_RAT_OP = 5, /* u8 */ +}; + +enum pf_labels_type_t { + PF_LT_UNSPEC, + PF_LT_LABEL = 1, /* string */ +}; + +enum pf_mape_portset_type_t +{ + PF_MET_UNSPEC, + PF_MET_OFFSET = 1, /* u8 */ + PF_MET_PSID_LEN = 2, /* u8 */ + PF_MET_PSID = 3, /* u16 */ +}; + +enum pf_rpool_type_t +{ + PF_PT_UNSPEC, + PF_PT_KEY = 1, /* bytes, sizeof(struct pf_poolhashkey) */ + PF_PT_COUNTER = 2, /* in6_addr */ + PF_PT_TBLIDX = 3, /* u32 */ + PF_PT_PROXY_SRC_PORT = 4, /* u16 */ + PF_PT_PROXY_DST_PORT = 5, /* u16 */ + PF_PT_OPTS = 6, /* u8 */ + PF_PT_MAPE = 7, /* nested, pf_mape_portset_type_t */ +}; + +enum pf_timeout_type_t { + PF_TT_UNSPEC, + PF_TT_TIMEOUT = 1, /* u32 */ +}; + +enum pf_rule_uid_type_t { + PF_RUT_UNSPEC, + PF_RUT_UID_LOW = 1, /* u32 */ + PF_RUT_UID_HIGH = 2, /* u32 */ + PF_RUT_OP = 3, /* u8 */ +}; + +enum pf_rule_type_t { + PF_RT_UNSPEC, + PF_RT_SRC = 1, /* nested, pf_rule_addr_type_t */ + PF_RT_DST = 2, /* nested, pf_rule_addr_type_t */ + PF_RT_RIDENTIFIER = 3, /* u32 */ + PF_RT_LABELS = 4, /* nested, pf_labels_type_t */ + PF_RT_IFNAME = 5, /* string */ + PF_RT_QNAME = 6, /* string */ + PF_RT_PQNAME = 7, /* string */ + PF_RT_TAGNAME = 8, /* string */ + PF_RT_MATCH_TAGNAME = 9, /* string */ + PF_RT_OVERLOAD_TBLNAME = 10, /* string */ + PF_RT_RPOOL = 11, /* nested, pf_rpool_type_t */ + PF_RT_OS_FINGERPRINT = 12, /* u32 */ + PF_RT_RTABLEID = 13, /* u32 */ + PF_RT_TIMEOUT = 14, /* nested, pf_timeout_type_t */ + PF_RT_MAX_STATES = 15, /* u32 */ + PF_RT_MAX_SRC_NODES = 16, /* u32 */ + PF_RT_MAX_SRC_STATES = 17, /* u32 */ + PF_RT_MAX_SRC_CONN_RATE_LIMIT = 18, /* u32 */ + PF_RT_MAX_SRC_CONN_RATE_SECS = 19, /* u32 */ + PF_RT_DNPIPE = 20, /* u16 */ + PF_RT_DNRPIPE = 21, /* u16 */ + PF_RT_DNFLAGS = 22, /* u32 */ + PF_RT_NR = 23, /* u32 */ + PF_RT_PROB = 24, /* u32 */ + PF_RT_CUID = 25, /* u32 */ + PF_RT_CPID = 26, /* u32 */ + PF_RT_RETURN_ICMP = 27, /* u16 */ + PF_RT_RETURN_ICMP6 = 28, /* u16 */ + PF_RT_MAX_MSS = 29, /* u16 */ + PF_RT_SCRUB_FLAGS = 30, /* u16 */ + PF_RT_UID = 31, /* nested, pf_rule_uid_type_t */ + PF_RT_GID = 32, /* nested, pf_rule_uid_type_t */ + PF_RT_RULE_FLAG = 33, /* u32 */ + PF_RT_ACTION = 34, /* u8 */ + PF_RT_DIRECTION = 35, /* u8 */ + PF_RT_LOG = 36, /* u8 */ + PF_RT_LOGIF = 37, /* u8 */ + PF_RT_QUICK = 38, /* u8 */ + PF_RT_IF_NOT = 39, /* u8 */ + PF_RT_MATCH_TAG_NOT = 40, /* u8 */ + PF_RT_NATPASS = 41, /* u8 */ + PF_RT_KEEP_STATE = 42, /* u8 */ + PF_RT_AF = 43, /* u8 */ + PF_RT_PROTO = 44, /* u8 */ + PF_RT_TYPE = 45, /* u8 */ + PF_RT_CODE = 46, /* u8 */ + PF_RT_FLAGS = 47, /* u8 */ + PF_RT_FLAGSET = 48, /* u8 */ + PF_RT_MIN_TTL = 49, /* u8 */ + PF_RT_ALLOW_OPTS = 50, /* u8 */ + PF_RT_RT = 51, /* u8 */ + PF_RT_RETURN_TTL = 52, /* u8 */ + PF_RT_TOS = 53, /* u8 */ + PF_RT_SET_TOS = 54, /* u8 */ + PF_RT_ANCHOR_RELATIVE = 55, /* u8 */ + PF_RT_ANCHOR_WILDCARD = 56, /* u8 */ + PF_RT_FLUSH = 57, /* u8 */ + PF_RT_PRIO = 58, /* u8 */ + PF_RT_SET_PRIO = 59, /* u8 */ + PF_RT_SET_PRIO_REPLY = 60, /* u8 */ + PF_RT_DIVERT_ADDRESS = 61, /* in6_addr */ + PF_RT_DIVERT_PORT = 62, /* u16 */ +}; + +enum pf_addrule_type_t { + PF_ART_UNSPEC, + PF_ART_TICKET = 1, /* u32 */ + PF_ART_POOL_TICKET = 2, /* u32 */ + PF_ART_ANCHOR = 3, /* string */ + PF_ART_ANCHOR_CALL = 4, /* string */ + PF_ART_RULE = 5, /* nested, pfrule_type_t */ +}; + #ifdef _KERNEL void pf_nl_register(void); From nobody Mon Oct 23 15:10:34 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SDdt26nsHz4y9MV; Mon, 23 Oct 2023 15:10: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 4SDdt25gRfz4JDd; Mon, 23 Oct 2023 15:10:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698073834; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+OUWRbRge+LMIFOXlfkXbuHftg/uNRU6/KEujOeS4c0=; b=I+BYPoQuBICEvoP3Gaxu3UyHmX57Kwa92BqelaJI6Igqe80hPBu/nz3oRZTecy9jIBvXpl vgD83bN98eC2B3K2culVoWxoJMIUK4szJkcT9xxC3ehEMdFzwrxX9uGmzk+qVDt56vMPDn CzYDuM85g997w1AwagztmJlZHdGZCNEJdverR6twyniUQ2RYG0GEElSG0B7B41AXfjLoMd fbW5XbtCG/qWzhJm0jWsSu9a18CrLbEosDvScXGByPPNmJpV68CwFCEMshFQg9UF6ek9zA vg5wJN2DwbeCmPwDZB88eYhP5u544ifHwvH/ZgMeoZK1jYkMM8T7IpSg8CNj4g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698073834; a=rsa-sha256; cv=none; b=USDZ8SIEbESD9rt2wmupaS1kz/X/3zmQq+qLfCeVcWOElzJ+WWViOrdW5+RDR1p9mpU2tB COAncA9N9mJ3dD7CEZSjlIpY4gz7JAav9jD2iaLcAMKlH9l6rfSSMIT9bP6nsyaVWMLLa5 f4H0DHTR4cS5deb2VELOjUcGY8QjddsSZ6ur5rHcOltjilCbGXmb7G7v1jlQawv6Vg2YWz gqqMLoOmqIvWWyYEjXOU1OfDJNCQ3yelkhz7ff9T5jWI0il0ur7loQ/Pt53gteaHz8Xo7k +nu+iO/IxAXj6EcGwxrjtt1/UwZHByGsZJOrRAlmIkUt4ao+ha+9VvBhZe9lGQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698073834; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+OUWRbRge+LMIFOXlfkXbuHftg/uNRU6/KEujOeS4c0=; b=WjGwrHYcYaAFScjhMCNAQnxHGF4+1GdMEdR55uLs+My7rwmqBq8Unsvs0VzcSPAJmWhS4E qkBSmghDAy5SYmLPafJlg7FGF7qUiPueoA9FdLWSc+bFPQHVLYfCWDSZqWKaKQmkeaywzM +MFjREVjKcbFVDDs/S6DmbRrXFQvOjbtzwcw6SNTxQBl9RtkFqjXEVL41/F2fM5qh10Sa9 O3KEEMQuBscdb7cmvDfUM+nvmzFv/ytXyX73r0PCUpn9jWw2sEkJ3HIQVsEZAh4JOpXI46 2/SctXtyz08ksECPktEV9qcnmdPCyMu7epJgEZE0dMRhfX2Wk/3q+rsiL09xFg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SDdt24jbnzl1j; Mon, 23 Oct 2023 15:10: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 39NFAYBF038527; Mon, 23 Oct 2023 15:10:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39NFAYcE038524; Mon, 23 Oct 2023 15:10:34 GMT (envelope-from git) Date: Mon, 23 Oct 2023 15:10:34 GMT Message-Id: <202310231510.39NFAYcE038524@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: 044eef6ab9cf - main - pf: support basic filters for state listing List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 044eef6ab9cf1730d21c5f5dffebb0cd35fb5bbf Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=044eef6ab9cf1730d21c5f5dffebb0cd35fb5bbf commit 044eef6ab9cf1730d21c5f5dffebb0cd35fb5bbf Author: Kristof Provost AuthorDate: 2023-10-16 14:47:22 +0000 Commit: Kristof Provost CommitDate: 2023-10-23 14:24:52 +0000 pf: support basic filters for state listing Allow users(pace) to specify a protocol, interface, address family and/ or address and mask, allowing the state listing to be pre-filtered in the kernel. Sponsored by: Rubicon Communications, LLC ("Netgate") Differential Revision: https://reviews.freebsd.org/D42280 --- lib/libpfctl/libpfctl.c | 18 ++++++++++++++++-- lib/libpfctl/libpfctl.h | 9 +++++++++ sbin/pfctl/pfctl.c | 9 +++++---- sys/netpfil/pf/pf_nl.c | 43 ++++++++++++++++++++++++++++++++++++++----- sys/netpfil/pf/pf_nl.h | 2 ++ 5 files changed, 70 insertions(+), 11 deletions(-) diff --git a/lib/libpfctl/libpfctl.c b/lib/libpfctl/libpfctl.c index 3865dc85aea1..25bb77d9c021 100644 --- a/lib/libpfctl/libpfctl.c +++ b/lib/libpfctl/libpfctl.c @@ -1342,7 +1342,7 @@ static const struct snl_hdr_parser *all_parsers[] = { }; static int -pfctl_get_states_nl(struct snl_state *ss, pfctl_get_state_fn f, void *arg) +pfctl_get_states_nl(struct pfctl_state_filter *filter, struct snl_state *ss, pfctl_get_state_fn f, void *arg) { SNL_VERIFY_PARSERS(all_parsers); int family_id = snl_get_genl_family(ss, PFNL_FAMILY_NAME); @@ -1354,7 +1354,14 @@ pfctl_get_states_nl(struct snl_state *ss, pfctl_get_state_fn f, void *arg) snl_init_writer(ss, &nw); hdr = snl_create_genl_msg_request(&nw, family_id, PFNL_CMD_GETSTATES); hdr->nlmsg_flags |= NLM_F_DUMP; + snl_add_msg_attr_string(&nw, PF_ST_IFNAME, filter->ifname); + snl_add_msg_attr_u16(&nw, PF_ST_PROTO, filter->proto); + snl_add_msg_attr_u8(&nw, PF_ST_AF, filter->af); + snl_add_msg_attr_ip6(&nw, PF_ST_FILTER_ADDR, &filter->addr.v6); + snl_add_msg_attr_ip6(&nw, PF_ST_FILTER_MASK, &filter->mask.v6); + hdr = snl_finalize_msg(&nw); + uint32_t seq_id = hdr->nlmsg_seq; snl_send_message(ss, hdr); @@ -1379,12 +1386,19 @@ pfctl_get_states_nl(struct snl_state *ss, pfctl_get_state_fn f, void *arg) int pfctl_get_states_iter(pfctl_get_state_fn f, void *arg) +{ + struct pfctl_state_filter filter = {}; + return (pfctl_get_filtered_states_iter(&filter, f, arg)); +} + +int +pfctl_get_filtered_states_iter(struct pfctl_state_filter *filter, pfctl_get_state_fn f, void *arg) { struct snl_state ss = {}; int error; snl_init(&ss, NETLINK_GENERIC); - error = pfctl_get_states_nl(&ss, f, arg); + error = pfctl_get_states_nl(filter, &ss, f, arg); snl_free(&ss); return (error); diff --git a/lib/libpfctl/libpfctl.h b/lib/libpfctl/libpfctl.h index 06cd25e82c08..ad6fde89771c 100644 --- a/lib/libpfctl/libpfctl.h +++ b/lib/libpfctl/libpfctl.h @@ -415,8 +415,17 @@ int pfctl_add_rule(int dev, const struct pfctl_rule *r, uint32_t pool_ticket); int pfctl_set_keepcounters(int dev, bool keep); int pfctl_get_creatorids(uint32_t *creators, size_t *len); + +struct pfctl_state_filter { + char ifname[IFNAMSIZ]; + uint16_t proto; + sa_family_t af; + struct pf_addr addr; + struct pf_addr mask; +}; typedef int (*pfctl_get_state_fn)(struct pfctl_state *, void *); int pfctl_get_states_iter(pfctl_get_state_fn f, void *arg); +int pfctl_get_filtered_states_iter(struct pfctl_state_filter *filter, pfctl_get_state_fn f, void *arg); int pfctl_get_states(int dev, struct pfctl_states *states); void pfctl_free_states(struct pfctl_states *states); int pfctl_clear_states(int dev, const struct pfctl_kill *kill, diff --git a/sbin/pfctl/pfctl.c b/sbin/pfctl/pfctl.c index 56b1d28c6fd6..c3f3d82ff767 100644 --- a/sbin/pfctl/pfctl.c +++ b/sbin/pfctl/pfctl.c @@ -1529,9 +1529,6 @@ pfctl_show_state(struct pfctl_state *s, void *arg) { struct pfctl_show_state_arg *a = (struct pfctl_show_state_arg *)arg; - if (a->iface != NULL && strcmp(s->ifname, a->iface)) - return (0); - if (a->dotitle) { pfctl_print_title("STATES:"); a->dotitle = 0; @@ -1545,12 +1542,16 @@ int pfctl_show_states(int dev, const char *iface, int opts) { struct pfctl_show_state_arg arg; + struct pfctl_state_filter filter = {}; + + if (iface != NULL) + strncpy(filter.ifname, iface, IFNAMSIZ); arg.opts = opts; arg.dotitle = opts & PF_OPT_SHOWALL; arg.iface = iface; - if (pfctl_get_states_iter(pfctl_show_state, &arg)) + if (pfctl_get_filtered_states_iter(&filter, pfctl_show_state, &arg)) return (-1); return (0); diff --git a/sys/netpfil/pf/pf_nl.c b/sys/netpfil/pf/pf_nl.c index d5d294134b1f..53ff5d031ed6 100644 --- a/sys/netpfil/pf/pf_nl.c +++ b/sys/netpfil/pf/pf_nl.c @@ -52,6 +52,11 @@ struct nl_parsed_state { uint8_t version; uint32_t id; uint32_t creatorid; + char ifname[IFNAMSIZ]; + uint16_t proto; + sa_family_t af; + struct pf_addr addr; + struct pf_addr mask; }; #define _IN(_field) offsetof(struct genlmsghdr, _field) @@ -59,6 +64,11 @@ struct nl_parsed_state { static const struct nlattr_parser nla_p_state[] = { { .type = PF_ST_ID, .off = _OUT(id), .cb = nlattr_get_uint32 }, { .type = PF_ST_CREATORID, .off = _OUT(creatorid), .cb = nlattr_get_uint32 }, + { .type = PF_ST_IFNAME, .arg = (const void *)IFNAMSIZ, .off = _OUT(ifname), .cb = nlattr_get_chara }, + { .type = PF_ST_AF, .off = _OUT(proto), .cb = nlattr_get_uint8 }, + { .type = PF_ST_PROTO, .off = _OUT(proto), .cb = nlattr_get_uint16 }, + { .type = PF_ST_FILTER_ADDR, .off = _OUT(addr), .cb = nlattr_get_in6_addr }, + { .type = PF_ST_FILTER_MASK, .off = _OUT(mask), .cb = nlattr_get_in6_addr }, }; static const struct nlfield_parser nlf_p_generic[] = { { .off_in = _IN(version), .off_out = _OUT(version), .cb = nlf_get_u8 }, @@ -217,11 +227,34 @@ handle_dumpstates(struct nlpcb *nlp, struct nl_parsed_state *attrs, PF_HASHROW_LOCK(ih); LIST_FOREACH(s, &ih->states, entry) { - if (s->timeout != PFTM_UNLINKED) { - error = dump_state(nlp, hdr, s, npt); - if (error != 0) - break; - } + sa_family_t af = s->key[PF_SK_WIRE]->af; + + if (s->timeout == PFTM_UNLINKED) + continue; + + /* Filter */ + if (attrs->creatorid != 0 && s->creatorid != attrs->creatorid) + continue; + if (attrs->ifname[0] != 0 && + strncmp(attrs->ifname, s->kif->pfik_name, IFNAMSIZ) != 0) + continue; + if (attrs->proto != 0 && s->key[PF_SK_WIRE]->proto != attrs->proto) + continue; + if (attrs->af != 0 && af != attrs->af) + continue; + if (pf_match_addr(1, &s->key[PF_SK_WIRE]->addr[0], + &attrs->mask, &attrs->addr, af) && + pf_match_addr(1, &s->key[PF_SK_WIRE]->addr[1], + &attrs->mask, &attrs->addr, af) && + pf_match_addr(1, &s->key[PF_SK_STACK]->addr[0], + &attrs->mask, &attrs->addr, af) && + pf_match_addr(1, &s->key[PF_SK_STACK]->addr[1], + &attrs->mask, &attrs->addr, af)) + continue; + + error = dump_state(nlp, hdr, s, npt); + if (error != 0) + break; } PF_HASHROW_UNLOCK(ih); } diff --git a/sys/netpfil/pf/pf_nl.h b/sys/netpfil/pf/pf_nl.h index d936044c0d7d..8265ae1d1bfa 100644 --- a/sys/netpfil/pf/pf_nl.h +++ b/sys/netpfil/pf/pf_nl.h @@ -97,6 +97,8 @@ enum pfstate_type_t { PF_ST_SYNC_FLAGS = 26, /* u8 */ PF_ST_UPDATES = 27, /* u8 */ PF_ST_VERSION = 28, /* u64 */ + PF_ST_FILTER_ADDR = 29, /* in6_addr */ + PF_ST_FILTER_MASK = 30, /* in6_addr */ }; enum pf_addr_type_t { From nobody Mon Oct 23 15:17:58 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SDf2Z2tBgz4yB27; Mon, 23 Oct 2023 15:17:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SDf2Z2Lvcz4LWQ; Mon, 23 Oct 2023 15:17:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698074278; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+4AOPH3rGhSK2/8zGSz4wsZ6zf337A7nmpKd1bMRXXg=; b=aJcBbiP0URw4aHZtgrsFmuYRlj+eIZOFhvSvYN0k0ZmvCtak6PVvdfvUaB/Tu8B67H0Qw6 ia5L9ZQXTZdQLjNrFNC7aHL0NIJ2TYnjDA6HNft1eXBq+QAWIQFuohyyhvTc1F3BIGLUJ1 FZYSkM+7RXiliE93RYqy5rS+A0C8V9RFggBxGuSk/+o8XLKoTZ2+ivKquBhjEsD8BGjsHY 7h0isnFbfBOxVvX73frQwnaJnq0NbwTkV49Eh4DltQU8Aj9Sujz9lxpA9GiuDZfhc/BpbN +MGqVaRRo6XUevQ6h8BJOxVFEcUe/oYrv2WwZa5YxudLIdV/qKrEex4hqeFuag== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698074278; a=rsa-sha256; cv=none; b=ggm0wo8v4pu7Os0cwCYngLRELaTNs1u2qjo1rKDXoOSzfGiqUTTTfsOiFs5ZJeGzdojYoK NcJLoHIhZP8xsVDXKcuHQRKWRbLb7UZ7UboDluY5NOwdxzxy0EDjrdCqRSSI3wMnK/lqh5 yL1s8qd1jnoGPs5FAFyhsaiJHZSc0zPLTNc3q3YQ2J7BXwSDsqzW58IGtWgcxSquXElKev N9fUH/J/d/Nf3EGfOzszvLhgdD6MaeVPQ5KSf6rI10/v6zYGRSOOcEcdHwObUX0kaA6wNY rZ8Wocc/M+RtPWkysqpngBlzWqQOCNE+WVvE7npie2dN1jyyVVdH5DViZQVAcA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698074278; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+4AOPH3rGhSK2/8zGSz4wsZ6zf337A7nmpKd1bMRXXg=; b=Rok6AitZy22AXnB1G4PWmx0fHhfo2m1K4cJ1zrYyxNularZ53aJvN2y4DJV+BH5CU5afGz wZScD/2MrL3zWuN2GDI7gtyH9/TCegZu5Y/yIQ0bkPmz0OQVuMY01g1SYQHtKFW7V+IzKc ++dbPzcYXuLjcUtmQUZqvRM0W3TAbOdyKWj2YEbFNswlJpUiTKlzqwcW6TXpo7xoW08Uoz 2+u3tU96+PaSQ5SMF4gYggY6GR64uTCotNej/CnLl3WieAnNRFpi2jVdufSFvzTXcwEq5W bavqNrTQJFPBzBZ5UmFjntLdF883wzdLWm+GVtp2eAfvvlWgu215CvpVD1I7PQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SDf2Z1QSVzkvD; Mon, 23 Oct 2023 15:17: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 39NFHw2m046015; Mon, 23 Oct 2023 15:17:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39NFHwGp046012; Mon, 23 Oct 2023 15:17:58 GMT (envelope-from git) Date: Mon, 23 Oct 2023 15:17:58 GMT Message-Id: <202310231517.39NFHwGp046012@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: 3115538908e9 - main - boot/zfs: Add some fields to dsl_dir_phys_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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 3115538908e9344f4c881d5f6d5182e16bcd4e7b Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=3115538908e9344f4c881d5f6d5182e16bcd4e7b commit 3115538908e9344f4c881d5f6d5182e16bcd4e7b Author: Mark Johnston AuthorDate: 2023-10-23 15:05:50 +0000 Commit: Mark Johnston CommitDate: 2023-10-23 15:12:14 +0000 boot/zfs: Add some fields to dsl_dir_phys_t Most of the first block of pad bytes are now used for space accounting purposes. No functional change intended. MFC after: 1 week Sponsored by: The FreeBSD Foundation --- sys/cddl/boot/zfs/zfsimpl.h | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/sys/cddl/boot/zfs/zfsimpl.h b/sys/cddl/boot/zfs/zfsimpl.h index 843565607a49..fcaf407bcb75 100644 --- a/sys/cddl/boot/zfs/zfsimpl.h +++ b/sys/cddl/boot/zfs/zfsimpl.h @@ -1406,6 +1406,17 @@ typedef enum { #define SM2_RUN_MAX SM2_RUN_DECODE(~0ULL) #define SM2_OFFSET_MAX SM2_OFFSET_DECODE(~0ULL) +typedef enum dd_used { + DD_USED_HEAD, + DD_USED_SNAP, + DD_USED_CHILD, + DD_USED_CHILD_RSRV, + DD_USED_REFRSRV, + DD_USED_NUM +} dd_used_t; + +#define DD_FLAG_USED_BREAKDOWN (1 << 0) + typedef struct dsl_dir_phys { uint64_t dd_creation_time; /* not actually used */ uint64_t dd_head_dataset_obj; @@ -1424,7 +1435,9 @@ typedef struct dsl_dir_phys { /* Administrative reservation setting */ uint64_t dd_reserved; uint64_t dd_props_zapobj; - uint64_t dd_pad[7]; + uint64_t dd_pad[1]; + uint64_t dd_flags; + uint64_t dd_used_breakdown[DD_USED_NUM]; uint64_t dd_clones; uint64_t dd_pad1[13]; /* pad out to 256 bytes for good measure */ } dsl_dir_phys_t; From nobody Mon Oct 23 15:17:59 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SDf2b4WNdz4yB2B; Mon, 23 Oct 2023 15:17: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 4SDf2b3ck2z4LJn; Mon, 23 Oct 2023 15:17:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698074279; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Rdenbc3yS8Zu09S4PDopni5zKXVQmly9l4LoxQksnQA=; b=ZnjiOSWUsjt7EbpTXmFjpTHDj4OnepfG+2FaKp2Ju6zRpyYYOgOUwGkTIaDyW86nPxqu35 bZtD0UJQf9BsrwEpx2YIeo44ePfo7RzbQIhHfPI+NpgWfrfxay2jQ5iqOg2gygIRadWV0S UJhvNwLmwbD+MOYdDufZBY3mBUtqa5sodDrPomes4qbbpHA5nREwMgs6TUn9f5XmiP4Kcg d++uKhl4VPpJkdd4c4g80u2vdpUBRfsMUwUilRExUmMhA5FrGTsH/lo6i4i14j1/G80eoz 4p80UsjPIyf+iFJXV6lcqG+ciy9Z057jJFgSVYuBqYFxe+GzH8IH2/x0UpT1Jw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698074279; a=rsa-sha256; cv=none; b=BUpTo4oVc9Nd54sQlskVuHYwYP1L5UPpHnCFl5nkL7vAixXqxoiAiIF1eufiwk1b4XvC47 qQQImaCh/Xnr/EC25lkW6kl3fdmA9/YvsF5HMtQm9w3wiQxigB9Ea9qBNbxcvbtotpTmML jit0UqWHalD/o5qYnFl5j6tdUm9cROJC+19hjD1IacDJeAl7C/GvchibmYY+Rn2SIjsqu0 gE10el6s16e+xtfD+tF/bMIsvXwuAw2OaqyIlyY79IdBTpCYjlojjcb1IvAx+L4nyj/108 UiyKqABKgXqIr1iGkY1ekog3eaDfcNaNtqRlaqloCLeAFMge58KJarwM/J0wtQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698074279; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Rdenbc3yS8Zu09S4PDopni5zKXVQmly9l4LoxQksnQA=; b=xnyU7LPc39pGU77hyU/5qweL/jnIDawCqjbtrsKthkcBKWELpurGXuYaYaQVP0SC3FYXYq bxNkzLV+aFZVTvNnabE0FBMU31/xN5/lbwLX91kxw1FKgHsc2Ksu7f2AwOfasxZYr0Tcr6 D5uSchYXIX0Vj8MK3t7qnTeUJfBfB6nwfeQCU+5bYfGbxTeFC78/n7cnAr1dFwx+sKruxR OALe/eClNTD1qbPVRXY2m32n8/ONpPYxYXN4pp+RX16+ulyViOGr+f/TjgunUexv+hwVwv oMU1jYfBIsb3Xfga2MvzE5RADB+b+tk7kmYeBHdtmFBh0U/J9fBnbQgfmV3tAQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SDf2b2dlYzl2y; Mon, 23 Oct 2023 15:17: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 39NFHxil046073; Mon, 23 Oct 2023 15:17:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39NFHxgt046070; Mon, 23 Oct 2023 15:17:59 GMT (envelope-from git) Date: Mon, 23 Oct 2023 15:17:59 GMT Message-Id: <202310231517.39NFHxgt046070@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: 96092bf9108c - main - makefs/zfs: Fill out dd_used_breakdown fields in DSL directories List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 96092bf9108c97b45d18fd26fbe91f2d1c7799b8 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=96092bf9108c97b45d18fd26fbe91f2d1c7799b8 commit 96092bf9108c97b45d18fd26fbe91f2d1c7799b8 Author: Mark Johnston AuthorDate: 2023-10-23 15:08:04 +0000 Commit: Mark Johnston CommitDate: 2023-10-23 15:12:14 +0000 makefs/zfs: Fill out dd_used_breakdown fields in DSL directories This is required for the "used", "usedds" and "usedchild" dataset properties to be displayed. PR: 274613 Reported by: Mike Tancsa MFC after: 1 week Sponsored by: The FreeBSD Foundation --- usr.sbin/makefs/zfs/dsl.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/usr.sbin/makefs/zfs/dsl.c b/usr.sbin/makefs/zfs/dsl.c index a9ab93a90c38..f7abebe2e245 100644 --- a/usr.sbin/makefs/zfs/dsl.c +++ b/usr.sbin/makefs/zfs/dsl.c @@ -482,7 +482,7 @@ dsl_dir_finalize(zfs_opt_t *zfs, zfs_dsl_dir_t *dir, void *arg __unused) dnode_phys_t *snapnames; zfs_dsl_dataset_t *headds; zfs_objset_t *os; - uint64_t bytes, snapnamesid; + uint64_t bytes, childbytes, snapnamesid; dsl_dir_finalize_props(dir); zap_write(zfs, dir->propszap); @@ -514,6 +514,7 @@ dsl_dir_finalize(zfs_opt_t *zfs, zfs_dsl_dir_t *dir, void *arg __unused) headds->phys->ds_uncompressed_bytes = bytes; headds->phys->ds_compressed_bytes = bytes; + childbytes = 0; STAILQ_FOREACH(cdir, &dir->children, next) { /* * The root directory needs a special case: the amount of @@ -523,9 +524,13 @@ dsl_dir_finalize(zfs_opt_t *zfs, zfs_dsl_dir_t *dir, void *arg __unused) */ if (dir == zfs->rootdsldir && cdir == zfs->mosdsldir) continue; - bytes += cdir->phys->dd_used_bytes; + childbytes += cdir->phys->dd_used_bytes; } - dsl_dir_size_add(dir, bytes); + dsl_dir_size_add(dir, bytes + childbytes); + + dir->phys->dd_flags |= DD_FLAG_USED_BREAKDOWN; + dir->phys->dd_used_breakdown[DD_USED_HEAD] = bytes; + dir->phys->dd_used_breakdown[DD_USED_CHILD] = childbytes; } void From nobody Mon Oct 23 15:18:00 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SDf2d0plNz4y9hx; Mon, 23 Oct 2023 15:18:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SDf2c4HP3z4LKB; Mon, 23 Oct 2023 15:18:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698074280; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OfFecCSat0Dswr3vLYIy7srEtdivr4gHH31DGqBvqKk=; b=UeMdCtaS6P6bkISdHLghIArtGFQeVn8fWbcjdX5grCmaq9HOh1YTf8T9WhW41l8HMhE8Up UDcEUH5w8gpmVvf5DxzztsjomMI7iYPZHAVXZKPR2/Dy03HOExH3Ttx+etBpXaSJvuWfG3 JCY2bQDj5C9BZ2SU+htmMkb7yPp+TRPf5rFbWnKyiM/NqI43clN8SSznnvhHoFhEiplaSd wYGQqRWQln4IFxEfdZI9ePespDImxZ1RXbPyJG+hJhZON8ISOYJKT0vULEztX/GrW+yHPW 4rSzR+7Q8q7zRnLvcHTB+Wbh5dO6ui4YDY0w2ozpj0EcWG8Vt14flZXlV+wfkw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698074280; a=rsa-sha256; cv=none; b=q4DP+fttDNK9z9yUfhiw6BtS2Fb3prOHLb4yp8hwnfqgEXJcQ4oSLmlTwCkuAFPNHQ5DyA dcqlpUcuezlvMG+6tYt3QuT1LsmQg9Enzudu9IROrTup4UYL8aB4+6YCcEHEZsbEA/w+ZT ZQ6zqTY3nG4Pjv87SW6WvM7nlmIPom/SejpFfuM9KZc4M9Zlmw04bB/Rn8V+q5oXjkYJI8 KTiLvKiTbfw6PF6F1fSeIYtHlw6qBXXECq49BNkx15H0z1peFYLVuRO8HypG1AqD7rl0yG slqAKI3nz+4zdEYrbD+rUMbL99VKyUpZWl+7VEjsiMdY6Qio2EYchGy9cHsbcg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698074280; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OfFecCSat0Dswr3vLYIy7srEtdivr4gHH31DGqBvqKk=; b=W5fkUdfONY8PsxEO4a9/sRNh4rqaRstgUBWXl1eU7VOPF0iAuuMWMFZ05o4vzgFrjqxSOW N0EBq2CqpyGWYjTV/k39e/VXMftjWOHoL5U2+9CZcY/kqOO5SSxFfGmJ4/Gc9/U3x+oxfZ TNVtKOdctvdJOr8BP41Tt41loHWhkE5fxxUfZ0qZWRVw60v1kISqpwT9Da3AifZhWvgGee lhVzh0QwV3tQT4bF9Xq9c0hdSHk6c2YMAeVEfoF3OJ6N94Egju3m+kTZE9xqXfGivlqDdN ASgk/+0aDdo7WCvLP7A+6yAa9Ylhq4flfR40MkZ0t1WkZUCe9jBrGjMN4ZpjrA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SDf2c3KcZzlDb; Mon, 23 Oct 2023 15:18:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39NFI0qP046137; Mon, 23 Oct 2023 15:18:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39NFI08m046134; Mon, 23 Oct 2023 15:18:00 GMT (envelope-from git) Date: Mon, 23 Oct 2023 15:18:00 GMT Message-Id: <202310231518.39NFI08m046134@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: 9f9d18d61e74 - main - makefs/zfs: Add a regression test which checks the 'used*' properties List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 9f9d18d61e74e2486d9dc0c0187eb72b02c66743 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=9f9d18d61e74e2486d9dc0c0187eb72b02c66743 commit 9f9d18d61e74e2486d9dc0c0187eb72b02c66743 Author: Mark Johnston AuthorDate: 2023-10-23 15:11:26 +0000 Commit: Mark Johnston CommitDate: 2023-10-23 15:15:00 +0000 makefs/zfs: Add a regression test which checks the 'used*' properties PR: 274613 MFC after: 1 week Sponsored by: The FreeBSD Foundation --- usr.sbin/makefs/tests/makefs_zfs_tests.sh | 73 ++++++++++++++++++++++++++++++- 1 file changed, 71 insertions(+), 2 deletions(-) diff --git a/usr.sbin/makefs/tests/makefs_zfs_tests.sh b/usr.sbin/makefs/tests/makefs_zfs_tests.sh index 9173600dc555..1811b1bc8a8c 100644 --- a/usr.sbin/makefs/tests/makefs_zfs_tests.sh +++ b/usr.sbin/makefs/tests/makefs_zfs_tests.sh @@ -1,7 +1,7 @@ #- # SPDX-License-Identifier: BSD-2-Clause # -# Copyright (c) 2022 The FreeBSD Foundation +# Copyright (c) 2022-2023 The FreeBSD Foundation # # This software was developed by Mark Johnston under sponsorship from # the FreeBSD Foundation. @@ -57,7 +57,7 @@ import_image() atf_check -e empty -o save:$TEST_MD_DEVICE_FILE -s exit:0 \ mdconfig -a -f $TEST_IMAGE atf_check -o ignore -e empty -s exit:0 \ - zdb -e -p /dev/$(cat $TEST_MD_DEVICE_FILE) -mmm -ddddd $ZFS_POOL_NAME + zdb -e -p /dev/$(cat $TEST_MD_DEVICE_FILE) -mmm -ddddd $ZFS_POOL_NAME atf_check zpool import -R $TEST_MOUNT_DIR $ZFS_POOL_NAME echo "$ZFS_POOL_NAME" > $TEST_ZFS_POOL_NAME } @@ -726,6 +726,74 @@ root_props_cleanup() common_cleanup } +# +# Verify that usedds and usedchild props are set properly. +# +atf_test_case used_space_props cleanup +used_space_props_body() +{ + local used usedds usedchild + local rootmb childmb totalmb fudge + local status + + create_test_dirs + cd $TEST_INPUTS_DIR + mkdir dir + + rootmb=17 + childmb=39 + totalmb=$(($rootmb + $childmb)) + fudge=$((2 * 1024 * 1024)) + + atf_check -e ignore dd if=/dev/random of=foo bs=1M count=$rootmb + atf_check -e ignore dd if=/dev/random of=dir/bar bs=1M count=$childmb + + cd - + + atf_check $MAKEFS -s 1g -o rootpath=/ -o poolname=$ZFS_POOL_NAME \ + -o fs=${ZFS_POOL_NAME}/dir \ + $TEST_IMAGE $TEST_INPUTS_DIR + + import_image + + # Make sure that each dataset's space usage is no more than 2MB larger + # than their files. This number is magic and might need to change + # someday. + usedds=$(zfs list -o usedds -Hp ${ZFS_POOL_NAME}) + atf_check test $usedds -gt $(($rootmb * 1024 * 1024)) -a \ + $usedds -le $(($rootmb * 1024 * 1024 + $fudge)) + usedds=$(zfs list -o usedds -Hp ${ZFS_POOL_NAME}/dir) + atf_check test $usedds -gt $(($childmb * 1024 * 1024)) -a \ + $usedds -le $(($childmb * 1024 * 1024 + $fudge)) + + # Make sure that the usedchild property value makes sense: the parent's + # value corresponds to the size of the child, and the child has no + # children. + usedchild=$(zfs list -o usedchild -Hp ${ZFS_POOL_NAME}) + atf_check test $usedchild -gt $(($childmb * 1024 * 1024)) -a \ + $usedchild -le $(($childmb * 1024 * 1024 + $fudge)) + atf_check -o inline:'0\n' \ + zfs list -Hp -o usedchild ${ZFS_POOL_NAME}/dir + + # Make sure that the used property value makes sense: the parent's + # value is the sum of the two sizes, and the child's value is the + # same as its usedds value, which has already been checked. + used=$(zfs list -o used -Hp ${ZFS_POOL_NAME}) + atf_check test $used -gt $(($totalmb * 1024 * 1024)) -a \ + $used -le $(($totalmb * 1024 * 1024 + 2 * $fudge)) + used=$(zfs list -o used -Hp ${ZFS_POOL_NAME}/dir) + atf_check -o inline:$used'\n' \ + zfs list -Hp -o usedds ${ZFS_POOL_NAME}/dir + + # Both datasets do not have snapshots. + atf_check -o inline:'0\n' zfs list -Hp -o usedsnap ${ZFS_POOL_NAME} + atf_check -o inline:'0\n' zfs list -Hp -o usedsnap ${ZFS_POOL_NAME}/dir +} +used_space_props_cleanup() +{ + common_cleanup +} + atf_init_test_cases() { atf_add_test_case autoexpand @@ -748,6 +816,7 @@ atf_init_test_cases() atf_add_test_case snapshot atf_add_test_case soft_links atf_add_test_case root_props + atf_add_test_case used_space_props # XXXMJ tests: # - test with different ashifts (at least, 9 and 12), different image sizes From nobody Mon Oct 23 16:29:40 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SDgdJ4MPjz4yFPx; Mon, 23 Oct 2023 16:29: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 4SDgdJ3kQvz4SHj; Mon, 23 Oct 2023 16:29:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698078580; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gbkA7qnL6AdVCvQHw1qYKuWlrCFfT+Ls9WJnCYYExAs=; b=AL7ECht3UkECuoYBZyy+2jbEUiJbXUr45yK6U5A4527M7uajk76Ppb81Beb9x3nvXGgJqR YXAPS8XbRkCJHv7zCcNczYxqTXlJTiSvUx24UNlJoO8HVfGoy/Zro2UUz2iviwMnm0u5pD MwJW51ZHRsDtRztszi/uux1I3ofzhdUyvsZk2BsdKbrOWhZf9hFvFxCYpAqz7JA2e/SOAT NcgHIs6ppngcYy8cR/qYnbWL9C3dwmUHaIPUeLLVp4vuSlluPZwzvFF1W5rX26/kMTLYYV 4VsYGCPpWwmJRuJ2LxD4ndUseAIr9GdjByrzYTmuYmikC5uFAqPaUKKi0HvMQw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698078580; a=rsa-sha256; cv=none; b=OBR/7mcTfUopSMuFv1HVvzghAtxxTlhbip2hSzukGvNGgPV4cL3dasjzLmVDF8A1LOcRoA E4SS43Vgo7RH0+QD6R1VUPmZhrSE8uHxJgBRM1CiVXxM4ylGuawxWnhD/L1Jz1gEFs4n8n Ygf3M/kcUg2mSF6bPpjRddWsJtxlyYv8euXRYCt7EeXnDpelkk8Ya2oyizOhLOk7ovJshW riU/cgmMNMr9Fuu7iwgaeX0kRdnHKhx1pSuxRYnbqMRUF6Ld+AZolKVUqiMXdo4Sdsrg5m 3MvzhGz0CbrFJTyoGrqvdjIH6cRhcdzTWXQAaG2VszilSyVce/smWYwQxO7ugA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698078580; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gbkA7qnL6AdVCvQHw1qYKuWlrCFfT+Ls9WJnCYYExAs=; b=nma5s++QiF2rVndvTN8A9oi7EMLc0T1d45+lyjHlufHBri9ch55Hk/OuYemmmqGiJc+/1w WBlj5ncV2IdpaU2dxw5jtIfo/FwJ3vyL9b2leDmS2rjYuvl6tGrfui1BVTj+nJq3s1XIwX 0BxHS+vg545OTdOsED7iTuFRntt6gVjG5Zw7wYNMzNtHbxiyZJy/aHrMqJfoXECs7VyElC Lo3IIuajkXhVI8LpSXBhm+NY8FbH6/TK34q5EBLdWuXMEON/d1b5lASHn0gH3YkCwSufgH TCA/IivH2tUkLNvXkSzBjgtMVZ+RdOdM08ORtBuTN97PSyByTmwq7E6apr8LvQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SDgdJ2hhfzn7d; Mon, 23 Oct 2023 16:29: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 39NGTeME063368; Mon, 23 Oct 2023 16:29:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39NGTeSr063365; Mon, 23 Oct 2023 16:29:40 GMT (envelope-from git) Date: Mon, 23 Oct 2023 16:29:40 GMT Message-Id: <202310231629.39NGTeSr063365@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: ef067b579954 - main - makefs/zfs: Update dd_used_breakdown after writing the MOS List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: ef067b579954c3c443b2a70566e24d94a7583d19 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=ef067b579954c3c443b2a70566e24d94a7583d19 commit ef067b579954c3c443b2a70566e24d94a7583d19 Author: Mark Johnston AuthorDate: 2023-10-23 16:25:20 +0000 Commit: Mark Johnston CommitDate: 2023-10-23 16:29:20 +0000 makefs/zfs: Update dd_used_breakdown after writing the MOS Fixes: 96092bf9108c ("makefs/zfs: Fill out dd_used_breakdown fields in DSL directories") Sponsored by: The FreeBSD Foundation --- usr.sbin/makefs/zfs/dsl.c | 18 ++++++++++++++++-- usr.sbin/makefs/zfs/objset.c | 3 +-- usr.sbin/makefs/zfs/zfs.h | 2 +- 3 files changed, 18 insertions(+), 5 deletions(-) diff --git a/usr.sbin/makefs/zfs/dsl.c b/usr.sbin/makefs/zfs/dsl.c index f7abebe2e245..93083f286e81 100644 --- a/usr.sbin/makefs/zfs/dsl.c +++ b/usr.sbin/makefs/zfs/dsl.c @@ -423,7 +423,7 @@ dsl_dir_alloc(zfs_opt_t *zfs, const char *name) return (dir); } -void +static void dsl_dir_size_add(zfs_dsl_dir_t *dir, uint64_t bytes) { dir->phys->dd_used_bytes += bytes; @@ -431,6 +431,19 @@ dsl_dir_size_add(zfs_dsl_dir_t *dir, uint64_t bytes) dir->phys->dd_uncompressed_bytes += bytes; } +/* + * See dsl_dir_root_finalize(). + */ +void +dsl_dir_root_finalize(zfs_opt_t *zfs, uint64_t bytes) +{ + dsl_dir_size_add(zfs->mosdsldir, bytes); + zfs->mosdsldir->phys->dd_used_breakdown[DD_USED_HEAD] += bytes; + + dsl_dir_size_add(zfs->rootdsldir, bytes); + zfs->rootdsldir->phys->dd_used_breakdown[DD_USED_CHILD] += bytes; +} + /* * Convert dataset properties into entries in the DSL directory's properties * ZAP. @@ -520,7 +533,8 @@ dsl_dir_finalize(zfs_opt_t *zfs, zfs_dsl_dir_t *dir, void *arg __unused) * The root directory needs a special case: the amount of * space used for the MOS isn't known until everything else is * finalized, so it can't be accounted in the MOS directory's - * parent until then. + * parent until then, at which point dsl_dir_root_finalize() is + * called. */ if (dir == zfs->rootdsldir && cdir == zfs->mosdsldir) continue; diff --git a/usr.sbin/makefs/zfs/objset.c b/usr.sbin/makefs/zfs/objset.c index 3e3dcdeced4b..6be732db477a 100644 --- a/usr.sbin/makefs/zfs/objset.c +++ b/usr.sbin/makefs/zfs/objset.c @@ -185,8 +185,7 @@ objset_write(zfs_opt_t *zfs, zfs_objset_t *os) * We've finished allocating space, account for it in $MOS and * in the parent directory. */ - dsl_dir_size_add(zfs->mosdsldir, os->space); - dsl_dir_size_add(zfs->rootdsldir, os->space); + dsl_dir_root_finalize(zfs, os->space); } _objset_write(zfs, os, c, dnodeloc); } diff --git a/usr.sbin/makefs/zfs/zfs.h b/usr.sbin/makefs/zfs/zfs.h index 193ca1248d89..9af090b14912 100644 --- a/usr.sbin/makefs/zfs/zfs.h +++ b/usr.sbin/makefs/zfs/zfs.h @@ -124,7 +124,7 @@ char *dsl_dir_get_mountpoint(zfs_opt_t *, zfs_dsl_dir_t *); bool dsl_dir_has_dataset(zfs_dsl_dir_t *); bool dsl_dir_dataset_has_objset(zfs_dsl_dir_t *); void dsl_dir_dataset_write(zfs_opt_t *, zfs_objset_t *, zfs_dsl_dir_t *); -void dsl_dir_size_add(zfs_dsl_dir_t *, uint64_t); +void dsl_dir_root_finalize(zfs_opt_t *, uint64_t); void dsl_write(zfs_opt_t *); /* fs.c */ From nobody Mon Oct 23 16:41:46 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SDgvG3Sgpz4yFV0; Mon, 23 Oct 2023 16:41:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SDgvG317qz4TSM; Mon, 23 Oct 2023 16:41:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698079306; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BjfijAxtI8es5OkYaqmukCLJWBTRF2YYxvyx51FA3P8=; b=QKrpH1mWRnobcmaspC7VGRQ42pYRNxFgAs1C5rc35C4ZRg8kynMP/FH+sMYcj8AfBmaBkq 0ZGkbWIqrfvRiyLnLBxTz7y0iheyXcx7OY9FbGXiDXjfmnANhErHEUDwW4hd8IHHq9sEBS G8+WXourTbwWwWdRQle4FVHjI+R6A15Td1dJ2pGVw+t/VYkNKX5qCz+qRezNshcA3XFZgs havZ2TPFwzR+Ox3r0+eKAYqyKScAwBxm+SiEqy5ej6szzoQBblDh2+Ztrz48KPwPT6Jg50 1Ky784t3Fu1FUab058toWpBiU5RM5EOu3Yh8IgyvrfvQuuPZpn5rSwy321i/sw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698079306; a=rsa-sha256; cv=none; b=R33D2YD9/fBhJ3eSGSW+ce3fuci28+co0H/3cSD8uDxRiomXumnPx5c2soVyKdWECna6/z gbgDG9eBYXjfZExP2mOl11TxubV2zSHomNwYENx+44M17gRPz2viXEq5zD6lree3oSxUod vf//nYcY6hBmx5bCaTtF59JREMS6b1ZxuU7FHgXiHFCPRy2p02Rq5QbMwA6MhpFbfX34aS JGDOmUkEPBiy+TqDQ9ppIB3fCrQvYwpq3ofjv2Lgx3lOuGx9xlxMlFGsqtnEj17lHN2ZAC 8+4RNtnUT2Pz3b3dq7xGbSM5UofQjtTt5kXKM7YPW695GRfLloN3QycD3EcrkA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698079306; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BjfijAxtI8es5OkYaqmukCLJWBTRF2YYxvyx51FA3P8=; b=OGwPQxWnsm7Zta9lQCWVGZzTNXESL5CnqoWEUTTfkrGLrf+R+U/kx07B1yfW/F0FqJVE0j vBQqeqtJX3J67Ir53TLn1Dw0ACEmV1VcIrl5jNlP8gzba8KRT6n7MYTu+U4FjAkxJaJa46 pSiU6t3BOkJakAodesPngx5ObPigTmUUUrMNWP3gYkj3+huNIctJMuqal+s8nwtGtxwlFD 8PEVSfVum+XJwT2W/udBZm8EKCTZ5QWU8xOdvv6WiciMg9pFt88ZGVwkLZVBbKuZWYEWVw tMa/92Ud0WMyVG6oWMxSH6qJp8ByqLMIT3hgPcyfbcywO5dAF/BicTWSFzrn5w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SDgvG23YHznNN; Mon, 23 Oct 2023 16:41: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 39NGfkDB093716; Mon, 23 Oct 2023 16:41:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39NGfkDD093713; Mon, 23 Oct 2023 16:41:46 GMT (envelope-from git) Date: Mon, 23 Oct 2023 16:41:46 GMT Message-Id: <202310231641.39NGfkDD093713@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: 4f33755051c6 - main - pf: allow states to be killed by their pre-NAT address List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 4f33755051c60c6f65ba9f6aaa33d11e72909618 Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=4f33755051c60c6f65ba9f6aaa33d11e72909618 commit 4f33755051c60c6f65ba9f6aaa33d11e72909618 Author: Kristof Provost AuthorDate: 2023-10-20 05:37:46 +0000 Commit: Kristof Provost CommitDate: 2023-10-23 14:37:05 +0000 pf: allow states to be killed by their pre-NAT address If a connection is NAT-ed we could previously only terminate it by its ID or the post-NAT IP address. Allow users to specify they want look for the state by its pre-NAT address. Usage: `pfctl -k nat -k
`. See also: https://redmine.pfsense.org/issues/11556 Sponsored by: Rubicon Communications, LLC ("Netgate") Differential Revision: https://reviews.freebsd.org/D42312 --- lib/libpfctl/libpfctl.c | 1 + lib/libpfctl/libpfctl.h | 1 + sbin/pfctl/pfctl.8 | 13 +++++++++---- sbin/pfctl/pfctl.c | 6 ++++++ sys/net/pfvar.h | 1 + sys/netpfil/pf/pf_ioctl.c | 6 +++--- sys/netpfil/pf/pf_nv.c | 3 +++ 7 files changed, 24 insertions(+), 7 deletions(-) diff --git a/lib/libpfctl/libpfctl.c b/lib/libpfctl/libpfctl.c index 25bb77d9c021..0360c0c63be7 100644 --- a/lib/libpfctl/libpfctl.c +++ b/lib/libpfctl/libpfctl.c @@ -1468,6 +1468,7 @@ _pfctl_clear_states(int dev, const struct pfctl_kill *kill, nvlist_add_string(nvl, "ifname", kill->ifname); nvlist_add_string(nvl, "label", kill->label); nvlist_add_bool(nvl, "kill_match", kill->kill_match); + nvlist_add_bool(nvl, "nat", kill->nat); if ((ret = pfctl_do_ioctl(dev, ioctlval, 1024, &nvl)) != 0) return (ret); diff --git a/lib/libpfctl/libpfctl.h b/lib/libpfctl/libpfctl.h index ad6fde89771c..0b50cc054060 100644 --- a/lib/libpfctl/libpfctl.h +++ b/lib/libpfctl/libpfctl.h @@ -310,6 +310,7 @@ struct pfctl_kill { char ifname[IFNAMSIZ]; char label[PF_RULE_LABEL_SIZE]; bool kill_match; + bool nat; }; struct pfctl_state_peer { diff --git a/sbin/pfctl/pfctl.8 b/sbin/pfctl/pfctl.8 index 41eb2bea9f94..6c9a9f3b2ca4 100644 --- a/sbin/pfctl/pfctl.8 +++ b/sbin/pfctl/pfctl.8 @@ -24,7 +24,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.Dd February 22, 2021 +.Dd October 20, 2023 .Dt PFCTL 8 .Os .Sh NAME @@ -43,7 +43,7 @@ .Op Fl K Ar host | network .Xo .Oo Fl k -.Ar host | network | label | id | gateway +.Ar host | network | label | id | gateway | nat .Oc Xc .Op Fl o Ar level .Op Fl p Ar device @@ -256,15 +256,16 @@ option may be specified, which will kill all the source tracking entries from the first host/network to the second. .It Xo .Fl k -.Ar host | network | label | id | gateway +.Ar host | network | label | id | gateway | nat .Xc Kill all of the state entries matching the specified .Ar host , .Ar network , .Ar label , .Ar id , +.Ar gateway, or -.Ar gateway. +.Ar nat. .Pp For example, to kill all of the state entries originating from .Dq host : @@ -332,6 +333,10 @@ To kill all states using a gateway in 192.168.0.0/24: .Pp .Dl # pfctl -k gateway -k 192.168.0.0/24 .Pp +States can also be killed based on their pre-NAT address: +.Pp +.Dl # pfctl -k nat -k 192.168.0.1 +.Pp .It Fl M Kill matching states in the opposite direction (on other interfaces) when killing states. diff --git a/sbin/pfctl/pfctl.c b/sbin/pfctl/pfctl.c index c3f3d82ff767..03b7f24ce60a 100644 --- a/sbin/pfctl/pfctl.c +++ b/sbin/pfctl/pfctl.c @@ -725,6 +725,12 @@ pfctl_net_kill_states(int dev, const char *iface, int opts) sizeof(kill.ifname)) >= sizeof(kill.ifname)) errx(1, "invalid interface: %s", iface); + if (state_killers == 2 && (strcmp(state_kill[0], "nat") == 0)) { + kill.nat = true; + state_kill[0] = state_kill[1]; + state_killers = 1; + } + pfctl_addrprefix(state_kill[0], &kill.src.addr.v.a.mask); if (opts & PF_OPT_KILLMATCH) diff --git a/sys/net/pfvar.h b/sys/net/pfvar.h index b2aa1c450c50..6a5f8761755d 100644 --- a/sys/net/pfvar.h +++ b/sys/net/pfvar.h @@ -1770,6 +1770,7 @@ struct pf_kstate_kill { char psk_label[PF_RULE_LABEL_SIZE]; u_int psk_killed; bool psk_kill_match; + bool psk_nat; }; #endif diff --git a/sys/netpfil/pf/pf_ioctl.c b/sys/netpfil/pf/pf_ioctl.c index 2eae03a908ec..851bf8ee5b63 100644 --- a/sys/netpfil/pf/pf_ioctl.c +++ b/sys/netpfil/pf/pf_ioctl.c @@ -2249,7 +2249,7 @@ relock_DIOCKILLSTATES: /* For floating states look at the original kif. */ kif = s->kif == V_pfi_all ? s->orig_kif : s->kif; - sk = s->key[PF_SK_WIRE]; + sk = s->key[psk->psk_nat ? PF_SK_STACK : PF_SK_WIRE]; if (s->direction == PF_OUT) { srcaddr = &sk->addr[1]; dstaddr = &sk->addr[0]; @@ -2308,10 +2308,10 @@ relock_DIOCKILLSTATES: if (s->direction == PF_OUT) { dir = PF_IN; - idx = PF_SK_STACK; + idx = psk->psk_nat ? PF_SK_WIRE : PF_SK_STACK; } else { dir = PF_OUT; - idx = PF_SK_WIRE; + idx = psk->psk_nat ? PF_SK_STACK : PF_SK_WIRE; } match_key.af = s->key[idx]->af; diff --git a/sys/netpfil/pf/pf_nv.c b/sys/netpfil/pf/pf_nv.c index c4fa276da8fe..721d35be8916 100644 --- a/sys/netpfil/pf/pf_nv.c +++ b/sys/netpfil/pf/pf_nv.c @@ -873,6 +873,9 @@ pf_nvstate_kill_to_kstate_kill(const nvlist_t *nvl, sizeof(kill->psk_label))); PFNV_CHK(pf_nvbool(nvl, "kill_match", &kill->psk_kill_match)); + if (nvlist_exists_bool(nvl, "nat")) + PFNV_CHK(pf_nvbool(nvl, "nat", &kill->psk_nat)); + errout: return (error); } From nobody Mon Oct 23 16:41:47 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SDgvH4pxvz4yFs3; Mon, 23 Oct 2023 16:41: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 4SDgvH43pRz4T5W; Mon, 23 Oct 2023 16:41:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698079307; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tuZRTEKdZF4aoUlcuU+t40TUFpenidZrzkhjZncuV+o=; b=J7rQBZmLzoiNcNx/HfEHh2c75DYEoYP6pQ2i/GGsyOZZdx+EqA+eeNVTy//RGCbHAhCMlX L1bS7Nk9MLbPqE8jc0DiHvnPjMAuKwJ5ShthampctOENTKHoJMDdSbkGF2+pvwCqSxUcte zfBC+qD2cKnJ/upPOhAoKRyx+dIpD3p0X1JEzXgTpg+lqtK1XTQaJgCIDDIk/UBa+csGjV /5olyzQtDuf08zFWjVc986Jh6D+MCUUR82UoGbP+D5+AuDI5bzRMA4EdHnvew++XZzCAp1 55TuHMOmRiTzhTxis2Qjmwr1RfL7jahqPVrmrpiWMVPDtB/jfEq/IbG1kU3Srw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698079307; a=rsa-sha256; cv=none; b=kJWn4+s9+XmG6ro/rVrGoZ/rzCy68i67t4A1aONV9fQuTb1h8n/UKLY0rNZJvW2JgLgbtY L/JPjc7euDyPS51daa6Tq4stZiPbQeV29/+TKvWxMxKIJMVc4RD3LNkDsukLXecVI8X6li m95YigYq6NSx71oLKkcPL5Hbh33PeTJffCI1c260xEyxj2blM+fNwh0PAW/aaUnhPkhxcs 1EiSoq0zEV7MoK62q0RZuL9B8gOB3aSLY/bVQxX8SR37XdVeiHL8+JvVu3T67G63xTZwpV prmyvm9oUhcoit9FxjL/1WTh4n9KzBsIlgtN4VpeezYWOgDRKAaCtgQMtUIxkQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698079307; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tuZRTEKdZF4aoUlcuU+t40TUFpenidZrzkhjZncuV+o=; b=dO5vYLGkqXAFBs7ix4u17yiHrUYDB6OCdIFzJOeGa0lKOiFVxPe23EjofGo4Kw2t7WWNYy hS/eo+JlhZYLFsysxMibCXfvHG11ANzmze5l2T5kvB7jreqOfLSs94fh6wy81m4Fw0A7k6 Vbp2MM5w4UIoX4cFTer/yeltUDG5npQDXFiBa/7JxQKbWreSjBLRrKDma3CK5svGAKVtc0 z+VXL+WMuT/mdWuIqNrXrE1Fbe/gy0qXP78lYLbYMtf2hfISPvX3dme9TwaMt7oRhr69W/ dgRRs4molL4BCTsbChqOO0hjxOshhZfRhhvJlj6aSkOz4UQGvQGGk1OlmY0+cg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SDgvH2thJznT7; Mon, 23 Oct 2023 16:41: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 39NGflXh093777; Mon, 23 Oct 2023 16:41:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39NGflBq093774; Mon, 23 Oct 2023 16:41:47 GMT (envelope-from git) Date: Mon, 23 Oct 2023 16:41:47 GMT Message-Id: <202310231641.39NGflBq093774@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: 501b7fbd75cb - main - pf tests: add a test for killing states by NAT address List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 501b7fbd75cbc321227930d38a52394194170f5b Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=501b7fbd75cbc321227930d38a52394194170f5b commit 501b7fbd75cbc321227930d38a52394194170f5b Author: Kristof Provost AuthorDate: 2023-10-19 13:00:43 +0000 Commit: Kristof Provost CommitDate: 2023-10-23 14:37:05 +0000 pf tests: add a test for killing states by NAT address Sponsored by: Rubicon Communications, LLC ("Netgate") Differential Revision: https://reviews.freebsd.org/D42313 --- tests/sys/netpfil/pf/killstate.sh | 75 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 74 insertions(+), 1 deletion(-) diff --git a/tests/sys/netpfil/pf/killstate.sh b/tests/sys/netpfil/pf/killstate.sh index 72f8d9d29fc2..046d640ed355 100644 --- a/tests/sys/netpfil/pf/killstate.sh +++ b/tests/sys/netpfil/pf/killstate.sh @@ -30,7 +30,10 @@ common_dir=$(atf_get_srcdir)/../common find_state() { - jexec alcatraz pfctl -ss | grep icmp | grep 192.0.2.2 + jail=${1:-alcatraz} + ip=${2:-192.0.2.2} + + jexec ${jail} pfctl -ss | grep icmp | grep ${ip} } find_state_v6() @@ -571,6 +574,75 @@ id_cleanup() pft_cleanup } +atf_test_case "nat" "cleanup" +nat_head() +{ + atf_set descr 'Test killing states by their NAT-ed IP address' + atf_set require.user root + atf_set require.progs scapy +} + +nat_body() +{ + pft_init + j="killstate:nat" + + epair_c=$(vnet_mkepair) + epair_srv=$(vnet_mkepair) + + vnet_mkjail ${j}c ${epair_c}a + ifconfig -j ${j}c ${epair_c}a inet 192.0.2.2/24 up + jexec ${j}c route add default 192.0.2.1 + + vnet_mkjail ${j}srv ${epair_srv}a + ifconfig -j ${j}srv ${epair_srv}a inet 198.51.100.2/24 up + + vnet_mkjail ${j}r ${epair_c}b ${epair_srv}b + ifconfig -j ${j}r ${epair_c}b inet 192.0.2.1/24 up + ifconfig -j ${j}r ${epair_srv}b inet 198.51.100.1/24 up + jexec ${j}r sysctl net.inet.ip.forwarding=1 + + jexec ${j}r pfctl -e + pft_set_rules ${j}r \ + "nat on ${epair_srv}b inet from 192.0.2.0/24 to any -> (${epair_srv}b)" + + # Sanity check + atf_check -s exit:0 -o ignore \ + jexec ${j}c ping -c 1 192.0.2.1 + atf_check -s exit:0 -o ignore \ + jexec ${j}srv ping -c 1 198.51.100.1 + atf_check -s exit:0 -o ignore \ + jexec ${j}c ping -c 1 198.51.100.2 + + # Establish state + # Note: use pft_ping so we always use the same ID, so pf considers all + # echo requests part of the same flow. + atf_check -s exit:0 -o ignore jexec ${j}c ${common_dir}/pft_ping.py \ + --sendif ${epair_c}a \ + --to 198.51.100.1 \ + --replyif ${epair_c}a + + # There's NAT here, so the source IP will be 198.51.100.1 + if ! find_state ${j}r 198.51.100.1; + then + atf_fail "Expected state not found" + fi + + # By NAT-ed address? + jexec ${j}r pfctl -k nat -k 192.0.2.2 + + if find_state ${j}r 198.51.100.1; + then + jexec ${j}r pfctl -ss -v + atf_fail "Failed to remove state" + fi +} + +nat_cleanup() +{ + pft_cleanup +} + atf_init_test_cases() { atf_add_test_case "v4" @@ -581,4 +653,5 @@ atf_init_test_cases() atf_add_test_case "match" atf_add_test_case "interface" atf_add_test_case "id" + atf_add_test_case "nat" } From nobody Mon Oct 23 17:12:11 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SDhZM3lLRz4yHYq; Mon, 23 Oct 2023 17:12: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 4SDhZM3KD1z4Yvr; Mon, 23 Oct 2023 17:12:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698081131; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=icdYH90j+H2q+WkZ/Uo32e0tdk7b9MiKg3AL3Ey+3JM=; b=p3oIAvEffYn9eMPuvHaQ8+TzLSsUc4wiZG/0D6Q2yyGG8m8/mlH/ffolotZCaOcDxnMd+m yfYMiVsZxFYdgm7t2gyJ6MDqq2bx1KO/bcKomdXaUDAH7vwSSNZ7/MywihV+trxrzDEfY6 927V1L1bYCN0/dKY7Wa0hbGLnM8E/ZsdSD++S3n6wfSXnQWgpYauB//FbDrMP41yA4aSSE OvBQh3S989BvL+4OTOrkKtmrtDVDoaZYKITQcOC6cp1wnMRo61SkQOfP+KMaVSPQgn0rYJ 4jxPzLunEDRe6m1gznuAKEGj9OraOZwsnJuVdw1CrvtQ3nsMt8i6wb7qzIok5Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698081131; a=rsa-sha256; cv=none; b=SwC15otYpttZ7kQoo2Ky/COS8OrjwLgGWHqbDTFb5hsbt614QW4yW353JD+ka0ounkgzD9 Exz2A3deQJxPzLAb3Q9kwLJNTMyZZcqEWlEsjl//8LbL+xjVJZP2J3TyAyEjmLuIPE/PNo 54Vspznssy0khB6FhwSm3cCP6/drv1tq8hXTsaJ7uS9IxjQQJN4DxN4FT7X/tw0pW3JPQb pLwdV0W3HaDnJwjTll5BtG5gK1vOd62C63aUUEWFmR6vXwzi78j7vi6A/Y/NIJW4AkRipv fA0m7KuXdNQH1EOKk6oq8JKWZQ9Rpbnh7+hArTck8uGabkcQIXt8KVRAIK+1JQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698081131; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=icdYH90j+H2q+WkZ/Uo32e0tdk7b9MiKg3AL3Ey+3JM=; b=WuQXv23FOIcNSbcQnzMJravY/p4yXtPhJGjFal3xvJdHicLPvoDcacUEGpKJrDDEDwl3Vm mkR/U7V7UM4oX5L4S+zXYAz4cgSE7+CHZrXMuBdPCDjkMbucdIegBz1uiR4lbyYe+Pled7 Rf+uuftiCEGP5OC//OoG4AM4vBPvFMmpHZURbEeUnlPFgIZf9pYXHQiwWjF2E+YohnDHQt 3Q5nMN45LGxNbxnJ3AKpdRWbWHaYDq30zEmTQk742MFmHSnmN8oKdItpDU5w93Mz3f9Q6c t/KVT/yS76UT1GINoU1ntUkl1jIi+TYSoqh8DUbdWAflL3CFlGKHwkECYSRvGg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SDhZM2Pdvzp2Z; Mon, 23 Oct 2023 17:12: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 39NHCBrQ047062; Mon, 23 Oct 2023 17:12:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39NHCBfw047059; Mon, 23 Oct 2023 17:12:11 GMT (envelope-from git) Date: Mon, 23 Oct 2023 17:12:11 GMT Message-Id: <202310231712.39NHCBfw047059@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: 7b2ab18fbada - main - pf/netlink: explicitly include sys/ucred.h to provide struct ucred definition List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 7b2ab18fbada2e61d0b3154b74bd0935c77ec786 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=7b2ab18fbada2e61d0b3154b74bd0935c77ec786 commit 7b2ab18fbada2e61d0b3154b74bd0935c77ec786 Author: Konstantin Belousov AuthorDate: 2023-10-23 17:01:09 +0000 Commit: Konstantin Belousov CommitDate: 2023-10-23 17:11:11 +0000 pf/netlink: explicitly include sys/ucred.h to provide struct ucred definition Also remove no longer needed standalone sys/cdefs.h include. Reviewed by: kp Sponsored by: NVidia Networking --- sys/netpfil/pf/pf_nl.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sys/netpfil/pf/pf_nl.c b/sys/netpfil/pf/pf_nl.c index 53ff5d031ed6..bf3d23051c05 100644 --- a/sys/netpfil/pf/pf_nl.c +++ b/sys/netpfil/pf/pf_nl.c @@ -27,12 +27,11 @@ * */ -#include - #include #include #include #include +#include #include From nobody Mon Oct 23 17:23:28 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SDhqP0856z4yJ7j; Mon, 23 Oct 2023 17:23: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 4SDhqN6lflz4ZxK; Mon, 23 Oct 2023 17:23:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698081808; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=l4Bc72jf1Av7wumy+Psy2S/YZUbY7kiZ+5d+Nl3jZgk=; b=Yy4FBr0eM0UZREuHsn3V1lJwMRE3x29Jhx0p8zbSvpNiTaoIZhBZsON83FaabwxLTlEaOL AsDOd0lKxX5svc/V69o15AFqRUfOH7bSHvem5m3ys4gYk+wsQ8vOkTdWgtJ/G4FvgadpMz FzbxPRL99hT5XSRrDrHs5o433wSdG3IZOrvROIREAKzSfBog2116uZguw/i6mseNzVkjIC l51cXC/yXm3lESR3mSLi3dJQlbBEtkDPaFgZpLrR0IGyam6odygx1VWEYyqNiCNN0RXqnH V5e/O9jsTWi5EFT7JA/9g5T0fAMfmvUK1284sdqRei+/ZnA86CsFJD+avmkohQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698081808; a=rsa-sha256; cv=none; b=Kt0x8aMq0OqrC6a6HtPonNY76rBzzYCJC2ZGVJ95lwrozUGDBdMtDfXRhM5tIvnkSfuPwF I1UQhvakWIJotz+bB29oq7cE6G7d41MI4hhwGqXyPN+drzelu5LEZ0Gzd0toAjRCwxFYi9 NF9XCiSEfJvM/X1ywtnjMxGupFSjrWL0K6CBEdezd4ILp4ck7tGm7KNzRYc2JmaHTNBLgs bf3qPq55zixkeTgqgdUMHth2nn1kQyGurchl4B00Pl1Zm/A8EHHAGlupaI6vThlgb+5JZT o6ZZdeTB2kEbsbWHtw1EH/wZl7a/uVx8eOAc3l/IOxr85OGsV4BoSvWQiZvzow== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698081808; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=l4Bc72jf1Av7wumy+Psy2S/YZUbY7kiZ+5d+Nl3jZgk=; b=UcMjIVSWSWWwVyVfjKAd/DRTaP0VjkHEYSrONCH12xjQXLwDkTVWDC6dxtqqZAnOGnxVhN 7rp7RrmZiYe9R0LLDHA/WfclilIZOeyeuUb9v9L+dx2akv3sHUg2R1l4Tg3Ei0Mkw3Lg24 2EKaZnis2anEuvecWl3zAewbn2tnl+1Ap6W5dKhyJRvxRWr5SAlxSoYN0xDZYRDgDbZklz GZbzmDobI6EGXwCdmBjtCHsCVaCHPTaduPLbj9qBAZf4zxYHkha60Fr67LrnRPK77RJXoG Iq7LfXM8Uscgi14ry3YuEnWxJHziaHja56KZP/C1SNfwbngobzOhGHQYq6FpBQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SDhqN5pnYzpRf; Mon, 23 Oct 2023 17:23: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 39NHNS9O063747; Mon, 23 Oct 2023 17:23:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39NHNSn8063744; Mon, 23 Oct 2023 17:23:28 GMT (envelope-from git) Date: Mon, 23 Oct 2023 17:23:28 GMT Message-Id: <202310231723.39NHNSn8063744@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mateusz Guzik Subject: git: c35f527ed115 - main - sx: unset td_wantedlock around going to sleep List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mjg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c35f527ed115b792463d30c7d3c8904e435caead Auto-Submitted: auto-generated The branch main has been updated by mjg: URL: https://cgit.FreeBSD.org/src/commit/?id=c35f527ed115b792463d30c7d3c8904e435caead commit c35f527ed115b792463d30c7d3c8904e435caead Author: Mateusz Guzik AuthorDate: 2023-10-23 17:22:12 +0000 Commit: Mateusz Guzik CommitDate: 2023-10-23 17:22:12 +0000 sx: unset td_wantedlock around going to sleep Otherwise it can crash in sleepq_wait_sig -> sleepq_catch_signals -> sig_ast_checksusp -> thread_suspend_check due to a mutex acquire. Reported by: pho Sponsored by: Rubicon Communications, LLC ("Netgate") --- sys/kern/kern_sx.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/sys/kern/kern_sx.c b/sys/kern/kern_sx.c index bc8a1214689f..455ae165e328 100644 --- a/sys/kern/kern_sx.c +++ b/sys/kern/kern_sx.c @@ -854,10 +854,17 @@ retry_sleepq: sleepq_add(&sx->lock_object, NULL, sx->lock_object.lo_name, SLEEPQ_SX | ((opts & SX_INTERRUPTIBLE) ? SLEEPQ_INTERRUPTIBLE : 0), SQ_EXCLUSIVE_QUEUE); + /* + * Hack: this can land in thread_suspend_check which will + * conditionally take a mutex, tripping over an assert if a + * lock we are waiting for is set. + */ + THREAD_CONTENTION_DONE(&sx->lock_object); if (!(opts & SX_INTERRUPTIBLE)) sleepq_wait(&sx->lock_object, 0); else error = sleepq_wait_sig(&sx->lock_object, 0); + THREAD_CONTENTION_DONE(&sx->lock_object); #ifdef KDTRACE_HOOKS sleep_time += lockstat_nsecs(&sx->lock_object); sleep_cnt++; @@ -1209,10 +1216,17 @@ retry_sleepq: sleepq_add(&sx->lock_object, NULL, sx->lock_object.lo_name, SLEEPQ_SX | ((opts & SX_INTERRUPTIBLE) ? SLEEPQ_INTERRUPTIBLE : 0), SQ_SHARED_QUEUE); + /* + * Hack: this can land in thread_suspend_check which will + * conditionally take a mutex, tripping over an assert if a + * lock we are waiting for is set. + */ + THREAD_CONTENTION_DONE(&sx->lock_object); if (!(opts & SX_INTERRUPTIBLE)) sleepq_wait(&sx->lock_object, 0); else error = sleepq_wait_sig(&sx->lock_object, 0); + THREAD_CONTENDS_ON_LOCK(&sx->lock_object); #ifdef KDTRACE_HOOKS sleep_time += lockstat_nsecs(&sx->lock_object); sleep_cnt++; From nobody Mon Oct 23 17:28:04 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SDhwj4dKdz4yJGt; Mon, 23 Oct 2023 17:28:05 +0000 (UTC) (envelope-from glebius@freebsd.org) Received: from glebi.us (glebi.us [162.251.186.162]) by mx1.freebsd.org (Postfix) with ESMTP id 4SDhwj1Mgkz4c1c; Mon, 23 Oct 2023 17:28:05 +0000 (UTC) (envelope-from glebius@freebsd.org) Authentication-Results: mx1.freebsd.org; none Received: by glebi.us (Postfix, from userid 1000) id 5144B70C4B; Mon, 23 Oct 2023 10:28:04 -0700 (PDT) Date: Mon, 23 Oct 2023 10:28:04 -0700 From: Gleb Smirnoff To: Mateusz Guzik Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: c35f527ed115 - main - sx: unset td_wantedlock around going to sleep Message-ID: References: <202310231723.39NHNSn8063744@gitrepo.freebsd.org> List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <202310231723.39NHNSn8063744@gitrepo.freebsd.org> 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:27348, ipnet:162.251.186.0/24, country:US] X-Rspamd-Queue-Id: 4SDhwj1Mgkz4c1c Mateusz, On Mon, Oct 23, 2023 at 05:23:28PM +0000, Mateusz Guzik wrote: M> The branch main has been updated by mjg: M> M> URL: https://cgit.FreeBSD.org/src/commit/?id=c35f527ed115b792463d30c7d3c8904e435caead M> M> commit c35f527ed115b792463d30c7d3c8904e435caead M> Author: Mateusz Guzik M> AuthorDate: 2023-10-23 17:22:12 +0000 M> Commit: Mateusz Guzik M> CommitDate: 2023-10-23 17:22:12 +0000 M> M> sx: unset td_wantedlock around going to sleep M> M> Otherwise it can crash in sleepq_wait_sig -> sleepq_catch_signals -> M> sig_ast_checksusp -> thread_suspend_check due to a mutex acquire. M> M> Reported by: pho M> Sponsored by: Rubicon Communications, LLC ("Netgate") M> --- M> sys/kern/kern_sx.c | 14 ++++++++++++++ M> 1 file changed, 14 insertions(+) M> M> diff --git a/sys/kern/kern_sx.c b/sys/kern/kern_sx.c M> index bc8a1214689f..455ae165e328 100644 M> --- a/sys/kern/kern_sx.c M> +++ b/sys/kern/kern_sx.c M> @@ -854,10 +854,17 @@ retry_sleepq: M> sleepq_add(&sx->lock_object, NULL, sx->lock_object.lo_name, M> SLEEPQ_SX | ((opts & SX_INTERRUPTIBLE) ? M> SLEEPQ_INTERRUPTIBLE : 0), SQ_EXCLUSIVE_QUEUE); M> + /* M> + * Hack: this can land in thread_suspend_check which will M> + * conditionally take a mutex, tripping over an assert if a M> + * lock we are waiting for is set. M> + */ M> + THREAD_CONTENTION_DONE(&sx->lock_object); M> if (!(opts & SX_INTERRUPTIBLE)) M> sleepq_wait(&sx->lock_object, 0); M> else M> error = sleepq_wait_sig(&sx->lock_object, 0); M> + THREAD_CONTENTION_DONE(&sx->lock_object); Shouldn't the second one be THREAD_CONTENDS_ON_LOCK? M> #ifdef KDTRACE_HOOKS M> sleep_time += lockstat_nsecs(&sx->lock_object); M> sleep_cnt++; M> @@ -1209,10 +1216,17 @@ retry_sleepq: M> sleepq_add(&sx->lock_object, NULL, sx->lock_object.lo_name, M> SLEEPQ_SX | ((opts & SX_INTERRUPTIBLE) ? M> SLEEPQ_INTERRUPTIBLE : 0), SQ_SHARED_QUEUE); M> + /* M> + * Hack: this can land in thread_suspend_check which will M> + * conditionally take a mutex, tripping over an assert if a M> + * lock we are waiting for is set. M> + */ M> + THREAD_CONTENTION_DONE(&sx->lock_object); M> if (!(opts & SX_INTERRUPTIBLE)) M> sleepq_wait(&sx->lock_object, 0); M> else M> error = sleepq_wait_sig(&sx->lock_object, 0); M> + THREAD_CONTENDS_ON_LOCK(&sx->lock_object); M> #ifdef KDTRACE_HOOKS M> sleep_time += lockstat_nsecs(&sx->lock_object); M> sleep_cnt++; -- Gleb Smirnoff From nobody Mon Oct 23 17:31:06 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SDj0B37tJz4yJ10; Mon, 23 Oct 2023 17:31: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 4SDj0B2f9gz4cTY; Mon, 23 Oct 2023 17:31:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698082266; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=N4JkqavjLaJbeFDEdlTCLImJrcQcuTZ0PKLe0NwLm8A=; b=Y6uYHMdCLEJMn9ljbofwGgHMu0hWdYmMXv9dl1aufSUME1N5sgrdg6lf5Dpb80Jk3sjNNp PrDv1hATx6swjf+uddiGFkwyCQCEjalgpWmVwWaGGFFqQ5PRvDzYUaNqulUaDNzhxDYGdM fnQ0CgOETZ4d56S0cy46EaYH+OAgCzEIDZTxAck4+Vi7yVOXOY/QqjFvmGlLWtrX5Hlk0x EFQ9fJInB7wlJZuLlsvdR5zBl3zRiAoR79dj9I+2x0e7bgakRY1zintIHhWki9GULlLEJl q+w/SwKksLozYzXop7UVRiP0emfS4PDMpMzXgBEdvFm/fas5AmOpFfOlqvEWLw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698082266; a=rsa-sha256; cv=none; b=C4EliKdkrajm9ezbt9oPnN/BhuYmEzuRsb2ZDkWVZjtI5eBqozn0cijFIoZtrBzKlfDNTy N6gcnuYQn3CUORiODpWFmv9Nelp+0OeC9lF51mzrF8fRy7hgZMvMGhzELEYG4exDAwqD/f gzo2l0TpBA6y8SxCQGijwTB5lMZnxjbM26UKUENxXjSJ9tbADh9MGDfhgmy7rsWaNRqj0K /x9Wu/p5BMUAEvoNrZWzZXbceZbsHVJu5QQPceHstLMbooqITyFUKbf6zAGuPrOWjn//K2 6opBVOH/q7tPs6Af5lIQFJALU7T+OM77FYVgH52rIppZMtvi/A539Ce+N7mbwQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698082266; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=N4JkqavjLaJbeFDEdlTCLImJrcQcuTZ0PKLe0NwLm8A=; b=SYByCxoe4NdUvWULjGRs+mr9Lx9n/9U57cc9F6PDyjstgLJO2xjHOExzAaE56i2cOuMdSt DVUoDDhGrX7YN5V9DVk8zcyDbctMqCGtY32p6LK0VN3tfacPL9c+3pFc0IVEY/Xym33vYa JhxB0r/r0H0DXK8K2uPTQcp8cfxXNt/nvFl/hH24vIBd0pjN1TYaZ6QU5jZPu0psRShBbq 7m9Pdal0aL4+9hf9toa/V1MSbssUYARBh85x9xonDdovTGKfCQqC5SP2TrZG4I9NeNN+A3 SNKRefCTKTn9JO11fM8k/M5PQ1oD4iG8L1HQI3gZ3+zMHbiDEClXqVWosk8afw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SDj0B1jwHzphp; Mon, 23 Oct 2023 17:31: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 39NHV6nL074623; Mon, 23 Oct 2023 17:31:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39NHV6t5074621; Mon, 23 Oct 2023 17:31:06 GMT (envelope-from git) Date: Mon, 23 Oct 2023 17:31:06 GMT Message-Id: <202310231731.39NHV6t5074621@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mateusz Guzik Subject: git: 8bd794531118 - main - sx: fixup copy pasto in previous List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mjg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8bd794531118c17b530eb51384439c46e72bb69d Auto-Submitted: auto-generated The branch main has been updated by mjg: URL: https://cgit.FreeBSD.org/src/commit/?id=8bd794531118c17b530eb51384439c46e72bb69d commit 8bd794531118c17b530eb51384439c46e72bb69d Author: Mateusz Guzik AuthorDate: 2023-10-23 17:29:55 +0000 Commit: Mateusz Guzik CommitDate: 2023-10-23 17:29:55 +0000 sx: fixup copy pasto in previous Spotted by: glebius Sponsored by: Rubicon Communications, LLC ("Netgate") --- sys/kern/kern_sx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/kern/kern_sx.c b/sys/kern/kern_sx.c index 455ae165e328..ff3cd8a3c195 100644 --- a/sys/kern/kern_sx.c +++ b/sys/kern/kern_sx.c @@ -864,7 +864,7 @@ retry_sleepq: sleepq_wait(&sx->lock_object, 0); else error = sleepq_wait_sig(&sx->lock_object, 0); - THREAD_CONTENTION_DONE(&sx->lock_object); + THREAD_CONTENDS_ON_LOCK(&sx->lock_object); #ifdef KDTRACE_HOOKS sleep_time += lockstat_nsecs(&sx->lock_object); sleep_cnt++; From nobody Mon Oct 23 17:32:44 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SDj272j2Kz4yJf2; Mon, 23 Oct 2023 17:32:47 +0000 (UTC) (envelope-from garyj@gmx.de) Received: from mout.gmx.net (mout.gmx.net [212.227.15.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "mout.gmx.net", Issuer "Telekom Security ServerID OV Class 2 CA" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SDj263YJlz4drh; Mon, 23 Oct 2023 17:32:46 +0000 (UTC) (envelope-from garyj@gmx.de) Authentication-Results: mx1.freebsd.org; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.de; s=s31663417; t=1698082365; x=1698687165; i=garyj@gmx.de; bh=RQBVBDdLLNsOJcFhAQW4d630+0oXMksV6bgG4Pv09JA=; h=X-UI-Sender-Class:Date:From:To:Cc:Subject:In-Reply-To:References: Reply-To; b=PjKvF9+ITusXM3p1ZWav4mKUPqTkwq2hAaWVLurZ1mwySAK/pbWe20iP4iaFk+bm TAKTZIdVdgM0gZMkeki644DZVNchEZ21+fI/4mFTq5DwM6gfk60IX5JcyNTT53FhA 6JVwqss2Tz+xpGuhP6gpgMZ5Qwct9kQOE4+5kqMszIhKgwxT49E1wGgBihhWlkbXD xQVY9nxpWc0Z22sKLe3USsElz61pRZhpD6wkPciuSl/TyxiVqFldO93nTY2tzyxZY kEtwOIUvQ+1Ecw2y7uJyz5lYI/cce/BB1nO6X5mxWJCinBI2Wtv00JX2eg3eE7Ozt z5WcqexjP7xe19ePdg== X-UI-Sender-Class: 724b4f7f-cbec-4199-ad4e-598c01a50d3a Received: from ernst.home ([217.226.57.134]) by mail.gmx.net (mrgmx005 [212.227.17.190]) with ESMTPSA (Nemesis) id 1M9Wys-1qpUbo47Gu-005WVW; Mon, 23 Oct 2023 19:32:45 +0200 Date: Mon, 23 Oct 2023 17:32:44 +0000 From: Gary Jennejohn To: Mateusz Guzik Cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: c35f527ed115 - main - sx: unset td_wantedlock around going to sleep Message-ID: <20231023193244.148ddcec@ernst.home> In-Reply-To: <202310231723.39NHNSn8063744@gitrepo.freebsd.org> References: <202310231723.39NHNSn8063744@gitrepo.freebsd.org> Reply-To: garyj@gmx.de X-Mailer: Claws Mail 3.19.1 (GTK+ 2.24.33; amd64-portbld-freebsd14.0) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable X-Provags-ID: V03:K1:c4g/LjG3bQulm8SmT9XQ3pdb3ZAJAHXpaLCtD9oWQBeVW5oXCSf i5FIWB4iT/YtC6BV5fpX9DCRdSBTaknvI9jcbZJGeyKLV2z9uIW5CwI6rq2hLwlZJ1sCjPC GkqfqId87FO/EYUSjNHLhVsRGPlFxXeP7rLizWtso5Z2ckM6pwPj3sXfVaW/jOKxls+qMPg +egN1qoRupCwLL6P9N3OA== X-Spam-Flag: NO UI-OutboundReport: notjunk:1;M01:P0:T1rGdUPbzu0=;pBF87mcoFMWSnNLlEQw7/YFAD6n 5KzXo0v4fm9LaV6olNvl0utN30HVxNfGV6NLL689hDWcztajl+pSW8TDoAxeowmo5ai046ljm jE2HhW9eMXULLYA8dFnA2yBTbDj4AeXzr65ru3sllqMtyYdr6a1eEyge/wlgNh2WOCnqjWYQM Doe7B7y9deINUn09WG1pWSOW1Ng0nKOpc8mwvkPCiG3rRPe/7g7GwMIwZL0CaTfHZJTPYfhZr QI97vFk9O9TV+G2jYW4keEBuLgPM6cuK17/lDHv3SW8zV8Nu4ABDFmzSC1FiifLeqAghxJzAO O7rRJOXJ5H6HnnZYV4kG+EUNcVlf60EU5xrZZENAIpJCitH5j/hvrC9f4nLYbLo1lk2RFJ3f6 cdhgdai3UDoczsPSvKGye1AJd7z8hNrd8B/BfsLOmBv1iT64n1dzrAlnz6SRsiSsCXdPmmxEx va68HjwXhJ3zFqGejI9I/ynI3ioHxeqbLL+e10MLJXrFPBi6Z9trP9qmkGIYUfyMStbjVKU46 gaVs4af7nGFw2DkN4bdlNbDdUexABnlfWhnxwN339s0YCA49AvP/reHj8Y+TjF91Bx7rgPkCq IGScb8mPsN+9xU6eQTx4cjcP4xf1kIgT+lmXjye+BRuZBlfQ3dA0ciK5t3g5DpsWRlR/HjXkp +1veoOglA3kiv8bzx7S/O76i35vVMqy64snYm3Z0v07dmVqolNoPFS00kpS8IEPECcgmzhHNa bmR/KkP2fwHrwJ+rNOja+pHrxf678b5e8uWaTnJWvBP7T6rzeJl9Bg7JJl1NSwj5F3QEq0A0/ p2O7End7wwUuj/Zdl+Hcm4zidAEGpBURhoyCiCKyS21YdTBoLcuta4Nm467ftHGuDeq7iHTL6 Ek2dHgTI84BJztNOWlOYpYPMXlwMIP4RSePc8VZvbYfkozjgBdy4nZm3m+l0SCvZ0m1ILcmbQ 6aTiHthznZGGxtpWJ/b12jYNaH4= 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:8560, ipnet:212.227.0.0/16, country:DE] X-Rspamd-Queue-Id: 4SDj263YJlz4drh On Mon, 23 Oct 2023 17:23:28 GMT Mateusz Guzik wrote: > The branch main has been updated by mjg: > > URL: https://cgit.FreeBSD.org/src/commit/?id=3Dc35f527ed115b792463d30c7d= 3c8904e435caead > > commit c35f527ed115b792463d30c7d3c8904e435caead > Author: Mateusz Guzik > AuthorDate: 2023-10-23 17:22:12 +0000 > Commit: Mateusz Guzik > CommitDate: 2023-10-23 17:22:12 +0000 > > sx: unset td_wantedlock around going to sleep > > Otherwise it can crash in sleepq_wait_sig -> sleepq_catch_signals -> > sig_ast_checksusp -> thread_suspend_check due to a mutex acquire. > > Reported by: pho > Sponsored by: Rubicon Communications, LLC ("Netgate") > --- > sys/kern/kern_sx.c | 14 ++++++++++++++ > 1 file changed, 14 insertions(+) > > diff --git a/sys/kern/kern_sx.c b/sys/kern/kern_sx.c > index bc8a1214689f..455ae165e328 100644 > --- a/sys/kern/kern_sx.c > +++ b/sys/kern/kern_sx.c > @@ -854,10 +854,17 @@ retry_sleepq: > sleepq_add(&sx->lock_object, NULL, sx->lock_object.lo_name, > SLEEPQ_SX | ((opts & SX_INTERRUPTIBLE) ? > SLEEPQ_INTERRUPTIBLE : 0), SQ_EXCLUSIVE_QUEUE); > + /* > + * Hack: this can land in thread_suspend_check which will > + * conditionally take a mutex, tripping over an assert if a > + * lock we are waiting for is set. > + */ > + THREAD_CONTENTION_DONE(&sx->lock_object); > if (!(opts & SX_INTERRUPTIBLE)) > sleepq_wait(&sx->lock_object, 0); > else > error =3D sleepq_wait_sig(&sx->lock_object, 0); > + THREAD_CONTENTION_DONE(&sx->lock_object); should this be THREAD_CONTENDS_ON_LOCK, like below? > #ifdef KDTRACE_HOOKS > sleep_time +=3D lockstat_nsecs(&sx->lock_object); > sleep_cnt++; > @@ -1209,10 +1216,17 @@ retry_sleepq: > sleepq_add(&sx->lock_object, NULL, sx->lock_object.lo_name, > SLEEPQ_SX | ((opts & SX_INTERRUPTIBLE) ? > SLEEPQ_INTERRUPTIBLE : 0), SQ_SHARED_QUEUE); > + /* > + * Hack: this can land in thread_suspend_check which will > + * conditionally take a mutex, tripping over an assert if a > + * lock we are waiting for is set. > + */ > + THREAD_CONTENTION_DONE(&sx->lock_object); > if (!(opts & SX_INTERRUPTIBLE)) > sleepq_wait(&sx->lock_object, 0); > else > error =3D sleepq_wait_sig(&sx->lock_object, 0); > + THREAD_CONTENDS_ON_LOCK(&sx->lock_object); > #ifdef KDTRACE_HOOKS > sleep_time +=3D lockstat_nsecs(&sx->lock_object); > sleep_cnt++; > =2D- Gary Jennejohn From nobody Mon Oct 23 17:56:32 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SDjYX5QFWz4yKMF; Mon, 23 Oct 2023 17:56: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 4SDjYX4xqTz3C6n; Mon, 23 Oct 2023 17:56:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698083792; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aA2qLsVF+6hcq9br9yWp7x6H0C59CLtjSu5vrApM86I=; b=EcQMwRVaz3OpU/vC6iWxc9JmxTvloIYfUHIMlt4CCTbqMA/ukaql6/HoO8gSdWhuNwHdro qS4nFJhybWGnwQQ2FuNh/2IuC8cbsDDS/7ymdVsHzOOmqdhZDgp5hn2ZxGuQYQDHKBq4+2 LCu/qS43UQvdXACXxFDphTrlynaPZceQv1XRWpfFw8g0oKqJcniyTLvC4ngrkBDORFSQcL OgBHt656p36d9hGgx8fOUZTdrF0GFv35B/Edf4/rPW6Xoe+wRjm0LqbNjf5tbRUxa4rsTe IhhhVzSCNUu7kQ3nQArX5HI8dkIjrDRv4E3RNlJp49YGTvvWG/XkUVH4QQxpDQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698083792; a=rsa-sha256; cv=none; b=CByMhO58MBxtlqRIr4LwkP7+9gMdVVpTpYy0bpsylePsWsmGO/6R/PxIPtZ6vvmuBMSLxj 9qEZ0sauvjIqZlc5CPSuTbdkZVjnvZyQ6ptwIwj8pysh+z67VViBAEPOQ6G6iZGWgy1syw 1wsOUQe/M/5bmO+e0PB06uzDbd6fcEUzS9ebJ0T82s+kf5ToQX6j+22V4HVIklYW9wy+wj UHwvCi1MEkw31BUiVzstMyUmhh4/AdLFCcEyyim8sDgokIhKX9JK4YmvICUNXb9dkHHi5d CPRltyC24HFfodP8+qiM1Rh45z5V0i/OorDkhuVmZ+XvfiTxZbeAJbqnJ3BlXQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698083792; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aA2qLsVF+6hcq9br9yWp7x6H0C59CLtjSu5vrApM86I=; b=POfkCZXU2kAuPa7yb4WS89A+ZSL94BLtnr/hE9nIQp7vRdHafwo8bZTdqzsM3Ytru6SyH9 6sAMaeXr/NweVnU2WK7fIKJEH4qO2oCHmPlWSqdfu8moSsdeXCxLpjroG9uZE8hFMha5Dw EMXYJybmO2/WMSwY0rInBCoVJRIsz3bLh1x1Ib939amyA9brRWuu4Kk9mkWM6XM1jaA6z3 kRxvlCkP3wVaeYxpMZOaw/d2Wh484yRW8NZ57f5WS/F8IKHs1qVNcd2qNIrc8NUf1nrGve GYF0DAVRPmUgPcLHJn+SVGUWuNvLimg4SE2HfCyLWb3ybBMdjZ5WnapS8Hi31Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SDjYX43N6zq2T; Mon, 23 Oct 2023 17:56: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 39NHuWwx013820; Mon, 23 Oct 2023 17:56:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39NHuWZm013817; Mon, 23 Oct 2023 17:56:32 GMT (envelope-from git) Date: Mon, 23 Oct 2023 17:56:32 GMT Message-Id: <202310231756.39NHuWZm013817@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: bcde15f5f894 - main - ofwdump(8): cross-reference openfirm(4) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: bcde15f5f894ece1f507ae997d17d810efae9c76 Auto-Submitted: auto-generated The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=bcde15f5f894ece1f507ae997d17d810efae9c76 commit bcde15f5f894ece1f507ae997d17d810efae9c76 Author: Mitchell Horne AuthorDate: 2023-09-20 22:33:59 +0000 Commit: Mitchell Horne CommitDate: 2023-10-23 17:56:29 +0000 ofwdump(8): cross-reference openfirm(4) This utility relies on the openfirm(4) pseudo-device. Sponsored by: The FreeBSD Foundation --- usr.sbin/ofwdump/ofwdump.8 | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/usr.sbin/ofwdump/ofwdump.8 b/usr.sbin/ofwdump/ofwdump.8 index a58b7cfc9395..2e9b280d4ab5 100644 --- a/usr.sbin/ofwdump/ofwdump.8 +++ b/usr.sbin/ofwdump/ofwdump.8 @@ -21,7 +21,7 @@ .\" OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE .\" USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.Dd February 26, 2022 +.Dd October 23, 2023 .Dt OFWDUMP 8 .Os .Sh NAME @@ -90,6 +90,8 @@ property of the node as plain string: .Pp .Dl "ofwdump -P compatible -S /pci" +.Sh SEE ALSO +.Xr openfirm 4 .Sh HISTORY The .Nm From nobody Mon Oct 23 18:14:48 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SDjyd1TTHz4yL8M; Mon, 23 Oct 2023 18:14: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 4SDjyd1002z3FYj; Mon, 23 Oct 2023 18:14:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698084889; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nQ19pU3cDLYW8U5WQ6vRArAt6dKugRtq8SEiiyuPDy4=; b=gS8ykfYYShwQL+mbc66sIsOm5me9DT7e5B0oEUs3LrtISFEKZEqcJ8DyHgdt26yVBWOFz/ OtXVQ4ydvvnWVOFOMFbleZ50/TYdmAdT+vNT+ZffbtqKZkgqzsv66fdVAwdMg673xfcx/O zDtzsBIQ4i8xmopvoU3mAZeKZYlQ+SJjctNnNL/wQRqRVA6wt/u/wtm3G9d1HD2Ewt6oAZ f/jDycHQhWykS9ke1Tse0ojAeqPHP1ktzaFQTm0peOk2VXQ4iuyhfSxeOQIY0pW3muFFcQ s6wMDnNsY2+fofq7WSwhGR+Dfw/EL5yzIbrwXZLZtn6q6Dg/k2L+yszRkD9GMw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698084889; a=rsa-sha256; cv=none; b=seodtj1tHPJuDB8N+uNh/u2K9AM3Z932a2zZqes6n0F7nTbShvvwzDI9zrCFSA9pPmNP0s g9H7pxI1y6qzPI4u+6lHrYkORlnteOevPo8mKAtrPE2GzgAxaKwZ468+KqwhNPIsBD6Kf4 Cn5AQ4lBHHC9y1oSQ+886sRZgehUMLmMJRwAzEDDbt0TV6lWC1GhRV1slo++rt4HF1B5ac kq5utw4X6KtfJHOlUrb0y/n/cPmXb3Otve546EvBpdjgOOEW6dBMFd3vc00nBIg1yHnbY+ cZS7rWIeIz8OfZJewlLcrTC4A7ExUOOK5xCkcPzhe0N26vqV+VovY3v6ATPZQQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698084889; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nQ19pU3cDLYW8U5WQ6vRArAt6dKugRtq8SEiiyuPDy4=; b=NMoQ+Bc81qRsFSezHtEeso4HoeczdG1P3xRq2+k/zWfbSsLmEqneNORJdrQanPbRcaGTc4 On+qZUUPjdIzExSpX95jF8mf8zMj4CtBzXs8JaIH7WK7NWRHPRFOn/C9NGe4vHwzA6YWzl dv/RWWne3M6CiH7N/S6d6l/t+sWyfCayVmZWE1tQ614Upki0w7/L7PuYZZVBV1d2SybRl2 9gxZ73HBoqg8MHxmT9yAURIkTD8EF8roCEPbphxtPsmVhO28tQaPF4+Zmpf6c7x6yihWO7 mW7Xfh9NcrrG91IYs+ih1aCE7bQkayOsKQ0+XLNStINdoaxSw02rSRiJNY7zzQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SDjyd02gtzqfS; Mon, 23 Oct 2023 18:14: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 39NIEmaE048360; Mon, 23 Oct 2023 18:14:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39NIEmiW048357; Mon, 23 Oct 2023 18:14:48 GMT (envelope-from git) Date: Mon, 23 Oct 2023 18:14:48 GMT Message-Id: <202310231814.39NIEmiW048357@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: 0514f032c835 - main - devfs(8): Remove references to /usr/share/examples/etc/devfs.conf List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 0514f032c835baba81ae157cae68584e60ffe278 Auto-Submitted: auto-generated The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=0514f032c835baba81ae157cae68584e60ffe278 commit 0514f032c835baba81ae157cae68584e60ffe278 Author: Jose Luis Duran AuthorDate: 2023-10-18 17:39:19 +0000 Commit: Mitchell Horne CommitDate: 2023-10-23 18:14:23 +0000 devfs(8): Remove references to /usr/share/examples/etc/devfs.conf This file does not exist, remove it from the list of files to avoid confusion. The example file is just /etc/devfs.conf. Reviewed by: mhorne Pull Request: https://github.com/freebsd/freebsd-src/pull/871 --- sbin/devfs/devfs.8 | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/sbin/devfs/devfs.8 b/sbin/devfs/devfs.8 index af777fe8947f..598f2303a605 100644 --- a/sbin/devfs/devfs.8 +++ b/sbin/devfs/devfs.8 @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd December 1, 2020 +.Dd October 18, 2023 .Dt DEVFS 8 .Os .Sh NAME @@ -248,7 +248,7 @@ will return the same information regardless of the mount-point specified with The mount-point is only relevant when changing what its current ruleset is or when using one of the apply commands. .Sh FILES -.Bl -tag -width "Pa /usr/share/examples/etc/devfs.conf" -compact +.Bl -tag -width "Pa /etc/defaults/devfs.rules" -compact .It Pa /etc/defaults/devfs.rules Default .Nm @@ -264,10 +264,6 @@ with the same ruleset number, otherwise the two files are effectively merged. Boot-time .Nm configuration file. -.It Pa /usr/share/examples/etc/devfs.conf -Example boot-time -.Nm -configuration file. .El .Sh EXAMPLES When the system boots, From nobody Mon Oct 23 20:19:39 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SDmkg3zFcz4yS1Y; Mon, 23 Oct 2023 20:19: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 4SDmkg3JP3z3PHh; Mon, 23 Oct 2023 20:19:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698092379; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zQFde6L3/FsIo4Tlef4WLg1jFj1wuXl4m8Ut2It3320=; b=bhWTAVVgLa6vStFD7w31PPi9wk+nPnYnNbMluBdSmZ79axNipmy+DRw14EXyLNuOP8TjCa iVkC87SXI00/l86s6SG6VwRGrNgEHv7HK879ksmHi/Kwctj/y2nsZfABT1plDTGYLVtfC3 0HSvV3MUDSSvdu5WDRWCKAMA73nGT0cgRvI189KNMKEAQCgCaVBglYM2pGTi5zSTrcWTqY jqjGKoI7Sis5dIPWsVEDc8EFwrS4/+1H6EC/vdcP1tFuVNrK9x3iKsiUjF7p9KMtWosesZ 2LbmiTr4gyoj0hgzpla7+0oKtbQfvR08MKXDxHvh2p1gOF/9mUb9aHudhX6tdg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698092379; a=rsa-sha256; cv=none; b=vNFSPhVUKbzEb+KpbZyAEACwKPl9DrSohczfbNH4A90HlkBSDX7dZDcOSEze/ShMTf/1EE AW/HMq2BFZ7nIc2N4vL1wJ5HaGl56Rm4KD3Ah+rPqj0dTJSdj9SLxSfMZXGd3oY1pnBz0s EEncTDa+MUPlaj1Aivw1rRC4TydCUVr9UtWvNY05sS85WxLQ9B4wgr7sfjUxXqtD3zwWt1 hAwXeFIYFIpjGtMM64h1PlDGP/feYYeiYmEkQlxL+fSmtqJnghWNqDsdY+J3AbCcfjsTEt tYZLXEiYPY+fwb5t/gdLsYphMbhwPq97n9xqQCvcrzRszLXXz7qGsZCiowNSHg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698092379; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zQFde6L3/FsIo4Tlef4WLg1jFj1wuXl4m8Ut2It3320=; b=O+LOXidvOIowkW2emeYNaMzAcICAYQYZiPZJNW2+4D0OJRFavW2jUGiKMlNCJV2CIr1Grc fFso66TOl8LobczKaVDfL/15nRvNv0JTwkav5uCd1vyRndh0i6IHqUl96+g6MiCrTlS4b6 GvPMmqL3EMWpsPXd998SpnCP8KmkIknoXDUSuN+Qi2abtE3WrE8m4hi76Lfd/d60cz2vnO yzomxt8QvYy3VvbeWKmgQ1QqonjMhEu7pWk7OlVEsMMYmgvrjSDyfiIIsZkp9kLN2JuaeD 0jSRCl9lrs8IBxwr/GkHHMuBRtI0odfif52ZOW4W0Vjub8s5vLGA6S8S1FMTZA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SDmkg2LyBzst9; Mon, 23 Oct 2023 20:19: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 39NKJd18051082; Mon, 23 Oct 2023 20:19:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39NKJdtb051079; Mon, 23 Oct 2023 20:19:39 GMT (envelope-from git) Date: Mon, 23 Oct 2023 20:19:39 GMT Message-Id: <202310232019.39NKJdtb051079@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: 428879dc9110 - main - kgssapi: Add a new file with a function for a future commit List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rmacklem X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 428879dc9110240ad0940c7ac8cd69bcaf6e686e Auto-Submitted: auto-generated The branch main has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=428879dc9110240ad0940c7ac8cd69bcaf6e686e commit 428879dc9110240ad0940c7ac8cd69bcaf6e686e Author: Rick Macklem AuthorDate: 2023-10-23 20:17:16 +0000 Commit: Rick Macklem CommitDate: 2023-10-23 20:17:16 +0000 kgssapi: Add a new file with a function for a future commit A future commit needs a new upcall function that can do reverse DNS in order to generate a "service principal". This patch adds the file. MFC after: 1 month --- sys/kgssapi/gss_ip_to_dns.c | 85 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 85 insertions(+) diff --git a/sys/kgssapi/gss_ip_to_dns.c b/sys/kgssapi/gss_ip_to_dns.c new file mode 100644 index 000000000000..d2be006d5b3e --- /dev/null +++ b/sys/kgssapi/gss_ip_to_dns.c @@ -0,0 +1,85 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2008 Isilon Inc http://www.isilon.com/ + * Authors: Doug Rabson + * Developed with Red Inc: Alfred Perlstein + * + * 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 "gssd.h" + +OM_uint32 +gss_ip_to_dns(OM_uint32 *minor_status, + char *ip_addr, + char *dns_name) +{ + struct ip_to_dns_res res; + struct ip_to_dns_args args; + enum clnt_stat stat; + CLIENT *cl; + + *minor_status = 0; + cl = kgss_gssd_client(); + if (cl == NULL) + return (GSS_S_FAILURE); + + args.ip_addr.ip_addr_len = strlen(ip_addr); + args.ip_addr.ip_addr_val = mem_alloc(args.ip_addr.ip_addr_len); + memcpy(args.ip_addr.ip_addr_val, ip_addr, args.ip_addr.ip_addr_len); + + bzero(&res, sizeof(res)); + stat = gssd_ip_to_dns_1(&args, &res, cl); + CLNT_RELEASE(cl); + if (stat != RPC_SUCCESS) { + *minor_status = stat; + return (GSS_S_FAILURE); + } + + if (res.major_status != GSS_S_COMPLETE) { + *minor_status = res.minor_status; + return (res.major_status); + } + + if (res.dns_name.dns_name_len == 0 || + res.dns_name.dns_name_len >= NI_MAXHOST) { + *minor_status = 0; + return (GSS_S_FAILURE); + } + + memcpy(dns_name, res.dns_name.dns_name_val, res.dns_name.dns_name_len); + dns_name[res.dns_name.dns_name_len] = '\0'; + + return (GSS_S_COMPLETE); +} From nobody Mon Oct 23 20:22:40 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SDmp91rMBz4ySJR; Mon, 23 Oct 2023 20:22: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 4SDmp919ftz3Q6K; Mon, 23 Oct 2023 20:22:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698092561; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8ittuYtxLwvyvecqugBy+c09g6viIEnLRGy+QSgBG2E=; b=SasuuZ8mZVLHa3vdASux+a6uupR1Rea76E+FK9t2fuXej23jpiBsZ+kPYJB5l1fXhpoB1r dIcQrCNaAiM6qE29iLLXccDFJaExUR93+68EkqOko3s93ahdhxlOQd2qNCkEHtf9kvbxA9 QTH81Syl0mZhjTxXg+XMBH5SkBnfpOyoG9Yt24inCRtXZRn7BF7WU+0JvI5xsq7b9DWSAA e1oQYeFrl0Hliwb5+VBfXrk0y5DuLktZA58AqahADnTPnZ/Zg8g0YmfIr2vGNspYcGQlwS 06FIAocrLR9cPh+JsOuwGU1eORqFL7wR0I6YW4hVm21DHfdoruypX6FVIMGmXw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698092561; a=rsa-sha256; cv=none; b=HHIq+YsH7EJeKB6e5sF0BJnDxTh0qwSf8dtH3tR2fl8YetLG1XfwZ4kTVZHownsXKhho5h 1uxP9vux663XoFkfutGIw6cHympHuJEc6wR6KrIEdRAQ/jRXnUXE2OzsfjDEX59q0cMYek JwkCHgFMinMYsqDDNNClbroEUHwA71EN5N8JBcCUZjqLh+BKgO8asnTNxXBLpcfTKsaUm7 7JSoBESNc/FkHFWrOrB2heaGjPgOCu8gDTHQGeUuzZrc9ZlhR4GMC7YpBdAVGkiB6I647E TQqZoxU+Q1+S2LwQ7tc0wNRcfrcu1M6nRie1Dsfv/LufRxaGWLRhjJZ2pNmZYg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698092561; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8ittuYtxLwvyvecqugBy+c09g6viIEnLRGy+QSgBG2E=; b=TMpt58Lz0HkD/suF1VPVI0TKZ2Ad3TRmxiMwPmlydeo01UCMEijrfcBktjtC9OiOdMlKt9 5j8gp+RgUwtTTMDs2brpnEHlYTNTqxYq+/xqTKcKjI0S71NHxyAftPehTSiXFwR/W1YLpZ eAW0DYqVd1IU5YGjbglhYizcS1LrNusk5QpMlkMHh13Yuiu49rJdYUcsCvGalpLCX1MSnh Zzolu7gQafAS2ReXsQq/e/GbkyZ43qQt26bich8hofZCSB1UZCcde7NUtUeWUZC/A1qshJ jxGSVaoYVHhlQCl/OusUhz/lVQeTHWTHbGNfK427T65fqE2wtbl31G+sE0sOUA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SDmp90CmXzv5C; Mon, 23 Oct 2023 20:22: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 39NKMeUG066599; Mon, 23 Oct 2023 20:22:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39NKMeFs066596; Mon, 23 Oct 2023 20:22:40 GMT (envelope-from git) Date: Mon, 23 Oct 2023 20:22:40 GMT Message-Id: <202310232022.39NKMeFs066596@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: dd7d42a1fae5 - main - nfscl/kgssapi: Fix Kerberized NFS mounts to pNFS servers List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: dd7d42a1fae5a4879b62689a165238082421f343 Auto-Submitted: auto-generated The branch main has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=dd7d42a1fae5a4879b62689a165238082421f343 commit dd7d42a1fae5a4879b62689a165238082421f343 Author: Rick Macklem AuthorDate: 2023-10-23 20:21:14 +0000 Commit: Rick Macklem CommitDate: 2023-10-23 20:21:14 +0000 nfscl/kgssapi: Fix Kerberized NFS mounts to pNFS servers During recent testing related to the IETF NFSv4 Bakeathon, it was discovered that Kerberized NFSv4.1/4.2 mounts to pNFS servers (sec=krb5[ip],pnfs mount options) was broken. The FreeBSD client was using the "service principal" for the MDS to try and establish a rpcsec_gss credential for a DS, which is incorrect. (A "service principal" looks like "nfs@" and the for the DS is not the same as the MDS for most pNFS servers.) To fix this, the rpcsec_gss code needs to be able to do a reverse DNS lookup of the DS's IP address. A new kgssapi upcall to the gssd(8) daemon is added by this patch to do the reverse DNS along with a new rpcsec_gss function to generate the "service principal". A separate patch to the gssd(8) will be committed, so that this patch will fix the problem. Without the gssd(8) patch, the new upcall fails and current/incorrect behaviour remains. This bug only affects the rare case of a Kerberized (sec=krb5[ip],pnfs) mount using pNFS. This patch changes the internal KAPI between the kgssapi and nfscl modules, but since I did a version bump a few days ago, I will not do one this time. MFC after: 1 month --- sys/conf/files | 1 + sys/fs/nfs/nfs.h | 1 + sys/fs/nfs/nfs_commonkrpc.c | 13 ++++++++--- sys/fs/nfsclient/nfs_clrpcops.c | 44 +++++++++++++++++++++++++++++++++++-- sys/kgssapi/gss_impl.c | 2 ++ sys/kgssapi/gssapi.h | 18 +++++++++++++++ sys/kgssapi/gssd.x | 14 ++++++++++++ sys/modules/kgssapi/Makefile | 1 + sys/rpc/rpcsec_gss.h | 17 ++++++++++++++ sys/rpc/rpcsec_gss/svc_rpcsec_gss.c | 31 ++++++++++++++++++++++++++ 10 files changed, 137 insertions(+), 5 deletions(-) diff --git a/sys/conf/files b/sys/conf/files index c127ce7e7103..51d052e3c31d 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -3983,6 +3983,7 @@ kgssapi/gss_get_mic.c optional kgssapi kgssapi/gss_init_sec_context.c optional kgssapi kgssapi/gss_impl.c optional kgssapi kgssapi/gss_import_name.c optional kgssapi +kgssapi/gss_ip_to_dns.c optional kgssapi kgssapi/gss_names.c optional kgssapi kgssapi/gss_pname_to_uid.c optional kgssapi kgssapi/gss_release_buffer.c optional kgssapi diff --git a/sys/fs/nfs/nfs.h b/sys/fs/nfs/nfs.h index 0ed96fe43c0a..9b09520b3257 100644 --- a/sys/fs/nfs/nfs.h +++ b/sys/fs/nfs/nfs.h @@ -636,6 +636,7 @@ struct nfssockreq { u_int32_t nr_vers; struct __rpc_client *nr_client; AUTH *nr_auth; + char nr_srvprinc[1]; }; /* diff --git a/sys/fs/nfs/nfs_commonkrpc.c b/sys/fs/nfs/nfs_commonkrpc.c index 29fbb8dc4351..7ca150d4f54c 100644 --- a/sys/fs/nfs/nfs_commonkrpc.c +++ b/sys/fs/nfs/nfs_commonkrpc.c @@ -599,10 +599,14 @@ nfs_getauth(struct nfssockreq *nrp, int secflavour, char *clnt_principal, else svc = rpc_gss_svc_privacy; - if (clnt_principal == NULL) + if (clnt_principal == NULL) { + NFSCL_DEBUG(1, "nfs_getauth: clnt princ=NULL, " + "srv princ=%s\n", srv_principal); auth = rpc_gss_secfind_call(nrp->nr_client, cred, srv_principal, mech_oid, svc); - else { + } else { + NFSCL_DEBUG(1, "nfs_getauth: clnt princ=%s " + "srv princ=%s\n", clnt_principal, srv_principal); auth = rpc_gss_seccreate_call(nrp->nr_client, cred, clnt_principal, srv_principal, "kerberosv5", svc, NULL, NULL, NULL); @@ -799,7 +803,10 @@ newnfs_request(struct nfsrv_descript *nd, struct nfsmount *nmp, secflavour = RPCSEC_GSS_KRB5P; else secflavour = RPCSEC_GSS_KRB5; - srv_principal = NFSMNT_SRVKRBNAME(nmp); + if (nrp->nr_srvprinc[0] == '\0') + srv_principal = NFSMNT_SRVKRBNAME(nmp); + else + srv_principal = nrp->nr_srvprinc; } else if (nmp != NULL && (!NFSHASKERB(nmp) || NFSHASSYSKRB5(nmp)) && nd->nd_procnum != NFSPROC_NULL && (nd->nd_flag & ND_USEGSSNAME) != 0) { diff --git a/sys/fs/nfsclient/nfs_clrpcops.c b/sys/fs/nfsclient/nfs_clrpcops.c index 87362f2e744f..1b0011760d10 100644 --- a/sys/fs/nfsclient/nfs_clrpcops.c +++ b/sys/fs/nfsclient/nfs_clrpcops.c @@ -6014,7 +6014,27 @@ nfsrpc_fillsa(struct nfsmount *nmp, struct sockaddr_in *sin, sad->sin_family = AF_INET; sad->sin_port = sin->sin_port; sad->sin_addr.s_addr = sin->sin_addr.s_addr; - nrp = malloc(sizeof(*nrp), M_NFSSOCKREQ, M_WAITOK | M_ZERO); + if (NFSHASPNFS(nmp) && NFSHASKERB(nmp)) { + /* For pNFS, a separate server principal is needed. */ + nrp = malloc(sizeof(*nrp) + NI_MAXSERV + NI_MAXHOST, + M_NFSSOCKREQ, M_WAITOK | M_ZERO); + /* + * Use the latter part of nr_srvprinc as a temporary + * buffer for the IP address. + */ + inet_ntoa_r(sad->sin_addr, + &nrp->nr_srvprinc[NI_MAXSERV]); + NFSCL_DEBUG(1, "nfsrpc_fillsa: DS IP=%s\n", + &nrp->nr_srvprinc[NI_MAXSERV]); + if (!rpc_gss_ip_to_srv_principal_call( + &nrp->nr_srvprinc[NI_MAXSERV], "nfs", + nrp->nr_srvprinc)) + nrp->nr_srvprinc[0] = '\0'; + NFSCL_DEBUG(1, "nfsrpc_fillsa: srv principal=%s\n", + nrp->nr_srvprinc); + } else + nrp = malloc(sizeof(*nrp), M_NFSSOCKREQ, + M_WAITOK | M_ZERO); nrp->nr_nam = (struct sockaddr *)sad; } else if (af == AF_INET6) { NFSLOCKMNT(nmp); @@ -6053,7 +6073,27 @@ nfsrpc_fillsa(struct nfsmount *nmp, struct sockaddr_in *sin, sad6->sin6_port = sin6->sin6_port; NFSBCOPY(&sin6->sin6_addr, &sad6->sin6_addr, sizeof(struct in6_addr)); - nrp = malloc(sizeof(*nrp), M_NFSSOCKREQ, M_WAITOK | M_ZERO); + if (NFSHASPNFS(nmp) && NFSHASKERB(nmp)) { + /* For pNFS, a separate server principal is needed. */ + nrp = malloc(sizeof(*nrp) + NI_MAXSERV + NI_MAXHOST, + M_NFSSOCKREQ, M_WAITOK | M_ZERO); + /* + * Use the latter part of nr_srvprinc as a temporary + * buffer for the IP address. + */ + inet_ntop(AF_INET6, &sad6->sin6_addr, + &nrp->nr_srvprinc[NI_MAXSERV], NI_MAXHOST); + NFSCL_DEBUG(1, "nfsrpc_fillsa: DS IP=%s\n", + &nrp->nr_srvprinc[NI_MAXSERV]); + if (!rpc_gss_ip_to_srv_principal_call( + &nrp->nr_srvprinc[NI_MAXSERV], "nfs", + nrp->nr_srvprinc)) + nrp->nr_srvprinc[0] = '\0'; + NFSCL_DEBUG(1, "nfsrpc_fillsa: srv principal=%s\n", + nrp->nr_srvprinc); + } else + nrp = malloc(sizeof(*nrp), M_NFSSOCKREQ, + M_WAITOK | M_ZERO); nrp->nr_nam = (struct sockaddr *)sad6; } else return (EPERM); diff --git a/sys/kgssapi/gss_impl.c b/sys/kgssapi/gss_impl.c index 2bb785b63345..ae37cb646f1f 100644 --- a/sys/kgssapi/gss_impl.c +++ b/sys/kgssapi/gss_impl.c @@ -338,6 +338,8 @@ kgssapi_modevent(module_t mod, int type, void *data) rpc_gss_get_principal_name; rpc_gss_entries.rpc_gss_svc_max_data_length = rpc_gss_svc_max_data_length; + rpc_gss_entries.rpc_gss_ip_to_srv_principal = + rpc_gss_ip_to_srv_principal; mtx_init(&kgss_gssd_lock, "kgss_gssd_lock", NULL, MTX_DEF); error = kgss_load(); break; diff --git a/sys/kgssapi/gssapi.h b/sys/kgssapi/gssapi.h index ef9181bf1251..37cc8a1a5a09 100644 --- a/sys/kgssapi/gssapi.h +++ b/sys/kgssapi/gssapi.h @@ -372,6 +372,18 @@ extern gss_OID GSS_KRB5_NT_STRING_UID_NAME; #define GSS_S_GAP_TOKEN \ (1ul << (GSS_C_SUPPLEMENTARY_OFFSET + 4)) +/* + * NI_MAXSERV and NI_MAXHOST. The srv_principal argument for + * rpc_gss_ip_to_srv_principal should point to at least + * NI_MAXSERV + NI_MAXHOST + 1 bytes of storage. The "+ 1" is for the '@'. + * The NI_MAXHOST limit is checked for gss_ip_to_dns(). + * These should be set to the same value as they are in . + */ +#ifndef NI_MAXHOST +#define NI_MAXSERV 32 +#define NI_MAXHOST 1025 +#endif + __BEGIN_DECLS /* @@ -568,6 +580,12 @@ OM_uint32 gss_pname_to_unix_cred gid_t *groups /* pointer to group list */ ); +OM_uint32 gss_ip_to_dns + (OM_uint32 *, /* minor status */ + char *ip_addr, /* IP host address string */ + char *dns_name /* pointer to dns_name for result */ + ); + /* * Mbuf oriented message signing and encryption. * diff --git a/sys/kgssapi/gssd.x b/sys/kgssapi/gssd.x index 29503ac8599f..b50f39b33554 100644 --- a/sys/kgssapi/gssd.x +++ b/sys/kgssapi/gssd.x @@ -32,6 +32,7 @@ %#include %#else %#include +%#include %#endif %extern bool_t xdr_gss_buffer_desc(XDR *xdrs, gss_buffer_desc *buf); @@ -218,6 +219,16 @@ struct display_status_args { uint32_t message_context; }; +struct ip_to_dns_res { + uint32_t major_status; + uint32_t minor_status; + char dns_name; +}; + +struct ip_to_dns_args { + char ip_addr; +}; + program GSSD { version GSSDVERS { void GSSD_NULL(void) = 0; @@ -260,5 +271,8 @@ program GSSD { display_status_res GSSD_DISPLAY_STATUS(display_status_args) = 13; + + ip_to_dns_res + GSSD_IP_TO_DNS(ip_to_dns_args) = 14; } = 1; } = 0x40677373; diff --git a/sys/modules/kgssapi/Makefile b/sys/modules/kgssapi/Makefile index 2cf36246137c..a3eb812fd6e6 100644 --- a/sys/modules/kgssapi/Makefile +++ b/sys/modules/kgssapi/Makefile @@ -14,6 +14,7 @@ SRCS= gss_accept_sec_context.c \ gss_init_sec_context.c \ gss_impl.c \ gss_import_name.c \ + gss_ip_to_dns.c \ gss_names.c \ gss_pname_to_uid.c \ gss_release_buffer.c \ diff --git a/sys/rpc/rpcsec_gss.h b/sys/rpc/rpcsec_gss.h index 51381762fe29..2475f61a057e 100644 --- a/sys/rpc/rpcsec_gss.h +++ b/sys/rpc/rpcsec_gss.h @@ -184,6 +184,8 @@ typedef bool_t rpc_gss_get_principal_name_ftype(rpc_gss_principal_t *principal, typedef int rpc_gss_svc_max_data_length_ftype(struct svc_req *req, int max_tp_unit_len); typedef void rpc_gss_refresh_auth_ftype(AUTH *auth); +typedef bool_t rpc_gss_ip_to_srv_principal_ftype(char *ip_addr, + const char *srv_name, char *dns_name); struct rpc_gss_entries { rpc_gss_secfind_ftype *rpc_gss_secfind; @@ -206,6 +208,7 @@ struct rpc_gss_entries { rpc_gss_get_principal_name_ftype *rpc_gss_get_principal_name; rpc_gss_svc_max_data_length_ftype *rpc_gss_svc_max_data_length; rpc_gss_refresh_auth_ftype *rpc_gss_refresh_auth; + rpc_gss_ip_to_srv_principal_ftype *rpc_gss_ip_to_srv_principal; }; extern struct rpc_gss_entries rpc_gss_entries; @@ -417,6 +420,18 @@ rpc_gss_refresh_auth_call(AUTH *auth) (*rpc_gss_entries.rpc_gss_refresh_auth)(auth); } +static __inline bool_t +rpc_gss_ip_to_srv_principal_call(char *ip_addr, const char *srv_name, + char *dns_name) +{ + bool_t ret = FALSE; + + if (rpc_gss_entries.rpc_gss_ip_to_srv_principal != NULL) + ret = (*rpc_gss_entries.rpc_gss_ip_to_srv_principal)(ip_addr, + srv_name, dns_name); + return (ret); +} + AUTH *rpc_gss_secfind(CLIENT *clnt, struct ucred *cred, const char *principal, gss_OID mech_oid, rpc_gss_service_t service); void rpc_gss_secpurge(CLIENT *clnt); @@ -455,6 +470,8 @@ void rpc_gss_clear_callback(rpc_gss_callback_t *cb); bool_t rpc_gss_get_principal_name(rpc_gss_principal_t *principal, const char *mech, const char *name, const char *node, const char *domain); int rpc_gss_svc_max_data_length(struct svc_req *req, int max_tp_unit_len); +bool_t rpc_gss_ip_to_srv_principal(char *ip_addr, const char *srv_name, + char *dns_name); /* * Internal interface from the RPC implementation. diff --git a/sys/rpc/rpcsec_gss/svc_rpcsec_gss.c b/sys/rpc/rpcsec_gss/svc_rpcsec_gss.c index 2707c5ed0582..90aa9e0d7d4f 100644 --- a/sys/rpc/rpcsec_gss/svc_rpcsec_gss.c +++ b/sys/rpc/rpcsec_gss/svc_rpcsec_gss.c @@ -457,6 +457,37 @@ rpc_gss_get_principal_name(rpc_gss_principal_t *principal, return (TRUE); } +/* + * Note that the ip_addr and srv_principal pointers can point to the same + * buffer, so long as ip_addr is at least strlen(srv_name) + 1 > srv_principal. + */ +bool_t +rpc_gss_ip_to_srv_principal(char *ip_addr, const char *srv_name, + char *srv_principal) +{ + OM_uint32 maj_stat, min_stat; + size_t len; + + /* + * First fill in the service name and '@'. + */ + len = strlen(srv_name); + if (len > NI_MAXSERV) + return (FALSE); + memcpy(srv_principal, srv_name, len); + srv_principal[len] = '@'; + + /* + * Do reverse DNS to get the DNS name for the ip_addr. + */ + maj_stat = gss_ip_to_dns(&min_stat, ip_addr, &srv_principal[len + 1]); + if (maj_stat != GSS_S_COMPLETE) { + rpc_gss_log_status("gss_ip_to_dns", NULL, maj_stat, min_stat); + return (FALSE); + } + return (TRUE); +} + bool_t rpc_gss_getcred(struct svc_req *req, rpc_gss_rawcred_t **rcred, rpc_gss_ucred_t **ucred, void **cookie) From nobody Mon Oct 23 20:58:57 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SDnc14N8Hz4yVCP; Mon, 23 Oct 2023 20:58: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 4SDnc13pByz3SGm; Mon, 23 Oct 2023 20:58:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698094737; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JEOTNHUaouo6PJxJPD5kK3rqBjcgWTF160TBIDX3c0I=; b=pnAwo48WIUnxzbciObgLsxySwGCZargl5+JTMyQRt2BR8j6nDGng0Q1V47+8/Zp+sLexUL xGShjtdhlVDDTZIHKfeyVYhyoaZzmQxG7onTxlxI5a8QGwq5yHeZInxjFx6q5HoJg6k4Ps bA+9eX1wLCQBX7sDrdqwaoI7wk0s/P6nN83EUqS20Ki4Ryru4AMORDqE9bbXSAY5tsWc/L Vb8HIX/bVaITwfr0Ppd4ryc+bwG15eLJ+SIEZRTQMPnHauh6bavpaNJ/P9bInuVJ3oXfOk qnILfxtTsETJq7qTvF0A/zvpoWwuFA+EZtH8dAls5ZFJafbvSthADcEhgXq+xA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698094737; a=rsa-sha256; cv=none; b=TpWSVK8jUNCGpgVL9ok+FBJd7v2cJdzydOdk7/I6S4p1IJjVjnnzKwZfPeYvEnmegj8MqX 8Bsh1OirdtSMJk9y3L1gPd22apA02PpqElcSW14ptwWOWFE/11MmNENfGsLX/RjZPi2q9K +DIu92JaetTT0EkyK4OW1ssV9hB459AtR/IJifUbTd6y87gUiyg+O/vWGEPBNUF/+21fEA prymz6h6zzGpsn3FOUa9vDJJXkpFJVWqWbA8RnMb9w8K+ZutXglcWn74UmW7wSD0Y+CIHk uOdiBp+tESqoT2Xdf+QlfRHxAnQxohqXdrkXjh73PmkYdoqjN7IR4Amd4xle2Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698094737; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JEOTNHUaouo6PJxJPD5kK3rqBjcgWTF160TBIDX3c0I=; b=PlMYSTTKCNu3DJu2cuNURrZ+DiQK7RbFa93Vx+nQKp4lV1yqpaE2+wptDJEpIJtdheXWiN E3BK6sTNRIuZS2IegzBEPuGvdcn+VxkICCMafRyR7m+7dXk1LjDN3SPnnfRXPPF1oebEgY 5kX6AcvexnldzmeedmFmfbyGhhWYnAqJFge8UVEbKewiifxBzR7iBeD2HnKgk0oUX9qEJb QgnPtBP6AlmDGbJ9V9sE7bFA1DrHs7Kc9dcZACmSkg4YXNgSjjdgtsC2WT+QnnaEQ/R6cE IAKHdcOtjBTNDNh7xo8AD4JGB4an100vYI0GhZiT8OdvAbpkjDC1Y1KbTBnhlw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SDnc12Wxlzvps; Mon, 23 Oct 2023 20:58: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 39NKwvZK017994; Mon, 23 Oct 2023 20:58:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39NKwvs7017991; Mon, 23 Oct 2023 20:58:57 GMT (envelope-from git) Date: Mon, 23 Oct 2023 20:58:57 GMT Message-Id: <202310232058.39NKwvs7017991@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: 934a24e55a78 - main - ndp: improve -c and -d handling in ndp_netlink List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 934a24e55a785e27faf96979602ae1954f384d67 Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=934a24e55a785e27faf96979602ae1954f384d67 commit 934a24e55a785e27faf96979602ae1954f384d67 Author: R. Christian McDonald AuthorDate: 2023-10-23 19:43:44 +0000 Commit: Kristof Provost CommitDate: 2023-10-23 20:58:29 +0000 ndp: improve -c and -d handling in ndp_netlink This patch restores/fixes some of the behavior present in pre-netlink ndp(8). 1. Deleting a local address now correctly returns EPERM (instead of ENOENT) 2. ndp -c no longer dumps the entire table while complaining about local addresses 3. Return exit code when deleting entry (e.g. trying ndp -d on a local address is an error) Reviewed by: kp Sponsored by: Rubicon Communications, LLC ("Netgate") Differential Revision: https://reviews.freebsd.org/D42316 --- usr.sbin/ndp/ndp.c | 8 +++++--- usr.sbin/ndp/ndp.h | 2 +- usr.sbin/ndp/ndp_netlink.c | 13 ++++++++----- 3 files changed, 14 insertions(+), 9 deletions(-) diff --git a/usr.sbin/ndp/ndp.c b/usr.sbin/ndp/ndp.c index b7bc25dd7aa4..23643dd6c200 100644 --- a/usr.sbin/ndp/ndp.c +++ b/usr.sbin/ndp/ndp.c @@ -201,6 +201,7 @@ main(int argc, char **argv) { int ch, mode = 0; char *arg = NULL; + int ret = 0; pid = getpid(); thiszone = utc_offset(); @@ -280,7 +281,7 @@ main(int argc, char **argv) /*NOTREACHED*/ } xo_open_list("neighbor-cache"); - delete(arg); + ret = delete(arg); xo_close_list("neighbor-cache"); break; case 'I': @@ -353,7 +354,8 @@ main(int argc, char **argv) } xo_close_container("ndp"); xo_finish(); - exit(0); + + return (ret); } /* @@ -841,7 +843,7 @@ static int delete(char *host) { #ifndef WITHOUT_NETLINK - return (delete_nl(0, host)); + return (delete_nl(0, host, true)); /* do warn */ #else return (delete_rtsock(host)); #endif diff --git a/usr.sbin/ndp/ndp.h b/usr.sbin/ndp/ndp.h index 5b2558982e86..f89ab19a9d3f 100644 --- a/usr.sbin/ndp/ndp.h +++ b/usr.sbin/ndp/ndp.h @@ -20,7 +20,7 @@ char *ether_str(struct sockaddr_dl *sdl); char *sec2str(time_t total); int getaddr(char *host, struct sockaddr_in6 *sin6); int print_entries_nl(uint32_t ifindex, struct sockaddr_in6 *addr, bool cflag); -int delete_nl(uint32_t ifindex, char *host); +int delete_nl(uint32_t ifindex, char *host, bool warn); int set_nl(uint32_t ifindex, struct sockaddr_in6 *dst, struct sockaddr_dl *sdl, char *host); diff --git a/usr.sbin/ndp/ndp_netlink.c b/usr.sbin/ndp/ndp_netlink.c index 79bdec2356d0..e18d64175619 100644 --- a/usr.sbin/ndp/ndp_netlink.c +++ b/usr.sbin/ndp/ndp_netlink.c @@ -180,7 +180,7 @@ guess_ifindex(struct snl_state *ss, uint32_t fibnum, const struct sockaddr_in6 * int off = snl_add_msg_attr_nested(&nw, NHA_FREEBSD); snl_add_msg_attr_u32(&nw, NHAF_KID, r.rta_knh_id); - snl_add_msg_attr_u8(&nw, NHAF_FAMILY, AF_INET); + snl_add_msg_attr_u8(&nw, NHAF_FAMILY, AF_INET6); snl_add_msg_attr_u32(&nw, NHAF_TABLE, fibnum); snl_end_attr_nested(&nw, off); @@ -372,13 +372,14 @@ print_entries_nl(uint32_t ifindex, struct sockaddr_in6 *addr, bool cflag) continue; } - print_entry(&neigh, &link); if (cflag) { char dst_str[INET6_ADDRSTRLEN]; inet_ntop(AF_INET6, &dst->sin6_addr, dst_str, sizeof(dst_str)); - delete_nl(neigh.nda_ifindex, dst_str); - } + delete_nl(neigh.nda_ifindex, dst_str, false); /* no warn */ + } else + print_entry(&neigh, &link); + count++; snl_clear_lb(&ss_req); } @@ -391,8 +392,9 @@ print_entries_nl(uint32_t ifindex, struct sockaddr_in6 *addr, bool cflag) } int -delete_nl(uint32_t ifindex, char *host) +delete_nl(uint32_t ifindex, char *host, bool warn) { +#define xo_warnx(...) do { if (warn) { xo_warnx(__VA_ARGS__); } } while(0) struct snl_state ss = {}; struct snl_writer nw; struct sockaddr_in6 dst; @@ -458,6 +460,7 @@ delete_nl(uint32_t ifindex, char *host) snl_free(&ss); return (e.error != 0); +#undef xo_warnx /* see above */ } int From nobody Mon Oct 23 21:09:54 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SDnrf53dkz4yVhQ; Mon, 23 Oct 2023 21:09:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SDnrf4Qv3z3TW2; Mon, 23 Oct 2023 21:09:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698095394; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fZs9DweRE23qISofwTvVuMHLn+7uRLjs0ndnfPxHmfk=; b=DfywR7RenFLSnxlVJnEo5syT/dt8uujMpAyLc0DU0Fnl2EfHubErhe38kPOUZhmjFFpaln UY6WPByFq7yBf4G0+IRQEaN9tQ0tcRHdO5BbPCBayBX7aq+8fLX5jzAwzKQFpcrgy28Hbq wMrbybtfxxSA0Kc/6xTMWQdjZ9TGK/IEagqN6tbZgz9GeyZ9rWVE/6Q89OqdbXexqKXtQ/ 4ANo1hEAPRyooLwtrLK9t0fwwW4GqmBIwM1GXUayqAHZNTW65/FM+c8uEBl6lu/3ONuInc oH6uK02xLbxDSo5BnCsvGf0mZ0SdGRdwFEFiUo+X2EL+1L9ag4ZVXpE4aulNlQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698095394; a=rsa-sha256; cv=none; b=NByS4mEbsQJ6L6AxsYoxkyp5CbdU/99vyg9TqiFIIGUWyM3L6vOLYTHx8cvqCwKZCXZGf6 yfkDtaRDzS5gpQsMaIrz8WblO2jgvtoNWuRZMaaaaOTNYYy7L7Kci0wGpDZ3ELT0V1Zw21 vdqBgj622hok9onGFGjeJNVVY4sExoItFySXcvZWRP2otaEEUqLUE1ZfezHRnI2W1ni5D2 Nxt8bgvZ54cQOdl7cNL1tuCrLIAVhpBPVLNbVP9vGq8/yJoDyOL6eSMhriwcuJdkZcUWOH Pr/DI+m31lmPHYSLjU7WMOCJwlczWapZ4RnVaU4ZbXlAz/W4+k+lVy5MwW3xJg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698095394; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fZs9DweRE23qISofwTvVuMHLn+7uRLjs0ndnfPxHmfk=; b=B/Ft1tE2KB05irtdjQLwMcb/2ItZnLUKnoJIo+9uuyLVybBrvVWYwX5Ooc4GnqdR93TmyL sCmp2vDElbrNm3FPHjmzb4aJPNA1yWRTTdA38X1df7y0SupU7p93Awe0ZGC8zzYYb1SR3T 7UVqU5FAS8EwxzuqcZorQ2V26UNyFOTvscw3fxI9643p0S/i8K++CNHkzbIUQU0Ga1ZsEa pDreqoZg5hsoLzpyiZlHZiBktLu4qlS7U2ycWCoRtwB9ABPrl4U627WeJXU9T2jQos7ZRa rRXbuCFaqAFbNPDCqOnCaP2SlfcU0QTl6bzkr3+VBGkZ5tsCP8dxDag52dvrZg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SDnrf3Rrzzw6w; Mon, 23 Oct 2023 21:09:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39NL9smc036392; Mon, 23 Oct 2023 21:09:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39NL9sWD036389; Mon, 23 Oct 2023 21:09:54 GMT (envelope-from git) Date: Mon, 23 Oct 2023 21:09:54 GMT Message-Id: <202310232109.39NL9sWD036389@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: afd74c400075 - main - cap_net: correct capability name from addr2name to name2addr List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: oshogbo X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: afd74c400075d94e01dd3430844bb290834660ef Auto-Submitted: auto-generated The branch main has been updated by oshogbo: URL: https://cgit.FreeBSD.org/src/commit/?id=afd74c400075d94e01dd3430844bb290834660ef commit afd74c400075d94e01dd3430844bb290834660ef Author: Mariusz Zaborski AuthorDate: 2023-10-23 21:03:51 +0000 Commit: Mariusz Zaborski CommitDate: 2023-10-23 21:11:23 +0000 cap_net: correct capability name from addr2name to name2addr Previously, while checking name2addr capabilities, we mistakenly used the addr2name set. This error could cause a process to inadvertently reset its limitations. Reported by: Shawn Webb --- lib/libcasper/services/cap_net/cap_net.c | 2 +- lib/libcasper/services/cap_net/tests/net_test.c | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/lib/libcasper/services/cap_net/cap_net.c b/lib/libcasper/services/cap_net/cap_net.c index bbb2a666440f..a8f039f81843 100644 --- a/lib/libcasper/services/cap_net/cap_net.c +++ b/lib/libcasper/services/cap_net/cap_net.c @@ -1232,7 +1232,7 @@ verify_name2addr_newlimits(const nvlist_t *oldlimits, oldfunclimits = NULL; if (oldlimits != NULL) { oldfunclimits = dnvlist_get_nvlist(oldlimits, - LIMIT_NV_ADDR2NAME, NULL); + LIMIT_NV_NAME2ADDR, NULL); } cookie = NULL; diff --git a/lib/libcasper/services/cap_net/tests/net_test.c b/lib/libcasper/services/cap_net/tests/net_test.c index 5522f92516eb..dcb897de467b 100644 --- a/lib/libcasper/services/cap_net/tests/net_test.c +++ b/lib/libcasper/services/cap_net/tests/net_test.c @@ -783,6 +783,18 @@ ATF_TC_BODY(capnet__limits_name2addr_hosts, tc) limit = cap_net_limit_init(capnet, CAPNET_NAME2ADDR); ATF_REQUIRE(cap_net_limit(limit) != 0); + /* Try to extend the limit. */ + limit = cap_net_limit_init(capnet, CAPNET_NAME2ADDR); + ATF_REQUIRE(limit != NULL); + cap_net_limit_name2addr(limit, TEST_DOMAIN_1, NULL); + ATF_REQUIRE(cap_net_limit(limit) != 0); + + limit = cap_net_limit_init(capnet, CAPNET_NAME2ADDR); + ATF_REQUIRE(limit != NULL); + cap_net_limit_name2addr(limit, TEST_DOMAIN_0, NULL); + cap_net_limit_name2addr(limit, TEST_DOMAIN_1, NULL); + ATF_REQUIRE(cap_net_limit(limit) != 0); + cap_close(capnet); } From nobody Mon Oct 23 21:42:24 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SDpZ83g5cz4yX53; Mon, 23 Oct 2023 21:42:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SDpZ83GPXz3WdN; Mon, 23 Oct 2023 21:42:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698097344; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eHvgFJLoS2Jn3cOekE8ZYzy3K/U7C0eRWh478kdC3Zg=; b=iRVb45Owrzx+T3WdSErp8Ntt5IYcVFUzx+hXKLr+64tMp4j4G6S880ZvP40usgPSve23xJ 8y8Vc2AXcR5o/bQNAzgmqkXlEEEFxgaDiPyNUCJiZn+wcs55Rh0BWkaO4TNizeEAzKrMTi 1SdhByZE36N5+P1IWz3zKvGw4lK82yp4QZocKfXyB3yxNgytvGmkFPrC8EuwSsSiOisR4Z i3sgMIbOb7JECe2bY76m7lBU8hatX3TgXhVSp0YdEFYZ+OVx3OzUI59+NAYdZ93Z59QQ+e 82UP5DVnce4P8wEvCV6QVf+GnAgOAh9Y7TAA3a+IliQ2zQjOX5ZNuIa9O4uLuQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698097344; a=rsa-sha256; cv=none; b=TEgn10CBBlhqNfsx/SW0F22AtdJsj7fqksgrac2wvwgi87q0mq28pGFVLofk7cvzRRjVEG OFVF/fJJu5XZrfrgZ7GUcHh+NjiYYFcpfgg+egA10GsLvwNGludbdsFfkFTJrq4KAm7y1+ /fX4JIIpaRVs0WL+6pGTAgBZqTKAYaTKde53KlXjFixGLZBMlKHBCPdM5ALe+4zcdt/wss SoihrI5zYjp5kgRDKtSdJqN00nwbgPVsebBQbOTVF2zE6TOmYV+Wts+kQ4n5b+1KOca2wq PXM2RlABdTajmslo6N2Qzx8fQ7LmjhjCbuKRidJfT0ToKSO8T8T/S3EJpv64wQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698097344; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eHvgFJLoS2Jn3cOekE8ZYzy3K/U7C0eRWh478kdC3Zg=; b=q0pNIC8CVAiNlNJZncmGUD9/wuxi5u40Lfp+V4qdTiFKksf8s8KFuF8kRgZSYh7jAp2iCq n5R9ec1CSNhOqGyCEq+wfIUAXY9YA9YA/guMzSbNiRZmHoa9iQisHpGhkeK1Oj/aj8uzGu PaZc4BRzHo1x4UboU7CHpGRkyaxTZEr4TwkZo+Bmycqna7NHtH77g+p1kwcNk/48p/0997 P3ufSmXtmo5bJCY6c9HOMbU3HaTrso1dCnZ4XXVAMTAWN/DqEpa2A6w09LIIbx2m4AugsS uQ3VV1aaFqKL57bxOPX0dsreclP6clA8lQRqOUzbP9Ao9nL9uyqX8YFb/5avSQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SDpZ82JhXzwM6; Mon, 23 Oct 2023 21:42: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 39NLgO74001708; Mon, 23 Oct 2023 21:42:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39NLgOWG001705; Mon, 23 Oct 2023 21:42:24 GMT (envelope-from git) Date: Mon, 23 Oct 2023 21:42:24 GMT Message-Id: <202310232142.39NLgOWG001705@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: 82ea0132c8b1 - main - gssd: Add support for the new upcall required by commit 428879dc9110 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 82ea0132c8b17a7a6067c8a36c6434e587ede6de Auto-Submitted: auto-generated The branch main has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=82ea0132c8b17a7a6067c8a36c6434e587ede6de commit 82ea0132c8b17a7a6067c8a36c6434e587ede6de Author: Rick Macklem AuthorDate: 2023-10-23 21:41:26 +0000 Commit: Rick Macklem CommitDate: 2023-10-23 21:41:26 +0000 gssd: Add support for the new upcall required by commit 428879dc9110 Commit 428879dc9110 adds a requirement for a new upcall for the gssd(8). This patch adds that upcall. Unfortunately, the old gssd.c would not build against the new patched gssd.x. This patch will fix the build. MFC after: 1 month --- usr.sbin/gssd/gssd.c | 68 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 68 insertions(+) diff --git a/usr.sbin/gssd/gssd.c b/usr.sbin/gssd/gssd.c index 59e0fc057f84..a22891f3bebf 100644 --- a/usr.sbin/gssd/gssd.c +++ b/usr.sbin/gssd/gssd.c @@ -33,6 +33,7 @@ #include #include #include +#include #include #include #include @@ -42,6 +43,7 @@ #ifndef WITHOUT_KERBEROS #include #endif +#include #include #include #include @@ -49,6 +51,8 @@ #include #include #include +#include +#include #include #include #include @@ -624,6 +628,51 @@ gssd_import_name_1_svc(import_name_args *argp, import_name_res *result, struct s return (TRUE); } +/* + * If the name is a numeric IP host address, do a DNS lookup on it and + * return the DNS name in a malloc'd string. + */ +static char * +gssd_conv_ip_to_dns(int len, char *name) +{ + struct sockaddr_in sin; + struct sockaddr_in6 sin6; + char *retcp; + + retcp = NULL; + if (len > 0) { + retcp = mem_alloc(NI_MAXHOST); + memcpy(retcp, name, len); + retcp[len] = '\0'; + if (inet_pton(AF_INET, retcp, &sin.sin_addr) != 0) { + sin.sin_family = AF_INET; + sin.sin_len = sizeof(sin); + sin.sin_port = 0; + if (getnameinfo((struct sockaddr *)&sin, + sizeof(sin), retcp, NI_MAXHOST, + NULL, 0, NI_NAMEREQD) != 0) { + mem_free(retcp, NI_MAXHOST); + return (NULL); + } + } else if (inet_pton(AF_INET6, retcp, &sin6.sin6_addr) != 0) { + sin6.sin6_family = AF_INET6; + sin6.sin6_len = sizeof(sin6); + sin6.sin6_port = 0; + if (getnameinfo((struct sockaddr *)&sin6, + sizeof(sin6), retcp, NI_MAXHOST, + NULL, 0, NI_NAMEREQD) != 0) { + mem_free(retcp, NI_MAXHOST); + return (NULL); + } + } else { + mem_free(retcp, NI_MAXHOST); + return (NULL); + } + gssd_verbose_out("gssd_conv_ip_to_dns: %s\n", retcp); + } + return (retcp); +} + bool_t gssd_canonicalize_name_1_svc(canonicalize_name_args *argp, canonicalize_name_res *result, struct svc_req *rqstp) { @@ -933,6 +982,25 @@ gssd_display_status_1_svc(display_status_args *argp, display_status_res *result, return (TRUE); } +bool_t +gssd_ip_to_dns_1_svc(ip_to_dns_args *argp, ip_to_dns_res *result, struct svc_req *rqstp) +{ + char *host; + + memset(result, 0, sizeof(*result)); + /* Check to see if the name is actually an IP address. */ + host = gssd_conv_ip_to_dns(argp->ip_addr.ip_addr_len, + argp->ip_addr.ip_addr_val); + if (host != NULL) { + result->major_status = GSS_S_COMPLETE; + result->dns_name.dns_name_len = strlen(host); + result->dns_name.dns_name_val = host; + return (TRUE); + } + result->major_status = GSS_S_FAILURE; + return (TRUE); +} + int gssd_1_freeresult(SVCXPRT *transp, xdrproc_t xdr_result, caddr_t result) { From nobody Mon Oct 23 23:36:56 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SDs6K118xz4ydLR; Mon, 23 Oct 2023 23:36: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 4SDs6K0Bjcz3gbW; Mon, 23 Oct 2023 23:36:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698104217; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=L96eniPnNs6F9qfawRf1Gr5XpQ6FpO5+Bj6lF5AonZg=; b=VNnTrP33ySbgVJ74A/YVve9S5i0kK/P1a+mfHhsD8ZW7ROU61ZULP7cC1P0f+1Z0zIis9Y KHyp10pM6YWhCipqC7gZ0sgPf3GiA64TbZ70oOMvgMroM6+3sTcIwXmVn8nhY1CM+ws7T7 1oXF9TBM8SF6qp65E5tv992a6m8mV+DrV9Qjr7ed9POtnKVJUawU3fE4dqRRBeftsCMohS h63dioPvrdph+o/a20E9dGBBm32zqlu+/F6+GW/FTdbzT49AvwsO4DA8xA3tGJGbNP7MW3 PR+ns/XqbOzriZeYZltoVfqtZHhygSCEwS7SyrCo2RUTHUI1wXpwrZgWVX3a2g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698104217; a=rsa-sha256; cv=none; b=w/kXysbDTq2u2Kdhi6fL06ludIuVcuXOCJXKE731l4F0Ltha5fdA+TR23ESEDl/MP5XR6e nLDI0no+oAgAGxTTLbGbFYLpFLnIiZV2z0lQ+KEGiRBn/GuXjGTPQcjt+dvA03yliqjDBn mC8blbyQPAkm02VVLUxMopSDgxyBWuWS2SFdj0S0Onj6fXWb6K5As2Cs9+oMjSTQ8e52vg UA7GjhRhxNX+aDIpgUyyzHLb2yYQ1oM5VkJv8EPYOkev9C2ix/RsyDGHkyJgXz9uRUK982 eRwh/G464UYBk+jUARwfJJRPZH8nEfkoUNbLmZ/YsKOMv+5aT/OeIF/9SccmBA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698104217; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=L96eniPnNs6F9qfawRf1Gr5XpQ6FpO5+Bj6lF5AonZg=; b=fuC9FxQSUeiMq5chYQBG8LcyCwH3slzus5P0Gq3unBZFOLKsNiTl58yk8ut87Sb4ywuLpl lu+vgi70JSZDpFfkQuxOTgjunZH8SO2C6iYJAZ/e2P4OcrUmPb3qQLC8hrjzGiAmXEJRgV TNMwIQRJNpUsNEJbwiwL3PBmQ9R5miIL+ux+50MrhTCvYMd9DbNQIaKhUFY5ODlznvlCkp Ti5zHrA5c3lJVqplkTQs/dEgCyQoJ1+da4NmZ1u6cBCuOyr+43R4CzQNPFLJx6HkGZfYH6 Jlul4HUSJRMUyOd2lfCafA+0QL2iKDte7oCntggAr2IEmV8vU2pTtT5w6CWmJg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SDs6J6NLTz10Qj; Mon, 23 Oct 2023 23:36: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 39NNauLO087586; Mon, 23 Oct 2023 23:36:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39NNaurN087584; Mon, 23 Oct 2023 23:36:56 GMT (envelope-from git) Date: Mon, 23 Oct 2023 23:36:56 GMT Message-Id: <202310232336.39NNaurN087584@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: 6561fec386a6 - stable/14 - freebsd-update: allow user to break out of conflict resolution loop List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 6561fec386a6cbe65b3f9661db797317ab6a99b4 Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=6561fec386a6cbe65b3f9661db797317ab6a99b4 commit 6561fec386a6cbe65b3f9661db797317ab6a99b4 Author: Ed Maste AuthorDate: 2023-03-03 17:32:51 +0000 Commit: Ed Maste CommitDate: 2023-10-23 23:35:57 +0000 freebsd-update: allow user to break out of conflict resolution loop When a conflict marker is found during update allow the user to confirm they want it to remain in the file. Suggested by: Tim Hogard Reviewed by: imp Sponsored by: The FreeBSD Foundation Fixes: ceb5f28ba5fc ("freebsd-update: re-edit files if merge confli...") Differential Revision: https://reviews.freebsd.org/D38896 (cherry picked from commit 3d44241546173de00852ab5e22263ba538cd8759) --- usr.sbin/freebsd-update/freebsd-update.sh | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/usr.sbin/freebsd-update/freebsd-update.sh b/usr.sbin/freebsd-update/freebsd-update.sh index c6432dcd6b0e..0cfd29731126 100644 --- a/usr.sbin/freebsd-update/freebsd-update.sh +++ b/usr.sbin/freebsd-update/freebsd-update.sh @@ -2544,7 +2544,11 @@ Press Enter to edit this file in ${EDITOR} and resolve the conflicts manually... EOF while true; do - read dummy /dev/null; then + echo + break + fi ${EDITOR} `pwd`/merge/new/${F} < /dev/tty if ! grep -qE '^(<<<<<<<|=======|>>>>>>>)([[:space:]].*)?$' $(pwd)/merge/new/${F} ; then @@ -2555,7 +2559,8 @@ manually... Merge conflict markers remain in: ${F} These must be resolved for the system to be functional. -Press Enter to return to editing this file. +Press Enter to return to editing this file, or type "ACCEPT" to carry on with +these lines remaining in the file. EOF done done < failed.merges From nobody Tue Oct 24 00:04:49 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SDskT3Cmcz4yfMw; Tue, 24 Oct 2023 00:04: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 4SDskT2Qs4z4GNX; Tue, 24 Oct 2023 00:04:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698105889; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4yCDTz0eA3m6VrYgBvDDD0q2Ai2+eV+iTkX0P1EMZ5A=; b=dI0KAuQm5CVUjXehsNQA0YZq9B7UrH3unejSQq+ku8Zv8kDTQhOvuYLwlyyggRqxZ9yue/ hYE8Bfc0A5JQQKsC+N0HS3Jm9ljaCG9pYoSOLqKCrUP7eNqbRwIAsmfQ3ALptCDqGwPp3p IoWiPR71GA96Fqk8sR8iUStvaRlmxpOxx+oow8IGaQ6lwIqYE6iSKuCR6mhojJbhdZWoqd Z3KlrqVIIiJtGGbelwj4+1PVLXwkSLSgtT2w3Y8kudsT0LyJZQFjY1hNCVoS0fvlDAIgwt IFx92GKB9g1TIPgieEmkieKvdMmZNO1SwnDx5IHN3td7pIcIEiGr1sy4amrirQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698105889; a=rsa-sha256; cv=none; b=EaXq40ILvHO51Bx1nYofNco8Dtavwve7FcBtv7tY4nq2BBb78QqkS/JvYUGwmaZ1J6r5BG C4nrfm3UrrJNrlMhSf2C+uvatO8aj3eZYJdw7GKR3r3P97h7FjNvx0yktlW3vA9JYphfqe 4JYuJpnyQ6hlLwyqGucifgjVacSNDrKPwcSnidUq5DtfVgb1PMyQBKfxphsSsF+BK9Tisd Rc5akYfv97r2eCaockp0u+2ZqIkvg5GB/Vg4l1WSk/3iSMS8neFAeDf8VLYbknW9qHr4eh bQWRcHDCCklX9Ssx626m9YLx4gq3E9tkNfvTdfZ4Ezc5sYw2kLZpowC62Y9lwQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698105889; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4yCDTz0eA3m6VrYgBvDDD0q2Ai2+eV+iTkX0P1EMZ5A=; b=lwPnC944dkLh+sIyWqOYG8b/VqixZaehsB5v29in6Gn2+CLZg1XIB45+bnUOZn+ShaJM3G AJ54Q1CMEAVq9KMxUu+Kz7Dv0FneYJNdV2h+X1jl833vb50y/8Lepkr1VfhGnMjFtBY28n w/GPSal/dXGrTp+I0/yOndsfYRhqYOA1r5oe2aSyOcjppFFwPdk4ucjmnxV8VZwMM0DunF zD4floKUP1pwsN9C9w3Pgb0q9VIReAIAEkxg3rd74wHlbeTlycrzimz4RWF6ugBFqBH9c/ nipOxHLnU8D/AWIwHSEXu4dwt4nNSUjfhW1HYuEAFxYGQ8jN89/BV3ZK+bYT3A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SDskT1J0tz114x; Tue, 24 Oct 2023 00:04: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 39O04niT037616; Tue, 24 Oct 2023 00:04:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39O04nrW037612; Tue, 24 Oct 2023 00:04:49 GMT (envelope-from git) Date: Tue, 24 Oct 2023 00:04:49 GMT Message-Id: <202310240004.39O04nrW037612@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: 5c2a559876d1 - stable/14 - freebsd-update: create deep BEs by default List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 5c2a559876d123ba386612319bf42e7b32dee590 Auto-Submitted: auto-generated The branch stable/14 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=5c2a559876d123ba386612319bf42e7b32dee590 commit 5c2a559876d123ba386612319bf42e7b32dee590 Author: Kyle Evans AuthorDate: 2023-10-12 02:51:07 +0000 Commit: Kyle Evans CommitDate: 2023-10-24 00:04:14 +0000 freebsd-update: create deep BEs by default The -r flag to bectl needs to go away, and we need to just do the right thing. In the meantime, we can apply an -r in freebsd-update as a minimal fix to stop creating partial backups in these (non-default) deep BE setups. PR: 267535 (cherry picked from commit 989c5f6da99081b1f2b76ec09e91078e531e1250) --- usr.sbin/freebsd-update/freebsd-update.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/freebsd-update/freebsd-update.sh b/usr.sbin/freebsd-update/freebsd-update.sh index 0cfd29731126..f5289e1cd9fc 100644 --- a/usr.sbin/freebsd-update/freebsd-update.sh +++ b/usr.sbin/freebsd-update/freebsd-update.sh @@ -916,7 +916,7 @@ install_create_be () { echo -n "Creating snapshot of existing boot environment... " VERSION=`freebsd-version -ku | sort -V | tail -n 1` TIMESTAMP=`date +"%Y-%m-%d_%H%M%S"` - bectl create ${VERSION}_${TIMESTAMP} + bectl create -r ${VERSION}_${TIMESTAMP} if [ $? -eq 0 ]; then echo "done."; else From nobody Tue Oct 24 00:04:53 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SDskY5bt0z4yf8n; Tue, 24 Oct 2023 00:04:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SDskY47tzz4GbS; Tue, 24 Oct 2023 00:04:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698105893; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aqaCd/acjRS4O/YWgRLueRWuEr4X37AIs6SSodYdX+0=; b=BMUfSzZfYUPfrNkmtkTihj93T9ZelNynAn/cAz1kbYnk9c3PQ53NtPqBOSf7+BebLKMqbs ZFKJtk9/KVsOERHsGMG1Nu9agLMPMhij/Mq+T+TVGxxpD+bT5MMPaGJNSPFBU3N1fkPGVJ gJy/I71vtmtmmOr2vyvghBO6onhSNTuFWJnJs4A9j7djguJOWBZjbJi/HWPSukMDE+3nWF 06YQtI8SntlWyGNUp1kwLvP7eLOIY7sRz+hBuAzZ1Oxb62b1rCFuCvYMhh5Y3nQNZegfU9 i1HMPTdzv7lbf11DgkeT/btWHhDj8TbK6LTi2Sb91XirtYfIGtkBwFmapbS9Sg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698105893; a=rsa-sha256; cv=none; b=a6JOMZGCeqKJJdghXapYB1mSogieS0oLKkE0WeGqSeK2MMkvS+LOWnLccugIh4AdsOqqOV KQ/c0JizF/G2FrEx0IxgX/WxqlOHDDH6GEjUNeur86ARMoZHqPtI7jN68+9l4kGRbnwpPg 9JmrXaoFSNJN2CBB7J55Sa5N7NljejE/RHbmRf1SwfJXHIBSRGb1ryx336SLQRNCDI2giE r5scxCUjZ0YAClBVx0OUQ03xYi01oVZsxwDXmVe8GDnaJM6trov5zV1D0sm3H8hwKD/KmY atotsXFSb4MuPOXZwVFm4iY6PYkv3OA5yzeS8HY9Ck/4fS+VydR9SCjqw83vCg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698105893; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aqaCd/acjRS4O/YWgRLueRWuEr4X37AIs6SSodYdX+0=; b=PFgmB+Vjybv90y+NRnurkklVy/tFu9+pilPff8gRUMgo2+hmmeBaAfhzgu5e2PPch6xNo4 A53/JjY0+VirS9z7hp5MvsC3GL4aEgkd5X5Rz+d8Iusq/dwTcBTqtHeJfzax3G6jNmSm9i A/O9xCXogt3TYXyNQCBrcLxGjgdItmcHQVCYOqZgqAJMycNNEh0B161Ltqcu8xrS1IIiFd 2U8nVYDmjLOtFUkhSRL6MWpGI2v3jWzoblH+BoxxE5xsrALAHaAREQlwLMSLciadRhf0Gh /P+cpfJZiY3kdma3SDPa4g3ut+gODO1QCZxjqshOdsIdJqJqpQOYWsvlAtyDwQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SDskY3G1sz10Fw; Tue, 24 Oct 2023 00:04:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39O04rW4037763; Tue, 24 Oct 2023 00:04:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39O04rwX037760; Tue, 24 Oct 2023 00:04:53 GMT (envelope-from git) Date: Tue, 24 Oct 2023 00:04:53 GMT Message-Id: <202310240004.39O04rwX037760@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: c1c0873c9d3f - stable/12 - freebsd-update: create deep BEs by default List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: c1c0873c9d3f6c05168303d0b95f9363c1e6c371 Auto-Submitted: auto-generated The branch stable/12 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=c1c0873c9d3f6c05168303d0b95f9363c1e6c371 commit c1c0873c9d3f6c05168303d0b95f9363c1e6c371 Author: Kyle Evans AuthorDate: 2023-10-12 02:51:07 +0000 Commit: Kyle Evans CommitDate: 2023-10-24 00:04:42 +0000 freebsd-update: create deep BEs by default The -r flag to bectl needs to go away, and we need to just do the right thing. In the meantime, we can apply an -r in freebsd-update as a minimal fix to stop creating partial backups in these (non-default) deep BE setups. PR: 267535 (cherry picked from commit 989c5f6da99081b1f2b76ec09e91078e531e1250) --- usr.sbin/freebsd-update/freebsd-update.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/freebsd-update/freebsd-update.sh b/usr.sbin/freebsd-update/freebsd-update.sh index 5a523775dbbb..f89ee032e1f8 100644 --- a/usr.sbin/freebsd-update/freebsd-update.sh +++ b/usr.sbin/freebsd-update/freebsd-update.sh @@ -918,7 +918,7 @@ install_create_be () { echo -n "Creating snapshot of existing boot environment... " VERSION=`freebsd-version -ku | sort -V | tail -n 1` TIMESTAMP=`date +"%Y-%m-%d_%H%M%S"` - bectl create ${VERSION}_${TIMESTAMP} + bectl create -r ${VERSION}_${TIMESTAMP} if [ $? -eq 0 ]; then echo "done."; else From nobody Tue Oct 24 00:05:01 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SDskj5jCMz4yfJ9; Tue, 24 Oct 2023 00:05:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SDskj5FBgz4GjX; Tue, 24 Oct 2023 00:05:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698105901; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EN77u2WeFEkwoCIe+zyp8LQDTZBjfNWj8D9gshZVrqg=; b=Vt4ktZo5w2G1b3ABU/fMmWmIaJIm+Fu5SllYKYt0AItpyWcqT0sqwAWQmY5lDV9vi95ghU w/whEZonzE+sjeB9yR8CmxVCv5sjmnS7shqHmFNS1JhoDNJJk9/dz8PkewKPIIHQU/ZUjt FlqTQeIEAwEZlGkqwz3XxAJC8nFv85DFPfvyfh0hLB69nvwNEe7qji1lwlopm+7o45AqW+ Uim2N1+RqFXz1gVbM3pVX3RXRZGxmtokDnM8tStg9lEbqXMQdUxjb0VEHUCBY3H8Z3VCNU AgD9hGqy6DcAKVXoCxsKFCKDiYZDgUywQD4G23ghxK8yvrGdidh2bUskyTUpLA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698105901; a=rsa-sha256; cv=none; b=kVQ8N+1B/vxLEFxmh85H3lmZh33VN7Xpmor5r4iqA0stRQnBryIB8SJBGi5KrSA4a2BLpf J7X7RZDVvc3TsEclUHLGP8h2cl8T9SFNDL9LQgWKMKZhpcGjbizBTgkkS9eJ0a0xKSEX5Y zGlgslwL+/a4kUBtLQJQ3eizZZBk9naA0cFEjnK02aGsjeH8xndXcSlYyy9+Fwyxq9J91X HVzLqr/v0vVtC18K3H4FfW4KDJsuhSv3ibmVVM3xHlQ4Ie7pMMrIuT7rw/Xurdki2EYQF4 57ZeAlR5yRAZuUiAOwq06lD5qAbDEBu8vruP23nGrPvUiRYwmaEcj7ImKLV7/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=1698105901; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EN77u2WeFEkwoCIe+zyp8LQDTZBjfNWj8D9gshZVrqg=; b=trcTnrYC/CIAdGFwxlsRVvKqruUtL633dm3k5Q1Dj1sWKxobu+Enlrv9KhVw0/+0DaEoF3 5EXrYVzlxXGTHtZn3NifZDd7ZEL3D+VDcwf5pQFxj0ilBogofY83fDi+2Lg/grQCBaDkqs SwMYFyGVtGyLsUcNSzRCBKHhjHMS0bGZrTpdFUn0QUGpSEyBBNnzU+YwsXZlo6xAHi0Y0c 8ci6CywkwN6go64bNApVJ3PDJcP4pNY8G9SvIqF3b8e0aZ+pXOxDzK+xnsuJQfZR6NLX3f O7s5WA/7WDrhiY226foAM5YXMdUs0E3lx5gHCUugSUfpYmRMxC/s5mmCGkv7fw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SDskj4HDGz11L7; Tue, 24 Oct 2023 00:05:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39O051Ol037945; Tue, 24 Oct 2023 00:05:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39O051QC037942; Tue, 24 Oct 2023 00:05:01 GMT (envelope-from git) Date: Tue, 24 Oct 2023 00:05:01 GMT Message-Id: <202310240005.39O051QC037942@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: 80f747781f12 - stable/13 - freebsd-update: create deep BEs by default List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 80f747781f125576de40ab8b3d8d70b351ef0518 Auto-Submitted: auto-generated The branch stable/13 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=80f747781f125576de40ab8b3d8d70b351ef0518 commit 80f747781f125576de40ab8b3d8d70b351ef0518 Author: Kyle Evans AuthorDate: 2023-10-12 02:51:07 +0000 Commit: Kyle Evans CommitDate: 2023-10-24 00:04:18 +0000 freebsd-update: create deep BEs by default The -r flag to bectl needs to go away, and we need to just do the right thing. In the meantime, we can apply an -r in freebsd-update as a minimal fix to stop creating partial backups in these (non-default) deep BE setups. PR: 267535 (cherry picked from commit 989c5f6da99081b1f2b76ec09e91078e531e1250) --- usr.sbin/freebsd-update/freebsd-update.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/freebsd-update/freebsd-update.sh b/usr.sbin/freebsd-update/freebsd-update.sh index c6432dcd6b0e..438e13a51154 100644 --- a/usr.sbin/freebsd-update/freebsd-update.sh +++ b/usr.sbin/freebsd-update/freebsd-update.sh @@ -916,7 +916,7 @@ install_create_be () { echo -n "Creating snapshot of existing boot environment... " VERSION=`freebsd-version -ku | sort -V | tail -n 1` TIMESTAMP=`date +"%Y-%m-%d_%H%M%S"` - bectl create ${VERSION}_${TIMESTAMP} + bectl create -r ${VERSION}_${TIMESTAMP} if [ $? -eq 0 ]; then echo "done."; else From nobody Tue Oct 24 00:46:30 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SDtfb1YTGz4xD4F; Tue, 24 Oct 2023 00:46: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 4SDtfb13qNz4N9T; Tue, 24 Oct 2023 00:46:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698108391; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=B3g7FG5ukQ3UhgtxwXILJlRS+NSJtdci2qrN+lnGaI4=; b=gdfRDYtTN0VhWiOeNR0nqWO40LWLc/te7E/Z2BY6lJNp+sZ4lm658747xPpnCJ/1KSADM9 hplUAEFJm6IKJRjD5SN90OY9r0PdesMpd9UD89s4Z3SpV8rjmQ8L/WWAFCnGTUPf3XlRPn Bvd3Ph3jK3vcOnJ/0chhAO4t+xfwoLILs6Lyqok2CM76iFdHcDnZd+gZl4ihvH2CstVLfi c/mOCG78VFqFHaOqguJOYClLD4mjGpnk63TFhJQUjBlzpPISgDX5JWjdbjZE5vcoRLHYfI 5Q1bGRvJKimmH46jDpccWZfGgIQVCbQY96DmTG6Vk2bYbjdK3sqGz+EneitQeQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698108391; a=rsa-sha256; cv=none; b=al2E/S1OdIvaT5jo7BZ7n0u+TNbr/3nMo/wDTxn92i7S1GetAMRY6e2LjPllvFnSk0X5H5 IeqrEnciA2EwrcxuIUwPDyYNNHDovU7kJjfJpnDZGARRGGUSfBiBKpzoiH9h5JQE6Yfi67 rQUgI8ZAEPsecZV6mfkH0w+o52OacP5EzDegsPJtp+hPsg1wJhJFoiRbygcgiqUGd+aixI WySeC3ZJVy8HPHOl2CL+2Hu8+z6ZOHsbkSG9cg+Zg1Apyz4rdPv3WAv8x+Q1oswVHOQJ/1 R/N6YeGEoCYDi9fairtbvvMsP9p8m880Wzl1wDR5S1QvUp0HtRXA/oI0lDnfPg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698108391; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=B3g7FG5ukQ3UhgtxwXILJlRS+NSJtdci2qrN+lnGaI4=; b=FlwjHVKIVCtaPAw093hju8LW4nT/dBc/i38x6TsPDPNk6ydvD5niDTX2rRp4Mmnw6akmFa ihrfFLq4j90ryCCHCH2yDP5rcft5hk1Y4K+P2ob6oMdLEU7neBwF2S72wpWu5n7nuNSBds e0PXf66izGMSX25FSZtw/tof1Urb9XGXoz32RRDaisuFB7FBXq/DGTwzKmAstSMi44icBY kY6ZInmyyBbY4rHbBcXiSCL9C9dOa66TxLd/yDPJO43gKBfNCXrn5Rqdg+WooxHmYLxRr9 PB6RbMHcTBnViWLrT9DWiQzVA9BlfYoDxwhF9pAB7tU+UQBQXG9NcpqIroX2gw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SDtfb06HTz1289; Tue, 24 Oct 2023 00:46: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 39O0kUl0004339; Tue, 24 Oct 2023 00:46:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39O0kU8X004336; Tue, 24 Oct 2023 00:46:30 GMT (envelope-from git) Date: Tue, 24 Oct 2023 00:46:30 GMT Message-Id: <202310240046.39O0kU8X004336@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: be2333b68d71 - stable/14 - nmount(MNT_UPDATE): add optional generid fsid parameter List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: be2333b68d71bea99768749db3057f4fd66f9d5d Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=be2333b68d71bea99768749db3057f4fd66f9d5d commit be2333b68d71bea99768749db3057f4fd66f9d5d Author: Konstantin Belousov AuthorDate: 2023-09-29 18:42:50 +0000 Commit: Konstantin Belousov CommitDate: 2023-10-24 00:46:01 +0000 nmount(MNT_UPDATE): add optional generid fsid parameter (cherry picked from commit 9ef7a491a4236810e50f0a2ee8d52f5c4bb02c64) --- sys/kern/vfs_mount.c | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/sys/kern/vfs_mount.c b/sys/kern/vfs_mount.c index 8364081585f8..aa4642c0ba8c 100644 --- a/sys/kern/vfs_mount.c +++ b/sys/kern/vfs_mount.c @@ -1313,9 +1313,10 @@ vfs_domount_update( struct vnode *rootvp; void *bufp; struct mount *mp; - int error, export_error, i, len; + int error, export_error, i, len, fsid_up_len; uint64_t flag; gid_t *grps; + fsid_t *fsid_up; bool vfs_suser_failed; ASSERT_VOP_ELOCKED(vp, __func__); @@ -1378,10 +1379,24 @@ vfs_domount_update( VI_UNLOCK(vp); VOP_UNLOCK(vp); + rootvp = NULL; + + if (vfs_getopt(*optlist, "fsid", (void **)&fsid_up, + &fsid_up_len) == 0) { + if (fsid_up_len != sizeof(*fsid_up)) { + error = EINVAL; + goto end; + } + if (fsidcmp(&fsid_up, &mp->mnt_stat.f_fsid) != 0) { + error = ENOENT; + goto end; + } + vfs_deleteopt(*optlist, "fsid"); + } + vfs_op_enter(mp); vn_seqc_write_begin(vp); - rootvp = NULL; MNT_ILOCK(mp); if ((mp->mnt_kern_flag & MNTK_UNMOUNT) != 0) { MNT_IUNLOCK(mp); From nobody Tue Oct 24 00:46:32 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SDtfc2fJSz4xDFB; Tue, 24 Oct 2023 00:46: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 4SDtfc284Vz4N2J; Tue, 24 Oct 2023 00:46:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698108392; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=n75fanb2R+3OAUA9Ag4tOqgpmNKnj2cNGvuL9KALNSg=; b=CN7Fmt/0C7TilUT9eIkU51p5K16wV/okeytrQnvPoLORYeVvfQb1R3fGMDxbyYDWEv9M+0 evSeuhksJHsG7Q79VAMh2IlGJRmtqTuTrYWAzy87EtNlIQQYNYGlhH7gUnQdSqHlmis/4a 9TcSpzZ32gAN9j2KpIIxV8fnq45KZE/UxyxDjPBHo0+L/I/ex7TwANsLS2ErJm0RdjY/UC nl00YlvnocMdJ0woqM9QfhHMIyNPbbX/UjRqw2m6c6ZEX3bI5U84AzmnmasuK1FOCGda+s 1h4By77g8zHHxd6OJS44zXzKFrFxleezm5YSMYk7IWwS7FdrDFvIP4o7e3qEkA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698108392; a=rsa-sha256; cv=none; b=dmlpg3tJbjy11GowoKDj1NpjUR8vYLBp92b/xSHMBv3lSjI1tV47PxQIbNSlfd7zcRTT3V XDOxz62PVJqIYKK/PIg/WgPkYx8fEQ6NJsy7BNb4n4VLdTV4Qza2cb6lAnskrXuvQ6j+Cy lGWaRZlzL5AtMZFekQ2WTXL+uwhljCgtMs4kSK+hAh2gKni5LRZY9H3GbsxSgHrQ0NHaEU k4LC4zQ2tzQAIjA4t+aY/+N3bmHkxRFL34ewYAO4DXrwFjuRTG/VGNniDOEruGTGJg7bFA iryIu8rrcsB0vpcBNGtJX9XrQBQsi9d8NY/lgCAYAS3BzoIeMbk7vgPP74SbpA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698108392; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=n75fanb2R+3OAUA9Ag4tOqgpmNKnj2cNGvuL9KALNSg=; b=rtkj3+NjH2Y1N1aZyZ4UBobw1FEeQG07rqvr27KPNxLhRBn5dejTj/lV/4QtJDHs9bGNSR pCXuiXa4b4EzGfP/SfSsUEQT6NDacnrZVDq/3nW6MmCuebBGNNnU6qnkzoD6Ttc3toFmF6 DTsiER1CH+r6gz7qujGMUOxpNmi5zAR3hzDcQx/+pyyqOiTp6hou/yV13TrrsBf9DUCuaN 19F/8pK0U74rK6LYmNlwZHTMjDNo5a7NnQdDy5qDCZlBHf/0aEA/5o8K6fnhO+GrPnP7HJ GC4RYWl+S8/1tUSjna4aQkqJzb7lLHNlVXV7giezrX9kct8UVmy9OE6wLKXgjg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SDtfc181Cz12LB; Tue, 24 Oct 2023 00:46: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 39O0kWdi004390; Tue, 24 Oct 2023 00:46:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39O0kWHN004387; Tue, 24 Oct 2023 00:46:32 GMT (envelope-from git) Date: Tue, 24 Oct 2023 00:46:32 GMT Message-Id: <202310240046.39O0kWHN004387@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: 361f7820cde9 - stable/14 - automount: check for mounted-over autofs instances on flush List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 361f7820cde9cc9e9eb7118155b6a39c1a52ef9d Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=361f7820cde9cc9e9eb7118155b6a39c1a52ef9d commit 361f7820cde9cc9e9eb7118155b6a39c1a52ef9d Author: Andrew Gierth AuthorDate: 2023-07-10 15:09:56 +0000 Commit: Konstantin Belousov CommitDate: 2023-10-24 00:46:01 +0000 automount: check for mounted-over autofs instances on flush PR: 272446 (cherry picked from commit 21b8e363c4eb24c0a5659101603cc08a86d87759) --- usr.sbin/autofs/automount.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/usr.sbin/autofs/automount.c b/usr.sbin/autofs/automount.c index 188bbc3a040f..cee647cb4e2c 100644 --- a/usr.sbin/autofs/automount.c +++ b/usr.sbin/autofs/automount.c @@ -260,6 +260,7 @@ static void flush_caches(void) { struct statfs *mntbuf; + struct statfs statbuf; int i, nitems; nitems = getmntinfo(&mntbuf, MNT_WAIT); @@ -274,6 +275,21 @@ flush_caches(void) mntbuf[i].f_mntonname); continue; } + /* + * A direct map mountpoint may have been mounted over, in + * which case we can't MNT_UPDATE it. There's an obvious race + * condition remaining here, but that has to be fixed in the + * kernel. + */ + if (statfs(mntbuf[i].f_mntonname, &statbuf) != 0) { + log_err(1, "cannot statfs %s", mntbuf[i].f_mntonname); + continue; + } + if (strcmp(statbuf.f_fstypename, "autofs") != 0) { + log_debugx("skipping %s, filesystem type is not autofs", + mntbuf[i].f_mntonname); + continue; + } flush_autofs(mntbuf[i].f_mntonname); } From nobody Tue Oct 24 00:46:33 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SDtfd3YWyz4xDFG; Tue, 24 Oct 2023 00:46: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 4SDtfd2mPbz4NJ4; Tue, 24 Oct 2023 00:46:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698108393; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WpfsW8PQlWCAwPtczMUwtYYc8PefcPqJSz7L/WRR83k=; b=pl2BnjUP7YvCMGU6vFeaDsAGPaX7Is8kA8r0Mxj/sUIp4fSZlXFbziw7DlDRjpr6X/6OeJ 4aXo4EsYLnW4YvVWZKVcni5F8d9/imxVDpdtVIa1uhYkUYsR3dEBxydj74cbnl8UPr08t8 eIXgQcDC2cKnSeRtozFyW/3yUUx2ShuXoQx7sRInxLD/HWeeSVy4A2TXKdoS086BSBW1ta YSj/9oYcdA4Hig9bH7WtpczRAD8kmT3c5gsbI3Nexlhfmnb5FBp7jh1APOu3UGCKlUy0ON iEBdQA2zSQgR2S/KB9bZa3pestJspbwFA6l5LSa5W2sNgd3UDLKKkMn6FitCEQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698108393; a=rsa-sha256; cv=none; b=baeOer43soIwP18XtPvLJh2ejQQbXWs+EiBXEE6L8fgbHoYY9W7rFPWzD/wftU2cHMfw0H IS7FrKzzyMTb1Ier2M9O09uiEh60AWhw5PpalBdISxC+ulQ85ZMuZ2ja3UGnRr6xdGvhNY r5vrRNHsxBxrevPD4/s+70GQU1RklQqd3CPOfSigBHuUxKeWxZqlCCHNwg1slio8HQhsES FP/l3wnC4wRiOVYFMcGw5uOW7BfEGKo99fLgOucMddF1N67Ua07DcJerdhOnGdeo7HioYn wufkTVZrfRrVK6zxy4QBTqBjWCrSfuCl2eFHIxJYYHtnaitjyjrsd+hmc3zRKg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698108393; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WpfsW8PQlWCAwPtczMUwtYYc8PefcPqJSz7L/WRR83k=; b=rqu+5zIfZzx8RHAkF0XP16IYB+j0WL1O92zvItRJYmIdLbyb5Ecd1es7cHwTqKjpa1ODHb kYT+1O6JEv/Il5lIVKL7yfNnLrTVi1ikbLYoRsVXXDiJv+3ZD42kiiElBBzNQ8KTruiBEJ ZODLkYjqL7TD0uV0vc694a9HZpLGnyLvECsaFDor49/+RDosTaase0HleoEFXNkJrukiOK e5fSMd9QSlXI4LRGrMPdhDix9Uphp3FcuyYEoeakaYvO+BKIhYWaWL4684hTpjkxcaLbOh 5ygXREmWAhUCL5F+8WcsfTecFekAK5sBwfKonMka0AWT/KugBEIwPXiBX2zFjQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SDtfd1gfcz12LC; Tue, 24 Oct 2023 00:46: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 39O0kX7B004440; Tue, 24 Oct 2023 00:46:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39O0kXa9004438; Tue, 24 Oct 2023 00:46:33 GMT (envelope-from git) Date: Tue, 24 Oct 2023 00:46:33 GMT Message-Id: <202310240046.39O0kXa9004438@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: c5f92e2ac8aa - stable/14 - automount(8): when flushing autofs, specify fsid List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: c5f92e2ac8aad3c0d5e9659257f02846944bb347 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=c5f92e2ac8aad3c0d5e9659257f02846944bb347 commit c5f92e2ac8aad3c0d5e9659257f02846944bb347 Author: Konstantin Belousov AuthorDate: 2023-09-29 18:43:42 +0000 Commit: Konstantin Belousov CommitDate: 2023-10-24 00:46:02 +0000 automount(8): when flushing autofs, specify fsid PR: 272446 (cherry picked from commit 56c44bd92efa002b2185445878fc98172ae8c66f) --- usr.sbin/autofs/automount.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/usr.sbin/autofs/automount.c b/usr.sbin/autofs/automount.c index cee647cb4e2c..6637e16c9129 100644 --- a/usr.sbin/autofs/automount.c +++ b/usr.sbin/autofs/automount.c @@ -229,7 +229,7 @@ mount_unmount(struct node *root) } static void -flush_autofs(const char *fspath) +flush_autofs(const char *fspath, const fsid_t *fsid) { struct iovec *iov = NULL; char errmsg[255]; @@ -242,6 +242,8 @@ flush_autofs(const char *fspath) __DECONST(void *, "autofs"), (size_t)-1); build_iovec(&iov, &iovlen, "fspath", __DECONST(void *, fspath), (size_t)-1); + build_iovec(&iov, &iovlen, "fsid", + __DECONST(void *, fsid), sizeof(*fsid)); build_iovec(&iov, &iovlen, "errmsg", errmsg, sizeof(errmsg)); @@ -291,7 +293,7 @@ flush_caches(void) continue; } - flush_autofs(mntbuf[i].f_mntonname); + flush_autofs(mntbuf[i].f_mntonname, &statbuf.f_fsid); } } From nobody Tue Oct 24 00:47:47 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SDth41tVnz4xCkT; Tue, 24 Oct 2023 00:47:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SDth41N4nz4PMl; Tue, 24 Oct 2023 00:47:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698108468; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3hDm3AVlqWxleHY5qGtGCG4vl/rPeNRPQGVq+G/DTmQ=; b=wppbgBiD00gObPVM2S9/xn+pA1sg6En7KCrYAe5hRSuwpr0+vGZOqCBHKnRC7wAWo5GFah sam8rKiEK/XfXMMbPc8/IcP9zE8G4FR/WOAGxsg8EAIRmvFpCs1ZKCoNZRleHBwOEjO7rh kkg4rrUiGUcKOIpHUBZ3frjhxbFCX5U+Qa7c+92i1kI20gXHa9ik4zps5Aq2v2ULHHdVNT ADgagUhkt3jN+UUBy2OYSIEQj3tiUsBRYihaF8cTNflF09votkvOdvZkT5rTxOkak10lsG vhjiMFkdOpS0tiJZg0TCBUQZFhTKtRom4JldiVF6pi/lHxXv481WsKrcu41Qhw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698108468; a=rsa-sha256; cv=none; b=UeL5Jri7+9mebgjMzoWuPwYmnqx5YuhmbvckaE9H/2bfpJGcHAnaUzvymqae0k9lziPYKn ZgYXrRc+HWlm7sLCaKqUHEZh9aooDGK0R7ImSwHRaIPw2kYMA5AVkSiNJAOeGvWfDP7N+v fAZ3kJrDz9cgxDXO1FVYVw5B+8QEjz7cYIyQMNYbyJH2W+cvjMymIXMsdu9OaGv81NRcnR 3msWp/fKml9L6WAVCJJTyfQLnar35omIS5bSdVxCYG41AtubgD9XsVjUjKKVjj+mAWTig+ nEaGHN2hRTKpVqoyuptINhL6E1AUvQDQ57+ibDOGe/j9fG/sPjc3nj2JjVqa3A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698108468; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3hDm3AVlqWxleHY5qGtGCG4vl/rPeNRPQGVq+G/DTmQ=; b=RbATiof0os5q6vvTjc91WqCGu4AtX8WZENnvmupABKvm0gqHkicXKDoDZMNuZQI0ipsgHm tH9n/wrs81hcbfFTB4JE4Ucb8B60sB4zenDaEIBd6L+mJVZJifCAZEsNL1+bIDhMZ6W7cw O1yHBT9UA3+ByHP+KqKRwKhfoYGavcc/y0xb0YOOLyiuIWGeiEvihgK8tUqgPUQzOAzOJA YPvynKwdq95ZWuaO/soERHJWbc6g0X8wB/K3xJgnMrpryQJSseguAbhXn2FGm+sF4GRs57 kyWqGPdL2lqgWJvUGrTjOfpczzWD0z3phKTYchoX1lqAl3kOUymAFuYEYMgWpA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SDth40Rr4z12Hx; Tue, 24 Oct 2023 00:47:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39O0ll3C005024; Tue, 24 Oct 2023 00:47:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39O0llqL005021; Tue, 24 Oct 2023 00:47:47 GMT (envelope-from git) Date: Tue, 24 Oct 2023 00:47:47 GMT Message-Id: <202310240047.39O0llqL005021@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: 321af2d24da0 - stable/13 - nmount(MNT_UPDATE): add optional generid fsid parameter List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 321af2d24da0a54612f473afca2d3fec5820132f Auto-Submitted: auto-generated The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=321af2d24da0a54612f473afca2d3fec5820132f commit 321af2d24da0a54612f473afca2d3fec5820132f Author: Konstantin Belousov AuthorDate: 2023-09-29 18:42:50 +0000 Commit: Konstantin Belousov CommitDate: 2023-10-24 00:47:19 +0000 nmount(MNT_UPDATE): add optional generid fsid parameter (cherry picked from commit 9ef7a491a4236810e50f0a2ee8d52f5c4bb02c64) --- sys/kern/vfs_mount.c | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/sys/kern/vfs_mount.c b/sys/kern/vfs_mount.c index 25c4adeaae62..a4a981603ab6 100644 --- a/sys/kern/vfs_mount.c +++ b/sys/kern/vfs_mount.c @@ -1154,9 +1154,10 @@ vfs_domount_update( struct vnode *rootvp; void *bufp; struct mount *mp; - int error, export_error, i, len; + int error, export_error, i, len, fsid_up_len; uint64_t flag; gid_t *grps; + fsid_t *fsid_up; bool vfs_suser_failed; ASSERT_VOP_ELOCKED(vp, __func__); @@ -1219,10 +1220,24 @@ vfs_domount_update( VI_UNLOCK(vp); VOP_UNLOCK(vp); + rootvp = NULL; + + if (vfs_getopt(*optlist, "fsid", (void **)&fsid_up, + &fsid_up_len) == 0) { + if (fsid_up_len != sizeof(*fsid_up)) { + error = EINVAL; + goto end; + } + if (fsidcmp(&fsid_up, &mp->mnt_stat.f_fsid) != 0) { + error = ENOENT; + goto end; + } + vfs_deleteopt(*optlist, "fsid"); + } + vfs_op_enter(mp); vn_seqc_write_begin(vp); - rootvp = NULL; MNT_ILOCK(mp); if ((mp->mnt_kern_flag & MNTK_UNMOUNT) != 0) { MNT_IUNLOCK(mp); From nobody Tue Oct 24 00:47:49 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SDth52r2Mz4xCwL; Tue, 24 Oct 2023 00:47: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 4SDth52NpGz4PpV; Tue, 24 Oct 2023 00:47:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698108469; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qA5DgNKZtUDZD+udUGM6tAW7JinBQKVw/HDIPdahBUw=; b=NqXSrP98vcNjdJnvGSAMQtWxKmls/kyynMCtUBP3KbUkxiL39lQFTZ1ygVGJl/t6SHhFUY XVtvo7gdZeJt5RD7nrX+updBErGrJKd95VFlrfHoXbBxWHN9rPE+ChkKwd0oYSxJfK/k5S ORyUssqJhDeGSM7Sn4iKVFRKhTWpbQb+c2cwgbiNq2Hyw92N0adEdjZh0URoY/iRBDnJg+ vI92Kn2qOFkQ5YAid8AI2ymUPTxWn6hw8M5LIVZPWtJPjuL660kLn+qgKxGqN/s9zjOGE0 kBIin2UxlI2jfkLjHMm4NCjTIOARzRKVCIYVHn64Lt5IYt29kyNACNUDyL/klQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698108469; a=rsa-sha256; cv=none; b=lO6u4fMf7k5t0eB3BTP1YYdpl41v1Uo7QWhSDrcexnI2fY18eR/xQFR7sxnsm7TBIBAGaJ pQvHx+6lS5EDgexhTM+6JzCO8PXKI5KO6YAaxaCLtATW63OkPpulqMmNni1fsohQjFvryy hZ2ALa8SrADQcEehmkgb01fclfc1aNgKLzFBc4AlOFiS2RbVXG1p17xdEQQM9ZwGTdoLcg dD26YxheV4naTI2l0WEvZYTx3BG2P7T9AwNSY3R17Sr3AM3zkSEoV+beKa8eClAjlqj0uG q4fZ8DwbHbmWrxNgSYJl75981Ozp1AKrAqrvRw87wG/dMdXkHa9Da9vu59NHBQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698108469; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qA5DgNKZtUDZD+udUGM6tAW7JinBQKVw/HDIPdahBUw=; b=va/0/xGzl64vyfF+q1E6tHFkSL56yINjbww/ie3f9rMEP2zg2WpqzpMOgab+vNRsJzW1hE W188RQlO5ziovBC7lz99AHkOoI30JBc/I5nq3x038tU6/hUMf+/SxcFbC+sHo+8ZJIInB8 WYLoRoO2+7zxbzJaZ6YWs3cLqb8Wn/YphPPJsLPtvikcKtX1l8yItnJLnUrVyW/7Cx+KHL Mq6/PT0UkJ2PU6Od5+GqPohGyHYYVcnFcLCUpNhRjXbuCIHclmCtPH0eRcPhg5qz8lCxUy qmuTSllZjNHFJbVG1bt6rQaoruNX1PigJrCqWxbQ1p5Hv55q+nAyp+GeQFlzFw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SDth51RjLz11Wp; Tue, 24 Oct 2023 00:47: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 39O0lnuH005076; Tue, 24 Oct 2023 00:47:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39O0lnZI005073; Tue, 24 Oct 2023 00:47:49 GMT (envelope-from git) Date: Tue, 24 Oct 2023 00:47:49 GMT Message-Id: <202310240047.39O0lnZI005073@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: 29dae977ae9b - stable/13 - automount: check for mounted-over autofs instances on flush List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 29dae977ae9b01f429ae876743514da92ee8ecf4 Auto-Submitted: auto-generated The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=29dae977ae9b01f429ae876743514da92ee8ecf4 commit 29dae977ae9b01f429ae876743514da92ee8ecf4 Author: Andrew Gierth AuthorDate: 2023-07-10 15:09:56 +0000 Commit: Konstantin Belousov CommitDate: 2023-10-24 00:47:20 +0000 automount: check for mounted-over autofs instances on flush PR: 272446 (cherry picked from commit 21b8e363c4eb24c0a5659101603cc08a86d87759) --- usr.sbin/autofs/automount.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/usr.sbin/autofs/automount.c b/usr.sbin/autofs/automount.c index 188bbc3a040f..cee647cb4e2c 100644 --- a/usr.sbin/autofs/automount.c +++ b/usr.sbin/autofs/automount.c @@ -260,6 +260,7 @@ static void flush_caches(void) { struct statfs *mntbuf; + struct statfs statbuf; int i, nitems; nitems = getmntinfo(&mntbuf, MNT_WAIT); @@ -274,6 +275,21 @@ flush_caches(void) mntbuf[i].f_mntonname); continue; } + /* + * A direct map mountpoint may have been mounted over, in + * which case we can't MNT_UPDATE it. There's an obvious race + * condition remaining here, but that has to be fixed in the + * kernel. + */ + if (statfs(mntbuf[i].f_mntonname, &statbuf) != 0) { + log_err(1, "cannot statfs %s", mntbuf[i].f_mntonname); + continue; + } + if (strcmp(statbuf.f_fstypename, "autofs") != 0) { + log_debugx("skipping %s, filesystem type is not autofs", + mntbuf[i].f_mntonname); + continue; + } flush_autofs(mntbuf[i].f_mntonname); } From nobody Tue Oct 24 00:47:50 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SDth675KPz4xD8q; Tue, 24 Oct 2023 00:47: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 4SDth63X1Nz4PqB; Tue, 24 Oct 2023 00:47:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698108470; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=do6kJycXy0u6uNVAy8go+HXagkQF6XxxBtiGhjGn4NM=; b=QmDioMIhW8EOJNOJJk5WYGgtEt3AhPZlyWw0Ui05TrQFTTGHIEnEq6oOzYKjCoMZkovAjA n+4d/7twJ61jOrAANRt+nmZM402mxMUHAVmmMxT2mHo2vw63hgJqxWtCUDRKYA4OF7PinB J8x36kWWpnUI8Y4riejEgjw0prv/9kXCsI4zZA0rhrHJSTtxeyBTwEBzKGggBUoCnLXIlK ssrMqqLGdNrnAHtHb0hmH7FWVfnX8JIgZ7DbsQsR27+1Y5wW+v8VR1hf3KcSa2gOxy6ubo cB7LqeUDMBl+/cl/HsNiZ/XpA925A06HwMEYSHQ/PUbCDu/D+4OFOZTlL13ZAA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698108470; a=rsa-sha256; cv=none; b=CNcUmi3Hw8I69RGgZxuGbKcIfukbce4X0tuGvWGQqx4KHAouEKcdj2RTPKPImIXMnPBKv5 WKWAkPoKG+xmkS3hC8Ui3RKDt6bkW+ThulGZ21bqb1idqqGeyoyhRWQ7Kfykm/CdkGE+o3 sMDV6e5SPUtcjBTkCXDEUmj3rNiuFVJ3UK+Q9obk0NYuDJRLeZOmteUp1ijINqy/T2z9/z p+/yFNj8hq/DCflKKvJQKBxV+dYIm1lGVrbZF+m26+QHPtzJYDXqHFayddRPnu8Z9Fulbb nRejnzfwqeWs9q8IrV9KZmqj2mBWUrUJelDe6y2YJWFkr7jZ+hFhw7i2l4/5Hg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698108470; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=do6kJycXy0u6uNVAy8go+HXagkQF6XxxBtiGhjGn4NM=; b=qyij+qLuwvTPcjYU5KAMpufE7JmxWc+bA/aCtZzW0VVSrhbfihDMu8p66dhkJV3NQLgyKA e/KoJ0c4T4CzAxqiIZTkhUIK/jKC4vP1oc7lfH6GYk/1BjLEHUV7jIefREx1KCWj+T8xNF U1XGv2Yeq1DCGj4qDHfV1M1QaHtjfv3xboI5FWwNc6adWtIrk7HeziQeijQH48vOQhjqO6 6XB8hOjzH2VvZaD6sYxgZKZRbBPT8xQ0D1K4LJERYdknaleYhipC6OZmKmPZk8fntpNiJW bl6uPJyFw/B120xHZslrUEsEi9gdKJK14HOHWbReMMg8gmkyslHoZEjqrYi1YQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SDth62RtZz12Hy; Tue, 24 Oct 2023 00:47: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 39O0lotE005126; Tue, 24 Oct 2023 00:47:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39O0loNI005123; Tue, 24 Oct 2023 00:47:50 GMT (envelope-from git) Date: Tue, 24 Oct 2023 00:47:50 GMT Message-Id: <202310240047.39O0loNI005123@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: 2746fc0a5c89 - stable/13 - automount(8): when flushing autofs, specify fsid List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 2746fc0a5c8956deb2a13822c640fbee0fba5b95 Auto-Submitted: auto-generated The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=2746fc0a5c8956deb2a13822c640fbee0fba5b95 commit 2746fc0a5c8956deb2a13822c640fbee0fba5b95 Author: Konstantin Belousov AuthorDate: 2023-09-29 18:43:42 +0000 Commit: Konstantin Belousov CommitDate: 2023-10-24 00:47:20 +0000 automount(8): when flushing autofs, specify fsid PR: 272446 (cherry picked from commit 56c44bd92efa002b2185445878fc98172ae8c66f) --- usr.sbin/autofs/automount.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/usr.sbin/autofs/automount.c b/usr.sbin/autofs/automount.c index cee647cb4e2c..6637e16c9129 100644 --- a/usr.sbin/autofs/automount.c +++ b/usr.sbin/autofs/automount.c @@ -229,7 +229,7 @@ mount_unmount(struct node *root) } static void -flush_autofs(const char *fspath) +flush_autofs(const char *fspath, const fsid_t *fsid) { struct iovec *iov = NULL; char errmsg[255]; @@ -242,6 +242,8 @@ flush_autofs(const char *fspath) __DECONST(void *, "autofs"), (size_t)-1); build_iovec(&iov, &iovlen, "fspath", __DECONST(void *, fspath), (size_t)-1); + build_iovec(&iov, &iovlen, "fsid", + __DECONST(void *, fsid), sizeof(*fsid)); build_iovec(&iov, &iovlen, "errmsg", errmsg, sizeof(errmsg)); @@ -291,7 +293,7 @@ flush_caches(void) continue; } - flush_autofs(mntbuf[i].f_mntonname); + flush_autofs(mntbuf[i].f_mntonname, &statbuf.f_fsid); } } From nobody Tue Oct 24 00:57:30 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SDtvG2xHdz4xDhj; Tue, 24 Oct 2023 00:57: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 4SDtvG2N2Zz4RJP; Tue, 24 Oct 2023 00:57:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698109050; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SnzngUaWsRaP7iUOvqUSo1L/CJCP3hPfXSrM3Sl3fUc=; b=EEWTgDmjlb4bOq29SSz6pDZo7U+C+/KnMWpHpBNFl5y4pNhbCV6QgUIK2esRoDK5jn9bfE gdZFVXKPMaZy0iVNuKRO0mUSJAdLQTsTtKsei3M+geOI7fKHMtheCbrlgzdC/kbg7oCrw7 yXMalKnJ/nAHJNcbcv0bpA6QY/dX3DIJWhKgfkJg2JjYZjIQEcLP9P+1tCLcQlZXapZCjk eRx5Grm6ZLawq+oCfsIj8f4Z0U3UcWy59sK6eJQCviPxA/uZRWTAJkKq3SlHbdzcylopLY 0jCofqnD8kCgxTsv1tCk653TcsL5+lAy+S6HiHN3Xw3+DvaF1oFTfXtmBsbosA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698109050; a=rsa-sha256; cv=none; b=N5MnRv73oXZz/aBQMNRTuV6AXGpKg1ZlrV+s52noGmnRnwl3J5oO5it+seSnHfrNCjo7PG +JwAh2UCHNckoJAdNNKRtl8n8OFXMSjAF52/B2DaGssnciPct87dpRI0RQRUOv6ZexbJNH al9bjtFiF+5HSg9Ca4TTtrKfWMoBuL9x6PGyfjcS0Dtb7JSwnBab+lva6NVS6NFvC0i92T ZeUvQ6NMJTNKch/ULw6pTNhRiWS27oBMEYY/gVUg36n82uGCYUWlOeRbjizmN3wgdMAkMA YKDEWfc+vPL0/WrkT/tRSv5QOtIzQl7doS+VLGyswzpECYPApiFPgLfccz+ViQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698109050; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SnzngUaWsRaP7iUOvqUSo1L/CJCP3hPfXSrM3Sl3fUc=; b=mYaI1LjvvZERJiEXZ+cb8qJlODSioyy5nqIG/MsZdfvxAB1e9zP/DiCyLS2QVvGlhpFnNT 43nNCrryHT+0yEV4Prw20O/UjUzSbfr/RiNvGF/RmPxxtLhCA6hftsDALzWsY53NINwcg5 YHtAXagcrIDvp3Zn5YVDCao22nVOf/uRo0lpwAb1RCDwcHgXfBX3qTbi3josY+U0anHH8F J1e2RDXXB9N1J5WcVJZIOkGQUOZBh9PXhq20D0efQuN3sn0UEsl6W61boUj9V+aPjwjzNV a8g+gca5Ocyyhgt3en748KAbFz2pW423e12qvg5sSSmarB3sN9/lpVAZ8whafw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SDtvG1NQ9z12ZC; Tue, 24 Oct 2023 00:57: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 39O0vUBL021635; Tue, 24 Oct 2023 00:57:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39O0vUbR021632; Tue, 24 Oct 2023 00:57:30 GMT (envelope-from git) Date: Tue, 24 Oct 2023 00:57:30 GMT Message-Id: <202310240057.39O0vUbR021632@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: ede6fd06726c - stable/14 - setusercontext(): Apply personal settings only on matching effective UID List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: ede6fd06726c02e9d2a5c47ac8cf80d8aaec5a70 Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=ede6fd06726c02e9d2a5c47ac8cf80d8aaec5a70 commit ede6fd06726c02e9d2a5c47ac8cf80d8aaec5a70 Author: Olivier Certner AuthorDate: 2023-05-30 16:35:08 +0000 Commit: Ed Maste CommitDate: 2023-10-24 00:57:11 +0000 setusercontext(): Apply personal settings only on matching effective UID Commit 35305a8dc114 (r211393) added a check on whether 'uid' was equal to getuid() before calling setlogincontext(). Doing so still allows a setuid program to apply resource limits and priorities specified in a user-controlled configuration file ('~/.login_conf') where a non-setuid program could not. Plug the hole by checking instead that the process' effective UID is the target one (which is likely what was meant in the initial commit). PR: 271750 Reviewed by: kib, des MFC after: 2 weeks Sponsored by: Kumacom SAS Differential Revision: https://reviews.freebsd.org/D40351 (cherry picked from commit 892654fe9b5a9115815c30a423b8db47185aebbd) --- lib/libutil/login_class.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/libutil/login_class.c b/lib/libutil/login_class.c index 90a3ec5d106a..1036e9f9208c 100644 --- a/lib/libutil/login_class.c +++ b/lib/libutil/login_class.c @@ -546,7 +546,7 @@ setusercontext(login_cap_t *lc, const struct passwd *pwd, uid_t uid, unsigned in /* * Now, we repeat some of the above for the user's private entries */ - if (getuid() == uid && (lc = login_getuserclass(pwd)) != NULL) { + if (geteuid() == uid && (lc = login_getuserclass(pwd)) != NULL) { mymask = setlogincontext(lc, pwd, mymask, flags); login_close(lc); } From nobody Tue Oct 24 01:15:57 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SDvJY2PtWz4xFs5; Tue, 24 Oct 2023 01:15: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 4SDvJY1zSVz4TDW; Tue, 24 Oct 2023 01:15:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698110157; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZyWW8snh8rffYfN78kQS/GBjqqPSKEOdoiw4lmwZYsU=; b=XFOeiWs0NhVj8E3/6T6OzLSq1opfjRDDurAqKIwwqX+jlmUw4CpqWuzT+lQ2VUa9XA77iU M1BbetuWXKgHe1fRXu2alrWSfqcyhja53r8iiV9dNCrpVh9b1PbguijSM0QduVSKI+HLey OdsMatansSfBD5eNkRvLmwr67+aDk/tPMQGJ7Nwiy7mqwVIp0swxqFDosA50vws+trYSX0 h7y6HY2F0Es9vSPUO5/2EKoM2ogtQsx6tU6rs9oYY+wMpSLlk9hz3j6SOcoXxR5GersB+a zUSBbO1pCBlXXXSU1nYkMXz65SvBJ8BT5jCoc1z9cwiqkNtJX1FZBLmsBT7aYg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698110157; a=rsa-sha256; cv=none; b=lEvKPzYoQQYz0o6hhiKKClD+aI5xkB1kAFkku8RnebcRIWs5dLL5e3XIO5ZuSmouZeLKvV W1KX+BRmDCnCE7Vhs1aj0pBVBFtJcdUwYDuWMoOxv/ISatHUSzzzOeRyA/zHlYaZU5+ZHL tocj6Qex8ccAroKvLm+/+KXqXkIzPJ8wunwp7r4pUWQBslYXejBFuU5wW/LgB0RFo5npOJ cimb1WEmiPHPcFMdqMcpHnBqKZfVYfGY1lWlC4u/EkfJBZ2joJxVLutb4wq6g7G2iu6dJy fmoungS6CZxUwwA7OjgEjWjn5Dr+lTkxilw53y8V5yMsYm8x9YYIRVFxiaQLcQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698110157; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZyWW8snh8rffYfN78kQS/GBjqqPSKEOdoiw4lmwZYsU=; b=MUgZdTWVaMjET3gYYOL3tqDWxAA4KvY7i9O3N+FEBGeQxMhJskRMtGa922WyOA57GtOJnH Lb7yhanCgN/v2/J3iF+7CuE1HtS4tx4hI2eDHVfNE5zQSPmH7m8co+kstPZVhL2vVfWivC esxZV16tLVmstkKhPsj6uoR0wU+KAkyeNJrKCxrrs66vEbGWRzfYWmkbqL+nIixAVJY4qL XQfiFCyVG5UAEvVPwQVo9LzjRterbkPWEMud+Ky8X50kY0tjGQIcBPZQ/TAML2HJV2ZnA7 SvBe066kjKN9zutYVcozPEIHWUnYlIyvoLokfemezKgcU2FHAE/cD5pOis19bA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SDvJY1521z12nK; Tue, 24 Oct 2023 01:15: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 39O1Fvqv055741; Tue, 24 Oct 2023 01:15:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39O1FvMZ055738; Tue, 24 Oct 2023 01:15:57 GMT (envelope-from git) Date: Tue, 24 Oct 2023 01:15:57 GMT Message-Id: <202310240115.39O1FvMZ055738@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: 19232cc73b4b - releng/14.0 - if_re: add Realtek Killer Ethernet E2600 IDs List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.0 X-Git-Reftype: branch X-Git-Commit: 19232cc73b4b17246bbeec9dd133648ca1b608c0 Auto-Submitted: auto-generated The branch releng/14.0 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=19232cc73b4b17246bbeec9dd133648ca1b608c0 commit 19232cc73b4b17246bbeec9dd133648ca1b608c0 Author: Sk Razee AuthorDate: 2023-10-06 06:08:16 +0000 Commit: Ed Maste CommitDate: 2023-10-24 01:15:26 +0000 if_re: add Realtek Killer Ethernet E2600 IDs PR: 274292 MFC after: 1 week Reviewed by: kp Event: Oslo Hackathon at Modirum (cherry picked from commit 3c871489cdd6c5606b2b1125f66b0e9b8f39561f) (cherry picked from commit 50cf84e93c5be087316da4495395b66793fe80d9) Approved by: re (gjb) --- sys/dev/re/if_re.c | 2 ++ sys/dev/rl/if_rlreg.h | 1 + 2 files changed, 3 insertions(+) diff --git a/sys/dev/re/if_re.c b/sys/dev/re/if_re.c index 27984200bd91..83fd31fc4f0b 100644 --- a/sys/dev/re/if_re.c +++ b/sys/dev/re/if_re.c @@ -178,6 +178,8 @@ static const struct rl_type re_devs[] = { "D-Link DGE-528(T) Gigabit Ethernet Adapter" }, { DLINK_VENDORID, DLINK_DEVICEID_530T_REVC, 0, "D-Link DGE-530(T) Gigabit Ethernet Adapter" }, + { RT_VENDORID, RT_DEVICEID_2600, 0, + "RealTek Killer E2600 Gigabit Ethernet Controller" }, { RT_VENDORID, RT_DEVICEID_8139, 0, "RealTek 8139C+ 10/100BaseTX" }, { RT_VENDORID, RT_DEVICEID_8101E, 0, diff --git a/sys/dev/rl/if_rlreg.h b/sys/dev/rl/if_rlreg.h index 01634bb704c7..808d11e34346 100644 --- a/sys/dev/rl/if_rlreg.h +++ b/sys/dev/rl/if_rlreg.h @@ -991,6 +991,7 @@ struct rl_softc { /* * RealTek chip device IDs. */ +#define RT_DEVICEID_2600 0x2600 #define RT_DEVICEID_8139D 0x8039 #define RT_DEVICEID_8129 0x8129 #define RT_DEVICEID_8101E 0x8136 From nobody Tue Oct 24 04:40:47 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SDzrv2PS8z4xTv2; Tue, 24 Oct 2023 04:40: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 4SDzrv1qzrz3HhQ; Tue, 24 Oct 2023 04:40:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698122447; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WSHds4X3+giVKSNQOR5kIpcHP7cfxhXwHoZvE6y/z2Y=; b=Zk2oOsvE1FHrNrMITrc5dT4cy+RA5CBzxxek39KrNq5CMTUWlTk/EZ8zrWMWwI4CZEFC2W RnCALnbBzHVP5sAz1EM9iFXzf1/IJ/hgwT1XzVmILgglmPABWnwWTjlES2/HmdPkHwYW+6 QZc6oM9zYz/H0WJ8VM/4FqoV7203O13UUhyztUgUdqsi5unPCwua9HlHw1cE7TH/TPXZsO NoYnXiqMQzpv1BnVXgBxcJd3AebS7xkvRER4scuzc5YE9o+vLV6nvHN81NParstqk0TS5c GIdFQ/bl2jh9xrt7PFMPBjYL9FlxEbj4SQ2KUA354tbBZzYutXp4BINXZVPAqA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698122447; a=rsa-sha256; cv=none; b=eVhVuJeFoVJxQXhS4RROZ5B5koYN9j3EQXYCC5gf0c8et8vZhF+bB2wx6/kG8e0Cy4cB8Y PqvaWNwhEydg+fJgbylL+cmKLFDJZHJvgWYmkwaE4X3fcSB0CT35IgItT4e59OGP8gr6Cn Cg+9pWRdn7rz1k4dAnEnkX/WPIDxn2Sqo5fLaEmBJYtnZHhvemLhbliL3vby6KjkFrg2AR NzT3WgxfzRnmeu+uqOtDAg7Z4mSyuMyrmDoDLrNViPKoXeAJxqPU7YLERAAKDucehB70EA NJB0bkUj8T9osSqtut0D7sxOI+yCChbXsChbWLNpA1j5Rd7zYe4IK+CVa0pDvg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698122447; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WSHds4X3+giVKSNQOR5kIpcHP7cfxhXwHoZvE6y/z2Y=; b=PF55ibfEimQZi2GYz3pE1PRxGBHUPAu36j9YDbo/kFNmlLu38RFiPtGilzKdynJYpMcIfw XvW+wQyFZDmzB32L+JsDcxE3DVukPl8vvxvJBZ+d4eoHI/MBks1W6vxb669XAPrm4oE2Hp kFjree7WPlXqXV8lzpwUCAjIj447q6hcnqoM3dj5/Tl21dVKC9z40lvkmSKdZMlIrjkzBL 3ydckc5J4vyjvcHZIYrUWH6NI+sI3KEI9oUbDwydIdKzELEf9h3mMBDQK8whF1qQWMiq1F n6dZMszUGQlBVSFN7ZupW2bAWw39cr9h/XmRnNyxRGya84IzxCHrpZ524M+IBw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SDzrv0wGdz17ry; Tue, 24 Oct 2023 04:40: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 39O4elKQ099400; Tue, 24 Oct 2023 04:40:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39O4elox099397; Tue, 24 Oct 2023 04:40:47 GMT (envelope-from git) Date: Tue, 24 Oct 2023 04:40:47 GMT Message-Id: <202310240440.39O4elox099397@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: 9e48b627aed3 - stable/14 - vmx: Prefer consistent naming for loader tunables List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 9e48b627aed346bf5e950134a581218d3097eb7c Auto-Submitted: auto-generated The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=9e48b627aed346bf5e950134a581218d3097eb7c commit 9e48b627aed346bf5e950134a581218d3097eb7c Author: Zhenlei Huang AuthorDate: 2023-10-19 17:18:25 +0000 Commit: Zhenlei Huang CommitDate: 2023-10-24 04:39:31 +0000 vmx: Prefer consistent naming for loader tunables The following loader tunables do have corresponding sysctl MIBs but with different names. That may be historical reason. Let's prefer consistent naming for them so that it will be easier to read and maintain. 1. hw.vmm.l1d_flush -> hw.vmm.vmx.l1d_flush 2. hw.vmm.l1d_flush_sw -> hw.vmm.vmx.l1d_flush_sw 3. hw.vmm.vmx.use_apic_pir -> hw.vmm.vmx.cap.posted_interrupts 4. hw.vmm.vmx.use_apic_vid -> hw.vmm.vmx.cap.virtual_interrupt_delivery 5. hw.vmm.vmx.use_tpr_shadowing -> hw.vmm.vmx.cap.tpr_shadowing Old names are kept for compatibility. Meanwhile, add sysctl flag CTLFLAG_TUN to them so that `sysctl -T` will report them correctly. Reviewed by: corvink, jhb, kib, #bhyve MFC after: 5 days Differential Revision: https://reviews.freebsd.org/D42251 (cherry picked from commit f3ff0918ffcdbcb4c39175f3f9be70999edb14e8) --- sys/amd64/vmm/intel/vmx.c | 32 +++++++++++++++++++++++++++----- 1 file changed, 27 insertions(+), 5 deletions(-) diff --git a/sys/amd64/vmm/intel/vmx.c b/sys/amd64/vmm/intel/vmx.c index 51c6afe5a7da..317ed7e5d7fb 100644 --- a/sys/amd64/vmm/intel/vmx.c +++ b/sys/amd64/vmm/intel/vmx.c @@ -192,15 +192,18 @@ SYSCTL_INT(_hw_vmm_vmx_cap, OID_AUTO, invpcid, CTLFLAG_RD, &cap_invpcid, 0, "Guests are allowed to use INVPCID"); static int tpr_shadowing; -SYSCTL_INT(_hw_vmm_vmx_cap, OID_AUTO, tpr_shadowing, CTLFLAG_RD, +SYSCTL_INT(_hw_vmm_vmx_cap, OID_AUTO, tpr_shadowing, + CTLFLAG_RDTUN | CTLFLAG_NOFETCH, &tpr_shadowing, 0, "TPR shadowing support"); static int virtual_interrupt_delivery; -SYSCTL_INT(_hw_vmm_vmx_cap, OID_AUTO, virtual_interrupt_delivery, CTLFLAG_RD, +SYSCTL_INT(_hw_vmm_vmx_cap, OID_AUTO, virtual_interrupt_delivery, + CTLFLAG_RDTUN | CTLFLAG_NOFETCH, &virtual_interrupt_delivery, 0, "APICv virtual interrupt delivery support"); static int posted_interrupts; -SYSCTL_INT(_hw_vmm_vmx_cap, OID_AUTO, posted_interrupts, CTLFLAG_RD, +SYSCTL_INT(_hw_vmm_vmx_cap, OID_AUTO, posted_interrupts, + CTLFLAG_RDTUN | CTLFLAG_NOFETCH, &posted_interrupts, 0, "APICv posted interrupt support"); static int pirvec = -1; @@ -213,10 +216,10 @@ SYSCTL_UINT(_hw_vmm_vmx, OID_AUTO, vpid_alloc_failed, CTLFLAG_RD, &vpid_alloc_failed, 0, NULL); int guest_l1d_flush; -SYSCTL_INT(_hw_vmm_vmx, OID_AUTO, l1d_flush, CTLFLAG_RD, +SYSCTL_INT(_hw_vmm_vmx, OID_AUTO, l1d_flush, CTLFLAG_RDTUN | CTLFLAG_NOFETCH, &guest_l1d_flush, 0, NULL); int guest_l1d_flush_sw; -SYSCTL_INT(_hw_vmm_vmx, OID_AUTO, l1d_flush_sw, CTLFLAG_RD, +SYSCTL_INT(_hw_vmm_vmx, OID_AUTO, l1d_flush_sw, CTLFLAG_RDTUN | CTLFLAG_NOFETCH, &guest_l1d_flush_sw, 0, NULL); static struct msr_entry msr_load_list[1] __aligned(16); @@ -832,8 +835,12 @@ vmx_modinit(int ipinum) &tmp); if (error == 0) { tpr_shadowing = 1; +#ifndef BURN_BRIDGES TUNABLE_INT_FETCH("hw.vmm.vmx.use_tpr_shadowing", &tpr_shadowing); +#endif + TUNABLE_INT_FETCH("hw.vmm.vmx.cap.tpr_shadowing", + &tpr_shadowing); } if (tpr_shadowing) { @@ -854,8 +861,12 @@ vmx_modinit(int ipinum) procbased2_vid_bits, 0, &tmp); if (error == 0 && tpr_shadowing) { virtual_interrupt_delivery = 1; +#ifndef BURN_BRIDGES TUNABLE_INT_FETCH("hw.vmm.vmx.use_apic_vid", &virtual_interrupt_delivery); +#endif + TUNABLE_INT_FETCH("hw.vmm.vmx.cap.virtual_interrupt_delivery", + &virtual_interrupt_delivery); } if (virtual_interrupt_delivery) { @@ -881,8 +892,12 @@ vmx_modinit(int ipinum) } } else { posted_interrupts = 1; +#ifndef BURN_BRIDGES TUNABLE_INT_FETCH("hw.vmm.vmx.use_apic_pir", &posted_interrupts); +#endif + TUNABLE_INT_FETCH("hw.vmm.vmx.cap.posted_interrupts", + &posted_interrupts); } } } @@ -899,7 +914,10 @@ vmx_modinit(int ipinum) guest_l1d_flush = (cpu_ia32_arch_caps & IA32_ARCH_CAP_SKIP_L1DFL_VMENTRY) == 0; +#ifndef BURN_BRIDGES TUNABLE_INT_FETCH("hw.vmm.l1d_flush", &guest_l1d_flush); +#endif + TUNABLE_INT_FETCH("hw.vmm.vmx.l1d_flush", &guest_l1d_flush); /* * L1D cache flush is enabled. Use IA32_FLUSH_CMD MSR when @@ -911,8 +929,12 @@ vmx_modinit(int ipinum) if (guest_l1d_flush) { if ((cpu_stdext_feature3 & CPUID_STDEXT3_L1D_FLUSH) == 0) { guest_l1d_flush_sw = 1; +#ifndef BURN_BRIDGES TUNABLE_INT_FETCH("hw.vmm.l1d_flush_sw", &guest_l1d_flush_sw); +#endif + TUNABLE_INT_FETCH("hw.vmm.vmx.l1d_flush_sw", + &guest_l1d_flush_sw); } if (guest_l1d_flush_sw) { if (nmi_flush_l1d_sw <= 1) From nobody Tue Oct 24 04:40:48 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SDzrw5B23z4xTLB; Tue, 24 Oct 2023 04:40:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SDzrw34Qxz3HT9; Tue, 24 Oct 2023 04:40:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698122448; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fTf3r8igSkILacFcEKhvbPBKP1inHeihoNW15qVkgIg=; b=yz/DYSMzgXjHovIhHOrKBcXZJTolHV24SqCA8Eu6N6tPni6eTmOVULNXTuzWmYctBitmkD EsUBfmbS6O86KCAFdARF9/hQm2KF2uc1IGK7oWNH1IwKmTeMEqRL85sRHxNy0Z6FxOem7X GCxu8/fRrapNrm9hYnlxHAeblI1a0nvKaakzVSmH+hgvabHksvx2k0m2y7R8XrfXKl+9fK uGYwG71VtlB2rlI+YU3jQ2coom+iiVCT0ZlbEDSBSP3Psqu4mAaxyjsH1eaMCfFx6eqDvK 3KQo/VyJGyoUpy14cMFIMwuB8ViLz7Ga0J89lUYExzGxhuUF4ZZ8Grtw7btK+w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698122448; a=rsa-sha256; cv=none; b=qOEMekqEbtLXR/kBD5yw52aHENWIO4QOs+HcKpav+LTfs0hfHUIqAs9rCZLX1sY4ihWrjN pcU7aRS02uFVT+fcsTlEaZ47OG3BpQrPcFNYSS6Hri9/KOkwC8+G4BEvSBH5EPOQZdva+e GFkNm2slD1F500VPRccDBPNQJRVK6XthzzJGGKTVkR4YQRoFvODejqEdi2Ia4C6jhuqFcY LQv/OGDnYnu+Ow1zs8Jt9ZEJoa6fUOZxPL6uXwBmv29wqEEz3hHxDLOnVS7E8CKf1tfwl3 PaXZJJc2KKbZ0skjraiBAoq7nC1OoTeo3svmM9P/GiX/Te3YbXjcmClPo3jKBA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698122448; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fTf3r8igSkILacFcEKhvbPBKP1inHeihoNW15qVkgIg=; b=Accq//6nCHHPMSsjLOvFdZq6NpEALey3//Cofoy1E/p9g/bM0aViR5rWjGZQdEIpB+O+10 jsrQJt9FgzEzfJbkDHQYGrlg1/txMA1MJ8i0mcFT5Ir0qqlMO4+bXaDM+FjCyb7sybnL0Z W18Oh2bxM2k+Eryj1KCG7HbE9R8EqzzbW4EiNBZ8782rksPLQJkNXkwsbq/9DsdEZ7oBfv kBlzdDzWp5LBrBbTMPPA2OYvdgg1+NLllsYppDeboiO8sOvCz0fZ4fngUZq8aerg4A1NwQ xPnrIkRRg0Vb4FJYe58SWpYtzlz8hF48yxWmH5CfLWmcHvWLZaaBMOuXOmCxIg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SDzrw1wMsz17FL; Tue, 24 Oct 2023 04:40:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39O4emb9099452; Tue, 24 Oct 2023 04:40:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39O4emut099450; Tue, 24 Oct 2023 04:40:48 GMT (envelope-from git) Date: Tue, 24 Oct 2023 04:40:48 GMT Message-Id: <202310240440.39O4emut099450@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: 8784b153a31f - stable/14 - amd64 pmap: Prefer consistent naming for loader tunable List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 8784b153a31fc0b3a12449a2f0377eb038e6fb7b Auto-Submitted: auto-generated The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=8784b153a31fc0b3a12449a2f0377eb038e6fb7b commit 8784b153a31fc0b3a12449a2f0377eb038e6fb7b Author: Zhenlei Huang AuthorDate: 2023-10-20 07:31:44 +0000 Commit: Zhenlei Huang CommitDate: 2023-10-24 04:39:32 +0000 amd64 pmap: Prefer consistent naming for loader tunable The sysctl knob 'vm.pmap.allow_2m_x_ept' is loader tunable and have public document entry in security(7) but is fetched from kernel environment 'hw.allow_2m_x_ept'. That is inconsistent and obscure. As there is public security advisory FreeBSD-SA-19:25.mcepsc [1], people may refer to it and use 'hw.allow_2m_x_ept', let's keep old name for compatibility. [1] https://www.freebsd.org/security/advisories/FreeBSD-SA-19:25.mcepsc.asc Reviewed by: kib Fixes: c08973d09c95 Workaround for Intel SKL002/SKL012S errata MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D42311 (cherry picked from commit 9e7f349ff10691c2e3fb03898dbc942794a47566) --- sys/amd64/amd64/pmap.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sys/amd64/amd64/pmap.c b/sys/amd64/amd64/pmap.c index ff83d8749313..eedbf8fd8067 100644 --- a/sys/amd64/amd64/pmap.c +++ b/sys/amd64/amd64/pmap.c @@ -2342,7 +2342,10 @@ pmap_allow_2m_x_ept_recalculate(void) CPUID_TO_MODEL(cpu_id) == 0x57 || /* Knights */ CPUID_TO_MODEL(cpu_id) == 0x85)))) pmap_allow_2m_x_ept = 1; +#ifndef BURN_BRIDGES TUNABLE_INT_FETCH("hw.allow_2m_x_ept", &pmap_allow_2m_x_ept); +#endif + TUNABLE_INT_FETCH("vm.pmap.allow_2m_x_ept", &pmap_allow_2m_x_ept); } static bool From nobody Tue Oct 24 04:40:49 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SDzrx5NGJz4xTw7; Tue, 24 Oct 2023 04:40: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 4SDzrx4HPgz3HTL; Tue, 24 Oct 2023 04:40:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698122449; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=27HTRIz0qe9QIBjaUtPegGB99uaeB40hDM8hMEIZ92s=; b=BM3T049+ui+Wp+9AYOYONyCoYif9lkzLr9AXslK0T4NU7r6XJHD+Q9/vQglwrfNXPlU1zw 5jvsuJ7F9YyYF57pr0bHwfK2xYnycrcL/Hsq3ifJCPXCs44QZOt7KSkuBY+u6W/gJym8o+ SUIt3r953mNf3IWmeYMCa5UxcqpjfgnhjoRO0CyYhFNocX3tqa2F8of255VSHrvf42uH1Y jxpbY2row57p2sQ3kvrEDAs1m4jEemroC2xqVJAJ7VX+P5GQXXU8KhpOSRDFarmj3j2933 OhacBiTrH1rtoBxAiguil7b4peuCazmwJhELl3eE8mFYtsSt0f5x3YMppF3iLg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698122449; a=rsa-sha256; cv=none; b=YbGmFruiv37rzw9pEMuBZJs6cZkH/8f/xYRcDvowDiiymEsv0SrDHBEN+Ne/3ijzTuGVvf IRVEha9zfiD4UfgMZTT5nMd/zHQIPpDxREV6+IwSuEfAq1Ppz03SoE53vlCeT2jipTrDaJ TAVyJwnHGus3fvrfbk93ZdpdSRumb6IWL/BoMC4jVklvwf3p4wYB6tEHUJMWUB104qL8Kb h6IucUVd9TqkaIycdb1HLQP7Jz+DRNdmwJn0vL5lnssqyKhNt+XbaUVG4BKHlf5JHK/J2u ogNwzNO3AJVhf21yg3WS/o8p4vYyIkgq1JYVBrT/Xu0IIlHTRxfrcXim/2ogTQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698122449; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=27HTRIz0qe9QIBjaUtPegGB99uaeB40hDM8hMEIZ92s=; b=o+fNIkWe7KWfoQLb/pgc+5MkXdmHaw3Jyv/ro2JwKWViY106UCaP+GU9U4jYEpFELLF+Se PgRFVIlVXFZVlBF2JhOWr2rwoll9B/fDdDTo4120Y5aWYNW1aQNVhSHzMNRqKMgqImmoC7 I2G1jwQvULf/VsrhGbUAEyXGWiych3FstrFSon3tG0oCFkYn/LtUZaGwalDYzq0DJ7nZTC J7fjfPrFZEs8rzpM7dfMjUxpZwjpQKDlZLLnvk/lbnIBRpiKq2g5ROy+tg2HFHvy/rtiaq U5MsXsKbkCyXfYdFDA6js5QjQglDV72m53NQ9g8oz/Qd4ebpxyBM3CzIcLCvqg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SDzrx2w1Yz17xy; Tue, 24 Oct 2023 04:40:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39O4ento099500; Tue, 24 Oct 2023 04:40:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39O4ensG099497; Tue, 24 Oct 2023 04:40:49 GMT (envelope-from git) Date: Tue, 24 Oct 2023 04:40:49 GMT Message-Id: <202310240440.39O4ensG099497@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: 6cd7e3d118f2 - stable/14 - x86: Prefer consistent naming for loader tunables List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 6cd7e3d118f247a8f6bc0f8162a9cb67155b7c76 Auto-Submitted: auto-generated The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=6cd7e3d118f247a8f6bc0f8162a9cb67155b7c76 commit 6cd7e3d118f247a8f6bc0f8162a9cb67155b7c76 Author: Zhenlei Huang AuthorDate: 2023-10-17 07:05:25 +0000 Commit: Zhenlei Huang CommitDate: 2023-10-24 04:39:32 +0000 x86: Prefer consistent naming for loader tunables The following loader tunables do have corresponding sysctl MIBs but with inconsistent naming. That may be historical reason. Let's prefer consistent naming for them so that it will be easier to maintain. 1. hw.dmar.timeout -> hw.iommu.dmar.timeout 2. hw.lapic_eoi_suppression -> hw.apic.eoi_suppression 3. hw.lapic_tsc_deadline -> hw.apic.timer_tsc_deadline 4. hw.x2apic_enable -> hw.apic.x2apic_mode Those tunables are for field debugging, no need to keep old names for compatibility. Reviewed by: kib MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D42248 (cherry picked from commit 12cce5994b92f8235f379d660ccb28da8e69f55b) --- sys/x86/acpica/madt.c | 2 +- sys/x86/iommu/intel_drv.c | 2 +- sys/x86/x86/local_apic.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/x86/acpica/madt.c b/sys/x86/acpica/madt.c index 3d7c5a67375b..200eec1fbb28 100644 --- a/sys/x86/acpica/madt.c +++ b/sys/x86/acpica/madt.c @@ -221,7 +221,7 @@ madt_setup_local(void) else if (bootverbose) printf("x2APIC available but disabled %s\n", reason); user_x2apic = x2apic_mode; - TUNABLE_INT_FETCH("hw.x2apic_enable", &user_x2apic); + TUNABLE_INT_FETCH("hw.apic.x2apic_mode", &user_x2apic); if (user_x2apic != x2apic_mode) { if (bios_x2apic && !user_x2apic) printf("x2APIC disabled by tunable and " diff --git a/sys/x86/iommu/intel_drv.c b/sys/x86/iommu/intel_drv.c index a5821df6b835..ebdf24976504 100644 --- a/sys/x86/iommu/intel_drv.c +++ b/sys/x86/iommu/intel_drv.c @@ -429,7 +429,7 @@ dmar_attach(device_t dev) dmar_quirks_post_ident(unit); timeout = dmar_get_timeout(); - TUNABLE_UINT64_FETCH("hw.dmar.timeout", &timeout); + TUNABLE_UINT64_FETCH("hw.iommu.dmar.timeout", &timeout); dmar_update_timeout(timeout); for (i = 0; i < DMAR_INTR_TOTAL; i++) diff --git a/sys/x86/x86/local_apic.c b/sys/x86/x86/local_apic.c index 43fe4625cd08..6a913883cc5c 100644 --- a/sys/x86/x86/local_apic.c +++ b/sys/x86/x86/local_apic.c @@ -493,7 +493,7 @@ lapic_init(vm_paddr_t addr) (cpu_feature2 & CPUID2_TSCDLT) != 0 && tsc_is_invariant && tsc_freq != 0) { lapic_timer_tsc_deadline = 1; - TUNABLE_INT_FETCH("hw.lapic_tsc_deadline", + TUNABLE_INT_FETCH("hw.apic.timer_tsc_deadline", &lapic_timer_tsc_deadline); } @@ -526,7 +526,7 @@ lapic_init(vm_paddr_t addr) "KVM -- disabling lapic eoi suppression\n"); lapic_eoi_suppression = 0; } - TUNABLE_INT_FETCH("hw.lapic_eoi_suppression", + TUNABLE_INT_FETCH("hw.apic.eoi_suppression", &lapic_eoi_suppression); } From nobody Tue Oct 24 04:44:47 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SDzxX1DPkz4xVM1; Tue, 24 Oct 2023 04:44: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 4SDzxX0hHXz3JfQ; Tue, 24 Oct 2023 04:44:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698122688; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dYHMY3ujyr0gVRPdGHwRutF2hkasrcuP3kNdM1cdkTk=; b=tyt2OKgbCdvqlzfJvL1b8hue74qP7kUE7gdAcRPTN4r/C1P7kTpBtJZJ1oXCBPixPm4BOC T8iF+9zqI5sag/nFuSmY/gzCHvM4+/qgJwsdguuRxmHEQO/ZCDEKbRTOO1tbDmHOGl2AXZ wsdxTO9idr1V1SlxmIq1Ddgy1EM2zfwmcX+PQBFL0X/bOwakJ61iTVPkfMyc+j+fsBTCDC RBUQWkE7l/AvqQQDGmFd1VVhuIh0T362pf6W5/qn77FPGsj6H9O8hauMjAW9nVjXlgfx2n Z43+XBjxu8QwNPiTHqHlRlq1O7xvfjVz8cF9vFZeqAUMazKBXB1Ktoci+R8RhA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698122688; a=rsa-sha256; cv=none; b=CLZrW8+9SDtlwnholfgQIrMuZecm/D6P6GAJckbyIdyuHCAN6Yqd6vscmZD6ZgEomQg2hl iKTur+TEy0VFtNkTMBjHtccHjYYBY8aEqvwVO8Wy7JQPb8rqNhwkY4ItAOxaWpHiGJ3OUq x4m8+I83hFopWzkza1Gtx68T8HsduGCx+53qNOMo19t4+qUkaojFyMUEHTOzEuZbxpUPZO 2iR6wfkzbWJH1K0T7DnFraw9YuthXrZY86F3QJoTXd6ZeBMju2umdzOjgvV5YJTpa+7Px4 6e25Ue6t/eALpxtLigDOiWKFPgADrD9afNmKclwGUgX1Exn5kNcLj7VVPRU+IQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698122688; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dYHMY3ujyr0gVRPdGHwRutF2hkasrcuP3kNdM1cdkTk=; b=vZh9gyrSYueGxkpsD2b2+5SLeu8GxCgAYi32J4conQpxo3/VMq1ILOpodc7aIwk+oyA4rK BkZU8tyYDDKNFnH1mFR99OIkPq1v7bNwvvBRmnAcLg/uMzpoJyR2E4v/iTLAH6ybic1jTn XsMtP5EXPlRKwco6i2BD+ERLiQFR6KEOjvQpQQ2UzqtkChcZFGeoME0Egysh7cVb5z4/HV vGombkVRft1dqs/1zhx07J0XXlt12mlAqNrRhZ7CS6ZEWkcKZF1rgmAZ1oLI/4XEEYSI+a hDkz3tmTdnOBFNOzacvqWPo2tw7YUGHyCv0B55UJyrZHTJUDydZveRLvblpDWA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SDzxW6s6wz18BW; Tue, 24 Oct 2023 04:44: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 39O4il4V004971; Tue, 24 Oct 2023 04:44:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39O4ildW004968; Tue, 24 Oct 2023 04:44:47 GMT (envelope-from git) Date: Tue, 24 Oct 2023 04:44:47 GMT Message-Id: <202310240444.39O4ildW004968@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: ba924ff8c46c - stable/13 - vmx: Prefer consistent naming for loader tunables List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: ba924ff8c46ce44fc9b877cc48bdae3bc966c13a Auto-Submitted: auto-generated The branch stable/13 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=ba924ff8c46ce44fc9b877cc48bdae3bc966c13a commit ba924ff8c46ce44fc9b877cc48bdae3bc966c13a Author: Zhenlei Huang AuthorDate: 2023-10-19 17:18:25 +0000 Commit: Zhenlei Huang CommitDate: 2023-10-24 04:43:55 +0000 vmx: Prefer consistent naming for loader tunables The following loader tunables do have corresponding sysctl MIBs but with different names. That may be historical reason. Let's prefer consistent naming for them so that it will be easier to read and maintain. 1. hw.vmm.l1d_flush -> hw.vmm.vmx.l1d_flush 2. hw.vmm.l1d_flush_sw -> hw.vmm.vmx.l1d_flush_sw 3. hw.vmm.vmx.use_apic_pir -> hw.vmm.vmx.cap.posted_interrupts 4. hw.vmm.vmx.use_apic_vid -> hw.vmm.vmx.cap.virtual_interrupt_delivery 5. hw.vmm.vmx.use_tpr_shadowing -> hw.vmm.vmx.cap.tpr_shadowing Old names are kept for compatibility. Meanwhile, add sysctl flag CTLFLAG_TUN to them so that `sysctl -T` will report them correctly. Reviewed by: corvink, jhb, kib, #bhyve MFC after: 5 days Differential Revision: https://reviews.freebsd.org/D42251 (cherry picked from commit f3ff0918ffcdbcb4c39175f3f9be70999edb14e8) (cherry picked from commit 9e48b627aed346bf5e950134a581218d3097eb7c) --- sys/amd64/vmm/intel/vmx.c | 32 +++++++++++++++++++++++++++----- 1 file changed, 27 insertions(+), 5 deletions(-) diff --git a/sys/amd64/vmm/intel/vmx.c b/sys/amd64/vmm/intel/vmx.c index 9aecbabe6ca3..1402705ca5f5 100644 --- a/sys/amd64/vmm/intel/vmx.c +++ b/sys/amd64/vmm/intel/vmx.c @@ -192,15 +192,18 @@ SYSCTL_INT(_hw_vmm_vmx_cap, OID_AUTO, invpcid, CTLFLAG_RD, &cap_invpcid, 0, "Guests are allowed to use INVPCID"); static int tpr_shadowing; -SYSCTL_INT(_hw_vmm_vmx_cap, OID_AUTO, tpr_shadowing, CTLFLAG_RD, +SYSCTL_INT(_hw_vmm_vmx_cap, OID_AUTO, tpr_shadowing, + CTLFLAG_RDTUN | CTLFLAG_NOFETCH, &tpr_shadowing, 0, "TPR shadowing support"); static int virtual_interrupt_delivery; -SYSCTL_INT(_hw_vmm_vmx_cap, OID_AUTO, virtual_interrupt_delivery, CTLFLAG_RD, +SYSCTL_INT(_hw_vmm_vmx_cap, OID_AUTO, virtual_interrupt_delivery, + CTLFLAG_RDTUN | CTLFLAG_NOFETCH, &virtual_interrupt_delivery, 0, "APICv virtual interrupt delivery support"); static int posted_interrupts; -SYSCTL_INT(_hw_vmm_vmx_cap, OID_AUTO, posted_interrupts, CTLFLAG_RD, +SYSCTL_INT(_hw_vmm_vmx_cap, OID_AUTO, posted_interrupts, + CTLFLAG_RDTUN | CTLFLAG_NOFETCH, &posted_interrupts, 0, "APICv posted interrupt support"); static int pirvec = -1; @@ -213,10 +216,10 @@ SYSCTL_UINT(_hw_vmm_vmx, OID_AUTO, vpid_alloc_failed, CTLFLAG_RD, &vpid_alloc_failed, 0, NULL); int guest_l1d_flush; -SYSCTL_INT(_hw_vmm_vmx, OID_AUTO, l1d_flush, CTLFLAG_RD, +SYSCTL_INT(_hw_vmm_vmx, OID_AUTO, l1d_flush, CTLFLAG_RDTUN | CTLFLAG_NOFETCH, &guest_l1d_flush, 0, NULL); int guest_l1d_flush_sw; -SYSCTL_INT(_hw_vmm_vmx, OID_AUTO, l1d_flush_sw, CTLFLAG_RD, +SYSCTL_INT(_hw_vmm_vmx, OID_AUTO, l1d_flush_sw, CTLFLAG_RDTUN | CTLFLAG_NOFETCH, &guest_l1d_flush_sw, 0, NULL); static struct msr_entry msr_load_list[1] __aligned(16); @@ -832,8 +835,12 @@ vmx_modinit(int ipinum) &tmp); if (error == 0) { tpr_shadowing = 1; +#ifndef BURN_BRIDGES TUNABLE_INT_FETCH("hw.vmm.vmx.use_tpr_shadowing", &tpr_shadowing); +#endif + TUNABLE_INT_FETCH("hw.vmm.vmx.cap.tpr_shadowing", + &tpr_shadowing); } if (tpr_shadowing) { @@ -854,8 +861,12 @@ vmx_modinit(int ipinum) procbased2_vid_bits, 0, &tmp); if (error == 0 && tpr_shadowing) { virtual_interrupt_delivery = 1; +#ifndef BURN_BRIDGES TUNABLE_INT_FETCH("hw.vmm.vmx.use_apic_vid", &virtual_interrupt_delivery); +#endif + TUNABLE_INT_FETCH("hw.vmm.vmx.cap.virtual_interrupt_delivery", + &virtual_interrupt_delivery); } if (virtual_interrupt_delivery) { @@ -881,8 +892,12 @@ vmx_modinit(int ipinum) } } else { posted_interrupts = 1; +#ifndef BURN_BRIDGES TUNABLE_INT_FETCH("hw.vmm.vmx.use_apic_pir", &posted_interrupts); +#endif + TUNABLE_INT_FETCH("hw.vmm.vmx.cap.posted_interrupts", + &posted_interrupts); } } } @@ -899,7 +914,10 @@ vmx_modinit(int ipinum) guest_l1d_flush = (cpu_ia32_arch_caps & IA32_ARCH_CAP_SKIP_L1DFL_VMENTRY) == 0; +#ifndef BURN_BRIDGES TUNABLE_INT_FETCH("hw.vmm.l1d_flush", &guest_l1d_flush); +#endif + TUNABLE_INT_FETCH("hw.vmm.vmx.l1d_flush", &guest_l1d_flush); /* * L1D cache flush is enabled. Use IA32_FLUSH_CMD MSR when @@ -911,8 +929,12 @@ vmx_modinit(int ipinum) if (guest_l1d_flush) { if ((cpu_stdext_feature3 & CPUID_STDEXT3_L1D_FLUSH) == 0) { guest_l1d_flush_sw = 1; +#ifndef BURN_BRIDGES TUNABLE_INT_FETCH("hw.vmm.l1d_flush_sw", &guest_l1d_flush_sw); +#endif + TUNABLE_INT_FETCH("hw.vmm.vmx.l1d_flush_sw", + &guest_l1d_flush_sw); } if (guest_l1d_flush_sw) { if (nmi_flush_l1d_sw <= 1) From nobody Tue Oct 24 04:44:49 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SDzxY2qmzz4xV7Z; Tue, 24 Oct 2023 04:44: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 4SDzxY1xmQz3JrJ; Tue, 24 Oct 2023 04:44:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698122689; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6PWP3h9eAnu4PUc/r1qk/cy5lCbsMSYw1rPXu3t923o=; b=QWAoz1/kvAAGMyN4xTH3PKgAc/YH6Kl5jz3cu0xD9Dj2Gh5g1MdKX9mvurMg0rdTiBeOJs VgYPSIjZkO5LgcRTToIRKERZIxTvzB9eNTm2BpMQyu5pBprsLBoNythC0w0hpEBV2bsmJf gdLRV2t7ykC6FvAqhtBMKX6AR6IOv+Nm77LgCAVL+T6DixzpavXL64C8VsOYZuo0Gk+p15 nqDC5X1+r9OioHvACM/UmDXNsyQqrJxtdQlM2m8m+upY7fhP/S3HZyultiKK8E8k3d1DRO mvsB7pjkQ/T2WUkPJNMDDP7U2CQj78nJqKdzhJsL58KJIRfmxWyeQDT+lfcHmA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698122689; a=rsa-sha256; cv=none; b=u0EjUjSnN+cLajJZjCmRktXElsXIT+NNj4CCDa+ZZmvFrUfYU7O2mQX1kpyAZcaoHsJVDv 90IHYYUK4n3vjxt9LrspzzCaYg3vvG6nksfSJRWi/18fmUrLr0ybLm4RJAi7GCl8W3eBj5 BafshzJZ5MEhdLMiTArPvnXvOeq+CiYoWofkGXqqEoOvQt+40yrMcOfKFoVg9fPADliCHB M//lAxKa28i+hz7u+mjgFqgQIyMalhvZc1iQ5I9VEodmlyV5KGQMs37az9SoCOoR5CUAWm /R9j3gjw71Sco6z3/gatiXEfEv7GwbWTYuSHkeBObYxOKhbxDagvWba1WPp4qg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698122689; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6PWP3h9eAnu4PUc/r1qk/cy5lCbsMSYw1rPXu3t923o=; b=HMGzbHuGlE6Je+AI7FWtTs241WDI5SXGusXs/b1yGyA4clgJU3RtnbHs1XVlxWUA2zTGU/ IyH0mU+pUlD3RsS9JSsXwys6EG3d0vK1TkSqZPVJx/rmTKC/MbO1a45jL5TYn2FFvp3pzL b58zVrNqOXsy0BaIH14S6+mEyTYBEuWe95w0xDFMB/vFRpQeGoQfKGb5i5hUrgfYscaX0S iYbkcBj4CG/eE2ueLxNmYzsrYs2LTp13LzFFMrHU1rttLeYD2i6oUkz07bKwq4xp6JpsS5 bB9++u82N8++9lkGFMTd+Nc7ZCcGDNfXx7ZOm7KsDGt03+0K0aoYrL7ykXRxJA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SDzxY0n93z17vW; Tue, 24 Oct 2023 04:44: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 39O4inbM005022; Tue, 24 Oct 2023 04:44:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39O4incw005020; Tue, 24 Oct 2023 04:44:49 GMT (envelope-from git) Date: Tue, 24 Oct 2023 04:44:49 GMT Message-Id: <202310240444.39O4incw005020@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: 350e79edf9a8 - stable/13 - amd64 pmap: Prefer consistent naming for loader tunable List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 350e79edf9a8f65c9a9d17aa86ec90b436d638f8 Auto-Submitted: auto-generated The branch stable/13 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=350e79edf9a8f65c9a9d17aa86ec90b436d638f8 commit 350e79edf9a8f65c9a9d17aa86ec90b436d638f8 Author: Zhenlei Huang AuthorDate: 2023-10-20 07:31:44 +0000 Commit: Zhenlei Huang CommitDate: 2023-10-24 04:43:56 +0000 amd64 pmap: Prefer consistent naming for loader tunable The sysctl knob 'vm.pmap.allow_2m_x_ept' is loader tunable and have public document entry in security(7) but is fetched from kernel environment 'hw.allow_2m_x_ept'. That is inconsistent and obscure. As there is public security advisory FreeBSD-SA-19:25.mcepsc [1], people may refer to it and use 'hw.allow_2m_x_ept', let's keep old name for compatibility. [1] https://www.freebsd.org/security/advisories/FreeBSD-SA-19:25.mcepsc.asc Reviewed by: kib Fixes: c08973d09c95 Workaround for Intel SKL002/SKL012S errata MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D42311 (cherry picked from commit 9e7f349ff10691c2e3fb03898dbc942794a47566) (cherry picked from commit 8784b153a31fc0b3a12449a2f0377eb038e6fb7b) --- sys/amd64/amd64/pmap.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sys/amd64/amd64/pmap.c b/sys/amd64/amd64/pmap.c index 5e2cd4235823..4fba61269352 100644 --- a/sys/amd64/amd64/pmap.c +++ b/sys/amd64/amd64/pmap.c @@ -2257,7 +2257,10 @@ pmap_allow_2m_x_ept_recalculate(void) CPUID_TO_MODEL(cpu_id) == 0x57 || /* Knights */ CPUID_TO_MODEL(cpu_id) == 0x85)))) pmap_allow_2m_x_ept = 1; +#ifndef BURN_BRIDGES TUNABLE_INT_FETCH("hw.allow_2m_x_ept", &pmap_allow_2m_x_ept); +#endif + TUNABLE_INT_FETCH("vm.pmap.allow_2m_x_ept", &pmap_allow_2m_x_ept); } static bool From nobody Tue Oct 24 04:44:50 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SDzxZ4Pscz4xV9m; Tue, 24 Oct 2023 04:44: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 4SDzxZ2QqDz3KGQ; Tue, 24 Oct 2023 04:44:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698122690; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=25fsae4AP4TwSUeimUU0J91xcyLO7b7kKTX+6Euy70E=; b=nacJ8hOQUw8c+mLKnHGXsGGXRvAIbGw/wfqTAjUnK9wkdSZ5zukHS5P3Kjy0+DO4YMJP6d 7Mu6MxnnDS+1c4AgGnsmQSA7xFfiNwZMznxxCoTc62fDJ2QO+pmEsZoOUmyjw5YkSLMZks qLmc7F6NwqTwUfi14V0TOmAV/WDBGUx2cEcltCjmEV2C9MBTE5OedKMF6LmDL0zvlPSs5X Y8jSOYnDbu4Wo4+84LaWV7t2r38wlBua9A+EpF2Zc7mNDhQi3Zl5M2EEX0Uf/UNh78XHVP zgL1fD1pCAJDo3tMUpcTzuk88QiqV3csHiTQ6Adnj5DdrsWxcTLJz+criqm0oQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698122690; a=rsa-sha256; cv=none; b=PaJ55ImgHEJ8y5Ds7pMX8aupksczE/FmYLHrS21bq4B7vFRbklvDGzHigZK6qkv50GQeai t9FsmOzuyOzWEAw3vy2LuRBs7920DuTuxmEzHUGoWCdYFUun/A2HJG0pHIe+PORyc9vxo5 oPMDJzAtp6J7+qKTsQKM6ErNvdUyhUAfF2jxyTr2F2noRq7S1f0h4OFC3rXft8VckdOANp TskSe1v0p5c0iazqSVxcwX+5kIqaiQySaHHxCOlE2MKDAazC/lWP3qI+LHEXm/Hf06WRvz c5ca+dhWlzxGL/BpXs3aC0+d8pkW8z8WwFlG6LsBRYkcZyksmJkPj8S0IUax3Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698122690; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=25fsae4AP4TwSUeimUU0J91xcyLO7b7kKTX+6Euy70E=; b=iBrou6qITeOcCk7KzbGSQQDj+QKmEW5qzY5JsCgYrxBoAmdF4BNUEqkOjpwSYO+EFnvUiY rXH4IuzN94Ew39b/hq7AJPY15R+ZpzIX40xGwE55Rq9joxVKlbij5/GHNkVqsr3TXWXWXg PQVqNF7NUQjiKkC3ZEDi/3I892ZTPEByTKSu+RvVpa2YWJgkYxXL2pPqlx1q4Ysrf3prYp rSqgBlwwq89M4K9fgBRvaEpQFhlOUgEdUjH+PfXYZPIJOzjhA3W4kN9WlvSxgw6vUk4ram HUfj04WW+ifzWAVMnERURvLjRJBjmuPS+xhTeYWo8wwsTidftLnYMEbt54wydw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SDzxZ1X1lz18NS; Tue, 24 Oct 2023 04:44: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 39O4iog0005077; Tue, 24 Oct 2023 04:44:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39O4iopg005075; Tue, 24 Oct 2023 04:44:50 GMT (envelope-from git) Date: Tue, 24 Oct 2023 04:44:50 GMT Message-Id: <202310240444.39O4iopg005075@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: 8ca5539ae1e6 - stable/13 - x86: Prefer consistent naming for loader tunables List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 8ca5539ae1e693709553729edd7e34b90d734a85 Auto-Submitted: auto-generated The branch stable/13 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=8ca5539ae1e693709553729edd7e34b90d734a85 commit 8ca5539ae1e693709553729edd7e34b90d734a85 Author: Zhenlei Huang AuthorDate: 2023-10-17 07:05:25 +0000 Commit: Zhenlei Huang CommitDate: 2023-10-24 04:43:56 +0000 x86: Prefer consistent naming for loader tunables The following loader tunables do have corresponding sysctl MIBs but with inconsistent naming. That may be historical reason. Let's prefer consistent naming for them so that it will be easier to maintain. 1. hw.dmar.timeout -> hw.iommu.dmar.timeout 2. hw.lapic_eoi_suppression -> hw.apic.eoi_suppression 3. hw.lapic_tsc_deadline -> hw.apic.timer_tsc_deadline 4. hw.x2apic_enable -> hw.apic.x2apic_mode Those tunables are for field debugging, no need to keep old names for compatibility. Reviewed by: kib MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D42248 (cherry picked from commit 12cce5994b92f8235f379d660ccb28da8e69f55b) (cherry picked from commit 6cd7e3d118f247a8f6bc0f8162a9cb67155b7c76) --- sys/x86/acpica/madt.c | 2 +- sys/x86/iommu/intel_drv.c | 2 +- sys/x86/x86/local_apic.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/x86/acpica/madt.c b/sys/x86/acpica/madt.c index e63fd86a7c9b..6da4b23901a2 100644 --- a/sys/x86/acpica/madt.c +++ b/sys/x86/acpica/madt.c @@ -224,7 +224,7 @@ madt_setup_local(void) else if (bootverbose) printf("x2APIC available but disabled %s\n", reason); user_x2apic = x2apic_mode; - TUNABLE_INT_FETCH("hw.x2apic_enable", &user_x2apic); + TUNABLE_INT_FETCH("hw.apic.x2apic_mode", &user_x2apic); if (user_x2apic != x2apic_mode) { if (bios_x2apic && !user_x2apic) printf("x2APIC disabled by tunable and " diff --git a/sys/x86/iommu/intel_drv.c b/sys/x86/iommu/intel_drv.c index 72c6d5b7df44..6aa1c9d090cf 100644 --- a/sys/x86/iommu/intel_drv.c +++ b/sys/x86/iommu/intel_drv.c @@ -429,7 +429,7 @@ dmar_attach(device_t dev) dmar_quirks_post_ident(unit); timeout = dmar_get_timeout(); - TUNABLE_UINT64_FETCH("hw.dmar.timeout", &timeout); + TUNABLE_UINT64_FETCH("hw.iommu.dmar.timeout", &timeout); dmar_update_timeout(timeout); for (i = 0; i < DMAR_INTR_TOTAL; i++) diff --git a/sys/x86/x86/local_apic.c b/sys/x86/x86/local_apic.c index 68468110e522..15a69c207a98 100644 --- a/sys/x86/x86/local_apic.c +++ b/sys/x86/x86/local_apic.c @@ -568,7 +568,7 @@ native_lapic_init(vm_paddr_t addr) (cpu_feature2 & CPUID2_TSCDLT) != 0 && tsc_is_invariant && tsc_freq != 0) { lapic_timer_tsc_deadline = 1; - TUNABLE_INT_FETCH("hw.lapic_tsc_deadline", + TUNABLE_INT_FETCH("hw.apic.timer_tsc_deadline", &lapic_timer_tsc_deadline); } @@ -601,7 +601,7 @@ native_lapic_init(vm_paddr_t addr) "KVM -- disabling lapic eoi suppression\n"); lapic_eoi_suppression = 0; } - TUNABLE_INT_FETCH("hw.lapic_eoi_suppression", + TUNABLE_INT_FETCH("hw.apic.eoi_suppression", &lapic_eoi_suppression); } From nobody Tue Oct 24 04:47:14 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SF00L6pCvz4xTnB; Tue, 24 Oct 2023 04:47: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 4SF00L6H9rz3KkM; Tue, 24 Oct 2023 04: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=1698122834; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lfMAoRoNpv15CgpT5WrOiydpZ+04O80nnElws8EcWU8=; b=rPMbryIIDIaS5o8h/gVL5gz3zX3nlaTcc6XqOVuNpStqevxiBEt+NFdYJ5yr9IYS/uoQdB lkZ/QoH+mxxpw84IEY1OIQpApuf5qrgmZZ2j2LIctznCTTlmqy3zOsRAlgSnNIK4GnNOB/ 1nQ3j7EWnUkbwx/EUhUsY5dB0V57cyiIC+y7yPUipLc4topOTK8E4nxTz7apTvVASLIQVX 6ZJSfisxWUBb5iH+jxliOesQk/vWiawQyJMlGhxqavExqiCLsWyFQT6OElp3AkpW0jEbim nABKFoT4iMsR0ef1XEE6ozqh8xWgdUC8F3McB/k+cTEsgF0Yn4IoCt/waHhktg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698122834; a=rsa-sha256; cv=none; b=uzHl+uL9iMyQcDIDtT33qEw5FAW0Cmj1A7MWq2vVW/X3Nofpi4+RqI9LoKdOYYjNdqx6Em 8LnFvQ2EHpoWwk94dD+lmDRjBgpC5aWjyy9WoTeuYJXyFJvgNoGJIudV0yVZ0MY78uhyGE cJafi5JbIXRb4Qa1tjsJ70ozXTjX34gHW3Ygt4zntbAdZKNyMZ8/+EQvDcLBHSBPuyXkde hvpUXM2SAFYkaI2I29nQLM5XOIAg29NHFZ6eApc7DcwrAU1fkjWcFH7rs5kuSTvVb9Md8u Gz/4mZz42FDYweSPF4yhk6ueQDut8ymWgGCXEkTcUHCMj5iuvT90gX9Ww3QwAA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698122834; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lfMAoRoNpv15CgpT5WrOiydpZ+04O80nnElws8EcWU8=; b=jMWjwpuCM1lj6Pi69UCFu3wlwdWrGHNCdxCpIQgZDZNuLhDVDX6fHLyaO69iz8r6AEcFei UZNA14a8g9ksL8eqcyvs06VoOEnrPLdh8dYwg3UOHRtCvGTeyO0gmSFoxoN/lhcJck0R/M mk2EwE6wr+HYtiwmloCbe/8w1mNNFs9vXQyVCCnQ+QUcmaqLsqd+9nJzHXlZ4T0cDzVcNh V3vcjqUVQKSf0B9UP2XZGmW6YcqqZY0sjvHj1wx32TKVMeJSv1xiwnXb57eFPFjljTaShq QDYtrhiE1RfSeZhzRjVwC80cfCIOsCuU2q2oSUhT89dZUQEyUiTmEsJKdAZV9A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SF00L5LXbz187y; Tue, 24 Oct 2023 04: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 39O4lEel005564; Tue, 24 Oct 2023 04: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 39O4lEwZ005561; Tue, 24 Oct 2023 04:47:14 GMT (envelope-from git) Date: Tue, 24 Oct 2023 04:47:14 GMT Message-Id: <202310240447.39O4lEwZ005561@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: 95c4e64bf677 - stable/12 - vmx: Prefer consistent naming for loader tunables List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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/12 X-Git-Reftype: branch X-Git-Commit: 95c4e64bf677895fde328fcb564224cc2ad2eda1 Auto-Submitted: auto-generated The branch stable/12 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=95c4e64bf677895fde328fcb564224cc2ad2eda1 commit 95c4e64bf677895fde328fcb564224cc2ad2eda1 Author: Zhenlei Huang AuthorDate: 2023-10-19 17:18:25 +0000 Commit: Zhenlei Huang CommitDate: 2023-10-24 04:46:30 +0000 vmx: Prefer consistent naming for loader tunables The following loader tunables do have corresponding sysctl MIBs but with different names. That may be historical reason. Let's prefer consistent naming for them so that it will be easier to read and maintain. 1. hw.vmm.l1d_flush -> hw.vmm.vmx.l1d_flush 2. hw.vmm.l1d_flush_sw -> hw.vmm.vmx.l1d_flush_sw 3. hw.vmm.vmx.use_apic_pir -> hw.vmm.vmx.cap.posted_interrupts 4. hw.vmm.vmx.use_apic_vid -> hw.vmm.vmx.cap.virtual_interrupt_delivery 5. hw.vmm.vmx.use_tpr_shadowing -> hw.vmm.vmx.cap.tpr_shadowing Old names are kept for compatibility. Meanwhile, add sysctl flag CTLFLAG_TUN to them so that `sysctl -T` will report them correctly. Reviewed by: corvink, jhb, kib, #bhyve MFC after: 5 days Differential Revision: https://reviews.freebsd.org/D42251 (cherry picked from commit f3ff0918ffcdbcb4c39175f3f9be70999edb14e8) (cherry picked from commit 9e48b627aed346bf5e950134a581218d3097eb7c) (cherry picked from commit ba924ff8c46ce44fc9b877cc48bdae3bc966c13a) --- sys/amd64/vmm/intel/vmx.c | 32 +++++++++++++++++++++++++++----- 1 file changed, 27 insertions(+), 5 deletions(-) diff --git a/sys/amd64/vmm/intel/vmx.c b/sys/amd64/vmm/intel/vmx.c index e800618e9eeb..8ab927af3fc9 100644 --- a/sys/amd64/vmm/intel/vmx.c +++ b/sys/amd64/vmm/intel/vmx.c @@ -181,15 +181,18 @@ SYSCTL_INT(_hw_vmm_vmx_cap, OID_AUTO, invpcid, CTLFLAG_RD, &cap_invpcid, 0, "Guests are allowed to use INVPCID"); static int tpr_shadowing; -SYSCTL_INT(_hw_vmm_vmx_cap, OID_AUTO, tpr_shadowing, CTLFLAG_RD, +SYSCTL_INT(_hw_vmm_vmx_cap, OID_AUTO, tpr_shadowing, + CTLFLAG_RDTUN | CTLFLAG_NOFETCH, &tpr_shadowing, 0, "TPR shadowing support"); static int virtual_interrupt_delivery; -SYSCTL_INT(_hw_vmm_vmx_cap, OID_AUTO, virtual_interrupt_delivery, CTLFLAG_RD, +SYSCTL_INT(_hw_vmm_vmx_cap, OID_AUTO, virtual_interrupt_delivery, + CTLFLAG_RDTUN | CTLFLAG_NOFETCH, &virtual_interrupt_delivery, 0, "APICv virtual interrupt delivery support"); static int posted_interrupts; -SYSCTL_INT(_hw_vmm_vmx_cap, OID_AUTO, posted_interrupts, CTLFLAG_RD, +SYSCTL_INT(_hw_vmm_vmx_cap, OID_AUTO, posted_interrupts, + CTLFLAG_RDTUN | CTLFLAG_NOFETCH, &posted_interrupts, 0, "APICv posted interrupt support"); static int pirvec = -1; @@ -202,10 +205,10 @@ SYSCTL_UINT(_hw_vmm_vmx, OID_AUTO, vpid_alloc_failed, CTLFLAG_RD, &vpid_alloc_failed, 0, NULL); int guest_l1d_flush; -SYSCTL_INT(_hw_vmm_vmx, OID_AUTO, l1d_flush, CTLFLAG_RD, +SYSCTL_INT(_hw_vmm_vmx, OID_AUTO, l1d_flush, CTLFLAG_RDTUN | CTLFLAG_NOFETCH, &guest_l1d_flush, 0, NULL); int guest_l1d_flush_sw; -SYSCTL_INT(_hw_vmm_vmx, OID_AUTO, l1d_flush_sw, CTLFLAG_RD, +SYSCTL_INT(_hw_vmm_vmx, OID_AUTO, l1d_flush_sw, CTLFLAG_RDTUN | CTLFLAG_NOFETCH, &guest_l1d_flush_sw, 0, NULL); static struct msr_entry msr_load_list[1] __aligned(16); @@ -819,8 +822,12 @@ vmx_init(int ipinum) &tmp); if (error == 0) { tpr_shadowing = 1; +#ifndef BURN_BRIDGES TUNABLE_INT_FETCH("hw.vmm.vmx.use_tpr_shadowing", &tpr_shadowing); +#endif + TUNABLE_INT_FETCH("hw.vmm.vmx.cap.tpr_shadowing", + &tpr_shadowing); } if (tpr_shadowing) { @@ -841,8 +848,12 @@ vmx_init(int ipinum) procbased2_vid_bits, 0, &tmp); if (error == 0 && tpr_shadowing) { virtual_interrupt_delivery = 1; +#ifndef BURN_BRIDGES TUNABLE_INT_FETCH("hw.vmm.vmx.use_apic_vid", &virtual_interrupt_delivery); +#endif + TUNABLE_INT_FETCH("hw.vmm.vmx.cap.virtual_interrupt_delivery", + &virtual_interrupt_delivery); } if (virtual_interrupt_delivery) { @@ -867,8 +878,12 @@ vmx_init(int ipinum) } } else { posted_interrupts = 1; +#ifndef BURN_BRIDGES TUNABLE_INT_FETCH("hw.vmm.vmx.use_apic_pir", &posted_interrupts); +#endif + TUNABLE_INT_FETCH("hw.vmm.vmx.cap.posted_interrupts", + &posted_interrupts); } } } @@ -885,7 +900,10 @@ vmx_init(int ipinum) guest_l1d_flush = (cpu_ia32_arch_caps & IA32_ARCH_CAP_SKIP_L1DFL_VMENTRY) == 0; +#ifndef BURN_BRIDGES TUNABLE_INT_FETCH("hw.vmm.l1d_flush", &guest_l1d_flush); +#endif + TUNABLE_INT_FETCH("hw.vmm.vmx.l1d_flush", &guest_l1d_flush); /* * L1D cache flush is enabled. Use IA32_FLUSH_CMD MSR when @@ -897,8 +915,12 @@ vmx_init(int ipinum) if (guest_l1d_flush) { if ((cpu_stdext_feature3 & CPUID_STDEXT3_L1D_FLUSH) == 0) { guest_l1d_flush_sw = 1; +#ifndef BURN_BRIDGES TUNABLE_INT_FETCH("hw.vmm.l1d_flush_sw", &guest_l1d_flush_sw); +#endif + TUNABLE_INT_FETCH("hw.vmm.vmx.l1d_flush_sw", + &guest_l1d_flush_sw); } if (guest_l1d_flush_sw) { if (nmi_flush_l1d_sw <= 1) From nobody Tue Oct 24 04:47:15 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SF00N17PMz4xVQC; Tue, 24 Oct 2023 04: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 4SF00M702dz3KkY; Tue, 24 Oct 2023 04: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=1698122836; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zsj6dMwkeDvZabngIVKVzY2mQ2N5I5d6MDhFV+D6K2k=; b=myNegedhaBaHCK2yxz7XwUR6MdVT0CHtgySghe1VpyAgU3jMUDDI84RA+LmTkoI0IWTbwB m3afi0iFnQ/k3mZlE1JU57UuLMgnZ6wmpXAnEg5uwY8fBJAd+O9FEP9ytUcjCXJHWF/ycZ 2rBH1z+x1c3zHn7URhE72stiu6VelHOJsUKAuos87kFNxEmv7yq8uSpOw/WfoFN3bXuYmR 39TWWktvexn6UCbGoT2pwdS+gk1/BvPBg8m80JRTXJ46wFZBNJBU1EWqotBNjW/wWgXio8 huOtIaZhCh4jdeGYsTO+PNQkJRAmnxdoVxTyxgNTmAEkkzbI32fxKDRyYHgj8g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698122836; a=rsa-sha256; cv=none; b=g4MbPRTI0A9ucMmI5PgqbfFEO7hoBsBkdge2k3mltwMhLO8pDQIJ+rR/sreLPSamMuGA+O Cipt4fmSlj5dYaQaYYL9koVXiNNoT7MevF23miv+5Pqr429a7ROBmnjaZoFXgDyxNcdg9e HSR+IcyxVk01qpb+YV0w9cJNlvdsae4MDHVnB5dsunabGoj9tJYvm4s+Brx0BhrJWL2+Wg UG0F+tEVJmaRV8rs4FgzXIoufuubsCVG/mqmwn80/qPmN3VPaH3hcktxOcV+o7MTQVAjIe 014747/4PChrwZiijCOBZP7YnDt4LeAQJg//NJxhU/m52jmHh+ARW3f8WA0BQg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698122836; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zsj6dMwkeDvZabngIVKVzY2mQ2N5I5d6MDhFV+D6K2k=; b=XUc4aNJHn6yfrkpvDwOGdOgcHDfTjUDNoplhg7BL5ehuTVIWApz34kWjARFpJlCxRpfAT5 Jvp0anUQf8mJTnHGCLgS1NyoRgZsOPsLNSS86WaDM9fdNAP5V4pI+9VdZQBWsLimo8M8El UvepI88qCfJkmMC9XOnsrgAQwAxmLw6kVWZoophAjnGrDSslUjs0tO+kyfGRuDyGcI192g 9UGjWxm3ZQYAdREnNw5pAzVpqJd5PxX9cE2io4/fefRJBLBVvNHkHr8tokFaDXGJYBDRUG lFsHiMiQhtDYGt/Nqk7kIkZJipCqcxnDxIUP2gL3MbavJVpUKq7C11PQ53ofSg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SF00M62Sfz17vX; Tue, 24 Oct 2023 04: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 39O4lFCv005615; Tue, 24 Oct 2023 04: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 39O4lFjk005612; Tue, 24 Oct 2023 04:47:15 GMT (envelope-from git) Date: Tue, 24 Oct 2023 04:47:15 GMT Message-Id: <202310240447.39O4lFjk005612@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: 180695b8e643 - stable/12 - amd64 pmap: Prefer consistent naming for loader tunable List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 180695b8e6434891c418cfdde9a32eee8c8fb6f0 Auto-Submitted: auto-generated The branch stable/12 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=180695b8e6434891c418cfdde9a32eee8c8fb6f0 commit 180695b8e6434891c418cfdde9a32eee8c8fb6f0 Author: Zhenlei Huang AuthorDate: 2023-10-20 07:31:44 +0000 Commit: Zhenlei Huang CommitDate: 2023-10-24 04:46:30 +0000 amd64 pmap: Prefer consistent naming for loader tunable The sysctl knob 'vm.pmap.allow_2m_x_ept' is loader tunable and have public document entry in security(7) but is fetched from kernel environment 'hw.allow_2m_x_ept'. That is inconsistent and obscure. As there is public security advisory FreeBSD-SA-19:25.mcepsc [1], people may refer to it and use 'hw.allow_2m_x_ept', let's keep old name for compatibility. [1] https://www.freebsd.org/security/advisories/FreeBSD-SA-19:25.mcepsc.asc Reviewed by: kib Fixes: c08973d09c95 Workaround for Intel SKL002/SKL012S errata MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D42311 (cherry picked from commit 9e7f349ff10691c2e3fb03898dbc942794a47566) (cherry picked from commit 8784b153a31fc0b3a12449a2f0377eb038e6fb7b) (cherry picked from commit 350e79edf9a8f65c9a9d17aa86ec90b436d638f8) --- sys/amd64/amd64/pmap.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sys/amd64/amd64/pmap.c b/sys/amd64/amd64/pmap.c index b2fe589ed029..cf4a96ceabe6 100644 --- a/sys/amd64/amd64/pmap.c +++ b/sys/amd64/amd64/pmap.c @@ -1847,7 +1847,10 @@ pmap_allow_2m_x_ept_recalculate(void) CPUID_TO_MODEL(cpu_id) == 0x57 || /* Knights */ CPUID_TO_MODEL(cpu_id) == 0x85)))) pmap_allow_2m_x_ept = 1; +#ifndef BURN_BRIDGES TUNABLE_INT_FETCH("hw.allow_2m_x_ept", &pmap_allow_2m_x_ept); +#endif + TUNABLE_INT_FETCH("vm.pmap.allow_2m_x_ept", &pmap_allow_2m_x_ept); } static bool From nobody Tue Oct 24 04:47:16 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SF00P1bvPz4xVNX; Tue, 24 Oct 2023 04: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 4SF00P156Dz3Kq4; Tue, 24 Oct 2023 04:47:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698122837; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/eByzz7P8ve0Y4fvnAS0PDGh8T0PIbGHDXmYCxltTj4=; b=rFzsojDgNo9u+yRz/W6UflywmIgIpFIZp49AyHlUcF1YjKmefUT9Hsst0HQlFlrtBKhud3 j2boDjGurDrSr6pEOn9oF8bxX1avI7bSEja5R8UMjHrY7ciDOO+LGgA0yW3kwDbPDcitaM tkWwnyZqPE4m3dLY/58Pi4rSkJbIzwmJn5LrrSJEQLMDh2KVD9l7ZkZVM+C+vdnGGUYYsP 0so3UHGja+Tmh/fhFB3Xnunly3lRUb0p1KBt5SKIvTLihlf2o920n1ovy1ZlnEwd6rWtxC zaYN4xW/lBE0oXI5DQSJgE/nWxr3mhU33gJI9pLCaP2CrG4/4cYSHTsclvjvlw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698122837; a=rsa-sha256; cv=none; b=thDTOPAZqm6JsY5mxO02VJ/HXm9a6WkwTHjgNUdANp9Q9Dw7VLu8TQHPQzblMgZ3t7FYyK UGf6gq5rjLrwqoGEEeCXojS1NUNcPuWnA3WP467+nmDNegMOYcvLbToAUK2lxSVqiXWrd8 BSMl83Oqi4pb+sqDAeiw0Ps07w+T+7NeFE3+xNEZeoSVTkMsGzTzlRBHHUU2I6cPykjZ9v IeHopv1N1dV+kBsuzWIbW5PDMtyZNqxz2LxeOekd1D41b/navbLqEfSCrjG8jYN3H2r1g2 4aerLXGwOl+lVMwM4pa6s5z9OQijzZb7hmcbEwA0NQOXhG7m+mXp8TJkKxwhtw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698122837; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/eByzz7P8ve0Y4fvnAS0PDGh8T0PIbGHDXmYCxltTj4=; b=XvSIUCuS363ixAmVODu3Ka+HKz87zCg0DEvVsw7VqrS4ntIMEm80eTAab0aWKhBz9B4/Xc dZwCX5eLfThuEoj34VwGXXwY+d/keYj1myEaD7sQsZ7BaJkftLcu7pHZPP4s9F4iftudE/ cfValhwvAiyF2pmTTjh+YuLEYyV7QO+sf/85R0hsJlCJwvAQ+BvMN3H6gpq2tF13fEVhEa NLENzcP5OfU4O3nB/w4z53DKhghKtqconOAUd9qJw2jZW0QoLSZaZ32V8rVF5vz4MCEHMZ 5Hh1USRh35AkYVezK/fOX0wQsvGhwLHSG0QQIK8vDY9ha81w4GpUbK4mNXPiVA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SF00N72qHz17sp; Tue, 24 Oct 2023 04: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 39O4lGj9005669; Tue, 24 Oct 2023 04: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 39O4lGBx005666; Tue, 24 Oct 2023 04:47:16 GMT (envelope-from git) Date: Tue, 24 Oct 2023 04:47:16 GMT Message-Id: <202310240447.39O4lGBx005666@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: 71f147c60771 - stable/12 - x86: Prefer consistent naming for loader tunables List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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/12 X-Git-Reftype: branch X-Git-Commit: 71f147c60771fb4d6cbab2833c1206e007305044 Auto-Submitted: auto-generated The branch stable/12 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=71f147c60771fb4d6cbab2833c1206e007305044 commit 71f147c60771fb4d6cbab2833c1206e007305044 Author: Zhenlei Huang AuthorDate: 2023-10-17 07:05:25 +0000 Commit: Zhenlei Huang CommitDate: 2023-10-24 04:46:31 +0000 x86: Prefer consistent naming for loader tunables The following loader tunables do have corresponding sysctl MIBs but with inconsistent naming. That may be historical reason. Let's prefer consistent naming for them so that it will be easier to maintain. 1. hw.dmar.timeout -> hw.iommu.dmar.timeout 2. hw.lapic_eoi_suppression -> hw.apic.eoi_suppression 3. hw.lapic_tsc_deadline -> hw.apic.timer_tsc_deadline 4. hw.x2apic_enable -> hw.apic.x2apic_mode Those tunables are for field debugging, no need to keep old names for compatibility. Reviewed by: kib MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D42248 (cherry picked from commit 12cce5994b92f8235f379d660ccb28da8e69f55b) (cherry picked from commit 6cd7e3d118f247a8f6bc0f8162a9cb67155b7c76) (cherry picked from commit 8ca5539ae1e693709553729edd7e34b90d734a85) --- sys/x86/acpica/madt.c | 2 +- sys/x86/iommu/intel_drv.c | 2 +- sys/x86/x86/local_apic.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/x86/acpica/madt.c b/sys/x86/acpica/madt.c index 5c1e5b9f8848..33ba0cf8af20 100644 --- a/sys/x86/acpica/madt.c +++ b/sys/x86/acpica/madt.c @@ -203,7 +203,7 @@ madt_setup_local(void) else if (bootverbose) printf("x2APIC available but disabled %s\n", reason); user_x2apic = x2apic_mode; - TUNABLE_INT_FETCH("hw.x2apic_enable", &user_x2apic); + TUNABLE_INT_FETCH("hw.apic.x2apic_mode", &user_x2apic); if (user_x2apic != x2apic_mode) { if (bios_x2apic && !user_x2apic) printf("x2APIC disabled by tunable and " diff --git a/sys/x86/iommu/intel_drv.c b/sys/x86/iommu/intel_drv.c index 02daa05b0cad..cab3e4882433 100644 --- a/sys/x86/iommu/intel_drv.c +++ b/sys/x86/iommu/intel_drv.c @@ -433,7 +433,7 @@ dmar_attach(device_t dev) dmar_quirks_post_ident(unit); timeout = dmar_get_timeout(); - TUNABLE_UINT64_FETCH("hw.dmar.timeout", &timeout); + TUNABLE_UINT64_FETCH("hw.iommu.dmar.timeout", &timeout); dmar_update_timeout(timeout); for (i = 0; i < DMAR_INTR_TOTAL; i++) diff --git a/sys/x86/x86/local_apic.c b/sys/x86/x86/local_apic.c index 759c1ae8625a..99c7299bd3b9 100644 --- a/sys/x86/x86/local_apic.c +++ b/sys/x86/x86/local_apic.c @@ -556,7 +556,7 @@ native_lapic_init(vm_paddr_t addr) (cpu_feature2 & CPUID2_TSCDLT) != 0 && tsc_is_invariant && tsc_freq != 0) { lapic_timer_tsc_deadline = 1; - TUNABLE_INT_FETCH("hw.lapic_tsc_deadline", + TUNABLE_INT_FETCH("hw.apic.timer_tsc_deadline", &lapic_timer_tsc_deadline); } @@ -589,7 +589,7 @@ native_lapic_init(vm_paddr_t addr) "KVM -- disabling lapic eoi suppression\n"); lapic_eoi_suppression = 0; } - TUNABLE_INT_FETCH("hw.lapic_eoi_suppression", + TUNABLE_INT_FETCH("hw.apic.eoi_suppression", &lapic_eoi_suppression); } From nobody Tue Oct 24 07:51:55 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SF45R2l6wz4xh7Y; Tue, 24 Oct 2023 07:51:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SF45R29vVz3Vyl; Tue, 24 Oct 2023 07:51:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698133915; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DZ5xLrEB62Q+tEH50yziBpIwaC8MA7x0GqOpEvHcfXs=; b=aUefa3fqD/gFDF5fyPS51lMZ/MRfxqc587st7YOdV8+fXsSjwDvmiPMnMPU1wwhYpQNRKc GoYzgCyk9sSEvSrlD+BRwLm7kdc/jxHSQeeHXcFLN3s+3OfTYa1+7sbj3eIUoOd4SFB/Jl u0R2Ichkp39XVSxxQFnOv+Ks1DqKsj3TEL/MV19kfVJLom0+rUs0TqCI474xR+bPa4fv3Z cHjR81wqvAmeIjLyMAH2NrHXrHOjRlu9z2WEJnE6UP70HVPx8DXmZs/27cNu4NIElKPfpg aGqzy9wIkNWOvHdNRCMssez3+p5R1WiOg8n3OmC9OvL0dfgT/HKzd7m7rvIvCQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698133915; a=rsa-sha256; cv=none; b=NUQDPxaMvhj5j+GR5m2fBXTx8+Ngbu8/6QuWyBWFHXT1SwaAiFCqrCDJIoAA508lP1Nj2Z Bze8cxrzfTn7j4jcvW85QmN8jtPbytzAM+D4thW6zBIY1ilLv+l6XjbEX+WtLpPR1oq8pc KvnTIMUjINs2pFZxVUw1DHEmVEH3xYyiLpP+QPscBcHiGCo2ba09No6vrmCECO+KZnJh9v oQjv5zqPNRQy1K5oByNbTPc5Bdq+AlpIwDk9au8atHYS11o13/0LznnVmTQM1EJY8Z/Yg+ IoEm/PDzs3UK7bDzDEA3+8j++6x2ob2y51My31vv1ESq3Rs5bwBS7lg65S5BJQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698133915; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DZ5xLrEB62Q+tEH50yziBpIwaC8MA7x0GqOpEvHcfXs=; b=CQwe7psYS0gHktvD5DgsF4G4rmMQwhU9soPOhbyS9oRzb8XvX3BVK489mZ+X6Kk1IJKxy9 ld5awGx/f3+/gRi3DZswRXY9MlZIjPsJP3JOJzMYq9P0R2GUAvaT1ioDQsHw3iDgCyA7Gt IANyyoLG10nLMsmsstwiWVx26ddMqsbSHvy/hciAQLXPvukPAXb8J7+weAkffNkcFZThuF ro1joqYZ7U1UOrF075g3+28xr6XLcxPVq6zqSgMJBcBY9joBnFZMOYJ7DofEP/CBJo4ZYz V/y6iX85vSHV2FaOCKFzxKaKKdxwUJRIG2Jxx6ujQJjZ0TfU40OXsk0OfRlOow== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SF45R0wT9zvg; Tue, 24 Oct 2023 07:51:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39O7pt3X016319; Tue, 24 Oct 2023 07:51:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39O7pt5K016316; Tue, 24 Oct 2023 07:51:55 GMT (envelope-from git) Date: Tue, 24 Oct 2023 07:51:55 GMT Message-Id: <202310240751.39O7pt5K016316@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Wei Hu Subject: git: 7a19350993d9 - releng/14.0 - Hyper-V: vmbus: check if signaling host is needed in vmbus_rxbr_read List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: whu X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.0 X-Git-Reftype: branch X-Git-Commit: 7a19350993d9d93fb378abb588e92df4c4086a63 Auto-Submitted: auto-generated The branch releng/14.0 has been updated by whu: URL: https://cgit.FreeBSD.org/src/commit/?id=7a19350993d9d93fb378abb588e92df4c4086a63 commit 7a19350993d9d93fb378abb588e92df4c4086a63 Author: Wei Hu AuthorDate: 2023-10-20 08:58:20 +0000 Commit: Wei Hu CommitDate: 2023-10-24 07:51:00 +0000 Hyper-V: vmbus: check if signaling host is needed in vmbus_rxbr_read It is observed that netvsc's send rings could stall on the latest Azure Boost platforms. This is due to vmbus_rxbr_read() routine doesn't check if host is waiting for more room to put data, which leads to host side sleeping forever on this vmbus channel. The problem was only observed on the latest platform because the host requests larger buffer ring room to be available, which causes the issue to happen much more easily. Fix this by adding check in the vmbus_rxbr_read call and signaling the host in the callers if check returns positively. Approved by: re (gjb) Reported by: NetApp Tested by: whu Sponsored by: Microsoft (cherry picked from commit 49fa9a64372b087cfd66459a20f4ffd25464b6a3) (cherry picked from commit c81166b018acfbe521f52415ff37b8c2696d77c6) --- sys/dev/hyperv/vmbus/vmbus_br.c | 9 ++++++++- sys/dev/hyperv/vmbus/vmbus_brvar.h | 2 +- sys/dev/hyperv/vmbus/vmbus_chan.c | 12 ++++++++++-- 3 files changed, 19 insertions(+), 4 deletions(-) diff --git a/sys/dev/hyperv/vmbus/vmbus_br.c b/sys/dev/hyperv/vmbus/vmbus_br.c index 27adf71fd6ea..f663bb7c2ba5 100644 --- a/sys/dev/hyperv/vmbus/vmbus_br.c +++ b/sys/dev/hyperv/vmbus/vmbus_br.c @@ -684,7 +684,8 @@ vmbus_rxbr_idxadv(struct vmbus_rxbr *rbr, uint32_t idx_adv, * We assume (dlen + skip) == sizeof(channel packet). */ int -vmbus_rxbr_read(struct vmbus_rxbr *rbr, void *data, int dlen, uint32_t skip) +vmbus_rxbr_read(struct vmbus_rxbr *rbr, void *data, int dlen, uint32_t skip, + boolean_t *need_sig) { uint32_t rindex, br_dsize = rbr->rxbr_dsize; @@ -717,5 +718,11 @@ vmbus_rxbr_read(struct vmbus_rxbr *rbr, void *data, int dlen, uint32_t skip) mtx_unlock_spin(&rbr->rxbr_lock); + if (need_sig) { + *need_sig = + vmbus_rxbr_need_signal(rbr, + dlen + skip + sizeof(uint64_t)); + } + return (0); } diff --git a/sys/dev/hyperv/vmbus/vmbus_brvar.h b/sys/dev/hyperv/vmbus/vmbus_brvar.h index 8593c1886b0f..a04169f3291c 100644 --- a/sys/dev/hyperv/vmbus/vmbus_brvar.h +++ b/sys/dev/hyperv/vmbus/vmbus_brvar.h @@ -129,7 +129,7 @@ void vmbus_rxbr_deinit(struct vmbus_rxbr *rbr); void vmbus_rxbr_setup(struct vmbus_rxbr *rbr, void *buf, int blen); int vmbus_rxbr_peek(struct vmbus_rxbr *rbr, void *data, int dlen); int vmbus_rxbr_read(struct vmbus_rxbr *rbr, void *data, int dlen, - uint32_t skip); + uint32_t skip, boolean_t *need_sig); int vmbus_rxbr_idxadv(struct vmbus_rxbr *rbr, uint32_t idx_adv, boolean_t *need_sig); int vmbus_rxbr_idxadv_peek(struct vmbus_rxbr *rbr, void *data, diff --git a/sys/dev/hyperv/vmbus/vmbus_chan.c b/sys/dev/hyperv/vmbus/vmbus_chan.c index d5c4d357e9ec..ecb2e947c953 100644 --- a/sys/dev/hyperv/vmbus/vmbus_chan.c +++ b/sys/dev/hyperv/vmbus/vmbus_chan.c @@ -1205,6 +1205,7 @@ vmbus_chan_recv(struct vmbus_channel *chan, void *data, int *dlen0, { struct vmbus_chanpkt_hdr pkt; int error, dlen, hlen; + boolean_t sig_event; error = vmbus_rxbr_peek(&chan->ch_rxbr, &pkt, sizeof(pkt)); if (error) @@ -1235,9 +1236,12 @@ vmbus_chan_recv(struct vmbus_channel *chan, void *data, int *dlen0, *dlen0 = dlen; /* Skip packet header */ - error = vmbus_rxbr_read(&chan->ch_rxbr, data, dlen, hlen); + error = vmbus_rxbr_read(&chan->ch_rxbr, data, dlen, hlen, &sig_event); KASSERT(!error, ("vmbus_rxbr_read failed")); + if (!error && sig_event) + vmbus_chan_signal_rx(chan); + return (0); } @@ -1246,6 +1250,7 @@ vmbus_chan_recv_pkt(struct vmbus_channel *chan, struct vmbus_chanpkt_hdr *pkt, int *pktlen0) { int error, pktlen, pkt_hlen; + boolean_t sig_event; pkt_hlen = sizeof(*pkt); error = vmbus_rxbr_peek(&chan->ch_rxbr, pkt, pkt_hlen); @@ -1277,9 +1282,12 @@ vmbus_chan_recv_pkt(struct vmbus_channel *chan, * by the above vmbus_rxbr_peek(). */ error = vmbus_rxbr_read(&chan->ch_rxbr, pkt + 1, - pktlen - pkt_hlen, pkt_hlen); + pktlen - pkt_hlen, pkt_hlen, &sig_event); KASSERT(!error, ("vmbus_rxbr_read failed")); + if (!error && sig_event) + vmbus_chan_signal_rx(chan); + return (0); } From nobody Tue Oct 24 09:34:02 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SF6MH0RTbz4xnT3; Tue, 24 Oct 2023 09:34: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 4SF6MG6VMFz3c1c; Tue, 24 Oct 2023 09:34:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698140042; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=w0rvgkL/fBxEh+Am3c24TvaEcou7T3Hxwsu+jmNtQRo=; b=Y1gxiYt9L9ycqhq3hoGLfrUTexeJlYnsWADdIDMUoJbL/HgUCb0ImyxuY9rbLlBo9Le4XS eZ6mSUPncl92I+rRG6FTupvVFopWl8u2EuJPwo4qxEiB7Kfsnnw6GDO/R6VMImpeeGlr0z e42Oe2IdaW147K+7q9RKUBv9WuEyTKLtKvoIlauwfmu0ERc/PchN8EBcWpW3BK6MQpvw8L IwSlzmQ/OQT8zG4h24MXoAwQQr59Pg/DO9/Io10cOdbEA9SWbXnfHlvzWt5yIN0HDXSWq2 gDLGTKmKd4YA4aOet9rPrweuOjbfj21xn4a8qgcYR9a5VWtgMOR4PqidCyqNoA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698140042; a=rsa-sha256; cv=none; b=RDLdVFEl4d97ja+Tm6EsH7ARxSL0d+EdolLL/4eIECXW7g0T94QImQWzNLd84PHfmb249q rJ4k4ZK6s3ZydmKMQ9gJujBSj/tIGgAGGq4krqG7sdU9+5CE5hIbYPLMjSF2wS3QR6tQZ+ XYcsjKKqHOxOtU/ST59l5ZI91sDBkenS1hN+gxLCkgAqnGUVMWdHdBl86hf5omrcepq6It M6WYptCJrsIKvljZuKyGwKgvTE3Af7IZOaC4sswUqMp4NwpwciAnHTfe4gtKRZWbluslMK EZxYKGgZAd0VF7c7iSju79KmhxLOrlKq59CNdlY6KLUzTLXZClA0jBlv12umzA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698140042; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=w0rvgkL/fBxEh+Am3c24TvaEcou7T3Hxwsu+jmNtQRo=; b=mQLcEddTZOMenA46DMJZWd/kIT/zhfYu1IMrbKPbvaDOUGeG5chZoftE03Xb7fDzeD3d5O 8KSfb3FSEH7rGnUUHeY6VW7vLgGhuXaGWTDpqDex9gytb790z+S4qhBzLp4iJhQdqfs6pT RubdqKJauJcw5VbI7+QyXWAWGMTon5pY8SdMHLgZOW3Ta/wUQv0Ctht4kzngMuhfWkig/0 spoUm/IKg50d+wz/3wsCwFf1IYcpqNc1d86DH/mLebWSi/3tbuTu3tzT7uCBJvXthbTVgJ 6qVUevkhKbbYk45uqWb5xIEbIg5giD0kAimOjRFnXo7cvje1qmhBVVz3GY+9wA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SF6MG5XG1z38H; Tue, 24 Oct 2023 09:34: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 39O9Y207086204; Tue, 24 Oct 2023 09:34:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39O9Y229086201; Tue, 24 Oct 2023 09:34:02 GMT (envelope-from git) Date: Tue, 24 Oct 2023 09:34:02 GMT Message-Id: <202310240934.39O9Y229086201@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: 2cffb52514b0 - main - libpfctl: fix pfctl_do_ioctl() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2cffb52514b070e716e700c7f58fdb8cd9b05335 Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=2cffb52514b070e716e700c7f58fdb8cd9b05335 commit 2cffb52514b070e716e700c7f58fdb8cd9b05335 Author: Kristof Provost AuthorDate: 2023-10-23 11:43:52 +0000 Commit: Kristof Provost CommitDate: 2023-10-24 07:50:31 +0000 libpfctl: fix pfctl_do_ioctl() pfctl_do_ioctl() copies the packed request data into the request buffer and then frees it. However, it's possible for the buffer to be too small for the reply, causing us to allocate a new buffer. We then copied from the freed request, and freed it again. Do not free the request buffer until we're all the way done. PR: 274614 Reviewed by: emaste MFC after: 1 week Sponsored by: Rubicon Communications, LLC ("Netgate") Differential Revision: https://reviews.freebsd.org/D42329 --- lib/libpfctl/libpfctl.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/lib/libpfctl/libpfctl.c b/lib/libpfctl/libpfctl.c index 0360c0c63be7..22b0471e2912 100644 --- a/lib/libpfctl/libpfctl.c +++ b/lib/libpfctl/libpfctl.c @@ -79,7 +79,6 @@ pfctl_do_ioctl(int dev, uint cmd, size_t size, nvlist_t **nvl) retry: nv.data = malloc(size); memcpy(nv.data, data, nvlen); - free(data); nv.len = nvlen; nv.size = size; @@ -97,13 +96,15 @@ retry: if (ret == 0) { *nvl = nvlist_unpack(nv.data, nv.len, 0); if (*nvl == NULL) { - free(nv.data); - return (EIO); + ret = EIO; + goto out; } } else { ret = errno; } +out: + free(data); free(nv.data); return (ret); From nobody Tue Oct 24 09:34:03 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SF6MJ172dz4xnKl; Tue, 24 Oct 2023 09:34: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 4SF6MJ0SHDz3c3b; Tue, 24 Oct 2023 09:34:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698140044; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jvmK0mHsKeByZbRkkVfwKTZiU8yoloaxWIyGnGB0OjA=; b=BD1wz0qV4EahfxmaT0ROQoL63rROMXvI35TbF0rp3w6lTzsHY20VCDINRVVMVNGJdsLxMC Pa+0YysM3JVmwtqCvs5b4P8djrKRBMmesJg1NvXg193RgqMYUY0a8CXidtVyYCfm1eSliE BFsjZb7XZhhJDusuuyaRqnQYO4a7jYpamwMUQaOFOVKIMP93LQaHwzFZrJphQiuM2YRjhH oujuVMjDmNz/Bc3qknxdYdW0aIzaKBiF/RjMKjYJmCak0o6Wg2qCOgNGvicMEQxcR01nFE kC6f15/0Vu+uc5BQ4tvgGZk1T2dsBpeik/xnTgn5VTygS84aNfLofgR6D2EHdQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698140044; a=rsa-sha256; cv=none; b=lMwzLPAXs0KO2ZdyVvnPNG9xG9tJ5NRdp3wTcr8Fp2rD7hIgGHC5SLKg/RUXniSMMKDn2N mnDzxJLeyAUbrDlyFzhOi++9a1uMbJK8BxjChK29Xr7Sg9qd7F5eY3Flej1Lnahh0xasFo 7XmkwdGw+xYf9ZkMwzr2M4X2d377ZzavETHdfZpUhUS5708BS1Hh/K63CWQToDekj2dI+n sLFK3DtmOfPY85NY8dZlyzjbtz/EpbqzFneTX+W6FHnZxzZJd2YX+JETRtQ7ylZzqPSShM /ZIFFLC/TS29LHhcB7PGhqFuZq9sykndXflQTzECj50I146sw32HIDomlKNJww== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698140044; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jvmK0mHsKeByZbRkkVfwKTZiU8yoloaxWIyGnGB0OjA=; b=D6owxhN8n33m9nhPzKcyhUIEm0Lts2Z79v55VF7ebJqFBWBApMPEA5kIWWrmHisaytsJVL x5EI6mUDuL6TqQu71ZiZ67Pn+JVoRvfOqZqyZUyl/TblO4jWKv2Qy5D3ORDqsutTEMSgU2 dNil71LssZPhRvKCLDwb2W2qHh9og375T1hzneHoxdgXJT2KTdT0X4cB+EieGbCMOosilj gMZCprjaCESLsuzyhrtd87NIdx+AZco/1+aUJHsmSue8Zh2bfnGrPfjUr168Kw2ESs7WtB T3jq+H+Kqt5Uv6KnQBNcOH4SJCIIm2SO3ckNGYvNoGItoyn0t1DGkSupnlXqNg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SF6MH6KDMz38J; Tue, 24 Oct 2023 09:34: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 39O9Y37g086246; Tue, 24 Oct 2023 09:34:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39O9Y3kV086243; Tue, 24 Oct 2023 09:34:03 GMT (envelope-from git) Date: Tue, 24 Oct 2023 09:34:03 GMT Message-Id: <202310240934.39O9Y3kV086243@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: 4abc3b482e0d - main - libpfctl: fix Coverity issues List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4abc3b482e0d246cd3518622223795c8de102130 Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=4abc3b482e0d246cd3518622223795c8de102130 commit 4abc3b482e0d246cd3518622223795c8de102130 Author: Kristof Provost AuthorDate: 2023-10-23 11:46:11 +0000 Commit: Kristof Provost CommitDate: 2023-10-24 07:50:47 +0000 libpfctl: fix Coverity issues - handle snl_finalize_msg() returning NULL - insert the correct data into the states list - add missing nvlist_destroy() - incorrect order for array bounds Coverity: 1522929, 1522925, 1522923, 1522921, 1522780, 1522770, 1522764, 1487785, 1471250 Reviewed by: emaste MFC after: 1 week Sponsored by: Rubicon Communications, LLC ("Netgate") Differential Revision: https://reviews.freebsd.org/D42330 --- lib/libpfctl/libpfctl.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/lib/libpfctl/libpfctl.c b/lib/libpfctl/libpfctl.c index 22b0471e2912..335aeb8e2c8c 100644 --- a/lib/libpfctl/libpfctl.c +++ b/lib/libpfctl/libpfctl.c @@ -196,6 +196,8 @@ pfctl_startstop(int start) start ? PFNL_CMD_START : PFNL_CMD_STOP); hdr = snl_finalize_msg(&nw); + if (hdr == NULL) + return (ENOMEM); seq_id = hdr->nlmsg_seq; snl_send_message(&ss, hdr); @@ -730,6 +732,8 @@ pfctl_get_eth_ruleset(int dev, const char *path, int nr, strlcpy(ri->name, nvlist_get_string(nvl, "name"), PF_ANCHOR_NAME_SIZE); + nvlist_destroy(nvl); + return (0); } @@ -828,8 +832,8 @@ pfctl_add_eth_rule(int dev, const struct pfctl_eth_rule *r, const char *anchor, pfctl_nv_add_rule_addr(nvl, "ipdst", &r->ipdst); labelcount = 0; - while (r->label[labelcount][0] != 0 && - labelcount < PF_RULE_MAX_LABEL_COUNT) { + while (labelcount < PF_RULE_MAX_LABEL_COUNT && + r->label[labelcount][0] != 0) { nvlist_append_string_array(nvl, "labels", r->label[labelcount]); labelcount++; @@ -1208,6 +1212,8 @@ pfctl_get_creators_nl(struct snl_state *ss, uint32_t *creators, size_t *len) hdr = snl_create_genl_msg_request(&nw, family_id, PFNL_CMD_GETCREATORS); hdr->nlmsg_flags |= NLM_F_DUMP; hdr = snl_finalize_msg(&nw); + if (hdr == NULL) + return (ENOMEM); uint32_t seq_id = hdr->nlmsg_seq; snl_send_message(ss, hdr); @@ -1362,6 +1368,8 @@ pfctl_get_states_nl(struct pfctl_state_filter *filter, struct snl_state *ss, pfc snl_add_msg_attr_ip6(&nw, PF_ST_FILTER_MASK, &filter->mask.v6); hdr = snl_finalize_msg(&nw); + if (hdr == NULL) + return (ENOMEM); uint32_t seq_id = hdr->nlmsg_seq; @@ -1417,7 +1425,7 @@ pfctl_append_states(struct pfctl_state *s, void *arg) memcpy(new, s, sizeof(*s)); - TAILQ_INSERT_TAIL(&states->states, s, entry); + TAILQ_INSERT_TAIL(&states->states, new, entry); return (0); } From nobody Tue Oct 24 09:34:04 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SF6MK1gksz4xnKp; Tue, 24 Oct 2023 09:34: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 4SF6MK124Sz3cTg; Tue, 24 Oct 2023 09:34:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698140045; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zDf5vGX56UB4mLaAVhFK/vtKfU6eLbI2ztpyumgUk5s=; b=i60ujQqN33VtSi2OAiK4BWLfFDF2+QF+0JbumLaqWxxgDTwEzQItnnT0O/fO7WXgizCyRu DyPiHV1iZSYBha1jws0zL6sPN2vOuUh/0fPKo8zugCJhWTiLAKjvb/13RB/wTAU/oLxt8L Qlo7jyUd9HxCMZdNuMTXcYxx2veQp0Vqh/sGTgX7W5Yk+ufLRUp75NzA0Z7ZJyF499UMeD 18IkO1gkJH6VswlWDVs0vAcic56dKYtoVWFcvIIOzPhJyKh4n3ZZftzUdGo0GInIZ/GI8e 1xraDQnAM/3RLZTxjvM2u7TxlSu0WKNq6nNpyC+OwJvIrLrvuZTEOTyZ/iT2UQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698140045; a=rsa-sha256; cv=none; b=tMLY0dHdjRSB0E36Ms/fw8XlmTo98hY6RgfmzyugRon26rf1BDqmNAuaWJPQvVf1naRPh1 wCw2DJz+7XmC88hEuTeYnj3OptPPLmO3DzVzqKbw/4sx18PPzXqX40vP3k5abuyz04zRtD 7YAiYeS2FIoVtMioQK7GaXSaW+8d15RmxJDjQ7Sl84qL4220kD8hk7kHKnNUPIssKk3AhZ m4qKMHu4MyPT0oBIJrrHA6OyYElM6p6KN3herEL4aCUu/pzBG40tyttcPFJ4DOOmvMGhHR R8hfreMFc31MKFlZKjv/Ull9j7abBsv2k/JdQWXOe/80+Tb+GnIGRmsAkQrq2w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698140045; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zDf5vGX56UB4mLaAVhFK/vtKfU6eLbI2ztpyumgUk5s=; b=D6R5UDJhQu0FxeY/41rkZrY6DliP5qJ07WkBoU9RgGeJk9Iwlo6kJ0RNP9Q8xVcW7pwTdS vH5HLYOiJfsHscSHBVPd3DfDbwmWJLrkZpY5xaIVEFPjcRRlzf40c57xTybc2yRpktvBu6 if2tmMorZy0aKp2nwPhV5O7vemp5aTJ34km9nK1paSVbCsHrxqiGUZxgsoH4XJL9UVTaLx QYphgC7bTIITgqJrTheeT29G2dyaOyhavdnR38yv4Q/h4igPt6o/c+bMZkRD5+3W/q3TV1 SlG51uxRbd+vxQ8HTbU5Fdy5CtleQjB2EMWJTthCay+nTdPH3Rc9+5q3jzEmjw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SF6MK03Pxz3J3; Tue, 24 Oct 2023 09:34: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 39O9Y457086297; Tue, 24 Oct 2023 09:34:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39O9Y4ei086294; Tue, 24 Oct 2023 09:34:04 GMT (envelope-from git) Date: Tue, 24 Oct 2023 09:34:04 GMT Message-Id: <202310240934.39O9Y4ei086294@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: 6869f90bf5bb - main - pf: update pf(4) man page to list DIOCGETSTATESV2 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6869f90bf5bbb2f5ae5400e3a435b3680991321d Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=6869f90bf5bbb2f5ae5400e3a435b3680991321d commit 6869f90bf5bbb2f5ae5400e3a435b3680991321d Author: Kristof Provost AuthorDate: 2023-10-23 15:11:15 +0000 Commit: Kristof Provost CommitDate: 2023-10-24 07:51:00 +0000 pf: update pf(4) man page to list DIOCGETSTATESV2 The nvlist based state retrieval ioctl has been replaced by an old-style ioctl for performance reasons. Document that one. Reported by: Michael Gmelin MFC after: 1 week Sponsored by: Rubicon Communications, LLC ("Netgate") Differential Revision: https://reviews.freebsd.org/D42331 --- share/man/man4/pf.4 | 103 +++++++++++++++++++++++++--------------------------- 1 file changed, 49 insertions(+), 54 deletions(-) diff --git a/share/man/man4/pf.4 b/share/man/man4/pf.4 index 67d85b7b1a92..645f31e6e395 100644 --- a/share/man/man4/pf.4 +++ b/share/man/man4/pf.4 @@ -26,7 +26,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd September 22, 2023 +.Dd October 20, 2023 .Dt PF 4 .Os .Sh NAME @@ -428,65 +428,60 @@ Set the debug level. enum { PF_DEBUG_NONE, PF_DEBUG_URGENT, PF_DEBUG_MISC, PF_DEBUG_NOISY }; .Ed -.It Dv DIOCGETSTATESNV Fa "struct pfioc_nv *nv" +.It Dv DIOCGETSTATESV2 Fa "struct pfioc_states_v2 *ps" Get state table entries. .Bd -literal -nvlist pf_state_key { - nvlist pf_addr addr[2]; - number port[2]; - number af; - number proto; -}; - -nvlist pf_state_scrub { - bool timestamp; - number ttl; - number ts_mod; -}; - -nvlist pf_state_peer { - nvlist pf_state_scrub scrub; - number seqlo; - number seqhi; - number seqdiff; - number max_win; - number mss; - number state; - number wscale; -}; - -nvlist pf_state { - number id; - string ifname; - nvlist pf_state_key stack_key; - nvlist pf_state_key wire_key; - nvlist pf_state_peer src; - nvlist pf_state_peer dst; - nvlist pf_addr rt_addr; - number rule; - number anchor; - number nat_rule; - number expire; - number packets[2]; - number bytes[2]; - number creatorid; - number direction; - number log; - number state_flags; - number timeout; - number sync_flags; +struct pfioc_states_v2 { + int ps_len; + uint64_t ps_req_version; + union { + void *ps_buf; + struct pf_state_export *ps_states; + }; }; -nvlist pf_states { - number count; - nvlist pf_state states[]; +struct pf_state_export { + uint64_t version; + uint64_t id; + char ifname[IFNAMSIZ]; + char orig_ifname[IFNAMSIZ]; + struct pf_state_key_export key[2]; + struct pf_state_peer_export src; + struct pf_state_peer_export dst; + struct pf_addr rt_addr; + uint32_t rule; + uint32_t anchor; + uint32_t nat_rule; + uint32_t creation; + uint32_t expire; + uint32_t spare0; + uint64_t packets[2]; + uint64_t bytes[2]; + uint32_t creatorid; + uint32_t spare1; + sa_family_t af; + uint8_t proto; + uint8_t direction; + uint8_t log; + uint8_t state_flags_compat; + uint8_t timeout; + uint8_t sync_flags; + uint8_t updates; + uint16_t state_flags; + uint16_t qid; + uint16_t pqid; + uint16_t dnpipe; + uint16_t dnrpipe; + int32_t rtableid; + uint8_t min_ttl; + uint8_t set_tos; + uint16_t max_mss; + uint8_t set_prio[2]; + uint8_t rt; + char rt_ifname[IFNAMSIZ]; + uint8_t spare[72]; }; .Ed -.Pp -If -.Va pfioc_nv.size -is insufficiently large, as many states as possible that can fit into this -size will be copied into the supplied buffer. .It Dv DIOCCHANGERULE Fa "struct pfioc_rule *pcr" Add or remove the .Va rule From nobody Tue Oct 24 12:27:48 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SFBCn2BFJz4y01T; Tue, 24 Oct 2023 12:27: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 4SFBCn0GM9z4R5j; Tue, 24 Oct 2023 12:27:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698150469; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=miPa/33H58cDYCCaY3QnhdNYOOkPP7n61f+wjz17qHw=; b=QMqorreqa4jQW22QWuEUhqG5UjwiyzpqyEkP8+qvODIN9VC+p5U8eodA/ygOjmyP6ydtB8 YSQcoPB9QhLtf1U5MbMEG77Mj5te1YyX6YQjCsCOZXAod0tPBVWJeIeopLMbaJyfzoABpJ pqqnHEjt8RcobP58BveKTYNFukkUcLT8MFmjmtEKwXcjoBNr2Ug/DQvIuz3liVcd/9sEDl b00LtP/TyT36hMxQST0E7kN2wnt95QA/MZS21uJe0kK4mxlUNwXVjQGTmuYRGPOcz45h+E CS3ALjwtDmSwQLSfaFUp9DOPYqVPIjLTSKpim/hsPnp7drPinUWD/3XhH+TbLw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698150469; a=rsa-sha256; cv=none; b=tmCAhe2Ldyl5akfMCcD4+mlbXQ0X1iISQpetOgIRgXYPotp+u8HxClRq5bZ01rrTV2X+NU PUV2vMO1+FEoJ3WlkHYm17G8f1Vdr0RpdSbcPQ3d+huJ7Dlo7AERve4Opp/0lvqOVmVQYI Q7s5ZsocLdDA9epkPyqoZVi5+qsUY/SR/XxcD1EujPIVHI6kMy+i22BFZJ7i5x4QitouHR oVoyjMQO+wbF6TuphYnybVUoVaDVmAJFofqNuVbsFem81AjDfYWThiIsps/Ca8KPOTYGrY Vw7FYOHbkzM0UZffnhSrXG1vdT8sSb14f3orbORMKd5BWp3F682hOt0BFc/ACA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698150469; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=miPa/33H58cDYCCaY3QnhdNYOOkPP7n61f+wjz17qHw=; b=yp0eOrvypb79Ef3Yxj1XxNB6fpuMBxn8GncwkYuqLNQF9vcwR7xZYZButlVncPNG7YZIOf M+AiM3HkaJEda70QYpKZmyArHAjWdbceBXKhWuoX/EvhxBTSCIfurVCDUHtyfBsC9XIqfR Akzl8Hi3W1ZcnwWTJcriuscvNJXmGCWySRTIl4pJnjBJr/5XQYOt2VC0QdjS2wXKIFLVji wjb8QmT2SG7D4S49ldF99rfFQdavxOEL2NC+Iks0s4B4gOst7IpPylQy6ODGdx/pdmcqPm Umm/egy6OXtk94IqYtDDJJI3BrQnuwk7zINt4KNevrPlFVae4nPxE0L4L6BH9w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SFBCm6KcGz7lk; Tue, 24 Oct 2023 12:27: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 39OCRmxB070838; Tue, 24 Oct 2023 12:27:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39OCRm5Y070835; Tue, 24 Oct 2023 12:27:48 GMT (envelope-from git) Date: Tue, 24 Oct 2023 12:27:48 GMT Message-Id: <202310241227.39OCRm5Y070835@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kristof Provost Subject: git: 8bfa084a4bf3 - stable/13 - ndp: fix timestamp display output List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 8bfa084a4bf331b6baf2cc530b9752c4cbe573ad Auto-Submitted: auto-generated The branch stable/13 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=8bfa084a4bf331b6baf2cc530b9752c4cbe573ad commit 8bfa084a4bf331b6baf2cc530b9752c4cbe573ad Author: R. Christian McDonald AuthorDate: 2023-10-17 16:57:22 +0000 Commit: Kristof Provost CommitDate: 2023-10-24 07:45:38 +0000 ndp: fix timestamp display output The current xo_format string is incorrect. This restores the display format prior to libxo-ification work while also explicitly marking tv_sec and tv_usec as encoded output only. MFC after: 1 week Reviewed by: kp Sponsored by: Rubicon Communications, LLC ("Netgate") Differential Revision: https://reviews.freebsd.org/D42269 (cherry picked from commit 2bb78b46e02413483409fe73244995524b838b6e) --- usr.sbin/ndp/ndp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/ndp/ndp.c b/usr.sbin/ndp/ndp.c index 5e79666e6c38..37c4ee769bff 100644 --- a/usr.sbin/ndp/ndp.c +++ b/usr.sbin/ndp/ndp.c @@ -1481,7 +1481,7 @@ ts_print(const struct timeval *tvp) /* Default */ sec = (tvp->tv_sec + thiszone) % 86400; - xo_emit("{:tv_sec/%lld}{:tv_usec/%lld}%02d:%02d:%02d.%06u ", + xo_emit("{e:tv_sec/%lld}{e:tv_usec/%lld}{d:/%02d:%02d:%02d.%06u} ", tvp->tv_sec, tvp->tv_usec, sec / 3600, (sec % 3600) / 60, sec % 60, (u_int32_t)tvp->tv_usec); } From nobody Tue Oct 24 12:27:49 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SFBCp0dn4z4y01Y; Tue, 24 Oct 2023 12:27: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 4SFBCp0681z4Qx6; Tue, 24 Oct 2023 12:27:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698150470; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CPQg5XzhDqeAeSeZdUZpgtkTFJw58MUlSzWBlD32Oxc=; b=NKEBll/cUlPpaHHzUcYBBAHBEDuTlwr2lUc9jLRNIFdInXFBEb5yhm2uinZ3yN7XkP448N r1LeCo/RrOtSYAxmn9EHstxIhQ3+qAonoutGgqh1wqeVaVsyW9ftD8Yec6jAYoJSiNORml mIZ6ul+KE8oO4q58jo9vVDCkHGNxz3NmUQNH1Iscz6ghDvhD7GILy4iGGMa6hxhsWuuj2J rfaUzotdhNFp1tWOuF8LV/kcaXcr7n7rhirSO7Y0kzrXRS818x2CMzmdz+bvbtajOTCRR+ bVF3crDanEWaxXdmJuUGFSxGpZnHmDS2FBxZ8BDcSec4G2gim4HWTWtZ8BfpVA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698150470; a=rsa-sha256; cv=none; b=APM3EsIxDwF1+fMBpwrq0eKAHRNAE66PZo2pni/d4I84chuq2JQloy4lFVlNKhSArbDEOL 68kWtm+w8+i+cCJiPliOZqt5En7jd8KwDO9ULjSadqPxR81QzuDPmi9xJJJ6x3I+1qTJqK CWMEVWBUjFeogfASXJoCyOFzEIIDH48Z4edmnrzD0QJAeP6K2G9Wsj4eesumR/8gklB77b s4X5jjmfDDGqLoUm0qgIyydErDQOeeTP16QHT8fA2aoeAIo9q+zKkNSU35KwWuw99nSBuk YV9muKEAdjz+vdwW6z9eEOLpNeKle3zjss95mOv3WRlSZuR3JqOYvrLjBquXqw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698150470; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CPQg5XzhDqeAeSeZdUZpgtkTFJw58MUlSzWBlD32Oxc=; b=UWxK7ld935aSTC9M3RJtc4HlCP20rEvWWJN1QjwXnxJnEyEJCYC8HyckxJPrLJJuxMC7Rv tvB4VSnJeJpBsStAsdX/DNCOazM6bW5ikHMHBINwRAO1UQ3/XwLPOIaO5aX7OQ8ilwdXu2 DmvMydbLzbRLzq9WFpNZwO//dVuquPT4qEdgVaqx05zUkkVFn9TaWn3WnkYFA4g4Vp4b3e 4vaNVAg/cbPK062WfeBF4aSNNESAEW8/wgGpH5yCWaPQfEirtJ+l5K3DLbJdoiZkZzqwMZ aPjmIBKl8pfy0o9G2f/PdMZDXPKp1FZoBHMRApWJ4FY6asH6htiaEND1yKVt6Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SFBCn6HB9z6mG; Tue, 24 Oct 2023 12:27: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 39OCRndG070950; Tue, 24 Oct 2023 12:27:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39OCRndd070938; Tue, 24 Oct 2023 12:27:49 GMT (envelope-from git) Date: Tue, 24 Oct 2023 12:27:49 GMT Message-Id: <202310241227.39OCRndd070938@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kristof Provost Subject: git: 72b97a4e2861 - stable/14 - netlink: cope with growing requests List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 72b97a4e28617b600cc21eb51664d1e1f6e6f923 Auto-Submitted: auto-generated The branch stable/14 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=72b97a4e28617b600cc21eb51664d1e1f6e6f923 commit 72b97a4e28617b600cc21eb51664d1e1f6e6f923 Author: Kristof Provost AuthorDate: 2023-10-16 09:48:57 +0000 Commit: Kristof Provost CommitDate: 2023-10-24 07:45:20 +0000 netlink: cope with growing requests If a request ends up growing beyong the initially allocated space the netlink functions (such as snl_add_msg_attr_u32()) will allocate a new buffer. This invalidates the header pointer we can have received from snl_create_msg_request(). Always use the hdr returned by snl_finalize_msg(). Reviewed by: melifaro MFC after: 1 week Sponsored by: Rubicon Communications, LLC ("Netgate") Differential Revision: https://reviews.freebsd.org/D42223 (cherry picked from commit 4f8f43b06ed07e96a250855488cc531799d5b78f) --- sbin/ifconfig/af_inet.c | 6 +++--- sbin/ifconfig/af_inet6.c | 2 +- sbin/ifconfig/ifconfig_netlink.c | 6 +++--- sbin/route/route_netlink.c | 8 ++++---- sys/netlink/netlink_snl_generic.h | 2 +- tests/sys/netlink/test_snl_generic.c | 2 +- usr.sbin/arp/arp_netlink.c | 12 ++++++------ usr.sbin/ndp/ndp_netlink.c | 12 ++++++------ 8 files changed, 25 insertions(+), 25 deletions(-) diff --git a/sbin/ifconfig/af_inet.c b/sbin/ifconfig/af_inet.c index 83b605e8c4cb..bcf2a8ab0ffd 100644 --- a/sbin/ifconfig/af_inet.c +++ b/sbin/ifconfig/af_inet.c @@ -360,7 +360,7 @@ in_delete_first_nl(if_ctx *ctx) ifahdr->ifa_family = AF_INET; ifahdr->ifa_index = ifindex; - if (!snl_finalize_msg(&nw) || !snl_send_message(ss, hdr)) + if (! (hdr = snl_finalize_msg(&nw)) || !snl_send_message(ss, hdr)) return (EINVAL); nlmsg_seq = hdr->nlmsg_seq; @@ -391,7 +391,7 @@ in_delete_first_nl(if_ctx *ctx) ifahdr->ifa_index = ifindex; snl_add_msg_attr_ip4(&nw, IFA_LOCAL, &addr); - if (!snl_finalize_msg(&nw) || !snl_send_message(ss, hdr)) + if (! (hdr = snl_finalize_msg(&nw)) || !snl_send_message(ss, hdr)) return (EINVAL); memset(&e, 0, sizeof(e)); snl_read_reply_code(ss, hdr->nlmsg_seq, &e); @@ -431,7 +431,7 @@ in_exec_nl(if_ctx *ctx, unsigned long action, void *data) snl_add_msg_attr_u32(&nw, IFAF_VHID, pdata->vhid); snl_end_attr_nested(&nw, off); - if (!snl_finalize_msg(&nw) || !snl_send_message(ctx->io_ss, hdr)) + if (! (hdr = snl_finalize_msg(&nw)) || !snl_send_message(ctx->io_ss, hdr)) return (0); struct snl_errmsg_data e = {}; diff --git a/sbin/ifconfig/af_inet6.c b/sbin/ifconfig/af_inet6.c index a0138e9b3de6..b3da21758982 100644 --- a/sbin/ifconfig/af_inet6.c +++ b/sbin/ifconfig/af_inet6.c @@ -493,7 +493,7 @@ in6_exec_nl(if_ctx *ctx, unsigned long action, void *data) snl_add_msg_attr_u32(&nw, IFAF_VHID, pdata->vhid); snl_end_attr_nested(&nw, off); - if (!snl_finalize_msg(&nw) || !snl_send_message(ctx->io_ss, hdr)) + if (! (hdr = snl_finalize_msg(&nw)) || !snl_send_message(ctx->io_ss, hdr)) return (0); struct snl_errmsg_data e = {}; diff --git a/sbin/ifconfig/ifconfig_netlink.c b/sbin/ifconfig/ifconfig_netlink.c index 76dd99307f31..7be340e18ab5 100644 --- a/sbin/ifconfig/ifconfig_netlink.c +++ b/sbin/ifconfig/ifconfig_netlink.c @@ -171,7 +171,7 @@ prepare_ifmap(struct snl_state *ss) hdr->nlmsg_flags |= NLM_F_DUMP; snl_reserve_msg_object(&nw, struct ifinfomsg); - if (!snl_finalize_msg(&nw) || !snl_send_message(ss, hdr)) + if (! (hdr = snl_finalize_msg(&nw)) || !snl_send_message(ss, hdr)) return (NULL); uint32_t nlmsg_seq = hdr->nlmsg_seq; @@ -212,7 +212,7 @@ if_nametoindex_nl(struct snl_state *ss, const char *ifname) snl_reserve_msg_object(&nw, struct ifinfomsg); snl_add_msg_attr_string(&nw, IFLA_IFNAME, ifname); - if (!snl_finalize_msg(&nw) || !snl_send_message(ss, hdr)) + if (! (hdr = snl_finalize_msg(&nw)) || !snl_send_message(ss, hdr)) return (0); hdr = snl_read_reply(ss, hdr->nlmsg_seq); @@ -234,7 +234,7 @@ prepare_ifaddrs(struct snl_state *ss, struct ifmap *ifmap) hdr->nlmsg_flags |= NLM_F_DUMP; snl_reserve_msg_object(&nw, struct ifaddrmsg); - if (!snl_finalize_msg(&nw) || !snl_send_message(ss, hdr)) + if (! (hdr = snl_finalize_msg(&nw)) || !snl_send_message(ss, hdr)) return; uint32_t nlmsg_seq = hdr->nlmsg_seq; diff --git a/sbin/route/route_netlink.c b/sbin/route/route_netlink.c index 0dbd90151e10..28766b062e18 100644 --- a/sbin/route/route_netlink.c +++ b/sbin/route/route_netlink.c @@ -266,7 +266,7 @@ rtmsg_nl_int(struct nl_helper *h, int cmd, int rtm_flags, int fib, int rtm_addrs if (rt_metrics->rmx_weight > 0) snl_add_msg_attr_u32(&nw, NL_RTA_WEIGHT, rt_metrics->rmx_weight); - if (snl_finalize_msg(&nw) && snl_send_message(ss, hdr)) { + if ((hdr = snl_finalize_msg(&nw)) && snl_send_message(ss, hdr)) { struct snl_errmsg_data e = {}; hdr = snl_read_reply(ss, hdr->nlmsg_seq); @@ -314,7 +314,7 @@ get_ifdata(struct nl_helper *h, uint32_t ifindex, struct snl_parsed_link_simple struct ifinfomsg *ifmsg = snl_reserve_msg_object(&nw, struct ifinfomsg); if (ifmsg != NULL) ifmsg->ifi_index = ifindex; - if (!snl_finalize_msg(&nw) || !snl_send_message(ss, hdr)) + if (! (hdr = snl_finalize_msg(&nw)) || !snl_send_message(ss, hdr)) return; hdr = snl_read_reply(ss, hdr->nlmsg_seq); @@ -817,7 +817,7 @@ flushroute_one(struct nl_helper *h, struct snl_parsed_route *r) snl_add_msg_attr_u32(&nw, RTA_TABLE, r->rta_table); snl_add_msg_attr_ip(&nw, RTA_DST, r->rta_dst); - if (!snl_finalize_msg(&nw) || !snl_send_message(ss, hdr)) + if (! (hdr = snl_finalize_msg(&nw)) || !snl_send_message(ss, hdr)) return (ENOMEM); if (!snl_read_reply_code(ss, hdr->nlmsg_seq, &e)) { @@ -864,7 +864,7 @@ flushroutes_fib_nl(int fib, int af) rtm->rtm_family = af; snl_add_msg_attr_u32(&nw, RTA_TABLE, fib); - if (!snl_finalize_msg(&nw) || !snl_send_message(&ss, hdr)) { + if (! (hdr = snl_finalize_msg(&nw)) || !snl_send_message(&ss, hdr)) { snl_free(&ss); return (EINVAL); } diff --git a/sys/netlink/netlink_snl_generic.h b/sys/netlink/netlink_snl_generic.h index 1324cf3da17a..0a2913c9155e 100644 --- a/sys/netlink/netlink_snl_generic.h +++ b/sys/netlink/netlink_snl_generic.h @@ -106,7 +106,7 @@ snl_get_genl_family_info(struct snl_state *ss, const char *family_name, snl_init_writer(ss, &nw); hdr = snl_create_genl_msg_request(&nw, GENL_ID_CTRL, CTRL_CMD_GETFAMILY); snl_add_msg_attr_string(&nw, CTRL_ATTR_FAMILY_NAME, family_name); - if (snl_finalize_msg(&nw) == NULL || !snl_send_message(ss, hdr)) + if ((hdr = snl_finalize_msg(&nw)) == NULL || !snl_send_message(ss, hdr)) return (false); hdr = snl_read_reply(ss, hdr->nlmsg_seq); diff --git a/tests/sys/netlink/test_snl_generic.c b/tests/sys/netlink/test_snl_generic.c index f3c11daf19e1..d84d3f88f487 100644 --- a/tests/sys/netlink/test_snl_generic.c +++ b/tests/sys/netlink/test_snl_generic.c @@ -86,7 +86,7 @@ ATF_TC_BODY(test_snl_get_genl_family_groups, tc) snl_init_writer(&ss, &nw); hdr = snl_create_genl_msg_request(&nw, GENL_ID_CTRL, CTRL_CMD_GETFAMILY); snl_add_msg_attr_string(&nw, CTRL_ATTR_FAMILY_NAME, "nlctrl"); - snl_finalize_msg(&nw); + hdr = snl_finalize_msg(&nw); snl_send_message(&ss, hdr); hdr = snl_read_reply(&ss, hdr->nlmsg_seq); diff --git a/usr.sbin/arp/arp_netlink.c b/usr.sbin/arp/arp_netlink.c index 40b5367f330d..d78f380af04b 100644 --- a/usr.sbin/arp/arp_netlink.c +++ b/usr.sbin/arp/arp_netlink.c @@ -63,7 +63,7 @@ get_link_info(struct snl_state *ss, uint32_t ifindex, struct ifinfomsg *ifmsg = snl_reserve_msg_object(&nw, struct ifinfomsg); if (ifmsg != NULL) ifmsg->ifi_index = ifindex; - if (!snl_finalize_msg(&nw) || !snl_send_message(ss, hdr)) + if (! (hdr = snl_finalize_msg(&nw)) || !snl_send_message(ss, hdr)) return (false); hdr = snl_read_reply(ss, hdr->nlmsg_seq); @@ -116,7 +116,7 @@ guess_ifindex(struct snl_state *ss, uint32_t fibnum, struct in_addr addr) snl_add_msg_attr_ip(&nw, RTA_DST, (struct sockaddr *)&dst); snl_add_msg_attr_u32(&nw, RTA_TABLE, fibnum); - if (!snl_finalize_msg(&nw) || !snl_send_message(ss, hdr)) + if (! (hdr = snl_finalize_msg(&nw)) || !snl_send_message(ss, hdr)) return (0); hdr = snl_read_reply(ss, hdr->nlmsg_seq); @@ -148,7 +148,7 @@ guess_ifindex(struct snl_state *ss, uint32_t fibnum, struct in_addr addr) snl_add_msg_attr_u32(&nw, NHAF_TABLE, fibnum); snl_end_attr_nested(&nw, off); - if (!snl_finalize_msg(&nw) || !snl_send_message(ss, hdr)) + if (! (hdr = snl_finalize_msg(&nw)) || !snl_send_message(ss, hdr)) return (0); hdr = snl_read_reply(ss, hdr->nlmsg_seq); @@ -285,7 +285,7 @@ print_entries_nl(uint32_t ifindex, struct in_addr addr) ndmsg->ndm_ifindex = ifindex; } - if (!snl_finalize_msg(&nw) || !snl_send_message(&ss_req, hdr)) { + if (! (hdr = snl_finalize_msg(&nw)) || !snl_send_message(&ss_req, hdr)) { snl_free(&ss_req); return (0); } @@ -355,7 +355,7 @@ delete_nl(uint32_t ifindex, char *host) } snl_add_msg_attr_ip(&nw, NDA_DST, (struct sockaddr *)dst); - if (!snl_finalize_msg(&nw) || !snl_send_message(&ss, hdr)) { + if (! (hdr = snl_finalize_msg(&nw)) || !snl_send_message(&ss, hdr)) { snl_free(&ss); return (1); } @@ -422,7 +422,7 @@ set_nl(uint32_t ifindex, struct sockaddr_in *dst, struct sockaddr_dl *sdl, char snl_end_attr_nested(&nw, off); } - if (!snl_finalize_msg(&nw) || !snl_send_message(&ss, hdr)) { + if (! (hdr = snl_finalize_msg(&nw)) || !snl_send_message(&ss, hdr)) { snl_free(&ss); return (1); } diff --git a/usr.sbin/ndp/ndp_netlink.c b/usr.sbin/ndp/ndp_netlink.c index 954d16995b5a..79bdec2356d0 100644 --- a/usr.sbin/ndp/ndp_netlink.c +++ b/usr.sbin/ndp/ndp_netlink.c @@ -76,7 +76,7 @@ get_link_info(struct snl_state *ss, uint32_t ifindex, struct ifinfomsg *ifmsg = snl_reserve_msg_object(&nw, struct ifinfomsg); if (ifmsg != NULL) ifmsg->ifi_index = ifindex; - if (!snl_finalize_msg(&nw) || !snl_send_message(ss, hdr)) + if (! (hdr = snl_finalize_msg(&nw)) || !snl_send_message(ss, hdr)) return (false); hdr = snl_read_reply(ss, hdr->nlmsg_seq); @@ -152,7 +152,7 @@ guess_ifindex(struct snl_state *ss, uint32_t fibnum, const struct sockaddr_in6 * snl_add_msg_attr_ip(&nw, RTA_DST, (struct sockaddr *)dst); snl_add_msg_attr_u32(&nw, RTA_TABLE, fibnum); - if (!snl_finalize_msg(&nw) || !snl_send_message(ss, hdr)) + if (! (hdr = snl_finalize_msg(&nw)) || !snl_send_message(ss, hdr)) return (0); hdr = snl_read_reply(ss, hdr->nlmsg_seq); @@ -184,7 +184,7 @@ guess_ifindex(struct snl_state *ss, uint32_t fibnum, const struct sockaddr_in6 * snl_add_msg_attr_u32(&nw, NHAF_TABLE, fibnum); snl_end_attr_nested(&nw, off); - if (!snl_finalize_msg(&nw) || !snl_send_message(ss, hdr)) + if (! (hdr = snl_finalize_msg(&nw)) || !snl_send_message(ss, hdr)) return (0); hdr = snl_read_reply(ss, hdr->nlmsg_seq); @@ -327,7 +327,7 @@ print_entries_nl(uint32_t ifindex, struct sockaddr_in6 *addr, bool cflag) ndmsg->ndm_ifindex = ifindex; } - if (!snl_finalize_msg(&nw) || !snl_send_message(&ss_req, hdr)) { + if (! (hdr = snl_finalize_msg(&nw)) || !snl_send_message(&ss_req, hdr)) { snl_free(&ss_req); return (0); } @@ -421,7 +421,7 @@ delete_nl(uint32_t ifindex, char *host) } snl_add_msg_attr_ip(&nw, NDA_DST, (struct sockaddr *)&dst); - if (!snl_finalize_msg(&nw) || !snl_send_message(&ss, hdr)) { + if (! (hdr = snl_finalize_msg(&nw)) || !snl_send_message(&ss, hdr)) { snl_free(&ss); return (1); } @@ -493,7 +493,7 @@ set_nl(uint32_t ifindex, struct sockaddr_in6 *dst, struct sockaddr_dl *sdl, char snl_add_msg_attr_ip(&nw, NDA_DST, (struct sockaddr *)dst); snl_add_msg_attr(&nw, NDA_LLADDR, sdl->sdl_alen, LLADDR(sdl)); - if (!snl_finalize_msg(&nw) || !snl_send_message(&ss, hdr)) { + if (! (hdr = snl_finalize_msg(&nw)) || !snl_send_message(&ss, hdr)) { snl_free(&ss); return (1); } From nobody Tue Oct 24 12:27:50 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SFBCq1ngrz4y01c; Tue, 24 Oct 2023 12:27: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 4SFBCq1JWyz4R9T; Tue, 24 Oct 2023 12:27:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698150471; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QS3IbmvlNsWGLo42JWN+owqG9bTO+fTnr0mNI+2YLSY=; b=vKtwHZrdowVB6XyzGiFb4viDMZSNcgq+VPUCvonmwbYd/iZA1ETNi75BwkKeWuHqDwacQG bH0OwnKvkbDxX00angx1j6UoyLPm52FJSr+YitvoP4lblp3Fop821ueZXOOxxHS0qOi/Nd SzGFxIAJp7BF+iBsiJ60Bwh1uIjcWzbB6NzeY/62uqK7l2mt6QxjUlIV5eq0LJDBu60IJ5 lNZkoI600FqLj4RCptfl7U7qU6JBmHZ6osypodFKI+Shq5hVKLeMEiyFfEi1HFnjzh88mH Bb4B3cYJIxnvkd37pUVjeTR3v4XIdgj/wE5cjGsxA1CFLp5LSVydIntfPAC7IQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698150471; a=rsa-sha256; cv=none; b=gAW4CFd+D4giBEYKTnUZvrOcr3xxm2kcHDscFLtcnHKa7w0o4/ip+gL54ky4z+nBVSbn/X N3bPCGIgwY0lSySG/AazoUh5zrnYQg5iyS6HcJYBG66z/r2fNx9kGezw9tEhympz7KQUYw X2mneHxZgXu1HOkaMNzbjWJgziHFGmrKCo3Z+Oo6hbEykctrnOHaUc2M4/h8r2gfxJTzwm zneYxpHNUcm2tfUHucKsyqMaMXl2BJe09qo4HMtJB4BZlGfqVV3HPNFcHVlhHQzUtbLbj6 7+bZWzX75xLAAEaNR8adKFbQ1ZZKccaEvpOfurRBrYNRlO/nfSkpQ8m8hpNzUg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698150471; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QS3IbmvlNsWGLo42JWN+owqG9bTO+fTnr0mNI+2YLSY=; b=x46hBKqFD6qry0d52ArZsQtlVTaP2x0ZLdUd0BKDAoZxFveJOLqor7eI2yUlqWq6zGQ5km oXkyDjISo83Bpu3A7yJ+mgd64D06sJEYeLltZhP07QA36EwEZD+q7mn3jk4oomQE/qtIt7 9lWeJuCPMY8q0ht0cJbuXZQ90Mli6bt4mACdsqL181ksyj5MuPGXm8/FFPOLsgwGpFAjQr IObNsc3EVQbQc9haL3Iqt6adPBPBTkjuaWiYNHkQlmqk2W7gSVoehQGi9Hl8g2rU6qXTG/ g4YZJ1Ravr/qA0vT9xGXQuwyPO+8jg00NcLr2SP8Z3UeukFIcdlUk7ZOLzlwfg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SFBCq0Mf5z7Yv; Tue, 24 Oct 2023 12:27: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 39OCRoQB071004; Tue, 24 Oct 2023 12:27:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39OCRoPa071001; Tue, 24 Oct 2023 12:27:50 GMT (envelope-from git) Date: Tue, 24 Oct 2023 12:27:50 GMT Message-Id: <202310241227.39OCRoPa071001@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kristof Provost Subject: git: 169746a877f6 - stable/14 - ndp: fix timestamp display output List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 169746a877f6f90214fec17bc0861eaf94cde855 Auto-Submitted: auto-generated The branch stable/14 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=169746a877f6f90214fec17bc0861eaf94cde855 commit 169746a877f6f90214fec17bc0861eaf94cde855 Author: R. Christian McDonald AuthorDate: 2023-10-17 16:57:22 +0000 Commit: Kristof Provost CommitDate: 2023-10-24 07:45:35 +0000 ndp: fix timestamp display output The current xo_format string is incorrect. This restores the display format prior to libxo-ification work while also explicitly marking tv_sec and tv_usec as encoded output only. MFC after: 1 week Reviewed by: kp Sponsored by: Rubicon Communications, LLC ("Netgate") Differential Revision: https://reviews.freebsd.org/D42269 (cherry picked from commit 2bb78b46e02413483409fe73244995524b838b6e) --- usr.sbin/ndp/ndp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/ndp/ndp.c b/usr.sbin/ndp/ndp.c index 1e3469d54228..b7bc25dd7aa4 100644 --- a/usr.sbin/ndp/ndp.c +++ b/usr.sbin/ndp/ndp.c @@ -1544,7 +1544,7 @@ ts_print(const struct timeval *tvp) /* Default */ sec = (tvp->tv_sec + thiszone) % 86400; - xo_emit("{:tv_sec/%lld}{:tv_usec/%lld}%02d:%02d:%02d.%06u ", + xo_emit("{e:tv_sec/%lld}{e:tv_usec/%lld}{d:/%02d:%02d:%02d.%06u} ", tvp->tv_sec, tvp->tv_usec, sec / 3600, (sec % 3600) / 60, sec % 60, (u_int32_t)tvp->tv_usec); } From nobody Tue Oct 24 12:44:01 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SFBZl6D4fz4y0SF; Tue, 24 Oct 2023 12:44:15 +0000 (UTC) (envelope-from 75ypz71@oldach.net) Received: from nuc.oldach.net (hmo.in-vpn.de [IPv6:2001:67c:1407:60::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-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "hmo.in-vpn.de", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SFBZk4FMDz4Svc; Tue, 24 Oct 2023 12:44:14 +0000 (UTC) (envelope-from 75ypz71@oldach.net) Authentication-Results: mx1.freebsd.org; dkim=none; spf=pass (mx1.freebsd.org: domain of 75ypz71@oldach.net designates 2001:67c:1407:60::1 as permitted sender) smtp.mailfrom=75ypz71@oldach.net; dmarc=none Received: from nuc.oldach.net (localhost [127.0.0.1]) by nuc.oldach.net (8.17.2/8.17.2) with ESMTPS id 39OCi10K054416 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NO); Tue, 24 Oct 2023 14:44:01 +0200 (CEST) (envelope-from 75ypz71@oldach.net) Received: (from hmo@localhost) by nuc.oldach.net (8.17.2/8.17.2) id 39OCi1Zl054415; Tue, 24 Oct 2023 14:44:01 +0200 (CEST) (envelope-from 75ypz71@oldach.net) Message-Id: <202310241244.39OCi1Zl054415@nuc.oldach.net> Subject: Re: git: 8bfa084a4bf3 - stable/13 - ndp: fix timestamp display output In-Reply-To: <202310241227.39OCRm5Y070835@gitrepo.freebsd.org> from Kristof Provost at "24 Oct 2023 12:27:48" To: kp@FreeBSD.org (Kristof Provost) Date: Tue, 24 Oct 2023 14:44:01 +0200 (CEST) Cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: 75ypz71@oldach.net (Helge Oldach) X-No-Archive: Yes List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Greylist: inspected by milter-greylist-4.6.4 (nuc.oldach.net [0.0.0.0]); Tue, 24 Oct 2023 14:44:01 +0200 (CEST) for IP:127.0.0.1 DOMAIN:localhost HELO:nuc.oldach.net FROM:75ypz71@oldach.net RCPT: X-Spamd-Bar: --- X-Spamd-Result: default: False [-3.30 / 15.00]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_SHORT(-1.00)[-0.999]; R_SPF_ALLOW(-0.20)[+mx]; MIME_GOOD(-0.10)[text/plain]; FROM_EQ_ENVFROM(0.00)[]; FROM_NO_DN(0.00)[]; R_DKIM_NA(0.00)[]; MLMMJ_DEST(0.00)[dev-commits-src-all@FreeBSD.org,dev-commits-src-branches@FreeBSD.org]; MIME_TRACE(0.00)[0:+]; MID_RHS_MATCH_FROMTLD(0.00)[]; RCVD_TLS_LAST(0.00)[]; DMARC_NA(0.00)[oldach.net]; ARC_NA(0.00)[]; ASN(0.00)[asn:29670, ipnet:2001:67c:1400::/45, country:DE]; RCPT_COUNT_THREE(0.00)[4]; TO_DN_NONE(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; RCVD_COUNT_TWO(0.00)[2] X-Rspamd-Queue-Id: 4SFBZk4FMDz4Svc Kristof Provost wrote on Tue, 24 Oct 2023 14:27:48 +0200 (CEST): > The branch stable/13 has been updated by kp: > > URL: https://cgit.FreeBSD.org/src/commit/?id=8bfa084a4bf331b6baf2cc530b9752c4cbe573ad > > commit 8bfa084a4bf331b6baf2cc530b9752c4cbe573ad > Author: R. Christian McDonald > AuthorDate: 2023-10-17 16:57:22 +0000 > Commit: Kristof Provost > CommitDate: 2023-10-24 07:45:38 +0000 > > ndp: fix timestamp display output > > The current xo_format string is incorrect. This restores the display > format prior to libxo-ification work while also explicitly marking > tv_sec and tv_usec as encoded output only. A couple of other xo_emit formats in ndp had also been damaged by the libxo-ification. Please see patch in PR 272749. Kind regards Helge From nobody Tue Oct 24 12:49:34 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SFBht3263z4y0qp; Tue, 24 Oct 2023 12:49: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 4SFBht2bn0z4T6R; Tue, 24 Oct 2023 12:49:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698151774; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=k22mdZ4o8h0/AKd+MuYJKQv4X5L3XsXYrNkmSM7rP1c=; b=ZlVj3dsaSP7Vp24J3EC/3TOU6VLZnUYZ8AFGdjXHmGZWmpWWcrhMb5FwROqD0m78OTHZqT dbpkWzwVD4+Kdeu6V8pl457DAmac3cpPgI1KIdAnRpXq0rsTh+8R/hd98lRRoV9Ok67Fxx nf26Ox6CKxvhBXgYw9p/faOt2S7A0eVJW6wN3Wpl9FH05xMde5zc2HYroC5iws0Y6ltkka PEhevu4GIYI6ZzJGn1mrMd3XeMPIpHq22TbM4Gd35B8tDTj5qs6CEH0mBv8ooMDYXhFXBT wE9LzDKTXZejS/3Aqu+esMTl4Cg9W6+zeM91gtzKy7gzba1OKsW8ZYaJj5KUlw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698151774; a=rsa-sha256; cv=none; b=HH2vsfhTfeEJ4l5FPdBLeq5N6ZMwSivngEdvwU+mwkN/SU2bhrRLQFcGq0jusuT1H9BYE0 JEO/vXmr3iH7oi1hMvTZso60XODEhLGFZOvE4S8M0CqP2UNgkpEF6642k/LDtrUVJoCk+z rSb8CVKuMaq1rA7Qyf11RD39O47DiWJj3MQZQTsR/ynuGQTYV1jAxoEO9FM52AKd3hreRO U8yRPKlKYLGmy7rliU3xPUiwo0dNeGllpw/AcCW+BEXarKTVHIdnt/GN1uewY2Cm5LqsY9 TXjqRUW89D9BRSlhaWiO50JBME7De9vQKrxog6gGA4HWPc9F/dfJNDrIGwv0HQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698151774; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=k22mdZ4o8h0/AKd+MuYJKQv4X5L3XsXYrNkmSM7rP1c=; b=Xajv7aymmZhqz7gdXRJIqmjb4A2VnOp0tdVQ2f1UJB04JZiAqa7tRJsQeu8kL8e3aE0Loq OanAvXE/CKW9BQxUHdP7QBXmfQt5x50fy0A/S28/aYnVNyxF23A21iP1O5vT2It/EVwGvj 9Te3VyUz9lR6TCA3VXvD2CtHL5BNK5HVPiSymeaSZxjjKQrdvdNrNlTQ2S+12Fh8yQTU5m Ikd8iEln8QgBJGtlCfjhjKJ3lW5Ss/k1zh9cmBCCuqNsJQmYRElRJFYokbHz2zBjPWB0ha BNEdcCPpFoDmLleFHOWQQfD3T8ythg1F4agnVmop2fzQ76Z7OFoWidicey8KaQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SFBht1fV2z7b5; Tue, 24 Oct 2023 12:49: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 39OCnYDU004757; Tue, 24 Oct 2023 12:49:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39OCnYWD004754; Tue, 24 Oct 2023 12:49:34 GMT (envelope-from git) Date: Tue, 24 Oct 2023 12:49:34 GMT Message-Id: <202310241249.39OCnYWD004754@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: 465b393b731c - stable/14 - Add expected failure for tmpfs atime test failing on FreeBSD List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 465b393b731c621ce027b8542cb70ce50943edcc Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=465b393b731c621ce027b8542cb70ce50943edcc commit 465b393b731c621ce027b8542cb70ce50943edcc Author: Ed Maste AuthorDate: 2023-10-21 15:15:14 +0000 Commit: Ed Maste CommitDate: 2023-10-24 12:49:17 +0000 Add expected failure for tmpfs atime test failing on FreeBSD PR: 274615 Reviewed by: ngie Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D42321 (cherry picked from commit 63f537551380d2dab29fa402ad1269feae17e594) --- contrib/netbsd-tests/fs/tmpfs/t_times.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/contrib/netbsd-tests/fs/tmpfs/t_times.sh b/contrib/netbsd-tests/fs/tmpfs/t_times.sh index f83dfe8f5929..f7676814fa71 100755 --- a/contrib/netbsd-tests/fs/tmpfs/t_times.sh +++ b/contrib/netbsd-tests/fs/tmpfs/t_times.sh @@ -36,6 +36,10 @@ empty_head() { atf_set "require.user" "root" } empty_body() { + # Begin FreeBSD + atf_expect_fail "Incorrect atime on FreeBSD: PR274615" + # End FreeBSD + test_mount atf_check -s eq:0 -o empty -e empty touch a From nobody Tue Oct 24 13:38:04 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SFCmr3Gg0z4y3dq; Tue, 24 Oct 2023 13:38: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 4SFCmr2nFlz4Y26; Tue, 24 Oct 2023 13:38:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698154684; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vnaL3hRTw19giz3jR3UdKjLUI+y0loVTCi6iWnIKdV8=; b=fztSW6FKz85Yof7Z0/XDOEmtVf3Wlqagl3YQlk/hIYCv4IbHD0HL9kUrFWTSzIkqJlsdby sWh3Cs5JFqFJ6mvxkcRDiP/mm7fJVxg0+rLnu0greP6Hne3I2FSMbIbY8lkDi33TL7F5R+ gA6HfeRBo5xcTfGBTHSTGRpmp+Xtuu1Z2CCyAUC5XGE5Ep2z4cgLEfgoXzWtxZ/p2oBuJo xtBQR02X22VQmCcdeHrZW2Bt2FXjk/w6IksTIppSQJSoGGOBMxgI9s/InFYeE1gu4B3yeN xHrrTwAqALog+aSythxCFYZmcSCo8vj2xaNmxExzfjx19Nd9Ya9/K8A2sm8OXw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698154684; a=rsa-sha256; cv=none; b=YH9A5vp60nDzan+428eJomwq71/k0/0+A2O5v6Kr5X8eygf73xTUVHnRrwJ1Z1wblsAGUI A71IPbxOD80NI3n59uw7VHbZa5hvY1Phx0iCefHaTvx7xMnBIGc40dhlhGCnfcfkhtlFs7 +QZGTTtm7J79UsPPFJ7a8xPce9fT9HZuU4CpOnMI23vfD8GXOIfaV25Qy0msQNp4NsbiX9 T97lf4f+qAGL59ouv/L+Y595qUk9yQaoJ+eaFrRSqCslvVjCwpwDEQa1BAF0HjUJPgz3D/ SUnD3JXqX7Opd9fq2WkG/tAQxZKMMrgSgJpoW0fG0n5LI0e8LiYFBOedUjNukg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698154684; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vnaL3hRTw19giz3jR3UdKjLUI+y0loVTCi6iWnIKdV8=; b=uwWt0UGTNFk7By42DRd7KtTGnFZfXQNvCKp2wVkP0AL/RiIdhQvrR4rqQWq6fC+JfJSRsC WWxcWZXK8XDv+jh3A7M/ofLWtGkHYUXZ6BjpX4zF5tWWAegGwOQQdsBdJ81pMmlqSSxNF2 l+jVCwsOWoujqKtQJy598/5W1gMBCfYrRuciIBRlA3Tg7WcCAfHX3/h1oe2v9mJq+VzcJP wC5ceXCvxs5L9j6Bo9SV4h9Lx+WHWJjlKrG2rOkejwEQghi84fsaSuam0gu6rFT8Lt2vMw gtxVItKtLIPOLfsl+BuP98wPXqtK9bKj3lAqFwAoATh+DeLXND9ZAnRjKXzBTg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SFCmr1qkTz9Sq; Tue, 24 Oct 2023 13:38: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 39ODc4EN088634; Tue, 24 Oct 2023 13:38:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39ODc4Wm088631; Tue, 24 Oct 2023 13:38:04 GMT (envelope-from git) Date: Tue, 24 Oct 2023 13:38:04 GMT Message-Id: <202310241338.39ODc4Wm088631@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 2d7b5953dd90 - stable/13 - geom_linux_lvm: Avoid removing from vg_list before inserting List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 2d7b5953dd90430c065014b748ac0e6217bff9d7 Auto-Submitted: auto-generated The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=2d7b5953dd90430c065014b748ac0e6217bff9d7 commit 2d7b5953dd90430c065014b748ac0e6217bff9d7 Author: Mark Johnston AuthorDate: 2023-10-17 14:25:38 +0000 Commit: Mark Johnston CommitDate: 2023-10-24 13:18:07 +0000 geom_linux_lvm: Avoid removing from vg_list before inserting PR: 266693 Reported by: Robert Morris MFC after: 1 week (cherry picked from commit 56279238b03a0ccef245b22fff7679fe35cffccc) --- sys/geom/linux_lvm/g_linux_lvm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/geom/linux_lvm/g_linux_lvm.c b/sys/geom/linux_lvm/g_linux_lvm.c index dddc3ae9184e..c63318fed729 100644 --- a/sys/geom/linux_lvm/g_linux_lvm.c +++ b/sys/geom/linux_lvm/g_linux_lvm.c @@ -512,7 +512,6 @@ g_llvm_free_vg(struct g_llvm_vg *vg) LIST_REMOVE(lv, lv_next); free(lv, M_GLLVM); } - LIST_REMOVE(vg, vg_next); free(vg, M_GLLVM); } @@ -596,7 +595,8 @@ g_llvm_destroy(struct g_llvm_vg *vg, int force) } } - g_llvm_free_vg(gp->softc); + LIST_REMOVE(vg, vg_next); + g_llvm_free_vg(vg); gp->softc = NULL; g_wither_geom(gp, ENXIO); return (0); From nobody Tue Oct 24 13:38:05 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SFCms4Lsvz4y3ds; Tue, 24 Oct 2023 13:38: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 4SFCms3Z71z4Y2f; Tue, 24 Oct 2023 13:38:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698154685; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SiOzKFX/AVDFAfcI//H3ZUvw1Ggg3NlOxUwwKCtbb+4=; b=x69A8YDO31HcXgU7vIP/6mKz+0uwRTQ5BQl+IfnAZgLjOJfaiduX3f2Xum9HDEQF4358qm KV6+GeQG8uR8dlp0kdxc6FEWB7bu/9BZZ3X0t2PueCVWwbugCrGqvIZqT29BULcrHX0pQA 0DSYegI2bJW4PEgcikng3DCIIdw5SovdFa2Y54py1K7qX/Vl77CVhpd6Dulp0HqB+5eU1u OWsB9Ofup1Inm0YV+08LYPs9BjWLxBc53AJZldi+DM9RnxeH6ft8x0lkDKZDxI9NCTOPIR v7FLpKE2s53lDlpyYqbgyWFLUMoLBrCSsKTPcKLHGv0cZr7VMcY0t4o8v2JdTQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698154685; a=rsa-sha256; cv=none; b=XmJLJWNyiTgIK1XXVNXnvhgkNg0iHFQ386KDug16yVRJGhO6o/Rga2oTiQbPuKfmctAANg Pkj6ET7StBCZu+mH87eA5zmWdznnOn5XAu8eyDDPdowoqpP3mAPy7q/kuBANONmk/DIsTy g88rhqEw9RtFqn7JxYGD6DQSNOUcEuTLxAhi8aWZZ/UpFz4xGS0zTXL4dvphbMKzdzs9Qm RmwD3E8WAq0QaqwxJi03fPS/pvQgvObAm+oV9ngNyRnZXMkPsiJ1/+W98c1HT2jVS4kCOJ UEIR/yfgLwr84SzC0mdg+5Z+OFv1JRBIp096HF+ZroJtQcLvEPFRnGieJapDKQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698154685; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SiOzKFX/AVDFAfcI//H3ZUvw1Ggg3NlOxUwwKCtbb+4=; b=jF+Q1jWu75p4+vwN2Qfm1zPeIBZZafQ1uf73B3cOh0Or15XhnESjidJtVec/9bPDeL/9y2 lSJGP3p4vjhYdO1Rkm0mPAkwj3fzXZJV8kD9Q8us7af2ISf38V91X3uiU8qATIsqZDXIoZ 8BIqGBSlr30gSN80LpGDTl8S2g6s76sEzhL990iSbHbJFGMbCM3s4azYbRXIwT1QaN4ir5 IpuJAYHD/2L3wt49ni1l4k5Vdc3stcVGPtFR/+R9KVZmhVWgAEOI11mv66bgk0rzvHkRaA K5ZQMScGPOHCRQXdpbshmT921d2q+zK7vX34tmZ+RoexDEbDgLvOP5dvZZSfgA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SFCms2glmz9Yr; Tue, 24 Oct 2023 13:38: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 39ODc5xM088691; Tue, 24 Oct 2023 13:38:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39ODc5Wf088688; Tue, 24 Oct 2023 13:38:05 GMT (envelope-from git) Date: Tue, 24 Oct 2023 13:38:05 GMT Message-Id: <202310241338.39ODc5Wf088688@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 95fa4ae00e18 - stable/13 - socket tests: Clean up the MSG_TRUNC regression tests a bit List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 95fa4ae00e18a46eb85e31718d172b12ba2d2ce4 Auto-Submitted: auto-generated The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=95fa4ae00e18a46eb85e31718d172b12ba2d2ce4 commit 95fa4ae00e18a46eb85e31718d172b12ba2d2ce4 Author: Mark Johnston AuthorDate: 2023-10-16 21:35:07 +0000 Commit: Mark Johnston CommitDate: 2023-10-24 13:18:27 +0000 socket tests: Clean up the MSG_TRUNC regression tests a bit - Fix style. - Move test case-specific code out of the shared function and into the individual test cases. - Remove unneeded setting of SO_REUSEPORT. - Avoid unnecessary copying. - Use ATF_REQUIRE* instead of ATF_CHECK*. The former cause test execution to stop after a failed assertion, which is what we want. - Add a test case for AF_LOCAL/SOCK_SEQPACKET sockets. MFC after: 1 week (cherry picked from commit b5e7dbac756afb49c58315c7081737b34a1d2dfd) --- tests/sys/kern/socket_msg_trunc.c | 230 +++++++++++++++++++++----------------- 1 file changed, 128 insertions(+), 102 deletions(-) diff --git a/tests/sys/kern/socket_msg_trunc.c b/tests/sys/kern/socket_msg_trunc.c index a863705adbae..469b9e1503cd 100644 --- a/tests/sys/kern/socket_msg_trunc.c +++ b/tests/sys/kern/socket_msg_trunc.c @@ -25,143 +25,169 @@ * SUCH DAMAGE. */ -#include -#include -#include +#include #include #include #include + #include + #include +#include +#include #include static void -check_recvmsg(const char *test_name) +check_recvmsg(int cs, int ss, struct sockaddr *sa, const size_t sizes[], + size_t nsizes) { - int ss, cs, rc; - struct sockaddr *sa; - struct sockaddr_in sin; - struct sockaddr_in6 sin6; - struct sockaddr_un saun; - int *sizes, sizes_count; - int one = 1; - - - if (!strcmp(test_name, "udp")) { - ss = socket(PF_INET, SOCK_DGRAM, 0); - ATF_CHECK(ss >= 0); - rc = setsockopt(ss, SOL_SOCKET, SO_REUSEPORT, &one, sizeof(one)); - ATF_CHECK_EQ(0, rc); - bzero(&sin, sizeof(sin)); - sin.sin_family = AF_INET; - sin.sin_len = sizeof(sin); - sin.sin_port = htons(6666); - sin.sin_addr.s_addr = htonl(INADDR_LOOPBACK); - sa = (struct sockaddr *)&sin; - rc = bind(ss, sa, sa->sa_len); - ATF_CHECK_EQ(0, rc); - - cs = socket(PF_INET, SOCK_DGRAM, 0); - ATF_CHECK(cs >= 0); - int inet_sizes[] = {80, 255, 256, 1024, 4096, 9000}; - sizes_count = sizeof(inet_sizes) / sizeof(int); - sizes = malloc(sizeof(inet_sizes)); - memcpy(sizes, inet_sizes, sizeof(inet_sizes)); - - } else if (!strcmp(test_name, "udp6")) { - ss = socket(PF_INET6, SOCK_DGRAM, 0); - ATF_CHECK(ss >= 0); - rc = setsockopt(ss, SOL_SOCKET, SO_REUSEPORT, &one, sizeof(one)); - ATF_CHECK_EQ(0, rc); - bzero(&sin6, sizeof(sin6)); - sin6.sin6_family = AF_INET6; - sin6.sin6_len = sizeof(sin6); - sin6.sin6_port = htons(6666); - const struct in6_addr in6loopback = IN6ADDR_LOOPBACK_INIT; - sin6.sin6_addr = in6loopback; - sa = (struct sockaddr *)&sin6; - rc = bind(ss, sa, sa->sa_len); - ATF_CHECK_EQ(0, rc); - - cs = socket(PF_INET6, SOCK_DGRAM, 0); - ATF_CHECK(cs >= 0); - int inet_sizes[] = {80, 255, 256, 1024, 4096, 9000}; - sizes_count = sizeof(inet_sizes) / sizeof(int); - sizes = malloc(sizeof(inet_sizes)); - memcpy(sizes, inet_sizes, sizeof(inet_sizes)); - - } else if (!strcmp(test_name, "unix")) { - const char *PATH = "/tmp/test_check_recvmsg_socket"; - ss = socket(PF_UNIX, SOCK_DGRAM, 0); - ATF_CHECK(ss >= 0); - rc = setsockopt(ss, SOL_SOCKET, SO_REUSEPORT, &one, sizeof(one)); - ATF_CHECK_EQ(0, rc); - bzero(&saun, sizeof(saun)); - saun.sun_family = AF_UNIX; - strcpy(saun.sun_path, PATH); - saun.sun_len = sizeof(saun); - sa = (struct sockaddr *)&saun; - unlink(PATH); - rc = bind(ss, sa, sa->sa_len); - ATF_CHECK_EQ(0, rc); - - cs = socket(PF_UNIX, SOCK_DGRAM, 0); - ATF_CHECK(cs >= 0); - int unix_sizes[] = {80, 255, 256, 1024, 2000}; - sizes_count = sizeof(unix_sizes) / sizeof(int); - sizes = malloc(sizeof(unix_sizes)); - memcpy(sizes, unix_sizes, sizeof(unix_sizes)); - } else - return; - char buf[4096]; + memset(buf, 0xFF, sizeof(buf)); - for (int i = 0; i < sizes_count; i++) { - int sz = sizes[i]; + for (size_t i = 0; i < nsizes; i++) { + ssize_t rc; + size_t sz = sizes[i]; char tbuf[1]; + rc = sendto(cs, buf, sz, 0, sa, sa->sa_len); - ATF_REQUIRE_EQ(rc, sz); + ATF_REQUIRE_MSG(rc != -1, "sendto failed: %s", strerror(errno)); + ATF_REQUIRE((size_t)rc == sz); rc = recv(ss, NULL, 0, MSG_PEEK | MSG_TRUNC); - ATF_CHECK_EQ(rc, sz); + ATF_REQUIRE_MSG(rc >= 0, "recv failed: %s", strerror(errno)); + ATF_REQUIRE((size_t)rc == sz); rc = recv(ss, tbuf, sizeof(tbuf), MSG_PEEK | MSG_TRUNC); - ATF_CHECK_EQ(rc, sz); + ATF_REQUIRE_MSG(rc >= 0, "recv failed: %s", strerror(errno)); + ATF_REQUIRE((size_t)rc == sz); rc = recv(ss, tbuf, sizeof(tbuf), MSG_TRUNC); - ATF_CHECK_EQ(rc, sz); + ATF_REQUIRE_MSG(rc >= 0, "recv failed: %s", strerror(errno)); + ATF_REQUIRE((size_t)rc == sz); } - close(ss); - close(cs); + ATF_REQUIRE(close(cs) == 0); + ATF_REQUIRE(close(ss) == 0); } -ATF_TC_WITHOUT_HEAD(socket_afinet_udp_recv_trunc); -ATF_TC_BODY(socket_afinet_udp_recv_trunc, tc) +ATF_TC_WITHOUT_HEAD(recv_trunc_afinet_udp); +ATF_TC_BODY(recv_trunc_afinet_udp, tc) { - check_recvmsg("udp"); + struct sockaddr_in sin; + struct sockaddr *sa; + int ss, cs, rc; + + ss = socket(PF_INET, SOCK_DGRAM, 0); + ATF_REQUIRE(ss >= 0); + + memset(&sin, 0, sizeof(sin)); + sin.sin_family = AF_INET; + sin.sin_len = sizeof(sin); + sin.sin_port = htons(6666); + sin.sin_addr.s_addr = htonl(INADDR_LOOPBACK); + sa = (struct sockaddr *)&sin; + rc = bind(ss, sa, sa->sa_len); + ATF_REQUIRE_MSG(rc == 0, "bind failed: %s", strerror(errno)); + + cs = socket(PF_INET, SOCK_DGRAM, 0); + ATF_REQUIRE(cs >= 0); + + size_t sizes[] = {80, 255, 256, 1024, 4096, 9000}; + check_recvmsg(cs, ss, sa, sizes, nitems(sizes)); } -ATF_TC_WITHOUT_HEAD(socket_afinet6_udp_recv_trunc); -ATF_TC_BODY(socket_afinet6_udp_recv_trunc, tc) +ATF_TC_WITHOUT_HEAD(recv_trunc_afinet6_udp); +ATF_TC_BODY(recv_trunc_afinet6_udp, tc) { - check_recvmsg("udp6"); + struct sockaddr_in6 sin6; + struct sockaddr *sa; + int cs, ss, rc; + + ss = socket(PF_INET6, SOCK_DGRAM, 0); + ATF_REQUIRE(ss >= 0); + + memset(&sin6, 0, sizeof(sin6)); + sin6.sin6_family = AF_INET6; + sin6.sin6_len = sizeof(sin6); + sin6.sin6_port = htons(6666); + const struct in6_addr in6loopback = IN6ADDR_LOOPBACK_INIT; + sin6.sin6_addr = in6loopback; + sa = (struct sockaddr *)&sin6; + rc = bind(ss, sa, sa->sa_len); + ATF_REQUIRE_MSG(rc == 0, "bind failed: %s", strerror(errno)); + + cs = socket(PF_INET6, SOCK_DGRAM, 0); + ATF_REQUIRE(cs >= 0); + + size_t sizes[] = {80, 255, 256, 1024, 4096, 9000}; + check_recvmsg(cs, ss, sa, sizes, nitems(sizes)); } -ATF_TC_WITHOUT_HEAD(socket_afunix_recv_trunc); -ATF_TC_BODY(socket_afunix_recv_trunc, tc) +ATF_TC_WITHOUT_HEAD(recv_trunc_afunix_dgram); +ATF_TC_BODY(recv_trunc_afunix_dgram, tc) { - check_recvmsg("unix"); + struct sockaddr_un sun; + struct sockaddr *sa; + int ss, cs, rc; + + ss = socket(PF_UNIX, SOCK_DGRAM, 0); + ATF_REQUIRE(ss >= 0); + + bzero(&sun, sizeof(sun)); + sun.sun_family = AF_UNIX; + strlcpy(sun.sun_path, "test_check_recvmsg_socket", sizeof(sun.sun_path)); + sun.sun_len = sizeof(sun); + sa = (struct sockaddr *)&sun; + rc = bind(ss, sa, sa->sa_len); + ATF_REQUIRE_MSG(rc == 0, "bind failed: %s", strerror(errno)); + + cs = socket(PF_UNIX, SOCK_DGRAM, 0); + ATF_REQUIRE(cs >= 0); + + size_t sizes[] = {80, 255, 256, 1024, 2000}; + check_recvmsg(cs, ss, sa, sizes, nitems(sizes)); } +ATF_TC_WITHOUT_HEAD(recv_trunc_afunix_seqpacket); +ATF_TC_BODY(recv_trunc_afunix_seqpacket, tc) +{ + struct sockaddr_un sun; + struct sockaddr *sa; + int ss, nss, cs, rc; + + ss = socket(PF_UNIX, SOCK_SEQPACKET, 0); + ATF_REQUIRE(ss >= 0); + + bzero(&sun, sizeof(sun)); + sun.sun_family = AF_UNIX; + strlcpy(sun.sun_path, "test_check_recvmsg_socket", sizeof(sun.sun_path)); + sun.sun_len = sizeof(sun); + sa = (struct sockaddr *)&sun; + rc = bind(ss, sa, sa->sa_len); + ATF_REQUIRE_MSG(rc == 0, "bind failed: %s", strerror(errno)); + rc = listen(ss, 1); + ATF_REQUIRE_MSG(rc == 0, "listen failed: %s", strerror(errno)); + + cs = socket(PF_UNIX, SOCK_SEQPACKET, 0); + ATF_REQUIRE(cs >= 0); + rc = connect(cs, sa, sa->sa_len); + ATF_REQUIRE_MSG(rc == 0, "connect failed: %s", strerror(errno)); + nss = accept(ss, NULL, NULL); + ATF_REQUIRE(nss >= 0); + + size_t sizes[] = {80, 255, 256, 1024, 2000}; + check_recvmsg(cs, nss, sa, sizes, nitems(sizes)); + + ATF_REQUIRE(close(ss) == 0); +} ATF_TP_ADD_TCS(tp) { + ATF_TP_ADD_TC(tp, recv_trunc_afinet_udp); + ATF_TP_ADD_TC(tp, recv_trunc_afinet6_udp); + ATF_TP_ADD_TC(tp, recv_trunc_afunix_dgram); + ATF_TP_ADD_TC(tp, recv_trunc_afunix_seqpacket); - ATF_TP_ADD_TC(tp, socket_afinet_udp_recv_trunc); - ATF_TP_ADD_TC(tp, socket_afinet6_udp_recv_trunc); - ATF_TP_ADD_TC(tp, socket_afunix_recv_trunc); - - return atf_no_error(); + return (atf_no_error()); } From nobody Tue Oct 24 13:38:06 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SFCmt5YDtz4y3gj; Tue, 24 Oct 2023 13:38: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 4SFCmt4p5Dz4Y3N; Tue, 24 Oct 2023 13:38:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698154686; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bvSGlDmFN/EN0G2jjOxZQTF7I65W9KPvTd739g6V4VM=; b=Ye7jfo172lwZr+iIHcmZuBuRkfHupFiSTnNnTAkgRBBOCbifNprGdZ0PIt8I/+DMxsQKi3 dI+0Cz17UcK1LqJuuO23PEEmgxkkBb6lNBYyeRWW6pUQsCNoYPvA5q45QKaVZqgtLoVEmN 8BbnsgjDjv0zJPX2NiIKFJq5ICKo5MUTglIQ6NZpAMaCfW+WafP2umWG258wcSCdFfq8eo c6/YN3oikVyzXRl4gXJNFyeeIXBYJT5NxlmqtT/CC92FruLMjKO98B0U5eoNC6eUKdAF48 5VsXsi+lWLh0W81ojN5gOVufHmGdDbOV3kjshkwBtgHskz5oAvG59c57iAhJpg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698154686; a=rsa-sha256; cv=none; b=fu9k6eo1wowZDHyS1e+GXdi8z2Fm9TpPJw+iAxG98PXEDzBhLsttt7t6gHpu0jZgFTur7Z 3k6iMoTELq9JTcdhqON5NqD4AXhCYhlm+POwV81euz5fiAnb8CNQiw1eh/rkJUqfwzMPOx K1liTLEOd6JboLpjbgumqH7BCeEbV9bdqprDIsZMkbcIl24xS9TbgDy6KH1KHgx8Snh2oU O6DL1aWI1nNpD3yusuWFMDWTn7Dae1O8Ar8LV65IQmRCg5MMMJwyynKtZeTMPIheljPkKs 5gJUFfFItmOpVk9mHG3I8jan5ibW7tFvvhp0p52YQTs5Gqlxv78BXI7rXcEhhw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698154686; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bvSGlDmFN/EN0G2jjOxZQTF7I65W9KPvTd739g6V4VM=; b=jHKeFQHHLtwfXglpego8EZiRJxks0q1DdQ9D3wpU6RVpr8KiSmkO58iQH8Dn3O+VtCPj+V 7FqWNzI8MYnRhlOn2MhOmBkbpFfkJdHO2hArdjT2lx9p6tkWZFF+8FF8nQw0Yi82xe1wbr C89y0xmICDhOcRTOItV+fjycYXQUxHfdBE3kNN1omunPOmwZVb0phX/WfmOk6xRj9lezhm 3qfj9H8wY38tvK2OvWOnV4hkcGqhPRIEd3Q1glA2V9a6/0bRcoHfFnlhC90ZbObvBGij0s qrodGNDQ5f9FUHTe42c1n59Y6DZ3+rcjI7X6t2K5Xbt/i2dlXh92dahSY7CDeg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SFCmt3vxFz9Sr; Tue, 24 Oct 2023 13:38: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 39ODc6nl088743; Tue, 24 Oct 2023 13:38:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39ODc60X088740; Tue, 24 Oct 2023 13:38:06 GMT (envelope-from git) Date: Tue, 24 Oct 2023 13:38:06 GMT Message-Id: <202310241338.39ODc60X088740@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: f5a9a849e903 - stable/13 - socket tests: Add a regression test for ktrace+recv(MSG_TRUNC) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: f5a9a849e9034c597c2b0a9014673a44834b9516 Auto-Submitted: auto-generated The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=f5a9a849e9034c597c2b0a9014673a44834b9516 commit f5a9a849e9034c597c2b0a9014673a44834b9516 Author: Mark Johnston AuthorDate: 2023-10-16 22:23:36 +0000 Commit: Mark Johnston CommitDate: 2023-10-24 13:18:43 +0000 socket tests: Add a regression test for ktrace+recv(MSG_TRUNC) MFC after: 1 week (cherry picked from commit d8735eb7acc0613fd19f74a49d3bdcb7ed0e9b0e) --- tests/sys/kern/socket_msg_trunc.c | 57 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) diff --git a/tests/sys/kern/socket_msg_trunc.c b/tests/sys/kern/socket_msg_trunc.c index 469b9e1503cd..279170158643 100644 --- a/tests/sys/kern/socket_msg_trunc.c +++ b/tests/sys/kern/socket_msg_trunc.c @@ -27,11 +27,13 @@ #include #include +#include #include #include #include +#include #include #include #include @@ -182,12 +184,67 @@ ATF_TC_BODY(recv_trunc_afunix_seqpacket, tc) ATF_REQUIRE(close(ss) == 0); } +/* + * Exercise the case where ktrace was used to dump a truncated buffer. + */ +ATF_TC_WITHOUT_HEAD(recvmsg_trunc_ktrace_uio); +ATF_TC_BODY(recvmsg_trunc_ktrace_uio, tc) +{ + struct ktr_header ktr; + struct msghdr msg; + struct iovec iov; + const char *tracepath; + char buf[128]; + ssize_t nbytes; + int error, fd, sd[2]; + + tracepath = "ktrace"; + + error = socketpair(AF_UNIX, SOCK_DGRAM, 0, sd); + ATF_REQUIRE(error == 0); + + memset(buf, 0, sizeof(buf)); + nbytes = send(sd[0], buf, sizeof(buf), 0); + ATF_REQUIRE_MSG(nbytes >= 0, "send failed: %s", strerror(errno)); + ATF_REQUIRE((size_t)nbytes == sizeof(buf)); + + fd = open(tracepath, O_RDWR | O_CREAT | O_TRUNC, 0644); + ATF_REQUIRE_MSG(fd >= 0, "open failed: %s", strerror(errno)); + error = ktrace(tracepath, KTROP_SET, KTRFAC_GENIO, getpid()); + ATF_REQUIRE_MSG(error == 0, + "ktrace(SET) failed: %s", strerror(errno)); + + iov.iov_base = buf; + iov.iov_len = sizeof(buf) - 1; /* truncate */ + memset(&msg, 0, sizeof(msg)); + msg.msg_iov = &iov; + msg.msg_iovlen = 1; + nbytes = recvmsg(sd[1], &msg, MSG_TRUNC); + ATF_REQUIRE_MSG(nbytes >= 0, "recvmsg failed: %s", strerror(errno)); + ATF_REQUIRE((size_t)nbytes == sizeof(buf)); + ATF_REQUIRE((msg.msg_flags & MSG_TRUNC) != 0); + + error = ktrace(tracepath, KTROP_CLEARFILE, 0, getpid()); + ATF_REQUIRE_MSG(error == 0, + "ktrace(CLEARFILE) failed: %s", strerror(errno)); + + nbytes = read(fd, &ktr, sizeof(ktr)); + ATF_REQUIRE_MSG(nbytes >= 0, "read failed: %s", strerror(errno)); + ATF_REQUIRE((size_t)nbytes == sizeof(ktr)); + ATF_REQUIRE_MSG((ktr.ktr_type & ~KTR_TYPE) == KTR_GENIO); + + ATF_REQUIRE(close(fd) == 0); + ATF_REQUIRE(close(sd[0]) == 0); + ATF_REQUIRE(close(sd[1]) == 0); +} + ATF_TP_ADD_TCS(tp) { ATF_TP_ADD_TC(tp, recv_trunc_afinet_udp); ATF_TP_ADD_TC(tp, recv_trunc_afinet6_udp); ATF_TP_ADD_TC(tp, recv_trunc_afunix_dgram); ATF_TP_ADD_TC(tp, recv_trunc_afunix_seqpacket); + ATF_TP_ADD_TC(tp, recvmsg_trunc_ktrace_uio); return (atf_no_error()); } From nobody Tue Oct 24 13:38:07 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SFCmw0nHwz4y3ZF; Tue, 24 Oct 2023 13:38: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 4SFCmv5nbMz4Ydr; Tue, 24 Oct 2023 13:38:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698154687; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rAsW3Al+IMz4qrPsvfZORCcbuY7wA4++pn1hZ9gV7CY=; b=bdkhxMn+MM/yODLBos+GJFz5uI4TZaBUVCb3jxrjFPgEq5hqK2n3o77P7j4mvNJlqYrr30 nv5GYdVzIiY8y5b7Y5MvNbVGzd3WdqPH1bdmKVDCHsEN7AuUV8Pt/B1fJjGSh3GrEaxb6h ZpIUzRYlYIQj4qL6hrd4t9cUb+KSvnnv67W3Ksbf96G6TWNt5Ew9/DvZp4RG0T0FdllWhx EfISC72kKagpgf1bBBF5eRUko2kEUrdSrjtxGqds9PpQt0/iZ8AKXIX6H4l/Igp8U1mZV4 e1AyXFbJkedc2ehXpDu26/cbPLXygvVyVHisAN3QBPLlejCDYAk+zx+Wtx4yjA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698154687; a=rsa-sha256; cv=none; b=cegp/4RjLaRkHotaIfBtr6HqdZDVb9FhR/bf/l03JUphOIGqC7OJUlXwP0VaD03egGZnMk GmqqC24+Mvzswa6iiVXGu1ki7UQyQzxgwOuq0Iu/Ey6gO16HUPW2tpa3weNBa6LyiuhQeB ahgTTPI9F1NofC5nODY1qFqiFqQ0Lxsx3+yBt1XlZFvbhRhO5CDAdnLN0wnD7ubJrA4oHH a73F1EHJFy4bYf22HIpDmevc2qYNrBYwk+cv7VGFYv9CkRS7aPZu7DMNqyBmUy3G1eGaER DI3F4hpcs6hIl68EWMwXZtmgDosdIdZ6JAIcXoEgFrXuEKSiQutGFLAMGfbcdA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698154687; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rAsW3Al+IMz4qrPsvfZORCcbuY7wA4++pn1hZ9gV7CY=; b=selYYN1mMeFBx+JtcSYZbCafFHd2uUgNIuEurnWAd6fWqlWlVkGT+lnDYi8iA/z+tHihG/ H6o6x55K1NHM/vz4bM1CzQQFPFAE4VDBZAWi8m8v/5VDve3ak6o3U0Plxzt3igfWvQjfY6 fONf4MzB03gKHwR78Cwz9V4a3WKW7XPYk6cj+3hglu1xqnwcgV+qn7tBMW9QOHwn85QUPR Fy5Ru3+aSGihUkmUj/LOSLltumQ77LAoS7+n0NHtKHOVd+htfxiZHfXeKWrlGjoInqy758 7drrTT8hvWyc8SkvAKiJ14NY5l7txOXL0VGjYQIelkBUCFfPqrfuAlqgY2ak9Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SFCmv4tlPz99Q; Tue, 24 Oct 2023 13:38: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 39ODc7r1088782; Tue, 24 Oct 2023 13:38:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39ODc7no088779; Tue, 24 Oct 2023 13:38:07 GMT (envelope-from git) Date: Tue, 24 Oct 2023 13:38:07 GMT Message-Id: <202310241338.39ODc7no088779@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: eb8923452e1e - stable/13 - uiomove: Add some assertions List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: eb8923452e1e4071d06c28322e19f544844378ba Auto-Submitted: auto-generated The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=eb8923452e1e4071d06c28322e19f544844378ba commit eb8923452e1e4071d06c28322e19f544844378ba Author: Mark Johnston AuthorDate: 2023-10-16 20:12:37 +0000 Commit: Mark Johnston CommitDate: 2023-10-24 13:18:54 +0000 uiomove: Add some assertions Make sure that we don't try to copy with a negative resid. Make sure that we don't walk off the end of the iovec array. Reviewed by: kib MFC after: 1 week Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D42098 (cherry picked from commit 8fd0ec53deaad34383d4b344714b74d67105b258) --- sys/amd64/amd64/uio_machdep.c | 6 ++++++ sys/arm/arm/uio_machdep.c | 6 ++++++ sys/arm64/arm64/uio_machdep.c | 6 ++++++ sys/i386/i386/uio_machdep.c | 6 ++++++ sys/kern/subr_uio.c | 5 +++++ sys/powerpc/powerpc/uio_machdep.c | 5 +++++ sys/riscv/riscv/uio_machdep.c | 6 ++++++ 7 files changed, 40 insertions(+) diff --git a/sys/amd64/amd64/uio_machdep.c b/sys/amd64/amd64/uio_machdep.c index 890d1078c4f6..59e0998482ab 100644 --- a/sys/amd64/amd64/uio_machdep.c +++ b/sys/amd64/amd64/uio_machdep.c @@ -71,10 +71,16 @@ uiomove_fromphys(vm_page_t ma[], vm_offset_t offset, int n, struct uio *uio) ("uiomove_fromphys: mode")); KASSERT(uio->uio_segflg != UIO_USERSPACE || uio->uio_td == curthread, ("uiomove_fromphys proc")); + KASSERT(uio->uio_resid >= 0, + ("%s: uio %p resid underflow", __func__, uio)); + save = td->td_pflags & TDP_DEADLKTREAT; td->td_pflags |= TDP_DEADLKTREAT; mapped = FALSE; while (n > 0 && uio->uio_resid) { + KASSERT(uio->uio_iovcnt > 0, + ("%s: uio %p iovcnt underflow", __func__, uio)); + iov = uio->uio_iov; cnt = iov->iov_len; if (cnt == 0) { diff --git a/sys/arm/arm/uio_machdep.c b/sys/arm/arm/uio_machdep.c index 07531f76217b..18661ebd1652 100644 --- a/sys/arm/arm/uio_machdep.c +++ b/sys/arm/arm/uio_machdep.c @@ -72,9 +72,15 @@ uiomove_fromphys(vm_page_t ma[], vm_offset_t offset, int n, struct uio *uio) ("uiomove_fromphys: mode")); KASSERT(uio->uio_segflg != UIO_USERSPACE || uio->uio_td == curthread, ("uiomove_fromphys proc")); + KASSERT(uio->uio_resid >= 0, + ("%s: uio %p resid underflow", __func__, uio)); + save = td->td_pflags & TDP_DEADLKTREAT; td->td_pflags |= TDP_DEADLKTREAT; while (n > 0 && uio->uio_resid) { + KASSERT(uio->uio_iovcnt > 0, + ("%s: uio %p iovcnt underflow", __func__, uio)); + iov = uio->uio_iov; cnt = iov->iov_len; if (cnt == 0) { diff --git a/sys/arm64/arm64/uio_machdep.c b/sys/arm64/arm64/uio_machdep.c index d5c3bad6c908..b45b2ba80d2c 100644 --- a/sys/arm64/arm64/uio_machdep.c +++ b/sys/arm64/arm64/uio_machdep.c @@ -69,10 +69,16 @@ uiomove_fromphys(vm_page_t ma[], vm_offset_t offset, int n, struct uio *uio) ("uiomove_fromphys: mode")); KASSERT(uio->uio_segflg != UIO_USERSPACE || uio->uio_td == curthread, ("uiomove_fromphys proc")); + KASSERT(uio->uio_resid >= 0, + ("%s: uio %p resid underflow", __func__, uio)); + save = td->td_pflags & TDP_DEADLKTREAT; td->td_pflags |= TDP_DEADLKTREAT; mapped = FALSE; while (n > 0 && uio->uio_resid) { + KASSERT(uio->uio_iovcnt > 0, + ("%s: uio %p iovcnt underflow", __func__, uio)); + iov = uio->uio_iov; cnt = iov->iov_len; if (cnt == 0) { diff --git a/sys/i386/i386/uio_machdep.c b/sys/i386/i386/uio_machdep.c index 07d71eac5db6..92e067b35bed 100644 --- a/sys/i386/i386/uio_machdep.c +++ b/sys/i386/i386/uio_machdep.c @@ -71,9 +71,15 @@ uiomove_fromphys(vm_page_t ma[], vm_offset_t offset, int n, struct uio *uio) ("uiomove_fromphys: mode")); KASSERT(uio->uio_segflg != UIO_USERSPACE || uio->uio_td == curthread, ("uiomove_fromphys proc")); + KASSERT(uio->uio_resid >= 0, + ("%s: uio %p resid underflow", __func__, uio)); + save = td->td_pflags & TDP_DEADLKTREAT; td->td_pflags |= TDP_DEADLKTREAT; while (n > 0 && uio->uio_resid) { + KASSERT(uio->uio_iovcnt > 0, + ("%s: uio %p iovcnt underflow", __func__, uio)); + iov = uio->uio_iov; cnt = iov->iov_len; if (cnt == 0) { diff --git a/sys/kern/subr_uio.c b/sys/kern/subr_uio.c index 21a1f044db54..b0c4a256cd17 100644 --- a/sys/kern/subr_uio.c +++ b/sys/kern/subr_uio.c @@ -216,6 +216,8 @@ uiomove_faultflag(void *cp, int n, struct uio *uio, int nofault) ("uiomove: mode")); KASSERT(uio->uio_segflg != UIO_USERSPACE || uio->uio_td == curthread, ("uiomove proc")); + KASSERT(uio->uio_resid >= 0, + ("%s: uio %p resid underflow", __func__, uio)); if (uio->uio_segflg == UIO_USERSPACE) { newflags = TDP_DEADLKTREAT; @@ -234,6 +236,9 @@ uiomove_faultflag(void *cp, int n, struct uio *uio, int nofault) } while (n > 0 && uio->uio_resid) { + KASSERT(uio->uio_iovcnt > 0, + ("%s: uio %p iovcnt underflow", __func__, uio)); + iov = uio->uio_iov; cnt = iov->iov_len; if (cnt == 0) { diff --git a/sys/powerpc/powerpc/uio_machdep.c b/sys/powerpc/powerpc/uio_machdep.c index 679139a96e99..5de2dd8b416b 100644 --- a/sys/powerpc/powerpc/uio_machdep.c +++ b/sys/powerpc/powerpc/uio_machdep.c @@ -75,10 +75,15 @@ uiomove_fromphys(vm_page_t ma[], vm_offset_t offset, int n, struct uio *uio) ("uiomove_fromphys: mode")); KASSERT(uio->uio_segflg != UIO_USERSPACE || uio->uio_td == curthread, ("uiomove_fromphys proc")); + KASSERT(uio->uio_resid >= 0, + ("%s: uio %p resid underflow", __func__, uio)); save = td->td_pflags & TDP_DEADLKTREAT; td->td_pflags |= TDP_DEADLKTREAT; while (n > 0 && uio->uio_resid) { + KASSERT(uio->uio_iovcnt > 0, + ("%s: uio %p iovcnt underflow", __func__, uio)); + iov = uio->uio_iov; cnt = iov->iov_len; if (cnt == 0) { diff --git a/sys/riscv/riscv/uio_machdep.c b/sys/riscv/riscv/uio_machdep.c index d0f3e45ee1f4..ace1f368b594 100644 --- a/sys/riscv/riscv/uio_machdep.c +++ b/sys/riscv/riscv/uio_machdep.c @@ -69,10 +69,16 @@ uiomove_fromphys(vm_page_t ma[], vm_offset_t offset, int n, struct uio *uio) ("uiomove_fromphys: mode")); KASSERT(uio->uio_segflg != UIO_USERSPACE || uio->uio_td == curthread, ("uiomove_fromphys proc")); + KASSERT(uio->uio_resid >= 0, + ("%s: uio %p resid underflow", __func__, uio)); + save = td->td_pflags & TDP_DEADLKTREAT; td->td_pflags |= TDP_DEADLKTREAT; mapped = FALSE; while (n > 0 && uio->uio_resid) { + KASSERT(uio->uio_iovcnt > 0, + ("%s: uio %p iovcnt underflow", __func__, uio)); + iov = uio->uio_iov; cnt = iov->iov_len; if (cnt == 0) { From nobody Tue Oct 24 13:38:08 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SFCmx10gpz4y3pN; Tue, 24 Oct 2023 13:38: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 4SFCmw6nm1z4YR4; Tue, 24 Oct 2023 13:38:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698154689; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OhM2V0UFS4ScUorVfBA9TMuWGMYPeixlcR82V9AMCQY=; b=P1TqumV8zKdyNgHJoRfUi1HnYaVOOrcnqHbgIIfx+ZCvw3WqZqKgwpfVWNVje98PC6ZUjR gOo+WknBrdjCBknUcspVmU80ixBlYBzrdg+/ex9x3R2Sun4JcOGLIKK2wT8GSMCH3thAwp vvxkYE3L7FqWA0qSeYW3qpjdnWS2121s94EEWdodmdThXYmKq62gkEACTE7GeljMhe85u8 ss3vXMjz7MVjff6oTdRLQ7yDRqJdYJkouWFxehpSYx+go0dxqV0gHCj9xXEpSy5lRCSWPG lU+JOoJwJ6bcFNBXPvNJyCRULfaeiL9xI6zYZO5rxEB5qUQIF9tjs6NZWM2blg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698154689; a=rsa-sha256; cv=none; b=NHzWiwk5zueEz2IEXQNXFBbHf/A7L+mxwPzLD76l97/xc46f/3ymFHxYTGFsug0IZXaHKF TkFGNg8/lK0saKt4+Lj4Whij95cyYDSxkHjIzVlUJeF0wBgvCB8U3T+m9zKw9N2tPolpAo +fvywoy0Jvpucb8h1mRDRryr9EPfmbB+m3HJquOn4QnpBVhIhw3PBMy17JYo1d6dIyZ136 m4jg+wkvRXeJDYK/HrchCbWRkUFkvkWwCCcHXtMnVld3LjvOyDCL3cjmlDIAdVhWA6YRoA +8hhiAxMtuEEJt9L3DkqGpTdIMk1cd6r7KZBGmawbUZlGpWtEy3SX0SQCHGQoQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698154689; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OhM2V0UFS4ScUorVfBA9TMuWGMYPeixlcR82V9AMCQY=; b=O25nPCEuC0CnOetChE6TQD1tDKJC2FsILeuTAyVBKcXzTfgFu5RtAOuupHss3JaRVqkHmU LBKgo8O+c0Rn3jphsNb4CCZ/Vzu1JlyT/m9B0diI2r8ewisX/mVtGv6kzmcbCxBF5k1ZeL jkfjNm+pH8871qc6WgG30+N4fgftyGWb+1QsqS7T5ZDwCwYND54m7rLoD0hYN6CXc1zbrA rIt1hRBjJlKy8IIr4baxZ7dNRrKm3D9uOi5adWlLbRK8Fkg8iyFx9CJYUtFp0nCuCFVPVP YRlM6rXtwQNa6SZDGZ4elTScnbleNmM+VPPWRAIcTawF8WaElOc08hPq6WUueQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SFCmw5vgHz9Ss; Tue, 24 Oct 2023 13:38: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 39ODc8Jg088828; Tue, 24 Oct 2023 13:38:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39ODc8EV088825; Tue, 24 Oct 2023 13:38:08 GMT (envelope-from git) Date: Tue, 24 Oct 2023 13:38:08 GMT Message-Id: <202310241338.39ODc8EV088825@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: bc6372602a00 - stable/13 - bhyve: Use VMIO_SIOCSIFFLAGS instead of SIOCGIFFLAGS List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: bc6372602a0042e5496d9ab6637558f98af0deef Auto-Submitted: auto-generated The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=bc6372602a0042e5496d9ab6637558f98af0deef commit bc6372602a0042e5496d9ab6637558f98af0deef Author: Jan Bramkamp AuthorDate: 2023-09-04 08:38:25 +0000 Commit: Mark Johnston CommitDate: 2023-10-24 13:21:26 +0000 bhyve: Use VMIO_SIOCSIFFLAGS instead of SIOCGIFFLAGS Creating an IP socket to invoke the SIOCGIFFLAGS ioctl on is the only thing preventing bhyve from working inside a bhyve jail with IPv4 and IPv6 disabled restricting the jailed bhyve process to only access the host network via a tap/vmnet device node. PR: 273557 Fixes: 56be282bc999 ("bhyve: net_backends, automatically IFF_UP tap devices") Reviewed by: markj MFC after: 1 week (cherry picked from commit fd8b9c73a5a63a7aa438a73951d7a535b4f25d9a) --- usr.sbin/bhyve/net_backends.c | 52 ++++--------------------------------------- 1 file changed, 4 insertions(+), 48 deletions(-) diff --git a/usr.sbin/bhyve/net_backends.c b/usr.sbin/bhyve/net_backends.c index fa7cd9c81f46..99781cfdcbb6 100644 --- a/usr.sbin/bhyve/net_backends.c +++ b/usr.sbin/bhyve/net_backends.c @@ -42,9 +42,7 @@ #include #include -#if defined(INET6) || defined(INET) #include -#endif #include #include #define NETMAP_WITH_LIBS @@ -180,17 +178,6 @@ SET_DECLARE(net_backend_set, struct net_backend); * The tap backend */ -#if defined(INET6) || defined(INET) -static const int pf_list[] = { -#if defined(INET6) - PF_INET6, -#endif -#if defined(INET) - PF_INET, -#endif -}; -#endif - struct tap_priv { struct mevent *mevp; /* @@ -222,11 +209,8 @@ tap_init(struct net_backend *be, const char *devname, { struct tap_priv *priv = NET_BE_PRIV(be); char tbuf[80]; - int opt = 1; -#if defined(INET6) || defined(INET) - struct ifreq ifrq; - int s; -#endif + int opt = 1, up = IFF_UP; + #ifndef WITHOUT_CAPSICUM cap_rights_t rights; #endif @@ -254,39 +238,11 @@ tap_init(struct net_backend *be, const char *devname, goto error; } -#if defined(INET6) || defined(INET) - /* - * Try to UP the interface rather than relying on - * net.link.tap.up_on_open. - */ - bzero(&ifrq, sizeof(ifrq)); - if (ioctl(be->fd, TAPGIFNAME, &ifrq) < 0) { - WPRINTF(("Could not get interface name")); - goto error; - } - - s = -1; - for (size_t i = 0; s == -1 && i < nitems(pf_list); i++) - s = socket(pf_list[i], SOCK_DGRAM, 0); - if (s == -1) { - WPRINTF(("Could open socket")); + if (ioctl(be->fd, VMIO_SIOCSIFFLAGS, &up)) { + WPRINTF(("tap device link up failed")); goto error; } - if (ioctl(s, SIOCGIFFLAGS, &ifrq) < 0) { - (void)close(s); - WPRINTF(("Could not get interface flags")); - goto error; - } - ifrq.ifr_flags |= IFF_UP; - if (ioctl(s, SIOCSIFFLAGS, &ifrq) < 0) { - (void)close(s); - WPRINTF(("Could not set interface flags")); - goto error; - } - (void)close(s); -#endif - #ifndef WITHOUT_CAPSICUM cap_rights_init(&rights, CAP_EVENT, CAP_READ, CAP_WRITE); if (caph_rights_limit(be->fd, &rights) == -1) From nobody Tue Oct 24 13:38:18 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SFCn719Vtz4y3rh; Tue, 24 Oct 2023 13:38: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 4SFCn624Y3z4Z3w; Tue, 24 Oct 2023 13:38:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698154698; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1ahNXjxPJSD7vmTRLJX5AFCeete2Ruei+7rR+cX6kbM=; b=JhFB/inKq51q68k3A5VeWDr6O2tV3canNxwL00mA3qjry5AEGFZf0gla9tj8QpHFTS2nNa VVNWjASRvwivLOfQ4DzxgUjMeTLw5XCKJW/9pUewP7WxEDy7IFcj5cO6zcvo1DnlmVILjF ROONIKY0Z7nJVqFE5Jd54Vaf69+QwWVf1F39POuq+jOvhSUy18XVdplMHEyXDgP2H8vtt9 5sNwqaFFTaBAt6Xb0f7voYyOB2Dp9/IydeOJZ+L/vqFRoEp6DSl/wMLGD6PTLwowPi7j96 xUMbsf3RrTpB5fuqjDcSlgMEyvboSM0ns7nn57g7DTWOLKPvTX9Evsuedue50A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698154698; a=rsa-sha256; cv=none; b=VWUv19oLKDFZi86QM3G0qWkvlInXo+z4uGpnarTv3e9wGHVtTm8N3MiBegNLppTAyRvDmq sJoG2wI8pcqAbDIcrRCuGtXNz3FqF/1NDBaZm5Nc83XeonviWU4iZiFXJMnG7Dz7xMz7TX e06VFIGAs5TuxE2N76Ay0LQlvIG6LAOIMRyqlfgfue3Fx/zDkHY9sT8GF0PZvfQGGt2e2p K2pcU+2Y0W1lzfXAQcshvHEvuKfvUWD7PJuP26n/MRrjsJIgCAnocLM+n0+vA52KySZknO U0JY8rZ6BXHAw43iZeQCcNNBE9E4xjW+xqwBnJWdigTwp6+uiMDeWdeFELvY+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=1698154698; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1ahNXjxPJSD7vmTRLJX5AFCeete2Ruei+7rR+cX6kbM=; b=h5V8iGC2vAU985Xik2zL+JdBhgWiWIZUOmrS+hZTBwt3BKUlZa2/oh+trMrUYEPN1j4+cW 8Y1kV6yHCQKfkE99Q0736Mvglx7PPQs9xoNIQ8FpChKDO2DiJ4oh9VBRuVo/+US6wZPO3s RAvWWdb050Qux2gMqy8BE8aLPCg1rIf1oG8+mvdnR9Rklg/QSoxkC7JikN9DtWc4LOYOOo Rv1VH6845qHJaxwvdTD6M6JL7c2kXYtga/u73xeRBdiBqwwthImoqaSBRbgYWLMIjL5r54 urJrHkbD7PbOV0xbhbjV80BCMJl0pb8cuMHDkot6i3sVofNJDo1qZsakJ4lTzQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SFCn613P1z9d2; Tue, 24 Oct 2023 13:38: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 39ODcIjr089073; Tue, 24 Oct 2023 13:38:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39ODcI2Q089070; Tue, 24 Oct 2023 13:38:18 GMT (envelope-from git) Date: Tue, 24 Oct 2023 13:38:18 GMT Message-Id: <202310241338.39ODcI2Q089070@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: ab6bc4893e4d - stable/14 - arm64: Add a leaf PTP when pmap_enter(psind=1) creates a wired mapping List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: ab6bc4893e4d0d0932b023c48231c7bb63c0baf2 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=ab6bc4893e4d0d0932b023c48231c7bb63c0baf2 commit ab6bc4893e4d0d0932b023c48231c7bb63c0baf2 Author: Bojan Novković AuthorDate: 2023-10-09 00:38:08 +0000 Commit: Mark Johnston CommitDate: 2023-10-24 13:17:37 +0000 arm64: Add a leaf PTP when pmap_enter(psind=1) creates a wired mapping Let pmap_enter_l2() create wired mappings. In particular, allocate a leaf PTP for use during demotion. This is a step towards reverting commit 64087fd7f372. Reviewed by: alc, markj Sponsored by: Google, Inc. (GSoC 2023) MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D41634 (cherry picked from commit 808f5ac3c6dcbe38f505c0c843b0a10ae154e6ec) --- sys/arm64/arm64/pmap.c | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/sys/arm64/arm64/pmap.c b/sys/arm64/arm64/pmap.c index a30a037c8d4a..6f2afa0b98a3 100644 --- a/sys/arm64/arm64/pmap.c +++ b/sys/arm64/arm64/pmap.c @@ -4797,6 +4797,7 @@ pmap_enter_l2(pmap_t pmap, vm_offset_t va, pd_entry_t new_l2, u_int flags, struct spglist free; pd_entry_t *l2, old_l2; vm_page_t l2pg, mt; + vm_page_t uwptpg; PMAP_LOCK_ASSERT(pmap, MA_OWNED); KASSERT(ADDR_IS_CANONICAL(va), @@ -4864,6 +4865,24 @@ pmap_enter_l2(pmap_t pmap, vm_offset_t va, pd_entry_t new_l2, u_int flags, } } + /* + * Allocate leaf ptpage for wired userspace pages. + */ + uwptpg = NULL; + if ((new_l2 & ATTR_SW_WIRED) != 0 && pmap != kernel_pmap) { + uwptpg = vm_page_alloc_noobj(VM_ALLOC_WIRED); + if (uwptpg == NULL) { + return (KERN_RESOURCE_SHORTAGE); + } + uwptpg->pindex = pmap_l2_pindex(va); + if (pmap_insert_pt_page(pmap, uwptpg, true, false)) { + vm_page_unwire_noq(uwptpg); + vm_page_free(uwptpg); + return (KERN_RESOURCE_SHORTAGE); + } + pmap_resident_count_inc(pmap, 1); + uwptpg->ref_count = NL3PG; + } if ((new_l2 & ATTR_SW_MANAGED) != 0) { /* * Abort this mapping if its PV entry could not be created. @@ -4871,6 +4890,16 @@ pmap_enter_l2(pmap_t pmap, vm_offset_t va, pd_entry_t new_l2, u_int flags, if (!pmap_pv_insert_l2(pmap, va, new_l2, flags, lockp)) { if (l2pg != NULL) pmap_abort_ptp(pmap, va, l2pg); + if (uwptpg != NULL) { + mt = pmap_remove_pt_page(pmap, va); + KASSERT(mt == uwptpg, + ("removed pt page %p, expected %p", mt, + uwptpg)); + pmap_resident_count_dec(pmap, 1); + uwptpg->ref_count = 1; + vm_page_unwire_noq(uwptpg); + vm_page_free(uwptpg); + } CTR2(KTR_PMAP, "pmap_enter_l2: failure for va %#lx in pmap %p", va, pmap); From nobody Tue Oct 24 13:38:19 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SFCn84QS7z4y3hX; Tue, 24 Oct 2023 13:38: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 4SFCn734Mxz4Z8W; Tue, 24 Oct 2023 13:38:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698154699; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DtmhFP/B46AKxGNzcEMwR3MJDaM7gfKlb5OGe+44o80=; b=WzKqMv1fLbBlh3jrwZdEszDZz718TH3YgihET1vSCcDXUUBdjEyJh26sInhdFQ0a1YeEP7 mC3Tr5U/l8GuPMm5srwrDJamclNGDVkp34vg84d+jbDthasknYtpr9InwR1q6F+jf60oEX HMPqM+JPP/PYaJBOJur+ZWEOqD3VRa6TqaC3aQbJjRKQaI0H/yJaYVQUbmehSTyVpV9LkK 704sxtVKq0G4YIbYRJzJOeVkZnZYeeu4mL1d9gxIJ+m/B8ghSfCqbfdIcd60uE/QIIbDC3 Hvo8YMfp2+1V66B11E5xb6BV+/5+RCFp3IkZkEK2oNivA0n+K7zFMNgAznNbFQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698154699; a=rsa-sha256; cv=none; b=RHV+wYbq+7aUzWSZz9WirP3aJmu54zEa2utfuk83cm9cAxRZDgkQJAc7SRGHaYF4bIOm46 k4V5YW6btAfkmISWb43zv7RggUmvnm5XITrJQz8DS793AuaQ4WI6HNoYZRTllj5eY8FIlq MUqakDQ5snwba9tdOtYXi/xESjTSfDpuWXcavt/jx+lcK8eW5c5HR+rjTu86aGWRrgETKJ IQA8uTcdlCEGra0m6pfA2qoMtPQ/odR4c5GBDPYiirBowKz7WmclYJXmPE7jo2GYgPqs3f fnS9UbdqymCyzudX4rWIsTJK06dAzRnuaMR+6RVxnlzJL50KNWX0v+tT+Ia5+Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698154699; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DtmhFP/B46AKxGNzcEMwR3MJDaM7gfKlb5OGe+44o80=; b=N/zo1+7z4VnrdOHSPN7ssYyqagd1iMtR9nCliauzX161jX2SoQW0WxwpYxYejvuiGMqmAz xypahABGTOW0ZolZ6U+6/BzwnTViCtBF82jJ9LqEkl7Wu+B93uIbJ4NFFuBbnPjoYCaZPs KQBmFu5kA1WBwXK0ltjm+SgMl1Rmwr+78g6kNz2tu7S76v+Xpzyyesn3VC0gIZjrROTZEN DWLR2sISNxnbeda/Jv3Hak35+Q4FiDWdYLELA9g8D8iweTzCFiNQ7RZrq1SSpu2YFsJJR3 LFp9XLbwMVdU8zagbvT3AHpl79u4izSnv+bO0mkWjQraaPP2ANo6XaCjNPje2Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SFCn7232Yz9Sw; Tue, 24 Oct 2023 13:38: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 39ODcJ8k089123; Tue, 24 Oct 2023 13:38:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39ODcJZo089120; Tue, 24 Oct 2023 13:38:19 GMT (envelope-from git) Date: Tue, 24 Oct 2023 13:38:19 GMT Message-Id: <202310241338.39ODcJZo089120@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 688c44068ad9 - stable/14 - kmsan: Use __builtin_memset to initialize per-thread state List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 688c44068ad977e0714ae30e0c52ebe172309d0c Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=688c44068ad977e0714ae30e0c52ebe172309d0c commit 688c44068ad977e0714ae30e0c52ebe172309d0c Author: Mark Johnston AuthorDate: 2023-10-16 19:37:19 +0000 Commit: Mark Johnston CommitDate: 2023-10-24 13:17:44 +0000 kmsan: Use __builtin_memset to initialize per-thread state Accesses to KMSAN's TLS block are not instrumented, so there's no need to use kmsan_memset(). No functional change intended. MFC after: 1 week Sponsored by: Klara, Inc. Sponsored by: Juniper Networks, Inc. (cherry picked from commit e5caed14067b40f1454d74e99789a28508d0eea3) --- sys/kern/subr_msan.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/kern/subr_msan.c b/sys/kern/subr_msan.c index 54948370a14a..f8fdcf478b79 100644 --- a/sys/kern/subr_msan.c +++ b/sys/kern/subr_msan.c @@ -452,7 +452,7 @@ kmsan_thread_alloc(struct thread *td) sizeof(int)); mtd = malloc(sizeof(*mtd), M_KMSAN, M_WAITOK); } - kmsan_memset(mtd, 0, sizeof(*mtd)); + __builtin_memset(mtd, 0, sizeof(*mtd)); mtd->ctx = 0; if (td->td_kstack != 0) From nobody Tue Oct 24 13:38:20 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SFCnB364Rz4y3rn; Tue, 24 Oct 2023 13:38: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 4SFCn83y7kz4Z1N; Tue, 24 Oct 2023 13:38:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698154700; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Jfocy6EJJoSAWja2a5VlwkXc6dv/MZOKhCD3/8PvHX8=; b=ClP6XPkFsjMxN5ReyNBTlu2UwkgwY5dPzh0RcEPC3AhFkDTrLUQ1AzPvdUZIGyxwa2/nJp kSoJ3k7mcunAQ9poe3o3wQb5BN3iX7FrcGZyU7SCk9nFkt1NhgNjshfTLOQZj0HssHXmzE JbfFnYl2g8A0uh+hkmWv/PItrmVvAYaoq61MW6uu9g6bsBK5l3otO8W8dLiIM8TdsamXh7 cois1zpP6aZn5kqORxdsQyCfVd364ZGnu0ZsVvS2sP6Zazmxe5UacZwSLi0dq2SUi5wy0s 9SJ5JE424PMI3+pXRotVeS0nlsbROpLOKnXdvUi22B3Isu0T7WYI8fAfdTaDqA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698154700; a=rsa-sha256; cv=none; b=ejoLhUPvzI0Xntc38JNtoZTYwjy2NKfYiSAYU6BS/WH94nz7hU19X3eKXbLhfqyGvFUoqp z8vziBIugb9TdPi7I0eVcxhMN72IhGTH9EuWqH5CCOMJapDpCvx2Gyceez4xauQAU2TrE8 lfN+yFP9f/SwRZLfqn90SbTuFUeK3zd+qQfRhWcqBi/nXUyBnjnDSfRp9b4yVOHhaz/RHO bbEIiQTjsN4NCl1AzT6dnwJL3/Zh5TCFxaUgEcZLw4E8IutCqCSnc4lefSAQxZPqKze+bz 6CL+xU29a/lbgVNG3cxBQNcttv2hJ3vJuvYOynIQ/wKgtsNtVgqOOpgx5gLMQA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698154700; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Jfocy6EJJoSAWja2a5VlwkXc6dv/MZOKhCD3/8PvHX8=; b=tnEHVLSSldkn5Cb82pPHtTB3ADax5atAHURdN8b8eC+dTEPChgbB0i6UhykDO84uJnoUAV QhFGIl7P2HqZX0jDqyXLoYp9Pybr8XlBxDEDtwT9l4XZhVraEc0UAMffw3H1wzL+yPIt5E KvH/XIaWs2/QUxgNnCm2T1EVbcRKD/XogHlUBMxwK23YwqTGVnZgvCOIKL8gQ49AQN1QyU NA3QGwVVSJs5MKjrqSu9BxMvZ6IdMiDFDM1tw2X3Gs7DbfffiH0hcaDBO7pKxt1beL5ILl Qq0ovCiatwSqN0oJjAZ15o/dMg0xb5elnuWZMmNx65ZrumSSwwE5YhQIxTr7uA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SFCn83451z97D; Tue, 24 Oct 2023 13:38: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 39ODcKCr089171; Tue, 24 Oct 2023 13:38:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39ODcK2T089168; Tue, 24 Oct 2023 13:38:20 GMT (envelope-from git) Date: Tue, 24 Oct 2023 13:38:20 GMT Message-Id: <202310241338.39ODcK2T089168@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 0da34087c41c - stable/14 - geom_linux_lvm: Avoid removing from vg_list before inserting List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 0da34087c41cd3a64a5c07edfe373395bc29857f Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=0da34087c41cd3a64a5c07edfe373395bc29857f commit 0da34087c41cd3a64a5c07edfe373395bc29857f Author: Mark Johnston AuthorDate: 2023-10-17 14:25:38 +0000 Commit: Mark Johnston CommitDate: 2023-10-24 13:17:59 +0000 geom_linux_lvm: Avoid removing from vg_list before inserting PR: 266693 Reported by: Robert Morris MFC after: 1 week (cherry picked from commit 56279238b03a0ccef245b22fff7679fe35cffccc) --- sys/geom/linux_lvm/g_linux_lvm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/geom/linux_lvm/g_linux_lvm.c b/sys/geom/linux_lvm/g_linux_lvm.c index dddc3ae9184e..c63318fed729 100644 --- a/sys/geom/linux_lvm/g_linux_lvm.c +++ b/sys/geom/linux_lvm/g_linux_lvm.c @@ -512,7 +512,6 @@ g_llvm_free_vg(struct g_llvm_vg *vg) LIST_REMOVE(lv, lv_next); free(lv, M_GLLVM); } - LIST_REMOVE(vg, vg_next); free(vg, M_GLLVM); } @@ -596,7 +595,8 @@ g_llvm_destroy(struct g_llvm_vg *vg, int force) } } - g_llvm_free_vg(gp->softc); + LIST_REMOVE(vg, vg_next); + g_llvm_free_vg(vg); gp->softc = NULL; g_wither_geom(gp, ENXIO); return (0); From nobody Tue Oct 24 13:38:21 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SFCnC1tJ9z4y3hg; Tue, 24 Oct 2023 13:38: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 4SFCn95k6Sz4ZCR; Tue, 24 Oct 2023 13:38:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698154701; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Qog1XoVLl/tZs7lEXl9bInJR2Ze17WAhY7soNupSQPQ=; b=fa9nJsEz0XAKWtsPtGCr0JNSWBu39NBzqMFuVOmSwUU8F5YrvKTbljbRqRV+BPjZtK27XG fAE5A/rpPddQOM2tLE4ZK+i+sJOt8YpdMS8JmMOetnJcdLsVWrbb9FXiI5dJv6NA26n8gK C5uNeaoY8xGdp6R0aHIIH69redt2AmsJkrWmFAhULfK+8N+5gexkIiHNKfyZcweTJuA5ji 7Ctp3uIHswETnMMXbfLVFN7TFzAuVHT7Fg/Q0IoTfmRaSz/hnj7tTq1IP4ejVgranUMQGt QISK7cUZUo7GsDPqDsr9JyZBIVTtUyPV8OXX2YRACONuGNJ5+i60JUqMBYHUSg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698154701; a=rsa-sha256; cv=none; b=IYYT9k15BP+4OSLrulpqAcNk7q5YnsRjF3Rh5lyn3vY7lmw1v+fYJU9yVkVTDcxvkMKvKA nnFUzZLy7CsRg+M9KGEU3JtJRzf1YDZet7c4ZNfsdbfat4Iq6HlrNDo7pq2wGrfHFJrojc 39lyE1AZrRmf4eTuQY+c84W/9f5DUvC3g/zQQK0svUSUMlx5W60DLImf3Wg/cFqwnVIU0Z vkd2KwKQ+2roHRmzSgd41ICN21GRXDkduXPmcCoWvKTL4FaRIi61gbCbI9xQWhC8s6wI0j rX9VrVdzvj4gFeT+S0twpYJgUkISBkiZgavugCUHdAtIrxIe545yZGKQt/xYog== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698154701; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Qog1XoVLl/tZs7lEXl9bInJR2Ze17WAhY7soNupSQPQ=; b=lsJEcwEMWIr6SWd2Q/tP2Rk0Sb2wr6WHlcrpzC1/zD2eSfwzhwm211Zs8OXZ3pL2rClCjL eMk+lzkvns9qJsdcD7hPci+Yd0L7mRXacrqslBSm4cks9b62UZuxMA9wfvQTVc43wZqghd tp7fuHgHzXnWTlYhw4PkizAR91Q4vOeWRwYf+BqkbtmP+wIQFZA3zDvCt7KLrw2xkBxlJE yjtQUKieZ0rR9Hyk1SQB1+46QQA0WCdw+vlJA71KplhOoY54PXvCZmnnomj2LryOgevwYp tZ/0v84d6tobKjthniaRjBGyAGDnLfplfyHgxETiNACFOUYmVBbu6UorDQpasA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SFCn940xPz9Zc; Tue, 24 Oct 2023 13:38: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 39ODcLGf089235; Tue, 24 Oct 2023 13:38:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39ODcLMx089232; Tue, 24 Oct 2023 13:38:21 GMT (envelope-from git) Date: Tue, 24 Oct 2023 13:38:21 GMT Message-Id: <202310241338.39ODcLMx089232@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 6b107108b1c7 - stable/14 - socket tests: Clean up the MSG_TRUNC regression tests a bit List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 6b107108b1c7b49568a93cbed479ff4b37ca3024 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=6b107108b1c7b49568a93cbed479ff4b37ca3024 commit 6b107108b1c7b49568a93cbed479ff4b37ca3024 Author: Mark Johnston AuthorDate: 2023-10-16 21:35:07 +0000 Commit: Mark Johnston CommitDate: 2023-10-24 13:18:23 +0000 socket tests: Clean up the MSG_TRUNC regression tests a bit - Fix style. - Move test case-specific code out of the shared function and into the individual test cases. - Remove unneeded setting of SO_REUSEPORT. - Avoid unnecessary copying. - Use ATF_REQUIRE* instead of ATF_CHECK*. The former cause test execution to stop after a failed assertion, which is what we want. - Add a test case for AF_LOCAL/SOCK_SEQPACKET sockets. MFC after: 1 week (cherry picked from commit b5e7dbac756afb49c58315c7081737b34a1d2dfd) --- tests/sys/kern/socket_msg_trunc.c | 230 +++++++++++++++++++++----------------- 1 file changed, 128 insertions(+), 102 deletions(-) diff --git a/tests/sys/kern/socket_msg_trunc.c b/tests/sys/kern/socket_msg_trunc.c index a863705adbae..469b9e1503cd 100644 --- a/tests/sys/kern/socket_msg_trunc.c +++ b/tests/sys/kern/socket_msg_trunc.c @@ -25,143 +25,169 @@ * SUCH DAMAGE. */ -#include -#include -#include +#include #include #include #include + #include + #include +#include +#include #include static void -check_recvmsg(const char *test_name) +check_recvmsg(int cs, int ss, struct sockaddr *sa, const size_t sizes[], + size_t nsizes) { - int ss, cs, rc; - struct sockaddr *sa; - struct sockaddr_in sin; - struct sockaddr_in6 sin6; - struct sockaddr_un saun; - int *sizes, sizes_count; - int one = 1; - - - if (!strcmp(test_name, "udp")) { - ss = socket(PF_INET, SOCK_DGRAM, 0); - ATF_CHECK(ss >= 0); - rc = setsockopt(ss, SOL_SOCKET, SO_REUSEPORT, &one, sizeof(one)); - ATF_CHECK_EQ(0, rc); - bzero(&sin, sizeof(sin)); - sin.sin_family = AF_INET; - sin.sin_len = sizeof(sin); - sin.sin_port = htons(6666); - sin.sin_addr.s_addr = htonl(INADDR_LOOPBACK); - sa = (struct sockaddr *)&sin; - rc = bind(ss, sa, sa->sa_len); - ATF_CHECK_EQ(0, rc); - - cs = socket(PF_INET, SOCK_DGRAM, 0); - ATF_CHECK(cs >= 0); - int inet_sizes[] = {80, 255, 256, 1024, 4096, 9000}; - sizes_count = sizeof(inet_sizes) / sizeof(int); - sizes = malloc(sizeof(inet_sizes)); - memcpy(sizes, inet_sizes, sizeof(inet_sizes)); - - } else if (!strcmp(test_name, "udp6")) { - ss = socket(PF_INET6, SOCK_DGRAM, 0); - ATF_CHECK(ss >= 0); - rc = setsockopt(ss, SOL_SOCKET, SO_REUSEPORT, &one, sizeof(one)); - ATF_CHECK_EQ(0, rc); - bzero(&sin6, sizeof(sin6)); - sin6.sin6_family = AF_INET6; - sin6.sin6_len = sizeof(sin6); - sin6.sin6_port = htons(6666); - const struct in6_addr in6loopback = IN6ADDR_LOOPBACK_INIT; - sin6.sin6_addr = in6loopback; - sa = (struct sockaddr *)&sin6; - rc = bind(ss, sa, sa->sa_len); - ATF_CHECK_EQ(0, rc); - - cs = socket(PF_INET6, SOCK_DGRAM, 0); - ATF_CHECK(cs >= 0); - int inet_sizes[] = {80, 255, 256, 1024, 4096, 9000}; - sizes_count = sizeof(inet_sizes) / sizeof(int); - sizes = malloc(sizeof(inet_sizes)); - memcpy(sizes, inet_sizes, sizeof(inet_sizes)); - - } else if (!strcmp(test_name, "unix")) { - const char *PATH = "/tmp/test_check_recvmsg_socket"; - ss = socket(PF_UNIX, SOCK_DGRAM, 0); - ATF_CHECK(ss >= 0); - rc = setsockopt(ss, SOL_SOCKET, SO_REUSEPORT, &one, sizeof(one)); - ATF_CHECK_EQ(0, rc); - bzero(&saun, sizeof(saun)); - saun.sun_family = AF_UNIX; - strcpy(saun.sun_path, PATH); - saun.sun_len = sizeof(saun); - sa = (struct sockaddr *)&saun; - unlink(PATH); - rc = bind(ss, sa, sa->sa_len); - ATF_CHECK_EQ(0, rc); - - cs = socket(PF_UNIX, SOCK_DGRAM, 0); - ATF_CHECK(cs >= 0); - int unix_sizes[] = {80, 255, 256, 1024, 2000}; - sizes_count = sizeof(unix_sizes) / sizeof(int); - sizes = malloc(sizeof(unix_sizes)); - memcpy(sizes, unix_sizes, sizeof(unix_sizes)); - } else - return; - char buf[4096]; + memset(buf, 0xFF, sizeof(buf)); - for (int i = 0; i < sizes_count; i++) { - int sz = sizes[i]; + for (size_t i = 0; i < nsizes; i++) { + ssize_t rc; + size_t sz = sizes[i]; char tbuf[1]; + rc = sendto(cs, buf, sz, 0, sa, sa->sa_len); - ATF_REQUIRE_EQ(rc, sz); + ATF_REQUIRE_MSG(rc != -1, "sendto failed: %s", strerror(errno)); + ATF_REQUIRE((size_t)rc == sz); rc = recv(ss, NULL, 0, MSG_PEEK | MSG_TRUNC); - ATF_CHECK_EQ(rc, sz); + ATF_REQUIRE_MSG(rc >= 0, "recv failed: %s", strerror(errno)); + ATF_REQUIRE((size_t)rc == sz); rc = recv(ss, tbuf, sizeof(tbuf), MSG_PEEK | MSG_TRUNC); - ATF_CHECK_EQ(rc, sz); + ATF_REQUIRE_MSG(rc >= 0, "recv failed: %s", strerror(errno)); + ATF_REQUIRE((size_t)rc == sz); rc = recv(ss, tbuf, sizeof(tbuf), MSG_TRUNC); - ATF_CHECK_EQ(rc, sz); + ATF_REQUIRE_MSG(rc >= 0, "recv failed: %s", strerror(errno)); + ATF_REQUIRE((size_t)rc == sz); } - close(ss); - close(cs); + ATF_REQUIRE(close(cs) == 0); + ATF_REQUIRE(close(ss) == 0); } -ATF_TC_WITHOUT_HEAD(socket_afinet_udp_recv_trunc); -ATF_TC_BODY(socket_afinet_udp_recv_trunc, tc) +ATF_TC_WITHOUT_HEAD(recv_trunc_afinet_udp); +ATF_TC_BODY(recv_trunc_afinet_udp, tc) { - check_recvmsg("udp"); + struct sockaddr_in sin; + struct sockaddr *sa; + int ss, cs, rc; + + ss = socket(PF_INET, SOCK_DGRAM, 0); + ATF_REQUIRE(ss >= 0); + + memset(&sin, 0, sizeof(sin)); + sin.sin_family = AF_INET; + sin.sin_len = sizeof(sin); + sin.sin_port = htons(6666); + sin.sin_addr.s_addr = htonl(INADDR_LOOPBACK); + sa = (struct sockaddr *)&sin; + rc = bind(ss, sa, sa->sa_len); + ATF_REQUIRE_MSG(rc == 0, "bind failed: %s", strerror(errno)); + + cs = socket(PF_INET, SOCK_DGRAM, 0); + ATF_REQUIRE(cs >= 0); + + size_t sizes[] = {80, 255, 256, 1024, 4096, 9000}; + check_recvmsg(cs, ss, sa, sizes, nitems(sizes)); } -ATF_TC_WITHOUT_HEAD(socket_afinet6_udp_recv_trunc); -ATF_TC_BODY(socket_afinet6_udp_recv_trunc, tc) +ATF_TC_WITHOUT_HEAD(recv_trunc_afinet6_udp); +ATF_TC_BODY(recv_trunc_afinet6_udp, tc) { - check_recvmsg("udp6"); + struct sockaddr_in6 sin6; + struct sockaddr *sa; + int cs, ss, rc; + + ss = socket(PF_INET6, SOCK_DGRAM, 0); + ATF_REQUIRE(ss >= 0); + + memset(&sin6, 0, sizeof(sin6)); + sin6.sin6_family = AF_INET6; + sin6.sin6_len = sizeof(sin6); + sin6.sin6_port = htons(6666); + const struct in6_addr in6loopback = IN6ADDR_LOOPBACK_INIT; + sin6.sin6_addr = in6loopback; + sa = (struct sockaddr *)&sin6; + rc = bind(ss, sa, sa->sa_len); + ATF_REQUIRE_MSG(rc == 0, "bind failed: %s", strerror(errno)); + + cs = socket(PF_INET6, SOCK_DGRAM, 0); + ATF_REQUIRE(cs >= 0); + + size_t sizes[] = {80, 255, 256, 1024, 4096, 9000}; + check_recvmsg(cs, ss, sa, sizes, nitems(sizes)); } -ATF_TC_WITHOUT_HEAD(socket_afunix_recv_trunc); -ATF_TC_BODY(socket_afunix_recv_trunc, tc) +ATF_TC_WITHOUT_HEAD(recv_trunc_afunix_dgram); +ATF_TC_BODY(recv_trunc_afunix_dgram, tc) { - check_recvmsg("unix"); + struct sockaddr_un sun; + struct sockaddr *sa; + int ss, cs, rc; + + ss = socket(PF_UNIX, SOCK_DGRAM, 0); + ATF_REQUIRE(ss >= 0); + + bzero(&sun, sizeof(sun)); + sun.sun_family = AF_UNIX; + strlcpy(sun.sun_path, "test_check_recvmsg_socket", sizeof(sun.sun_path)); + sun.sun_len = sizeof(sun); + sa = (struct sockaddr *)&sun; + rc = bind(ss, sa, sa->sa_len); + ATF_REQUIRE_MSG(rc == 0, "bind failed: %s", strerror(errno)); + + cs = socket(PF_UNIX, SOCK_DGRAM, 0); + ATF_REQUIRE(cs >= 0); + + size_t sizes[] = {80, 255, 256, 1024, 2000}; + check_recvmsg(cs, ss, sa, sizes, nitems(sizes)); } +ATF_TC_WITHOUT_HEAD(recv_trunc_afunix_seqpacket); +ATF_TC_BODY(recv_trunc_afunix_seqpacket, tc) +{ + struct sockaddr_un sun; + struct sockaddr *sa; + int ss, nss, cs, rc; + + ss = socket(PF_UNIX, SOCK_SEQPACKET, 0); + ATF_REQUIRE(ss >= 0); + + bzero(&sun, sizeof(sun)); + sun.sun_family = AF_UNIX; + strlcpy(sun.sun_path, "test_check_recvmsg_socket", sizeof(sun.sun_path)); + sun.sun_len = sizeof(sun); + sa = (struct sockaddr *)&sun; + rc = bind(ss, sa, sa->sa_len); + ATF_REQUIRE_MSG(rc == 0, "bind failed: %s", strerror(errno)); + rc = listen(ss, 1); + ATF_REQUIRE_MSG(rc == 0, "listen failed: %s", strerror(errno)); + + cs = socket(PF_UNIX, SOCK_SEQPACKET, 0); + ATF_REQUIRE(cs >= 0); + rc = connect(cs, sa, sa->sa_len); + ATF_REQUIRE_MSG(rc == 0, "connect failed: %s", strerror(errno)); + nss = accept(ss, NULL, NULL); + ATF_REQUIRE(nss >= 0); + + size_t sizes[] = {80, 255, 256, 1024, 2000}; + check_recvmsg(cs, nss, sa, sizes, nitems(sizes)); + + ATF_REQUIRE(close(ss) == 0); +} ATF_TP_ADD_TCS(tp) { + ATF_TP_ADD_TC(tp, recv_trunc_afinet_udp); + ATF_TP_ADD_TC(tp, recv_trunc_afinet6_udp); + ATF_TP_ADD_TC(tp, recv_trunc_afunix_dgram); + ATF_TP_ADD_TC(tp, recv_trunc_afunix_seqpacket); - ATF_TP_ADD_TC(tp, socket_afinet_udp_recv_trunc); - ATF_TP_ADD_TC(tp, socket_afinet6_udp_recv_trunc); - ATF_TP_ADD_TC(tp, socket_afunix_recv_trunc); - - return atf_no_error(); + return (atf_no_error()); } From nobody Tue Oct 24 13:38:22 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SFCnC72RBz4y3vs; Tue, 24 Oct 2023 13:38: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 4SFCnB5cJTz4YyH; Tue, 24 Oct 2023 13:38:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698154702; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CMm/U0yz4ALoUfw8omkKQAdMawvO8RMEssCxZRL9oMU=; b=X8BUb2AEzXA0qc1eH2axbJxPl9tjZG8j56d9JXEnYFIVeQ5+koyFyd5XRRNqioXL/craZ0 bJzPaUdBiwDEnR8XLqoVlUcK0FN6SES0lcDZDCp+5FZZsEbStAfPA7bgP28+uISh4LxeSu iim4N3hKvS6SYJvH4Kh6XlIDrVcm861Gq1AktXJUwgyx4/9sf/hWk7RyqHYjSW2z/wHAJ+ l7EQm+i0PUIaQq9rVSAJZLfB9hmVXTjXOoqUM9i3iqm5SoWU4WknVkAeaZxFYnk7g/w8N0 NT7/7Q6drVXH2dg/u6/dgkfAVLKEIK/lNQKjTjoqQnC3j9CNA2v8wcPTVtYumA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698154702; a=rsa-sha256; cv=none; b=hZrWn/b4JGUuzOjLgeMr7oVsoA1EAocbOb5E0mkKizR6uOu8XQwPCyCZq0mLa5miN0Ag+J dWNbqmO4OAH/woc0Y1lQrHlI63uZmDUbMKsQPNxPan82rpQ5WjBucWWhamMxiWZa90/Nnd Es+oIKB3uO6TtwSG7X/7lwF8DPgcvlqwrJMSK3KeCK6hpoJgdKy4lT2JHKzEQCPYchbvWC 3a8BuiLmS65aLvBjVyU+cH6/4BlWXqJMIt6KrbtA7u/8k7sEFLU+6PZOXKDvPzrqv6LYSp 1H4dQlriqSIEWr+HuAJ76zAXXyr5E085SKGopn9bFZf65k1vRG3YYFbfmmFx0A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698154702; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CMm/U0yz4ALoUfw8omkKQAdMawvO8RMEssCxZRL9oMU=; b=MFinDdvdGwkHOgRpn8xH7p0VDTiiGGM2a24kraWIC3XxkQ9OaV6bBZRgat+1xEMs/8NVMb NhtSj2lkV2bXeMeLWjlO5I2oKUFO/t9w7RWxusmDqYduHzE40HvKrWGrmK2JjweUdblk/S 6GHRZN2G8T+ZxfTHjHguBBg9m+NsGV0TXKV2YfLmumgUjNAfcaDbJ/oDs9qa1K9alD5HDZ GJeLIsvnMBNFdEvgTOWCnwGqKZIeDfC9mgjc1zVu9sGN1IPJ0owDjSBg8v/EI8XfX2kL73 hIV8ywtEqebtc7sY5GXmZH5Ko+rYbrJRi/jlS6zBqK0iCS1xCWHnM4pGs1Ld5Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SFCnB4k7Zz9P6; Tue, 24 Oct 2023 13:38: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 39ODcM88089286; Tue, 24 Oct 2023 13:38:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39ODcMLu089283; Tue, 24 Oct 2023 13:38:22 GMT (envelope-from git) Date: Tue, 24 Oct 2023 13:38:22 GMT Message-Id: <202310241338.39ODcMLu089283@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: f79b01d323c0 - stable/14 - socket tests: Add a regression test for ktrace+recv(MSG_TRUNC) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: f79b01d323c04e5530956ee071faff7b2ec5ec33 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=f79b01d323c04e5530956ee071faff7b2ec5ec33 commit f79b01d323c04e5530956ee071faff7b2ec5ec33 Author: Mark Johnston AuthorDate: 2023-10-16 22:23:36 +0000 Commit: Mark Johnston CommitDate: 2023-10-24 13:18:39 +0000 socket tests: Add a regression test for ktrace+recv(MSG_TRUNC) MFC after: 1 week (cherry picked from commit d8735eb7acc0613fd19f74a49d3bdcb7ed0e9b0e) --- tests/sys/kern/socket_msg_trunc.c | 57 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) diff --git a/tests/sys/kern/socket_msg_trunc.c b/tests/sys/kern/socket_msg_trunc.c index 469b9e1503cd..279170158643 100644 --- a/tests/sys/kern/socket_msg_trunc.c +++ b/tests/sys/kern/socket_msg_trunc.c @@ -27,11 +27,13 @@ #include #include +#include #include #include #include +#include #include #include #include @@ -182,12 +184,67 @@ ATF_TC_BODY(recv_trunc_afunix_seqpacket, tc) ATF_REQUIRE(close(ss) == 0); } +/* + * Exercise the case where ktrace was used to dump a truncated buffer. + */ +ATF_TC_WITHOUT_HEAD(recvmsg_trunc_ktrace_uio); +ATF_TC_BODY(recvmsg_trunc_ktrace_uio, tc) +{ + struct ktr_header ktr; + struct msghdr msg; + struct iovec iov; + const char *tracepath; + char buf[128]; + ssize_t nbytes; + int error, fd, sd[2]; + + tracepath = "ktrace"; + + error = socketpair(AF_UNIX, SOCK_DGRAM, 0, sd); + ATF_REQUIRE(error == 0); + + memset(buf, 0, sizeof(buf)); + nbytes = send(sd[0], buf, sizeof(buf), 0); + ATF_REQUIRE_MSG(nbytes >= 0, "send failed: %s", strerror(errno)); + ATF_REQUIRE((size_t)nbytes == sizeof(buf)); + + fd = open(tracepath, O_RDWR | O_CREAT | O_TRUNC, 0644); + ATF_REQUIRE_MSG(fd >= 0, "open failed: %s", strerror(errno)); + error = ktrace(tracepath, KTROP_SET, KTRFAC_GENIO, getpid()); + ATF_REQUIRE_MSG(error == 0, + "ktrace(SET) failed: %s", strerror(errno)); + + iov.iov_base = buf; + iov.iov_len = sizeof(buf) - 1; /* truncate */ + memset(&msg, 0, sizeof(msg)); + msg.msg_iov = &iov; + msg.msg_iovlen = 1; + nbytes = recvmsg(sd[1], &msg, MSG_TRUNC); + ATF_REQUIRE_MSG(nbytes >= 0, "recvmsg failed: %s", strerror(errno)); + ATF_REQUIRE((size_t)nbytes == sizeof(buf)); + ATF_REQUIRE((msg.msg_flags & MSG_TRUNC) != 0); + + error = ktrace(tracepath, KTROP_CLEARFILE, 0, getpid()); + ATF_REQUIRE_MSG(error == 0, + "ktrace(CLEARFILE) failed: %s", strerror(errno)); + + nbytes = read(fd, &ktr, sizeof(ktr)); + ATF_REQUIRE_MSG(nbytes >= 0, "read failed: %s", strerror(errno)); + ATF_REQUIRE((size_t)nbytes == sizeof(ktr)); + ATF_REQUIRE_MSG((ktr.ktr_type & ~KTR_TYPE) == KTR_GENIO); + + ATF_REQUIRE(close(fd) == 0); + ATF_REQUIRE(close(sd[0]) == 0); + ATF_REQUIRE(close(sd[1]) == 0); +} + ATF_TP_ADD_TCS(tp) { ATF_TP_ADD_TC(tp, recv_trunc_afinet_udp); ATF_TP_ADD_TC(tp, recv_trunc_afinet6_udp); ATF_TP_ADD_TC(tp, recv_trunc_afunix_dgram); ATF_TP_ADD_TC(tp, recv_trunc_afunix_seqpacket); + ATF_TP_ADD_TC(tp, recvmsg_trunc_ktrace_uio); return (atf_no_error()); } From nobody Tue Oct 24 13:38:23 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SFCnD2gWfz4y3b3; Tue, 24 Oct 2023 13:38:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SFCnC6rFKz4ZFj; Tue, 24 Oct 2023 13:38:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698154704; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/P+JSEfIXmRfaDnYxB+gPSO8TF13cyj+3Dngq5J+XPM=; b=i2lL4PIu+lhb9dXbMKEtz5uJYM6qYAmd0ciHE2f1ZxR+C7B4365y3V1LqWQBg5KQzwl5Bs BR3PXTutZlBQrukJy5zpVTTLt+8rB+x0BNYYRhPJZ2F81gYKbWa0qCocDFehCFewkl1rnu siUAYhKrJCCC8aONoqXp9qpoBlmfeEWkDQnXwPXSOOyIK03kFWH4kEE8pkT93PiRLPD4Qg eaButyMU/sUMWCmwW4NYY8DaUK57culRRdIQm4FkwmDvwDVKZhmdVBhR3FfOCY8f6cJcnT SfPZ5Zbj7+G9b4FbQXoMy668RCSenhiPQhZXUHcv49vRxhjbc7zLYEfsFfMVKQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698154704; a=rsa-sha256; cv=none; b=Vd6WZ6TEr5ZmL0sRgOLKv7VLETx9Go3pI/dhNirrQOr/WbTgIjZCH/QW1ZzY4CpCax8a+I QOFNFRwJX0IyV0oItPej/k+fWqwsMg6URjrQxwgu0xkiU2aFodvdGpw6Q/ZiBdnRLUMOC0 +3FWxvhL95T++83wiR1+TLnXAr4e/Nbn5lUbIjSUIkuNuH6wK89WYRjWvswvLDRyPENFUj wQRRDx9Pp3gXWsyvK608bkNO7rUFOR85luzK5Tf7ZMhEGvenKtr6h+BSiaUvqiCrWas+vs +ubnErXPviMqH+UN4E6xKd1pb2GDOG7xhP1YH/g183+6aPpsvk+GPoW9p82eDw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698154704; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/P+JSEfIXmRfaDnYxB+gPSO8TF13cyj+3Dngq5J+XPM=; b=Q44xNFfcfYSWZY0k7Iebyg094dzqE6oAeq5zjX7+Ern5y/Q8t3CMyq2WbI7VJ2oG/LzIPE DgP2dYtjI8bH7JNVisufk2qhvOEl1ddtrE/obLsO/RvC/GR0Luuo6TflRyvwVJDjFU/aLJ Oua4xrZCrIDfbsHwXbM+hlUjo8woZp8Wbw8kD8ZsiqKoY36cnfJLN8LFWXS0i8qrlkNFUm owfnb55o+6IwTz7EfWCVmDQjit3SeY0RpOZD+Q+O+lXQFNF/lD4Hrt02xjzS20sPj+rZCH +njPKYDdO8pv/kQW1qKFmloK6uyAEq8Pp8hiAiJ7bcr7QtbANwGBjgfgchJLaA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SFCnC5yFDz97F; Tue, 24 Oct 2023 13:38: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 39ODcNSn089325; Tue, 24 Oct 2023 13:38:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39ODcNFq089322; Tue, 24 Oct 2023 13:38:23 GMT (envelope-from git) Date: Tue, 24 Oct 2023 13:38:23 GMT Message-Id: <202310241338.39ODcNFq089322@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 2d49b111a312 - stable/14 - uiomove: Add some assertions List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 2d49b111a312469447776e1b68fbea2a644249c8 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=2d49b111a312469447776e1b68fbea2a644249c8 commit 2d49b111a312469447776e1b68fbea2a644249c8 Author: Mark Johnston AuthorDate: 2023-10-16 20:12:37 +0000 Commit: Mark Johnston CommitDate: 2023-10-24 13:19:01 +0000 uiomove: Add some assertions Make sure that we don't try to copy with a negative resid. Make sure that we don't walk off the end of the iovec array. Reviewed by: kib MFC after: 1 week Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D42098 (cherry picked from commit 8fd0ec53deaad34383d4b344714b74d67105b258) --- sys/amd64/amd64/uio_machdep.c | 6 ++++++ sys/arm/arm/uio_machdep.c | 6 ++++++ sys/arm64/arm64/uio_machdep.c | 6 ++++++ sys/i386/i386/uio_machdep.c | 6 ++++++ sys/kern/subr_uio.c | 5 +++++ sys/powerpc/powerpc/uio_machdep.c | 5 +++++ sys/riscv/riscv/uio_machdep.c | 6 ++++++ 7 files changed, 40 insertions(+) diff --git a/sys/amd64/amd64/uio_machdep.c b/sys/amd64/amd64/uio_machdep.c index f3e80addc92c..67e14d8e0d12 100644 --- a/sys/amd64/amd64/uio_machdep.c +++ b/sys/amd64/amd64/uio_machdep.c @@ -71,10 +71,16 @@ uiomove_fromphys(vm_page_t ma[], vm_offset_t offset, int n, struct uio *uio) ("uiomove_fromphys: mode")); KASSERT(uio->uio_segflg != UIO_USERSPACE || uio->uio_td == curthread, ("uiomove_fromphys proc")); + KASSERT(uio->uio_resid >= 0, + ("%s: uio %p resid underflow", __func__, uio)); + save = td->td_pflags & TDP_DEADLKTREAT; td->td_pflags |= TDP_DEADLKTREAT; mapped = false; while (n > 0 && uio->uio_resid) { + KASSERT(uio->uio_iovcnt > 0, + ("%s: uio %p iovcnt underflow", __func__, uio)); + iov = uio->uio_iov; cnt = iov->iov_len; if (cnt == 0) { diff --git a/sys/arm/arm/uio_machdep.c b/sys/arm/arm/uio_machdep.c index 07531f76217b..18661ebd1652 100644 --- a/sys/arm/arm/uio_machdep.c +++ b/sys/arm/arm/uio_machdep.c @@ -72,9 +72,15 @@ uiomove_fromphys(vm_page_t ma[], vm_offset_t offset, int n, struct uio *uio) ("uiomove_fromphys: mode")); KASSERT(uio->uio_segflg != UIO_USERSPACE || uio->uio_td == curthread, ("uiomove_fromphys proc")); + KASSERT(uio->uio_resid >= 0, + ("%s: uio %p resid underflow", __func__, uio)); + save = td->td_pflags & TDP_DEADLKTREAT; td->td_pflags |= TDP_DEADLKTREAT; while (n > 0 && uio->uio_resid) { + KASSERT(uio->uio_iovcnt > 0, + ("%s: uio %p iovcnt underflow", __func__, uio)); + iov = uio->uio_iov; cnt = iov->iov_len; if (cnt == 0) { diff --git a/sys/arm64/arm64/uio_machdep.c b/sys/arm64/arm64/uio_machdep.c index f9e4e7a9547f..4fdcaf74890c 100644 --- a/sys/arm64/arm64/uio_machdep.c +++ b/sys/arm64/arm64/uio_machdep.c @@ -69,10 +69,16 @@ uiomove_fromphys(vm_page_t ma[], vm_offset_t offset, int n, struct uio *uio) ("uiomove_fromphys: mode")); KASSERT(uio->uio_segflg != UIO_USERSPACE || uio->uio_td == curthread, ("uiomove_fromphys proc")); + KASSERT(uio->uio_resid >= 0, + ("%s: uio %p resid underflow", __func__, uio)); + save = td->td_pflags & TDP_DEADLKTREAT; td->td_pflags |= TDP_DEADLKTREAT; mapped = false; while (n > 0 && uio->uio_resid) { + KASSERT(uio->uio_iovcnt > 0, + ("%s: uio %p iovcnt underflow", __func__, uio)); + iov = uio->uio_iov; cnt = iov->iov_len; if (cnt == 0) { diff --git a/sys/i386/i386/uio_machdep.c b/sys/i386/i386/uio_machdep.c index 07d71eac5db6..92e067b35bed 100644 --- a/sys/i386/i386/uio_machdep.c +++ b/sys/i386/i386/uio_machdep.c @@ -71,9 +71,15 @@ uiomove_fromphys(vm_page_t ma[], vm_offset_t offset, int n, struct uio *uio) ("uiomove_fromphys: mode")); KASSERT(uio->uio_segflg != UIO_USERSPACE || uio->uio_td == curthread, ("uiomove_fromphys proc")); + KASSERT(uio->uio_resid >= 0, + ("%s: uio %p resid underflow", __func__, uio)); + save = td->td_pflags & TDP_DEADLKTREAT; td->td_pflags |= TDP_DEADLKTREAT; while (n > 0 && uio->uio_resid) { + KASSERT(uio->uio_iovcnt > 0, + ("%s: uio %p iovcnt underflow", __func__, uio)); + iov = uio->uio_iov; cnt = iov->iov_len; if (cnt == 0) { diff --git a/sys/kern/subr_uio.c b/sys/kern/subr_uio.c index 21a1f044db54..b0c4a256cd17 100644 --- a/sys/kern/subr_uio.c +++ b/sys/kern/subr_uio.c @@ -216,6 +216,8 @@ uiomove_faultflag(void *cp, int n, struct uio *uio, int nofault) ("uiomove: mode")); KASSERT(uio->uio_segflg != UIO_USERSPACE || uio->uio_td == curthread, ("uiomove proc")); + KASSERT(uio->uio_resid >= 0, + ("%s: uio %p resid underflow", __func__, uio)); if (uio->uio_segflg == UIO_USERSPACE) { newflags = TDP_DEADLKTREAT; @@ -234,6 +236,9 @@ uiomove_faultflag(void *cp, int n, struct uio *uio, int nofault) } while (n > 0 && uio->uio_resid) { + KASSERT(uio->uio_iovcnt > 0, + ("%s: uio %p iovcnt underflow", __func__, uio)); + iov = uio->uio_iov; cnt = iov->iov_len; if (cnt == 0) { diff --git a/sys/powerpc/powerpc/uio_machdep.c b/sys/powerpc/powerpc/uio_machdep.c index 679139a96e99..5de2dd8b416b 100644 --- a/sys/powerpc/powerpc/uio_machdep.c +++ b/sys/powerpc/powerpc/uio_machdep.c @@ -75,10 +75,15 @@ uiomove_fromphys(vm_page_t ma[], vm_offset_t offset, int n, struct uio *uio) ("uiomove_fromphys: mode")); KASSERT(uio->uio_segflg != UIO_USERSPACE || uio->uio_td == curthread, ("uiomove_fromphys proc")); + KASSERT(uio->uio_resid >= 0, + ("%s: uio %p resid underflow", __func__, uio)); save = td->td_pflags & TDP_DEADLKTREAT; td->td_pflags |= TDP_DEADLKTREAT; while (n > 0 && uio->uio_resid) { + KASSERT(uio->uio_iovcnt > 0, + ("%s: uio %p iovcnt underflow", __func__, uio)); + iov = uio->uio_iov; cnt = iov->iov_len; if (cnt == 0) { diff --git a/sys/riscv/riscv/uio_machdep.c b/sys/riscv/riscv/uio_machdep.c index 86a39be12cdb..e2f82974b2e9 100644 --- a/sys/riscv/riscv/uio_machdep.c +++ b/sys/riscv/riscv/uio_machdep.c @@ -69,10 +69,16 @@ uiomove_fromphys(vm_page_t ma[], vm_offset_t offset, int n, struct uio *uio) ("uiomove_fromphys: mode")); KASSERT(uio->uio_segflg != UIO_USERSPACE || uio->uio_td == curthread, ("uiomove_fromphys proc")); + KASSERT(uio->uio_resid >= 0, + ("%s: uio %p resid underflow", __func__, uio)); + save = td->td_pflags & TDP_DEADLKTREAT; td->td_pflags |= TDP_DEADLKTREAT; mapped = false; while (n > 0 && uio->uio_resid) { + KASSERT(uio->uio_iovcnt > 0, + ("%s: uio %p iovcnt underflow", __func__, uio)); + iov = uio->uio_iov; cnt = iov->iov_len; if (cnt == 0) { From nobody Tue Oct 24 13:38:24 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SFCnF1dDlz4y3ry; Tue, 24 Oct 2023 13:38:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SFCnF0z83z4ZDB; Tue, 24 Oct 2023 13:38:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698154705; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=b88HxLwJcZljTYyi4Rhs7GAzLlg40PQYukYnP+AU7TM=; b=cS2DD7h96eTnuPjGalNaTLdinACuEnSTDlXVU+LoQwz4sil+/wuMne/MI3Niuhgi5pm3LK W0Qo7R+u3WjsM529FoFQgCaECh4Gp9/T5O9AlTXoimUQgakwj9tu3yfTKLkxJ8vt3Ghsfc kRzocHTuR68GSQwgUzFD9H9hA+QMiIPDnLO7YRtJlX3+4uYSOAHE+pMV59Gs8Nxk4irlpr 2mNrDYeA0kJZUTWT8kc8xJPuJ+SnEqxRMEv+hh8HJsfQ1aGV32psIoJxKo4xILWREjkkt5 lckE79ypbSSGR5gmvmvPZ+0Qf3ga+HcG8sVjJn2cZvD4Bg23kU2foxLQk0rPlg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698154705; a=rsa-sha256; cv=none; b=lCItAJM6jHxZbS6IWofmwyATtGCoFWN3lVNMBAp1PS+I4x2ceccUR6BBAgj4ugIWjgvJgw Fu/yw6lwJfEHo4LMzRC3d7Cdh+hXrySOwEcpv3LCX3RgD2FOK8Czs9UP6bXBVOYRcbYnfv s2RBhve3VzwNnvGYd3WeWXERGtE12MiRny+L7aQFCifQ7FB6d6coTqtgZT+t1A4Lddk9gQ OCiBTy5x6wxDqw72z/Afa9AP3uxYgtmbLyBDPkHXqXpKzT322l8YXK5ajt6MNViMauT082 M9nS5EmxmGLt/RZzwJ9BIFDGTbGvQq0ymojVINPtiJpmCXkQA4k1hW8AobviZw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698154705; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=b88HxLwJcZljTYyi4Rhs7GAzLlg40PQYukYnP+AU7TM=; b=VH70uTxOqPlyuKIl+EkDcwEnYqC5KQ2hcQCeL8tHFA89/GnYTa91BsDQnPrkbni2y5rF8p p7TA4o4z9l1mwjnr0GJq2ZstJaktrJkEWk/SOm3kRCzKDc/bmqBpgX7j08CZ/HtsoV5R+v aJkyeWPQAkj7g5HgbDKmqhVXGWtLHex+cDztAyPq97KI1L4/XYKOY2pWcV71ZPAI03fCcI aMwExPXz+QakUcEjShVMHJFFNDLDBzWCHT6uh0Q2g3YiurHVuFOv6NsUBvawDcaLkVStoD E/H/k2Gqgp6kZXeTRMSdwcBpTdgieSsztLBGZjfCT03ahOxuHFEg+X3IuZfizw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SFCnF01gJz9Sx; Tue, 24 Oct 2023 13:38:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39ODcO9m089386; Tue, 24 Oct 2023 13:38:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39ODcONY089383; Tue, 24 Oct 2023 13:38:24 GMT (envelope-from git) Date: Tue, 24 Oct 2023 13:38:24 GMT Message-Id: <202310241338.39ODcONY089383@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 4b1770ef487d - stable/14 - netinet tests: Add error handling tests for UDP with v4-mapped sockets List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 4b1770ef487d543b083ffea614f12edb3fb36a9d Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=4b1770ef487d543b083ffea614f12edb3fb36a9d commit 4b1770ef487d543b083ffea614f12edb3fb36a9d Author: Mark Johnston AuthorDate: 2023-10-17 14:29:42 +0000 Commit: Mark Johnston CommitDate: 2023-10-24 13:19:46 +0000 netinet tests: Add error handling tests for UDP with v4-mapped sockets This provides a regression test for commit abca3ae7734f. Add it to the existing v4-mapped address test file, and rename accordingly. Reviewed by: tuexen, karels, rrs MFC after: 1 week Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D39216 (cherry picked from commit ae5c3dfd3e75bb287984947359d4f958aea505ec) --- ObsoleteFiles.inc | 3 + tests/sys/netinet/Makefile | 2 +- ...p6_v4mapped_bind_test.c => ip6_v4mapped_test.c} | 81 +++++++++++++++++++--- 3 files changed, 76 insertions(+), 10 deletions(-) diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index 6a5e4e39fc1e..dbb4eda24416 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -51,6 +51,9 @@ # xargs -n1 | sort | uniq -d; # done +# 20231006: rename tcp6_v4unmapped_bind_test +OLD_FILES+=usr/tests/sys/netinet/tcp6_v4unmapped_bind_test + # 20231013: Man pages renamed to match the actual functions OLD_FILES+=usr/share/man/man9/cr_seeothergids.9.gz OLD_FILES+=usr/share/man/man9/cr_seeotheruids.9.gz diff --git a/tests/sys/netinet/Makefile b/tests/sys/netinet/Makefile index 144754acfbcc..44f76508bf5c 100644 --- a/tests/sys/netinet/Makefile +++ b/tests/sys/netinet/Makefile @@ -7,9 +7,9 @@ BINDIR= ${TESTSDIR} TESTS_SUBDIRS+= libalias ATF_TESTS_C= ip_reass_test \ + ip6_v4mapped_test \ so_reuseport_lb_test \ socket_afinet \ - tcp6_v4mapped_bind_test \ tcp_connect_port_test \ tcp_md5_getsockopt diff --git a/tests/sys/netinet/tcp6_v4mapped_bind_test.c b/tests/sys/netinet/ip6_v4mapped_test.c similarity index 81% rename from tests/sys/netinet/tcp6_v4mapped_bind_test.c rename to tests/sys/netinet/ip6_v4mapped_test.c index c7fc682d7ae7..d4c4ed526ab5 100644 --- a/tests/sys/netinet/tcp6_v4mapped_bind_test.c +++ b/tests/sys/netinet/ip6_v4mapped_test.c @@ -194,17 +194,15 @@ restore_portrange(void) "failed while restoring value"); } -ATF_TC_WITH_CLEANUP(v4mapped); -ATF_TC_HEAD(v4mapped, tc) +ATF_TC_WITH_CLEANUP(tcp_v4mapped_bind); +ATF_TC_HEAD(tcp_v4mapped_bind, tc) { - /* root is only required for sysctls (setup and cleanup). */ atf_tc_set_md_var(tc, "require.user", "root"); atf_tc_set_md_var(tc, "require.config", "allow_sysctl_side_effects"); atf_tc_set_md_var(tc, "descr", "Check local port assignment with bind and mapped V4 addresses"); } - /* * Create a listening IPv4 socket, then connect to it repeatedly using a * bound IPv6 socket using a v4 mapped address. With a small port range, @@ -213,7 +211,7 @@ ATF_TC_HEAD(v4mapped, tc) * and then the connect would fail with EADDRINUSE. Make sure we get * the right error. */ -ATF_TC_BODY(v4mapped, tc) +ATF_TC_BODY(tcp_v4mapped_bind, tc) { union { struct sockaddr saddr; @@ -315,17 +313,82 @@ ATF_TC_BODY(v4mapped, tc) ATF_REQUIRE_MSG(i >= 1, "No successful connections"); ATF_REQUIRE_MSG(got_bind_error == true, "No expected bind error"); } +ATF_TC_CLEANUP(tcp_v4mapped_bind, tc) +{ + restore_portrange(); +} -ATF_TC_CLEANUP(v4mapped, tc) +ATF_TC(udp_v4mapped_sendto); +ATF_TC_HEAD(udp_v4mapped_sendto, tc) +{ + atf_tc_set_md_var(tc, "descr", + "Validate sendto() with a v4-mapped address and a v6-only socket"); +} +ATF_TC_BODY(udp_v4mapped_sendto, tc) { + struct addrinfo ai_hint, *aip; + struct sockaddr_in sin; + struct sockaddr_in6 sin6; + ssize_t n; + socklen_t salen; + int error, ls, s, zero; + short port; + char ch; - restore_portrange(); + ls = socket(PF_INET, SOCK_DGRAM, 0); + ATF_REQUIRE(ls >= 0); + + memset(&ai_hint, 0, sizeof(ai_hint)); + ai_hint.ai_family = AF_INET; + ai_hint.ai_flags = AI_NUMERICHOST; + error = getaddrinfo("127.0.0.1", NULL, &ai_hint, &aip); + ATF_REQUIRE_MSG(error == 0, "getaddrinfo: %s", gai_strerror(error)); + memcpy(&sin, aip->ai_addr, sizeof(sin)); + + error = bind(ls, (struct sockaddr *)&sin, sizeof(sin)); + ATF_REQUIRE_MSG(error == 0, "bind: %s", strerror(errno)); + salen = sizeof(sin); + error = getsockname(ls, (struct sockaddr *)&sin, &salen); + ATF_REQUIRE_MSG(error == 0, + "getsockname() for listen socket failed: %s", strerror(errno)); + ATF_REQUIRE_MSG(salen == sizeof(struct sockaddr_in), + "unexpected sockaddr size"); + port = sin.sin_port; + + s = socket(PF_INET6, SOCK_DGRAM, 0); + ATF_REQUIRE(s >= 0); + + memset(&ai_hint, 0, sizeof(ai_hint)); + ai_hint.ai_family = AF_INET6; + ai_hint.ai_flags = AI_NUMERICHOST | AI_V4MAPPED; + error = getaddrinfo("127.0.0.1", NULL, &ai_hint, &aip); + ATF_REQUIRE_MSG(error == 0, "getaddrinfo: %s", gai_strerror(error)); + memcpy(&sin6, aip->ai_addr, sizeof(sin6)); + sin6.sin6_port = port; + + ch = 0x42; + n = sendto(s, &ch, 1, 0, (struct sockaddr *)&sin6, sizeof(sin6)); + ATF_REQUIRE_ERRNO(EINVAL, n == -1); + + zero = 0; + error = setsockopt(s, IPPROTO_IPV6, IPV6_V6ONLY, &zero, sizeof(zero)); + ATF_REQUIRE_MSG(error == 0, + "setsockopt(IPV6_V6ONLY) failed: %s", strerror(errno)); + + ch = 0x42; + n = sendto(s, &ch, 1, 0, (struct sockaddr *)&sin6, sizeof(sin6)); + ATF_REQUIRE_MSG(n == 1, "sendto() failed: %s", strerror(errno)); + + ch = 0; + n = recv(ls, &ch, 1, 0); + ATF_REQUIRE_MSG(n == 1, "recv() failed: %s", strerror(errno)); + ATF_REQUIRE(ch == 0x42); } ATF_TP_ADD_TCS(tp) { - ATF_TP_ADD_TC(tp, v4mapped); + ATF_TP_ADD_TC(tp, tcp_v4mapped_bind); + ATF_TP_ADD_TC(tp, udp_v4mapped_sendto); return (atf_no_error()); } - From nobody Tue Oct 24 13:38:26 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SFCnG52stz4y3kv; Tue, 24 Oct 2023 13:38:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SFCnG1whtz4Z9X; Tue, 24 Oct 2023 13:38:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698154706; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pK1CQ54p4cX03b/cMFzudOcxD8q1i528fdun0pGwdlU=; b=CrXSakiKWdQGoYMInFsW/PUgRr06RbG2x/a6GppanKBfMIyGTga6PdSSW0DT2f++z2XyW+ h/7ddBU8y8KC36MPYXRDUzicJhOp65pIUwGOVvB37n6Qp8l8/D0bHT18Lu1iXQf1CD+YV3 PTQwoXFeLICPRhVqG9RzaR3t8d8otT1+5C41pDKnrSxYtdpv8N7fjXAM70Ey53OcdsxNgE uwerBRNbzi2XnNbeo2zqA0eCm8YcpLhnI2H8Vbeohx0CJO5xgRPYZI7+WwmIikBTPQ53Cp t++1ApQCphaXRhyU8fajh2QBnRojvGNzNzA9GE1PW1/33xoRkS7pk61QeLtiPg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698154706; a=rsa-sha256; cv=none; b=GT0Ii4AOLY2pfOGzOiJYDbbi3hMUlwH5e2m8nqWHjFgmcPxfVHk3+O28WMIGny4tUa3eZF ntfUdwsXeTYjFvEbNj8Yg6bXSo8j0zFmtdywU9MUeqDPdipbwDeF/1FavIIEi3gL7nvZ/T 0WCLig0J6hvJKC8p+4vlXBJoEwsClIHWRxXYonlB3jl0LlIVWzKtQ66Xgjf7lM+hl96ufS TBMUlYCdY2WhrUvQFvdcKugqCPJ2n3H3fF38hOAOFCD2PFqvh7JaFAcnS2r01/fz2PSAoU mzcqaqeCUqEdiIAWiOUT7h5meN0nRZ4eMmhFgFwkBQ607kgWV4nTx5QMRiveRA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698154706; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pK1CQ54p4cX03b/cMFzudOcxD8q1i528fdun0pGwdlU=; b=ECySM5akrJ0uYkCxE04j4osdHbfRV/rvFelo008ZunkZopmZD3cis2g4d09H3iPo0irTo+ EwKpYAnUveeo0IsSbHQaHqX47agpkJ5fn4i7+zI+Qiow1AnPSJRXR718/d6c0CTaJlEaY8 iJ5B20fMbtllqRqQHyRqQFvTGR/JUo1Z6hCMW+VPY0GlXAq7UVWzdK5Ap9kVxnDJJPG3Ly 5fCJV1D/SMXtLyldcZ1IyK7MDWOTTyfItsLUQBKqH4CY8fZE2dBDuiW4xxB1aGHcDKCcl7 N0Eczw0wMvnLl/53ugkAvvJl6A7fRX7kiGYhaNuiNLqU+DqLMxqNFtsusVXsWg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SFCnG125cz9Sy; Tue, 24 Oct 2023 13:38:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39ODcQDB089436; Tue, 24 Oct 2023 13:38:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39ODcQeo089433; Tue, 24 Oct 2023 13:38:26 GMT (envelope-from git) Date: Tue, 24 Oct 2023 13:38:26 GMT Message-Id: <202310241338.39ODcQeo089433@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 4862eb8604d5 - stable/14 - linuxkpi: Handle direct-mapped addresses in linux_free_kmem() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 4862eb8604d503b52e7c3aa7ff32155b75a1ff93 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=4862eb8604d503b52e7c3aa7ff32155b75a1ff93 commit 4862eb8604d503b52e7c3aa7ff32155b75a1ff93 Author: Mark Johnston AuthorDate: 2023-10-17 14:26:18 +0000 Commit: Mark Johnston CommitDate: 2023-10-24 13:20:01 +0000 linuxkpi: Handle direct-mapped addresses in linux_free_kmem() See the analysis in PR 271333. It is possible for driver code to allocate a page, store its address as returned by page_address(), then call free_page() on that address. On most systems that'll result in the LinuxKPI calling kmem_free() with a direct-mapped address, which is not legal. Fix the problem by making linux_free_kmem() check the address to see whether it's direct-mapped or not, and handling it appropriately. PR: 271333, 274515 Reviewed by: hselasky, bz Tested by: trasz MFC after: 1 week Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D40028 (cherry picked from commit 6223d0b67af923f53d962a9bf594dc37004dffe8) --- sys/compat/linuxkpi/common/src/linux_page.c | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/sys/compat/linuxkpi/common/src/linux_page.c b/sys/compat/linuxkpi/common/src/linux_page.c index ce9ad34464bd..21e338acb089 100644 --- a/sys/compat/linuxkpi/common/src/linux_page.c +++ b/sys/compat/linuxkpi/common/src/linux_page.c @@ -145,6 +145,14 @@ linux_alloc_pages(gfp_t flags, unsigned int order) return (page); } +static void +_linux_free_kmem(vm_offset_t addr, unsigned int order) +{ + size_t size = ((size_t)PAGE_SIZE) << order; + + kmem_free((void *)addr, size); +} + void linux_free_pages(struct page *page, unsigned int order) { @@ -163,7 +171,7 @@ linux_free_pages(struct page *page, unsigned int order) vaddr = (vm_offset_t)page_address(page); - linux_free_kmem(vaddr, order); + _linux_free_kmem(vaddr, order); } } @@ -185,9 +193,17 @@ linux_alloc_kmem(gfp_t flags, unsigned int order) void linux_free_kmem(vm_offset_t addr, unsigned int order) { - size_t size = ((size_t)PAGE_SIZE) << order; + KASSERT((addr & PAGE_MASK) == 0, + ("%s: addr %p is not page aligned", __func__, (void *)addr)); - kmem_free((void *)addr, size); + if (addr >= VM_MIN_KERNEL_ADDRESS && addr < VM_MAX_KERNEL_ADDRESS) { + _linux_free_kmem(addr, order); + } else { + vm_page_t page; + + page = PHYS_TO_VM_PAGE(DMAP_TO_PHYS(addr)); + linux_free_pages(page, order); + } } static int From nobody Tue Oct 24 13:38:27 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SFCnH3Z5dz4y3kx; Tue, 24 Oct 2023 13:38: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 4SFCnH34ffz4ZTW; Tue, 24 Oct 2023 13:38:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698154707; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lTEBW+F+ho5Om9DMUTTEm+TIgLPsZubaimdCvsCvkik=; b=pPbRkS6jtITkiykGjOmJ6JGpWjCUxni/A2J5Zx0xlhtBnfdCfQ87bbaN25vkAVOqZBDDT8 5QuLJeYv/TJ+D+7ZvykJx/XQh8fU8sO+dW3aXEHXHG/MGl8a9hTqTaaEGLxeisUgivNUxN lCkM0RmiJLmdkZLYMUQRaKMIKSo6Pf8cX8VVi9H0flA/d9gqkwg05Z+sjzWDo8TBcA/b0N 1xNnRIX8BG6zIogYXnGZKm5coYaKlHrr4RrfxSRd7fLw6jAqL0C/etj2nC0IWdEhSvbGn0 XnDGP7ljz1/g/vulZuTR9XL/DxzjR/tBUK6wEw7Yf6yT2B5qHPz5BrugetHZ7A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698154707; a=rsa-sha256; cv=none; b=a0AyFZxiPEHc54xzIAYGk6azkf7GHx4sR/fohZyz/j3ioZEkwtCI1ySwmDVQPK7DkVfVPw NcnIV2oBFfLpzzmMVOXQNmSB42SKK8YfXnVtPHxmfA98MgaZ7r8SzSM4N9kT6uffBbBapP Xnx8FF6ibmNlnUGGxeZpawQgjyWCGn5qRJ8dW7huiHSFYQcetJfBpdE7rmpT2oM6R8Owbh bK9fEXNzdvPkw2M/khhSe1smsW7PXWyTGUXnwLmu6ARxnSn4m58B9JEVlbPVmwA8FcZoZS lKIr5S/t4fSvmvadGhW+IeRSOOMDf9MG4v8paqZz/iyFemTNT9m3D7BIqqmLXA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698154707; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lTEBW+F+ho5Om9DMUTTEm+TIgLPsZubaimdCvsCvkik=; b=bK1aTWwRfF8VX00y14E0zxbib1uMziAq4IW+jq5nV75HbTWaIVbCYcMXCJCLqjZUpjie09 /yh5Iv8zejoOm6UEII43qEXBCtw68uXtM/IlC6+7G/k0cUfselBogQ7wLJWFSTBiX+LvF1 LHwYH5b2PFYT7jqTSQx+z0kIhhCi2Khc36ZSPhi3yOkNk2nFqjevS9UFyCDG619og2rADO vjRX0lk5aSf6jfkUH1Vd+9AycIPrGKwOcxrwHasM7EeF4EblEj2gXHeNJ4XulJ1c//7Le+ e/51dWlh+RJzoy5wTN0MUYFtP2ALC3srM93M7YRQCRBpgGfqyKalkLgOQzHu5g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SFCnH20drz97G; Tue, 24 Oct 2023 13:38: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 39ODcRhm089487; Tue, 24 Oct 2023 13:38:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39ODcRYu089484; Tue, 24 Oct 2023 13:38:27 GMT (envelope-from git) Date: Tue, 24 Oct 2023 13:38:27 GMT Message-Id: <202310241338.39ODcRYu089484@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 501e1152d2a0 - stable/14 - linuxkpi: Fix an assertion in linux_free_kmem() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 501e1152d2a047f8ff8fba6e6efbd2d5e9872738 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=501e1152d2a047f8ff8fba6e6efbd2d5e9872738 commit 501e1152d2a047f8ff8fba6e6efbd2d5e9872738 Author: Mark Johnston AuthorDate: 2023-10-18 13:43:02 +0000 Commit: Mark Johnston CommitDate: 2023-10-24 13:20:12 +0000 linuxkpi: Fix an assertion in linux_free_kmem() In the LinuxKPI, PAGE_MASK is the logical negation of FreeBSD's PAGE_MASK, so the original assertion was simply incorrect. Reported by: trasz Tested by: trasz Fixes: 6223d0b67af9 ("linuxkpi: Handle direct-mapped addresses in linux_free_kmem()") (cherry picked from commit f88bd1174aab1aff7fea7241ab6e103e769d2d7a) --- sys/compat/linuxkpi/common/src/linux_page.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/compat/linuxkpi/common/src/linux_page.c b/sys/compat/linuxkpi/common/src/linux_page.c index 21e338acb089..ead2f24cf5df 100644 --- a/sys/compat/linuxkpi/common/src/linux_page.c +++ b/sys/compat/linuxkpi/common/src/linux_page.c @@ -193,7 +193,7 @@ linux_alloc_kmem(gfp_t flags, unsigned int order) void linux_free_kmem(vm_offset_t addr, unsigned int order) { - KASSERT((addr & PAGE_MASK) == 0, + KASSERT((addr & ~PAGE_MASK) == 0, ("%s: addr %p is not page aligned", __func__, (void *)addr)); if (addr >= VM_MIN_KERNEL_ADDRESS && addr < VM_MAX_KERNEL_ADDRESS) { From nobody Tue Oct 24 13:38:28 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SFCnJ4jFTz4y3bD; Tue, 24 Oct 2023 13:38: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 4SFCnJ3tPsz4ZZd; Tue, 24 Oct 2023 13:38:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698154708; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/+v/JXkQJIiBoRUvpZ3MXk3w7Eq7sHsly1iObwxTuaQ=; b=lh7WQRZ5vmSnlAFXO6bMSgdgy6vXA0lqG+Nan1qqIO3eV6azPRuZ/st8JLBjnDSVuwkRP7 QjEIlgcP+jdS2Ppy7GhNlcl9u7QWBZoMUg+SEbED1UUPUv/gnx1np68pXkL5yrTyR6mzWE FsVmb/rAuoS3rud4IHM87Ei3S2d0v/9nqr7wUgNBe4zJiE9118ESIhqAUsyH44nLM1HvEy SigTgCB+L/sYZRjgjszxqERU+tWaFKpDMu+iZ52CIl6LksJGjzi88U/0NWbpBFTiAopH15 RQgO0PV+1bsvn05f70EdhwOltB/t+WL4ZMNDLbGTedd7hcNs0IxDz3JmBJZ8UA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698154708; a=rsa-sha256; cv=none; b=LK4bCIZJI54jniCPL5tgdnQWJrAQ61MP9k72ulcZtnbWVoYXmeu9ZRQweTTMpXdfakVKoW njGzKiNJLbThyv46BH1OtflizJgtvFHAUHNk2z2efnw9/DAud6vF6Wf/auICUEKL2MkAfT cGuelnxJrH/VFoODZqfR/Bq6x1Vo6KtsoW3cEAhmKLetY+rkvSI94SUKMfZCowE3ncao1D IHFmC77dVYyLKA14nYeubOIY0o0vzusSbH8EpIdkWIXd141Pva7y/er4yft+WlRCrClO02 7Fh8NVTRw3a7SCupCmBWYMZc8mNAlepFslwfjXuySV81NIy9Uf/KYVrUL6bMbQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698154708; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/+v/JXkQJIiBoRUvpZ3MXk3w7Eq7sHsly1iObwxTuaQ=; b=SoTQGEt4su88bGuHfBzIzLTAqbM4VFMjOKXgHbqQVmMZab5t9dsC+Bdhsaaaa2uNTm0FIc czBovDFIqVY0/j9VaNiY+NrmLoZ8mY2idfymsUl56Egz2mpCM/9sz4H/5Yfhgd+/LpyhmK WDiGn2TKPcGdKBqWhbk6+kCtRZ0uSieKU66gBhkByTPxd/UU8R0ltLiBJ8aIgetneeJpwZ q5nVZ+9j/m7vy2NSLyicU0sfwd7JN2LyhhPFWnUWMxnDGlIu2pyjqIO5UMfhJxb2UM18do 8Ls6AjdDAxZoZQLcGM1qGqRcpSbjh7h1sURoTH9+RVvfGeI8md5jW0q6dtuJtw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SFCnJ2zYVz9Ys; Tue, 24 Oct 2023 13:38: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 39ODcSKv089532; Tue, 24 Oct 2023 13:38:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39ODcSFn089529; Tue, 24 Oct 2023 13:38:28 GMT (envelope-from git) Date: Tue, 24 Oct 2023 13:38:28 GMT Message-Id: <202310241338.39ODcSFn089529@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 53f62d1c9a9c - stable/14 - witness: Unconditionally initialize out-params for witness_save() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 53f62d1c9a9cce1ba1e04fe68c5ae3e5a9a2e656 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=53f62d1c9a9cce1ba1e04fe68c5ae3e5a9a2e656 commit 53f62d1c9a9cce1ba1e04fe68c5ae3e5a9a2e656 Author: Mark Johnston AuthorDate: 2023-10-16 17:23:40 +0000 Commit: Mark Johnston CommitDate: 2023-10-24 13:20:55 +0000 witness: Unconditionally initialize out-params for witness_save() As of LLVM 16, the -fsanitize-memory-param-retval option is set to true by default, meaning that MSan will eagerly report uninitialized function parameters and return values, even if they are not used. A witness_save()/witness_restore() call pair fails this test since witness_save() may return before saving file and line number information. Modify witness_save() to initialize the out-params unconditionally; this appears to be the only instance of the problem triggered when booting to a login prompt, so let's just address it directly. Sponsored by: Klara, Inc. Sponsored by: Juniper Networks, Inc. MFC after: 1 week (cherry picked from commit 7123222220aa563dc16bf1989d335722e4ff57a6) --- sys/kern/subr_witness.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sys/kern/subr_witness.c b/sys/kern/subr_witness.c index d4ab085197f4..5b9f8afd9565 100644 --- a/sys/kern/subr_witness.c +++ b/sys/kern/subr_witness.c @@ -2362,6 +2362,10 @@ witness_save(struct lock_object *lock, const char **filep, int *linep) struct lock_instance *instance; struct lock_class *class; + /* Initialize for KMSAN's benefit. */ + *filep = NULL; + *linep = 0; + /* * This function is used independently in locking code to deal with * Giant, SCHEDULER_STOPPED() check can be removed here after Giant From nobody Tue Oct 24 13:38:29 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SFCnK5rL1z4y3s4; Tue, 24 Oct 2023 13:38: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 4SFCnK4w3Bz4ZVs; Tue, 24 Oct 2023 13:38:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698154709; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qH6f/DwY0BljJKLnsOlU98DlS8qvE4DJAONyD2hsp+o=; b=qDNfwGk7SRQBkgwXXMNpKNJ3EHZxZJGT2V5xHcXdeSVbIfbdty1FHiKyllaA4U41dWCWy/ UJjfWffD6FjfFBwBLwffU0O/ZrjMgAvlZocaIwyhJsX/E1bT2r099WD9g9qKTH9N+5neij RIDCr4RBtBoEglhjD8SxFGMmtK6jkhkAoSTjmF8juMkvCOfvzL03G1FogsyejTYHbALwrs 4mVn2CbnrE3K+OCntvj5bYXOzYDW2DAhAAwMmnHiW0MCcJfRJBREvI+u2i5916JaspEPFE 4i1SWFMWVGfGEBB4bREaO87i+SR94Dnm90jXt2wPKRE9/wzxSzAkJ9/yj6BD/g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698154709; a=rsa-sha256; cv=none; b=a7g2/npYfC5V9mJDtFr2iMNL+OROD1CWju3TcRxu0LQw8y8nUpUe7q/HHtw3sgiYV0vXm7 H2s4T/DWxM1jDgzu5JgX/G/eenkpL8/gI5m1C7Pv4SY2B74tZHyOP0M6bvFW9FEEz9wSqQ Uv4/l/K7tzpKbIFACYl2ovVJ5tRx+ZShfRJRIgrVSy94Aj3WQ3B//RPY4rjUx55mqFK8P4 imTE1EjNBH/jeTuBw25quGPSO/FC4NycaX0HKeVsiR/RgzXtljKiIdHt5+1dvOGc/BryK+ QhcXaoGfg/CxbuRrdUAnyrn4wu8qSaFCbqTasZv1fqccoBK5xxjc1p3JezomtA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698154709; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qH6f/DwY0BljJKLnsOlU98DlS8qvE4DJAONyD2hsp+o=; b=cyUe+X4DkiecKLx/GuctVBM8t3Z9NrNcV0T8ioBreA9o5XnKnc6j05e9ABCp1ankW43G2U 8yNcE33PV3/QgmzX8ZGErJMKtYAvIbLYfLm8vM9APzDXKKSZoiejMv5Mqdk5VkSMak0sXP cW9o7pHTi4AVnfAyf/UUNuG3E0z6KIZ0yOy6zBp0EUPBB3kDqtE+CEMY9WyuuOZFmgBFuH A7q3cc35zbZRz65oJrhsz10utIkFzGTDGJrVpPEwVjipAAYvqOle5AxNZP9+R9xjJYKiqq vnvWiKQSP8CIAELZq0agCseX73SemD9xsZwjJrAMGOBjciXBDJMedZzDIGP3rg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SFCnK41JMz9d3; Tue, 24 Oct 2023 13:38: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 39ODcTRD089580; Tue, 24 Oct 2023 13:38:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39ODcTdl089577; Tue, 24 Oct 2023 13:38:29 GMT (envelope-from git) Date: Tue, 24 Oct 2023 13:38:29 GMT Message-Id: <202310241338.39ODcTdl089577@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: c038e80498b3 - stable/14 - bhyve: Remove init_snapshot() and initialize static vars List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: c038e80498b38027f31e86d9e3bf6b418ed4d5f1 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=c038e80498b38027f31e86d9e3bf6b418ed4d5f1 commit c038e80498b38027f31e86d9e3bf6b418ed4d5f1 Author: Vitaliy Gusev AuthorDate: 2023-10-17 14:16:08 +0000 Commit: Mark Johnston CommitDate: 2023-10-24 13:21:08 +0000 bhyve: Remove init_snapshot() and initialize static vars vCPU threads are starting before init_snapshot() is called. That can lead to corruption of vcpu_lock userspace mutex (snapshot.c) and then VM hangs in acquiring that mutex. init_snapshot() initializes only static variables (mutex, cv) and that code can be optimized and removed. Fixes: 9a9a248964696 ("bhyve: init checkput before caph_enter") Reviewed by: markj MFC after: 1 week Sponsored by: vStack (cherry picked from commit 7de582874eb9d08f3f87d11ed9e2b9ce8306db79) --- usr.sbin/bhyve/bhyverun.c | 3 --- usr.sbin/bhyve/snapshot.c | 21 +++------------------ usr.sbin/bhyve/snapshot.h | 1 - 3 files changed, 3 insertions(+), 22 deletions(-) diff --git a/usr.sbin/bhyve/bhyverun.c b/usr.sbin/bhyve/bhyverun.c index eda9711bccb8..581e45a7492c 100644 --- a/usr.sbin/bhyve/bhyverun.c +++ b/usr.sbin/bhyve/bhyverun.c @@ -1016,9 +1016,6 @@ main(int argc, char *argv[]) setproctitle("%s", vmname); #ifdef BHYVE_SNAPSHOT - /* initialize mutex/cond variables */ - init_snapshot(); - /* * checkpointing thread for communication with bhyvectl */ diff --git a/usr.sbin/bhyve/snapshot.c b/usr.sbin/bhyve/snapshot.c index 86c76e679e53..5f2b5e1fafe4 100644 --- a/usr.sbin/bhyve/snapshot.c +++ b/usr.sbin/bhyve/snapshot.c @@ -137,8 +137,9 @@ static const struct vm_snapshot_kern_info snapshot_kern_structs[] = { }; static cpuset_t vcpus_active, vcpus_suspended; -static pthread_mutex_t vcpu_lock; -static pthread_cond_t vcpus_idle, vcpus_can_run; +static pthread_mutex_t vcpu_lock = PTHREAD_MUTEX_INITIALIZER; +static pthread_cond_t vcpus_idle = PTHREAD_COND_INITIALIZER; +static pthread_cond_t vcpus_can_run = PTHREAD_COND_INITIALIZER; static bool checkpoint_active; /* @@ -1395,22 +1396,6 @@ vm_do_checkpoint(struct vmctx *ctx, const nvlist_t *nvl) } IPC_COMMAND(ipc_cmd_set, checkpoint, vm_do_checkpoint); -void -init_snapshot(void) -{ - int err; - - err = pthread_mutex_init(&vcpu_lock, NULL); - if (err != 0) - errc(1, err, "checkpoint mutex init"); - err = pthread_cond_init(&vcpus_idle, NULL); - if (err != 0) - errc(1, err, "checkpoint cv init (vcpus_idle)"); - err = pthread_cond_init(&vcpus_can_run, NULL); - if (err != 0) - errc(1, err, "checkpoint cv init (vcpus_can_run)"); -} - /* * Create the listening socket for IPC with bhyvectl */ diff --git a/usr.sbin/bhyve/snapshot.h b/usr.sbin/bhyve/snapshot.h index fdfbbcbe0cb8..b60773cb99c0 100644 --- a/usr.sbin/bhyve/snapshot.h +++ b/usr.sbin/bhyve/snapshot.h @@ -100,7 +100,6 @@ int vm_resume_devices(void); int get_checkpoint_msg(int conn_fd, struct vmctx *ctx); void *checkpoint_thread(void *param); int init_checkpoint_thread(struct vmctx *ctx); -void init_snapshot(void); int load_restore_file(const char *filename, struct restore_state *rstate); From nobody Tue Oct 24 13:38:30 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SFCnM0xPhz4y3l4; Tue, 24 Oct 2023 13:38: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 4SFCnL5rPFz4ZMn; Tue, 24 Oct 2023 13:38:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698154710; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ByLI8411T3gwIscWOhF7GLsQ93TNZUp5d7eBxDYThPU=; b=P6nymk2UuZfasOrQyvBGDpfud4N03Eopgm2ZjU80h7+O9jXb9/5vehUz4HaVH9pFuk+cBo /1pSTsimZJviEJSPssFCRHXhRsP1MLKdKiOOc2jhWrK7pCM0NF30ZuinJAVFyy4LW6m2IN Zd6EmQ3P3ZqQqBev5wuRp22qumdaS/jlFHCRl+XnaC8i5vZg008A/84jtUZLNeaeMzX+Wd +e3z4y763VqKDmjYiPpw7N2j7xOc454dHoXihPnb139i90PR2YLRjrKfqgn91wVD/pbrmx LGVQUd8mrVlVlPwapdaPb++7R+/KA6JENER+eXiyqd/Hlp6ztNzpb0KET3g8Eg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698154710; a=rsa-sha256; cv=none; b=k2FIRL87MHGqehQIX9MEw++bgqIK8vHmcnojsTPjG4VKeCfjhzH87GrhUbwhg7sc/yqJRt XJ/GANKAl8bH6W/arOkVkPdtSLitJHY+Ct4TrP+Fis4SwzT+ga8vQcIBXKk7Ci/+2Nb2PQ GByiGPcDLNYZQg6qTNf5Lsq5iHjnUkugxT+efKSJ0GzbrAuzHXqFo6s/pbX68gnzCBuKPY 1i+AzasLmceJzd5VAR0Rifxt7WIE4JoDgjDoGqYUuKAtRR5gt241CFPGracMmCB8aYRCyB 6pDKU0utgC9Vzkrrp8urpwn0ZIEO9tTX+4hsLKbPDMANbuNeW12RcLZ3DdshBg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698154710; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ByLI8411T3gwIscWOhF7GLsQ93TNZUp5d7eBxDYThPU=; b=jtG/RZB47ssws9dxhpVJXpBIsc1ALKSC7A1RNHARjzWJ2/eZ9kPTa2N5ZQDJKQhGroa8C6 H0x4pbnAc2YvkyksrMQydt3sxehIpjCRHKcwjGVhP6j0h42L6w244QJIWdoscD9Hnu+0PJ +z+0xoaKfEg6oiLd+oYyfMvRIDvxdl9AlsbJk2wJ0aV70HwhQhxCWJec9eKWIGNi7/tsNX vQ/I8pmlFOh8k97s3o20PhKWdgqd6JOj+OLlWPjeZP3geFKOr1mUkleQCj77wXgQfgCIVf jIpWEsg/CoTPZXPWbhF3STEUx0ifFzb6SJOBImUFiM4z3Nvokcs7CEK8ySVUdA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SFCnL4y05z9Zd; Tue, 24 Oct 2023 13:38: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 39ODcU6k089625; Tue, 24 Oct 2023 13:38:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39ODcUE5089622; Tue, 24 Oct 2023 13:38:30 GMT (envelope-from git) Date: Tue, 24 Oct 2023 13:38:30 GMT Message-Id: <202310241338.39ODcUE5089622@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 700689bc2aba - stable/14 - bhyve: Use VMIO_SIOCSIFFLAGS instead of SIOCGIFFLAGS List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 700689bc2abaf860801b3896ceae86b0072f406c Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=700689bc2abaf860801b3896ceae86b0072f406c commit 700689bc2abaf860801b3896ceae86b0072f406c Author: Jan Bramkamp AuthorDate: 2023-09-04 08:38:25 +0000 Commit: Mark Johnston CommitDate: 2023-10-24 13:21:17 +0000 bhyve: Use VMIO_SIOCSIFFLAGS instead of SIOCGIFFLAGS Creating an IP socket to invoke the SIOCGIFFLAGS ioctl on is the only thing preventing bhyve from working inside a bhyve jail with IPv4 and IPv6 disabled restricting the jailed bhyve process to only access the host network via a tap/vmnet device node. PR: 273557 Fixes: 56be282bc999 ("bhyve: net_backends, automatically IFF_UP tap devices") Reviewed by: markj MFC after: 1 week (cherry picked from commit fd8b9c73a5a63a7aa438a73951d7a535b4f25d9a) --- usr.sbin/bhyve/net_backends.c | 52 ++++--------------------------------------- 1 file changed, 4 insertions(+), 48 deletions(-) diff --git a/usr.sbin/bhyve/net_backends.c b/usr.sbin/bhyve/net_backends.c index fa7cd9c81f46..99781cfdcbb6 100644 --- a/usr.sbin/bhyve/net_backends.c +++ b/usr.sbin/bhyve/net_backends.c @@ -42,9 +42,7 @@ #include #include -#if defined(INET6) || defined(INET) #include -#endif #include #include #define NETMAP_WITH_LIBS @@ -180,17 +178,6 @@ SET_DECLARE(net_backend_set, struct net_backend); * The tap backend */ -#if defined(INET6) || defined(INET) -static const int pf_list[] = { -#if defined(INET6) - PF_INET6, -#endif -#if defined(INET) - PF_INET, -#endif -}; -#endif - struct tap_priv { struct mevent *mevp; /* @@ -222,11 +209,8 @@ tap_init(struct net_backend *be, const char *devname, { struct tap_priv *priv = NET_BE_PRIV(be); char tbuf[80]; - int opt = 1; -#if defined(INET6) || defined(INET) - struct ifreq ifrq; - int s; -#endif + int opt = 1, up = IFF_UP; + #ifndef WITHOUT_CAPSICUM cap_rights_t rights; #endif @@ -254,39 +238,11 @@ tap_init(struct net_backend *be, const char *devname, goto error; } -#if defined(INET6) || defined(INET) - /* - * Try to UP the interface rather than relying on - * net.link.tap.up_on_open. - */ - bzero(&ifrq, sizeof(ifrq)); - if (ioctl(be->fd, TAPGIFNAME, &ifrq) < 0) { - WPRINTF(("Could not get interface name")); - goto error; - } - - s = -1; - for (size_t i = 0; s == -1 && i < nitems(pf_list); i++) - s = socket(pf_list[i], SOCK_DGRAM, 0); - if (s == -1) { - WPRINTF(("Could open socket")); + if (ioctl(be->fd, VMIO_SIOCSIFFLAGS, &up)) { + WPRINTF(("tap device link up failed")); goto error; } - if (ioctl(s, SIOCGIFFLAGS, &ifrq) < 0) { - (void)close(s); - WPRINTF(("Could not get interface flags")); - goto error; - } - ifrq.ifr_flags |= IFF_UP; - if (ioctl(s, SIOCSIFFLAGS, &ifrq) < 0) { - (void)close(s); - WPRINTF(("Could not set interface flags")); - goto error; - } - (void)close(s); -#endif - #ifndef WITHOUT_CAPSICUM cap_rights_init(&rights, CAP_EVENT, CAP_READ, CAP_WRITE); if (caph_rights_limit(be->fd, &rights) == -1) From nobody Tue Oct 24 13:52:01 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SFD4x4m1Vz4y4Nf; Tue, 24 Oct 2023 13:52: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 4SFD4x4F3Qz4gBN; Tue, 24 Oct 2023 13:52:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698155521; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=w+zo5AmeUDm3gq8AMv38zluu55jfAy6d6igUZUH+n8k=; b=SGrYg02JIj37rzRjsYPavq2mv7J2P2s0D3IiR779PaDn1aspfIu56GvQh4iLrcWCbt3fwO PGVXnmvU0I1AVaM0ApDjpH39247EnN+6fcUMn6wvB+517ESNl25eXN4gbafJjcBbEmgiPq 6vulEeUmI9G1jRxlmYpomZJ6Qa5CC1sSC2tCeIWuXYAmwV2b031+5WTp/cQbqQW/f/k/Dq OEQPW/T7dUGyKmYgen0OETGPxRmK8kEmZecdeCpp5fw20J7Z+DCI7lT8Z5BDO0n1RA1/WS Ez/57UwPl5YKKgCrm9mJpuldRqcW5o5HQmSOKRl2UZe976dDjkQpt2QOsN8OnQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698155521; a=rsa-sha256; cv=none; b=B3Nd4jyhh3/46RqkNLha26bXZjUOFuNhbP4MyVtddlWHGH8XW1+F6pJAvrU+O6ulEdECvT c9GKc0Z5aTznji7551F34afp9B3ffipKaFAel+O2V1gYFuT9oPBYnzymtTlOSmO8Q3j7YG CUAZVDnggRosEn7peuM+CN32ukLe+gVPwx+uboWZ8j2/efzUYZBElyxUbSBTQjBnioXW1W UsjLYR2I3eSgrsEio9QYkD3sDtuw2aUxgMmH03M4PaZf3eajSV87aT712u5jy+lxPZQ63x DjGHdpkVaPQeBiivH05k3VKE4g/KD0ToyY0OI+yKhwgXoTbkI5RsV8ADqs6neg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698155521; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=w+zo5AmeUDm3gq8AMv38zluu55jfAy6d6igUZUH+n8k=; b=oRFEG0gi+R0F0klWf6ZzjnF7RV95CglDR8klMRrav7l4Tilmk0Tx8+EbNc9quEvMcMrVvQ VoaMlC0lbEmu07vgjQwBJ9SIfqOXEpkR8lfpMG5nyiFwHtUelajZq5p203zYVe4Vbqrp/a yrTn0BqYbWDQurCmexWsrStncKdeqVxV8Z5Lv2W6lg5hrPasTeTFUrtjgB4eyzsvmcfJKv 2VKLqQAsgHJ3qgaLxlmBYltD784/TpHPlsvj56D3kVol44maK792I2/nIOPddpK0ARAI1r j/STP4szg/VqeEdlq2BnTNAGSAIHhw0k/cY25IRV7ji+REdXO0vnvpXmAqYhuA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SFD4x3HbYz9f8; Tue, 24 Oct 2023 13:52: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 39ODq1wU020865; Tue, 24 Oct 2023 13:52:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39ODq1LS020862; Tue, 24 Oct 2023 13:52:01 GMT (envelope-from git) Date: Tue, 24 Oct 2023 13:52:01 GMT Message-Id: <202310241352.39ODq1LS020862@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: 44f28069e2e5 - stable/14 - makefs: Explain the -d 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 44f28069e2e5ecbf402244816ec6cac03c7c0cf9 Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=44f28069e2e5ecbf402244816ec6cac03c7c0cf9 commit 44f28069e2e5ecbf402244816ec6cac03c7c0cf9 Author: Greg Lehey AuthorDate: 2023-09-26 05:05:16 +0000 Commit: Ed Maste CommitDate: 2023-10-24 13:51:46 +0000 makefs: Explain the -d option (cherry picked from commit 915af883221a4982e89ef878f1def0899ccac283) --- usr.sbin/makefs/makefs.8 | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/usr.sbin/makefs/makefs.8 b/usr.sbin/makefs/makefs.8 index 2ffa512a3b9e..5c3d88b4ac1b 100644 --- a/usr.sbin/makefs/makefs.8 +++ b/usr.sbin/makefs/makefs.8 @@ -113,7 +113,12 @@ Treat duplicate paths in an mtree manifest as warnings not error. Enable various levels of debugging, depending upon which bits are set in .Ar debug-mask . -XXX: document these +This option is intended for source debugging. +.Ar debug-mask +is a bit map defined in the header file +.Ar makefs.h . +See the source for usage, and look for defines starting with +.Ar DEBUG_ . .It Fl F Ar mtree-specfile .Em This is almost certainly not the option you are looking for. To create an image from a list of files in an mtree format manifest, From nobody Tue Oct 24 14:28:18 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SFDtp2Gftz4y65c; Tue, 24 Oct 2023 14:28: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 4SFDtp1d4Lz4jvW; Tue, 24 Oct 2023 14:28:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698157698; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VC8upt/jXSClGuwg4yoGThE+ME9HlP370AIuPU/Zta8=; b=XLxY4ohPJsRIHyGBdxiX03LXFkVEwyA3l8nfCd1itiu0069K6xK/0bmnoULDVGD+KvDIY2 Jn2tuh2bgBTuD4/edUZqCtb5TRPeEb49ruEC+W+VjsKJdM40uoAUO+GCx77B5QTF1ruPbu v4nGniFcj3w/2At/WDsCZHBekYR/K6aqMX/kvn9rkvmBkGhzjaWXve9ZKkAFJ4P70c0OvA uGozaLnGyDf6BaosNIRW5Skx/GNRnTqcoBcQaodXGQhkDqKEyqF1BeFMZCszizfyccNttw /njQNXMjDSLMdb8K4DIlZmYZgLWTJqg7dhYsWnAmJHIJ5laTxu9jXnsYe6cxhg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698157698; a=rsa-sha256; cv=none; b=YJOT62r6vt7p9BkzXgLYHJDI5QIPyP8RBxKy01iPmqQ/K+qUST5IIqx37gTK6UQbu5QZiZ 6vplhtUfhmfoJCQ6xEZikNWfkjTdKzyo5Dl8BBLZLGoNNlcX3CCCPR4tSy4ZTXyCm9yiN6 6fDh1CHpV/P8vNeQMmClQNbvZwCSBhObdp47Gr5mLVUz8eYnKp0EmX6dWTr2xjgk7HNQu9 XsTbM3flMvL3g7S8F7249+itZ+GzSBibNJGCCHnAoTgdQf/cKd5+AVRtQ9Gty92V1k5Ub+ 5ndehQt73EHbOBmCZlefnQC1ifFwy85mq8e7phU97H+8SDWq6DKi0Kf+AcpBfQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698157698; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VC8upt/jXSClGuwg4yoGThE+ME9HlP370AIuPU/Zta8=; b=Wy1rYfGFNcYXr8m5hM9hNhoVMAujqAkTa9J+IBEzOz9vIJa9Fw+zazqaUj91TXPFhT6GVD 2a5lzZHWutl6Oifzq07IN1I3X3oMM5Mnpetd0utfkECL6U3fHlP4vkf/dtXo8f1iVxgD9M Do2ZNvDmoB5vSXI4PggpSDZNVBye4u7leY2BSmqOVOU1biROJELvo7/DyoOk/a0BhoGSAf +C5LrbPFogK6nihFnpff4GI97PehGXi2SOYDYUyeYk6iv+qNS8t8quAQXn7LBfvyZC7E0R a7MC0EiFG2lagT8IoOeP0jU/5KvqMD8uaw8ubFK6aIHy0wC1CsPKKSQlJ2ALsw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SFDtp0hDVzBrs; Tue, 24 Oct 2023 14:28: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 39OESITs072989; Tue, 24 Oct 2023 14:28:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39OESInw072986; Tue, 24 Oct 2023 14:28:18 GMT (envelope-from git) Date: Tue, 24 Oct 2023 14:28:18 GMT Message-Id: <202310241428.39OESInw072986@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 21a9924086c7 - stable/14 - socket tests: Build fix List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 21a9924086c7884f4545b64a56180ef690047973 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=21a9924086c7884f4545b64a56180ef690047973 commit 21a9924086c7884f4545b64a56180ef690047973 Author: Mark Johnston AuthorDate: 2023-10-17 14:21:32 +0000 Commit: Mark Johnston CommitDate: 2023-10-24 14:28:11 +0000 socket tests: Build fix Fixes: d8735eb7acc0 ("socket tests: Add a regression test for ktrace+recv(MSG_TRUNC)") Reported by: Jenkins (cherry picked from commit 4bd1e19684945aa1fd3397b58613f5210fda9091) --- tests/sys/kern/socket_msg_trunc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/sys/kern/socket_msg_trunc.c b/tests/sys/kern/socket_msg_trunc.c index 279170158643..ff0499c4540d 100644 --- a/tests/sys/kern/socket_msg_trunc.c +++ b/tests/sys/kern/socket_msg_trunc.c @@ -231,7 +231,7 @@ ATF_TC_BODY(recvmsg_trunc_ktrace_uio, tc) nbytes = read(fd, &ktr, sizeof(ktr)); ATF_REQUIRE_MSG(nbytes >= 0, "read failed: %s", strerror(errno)); ATF_REQUIRE((size_t)nbytes == sizeof(ktr)); - ATF_REQUIRE_MSG((ktr.ktr_type & ~KTR_TYPE) == KTR_GENIO); + ATF_REQUIRE((ktr.ktr_type & ~KTR_TYPE) == KTR_GENIO); ATF_REQUIRE(close(fd) == 0); ATF_REQUIRE(close(sd[0]) == 0); From nobody Tue Oct 24 14:28:42 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SFDvH0wr8z4y6KY; Tue, 24 Oct 2023 14:28: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 4SFDvH0Fwnz4k0q; Tue, 24 Oct 2023 14:28:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698157723; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yfzUhFypZCA6bPb9ydOY0TOHVbGAJkBxZjivk8YaXL4=; b=gOwHFeOKzxzMI6ujpoIYsMh5Pw32WyN9zvupxVjl1mg2ZBw3QFHbih9S3N5OoGoCmZg/eU IxNKpYoBhU3/cf2vwOGT/KT9Icfl8vkU1XV8wiL3Q/tsnVGy3ySDer4njJd6+fIJnq0Ut5 jHNzMYyYg0MsCTpzjGGdOQUHxLBQ5s0swAJgB+5XVgLzdDGvzjAR2060njFZGDvSDWdob4 PmhlRngnLUT4VosgRrCVKiLQNtzta2DnEy/NZffysRATTWWOedgCUlmHIFbHgZ6iIJpt75 iDXixU02nWjwjj+So7aLtobEdW3rqTMc6bUjQL/p2cjnuGj7jXq7nAtgsu4ZxA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698157723; a=rsa-sha256; cv=none; b=tila/efX/HBH0tBF+OBTkK+S/fJ37SsWrovtX1QLmEml2sygYWqCzERJ5lafuCReLw+mHa 6L0lMtiRyiYKPVmNy10d3FTG4k0UpXrswnI4wGjoM3i/+e9Ugx4OG6dCMcaY5cBH63huRI 6f53+La41v/3PMKITmImZ0l/RkAsE0cOvJMl6CHCG6/52YqAeZ2kTZ38YZhbC8sPVUn5dn ui4a1JIjtyB/uW3JQRdOLU3RmjfM2L3rolZdTQC1ohZmMbjPqot3xA+e3GuGBHJUG/obYD ZU7Xh2hkys5US7VI48VBRISQ9/0HnSOXPXx8CCwtC3T/wVjv5yjoBdDMgEk+9A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698157723; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yfzUhFypZCA6bPb9ydOY0TOHVbGAJkBxZjivk8YaXL4=; b=ZNp3sp+BFABRVUwn7rvq8SzDrpgfi5YfevqdOT5cjphX1JvrPLmnEdSSL7dGUUqZbJtAX0 MgHj5HnkgQu8NKnqVCHg3xDJ8SqqTawNqnRVXKjPGmz9DzWY5jXDTmOqKL5npm8+N/wPHf AZC2r5Bt55qMYWl7+A0SWTZbf6QdpAB8L3brqimn5NNsMyVcnt68APyH5Cp+6zSe30NU4+ adxrGWUPuVJCna/7gnKlUuWDzdsvqnSkTaZ0pw5zn/smiVA+RzyordHlWg43oIHwdcx33I xWdDlXAW9Is/Rnmle3qq5wOMD0wHTJYOQ1Lhav8zQg3k6NibUHkM3wjK7m77pw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SFDvG6PTyzBpK; Tue, 24 Oct 2023 14:28: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 39OESgM3073177; Tue, 24 Oct 2023 14:28:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39OESgtY073174; Tue, 24 Oct 2023 14:28:42 GMT (envelope-from git) Date: Tue, 24 Oct 2023 14:28:42 GMT Message-Id: <202310241428.39OESgtY073174@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 1b07f630c11c - stable/13 - socket tests: Build fix List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 1b07f630c11ccf899612a7d02777fe0855e3bb25 Auto-Submitted: auto-generated The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=1b07f630c11ccf899612a7d02777fe0855e3bb25 commit 1b07f630c11ccf899612a7d02777fe0855e3bb25 Author: Mark Johnston AuthorDate: 2023-10-17 14:21:32 +0000 Commit: Mark Johnston CommitDate: 2023-10-24 14:28:34 +0000 socket tests: Build fix Fixes: d8735eb7acc0 ("socket tests: Add a regression test for ktrace+recv(MSG_TRUNC)") Reported by: Jenkins (cherry picked from commit 4bd1e19684945aa1fd3397b58613f5210fda9091) --- tests/sys/kern/socket_msg_trunc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/sys/kern/socket_msg_trunc.c b/tests/sys/kern/socket_msg_trunc.c index 279170158643..ff0499c4540d 100644 --- a/tests/sys/kern/socket_msg_trunc.c +++ b/tests/sys/kern/socket_msg_trunc.c @@ -231,7 +231,7 @@ ATF_TC_BODY(recvmsg_trunc_ktrace_uio, tc) nbytes = read(fd, &ktr, sizeof(ktr)); ATF_REQUIRE_MSG(nbytes >= 0, "read failed: %s", strerror(errno)); ATF_REQUIRE((size_t)nbytes == sizeof(ktr)); - ATF_REQUIRE_MSG((ktr.ktr_type & ~KTR_TYPE) == KTR_GENIO); + ATF_REQUIRE((ktr.ktr_type & ~KTR_TYPE) == KTR_GENIO); ATF_REQUIRE(close(fd) == 0); ATF_REQUIRE(close(sd[0]) == 0); From nobody Tue Oct 24 14:37:40 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SFF5c2pHBz4y6fw; Tue, 24 Oct 2023 14:37: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 4SFF5c2KXfz4kxJ; Tue, 24 Oct 2023 14:37:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698158260; h=from:from:reply-to:subject:subject: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+5b5m+WmdkXExYsbl+IL3VIGK5piGngyxEuiKEpVB4=; b=nTSHYvdJ8pCDSGrVPSkCwzA8nVh+zWpW/O/JH65CJuFAC60ep7zWatm+ZQzwIAGzeuXiPK XXTPsCwzJOv31eSZcryXxtYmsk+iPNJ02MQuVEhFcXnXkhtCh6HxFhUQ26NoEXwnZr5Nx6 mFnfi/q70D0nylWaUzq/Wf0jgIH6OcbXZQY2oQ6yRW+f8zIy2Bmc1eeO/16udk6u4fA3NL +mBPKxgH2kJVTFZ9YTenJVdsOpplvYX2LI4tCJS48m/w9aaKycgsfVLtbatYiiIQNYIQ41 EtZVI4801fS5SnICBNStpk04vO0EJHlK2u6G+bzHBoa89V6BiHnC2gtohkQClw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698158260; a=rsa-sha256; cv=none; b=bkLuoKJgowmKTx9B7w4fGASSyr9WQNz31307LIIIst5ZyYASNu21prjfEl9w7IgenYGV3d nVkAKD/dCguv0ljmgItfa41gKj0vjf6cTZ2BD2VOu42k3qPQkKAI4ZPK/N5qylg/x6Z3zY lgZSFjig3uk3WAVBBhc5lWVgpY0HH4OWpZWQsTZ/R61zKleups910622I5fpEci2DNjnJT /bwK5mV1g3D2bkITVwbTtGFbZoChQYVQY9jsgc2L1J4XdRG/1vfkCjt3Zeb+lfSS0DGJvX mOBzuRxkiVvPnvgpJnhdiz/N9kAQtYhPckCJ5kOaWSofbjAI8PngvSjfzKCXuQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698158260; h=from:from:reply-to:subject:subject: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+5b5m+WmdkXExYsbl+IL3VIGK5piGngyxEuiKEpVB4=; b=bajm3grrEEw3y/NHv1t1y0b2FLCFljkg0Fpv6CWdRsI/kFHO8+7MiMyoLsHg4iGq2lIUSK WMpmyBHKMFcjqP/06RV60hnsT21FhmNPujMg9XM620hxn+7vSkb0G9xPxbd8RXJRzKLn5+ /HA1cGHh/gnVp0nd46drJrubU10hAUTKwrVEP/aBp6mAB1wxLUntBI5qr/keuLL31hM1U1 XwWQsShzB2kqPjGHy+9TecUOnzqkT0sMZKVqCmpqNKY02O5YupnBOcjCh1zWSrPQJtX93z hLt+xdIhAfTSorUwenX28Nhls6xDyN02GangI5q2kJLnuQi6Da265F3no/omxg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SFF5c156WzBy5; Tue, 24 Oct 2023 14:37: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 39OEbeF5089384; Tue, 24 Oct 2023 14:37:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39OEbeQf089381; Tue, 24 Oct 2023 14:37:40 GMT (envelope-from git) Date: Tue, 24 Oct 2023 14:37:40 GMT Message-Id: <202310241437.39OEbeQf089381@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: c2ee9efb43ba - releng/14.0 - sctp: Various fixes for loader tunables List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.0 X-Git-Reftype: branch X-Git-Commit: c2ee9efb43bad6dca8af2f01938e23585736f651 Auto-Submitted: auto-generated The branch releng/14.0 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=c2ee9efb43bad6dca8af2f01938e23585736f651 commit c2ee9efb43bad6dca8af2f01938e23585736f651 Author: Zhenlei Huang AuthorDate: 2023-10-09 04:36:48 +0000 Commit: Zhenlei Huang CommitDate: 2023-10-24 14:35:50 +0000 sctp: Various fixes for loader tunables The following sysctl variables are actually loader tunables. Add sysctl flag CTLFLAG_TUN to them so that `sysctl -T` will report them correctly. 1. net.inet.sctp.tcbhashsize 2. net.inet.sctp.pcbhashsize 3. net.inet.sctp.chunkscale The loader tunable 'net.inet.sctp.tcbhashsize' and 'net.inet.sctp.chunkscale' are only used during vnet initializing, thus it make no senses to make them writable tunable. Validate the values of loader tunables on vnet initialize, reset them to theirs defaults if invalid to prevent potential kernel panics. Reviewed by: tuexen, #transport, #network Approved by: re (gjb) MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D42007 (cherry picked from commit dac91eb7660324677d8a2f71bd6f192422355ba1) (cherry picked from commit fd9de12a71109d1e3bb4b20e7d040fc9a1784dc2) --- sys/netinet/sctp_pcb.c | 8 ++++++++ sys/netinet/sctp_sysctl.c | 24 ++++++++++++++++++------ 2 files changed, 26 insertions(+), 6 deletions(-) diff --git a/sys/netinet/sctp_pcb.c b/sys/netinet/sctp_pcb.c index 16cde18c4c1d..a1742b2fffca 100644 --- a/sys/netinet/sctp_pcb.c +++ b/sys/netinet/sctp_pcb.c @@ -5676,6 +5676,11 @@ sctp_startup_mcore_threads(void) } #endif +#define VALIDATE_LOADER_TUNABLE(var_name, prefix) \ + if (SCTP_BASE_SYSCTL(var_name) < prefix##_MIN || \ + SCTP_BASE_SYSCTL(var_name) > prefix##_MAX) \ + SCTP_BASE_SYSCTL(var_name) = prefix##_DEFAULT + void sctp_pcb_init(void) { @@ -5717,6 +5722,9 @@ sctp_pcb_init(void) TUNABLE_INT_FETCH("net.inet.sctp.tcbhashsize", &SCTP_BASE_SYSCTL(sctp_hashtblsize)); TUNABLE_INT_FETCH("net.inet.sctp.pcbhashsize", &SCTP_BASE_SYSCTL(sctp_pcbtblsize)); TUNABLE_INT_FETCH("net.inet.sctp.chunkscale", &SCTP_BASE_SYSCTL(sctp_chunkscale)); + VALIDATE_LOADER_TUNABLE(sctp_hashtblsize, SCTPCTL_TCBHASHSIZE); + VALIDATE_LOADER_TUNABLE(sctp_pcbtblsize, SCTPCTL_PCBHASHSIZE); + VALIDATE_LOADER_TUNABLE(sctp_chunkscale, SCTPCTL_CHUNKSCALE); SCTP_BASE_INFO(sctp_asochash) = SCTP_HASH_INIT((SCTP_BASE_SYSCTL(sctp_hashtblsize) * 31), &SCTP_BASE_INFO(hashasocmark)); SCTP_BASE_INFO(sctp_ephash) = SCTP_HASH_INIT(SCTP_BASE_SYSCTL(sctp_hashtblsize), diff --git a/sys/netinet/sctp_sysctl.c b/sys/netinet/sctp_sysctl.c index 851ed408092b..2c2cc58ee086 100644 --- a/sys/netinet/sctp_sysctl.c +++ b/sys/netinet/sctp_sysctl.c @@ -867,6 +867,14 @@ sctp_sysctl_handle_trace_log_clear(SYSCTL_HANDLER_ARGS) #endif #define SCTP_UINT_SYSCTL(mib_name, var_name, prefix) \ + SCTP_UINT_SYSCTL_FLAG(mib_name, var_name, prefix, \ + CTLFLAG_VNET|CTLTYPE_UINT|CTLFLAG_RW); + +#define SCTP_UINT_SYSCTL_TUN(mib_name, var_name, prefix) \ + SCTP_UINT_SYSCTL_FLAG(mib_name, var_name, prefix, \ + CTLFLAG_VNET|CTLTYPE_UINT|CTLFLAG_RWTUN|CTLFLAG_NOFETCH); + +#define SCTP_UINT_SYSCTL_FLAG(mib_name, var_name, prefix, flags) \ static int \ sctp_sysctl_handle_##mib_name(SYSCTL_HANDLER_ARGS) \ { \ @@ -885,9 +893,13 @@ sctp_sysctl_handle_trace_log_clear(SYSCTL_HANDLER_ARGS) } \ return (error); \ } \ - SYSCTL_PROC(_net_inet_sctp, OID_AUTO, mib_name, \ - CTLFLAG_VNET|CTLTYPE_UINT|CTLFLAG_RW, NULL, 0, \ - sctp_sysctl_handle_##mib_name, "UI", prefix##_DESC); + SYSCTL_PROC(_net_inet_sctp, OID_AUTO, mib_name, flags, \ + NULL, 0, sctp_sysctl_handle_##mib_name, "UI", prefix##_DESC) + +#define SCTP_UINT_SYSCTL_RDTUN(mib_name, var_name, prefix) \ + SYSCTL_UINT(_net_inet_sctp, OID_AUTO, mib_name, \ + CTLFLAG_VNET|CTLFLAG_RDTUN|CTLFLAG_NOFETCH, \ + &VNET_NAME(system_base_info.sctpsysctl.var_name), 0, prefix##_DESC); /* * sysctl definitions @@ -909,10 +921,10 @@ SCTP_UINT_SYSCTL(peer_chkoh, sctp_peer_chunk_oh, SCTPCTL_PEER_CHKOH) SCTP_UINT_SYSCTL(maxburst, sctp_max_burst_default, SCTPCTL_MAXBURST) SCTP_UINT_SYSCTL(fr_maxburst, sctp_fr_max_burst_default, SCTPCTL_FRMAXBURST) SCTP_UINT_SYSCTL(maxchunks, sctp_max_chunks_on_queue, SCTPCTL_MAXCHUNKS) -SCTP_UINT_SYSCTL(tcbhashsize, sctp_hashtblsize, SCTPCTL_TCBHASHSIZE) -SCTP_UINT_SYSCTL(pcbhashsize, sctp_pcbtblsize, SCTPCTL_PCBHASHSIZE) +SCTP_UINT_SYSCTL_RDTUN(tcbhashsize, sctp_hashtblsize, SCTPCTL_TCBHASHSIZE) +SCTP_UINT_SYSCTL_TUN(pcbhashsize, sctp_pcbtblsize, SCTPCTL_PCBHASHSIZE) SCTP_UINT_SYSCTL(min_split_point, sctp_min_split_point, SCTPCTL_MIN_SPLIT_POINT) -SCTP_UINT_SYSCTL(chunkscale, sctp_chunkscale, SCTPCTL_CHUNKSCALE) +SCTP_UINT_SYSCTL_RDTUN(chunkscale, sctp_chunkscale, SCTPCTL_CHUNKSCALE) SCTP_UINT_SYSCTL(delayed_sack_time, sctp_delayed_sack_time_default, SCTPCTL_DELAYED_SACK_TIME) SCTP_UINT_SYSCTL(sack_freq, sctp_sack_freq_default, SCTPCTL_SACK_FREQ) SCTP_UINT_SYSCTL(sys_resource, sctp_system_free_resc_limit, SCTPCTL_SYS_RESOURCE) From nobody Tue Oct 24 14:37:41 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SFF5d3zrMz4y6m6; Tue, 24 Oct 2023 14:37: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 4SFF5d37fQz4kmp; Tue, 24 Oct 2023 14:37:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698158261; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oVj4i7qOuQoiVh4d1R3EHcINRBzBZ3813IzNFsroVKg=; b=VxmmCPB9ax+4zSoPo27x2kyY05ncEmxoAV4VAoxEyXsxoG0YW446xrTPShOjV6eewPpnZz lGPUdTSrY4k/VsYGub6+28cWfaFERcAQhxU6Ob1prDYWxHGHYZdIHZkZ8HDTJHifCvFB0n f3xfXsGMLezzfQlJ5znzh4t2hgwP1+wTrCQJR45PcjTJmfzNLM5e2yFNMCkJw8E//z/gD8 YaZgNTmg8hSp5dtUq2vV0a0irYiUverZDGhCIZ0PCL8hcoSv4UVTDbi4xrGxtPsME0t0LT LGMw7KPuF5hotrJqyyVwyCPakx4EQlxzqFUCsJBt62Vxptbr5WY2D6eUWV9HTA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698158261; a=rsa-sha256; cv=none; b=rjqu/z3W/JtCC2VrZIZZ8FnCANv2Bft2deb5WJEy/CUTN0gtzmxMB3bG5MoXe+1pPcCzSY xdZ9zm9ttfSaktHgre2IkVj377OSD1zh/JhimyJJHp1z8jxcJ47Z49+iwkvMrF2LVFD3Ye R+s6gLWnbKZ4ElvZkKwm9sDNI0HnVfhIiMQyoPMd9oB8Ryt4yewxTUv34SQrZ9Ylb4Nyz+ ujub3IiBLiyahVSMvdMIgfdaEkJXYC3kiRj8prdcOEpb1Hp84I/BBAPXDJHGE2ViqDI8pl wIVJi2Sv6AHt/JPx79xo1vOp53QSUJuAnmE51/ZtOaN39xOBtfuTUuxt+lNqUw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698158261; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oVj4i7qOuQoiVh4d1R3EHcINRBzBZ3813IzNFsroVKg=; b=McIXX9w/fizzZ2S++bmFbD+qSZLZGE5AlnXg9PnGfOpMKru31tF75gLb58+0YEA3eYHMYt Qlpc6VC5rOJ6MkD+G02lxcjkCPEKrpkCuW/uhlCCjkpAMpru6mPaP93a4tdkA9XlMLMkfB sbUsKNkgtNAseYTk8+hM5DR+dEfSp7oLL9IK42QUfKcAophGvguiOB+uoRHOAbHmZ4Y72n 2+PrP0cZt5HVxInLlf1z55hNQt+qtxuekJ4DXfc3GhhF5/tzTg6vQah17XzBm72sA3iKXW lZlwatIkrk+vU/x4UkYnZVq2FmIAjmp24WTdZSWnXayT2YELc131H6oLEQaRlg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SFF5d24NmzBvx; Tue, 24 Oct 2023 14:37: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 39OEbffF089444; Tue, 24 Oct 2023 14:37:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39OEbfkB089441; Tue, 24 Oct 2023 14:37:41 GMT (envelope-from git) Date: Tue, 24 Oct 2023 14:37:41 GMT Message-Id: <202310241437.39OEbfkB089441@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: 423bb3869b71 - releng/14.0 - boottrace: Add corresponding sysctl knob for loader tunable List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.0 X-Git-Reftype: branch X-Git-Commit: 423bb3869b71c7e068fc89740c9d6cfdb9cb7be1 Auto-Submitted: auto-generated The branch releng/14.0 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=423bb3869b71c7e068fc89740c9d6cfdb9cb7be1 commit 423bb3869b71c7e068fc89740c9d6cfdb9cb7be1 Author: Zhenlei Huang AuthorDate: 2023-10-12 10:14:48 +0000 Commit: Zhenlei Huang CommitDate: 2023-10-24 14:35:50 +0000 boottrace: Add corresponding sysctl knob for loader tunable The loader tunable 'kern.boottrace.table_size' does not have corresponding sysctl MIB entry. Add it so that it can be retrieved, and `sysctl -T` will also report it correctly. Reviewed by: markj Approved by: re (gjb) MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D42138 (cherry picked from commit 51dc362d1a148362dc4cfacaa3629db928523204) (cherry picked from commit c525ec74b44f471261b0e67eaa254e05fdef3d05) --- sys/kern/kern_boottrace.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sys/kern/kern_boottrace.c b/sys/kern/kern_boottrace.c index cb013d4e8be1..86fee4f47fbe 100644 --- a/sys/kern/kern_boottrace.c +++ b/sys/kern/kern_boottrace.c @@ -158,6 +158,10 @@ SYSCTL_INT(_kern_boottrace, OID_AUTO, shutdown_trace_threshold, CTLFLAG_RWTUN, &shutdown_trace_threshold, 0, "Tracing threshold (ms) below which tracing is ignored"); +SYSCTL_UINT(_kern_boottrace, OID_AUTO, table_size, + CTLFLAG_RDTUN | CTLFLAG_NOFETCH, &bt.size, 0, + "Boot-time tracing table size"); + /* * Dump a trace to buffer or if buffer is NULL to console. * From nobody Tue Oct 24 14:37:42 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SFF5f5HS4z4y6m8; Tue, 24 Oct 2023 14:37: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 4SFF5f4M5Vz4l1p; Tue, 24 Oct 2023 14:37:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698158262; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hZv9DVCFIsGTkOkdS+jNfpn6bbhJdPkPbnerbB8qY1g=; b=Lgu5U2yh2qsfBUlTPZuVXvFsa6CHyTR8JXAUs51GW4UDQH2jvDdctuAAovFLMtAJa/4Xxd ghoClcukXSfao/HD9Glxv2bCr1q7UQGye07RaCH05wJ27Fk2PoUwu4iMUvQxTLwL8w1uvO PEkEzY7rgfa36hn4MoUoH4GxerS4TQO+dVGeWsEmUnb0Juhx3S2XVxHt/txnVyufTngta3 wvyUyRr8TosecYV5ssoEwE5dqNR/51IN7EjLFuA8KHt3Y1aM8GQ06M5jAABCrY+NHiGUX9 fRpGo3hcolDaPUGibItLzXEDOx7GHRSIIC9WtU/pa8dxNcODyeCs3F+8vWSkCg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698158262; a=rsa-sha256; cv=none; b=OCfz/KMz6F89/CmP6/VJIT+b5qO9CTVveUx5aLgQXlK1TBgksYCuVb5WNLcTHBDc9o9DB2 GCf3l6tVzsimDwp4CRYXBazG34emktzc/rpiVAkGwgLY6E9MyVEfis6LNRzMcSBT1ZXLxY RAFCKDvab7z5lBwScOdVCqdS+dym/kfB+WRPJvJIzaGF3Y9oyZ4AmbqaYLtLQf5TwW6phW VmjBPSdoEmECaT7SYiA98aYLciwLQ1sT0JAZ7AlWVecmpq2mcueTeK443yhFxm1B/H0/bv bhWIFpzu4k4UgvItDSqnWW9+KT3bpHzj/Q7nZEawL2MWK8FbgDHY7tVZ+L9yUA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698158262; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hZv9DVCFIsGTkOkdS+jNfpn6bbhJdPkPbnerbB8qY1g=; b=Gb5f+Rw24AKkUkJsi3CFFRUGddpupm+ghNa25lVitaY5uuThprJ7LPCfRiEP5gdgj7wnud FICyeLAx3ay484lu/bcce3IOIp9glybMZgvHwi39ca7LygNNtwfxxFQW9hieJy6F6iijPH sRNCfglMXotvzDkx6T08Gfm+S/TZiTBEwzCpSaFvfZFDHZKf/9uO3Ua8T3HAbfHgSkm25i KDsmD0sNRGOoljMIBwuVa3mwxPhl+e6U/XKZZzI5ihpT10ZxSzT1J7F9J8iwCRhupwFXxx +OYp9L/zA3nOPDXB07lFMMGKZdQmD9os8TLiBYsP1G0EjZLgoS18J5pmRWeY6w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SFF5f31p0zBt0; Tue, 24 Oct 2023 14:37: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 39OEbgeN089495; Tue, 24 Oct 2023 14:37:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39OEbgls089492; Tue, 24 Oct 2023 14:37:42 GMT (envelope-from git) Date: Tue, 24 Oct 2023 14:37:42 GMT Message-Id: <202310241437.39OEbgls089492@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: 5edc166571c4 - releng/14.0 - kasan: Add corresponding sysctl knob for loader tunable List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.0 X-Git-Reftype: branch X-Git-Commit: 5edc166571c44e61140e3b0cc8105c2a63bd47a4 Auto-Submitted: auto-generated The branch releng/14.0 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=5edc166571c44e61140e3b0cc8105c2a63bd47a4 commit 5edc166571c44e61140e3b0cc8105c2a63bd47a4 Author: Zhenlei Huang AuthorDate: 2023-10-12 10:14:48 +0000 Commit: Zhenlei Huang CommitDate: 2023-10-24 14:35:51 +0000 kasan: Add corresponding sysctl knob for loader tunable The loader tunable 'debug.kasan.disabled' does not have corresponding sysctl MIB entry. Add it so that it can be retrieved, and `sysctl -T` will also report it correctly. Reviewed by: markj Approved by: re (gjb) MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D42138 (cherry picked from commit db5d0bc868be669ed6588ebeccf8c02e76aabc41) (cherry picked from commit 6f8ef4d6e44ee27a08c14ab6a892ffccf332bcf7) --- sys/kern/subr_asan.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/sys/kern/subr_asan.c b/sys/kern/subr_asan.c index 44c96435a499..c3664d9cf6c2 100644 --- a/sys/kern/subr_asan.c +++ b/sys/kern/subr_asan.c @@ -92,7 +92,10 @@ SYSCTL_INT(_debug_kasan, OID_AUTO, panic_on_violation, CTLFLAG_RDTUN, &panic_on_violation, 0, "Panic if an invalid access is detected"); -static bool kasan_enabled __read_mostly = false; +#define kasan_enabled (!kasan_disabled) +static bool kasan_disabled __read_mostly = true; +SYSCTL_BOOL(_debug_kasan, OID_AUTO, disabled, CTLFLAG_RDTUN | CTLFLAG_NOFETCH, + &kasan_disabled, 0, "KASAN is disabled"); /* -------------------------------------------------------------------------- */ @@ -136,7 +139,7 @@ kasan_init(void) kasan_md_init(); /* Now officially enabled. */ - kasan_enabled = true; + kasan_disabled = false; } void @@ -180,7 +183,7 @@ kasan_code_name(uint8_t code) #define REPORT(f, ...) do { \ if (panic_on_violation) { \ - kasan_enabled = false; \ + kasan_disabled = true; \ panic(f, __VA_ARGS__); \ } else { \ struct stack st; \ From nobody Tue Oct 24 14:37:43 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SFF5h1BTXz4y6Ln; Tue, 24 Oct 2023 14:37: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 4SFF5g4wMLz4l2D; Tue, 24 Oct 2023 14:37:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698158263; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=P507d6Lj+1sRsXDjVxgWlWxf+e44ep4OyaBX6uNTAXI=; b=rHldZcaUFEFbLQVjBHKjedppA7JHQWJf506S1bFHk6u1lQqQCcMSpfKsqNY8AZxpSovk+z jmqZLPf/YY1UReCSLtd7g82nfZcSSwefQGCiAitRf6aIMxjE0WMQfY2jAN0jegWYJQqKg/ fTtOCEwEWpaCRPpKQKjUr4eyX7oDDz0sKnvLeTEj9o6SGPZmgy+szI3tUhh82jGWBAxGYn wmFpuWL8cMvVz1xuciBbt2t1XZaBtjG6ABxaHAHmsul/XorYcEPOa/QswGYwJScQSUiWVn n9i2JX0bswljsVzyOhfN79m2rN9CN8PHPA/lDrFPWPeQIUtaVwRaTcIWO2qW3A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698158263; a=rsa-sha256; cv=none; b=c1NR2Bfz/VHnD0DkhOOKV83uG3wWmNLnRLyo+fYlVTeNvw+cyXcW/UCDRFONeogM0QYk5h 5+ohg5BNFr9W/hE3lzibvJ/3YXFBTejOfyT5o1Y0ZRdJOMYK8YuugPExFEp8AXvoykY7W1 cVFZMb/p58fjzOa1lU4bHm8zKbdCTU0ep5Wauu7OXoBRyPzkePpSJi0AigiCovD0Eflgbx Q5lYYeDNQkeAYeRJ57FcOTYRHaR8Jh+YSx4dhWhQWANDpEDXR1QIbCSG1TVtYy0vToKhvQ xwdw9YMBgrVgqOKywNtWiq30lBMCzRxSfACXpFiQZy5wdeNX1hvlz29G/OYnkQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698158263; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=P507d6Lj+1sRsXDjVxgWlWxf+e44ep4OyaBX6uNTAXI=; b=OGwymgnusvt1QX7H8RDTzKNY/Nt0wRU7kpmmmXDQhYiYVpUnSR39S8jzdz+cI/gEMck/3Y kZ9rKgFHJ0pIJUcpMXw06GotishGLi7YH80iViUKL6ptyX4Gml/t+yk7fLYd5EQ5OBPqdP c3m1YkdM37cXLWqgQuRTh6jahzuJ4TMObIy+f7r30mYLhpyo+LgZV/WQT67tQQMwmokq7A g1MvG1R+FqYTlH2apRd+VG75YWahjepODWgaSeUrpoptkTRmIiYMe7afbZBL4UvBKVaDZx ettnFmOS7jlxOeb7jT1qZioQXwruMKPrPG2nNI5s6/8o5kci9d12BSwR/SK3Eg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SFF5g42DQzBy6; Tue, 24 Oct 2023 14:37: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 39OEbhlM089546; Tue, 24 Oct 2023 14:37:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39OEbhvV089543; Tue, 24 Oct 2023 14:37:43 GMT (envelope-from git) Date: Tue, 24 Oct 2023 14:37:43 GMT Message-Id: <202310241437.39OEbhvV089543@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: 8cb6243c3085 - releng/14.0 - kmsan: Add corresponding sysctl knob for loader tunable List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.0 X-Git-Reftype: branch X-Git-Commit: 8cb6243c3085b43e82096c775d8059ca61461318 Auto-Submitted: auto-generated The branch releng/14.0 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=8cb6243c3085b43e82096c775d8059ca61461318 commit 8cb6243c3085b43e82096c775d8059ca61461318 Author: Zhenlei Huang AuthorDate: 2023-10-12 10:14:49 +0000 Commit: Zhenlei Huang CommitDate: 2023-10-24 14:35:51 +0000 kmsan: Add corresponding sysctl knob for loader tunable The loader tunable 'debug.kmsan.disabled' does not have corresponding sysctl MIB entry. Add it so that it can be retrieved, and `sysctl -T` will also report it correctly. Reviewed by: markj Approved by: re (gjb) MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D42138 (cherry picked from commit 1d2b743784f7527a6840fe35ddb7e34cd41bc17a) (cherry picked from commit 1b289728e93d1000e6ca03354c8bc4209ea8da51) --- sys/kern/subr_msan.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/sys/kern/subr_msan.c b/sys/kern/subr_msan.c index 57caeb454b42..54948370a14a 100644 --- a/sys/kern/subr_msan.c +++ b/sys/kern/subr_msan.c @@ -108,15 +108,13 @@ static uint8_t msan_dummy_shad[PAGE_SIZE] __aligned(PAGE_SIZE); static uint8_t msan_dummy_write_shad[PAGE_SIZE] __aligned(PAGE_SIZE); static uint8_t msan_dummy_orig[PAGE_SIZE] __aligned(PAGE_SIZE); static msan_td_t msan_thread0; -static bool kmsan_enabled __read_mostly; - static bool kmsan_reporting = false; /* * Avoid clobbering any thread-local state before we panic. */ #define kmsan_panic(f, ...) do { \ - kmsan_enabled = false; \ + kmsan_disabled = true; \ panic(f, __VA_ARGS__); \ } while (0) @@ -142,6 +140,11 @@ SYSCTL_BOOL(_debug_kmsan, OID_AUTO, panic_on_violation, CTLFLAG_RWTUN, &panic_on_violation, 0, "Panic if an invalid access is detected"); +static bool kmsan_disabled __read_mostly = true; +#define kmsan_enabled (!kmsan_disabled) +SYSCTL_BOOL(_debug_kmsan, OID_AUTO, disabled, CTLFLAG_RDTUN | CTLFLAG_NOFETCH, + &kmsan_disabled, 0, "KMSAN is disabled"); + static MALLOC_DEFINE(M_KMSAN, "kmsan", "Kernel memory sanitizer"); /* -------------------------------------------------------------------------- */ @@ -599,7 +602,7 @@ kmsan_init(void) thread0.td_kmsan = &msan_thread0; /* Now officially enabled. */ - kmsan_enabled = true; + kmsan_disabled = false; } /* -------------------------------------------------------------------------- */ From nobody Tue Oct 24 14:37:44 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SFF5j0GWgz4y6s2; Tue, 24 Oct 2023 14:37: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 4SFF5h5z33z4l8g; Tue, 24 Oct 2023 14:37:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698158264; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RzFKzjGVZk439L/UR/+PR2cHpVQASDYHlIrlcM5Yq6Y=; b=byiLmmUUVT8kzm6ZThSp+d61Qd1ZkdA1GBbWE/Ef4Ry8n97D7XCxCGH00mRW4Qi/Qw5bng BtH4GjlvEcLxS8r2CD26I0WnCV6X4KWx6Qm2Ak4YGlVVTY50PjFiw/u7UIDenS6KNFoGqR KPYTU9wi0fgNlwA3yDLnQuyoMcxHKqteS0/QwnJ19oyGXd1zXFr7QcgbvrEFy0ChIe263B rs0n6evF3o4QF7UEj/5QBGOZxBV7FFO1+1I8gVnME88NXrDc2MgpbB0Y0fHyLr3qQNL3ru EIhCxPUszvhLv+TyfCTrWHYdO72uPuGnVFImxaFcGJRLwjlt3DuArVrqhgI+aA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698158264; a=rsa-sha256; cv=none; b=Q3FgRLuKWb93mCQV4KgPBMcRZ+ITawiCQ0o8klHEWHSpAmuRouBe4OmmyX1+MIMCqRnhDH jZgGPusdA9ixEwQfB/cWrWA15CQJxIYEweEdtKkg0eQobkX0Z0e3mv0KMAHwwWfC8hqzn6 h2UcEUZ2edachAU/z7Rk3GtkiC7wG2AN+LnMbfy1Hmnz7FiDIHQYgMWAfGQBrLobJ1fH8O +q3ilIGzXNTrLNHtV8TKQGVkdk6y0lxsxfwRODdtqyjXa7pdeDicTTcQvmmmI4mTU+hyuy t4k4ylFccYntCgYRfkG3sh1a137fHd/M5SU8X559Pbh522htCZWT+3uexN9eXQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698158264; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RzFKzjGVZk439L/UR/+PR2cHpVQASDYHlIrlcM5Yq6Y=; b=Kjcfj4p7tdIWk03zXbFnxVwULPMnejYE4zi0XZFr1ptSJX3kKlzeK3O3so4bsteZaVzaTn Y67oA135FFMKMCuFhEV2hXG4m8zd5a9Vy2yAp6jN3aQIPK57Ft5qo1QC8zYpbbIWaqweNa SQxpC+qTb8rFPQUrqkziZ7zmR+qV8GO44wapZlgFsA0MC3VXHGImneWRjlKb8cJDuob2pS CbudO53E+Wh3mVdp9zrBA2tQlaJB7hTaFgnLB3kdkQOYO74eAGBulGGvpNrx/+qG6HbgTI R1y4xAduMhP/Q9YuK1a7c/DHUGQKO5z+kh1/becGerV7KbTWzN1EedNmbHXp4A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SFF5h54XgzBt1; Tue, 24 Oct 2023 14:37: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 39OEbiD0089597; Tue, 24 Oct 2023 14:37:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39OEbiFH089594; Tue, 24 Oct 2023 14:37:44 GMT (envelope-from git) Date: Tue, 24 Oct 2023 14:37:44 GMT Message-Id: <202310241437.39OEbiFH089594@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: 5c23cc232716 - releng/14.0 - vm_page: Add corresponding sysctl knob for loader tunable List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.0 X-Git-Reftype: branch X-Git-Commit: 5c23cc232716a56d789a6c89681d520fcddc1696 Auto-Submitted: auto-generated The branch releng/14.0 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=5c23cc232716a56d789a6c89681d520fcddc1696 commit 5c23cc232716a56d789a6c89681d520fcddc1696 Author: Zhenlei Huang AuthorDate: 2023-10-12 10:14:49 +0000 Commit: Zhenlei Huang CommitDate: 2023-10-24 14:35:51 +0000 vm_page: Add corresponding sysctl knob for loader tunable The loader tunable 'vm.pgcache_zone_max_pcpu' does not have corresponding sysctl MIB entry. Add it so that it can be retrieved, and `sysctl -T` will also report it correctly. Reviewed by: markj Approved by: re (gjb) MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D42138 (cherry picked from commit a55fbda874db31b804490567c69502c891b6ff61) (cherry picked from commit cb5bc8a748dfefc68e3905e8fdf17e0484844383) --- sys/vm/vm_page.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/sys/vm/vm_page.c b/sys/vm/vm_page.c index 4f3c4ba2d4d7..8496a39154de 100644 --- a/sys/vm/vm_page.c +++ b/sys/vm/vm_page.c @@ -198,6 +198,11 @@ vm_page_init(void *dummy) bogus_page = vm_page_alloc_noobj(VM_ALLOC_WIRED); } +static int pgcache_zone_max_pcpu; +SYSCTL_INT(_vm, OID_AUTO, pgcache_zone_max_pcpu, + CTLFLAG_RDTUN | CTLFLAG_NOFETCH, &pgcache_zone_max_pcpu, 0, + "Per-CPU page cache size"); + /* * The cache page zone is initialized later since we need to be able to allocate * pages before UMA is fully initialized. @@ -209,9 +214,8 @@ vm_page_init_cache_zones(void *dummy __unused) struct vm_pgcache *pgcache; int cache, domain, maxcache, pool; - maxcache = 0; - TUNABLE_INT_FETCH("vm.pgcache_zone_max_pcpu", &maxcache); - maxcache *= mp_ncpus; + TUNABLE_INT_FETCH("vm.pgcache_zone_max_pcpu", &pgcache_zone_max_pcpu); + maxcache = pgcache_zone_max_pcpu * mp_ncpus; for (domain = 0; domain < vm_ndomains; domain++) { vmd = VM_DOMAIN(domain); for (pool = 0; pool < VM_NFREEPOOL; pool++) { From nobody Tue Oct 24 14:37:45 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SFF5k0YpZz4y6Vd; Tue, 24 Oct 2023 14:37:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SFF5k02fCz4l7Z; Tue, 24 Oct 2023 14:37:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698158266; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HZntKxgo+ErB8a+7esWlYNUeoTL7hhByzh9WCjEDdno=; b=eaYGDddSAqqy9PMYsr+hp3PWkhBqoRAfNBAZr39YCdvo4Odlzfr5t8/IH52C072MjuYuhc o0Oo62FA9TfGfVtOO5Xe7+afPtQT14JJFLEo3q5YJ7A57Evl1AnLS+Eeo3oCxRPMKZ9Ik8 La9WBV7jv/JE+D/KnMVNevFmpIf4GfRdITnmcLv1EHxuKcIJhDnMg9c2YDYEzwEieB6SlU viH9ruchPnmEFo7bdeBGwqTX3dC35QkJ2wKiQNwUfVjJ/8vRSETbM+jGWNAkTg6nQFGl+z pe8a27c1ksvO0wahSRTZ2hVLWVdjB7eXwWjZqMvLqFzuDaJTCJdLwFn4XMyAFg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698158266; a=rsa-sha256; cv=none; b=L7CYgpjpRpt44yMKpkYd3Chfz69ftQYa0dC5/CWwymeSptlhjVJXLL6GJty3X2xVhAG1S7 lwdhRelV2HQhbWXaejIeyVh5uFzNMjom3AUXvDltksEEairYwzjIqm2Z66Zyv9UUqIkGVN 7FTZWYhtX2toOrvA7KMp5lZTllU2/DtXx2lyu6PD6BeQLBkbmDohAMIdg9aTZLwnnQ4l/p yAC+VlVGbTciK4jucCgVxMzaOddrZ+vednppL16WLzdobhFvDorAN01BrpB2jKlM75dUQA 4JRPgEL78Db9orSfFlZyCfb+ip0H+miphNVTM7BrqU01cGB2OMMg4RncN3+ibQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698158266; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HZntKxgo+ErB8a+7esWlYNUeoTL7hhByzh9WCjEDdno=; b=wDJH9JD/ExGtBy1evHsogVulGdPGHeFa2ADmN8S2C6SqtnO++iLLEXo1fARGbU4XtNkW0J FeHo9N9IWSZK3igJrdeaele63nYUbVmIkDFVMcCoMTXLrLXT1y0Yuc+OpD8jTHbc4Ygs70 mw+hgHRO4Q+3JC5ILaRdbKePf8+MQK1MO3CC+lorLR/sEB4QgfHu0n2jq6X/cRaO834UTj jHPpVdKlBJV2pUEaVWCPsPEzop49tt7WqLo+wwML6yVNmLWgomViHeh3SdUxoCUINs6wUc OdDZH8slpjCR05igEF2Vsi7GJHwunjv0W8mFn0hUEqKIRr8X0g5EChiX7//c0Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SFF5j69lczC94; Tue, 24 Oct 2023 14:37: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 39OEbjZ1089648; Tue, 24 Oct 2023 14:37:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39OEbjRg089645; Tue, 24 Oct 2023 14:37:45 GMT (envelope-from git) Date: Tue, 24 Oct 2023 14:37:45 GMT Message-Id: <202310241437.39OEbjRg089645@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: 00b630cf6262 - releng/14.0 - vm_phys: Add corresponding sysctl knob for loader tunable List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.0 X-Git-Reftype: branch X-Git-Commit: 00b630cf6262bfc4ec0a434976c6544c57dc3e04 Auto-Submitted: auto-generated The branch releng/14.0 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=00b630cf6262bfc4ec0a434976c6544c57dc3e04 commit 00b630cf6262bfc4ec0a434976c6544c57dc3e04 Author: Zhenlei Huang AuthorDate: 2023-10-12 10:14:49 +0000 Commit: Zhenlei Huang CommitDate: 2023-10-24 14:35:51 +0000 vm_phys: Add corresponding sysctl knob for loader tunable The loader tunable 'vm.numa.disabled' does not have corresponding sysctl MIB entry. Add it so that it can be retrieved, and `sysctl -T` will also report it correctly. Reviewed by: markj Approved by: re (gjb) MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D42138 (cherry picked from commit c415cfc8be1b732a80f1ada6d52091e08eeb9ab5) (cherry picked from commit e26b7e8d02f648623ad343016533487634a16698) --- sys/vm/vm_phys.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/sys/vm/vm_phys.c b/sys/vm/vm_phys.c index 108297caac49..bc992bdfc58b 100644 --- a/sys/vm/vm_phys.c +++ b/sys/vm/vm_phys.c @@ -76,6 +76,12 @@ _Static_assert(sizeof(long long) >= sizeof(vm_paddr_t), #ifdef NUMA struct mem_affinity __read_mostly *mem_affinity; int __read_mostly *mem_locality; + +static int numa_disabled; +static SYSCTL_NODE(_vm, OID_AUTO, numa, CTLFLAG_RD | CTLFLAG_MPSAFE, 0, + "NUMA options"); +SYSCTL_INT(_vm_numa, OID_AUTO, disabled, CTLFLAG_RDTUN | CTLFLAG_NOFETCH, + &numa_disabled, 0, "NUMA-awareness in the allocators is disabled"); #endif int __read_mostly vm_ndomains = 1; @@ -627,15 +633,14 @@ vm_phys_register_domains(int ndomains, struct mem_affinity *affinity, int *locality) { #ifdef NUMA - int d, i; + int i; /* * For now the only override value that we support is 1, which * effectively disables NUMA-awareness in the allocators. */ - d = 0; - TUNABLE_INT_FETCH("vm.numa.disabled", &d); - if (d) + TUNABLE_INT_FETCH("vm.numa.disabled", &numa_disabled); + if (numa_disabled) ndomains = 1; if (ndomains > 1) { From nobody Tue Oct 24 14:37:46 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SFF5l1YQMz4y6Vj; Tue, 24 Oct 2023 14:37: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 4SFF5l0xCzz4lBK; Tue, 24 Oct 2023 14:37:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698158267; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ePjS6KX5bmTdl5s8N5HIm1jokUc6BSoWVpU2hiUstWI=; b=wyjMlIRwmBExm1QK2xlVn6hI7iLhFNYVnj0Sx5x/AN9s7+bHqGvPeb8Rg2QVR5+D9sHgdJ qyIfs2i9CFFysj7XUmx9ErfbT51xVVIRYZnC5EK9uheoSNCFBTCGRhu/Ka5elx3Zowaqkm 7W/4/2dtRVcToFkH5XAajTLzw8f3T/ir/Thd61oSEcppoVXo5UhG4kahjVgBEys2uTXy8i 6na8VZNVQ27TdPWzrsJIyUFSpObV7LI/QCUJQ8akr8a+ZlICVbT2ea0/5yfnwlOkFnvF0P j9KFalBmGYxoqxObKMNJXCyaMR7tbXPapHaK2CwSsyENuHtHgZIndyZKZzHcaA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698158267; a=rsa-sha256; cv=none; b=tXbsjYiH7gaezP8qPpN3BVUn4IQ6oLKDX9+lX7v91ZZx5vVVCcZrPtlv6y6lxXcZAH3tam MFJrZpc4/XseRNikhpdx31PgAB9MPGiQfejCJyuRoZa8STBI8z0r34LcHMch9w+hR0oloB MEvyCmzpehT93gguxOffSgVjoZKLKuvJXn88DpyYOicXGEdd955JFsBXt3GbtNt9pb33xw 7e+ihHSKVz2Ef6v4P6JqX+LThGufVNqf6sDRUnh/7p6gNO2+xjT5s5obMxAVfJrUIzNqkf kiurV6d+s/dVOsDLUqbKhtjjS5odyoC2OoZ+MNsseUx4fOvDsxjn2QR3HBCSCQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698158267; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ePjS6KX5bmTdl5s8N5HIm1jokUc6BSoWVpU2hiUstWI=; b=Bnvn1y5IUYfNtY7cL62lWoUMybQdK+qUH3Nu9jtvapIXC7AjGE5tLIAJLw2fAWBM+zxzlE fkqLg0or7RPEiQ+85uz8MCmApH1XTTEwYHaLujm5XoG39X59IUCjijEfmK5UfBj4QOXGQZ fyO6M0lzOHXPqIzu/ij/x5w6dQ5zyxbrMo0UIrxDCJvot5XIIatIRrJTq7MgkHS6PD5WRU 5xGV3Q7bdNNeiOMUv3vzM9KvdJ5JBctE3XPubequshYTMTNm+aQAhL1KSmcHmOZXs+Y9Kv tFum2JA26z9UZcIihFOSdXg/E2fmWUM2308o3xuPUFN39elPYbaV/pQ1k05FJw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SFF5l02lTzBt2; Tue, 24 Oct 2023 14:37: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 39OEbkk8089703; Tue, 24 Oct 2023 14:37:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39OEbk5b089700; Tue, 24 Oct 2023 14:37:46 GMT (envelope-from git) Date: Tue, 24 Oct 2023 14:37:46 GMT Message-Id: <202310241437.39OEbk5b089700@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: ecadbb2905b4 - releng/14.0 - vmx: Prefer consistent naming for loader tunables List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.0 X-Git-Reftype: branch X-Git-Commit: ecadbb2905b41f288ee239d40c64f8be6a27eb62 Auto-Submitted: auto-generated The branch releng/14.0 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=ecadbb2905b41f288ee239d40c64f8be6a27eb62 commit ecadbb2905b41f288ee239d40c64f8be6a27eb62 Author: Zhenlei Huang AuthorDate: 2023-10-19 17:18:25 +0000 Commit: Zhenlei Huang CommitDate: 2023-10-24 14:35:51 +0000 vmx: Prefer consistent naming for loader tunables The following loader tunables do have corresponding sysctl MIBs but with different names. That may be historical reason. Let's prefer consistent naming for them so that it will be easier to read and maintain. 1. hw.vmm.l1d_flush -> hw.vmm.vmx.l1d_flush 2. hw.vmm.l1d_flush_sw -> hw.vmm.vmx.l1d_flush_sw 3. hw.vmm.vmx.use_apic_pir -> hw.vmm.vmx.cap.posted_interrupts 4. hw.vmm.vmx.use_apic_vid -> hw.vmm.vmx.cap.virtual_interrupt_delivery 5. hw.vmm.vmx.use_tpr_shadowing -> hw.vmm.vmx.cap.tpr_shadowing Old names are kept for compatibility. Meanwhile, add sysctl flag CTLFLAG_TUN to them so that `sysctl -T` will report them correctly. Reviewed by: corvink, jhb, kib, #bhyve Approved by: re (gjb) MFC after: 5 days Differential Revision: https://reviews.freebsd.org/D42251 (cherry picked from commit f3ff0918ffcdbcb4c39175f3f9be70999edb14e8) (cherry picked from commit 9e48b627aed346bf5e950134a581218d3097eb7c) --- sys/amd64/vmm/intel/vmx.c | 32 +++++++++++++++++++++++++++----- 1 file changed, 27 insertions(+), 5 deletions(-) diff --git a/sys/amd64/vmm/intel/vmx.c b/sys/amd64/vmm/intel/vmx.c index 51c6afe5a7da..317ed7e5d7fb 100644 --- a/sys/amd64/vmm/intel/vmx.c +++ b/sys/amd64/vmm/intel/vmx.c @@ -192,15 +192,18 @@ SYSCTL_INT(_hw_vmm_vmx_cap, OID_AUTO, invpcid, CTLFLAG_RD, &cap_invpcid, 0, "Guests are allowed to use INVPCID"); static int tpr_shadowing; -SYSCTL_INT(_hw_vmm_vmx_cap, OID_AUTO, tpr_shadowing, CTLFLAG_RD, +SYSCTL_INT(_hw_vmm_vmx_cap, OID_AUTO, tpr_shadowing, + CTLFLAG_RDTUN | CTLFLAG_NOFETCH, &tpr_shadowing, 0, "TPR shadowing support"); static int virtual_interrupt_delivery; -SYSCTL_INT(_hw_vmm_vmx_cap, OID_AUTO, virtual_interrupt_delivery, CTLFLAG_RD, +SYSCTL_INT(_hw_vmm_vmx_cap, OID_AUTO, virtual_interrupt_delivery, + CTLFLAG_RDTUN | CTLFLAG_NOFETCH, &virtual_interrupt_delivery, 0, "APICv virtual interrupt delivery support"); static int posted_interrupts; -SYSCTL_INT(_hw_vmm_vmx_cap, OID_AUTO, posted_interrupts, CTLFLAG_RD, +SYSCTL_INT(_hw_vmm_vmx_cap, OID_AUTO, posted_interrupts, + CTLFLAG_RDTUN | CTLFLAG_NOFETCH, &posted_interrupts, 0, "APICv posted interrupt support"); static int pirvec = -1; @@ -213,10 +216,10 @@ SYSCTL_UINT(_hw_vmm_vmx, OID_AUTO, vpid_alloc_failed, CTLFLAG_RD, &vpid_alloc_failed, 0, NULL); int guest_l1d_flush; -SYSCTL_INT(_hw_vmm_vmx, OID_AUTO, l1d_flush, CTLFLAG_RD, +SYSCTL_INT(_hw_vmm_vmx, OID_AUTO, l1d_flush, CTLFLAG_RDTUN | CTLFLAG_NOFETCH, &guest_l1d_flush, 0, NULL); int guest_l1d_flush_sw; -SYSCTL_INT(_hw_vmm_vmx, OID_AUTO, l1d_flush_sw, CTLFLAG_RD, +SYSCTL_INT(_hw_vmm_vmx, OID_AUTO, l1d_flush_sw, CTLFLAG_RDTUN | CTLFLAG_NOFETCH, &guest_l1d_flush_sw, 0, NULL); static struct msr_entry msr_load_list[1] __aligned(16); @@ -832,8 +835,12 @@ vmx_modinit(int ipinum) &tmp); if (error == 0) { tpr_shadowing = 1; +#ifndef BURN_BRIDGES TUNABLE_INT_FETCH("hw.vmm.vmx.use_tpr_shadowing", &tpr_shadowing); +#endif + TUNABLE_INT_FETCH("hw.vmm.vmx.cap.tpr_shadowing", + &tpr_shadowing); } if (tpr_shadowing) { @@ -854,8 +861,12 @@ vmx_modinit(int ipinum) procbased2_vid_bits, 0, &tmp); if (error == 0 && tpr_shadowing) { virtual_interrupt_delivery = 1; +#ifndef BURN_BRIDGES TUNABLE_INT_FETCH("hw.vmm.vmx.use_apic_vid", &virtual_interrupt_delivery); +#endif + TUNABLE_INT_FETCH("hw.vmm.vmx.cap.virtual_interrupt_delivery", + &virtual_interrupt_delivery); } if (virtual_interrupt_delivery) { @@ -881,8 +892,12 @@ vmx_modinit(int ipinum) } } else { posted_interrupts = 1; +#ifndef BURN_BRIDGES TUNABLE_INT_FETCH("hw.vmm.vmx.use_apic_pir", &posted_interrupts); +#endif + TUNABLE_INT_FETCH("hw.vmm.vmx.cap.posted_interrupts", + &posted_interrupts); } } } @@ -899,7 +914,10 @@ vmx_modinit(int ipinum) guest_l1d_flush = (cpu_ia32_arch_caps & IA32_ARCH_CAP_SKIP_L1DFL_VMENTRY) == 0; +#ifndef BURN_BRIDGES TUNABLE_INT_FETCH("hw.vmm.l1d_flush", &guest_l1d_flush); +#endif + TUNABLE_INT_FETCH("hw.vmm.vmx.l1d_flush", &guest_l1d_flush); /* * L1D cache flush is enabled. Use IA32_FLUSH_CMD MSR when @@ -911,8 +929,12 @@ vmx_modinit(int ipinum) if (guest_l1d_flush) { if ((cpu_stdext_feature3 & CPUID_STDEXT3_L1D_FLUSH) == 0) { guest_l1d_flush_sw = 1; +#ifndef BURN_BRIDGES TUNABLE_INT_FETCH("hw.vmm.l1d_flush_sw", &guest_l1d_flush_sw); +#endif + TUNABLE_INT_FETCH("hw.vmm.vmx.l1d_flush_sw", + &guest_l1d_flush_sw); } if (guest_l1d_flush_sw) { if (nmi_flush_l1d_sw <= 1) From nobody Tue Oct 24 14:37:48 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SFF5m2ZpCz4y6M4; Tue, 24 Oct 2023 14:37: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 4SFF5m1nBNz4lS2; Tue, 24 Oct 2023 14:37:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698158268; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+BM+aIzfuXcq+r7dq9nShKwF8/eNPvoxrp/OQSarbQA=; b=gg20wqU3fAkFnmykwwbCGrQBJvOJ+ENoM4goBNzKb8uY0aCDpvX1h6iWfgIV5TyTtEDraK u+uuQYhqQjQiGxR5C6KLWoPQ3SFTtoV7xNfI2lsYAwnrBzl9LdU8/NMxGIfBhAgGMW1ze9 6WPtvIqHkn8CYNP4ytnl/tIJYjpuIjkV8q6xPlXyrZ/1L+JLAWu/0feY+qKT5A3mbkkC97 lv4C8CVek5eYvORPMterQIwc3P8kNs7jdRGEtX1FXynwksgFikz7mkpbR6mAUMbootGHsK lYwkOi5Fa46fxdbByLIrK90dfI2/UwT/b4m+oQKhlzz7yqMtVci+UFXo2dN69w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698158268; a=rsa-sha256; cv=none; b=Zw5iY6PLkj9b/DxFM22+P2WiRUf/UxQSk12DntS51IVtc390ZSwA1olTeUYeCET77sKUdX dNa3enk2qHFFLx0gH6sKzgAblb8b//v/amPSShXA4fiyELSJVj+p72m45jiEjZE7bDk1YE IVY2VJ5hO5bFN31IOciWxd7GAZK8GnkX7CIGCOBoQ/IIBrY1gV23eF0A+w3af6/cPXz2Jo KQf2qppFTrYwJ3nMXmvoQ8XbrvzCxmwGqTDqwtJKlIa5GynCMdf68tDMqTZzAjPqfuJhVb WaalZj0QLt4Poewgm47aqsKtJG/hmw7jl3qiU8Lg8WuNyHeusTXDqsN4JE72hQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698158268; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+BM+aIzfuXcq+r7dq9nShKwF8/eNPvoxrp/OQSarbQA=; b=v6y8dddGSL6oMaLPIdPP5h7lgWtaNSq987s1SwfzfenLuUWRmOQ43VrzsLayfA2RO1Efll Es3DDYHIiPx65cAskSgR1+mBw03g8pcEeTVDMLWiGgvpUSN++fqYN/9aC4F4KspQ7CIcCe cr/Eq83ldluanU42j9oyjawFWnJQRFdZUS9zXaRpXbmycp3VXVn8v3jWGRj8ZeEc/7vV2M XAbw5+69EjmXyH44MmnQU33elBFNXX0DXcHBW85Y9KbglTcYVqGdIgm0IwIYqXFbrjy0mo Jl66lB/nJMBfaCb6tvjnlpyGV+1lHbNueWMMLL3XopUqJh25Lb+R0tOgOkad5w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SFF5m0tcWzBpv; Tue, 24 Oct 2023 14:37: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 39OEbmTg089761; Tue, 24 Oct 2023 14:37:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39OEbmME089758; Tue, 24 Oct 2023 14:37:48 GMT (envelope-from git) Date: Tue, 24 Oct 2023 14:37:48 GMT Message-Id: <202310241437.39OEbmME089758@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: 8934fcb4983e - releng/14.0 - amd64 pmap: Prefer consistent naming for loader tunable List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.0 X-Git-Reftype: branch X-Git-Commit: 8934fcb4983ea74fa0b741add4d8b1bd65fa0c54 Auto-Submitted: auto-generated The branch releng/14.0 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=8934fcb4983ea74fa0b741add4d8b1bd65fa0c54 commit 8934fcb4983ea74fa0b741add4d8b1bd65fa0c54 Author: Zhenlei Huang AuthorDate: 2023-10-20 07:31:44 +0000 Commit: Zhenlei Huang CommitDate: 2023-10-24 14:35:51 +0000 amd64 pmap: Prefer consistent naming for loader tunable The sysctl knob 'vm.pmap.allow_2m_x_ept' is loader tunable and have public document entry in security(7) but is fetched from kernel environment 'hw.allow_2m_x_ept'. That is inconsistent and obscure. As there is public security advisory FreeBSD-SA-19:25.mcepsc [1], people may refer to it and use 'hw.allow_2m_x_ept', let's keep old name for compatibility. [1] https://www.freebsd.org/security/advisories/FreeBSD-SA-19:25.mcepsc.asc Reviewed by: kib Approved by: re (gjb) Fixes: c08973d09c95 Workaround for Intel SKL002/SKL012S errata MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D42311 (cherry picked from commit 9e7f349ff10691c2e3fb03898dbc942794a47566) (cherry picked from commit 8784b153a31fc0b3a12449a2f0377eb038e6fb7b) --- sys/amd64/amd64/pmap.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sys/amd64/amd64/pmap.c b/sys/amd64/amd64/pmap.c index b10997fd657b..38eab9969bb2 100644 --- a/sys/amd64/amd64/pmap.c +++ b/sys/amd64/amd64/pmap.c @@ -2342,7 +2342,10 @@ pmap_allow_2m_x_ept_recalculate(void) CPUID_TO_MODEL(cpu_id) == 0x57 || /* Knights */ CPUID_TO_MODEL(cpu_id) == 0x85)))) pmap_allow_2m_x_ept = 1; +#ifndef BURN_BRIDGES TUNABLE_INT_FETCH("hw.allow_2m_x_ept", &pmap_allow_2m_x_ept); +#endif + TUNABLE_INT_FETCH("vm.pmap.allow_2m_x_ept", &pmap_allow_2m_x_ept); } static bool From nobody Tue Oct 24 14:37:49 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SFF5n5Dzcz4y6vj; Tue, 24 Oct 2023 14:37: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 4SFF5n3Hxdz4lVF; Tue, 24 Oct 2023 14:37:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698158269; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vHRfU4Vm+3bGQMru1d32EpuV6FRc7cba7msqkXoFmAc=; b=hnvEj+QiDOsZx1qnev4p2/PXguRpJcMEnxXHskT/EFLxiKoUK+84okLWAtsaQqmci8e3P/ vSDsmwYS2s4GAjZUZDtYliBBCDRQixbd1QzwjYvwvIePuTo4dnOiHk7y0IXaGS0MpGMnSf eWaH00RR4FXrL61hhy+00taB74MlxstqQkiDAu2gBR0O2Zus8DxNq/X1PAoC5BbLIgMq3+ 9jguNenyaOFnnE9FORBfnzFoHl69qhjTRxqH7LhGzMRc10b7iC5LW6427lm6KeYsRDGr5P uH6E+0c+kkqn2Ki2my1U5nqbaUESNL36RWMH7x7dUF8zZ9tdZUVZMOzFty0hmw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698158269; a=rsa-sha256; cv=none; b=uzIdlzbpOLBbD3e4QiEbYHGe7o3GQ2uXmif/S2bi/VXUpx/nhZOLjpYpaxnyNiIPi4lT9Q YVcKbnMjSAxZp4uUc22dWABCsRMamFBaV62JO63W10RIZ+oBljL/PRm4nqJ4IQNbyxvAWD t/eq3XewmnfCmKV84saugJ9ZtbUyJ3x3bXeWrS4VJDn8uqvBS4COV1Mg8nRqLuHqSmW6px Z+FHhCeA1/9b9Y8vW3QRnsBTZS6NuA16RarUYVvtPeSR6u/f88D9tNycOdvoHH+ChBOSle TOQEGbLeTB2o+84hcbpzgI1dDPqjamvfKlHJsRe6gp0MKnCnuBGaMNxyu0gPOQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698158269; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vHRfU4Vm+3bGQMru1d32EpuV6FRc7cba7msqkXoFmAc=; b=ycQ4usdn6ziYU+nh3He4l5CR+owTuhHg+3vgWvg8XjAFB1w5gz7mqlBsnSrymdSP9QOBQW ju/hqwIaJVpgZM+q2Ywhm8EbadxsCS1wku7cvgjrKp1oxYWDDmN96o4fy64n/IP/MC3j1c CEG3b1BZyVGyD3mCKyJjT2gX+6xRABsh2guAFB3sGcrPut4yGbprPL8YFhHsUVTPpWJz9s ctbVNG5eNepQL4BluIdXpV7CTxIlXyeX5YnXy5PcqZ+lVjYeGc9JeEObk3loXzwojEMNVG by+rSheCZ+YF46SMCjch8UoUX1ve6OTGgLtVRVpf5L9MSf7Uh3VYEQjhgSR2Lg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SFF5n27RYzBy7; Tue, 24 Oct 2023 14:37: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 39OEbnh9089811; Tue, 24 Oct 2023 14:37:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39OEbnjS089808; Tue, 24 Oct 2023 14:37:49 GMT (envelope-from git) Date: Tue, 24 Oct 2023 14:37:49 GMT Message-Id: <202310241437.39OEbnjS089808@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: 62d60fad87db - releng/14.0 - x86: Prefer consistent naming for loader tunables List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.0 X-Git-Reftype: branch X-Git-Commit: 62d60fad87dbb65cfd0088c424c6f66e36d566c4 Auto-Submitted: auto-generated The branch releng/14.0 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=62d60fad87dbb65cfd0088c424c6f66e36d566c4 commit 62d60fad87dbb65cfd0088c424c6f66e36d566c4 Author: Zhenlei Huang AuthorDate: 2023-10-17 07:05:25 +0000 Commit: Zhenlei Huang CommitDate: 2023-10-24 14:35:52 +0000 x86: Prefer consistent naming for loader tunables The following loader tunables do have corresponding sysctl MIBs but with inconsistent naming. That may be historical reason. Let's prefer consistent naming for them so that it will be easier to maintain. 1. hw.dmar.timeout -> hw.iommu.dmar.timeout 2. hw.lapic_eoi_suppression -> hw.apic.eoi_suppression 3. hw.lapic_tsc_deadline -> hw.apic.timer_tsc_deadline 4. hw.x2apic_enable -> hw.apic.x2apic_mode Those tunables are for field debugging, no need to keep old names for compatibility. Reviewed by: kib Approved by: re (gjb) MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D42248 (cherry picked from commit 12cce5994b92f8235f379d660ccb28da8e69f55b) (cherry picked from commit 6cd7e3d118f247a8f6bc0f8162a9cb67155b7c76) --- sys/x86/acpica/madt.c | 2 +- sys/x86/iommu/intel_drv.c | 2 +- sys/x86/x86/local_apic.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/x86/acpica/madt.c b/sys/x86/acpica/madt.c index 3d7c5a67375b..200eec1fbb28 100644 --- a/sys/x86/acpica/madt.c +++ b/sys/x86/acpica/madt.c @@ -221,7 +221,7 @@ madt_setup_local(void) else if (bootverbose) printf("x2APIC available but disabled %s\n", reason); user_x2apic = x2apic_mode; - TUNABLE_INT_FETCH("hw.x2apic_enable", &user_x2apic); + TUNABLE_INT_FETCH("hw.apic.x2apic_mode", &user_x2apic); if (user_x2apic != x2apic_mode) { if (bios_x2apic && !user_x2apic) printf("x2APIC disabled by tunable and " diff --git a/sys/x86/iommu/intel_drv.c b/sys/x86/iommu/intel_drv.c index a5821df6b835..ebdf24976504 100644 --- a/sys/x86/iommu/intel_drv.c +++ b/sys/x86/iommu/intel_drv.c @@ -429,7 +429,7 @@ dmar_attach(device_t dev) dmar_quirks_post_ident(unit); timeout = dmar_get_timeout(); - TUNABLE_UINT64_FETCH("hw.dmar.timeout", &timeout); + TUNABLE_UINT64_FETCH("hw.iommu.dmar.timeout", &timeout); dmar_update_timeout(timeout); for (i = 0; i < DMAR_INTR_TOTAL; i++) diff --git a/sys/x86/x86/local_apic.c b/sys/x86/x86/local_apic.c index b382368cc626..012aa1e9a836 100644 --- a/sys/x86/x86/local_apic.c +++ b/sys/x86/x86/local_apic.c @@ -493,7 +493,7 @@ lapic_init(vm_paddr_t addr) (cpu_feature2 & CPUID2_TSCDLT) != 0 && tsc_is_invariant && tsc_freq != 0) { lapic_timer_tsc_deadline = 1; - TUNABLE_INT_FETCH("hw.lapic_tsc_deadline", + TUNABLE_INT_FETCH("hw.apic.timer_tsc_deadline", &lapic_timer_tsc_deadline); } @@ -526,7 +526,7 @@ lapic_init(vm_paddr_t addr) "KVM -- disabling lapic eoi suppression\n"); lapic_eoi_suppression = 0; } - TUNABLE_INT_FETCH("hw.lapic_eoi_suppression", + TUNABLE_INT_FETCH("hw.apic.eoi_suppression", &lapic_eoi_suppression); } From nobody Tue Oct 24 15:58:51 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SFGvH3bhnz4yC5Q; Tue, 24 Oct 2023 15:58: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 4SFGvH2cjNz4tpl; Tue, 24 Oct 2023 15:58:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698163131; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Hqcviu8u+9//laSUTtTUexXVw5zyVA8BiL1Hb+jSoQE=; b=PfjQSXxdVgh+38iht99Jd+qEDq00fiJ+qjUmjMumvo4I/iNKRoH7bVVJjoaCelJhfrMKly ZcpDZUXfypVjHrzL9gELuSf2zZbVLEw9E1KblrVFFj8cnKmMCWOxmMYtgaYYnjrFC9dN9O qJnZ1LiC6w8dh3XQtWtoWKfgHFj3JE5GThEiqkWSjM+2IjjHbTQOIqxLG31OfZJygWVVFT sbz7QVBQNyVzGn/g9QKk+wIcHU/fOCZ3tWhvIwp9ean9ObcBpKOoPZOxhpZQascrgENx15 A7dcQd32/xyNka7+tpBJg1qFZlRQcEFCI0yw/60iuO3dl6pHlWVWob0686i5Mw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698163131; a=rsa-sha256; cv=none; b=FE2BnA3bATDJ11VyHxVZBxCumgVTZMrJoeKrRMqv8sTqJgJDNbfQo18Gs7RkMFAn/QKAW0 IJmjI5gd++YMwzo9IfBwvxcAKy/2r4FyF+0CUb0UCw4O7f+N6z2GmerbSkRXP2MKQslVFG 84SS6ezYkL4zoZU4Nks9n5cHJcpCEXR6KvMlC3zWR3GI7OWmRpR+EE1jkz2TiBvzpWMHR9 Z/YSnGdei7V8jp6/KUoDnb4ypRMY60gneGG+CPy9x7IBl70Ss/rHmqNO6UpVPej1MwJfzN vfaHrrqXimBGtgL7ye3FZnPV6Hh7usNR8K7Ap3sq5XJYrXn+Bi0hO6D/HNdZdg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698163131; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Hqcviu8u+9//laSUTtTUexXVw5zyVA8BiL1Hb+jSoQE=; b=n1lKGhJZZtPfiUtd4lY9U55Fjc98JY/uflYFIO7sajwjy5zUq/htl/xb+w7P49vx3HBDP7 0ohDn/QHhlJSDAnt/puV8U6Sz2CpChQRtFwyMJt3Bi+vXwagl2sSjl8sxyvF2yPlFNEqJz yCyxq6rm1qOl2g4kafXcYCLgBfK4WQQsLF4h6tdMsgnFotnLtAXW5wkxzMMXBx76QCmQxL u6FUefLaSiJBqv8p7lk5GxqHP5ckdM/mVh2GgNPHo85umV5ijzH/Wj2DxrSSFY1mkA5+8r HZMpyUnKs+OdHxq9MFe1OpuC68OCBk5Zt3OlIDp6vH9k9nitp6j3LZqTiCXWsg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SFGvH1htxzTbq; Tue, 24 Oct 2023 15:58: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 39OFwpQM022483; Tue, 24 Oct 2023 15:58:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39OFwpmn022480; Tue, 24 Oct 2023 15:58:51 GMT (envelope-from git) Date: Tue, 24 Oct 2023 15:58:51 GMT Message-Id: <202310241558.39OFwpmn022480@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Martin Matuska Subject: git: ee3a92d1bffc - releng/14.0 - zfs: cherry-pick change from master List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mm X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.0 X-Git-Reftype: branch X-Git-Commit: ee3a92d1bffc27a6a341b97d3a1d2d166fed1d3a Auto-Submitted: auto-generated The branch releng/14.0 has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=ee3a92d1bffc27a6a341b97d3a1d2d166fed1d3a commit ee3a92d1bffc27a6a341b97d3a1d2d166fed1d3a Author: Martin Matuska AuthorDate: 2023-10-20 17:30:32 +0000 Commit: Martin Matuska CommitDate: 2023-10-24 15:54:47 +0000 zfs: cherry-pick change from master #15405 ea30b5a9e Set spa_ccw_fail_time=0 when expanding a vdev Fixes 5-minute autoexpand delay on ZFS-root VM images. Approved by: re (gjb) Requested by: cperciva Co-Authored-By: Colin Percival Obtained from: OpenZFS OpenZFS commit: ea30b5a9e0d266baa13398ed8f9435de050f4b25 (cherry picked from commit c458bf557d66161730ce644af840e968397a377b) --- sys/contrib/openzfs/module/zfs/vdev.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/contrib/openzfs/module/zfs/vdev.c b/sys/contrib/openzfs/module/zfs/vdev.c index 87c145593237..afb01c0ef7fd 100644 --- a/sys/contrib/openzfs/module/zfs/vdev.c +++ b/sys/contrib/openzfs/module/zfs/vdev.c @@ -4215,6 +4215,7 @@ vdev_online(spa_t *spa, uint64_t guid, uint64_t flags, vdev_state_t *newstate) /* XXX - L2ARC 1.0 does not support expansion */ if (vd->vdev_aux) return (spa_vdev_state_exit(spa, vd, ENOTSUP)); + spa->spa_ccw_fail_time = 0; spa_async_request(spa, SPA_ASYNC_CONFIG_UPDATE); } From nobody Tue Oct 24 16:12:12 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SFHBh66lqz4yCpW; Tue, 24 Oct 2023 16:12: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 4SFHBh5hZsz4vvM; Tue, 24 Oct 2023 16:12:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698163932; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OP5X9xtLqlJcOxvHhbb2XbJscbkrl7RtdMHp7lZojKI=; b=ucVaIHeBBl+lT5ChfEm4jdv4+CjFQCyhocRkLjtH3nuRzXN/NxWaiMnhOjzxUWxCJp7RXc okUijcqrkiCE/floGzEonuyAXOkS1SGTC/bPqjjrIenCkYMy+X6+NG8CzhKd7+zyxo9zEY E6gezyEUUHbD3+M47mcj+mM2QwoEUQbXxF3tfr6Bic0oBmhtT8/qi5ZzDDpKLJGMR51ByN 50+cOK5AgyhjkzuzQ69t49Q9kPp10V6BD8mSK1aRenl2cGcpCEIigsl+tc0oYiDHRYPTLO oRLt+aIINScZy3RXUiCGvxQFJ6etkKxzxEcBIkIPz++OZFyofkqTwLerFZvCpw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698163932; a=rsa-sha256; cv=none; b=Atx1VxbLFNb0m3bIaPolZx2CnKsF8DrYtgXCQCABRnOU5ux7DLMI7PGuBXbHhB3N3o1cji qChq7aHtmYnTBPFiogxRPubguPcWwJ/hESi8ZBxsC77Fwgf5x14tFyCJcjIH8xHqpuihVQ DSt5X9jFsEx3bffGVOleU04oVvN/Cjwijlj9ClB+fDuFZeL5pqyPVNJmFaWf/d5QlgMG// T0h9s5UBK7C0kzXaJ+FEg7tB9WjRisJtjMcWyFRToTszpSo7JDVpaftVtGDPDtFw7d8eD5 tdBGLGca3YJbCljtVTRCRVj4eRjM6jSQiD8+fuWQHrH0eHE+LPSw41fdB6mwxQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698163932; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OP5X9xtLqlJcOxvHhbb2XbJscbkrl7RtdMHp7lZojKI=; b=I4y9NzMe/ol26NM5cZYckROD4xsN0Lu4AgLr5zE+niylVKSePku9YH/LOYVMMWwEw0idky d08d89MrcFjI6nQa5Fa/5rl15s2Mml9zmavJzJ23RNR+oK6hgfg5EKYbA8ROMIcYBDns6y itFYa6aUe1AXyzauGtwRDVYSQTOMSfAhvLyq96cJTO+uZ8tuq+powPKL2MZn4xdXdAKlp9 flCamm8JODsrX2NIpgrfpo2aeSI0IOt8B2/2sGvi74pr00qthvYavma1LAJXFaZwgUcThj s57nPzgd22NiUZnfW6iOrmO75YVh6xqYjEAFofZjp5wbaD2UJT3LSoSiwy6wrQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SFHBh4mWHzVd0; Tue, 24 Oct 2023 16:12: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 39OGCCBZ053908; Tue, 24 Oct 2023 16:12:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39OGCCVf053905; Tue, 24 Oct 2023 16:12:12 GMT (envelope-from git) Date: Tue, 24 Oct 2023 16:12:12 GMT Message-Id: <202310241612.39OGCCVf053905@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: e34fdb7c119e - releng/14.0 - freebsd-update: create deep BEs by default List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.0 X-Git-Reftype: branch X-Git-Commit: e34fdb7c119e2913d0910033e6a26fd6c08b9503 Auto-Submitted: auto-generated The branch releng/14.0 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=e34fdb7c119e2913d0910033e6a26fd6c08b9503 commit e34fdb7c119e2913d0910033e6a26fd6c08b9503 Author: Kyle Evans AuthorDate: 2023-10-12 02:51:07 +0000 Commit: Kyle Evans CommitDate: 2023-10-24 16:12:01 +0000 freebsd-update: create deep BEs by default The -r flag to bectl needs to go away, and we need to just do the right thing. In the meantime, we can apply an -r in freebsd-update as a minimal fix to stop creating partial backups in these (non-default) deep BE setups. PR: 267535 Approved by: re (gjb) (cherry picked from commit 989c5f6da99081b1f2b76ec09e91078e531e1250) (cherry picked from commit 5c2a559876d123ba386612319bf42e7b32dee590) --- usr.sbin/freebsd-update/freebsd-update.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/freebsd-update/freebsd-update.sh b/usr.sbin/freebsd-update/freebsd-update.sh index c6432dcd6b0e..438e13a51154 100644 --- a/usr.sbin/freebsd-update/freebsd-update.sh +++ b/usr.sbin/freebsd-update/freebsd-update.sh @@ -916,7 +916,7 @@ install_create_be () { echo -n "Creating snapshot of existing boot environment... " VERSION=`freebsd-version -ku | sort -V | tail -n 1` TIMESTAMP=`date +"%Y-%m-%d_%H%M%S"` - bectl create ${VERSION}_${TIMESTAMP} + bectl create -r ${VERSION}_${TIMESTAMP} if [ $? -eq 0 ]; then echo "done."; else From nobody Tue Oct 24 17:04:35 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SFJMJ3Wxnz4yGYm; Tue, 24 Oct 2023 17:04:44 +0000 (UTC) (envelope-from phil@juniper.net) Received: from mx0a-00273201.pphosted.com (mx0a-00273201.pphosted.com [208.84.65.16]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "*.pphosted.com", Issuer "Sectigo RSA Organization Validation Secure Server CA" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SFJMJ0hN0z3Jmv; Tue, 24 Oct 2023 17:04:44 +0000 (UTC) (envelope-from phil@juniper.net) Authentication-Results: mx1.freebsd.org; none Received: from pps.filterd (m0108156.ppops.net [127.0.0.1]) by mx0a-00273201.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 39OErpCl019304; Tue, 24 Oct 2023 10:04:42 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=juniper.net; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-type : content-transfer-encoding; s=PPS1017; bh=VenZkl9o2xS1Vdo5SQvhCzQgxbZQSNSDqwfPfnkvZQE=; b=pqGaaCNCisP+SWAmW4lQhSa7r3eJaQLkoANHEAuitQkwDG8MdBaZ6p+wqcc7q25V0kAa IoDzLYbtSFWyXjWQJfgS9iW4mgqqHsj+c/7jY31MGcq1dfMzvy3hv5+5HiAbhmm5/3rz S9w0lvezGfRhKfjOZtnnzordmbxlyrIIpXnIQIH2mXGXiI+VX0ojR9NsFblWOOHWlh6Q d7vPYyv/zHQKEVCrg/eJEYd+KC2ZzrqNu+ikrbMDyq3IAAFCJs7kqy5n27tmeZisfDMx Xd9zZRkSrDTSzr34fqEdeiaUBDiaMFsci6O7Bm+W2SzF23pVeZEs4x78Tp/Kc2c5PR0P VA== Received: from mw2pr02cu001.outbound.protection.outlook.com (mail-westus2azlp17012025.outbound.protection.outlook.com [40.93.10.25]) by mx0a-00273201.pphosted.com (PPS) with ESMTPS id 3twnsrk60k-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 24 Oct 2023 10:04:41 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=QOByTZhgrz5ZZVoj0FdSUJC8BjMcb5Vo5BA9iNjBjUQRHMSNqulSILg0hLT1D1LNEcgNf9TtM8aNBKFnfkZoAWKuO89w8iTtO+rcBI5Y9ustj0ndoojNnIxOUwjXL1rwHLlMeQVtwOvzJZaISNvzPKsArpif3c5TB2edHZ3GS/PitQBbqZcMr7NwIBG9MNyKxWeR5dlnAvaXt+QOPrYNM9tJCkMlVAHUVlNWe1YfKHmupb67jYh5gqpC923KlYG8PXBpl7CGDhSM3LYhBVNN0pNxwwsU/gA5eJqNRcNj5I0PEV6KQtJGxLXA9Fg+4ZOgkMjrtIR+sleaYo7UIDc2eQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=VenZkl9o2xS1Vdo5SQvhCzQgxbZQSNSDqwfPfnkvZQE=; b=EGO3tIcQBmRvNt1Bp+Aia+IOv/tZjQzWjDEHIOeReN8J9ypIrW2gQkChC1oqMZBWIHSWglC9CvWeU5r44SM6nF4VhQql3hqP3ZcCeS9NH7C2QZjrBqK1hFtbf/ri53k1QHYhlTTuwlHOuqiOV0+Lc7LAVOiC8sz9nkffR/2vHhRQZB0F2QHI+D37xKy83iL2wHnt4I9Bwqz3kYGcWfXXX+F4YCj7gqTLE6gaI4ydOAT0CpvXJeNZIeBz7HiFEFSdalniD6D+tq/ec/j1f63sCWRB+aPu87v/+k22gb1nbOJVFr4cI9h5jfb5y+Wl2hN6zze4LPuyQ+NNkevorw0Iww== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=softfail (sender ip is 66.129.242.15) smtp.rcpttodomain=oldach.net smtp.mailfrom=juniper.net; dmarc=fail (p=reject sp=reject pct=100) action=oreject header.from=juniper.net; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=juniper.net; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=VenZkl9o2xS1Vdo5SQvhCzQgxbZQSNSDqwfPfnkvZQE=; b=IRxMPY/KjA/ZjRbDSo2srgEvzwIEODfwszpDilVqfQ9tACkDwuuukYAqTjq91U1X/u34INIk/RlTTo6RhgBLgiYZ3I7ij/5fonXNMpsiBK/R98o1b3S/H4A61UymSstwIUrpK59RxUCHaQj06/Mr3YuMiCFazaIW2XkgdQjxqo0= Received: from DS7PR03CA0030.namprd03.prod.outlook.com (2603:10b6:5:3b8::35) by SJ0PR05MB9373.namprd05.prod.outlook.com (2603:10b6:a03:449::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6907.26; Tue, 24 Oct 2023 17:04:39 +0000 Received: from DM6NAM12FT078.eop-nam12.prod.protection.outlook.com (2603:10b6:5:3b8:cafe::ae) by DS7PR03CA0030.outlook.office365.com (2603:10b6:5:3b8::35) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6907.33 via Frontend Transport; Tue, 24 Oct 2023 17:04:38 +0000 X-MS-Exchange-Authentication-Results: spf=softfail (sender IP is 66.129.242.15) smtp.mailfrom=juniper.net; dkim=none (message not signed) header.d=none;dmarc=fail action=oreject header.from=juniper.net; Received-SPF: SoftFail (protection.outlook.com: domain of transitioning juniper.net discourages use of 66.129.242.15 as permitted sender) Received: from p-exchfe-eqx-02.jnpr.net (66.129.242.15) by DM6NAM12FT078.mail.protection.outlook.com (10.13.179.142) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6933.15 via Frontend Transport; Tue, 24 Oct 2023 17:04:38 +0000 Received: from p-exchbe-eqx-01.jnpr.net (10.104.9.14) by p-exchfe-eqx-02.jnpr.net (10.104.9.17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1118.30; Tue, 24 Oct 2023 12:04:37 -0500 Received: from p-mailhub01.juniper.net (10.104.20.6) by p-exchbe-eqx-01.jnpr.net (10.104.9.14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1118.30 via Frontend Transport; Tue, 24 Oct 2023 12:04:37 -0500 Received: from idleski.juniper.net (idleski.juniper.net [172.25.4.10]) by p-mailhub01.juniper.net (8.14.4/8.11.3) with ESMTP id 39OH4aFv013931; Tue, 24 Oct 2023 10:04:37 -0700 (envelope-from phil@juniper.net) Received: from [172.25.4.169] (localhost [127.0.0.1]) by idleski.juniper.net (8.16.1/8.16.1) with ESMTP id 39OH5RkP000820; Tue, 24 Oct 2023 13:05:28 -0400 (EDT) (envelope-from phil@juniper.net) From: Phil Shafer To: Helge Oldach <75ypz71@oldach.net> CC: Kristof Provost , , , Subject: Re: git: 8bfa084a4bf3 - stable/13 - ndp: fix timestamp display output Date: Tue, 24 Oct 2023 13:04:35 -0400 X-Mailer: MailMate (1.14r5937) Message-ID: <9A751731-ED68-4823-806A-CB1C7DF3A4D7@juniper.net> In-Reply-To: <202310241244.39OCi1Zl054415@nuc.oldach.net> References: <202310241244.39OCi1Zl054415@nuc.oldach.net> List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain Content-Transfer-Encoding: quoted-printable X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM6NAM12FT078:EE_|SJ0PR05MB9373:EE_ X-MS-Office365-Filtering-Correlation-Id: 3866909a-91f2-44cf-5da3-08dbd4b34e88 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: EdI+gKXGtQbwJhnbOu9jEgOGcxKWYn31UcQb3OPptqk/zH+PBJfK0AFXMk9YbmyV7Jl+Et/3cvHAhcQ/pobh1xiXxHYEjW/Rrc/jFExpYZsCIrgWlSKvIowNrYYPNvhw7Rm1zPJO7hrD3HcsInONX+KEnKbQsjJ/CRP/dbWRptI7xcjSrJV0MLYs6xELDlEuPN2YDiWLtKCwFUjZ0oDcC6qcT1gI8QsN8OyS939n9AQ3gk4jtEGM8JnkOFwEnqBaE6GuIxkC03hqpYKkmHvI4g4hX8lG7kw0dwTEzyZwDx9gM88siRtNeYrYmlXK/hKyXJPbVKoh6wIrOCU1XjBI5kxGUX+Aaa/quXD8BKj5Z7nJaY5zNZyRKB1dDD3/DVDZQegUIBGS5rVDulLU+Z6uUubBjzShKGniUehTjCtFdq4LVll5uPDbAAtUV/20GeDimkQ+AvO7tkKFdW71RZFu46PtUN8M0qg9mEkG/b/K8tr2lVc6KuUSpjB+rFxz8L+xZ2ZelVf8uWKewoNRa22y1vyRtC25UCobYkpPX5z7GbNhohi+AYvdi4FJrgL8GksBASVm/1jFHujoOeWaM0JykqmRbI5NaZuOFnbwDJyj1xMkoS/m36q+Xhm+pEFzn5dQaMB+zwGnDV+/SuWOYZBL2USQwdCvPnywYaRVTbBvoNlRo5rPCtFD9ol8ZEXbakKMrYB/y9Mj9YlnEqbowvC/xhziJ6FnqG1FC1Wz0sosrhKmZ3b7MvtoFtd5GnNKabtbZtqckAYsRv0bO+gSbFZrn0yW6g92kkvebhn94YkmlYFfJ17Uzi7T88yLT1/iuxbL X-Forefront-Antispam-Report: CIP:66.129.242.15;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:p-exchfe-eqx-02.jnpr.net;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230031)(4636009)(376002)(39860400002)(396003)(136003)(346002)(230922051799003)(82310400011)(451199024)(1800799009)(64100799003)(186009)(46966006)(36840700001)(40470700004)(83380400001)(40460700003)(336012)(426003)(26005)(40480700001)(81166007)(82740400003)(356005)(36756003)(86362001)(33656002)(47076005)(36860700001)(8936002)(8676002)(4326008)(316002)(70206006)(6916009)(70586007)(54906003)(4001150100001)(2906002)(5660300002)(41300700001)(7126003)(2616005)(6666004)(53546011)(966005)(478600001)(36900700001);DIR:OUT;SFP:1102; X-OriginatorOrg: juniper.net X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Oct 2023 17:04:38.3913 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 3866909a-91f2-44cf-5da3-08dbd4b34e88 X-MS-Exchange-CrossTenant-Id: bea78b3c-4cdb-4130-854a-1d193232e5f4 X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=bea78b3c-4cdb-4130-854a-1d193232e5f4;Ip=[66.129.242.15];Helo=[p-exchfe-eqx-02.jnpr.net] X-MS-Exchange-CrossTenant-AuthSource: DM6NAM12FT078.eop-nam12.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ0PR05MB9373 X-Proofpoint-ORIG-GUID: PVAk02BmjGy_ebWVYyfJDBerwgmkljyZ X-Proofpoint-GUID: PVAk02BmjGy_ebWVYyfJDBerwgmkljyZ X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.980,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2023-10-24_16,2023-10-24_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_spam_notspam policy=outbound_spam score=0 impostorscore=0 mlxlogscore=975 bulkscore=0 phishscore=0 mlxscore=0 suspectscore=0 spamscore=0 lowpriorityscore=0 malwarescore=0 priorityscore=1501 clxscore=1011 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2310170001 definitions=main-2310240147 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:26211, ipnet:208.84.65.0/24, country:US] X-Rspamd-Queue-Id: 4SFJMJ0hN0z3Jmv Looking at: - xo_emit("{:tv_sec/%lld}{:tv_usec/%lld}%02d:%02d:%02d.%06u ", + xo_emit("{e:tv_sec/%lld}{e:tv_usec/%lld}{d:/%02d:%02d:%02d.%06u} ", tvp->tv_sec, tvp->tv_usec, I wonder if, while it makes sense to keep the encoded-only raw data, the = hr:mn:sc data would also be useful in the encoded styles (JSON,XML)? Thanks, Phil On 24 Oct 2023, at 8:44, Helge Oldach wrote: > [External Email. Be cautious of content] > > > Kristof Provost wrote on Tue, 24 Oct 2023 14:27:48 +0200 (CEST): >> The branch stable/13 has been updated by kp: >> >> URL: https://urldefense.com/v3/__https://cgit.FreeBSD.org/src/commit/?= id=3D8bfa084a4bf331b6baf2cc530b9752c4cbe573ad__;!!NEt6yMaO-gk!DiOM9v8cS3N= mBZU7Rg8KHHB7nfjV6jXCvws459nr40kayMsrO1OWkjeDGtmEsv2bfOuQrimOiUqQPfQ$ >> >> commit 8bfa084a4bf331b6baf2cc530b9752c4cbe573ad >> Author: R. Christian McDonald >> AuthorDate: 2023-10-17 16:57:22 +0000 >> Commit: Kristof Provost >> CommitDate: 2023-10-24 07:45:38 +0000 >> >> ndp: fix timestamp display output >> >> The current xo_format string is incorrect. This restores the displ= ay >> format prior to libxo-ification work while also explicitly marking= >> tv_sec and tv_usec as encoded output only. > > A couple of other xo_emit formats in ndp had also been damaged by the > libxo-ification. Please see patch in PR 272749. > > Kind regards > Helge From nobody Tue Oct 24 17:49:20 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SFKLm6wyhz4yJXD for ; Tue, 24 Oct 2023 17:49: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 4SFKLm6LKGz3RQd; Tue, 24 Oct 2023 17:49:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698169760; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KXrVkVH+DRQbI4f7TLNOddjcTm60oweCE9W/HRQUNGM=; b=GXVEVrzv+/42Oi1Tkzo0LXD+tZ7kq/bMhT0QcFgZGgmpwZ8oyYU7jTiWdxhaJ/DRCzTVWv zSyBbo/P8a0mZBQL6md8IVpvaN1ETM7H7BlHKPApOFkZjaubgpkhSnTvH5QycgAP4mM+2m SP0Q97Rr+I6CCqgtgj8crIhQwzu0C2DpZQHB8T3+jrfaZwpa7zP3zxwY7Wa9FQZgBJKY30 btAVDuYONsWQF812VZzzRP74NXIVJI+RsE9LnrBddb7d+idq6r945ab9seD87HvqlchZY4 wm163+G4Lddl7Xwtc9R3+zE92Y0B+YBziuFWaxT+fTYC4j/QAkZGEPPCLmcdbg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698169760; a=rsa-sha256; cv=none; b=yz9tiMGyghDgdeZut/K+lYiQ/NVLXBQ604Ee0WlnHQm+AwyEm6LaelC4SgL5bmLK4a2Zaj Jx66o0LxPVBVHmCZr6p/rNJrmFYXhyAS1d36HDhqKWM+tpDW+FjcmLo/RyUpBXEpYj2Ngu rrso1vLou1gyJMqyIoPzCsCiqY0C55bDhHF8wg4+Ub1JuqMRmf03TT1jc/4lM5brJdsCac PtuNQLgyA85SrK6WnODHplhoNRYR4wbv9YyQ1iJYGLzbD/kDEF00epVJoCuhTys67idQCH UraMlkM/lgG9yjKe0lJfiO4vDc1UL6MDnLC3cvk+I/JxHiw3n66HuCCitf1YNw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698169760; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KXrVkVH+DRQbI4f7TLNOddjcTm60oweCE9W/HRQUNGM=; b=pJ2b2V4Q9jiiCxc+YGuKnQ6lta4UNdMBrXRcn3bh8LZBg4uQVRwHWkwQqhnpqSLV+e1x2t WBKP297wOKHefmRn0zjt2pn/R5hvhrsYU+UJ5JN3iazx1+h6huQK6RzCiaGWbReg5rjjO8 sajVU5/WxWraiyw816lsEfvEc5barGhovignjAqDVaDtuqmxRn4OnITk+/sz/zZxYnL/5P P3yTSEuSHS3xWPSCgVe07ZMeE7KcEkLg1uUP38Ows1RrRPDJaAyBo3H0oLMMWsnpz4K3Z7 w7z1KaSf2ZyAlIEGKG76s/xDuGiSFtTmfON1dRzYcdxLdA97IDkemeXjtJvGLg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SFKLm567DzXbT; Tue, 24 Oct 2023 17:49: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 39OHnKUi003833; Tue, 24 Oct 2023 17:49:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39OHnKUx003832; Tue, 24 Oct 2023 17:49:20 GMT (envelope-from git) Date: Tue, 24 Oct 2023 17:49:20 GMT Message-Id: <202310241749.39OHnKUx003832@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: Ed Maste Subject: git: 315108b81694..825caf7e1244 - vendor/openssl-3.0 - vendor branch updated List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/vendor/openssl-3.0 X-Git-Reftype: branch X-Git-Commit: 825caf7e12445fa4818413cc37c8b45bebb6c3a9 X-Git-Oldrev: 315108b81694de474bbc273c0050b195047f5eed X-Git-Newrev: 825caf7e12445fa4818413cc37c8b45bebb6c3a9 Auto-Submitted: auto-generated The branch vendor/openssl-3.0 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/log/?id=315108b81694..825caf7e1244 825caf7e1244 OpenSSL: Vendor import of OpenSSL 3.0.12 From nobody Tue Oct 24 17:49:30 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SFKLy5qZzz4yJXT for ; Tue, 24 Oct 2023 17:49: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 4SFKLy5Nyqz3Rj2; Tue, 24 Oct 2023 17:49:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698169770; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=clusgQjOg81IeheOULTBHvWE5wKJmny2bWLqD5JrPIQ=; b=dYQ2B86BaLcZOuhQ87JiaRd/4jZukFo835lkvUmgcZudKNFyX5i03J1sYAxR625JhokUlR YEle1GinwTEza+erFIVyiWPTAdgsU1jwr+nRSqQ7J2Mi03pVgKntKl7yaN2qqzlooJ3iHa HY/IuUeiGMw4oCGGibS51Uivhg2Cfex4venHkK3aLG7H81H3Te8EVg8AVA0FO0Tkxkrv5x B48jVrYgOWeUnV4538VeZc5G7yaS5AEjW7WpFLE14eYw78TeutVQGwZZQlvJEo0eseWZVC 3LBkCneREXt/nkoKdCDA4iQ3YBI/+uOeSIoflE9k7YtR71QEm/LaXW8zG4VjvQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698169770; a=rsa-sha256; cv=none; b=sE3DKWkIHbM515BCR+br724OErc9B/MKAYYicTR3io3xq0lDbandXxfIqlMMaPBr2Tu2oq YcZXsFI/G+wMaJhLqZuskHdNzzBu72iHHu4Re+VUBz3iaDNcv8H2KuN6GJdmgR3iG5AUS9 hgMiwi7PWvXQiVglN1OF39UJ4Uyfry7rDv4ZyUKywCZ8i1Vtdc5S5zJguP3inZuZG6sepH SApRDfmhwa7LWhB3k8Z7USDJwJH/NYOZtrQQV7fkGcwf+1/vKXFDtL15MfQwVjJrHu1hRd b7oPmBtycqh1lMkko2hWzaXNcdlPBKZ+6P69mDUCBh6EM6C7M8dA8Z5wD51nCA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698169770; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=clusgQjOg81IeheOULTBHvWE5wKJmny2bWLqD5JrPIQ=; b=GgyEg7tAzhwXDgyVAoJhRz9a2JyTpUCFlofZrQxMOdvoHEHjSfQ46PGoayL7WvYyF/AKaP WAgxR9LzunwlMkj+1OlgG7d/z8adBZGzbBxdLzpxQU1mBE9P7KnQBQLcqCywsAKclFsBRG 4jeU9sAgZ3L530X7l3p+eSL6iK+5Kdb+Dj6hBiNXXKcueColqeSZjPmH9/2EN405n4d7SG fRYsVLEfoLjq0TookWPjw9MoKNE6/9IHF6sYS0/xrDluU78BRMWAozXP/GA6LfxIW6UFfa aeXc8tY63h0+WW7AViG9Df5P0so5N2WdYIA9NdtQgLuagm8KMgFadnWlLmWwrA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SFKLy4SY6zXks; Tue, 24 Oct 2023 17:49:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39OHnUGb003943; Tue, 24 Oct 2023 17:49:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39OHnUvI003942; Tue, 24 Oct 2023 17:49:30 GMT (envelope-from git) Date: Tue, 24 Oct 2023 17:49:30 GMT Message-Id: <202310241749.39OHnUvI003942@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: Ed Maste Subject: git: 70d413bfd13f - Create tag vendor/openssl/3.0.12 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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/tags/vendor/openssl/3.0.12 X-Git-Reftype: annotated tag X-Git-Commit: 70d413bfd13f46268da7d9aaf37e363414374511 Auto-Submitted: auto-generated The annotated tag vendor/openssl/3.0.12 has been created by emaste: URL: https://cgit.FreeBSD.org/src/tag/?h=vendor/openssl/3.0.12 tag vendor/openssl/3.0.12 Tagger: Ed Maste TaggerDate: 2023-10-24 17:47:33 +0000 Tag OpenSSL 3.0.12 commit 2689eac192efc2c60d6cdb3fdffee4d43e1d0d40 Author: Ed Maste AuthorDate: 2023-10-24 17:45:46 +0000 Commit: Ed Maste CommitDate: 2023-10-24 17:45:46 +0000 OpenSSL: Vendor import of OpenSSL 3.0.12 From nobody Tue Oct 24 18:03:58 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SFKgg1xFxz4yK4Y; Tue, 24 Oct 2023 18:03: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 4SFKgg1FkFz3SvY; Tue, 24 Oct 2023 18:03:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698170639; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2Iro/WmIVbTI9H33HYVp+Y2mRYFtTB57qztTlc0LtdY=; b=IKM846z/Nk9KkvvPXe4SHu3oQurK2E4RffwtiYPHZoykoy7WDXC6iqbvBdkXS+L0ELKmEs IaSNiK3KF3kRWrarTHyqahDPU+x+wWqg7/NKNlXCWxWW7pQaoRZqTDJ3UgB9d9hpEU+sRg cOZ/ofppPpQKVeICbYKe6RYK7sY6phTPdL4mfPs1L7OA6OoVVW2YjGqDq801+654P6pl+b kmgL14YzIdEdqhpOyJbvx87oT3BPe7cwVDHLv0odpGeWasx/ZM+5QKS842snDL+0E28tME 1mwOTA+LNsNOGW34+jNCOc1Ex6gOj84Szgb2ZoUWaQJWTaidMussG8UNgh2BjA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698170639; a=rsa-sha256; cv=none; b=igumORM98cmb9Zn3Gld0tk9D5Pkd7FymLYVyNz6P/C8bOkC4L5cXXlJxp6dqMHTDBJb1jx UCtCOP/naXNlfXTLgK8m0RgKG5pSqvjpHTddXDBomz4KFZOhXucTY+FEZaaleWCtQOz2OT Cvk+9pYU+HErT7ZWv1W2Wgcj7QY6QYXFiN9DOjyjGgybI02bjIQhBOIZNIYs4yXaXfrUvE OGxgAOPm249d6xdWY14rbXJwps8ykpw1jXYu5q917F8o18KBAJqzfz2IXQq4JMYATYaaFv SR9OAgsLiOSjEX2EPJzSNFRiZAlgX32HHd0I6ZgGH/0CP1stQXaz1Jf5frMNKA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698170639; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2Iro/WmIVbTI9H33HYVp+Y2mRYFtTB57qztTlc0LtdY=; b=gjZNJmp93SWjG1OFVNw7XzbTNfZWsbmp/Qp+v4Vq40cPi2RsruBLWDvYySowGfoxOimeaX VHIkOorh4RzeT+A0+kyAt9YFTHu2fT24mXEpICEekwYoRgGzwCk6Fn9BHLJdqrsCVXwXOC mAkxNvofCDG6jTJyB4smUdRMOJBggwRqk0NdJrRDPYxSmhq8gjWqVJzB7L+LjEXfLwDQqF UB76/IHcaTE1Vw42WQtlQSG+JDhAhyo7nef/FmRw1AWzndvQO+T50GZOT4jz2RKZTZW67q +5XbsuYmXR3+OZGsOuk3CYNZWjK3e8W4K6nTGkC8alFmQ1EJO3TwZAOxbjEEHA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SFKgg0Js7zY2p; Tue, 24 Oct 2023 18: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 39OI3wEP036981; Tue, 24 Oct 2023 18:03:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39OI3wBC036978; Tue, 24 Oct 2023 18:03:58 GMT (envelope-from git) Date: Tue, 24 Oct 2023 18:03:58 GMT Message-Id: <202310241803.39OI3wBC036978@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 7259e54556f2 - stable/13 - Revert "socket tests: Build fix" List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 7259e54556f21f34dc6c161cb1bb9d8d42e49777 Auto-Submitted: auto-generated The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=7259e54556f21f34dc6c161cb1bb9d8d42e49777 commit 7259e54556f21f34dc6c161cb1bb9d8d42e49777 Author: Mark Johnston AuthorDate: 2023-10-24 18:03:23 +0000 Commit: Mark Johnston CommitDate: 2023-10-24 18:03:27 +0000 Revert "socket tests: Build fix" This reverts commit 1b07f630c11ccf899612a7d02777fe0855e3bb25. This test will require extra work to port to stable/13. --- tests/sys/kern/socket_msg_trunc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/sys/kern/socket_msg_trunc.c b/tests/sys/kern/socket_msg_trunc.c index ff0499c4540d..279170158643 100644 --- a/tests/sys/kern/socket_msg_trunc.c +++ b/tests/sys/kern/socket_msg_trunc.c @@ -231,7 +231,7 @@ ATF_TC_BODY(recvmsg_trunc_ktrace_uio, tc) nbytes = read(fd, &ktr, sizeof(ktr)); ATF_REQUIRE_MSG(nbytes >= 0, "read failed: %s", strerror(errno)); ATF_REQUIRE((size_t)nbytes == sizeof(ktr)); - ATF_REQUIRE((ktr.ktr_type & ~KTR_TYPE) == KTR_GENIO); + ATF_REQUIRE_MSG((ktr.ktr_type & ~KTR_TYPE) == KTR_GENIO); ATF_REQUIRE(close(fd) == 0); ATF_REQUIRE(close(sd[0]) == 0); From nobody Tue Oct 24 18:04:00 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SFKgh3Bqnz4yK7L; Tue, 24 Oct 2023 18: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 4SFKgh2Dy7z3Ssk; Tue, 24 Oct 2023 18: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=1698170640; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1ArWWRefXyw/qDZ22VQuqjuVqTTQ+y/37LjkkN8x/PU=; b=IubiiMP5kmmnHCW2sC4Yjl/rHLGfmhMGitNtxVYzNXTHhYZO+5DSfJYdKB3R11rN59zhsd RUmTTJEJwyWh5BtaVM2U42MwzvH0o48e0e3HQZBNJppNIeNUwuXpTG29vbee7TXckZ2tre 3K0nb6B38Sn3gzPtacDihIRJ14OX1d1deO4+5xUsKUlGHxm7Enb0tLPknRyqXJxsofkTSg w/LurRBiwbYXuIcz6zuy9z40AQyKCLCb0cr1NiTSX52dfMUdz75DDlkqNb0AnJiR66XiAi //QZD0didu1oz5SCiz33adBSU2RaCq/JyTTYebL3jReBAJPRXv+NBNmroL5iDg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698170640; a=rsa-sha256; cv=none; b=pgkDKKF+agYuRiXC/p02LOcBIgdrJNwmm2JoCUvxABlGugSYXuPfWZF+acXmWdfDX5YwYz iQTpijmAN33XNgujIsdfv8d83azd7wpbtNlO9PPS79/+ZadqV7ePhLHO1LITVc7GJnR+qK ur9U/8kNuyPPY1YNGkdT6LR9lnxrdr4cJrNlj8ViXylHjuSkQB3gglxdWnvVbnKRSZsHhy jo3oA5w7d7/FOPQZGFfoQ4sXI7oW33UEPsoLAg8u030NIsmGtj4RWgs4mAAsP0j1w7SOOi zE8qseJ3JDRPQUWMtZ6WAKwM/0p1N6k/iUUC+YzsH8qNiorXRn+keQfInnxtMg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698170640; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1ArWWRefXyw/qDZ22VQuqjuVqTTQ+y/37LjkkN8x/PU=; b=HkpO/ZtKWzDWiljjQlbZDxAWDuPmAetRv3vijkZvjKytdt07iVKnFCbNXLLIOZPR11lBB/ AE44srYw+qTpbilrM8SIt/NmvFWwst1WOTy96lbm+NhnJvcRH2p00SlTCXZsTCOaWlLZry UM5HApn18xwrP9WENyAFD5538SUMk7RLQg2aKtwj+BGPhJOVprt8JL+nxlF0e+ua3BGmTr QmB4GA8owWwzh8/QTANbDdW9tkXNsG6Qo1Vs/iSwd1cxZ6YIKh6CZJSvyV2iZpJYDfU2Ii qmyXXqLJ3wBG244r2i2YN6d1IRDZPAE58Ygbn4v49BBPrSA6gSiMlT8oFyV7rQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SFKgh1JzlzXnv; Tue, 24 Oct 2023 18:04: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 39OI40qb037050; Tue, 24 Oct 2023 18:04:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39OI40qh037047; Tue, 24 Oct 2023 18:04:00 GMT (envelope-from git) Date: Tue, 24 Oct 2023 18:04:00 GMT Message-Id: <202310241804.39OI40qh037047@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 4bf16a282503 - stable/13 - Revert "socket tests: Add a regression test for ktrace+recv(MSG_TRUNC)" List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 4bf16a282503fb1b9091e7e431220d97e72e25f9 Auto-Submitted: auto-generated The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=4bf16a282503fb1b9091e7e431220d97e72e25f9 commit 4bf16a282503fb1b9091e7e431220d97e72e25f9 Author: Mark Johnston AuthorDate: 2023-10-24 18:03:49 +0000 Commit: Mark Johnston CommitDate: 2023-10-24 18:03:49 +0000 Revert "socket tests: Add a regression test for ktrace+recv(MSG_TRUNC)" This reverts commit f5a9a849e9034c597c2b0a9014673a44834b9516. This test will require extra work to port to stable/13. --- tests/sys/kern/socket_msg_trunc.c | 57 --------------------------------------- 1 file changed, 57 deletions(-) diff --git a/tests/sys/kern/socket_msg_trunc.c b/tests/sys/kern/socket_msg_trunc.c index 279170158643..469b9e1503cd 100644 --- a/tests/sys/kern/socket_msg_trunc.c +++ b/tests/sys/kern/socket_msg_trunc.c @@ -27,13 +27,11 @@ #include #include -#include #include #include #include -#include #include #include #include @@ -184,67 +182,12 @@ ATF_TC_BODY(recv_trunc_afunix_seqpacket, tc) ATF_REQUIRE(close(ss) == 0); } -/* - * Exercise the case where ktrace was used to dump a truncated buffer. - */ -ATF_TC_WITHOUT_HEAD(recvmsg_trunc_ktrace_uio); -ATF_TC_BODY(recvmsg_trunc_ktrace_uio, tc) -{ - struct ktr_header ktr; - struct msghdr msg; - struct iovec iov; - const char *tracepath; - char buf[128]; - ssize_t nbytes; - int error, fd, sd[2]; - - tracepath = "ktrace"; - - error = socketpair(AF_UNIX, SOCK_DGRAM, 0, sd); - ATF_REQUIRE(error == 0); - - memset(buf, 0, sizeof(buf)); - nbytes = send(sd[0], buf, sizeof(buf), 0); - ATF_REQUIRE_MSG(nbytes >= 0, "send failed: %s", strerror(errno)); - ATF_REQUIRE((size_t)nbytes == sizeof(buf)); - - fd = open(tracepath, O_RDWR | O_CREAT | O_TRUNC, 0644); - ATF_REQUIRE_MSG(fd >= 0, "open failed: %s", strerror(errno)); - error = ktrace(tracepath, KTROP_SET, KTRFAC_GENIO, getpid()); - ATF_REQUIRE_MSG(error == 0, - "ktrace(SET) failed: %s", strerror(errno)); - - iov.iov_base = buf; - iov.iov_len = sizeof(buf) - 1; /* truncate */ - memset(&msg, 0, sizeof(msg)); - msg.msg_iov = &iov; - msg.msg_iovlen = 1; - nbytes = recvmsg(sd[1], &msg, MSG_TRUNC); - ATF_REQUIRE_MSG(nbytes >= 0, "recvmsg failed: %s", strerror(errno)); - ATF_REQUIRE((size_t)nbytes == sizeof(buf)); - ATF_REQUIRE((msg.msg_flags & MSG_TRUNC) != 0); - - error = ktrace(tracepath, KTROP_CLEARFILE, 0, getpid()); - ATF_REQUIRE_MSG(error == 0, - "ktrace(CLEARFILE) failed: %s", strerror(errno)); - - nbytes = read(fd, &ktr, sizeof(ktr)); - ATF_REQUIRE_MSG(nbytes >= 0, "read failed: %s", strerror(errno)); - ATF_REQUIRE((size_t)nbytes == sizeof(ktr)); - ATF_REQUIRE_MSG((ktr.ktr_type & ~KTR_TYPE) == KTR_GENIO); - - ATF_REQUIRE(close(fd) == 0); - ATF_REQUIRE(close(sd[0]) == 0); - ATF_REQUIRE(close(sd[1]) == 0); -} - ATF_TP_ADD_TCS(tp) { ATF_TP_ADD_TC(tp, recv_trunc_afinet_udp); ATF_TP_ADD_TC(tp, recv_trunc_afinet6_udp); ATF_TP_ADD_TC(tp, recv_trunc_afunix_dgram); ATF_TP_ADD_TC(tp, recv_trunc_afunix_seqpacket); - ATF_TP_ADD_TC(tp, recvmsg_trunc_ktrace_uio); return (atf_no_error()); } From nobody Tue Oct 24 18:12:52 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SFKsw5tJFz4yKg3 for ; Tue, 24 Oct 2023 18:12: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 4SFKsw5MrTz3W3L; Tue, 24 Oct 2023 18:12:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698171172; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zH0TNeEwR2Mjxl2JzibVAo5gRTWrQreVzHDdfql6QX0=; b=nPlsZPYEV8Wjs7fsu9fGpDJtr7eM3vTYnGX9+YM1/uOcCjlFtC5C1Mgiw5ZJ1RNKYmZBcz WFIigVLBnZ8Lh8OX0nZ3rZAcY8srTGaMx/H89rFhZhXYvaBtUYMhIfs8Gnk/b1XGsnkRic W7+jbUrTlKA+gczInfvb4QMo9V5kVdzw5QfgTe7SePMNtcUQvtsQYHt4dXo/26/SLh4NOD MH2bqcXpe8AEV7lHnQMvCh0QbFQ/Ig3arLWzuHWJ4lBNUyNJJrZXir7GyAV7B9vVlnNfPP MzPZ7NWF2r+ZDG0XxP7nwAghHzVhdyueiUb+maNc2N5J8NC4FFyz6QfwsrkBVA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698171172; a=rsa-sha256; cv=none; b=YZUHqJG5qEIVsZEuPmLw7b6AjSz8OxxaFW5AEN4uSCCGUiPT8a94NCmk05awZPsckWtSAa mOIGZu+rIjBp3xw8tMkKiRja80zAilfsuS5cBMikvj9Ha87II6RGWk8kaHsJI1e8oNRNqf my85m4f6CrCQRWYzAx1PkJ/Y+lofbPTaaBFqC2Llcof309km/n+u1QwAaHIzLYjOm5fxc1 5rZ/ePCZoA9m2Fc51kCTyU8avapCyZjqDoc2YjU4DDNN+nQVi1ZyTDmKslN2HLAQaqredD LgUXnNRxrk0oxgnEpteJyRBR79QS7Y/jzLKkL5xbBI6+6Orvl7iguwgX9fiSUw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698171172; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zH0TNeEwR2Mjxl2JzibVAo5gRTWrQreVzHDdfql6QX0=; b=r8r4G9ozdpFj7nBwU+NamHwNSLQduzwx8xYujagIh7If/9a8ZW7G8tcRCHXfT8tArB0NeT NwDUhubO4szlNu7VFthf2ULwS+BLxoOAodvsHV0eHRjlY8xlUjewjxPfWNcCOTcMCuH2Bq ZCQcOpU31MGekLjqIcEhKT8TcqwWPNdtzYAr8KT3atZ1ddrB3Uyl6yeVuErb20nNEXgGs/ KO2ahfvwUE3ttj9rTVXRWG9pM+Ppr5PKjP3H41088d4TmNZu2Nhs4rQZ1ljZrMKH+jrCXX WLcWgp2gr4hgFP99Ni2+1DlDqCrf54+M31mW5minxe7orcGst9LQvn7NHzVvrw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SFKsw4RWnzYHc; Tue, 24 Oct 2023 18:12: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 39OICqoP053714; Tue, 24 Oct 2023 18:12:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39OICqXK053711; Tue, 24 Oct 2023 18:12:52 GMT (envelope-from git) Date: Tue, 24 Oct 2023 18:12:52 GMT Message-Id: <202310241812.39OICqXK053711@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: Sergio Carlavilla Delgado Subject: git: 31c9bdb6e926 - internal/admin - Take scottl's commit bit in for safekeeping at his request List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: carlavilla X-Git-Repository: src X-Git-Refname: refs/internal/admin X-Git-Reftype: branch X-Git-Commit: 31c9bdb6e926aa715ecb6cdfbb0252638cb911a5 Auto-Submitted: auto-generated The branch internal/admin has been updated by carlavilla: URL: https://cgit.FreeBSD.org/src/commit/?id=31c9bdb6e926aa715ecb6cdfbb0252638cb911a5 commit 31c9bdb6e926aa715ecb6cdfbb0252638cb911a5 Author: Sergio Carlavilla Delgado AuthorDate: 2023-10-24 18:11:39 +0000 Commit: Sergio Carlavilla Delgado CommitDate: 2023-10-24 18:12:39 +0000 Take scottl's commit bit in for safekeeping at his request Approved by: core(implicit) --- access | 1 - 1 file changed, 1 deletion(-) diff --git a/access b/access index e599789b1796..8673b6902134 100644 --- a/access +++ b/access @@ -140,7 +140,6 @@ rscheff rstone rwatson bb+lists.freebsd.cvs-committers@cyrus.watson.org schweikh -scottl scottph se sef From nobody Tue Oct 24 18:36:55 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SFLPh0NnFz4yLqt; Tue, 24 Oct 2023 18:36:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SFLPg6tlkz3Xn9; Tue, 24 Oct 2023 18:36:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698172616; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cTGznOHKahjOyOaHN+7hlLcsbOM+zhTcm9ykrh8ioMY=; b=buqYFdYiRxPpbMiiwUMhlQE0c4wL7p97t1pKlvVeDxNXfPQhOvOYJHdxgaWC9wcmNftPC5 KdJTWe0n0ZuXFDtsQh2aMf6e6Be6mvuQR02dMCwCQalzbgRgvuA7iOUSmAvv7vgBeDTDpV rmmgIRegzTIDfk9xOD+ml6qbsLFFmFvsc4FHnvTJARXUmxJsaO0exhX2AfPrnmKeP1lkvy 3VJdbuuVscryYO0Hnj6xzbEQIT2lmmyw2mb8tmN6Ifse88iiGVN4jRsTZ9v068bty8Mfoj MFETx0nRBDSw1E7uCh8/8EZ/Xwnj4/pjsdJvCEBFWB4EyElbOfPfGYk5GQwctA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698172616; a=rsa-sha256; cv=none; b=eyFhqfD+5ZpEQqUduCSR9zUtZpXJEJdhcQ16/joJLMDZpYqmOToJhVdXInWyZuuaR3SurL xqtgRJD2d4XHIhtR1C7IcZVV1+/g27Sr2AhVihTMOEA80B9iJg7a5bAPe+O/rT41d9bgst 3+sdcqoIw87ow06K1egCetPrfaddms/L6+JGcXgccefwJEyCEPDZFPPEO5YoXXtoGOa2eK prIWuo6BK7zfCPXuZLcQmPJN2ZIayD40xlbh3uN2CTCxQh9cve0OfmEFcsbxpb31+0cULB uIsKMxIZ+CfxDLWKx8EH4CX2zf7GmIWn5X9I827oo8YpGuh7SXuvpkhC+jn0Iw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698172616; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cTGznOHKahjOyOaHN+7hlLcsbOM+zhTcm9ykrh8ioMY=; b=F4xXv6/f3ssTM8g13Ax7eZ076Wp1315fF0h3UqXsUImuhtBZn/9Os6OD3+KbEtjBZyMAhU RLK09NiTFO/iVzAwbyYMZYW9mL+bm8VKc/fyq0/dgQt2pGXdZ9cCOEbgs+xVPiz/W0o3/i ug4//hltyIkB/KGuhK6YOve7ZxZ/+RvF0w4rJo7gpueMfWu+lD7GUPvBfiHH15lqR/oYKw Z+Z1Tqv+9ZoQlBi18/GwTotMH7ylqyUN8hzpC6jksyYfNH3DyEo0BD8pWSGDCZq+84usRT IdQ5yYEtHgfkhOFTn9TBmP/0DXVEyJ41jNwL4f7k7lBbTCUEpsgaPmNJKMqyQQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SFLPg5zkBzZ2y; Tue, 24 Oct 2023 18:36:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39OIatTU087337; Tue, 24 Oct 2023 18:36:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39OIatX0087334; Tue, 24 Oct 2023 18:36:55 GMT (envelope-from git) Date: Tue, 24 Oct 2023 18:36:55 GMT Message-Id: <202310241836.39OIatX0087334@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 83a00a92dab0 - stable/14 - Move kern_extattr_* prototypes to List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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/stable/14 X-Git-Reftype: branch X-Git-Commit: 83a00a92dab019a4f4cd413c2a2b79f861ec0788 Auto-Submitted: auto-generated The branch stable/14 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=83a00a92dab019a4f4cd413c2a2b79f861ec0788 commit 83a00a92dab019a4f4cd413c2a2b79f861ec0788 Author: John Baldwin AuthorDate: 2023-09-08 23:36:28 +0000 Commit: John Baldwin CommitDate: 2023-10-24 17:00:57 +0000 Move kern_extattr_* prototypes to All of the kern_* prototypes belong in this header. While here, sort the prototypes by function name. Reviewed by: dchagin Fixes: 6453d4240f6b vfs: Export exattr methods to reuse by Linuxulator Sponsored by: DARPA Differential Revision: https://reviews.freebsd.org/D41766 (cherry picked from commit 3555be0124a4f105c72d932f00071f332691e8cf) --- sys/kern/vfs_extattr.c | 1 + sys/sys/extattr.h | 22 ---------------------- sys/sys/syscallsubr.h | 20 ++++++++++++++++++++ 3 files changed, 21 insertions(+), 22 deletions(-) diff --git a/sys/kern/vfs_extattr.c b/sys/kern/vfs_extattr.c index e178589067c1..dc1bbb58644b 100644 --- a/sys/kern/vfs_extattr.c +++ b/sys/kern/vfs_extattr.c @@ -43,6 +43,7 @@ #include #include #include +#include #include #include diff --git a/sys/sys/extattr.h b/sys/sys/extattr.h index a6689c869c0c..a16ef238656f 100644 --- a/sys/sys/extattr.h +++ b/sys/sys/extattr.h @@ -62,33 +62,11 @@ #ifdef _KERNEL #include -enum uio_seg; -struct uio; struct thread; struct ucred; struct vnode; int extattr_check_cred(struct vnode *vp, int attrnamespace, struct ucred *cred, struct thread *td, accmode_t accmode); -int kern_extattr_set_path(struct thread *td, const char *path, - int attrnamespace, const char *attrname, void *data, - size_t nbytes, int follow, enum uio_seg pathseg); -int kern_extattr_set_fd(struct thread *td, int fd, int attrnamespace, - const char *attrname, void *data, size_t nbytes); -int kern_extattr_get_path(struct thread *td, const char *path, - int attrnamespace, const char *attrname, void *data, - size_t nbytes, int follow, enum uio_seg pathseg); -int kern_extattr_get_fd(struct thread *td, int fd, int attrnamespace, - const char *attrname, void *data, size_t nbytes); -int kern_extattr_delete_path(struct thread *td, const char *path, - int attrnamespace, const char *attrname, int follow, - enum uio_seg pathseg); -int kern_extattr_delete_fd(struct thread *td, int fd, int attrnamespace, - const char *attrname); -int kern_extattr_list_path(struct thread *td, const char *path, - int attrnamespace, struct uio *auiop, int follow, - enum uio_seg pathseg); -int kern_extattr_list_fd(struct thread *td, int fd, int attrnamespace, - struct uio *auiop); #else #include diff --git a/sys/sys/syscallsubr.h b/sys/sys/syscallsubr.h index 8be860dc0fd4..0480eda2fca4 100644 --- a/sys/sys/syscallsubr.h +++ b/sys/sys/syscallsubr.h @@ -139,6 +139,26 @@ int kern_cpuset_setid(struct thread *td, cpuwhich_t which, int kern_dup(struct thread *td, u_int mode, int flags, int old, int new); int kern_execve(struct thread *td, struct image_args *args, struct mac *mac_p, struct vmspace *oldvmspace); +int kern_extattr_delete_fd(struct thread *td, int fd, int attrnamespace, + const char *attrname); +int kern_extattr_delete_path(struct thread *td, const char *path, + int attrnamespace, const char *attrname, int follow, + enum uio_seg pathseg); +int kern_extattr_get_fd(struct thread *td, int fd, int attrnamespace, + const char *attrname, void *data, size_t nbytes); +int kern_extattr_get_path(struct thread *td, const char *path, + int attrnamespace, const char *attrname, void *data, + size_t nbytes, int follow, enum uio_seg pathseg); +int kern_extattr_list_fd(struct thread *td, int fd, int attrnamespace, + struct uio *auiop); +int kern_extattr_list_path(struct thread *td, const char *path, + int attrnamespace, struct uio *auiop, int follow, + enum uio_seg pathseg); +int kern_extattr_set_fd(struct thread *td, int fd, int attrnamespace, + const char *attrname, void *data, size_t nbytes); +int kern_extattr_set_path(struct thread *td, const char *path, + int attrnamespace, const char *attrname, void *data, + size_t nbytes, int follow, enum uio_seg pathseg); int kern_fchmodat(struct thread *td, int fd, const char *path, enum uio_seg pathseg, mode_t mode, int flag); int kern_fchownat(struct thread *td, int fd, const char *path, From nobody Tue Oct 24 18:36:56 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SFLPj1P7Qz4yM3m; Tue, 24 Oct 2023 18:36: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 4SFLPj0l58z3XqN; Tue, 24 Oct 2023 18:36:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698172617; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5tuBSTbHLmiG0JQLIqVXaDQpzZkmjQtA58mvi5KU+Xo=; b=nNky3ak+Wrto7bT5xJLmmXJMKjji3TPiRpZgJSQj5TorsM7Oqhz7ReSULPTh4JrGmV1akf zSB161jsL9zdJHTJQpt4B/fUG+pxpOpxbiihvA2ZTlVUPk/MxvSCgmGIzbfm5HO81jKRJt 5+zP9nzYuf63w8vdlyu7JZjnvTRreSwS5Q4gVdSgXZ091LXYyq/UMUNJ472FPF0V3KF4q5 k9dvH8JSnDozaJulKyRywEXt7FM3uTMnczNMn38+7XSVoKYsuJHUHi65i86bIFEEoamMxT kkPrP9CQ1rLTeY/62TsXaBD4ysbAY9RX1gCm9Ahzgn6rEluyDqi7OPtnFfxaDA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698172617; a=rsa-sha256; cv=none; b=DCqu3S48VvB0RNv+y/xhg+QDuyUtShIACUBunsutxXigVJxF6Gy/IX8Q8teJHW4q27O8fs zrBMa2RWHeM8QzukhPO4dsja9VvcV1PJcKi+5VKZkdhcVZqqWRn3ygWC0hSsqqPgxdGpzG sxxGgT1xtLoa9bIrj7cCJIZZqF/vi4mcI9qUrS2cSkqI/zIyBHg59inNg1rruL/1swzw6W M8l3bVRUe1G3kvePg3m1pTeCIniXAtKG7tU31OIVU9de6/Z/uu2+/jlQH4UzU0GnDNygjT Q9L8MVzFHZMlqBXNgZPo0CvLgWSkPTwGS5CA09Av8cHynB8R5ZUseTu0EEEtFg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698172617; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5tuBSTbHLmiG0JQLIqVXaDQpzZkmjQtA58mvi5KU+Xo=; b=hpMpxm23GR5j5tcoe8QFroETVAXqRYHYIPpi49yACs7dhhvIbEC0A0ovqVue0Nxr3Jck8l ed5uTwKpj8Ld0BNLgJ9vbCgEx6r1282dMMJgYEgad2K+coB3SLpy0iXxxiND9tEMb5jrfs +oJ4xZyujkxYTVJBzKdCTeVGCR8j/ZWQjqQgOGRknpc/R8C2aYciP3aPmWlZaNZGCUU2UK K+nHeMfbwM14SlVKc9k4DSs9Muw/NxPuD0cL99Vj9XZ12KbYc+n0sj1iB1MqzTb2dRWuPJ F6JjHdneu3Ocw8UlO3V5NT+OJV530e+RBIVv+49Nad//vWVdb6FlXq/JlgUBrw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SFLPh6gDlzYmL; Tue, 24 Oct 2023 18:36: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 39OIaufI087394; Tue, 24 Oct 2023 18:36:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39OIauDE087391; Tue, 24 Oct 2023 18:36:56 GMT (envelope-from git) Date: Tue, 24 Oct 2023 18:36:56 GMT Message-Id: <202310241836.39OIauDE087391@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: e949b671c555 - stable/14 - makeman: Use ${make} instead of plain make to compute ${requireds} List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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/stable/14 X-Git-Reftype: branch X-Git-Commit: e949b671c5550266ab88bd9d08e096af6a1550e4 Auto-Submitted: auto-generated The branch stable/14 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=e949b671c5550266ab88bd9d08e096af6a1550e4 commit e949b671c5550266ab88bd9d08e096af6a1550e4 Author: John Baldwin AuthorDate: 2023-09-08 23:36:52 +0000 Commit: John Baldwin CommitDate: 2023-10-24 17:01:07 +0000 makeman: Use ${make} instead of plain make to compute ${requireds} This is currently a no-op but can matter for downstreams whose ${make} includes additional settings. Reviewed by: imp, emaste Obtained from: CheriBSD Sponsored by: DARPA Differential Revision: https://reviews.freebsd.org/D41777 (cherry picked from commit 9c80d66ec1b4c5b9ac7aaf5b0fdbb1628d49c181) --- tools/build/options/makeman | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/build/options/makeman b/tools/build/options/makeman index ac5aaa8b8b03..4e44c78b0278 100755 --- a/tools/build/options/makeman +++ b/tools/build/options/makeman @@ -116,7 +116,7 @@ show() exit 1 ;; esac - requireds=`env -i make -f ${srcdir}/share/mk/src.opts.mk \ + requireds=`env -i ${make} -f ${srcdir}/share/mk/src.opts.mk \ -V '${__REQUIRED_OPTIONS:ts,}'` env -i ${make} .MAKE.MODE=normal "$@" showconfig __MAKE_CONF=/dev/null \ SRCCONF=/dev/null | From nobody Tue Oct 24 18:36:57 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SFLPk2QPhz4yM3s; Tue, 24 Oct 2023 18:36:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SFLPk1bLMz3Xr9; Tue, 24 Oct 2023 18:36:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698172618; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zPNqPpaJtlqWM5v61qniv05+Ma3B6tQtZv7xApf3N28=; b=BH6ixgDZkBsHVls76hiS+CNocrOrH5rPyTeeTe4v+Yx8dWvG2QK+Dh11tPmoHjGGdMwZds 0oetbgu070IKmbVEsKYVxsPfnQXDbEMqRGhdDH8kK0piWzTZ3TuaceS9407kXpZ/HBKhiA scSXqB47a28ZcYFgfACnmnCjKu33XPeoVYFraXSUo+L7BZpY7fwKM6UqhgohuYFP4lnp7C YNzK/QfxvekVW1iX5h7ry+h6Y8NmWlhiCezNfLKCbebS6ihR6i7mcVE4YPrG1ir6j+CROX 92Tz9oDXdaKn7EL4qKBOMEUt6C5iOa7ZMICfqsexUK9bHCmNw/4I8N/7kSQ80g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698172618; a=rsa-sha256; cv=none; b=LUPTZsFas9Ufa19Xtvpiwemr4ghhZxzZh9u4ZLa/YEWuxhst+dWpunziiS2vdmsSj9gJUT YvAWFuhJj14R34/+Av5DhDqlQB7GxlONoIKZJpl0XruOU1XsUbUJ80Fkm3RCr7+k01/dIQ j3VPIPCGZn5CoEABGODmnVx0JfT1rWZ7RMFz5hofKI+GTQSoZ0aatSZ3o71/ZmvTa4RAHe c3XU9stkYu/Tah22XVzmnD/HYr3Q+3Vh/YqyIZb4hXmZ4koAFfsKjZMN1FUX3Kkc4kMuhG 98Br4FPoyGe8up7kr7rBrbDRGG0QFy9Vy1eSPGRvc1okaF4Kmh31F7at5fdXOg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698172618; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zPNqPpaJtlqWM5v61qniv05+Ma3B6tQtZv7xApf3N28=; b=euEFAgoAljiOFE84tasfYk7f6lWxhs1/Sb7OSPR33rCdhSQUTMoJeyARmanJVJyjPJRSP7 EZHvlOFDtgYuQxOa2ABkGV4zKOm7xclYgoqOT8bHqQ0fk1Kkz6Y/ZQ3JwuLFTRuVsn23vj +FIsAMWAoDbLcmfwrlrKiucK7fM3i8yLOoLBpotSUCFF6VlUWOz9dOvDbotxK+F4i4iMy/ pYIhcrsc/GVzcPFfYjjz86uPmxJkspLm2HJ0HZV9WPIQrXAA1x9wVdwUkdsgRWuvEm1M3B wuqJsvg/KR6ydWBtDTVazSjaq9O7NaYDpTKz2zXsmmy1YeujIHARCcbi5vTuzw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SFLPk0K4gzYZv; Tue, 24 Oct 2023 18:36: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 39OIavRp087438; Tue, 24 Oct 2023 18:36:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39OIavdc087436; Tue, 24 Oct 2023 18:36:57 GMT (envelope-from git) Date: Tue, 24 Oct 2023 18:36:57 GMT Message-Id: <202310241836.39OIavdc087436@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 973e31028bf9 - stable/14 - ifconfig/ifvlan.c: Whitespace fix List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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/stable/14 X-Git-Reftype: branch X-Git-Commit: 973e31028bf905230ed464ee8f0e6a5ed5238d6b Auto-Submitted: auto-generated The branch stable/14 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=973e31028bf905230ed464ee8f0e6a5ed5238d6b commit 973e31028bf905230ed464ee8f0e6a5ed5238d6b Author: John Baldwin AuthorDate: 2023-09-23 20:27:49 +0000 Commit: John Baldwin CommitDate: 2023-10-24 17:01:13 +0000 ifconfig/ifvlan.c: Whitespace fix (cherry picked from commit 701468baa415c7d563d1ad28d3133d0a976908e6) --- sbin/ifconfig/ifvlan.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbin/ifconfig/ifvlan.c b/sbin/ifconfig/ifvlan.c index 7fb63b8142f4..90854885b561 100644 --- a/sbin/ifconfig/ifvlan.c +++ b/sbin/ifconfig/ifvlan.c @@ -4,7 +4,7 @@ * Copyright (c) 1999 Bill Paul * Copyright (c) 2012 ADARA Networks, Inc. * All rights reserved. - * + * * Portions of this software were developed by Robert N. M. Watson under * contract to ADARA Networks, Inc. * From nobody Tue Oct 24 18:36:59 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SFLPl3n4Wz4yLpH; Tue, 24 Oct 2023 18:36: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 4SFLPl2HRvz3XtC; Tue, 24 Oct 2023 18:36:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698172619; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=h2UWjFeG7QSt0ZdZw4b4n3DOiYNxGasp11nWcr2bjeQ=; b=jU6EPAye8QyTFyhGn20Bc2HXsC5iACqsUR3e1WGYb9p4SfpRTQP46iY1cu0P+KpaAqG/rT pGxhsvxdqcon2jnaomGZCCacZA40FK1turk1jpUYeDeUjME2+m0SeCGsDTi6n3dN5eL2Pj 3rX8sBm6NYP3sFMoZpFOfZyCj0hlM6KsDt/OHTWO6oLbMO3rcXqabLA0zETxxdW03g1XyV 0uvlb8uya8DqSKLnw1/YhBIag2bNe2bZVgd0uVkcegxnoDdp96q2A9p2k7HJqrKRy/HQUZ XWVdLyPwR085oc+BxizfuVB1YWkuVnhQPZucyLlFAahS0P3Y/fl0UtYd1KT/Rw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698172619; a=rsa-sha256; cv=none; b=azyspgHiXcaddeVCbvfJBEcwSrls+feGclIJHgSTJ5N+KoGA/j7hylydC0XeHyfR5BoU5s H69qS+eqzaPB5/51qKi1lblfLB99prRY1JyYZfWkDzcLN65vml4A8I3gQyMGEGDWgXBSVg F8TqwnDzFbcv3/47jUy1CGRmv2xrmoDTxp5eYa8qfKOkLPm1K+6V4UAqoKpWEEpzG3WrRm 5SrLwBilPsUDV0l1CmK4/V07o/xnJmj3jBHDWf/LkJqEINyt9++sYTH/lRH1KqPl5ROGB6 xJGL7N72gzA6pYTO/maz0Y3AFxfJsPt5oRTB7h7kHbeEkvcMICzkX6seBIMsIw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698172619; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=h2UWjFeG7QSt0ZdZw4b4n3DOiYNxGasp11nWcr2bjeQ=; b=Upn2kq9mv4IZIYsSYyYp6ujQ0AcbxgMfAGhvWIYvl10zekIL5/yM3sMYG4ggYHnOqg8cmT +klnpyilpKeKK4cmkV0mzhUqzsOjoDQB352vU9O7jHvfrZznTcwr3rnssgaQDQTidu+M88 9qyPc1LlfM0T5EmXz/V2kRmTmz4fTmDKAzZeDvwR6YNF8q/R4GA6Beg4t7MvtGyy6UXi10 rC7fyGDd5JCnEu7D6TAmlmDtElPgWOjnNVc5hDJlEyx59e1sWHDP4oa/+FnObA8jyhbCnk ImDg0UqUDzp8RtO4W4xdikNpm9MkN3GioNNwQJREBYMoOTwiA1r6/sDnTuejYg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SFLPl1LCdzYmM; Tue, 24 Oct 2023 18:36: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 39OIaxGP087498; Tue, 24 Oct 2023 18:36:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39OIax42087495; Tue, 24 Oct 2023 18:36:59 GMT (envelope-from git) Date: Tue, 24 Oct 2023 18:36:59 GMT Message-Id: <202310241836.39OIax42087495@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: a74d0e30bfd6 - stable/14 - factor: Remove an empty #ifdef __FBSDID clause List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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/stable/14 X-Git-Reftype: branch X-Git-Commit: a74d0e30bfd6833fcbed1c710b68eccf09bb0fdc Auto-Submitted: auto-generated The branch stable/14 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=a74d0e30bfd6833fcbed1c710b68eccf09bb0fdc commit a74d0e30bfd6833fcbed1c710b68eccf09bb0fdc Author: John Baldwin AuthorDate: 2023-09-23 21:49:11 +0000 Commit: John Baldwin CommitDate: 2023-10-24 17:02:32 +0000 factor: Remove an empty #ifdef __FBSDID clause (cherry picked from commit f2f73fa7bd4b24c22ced0ff4566e03115dc9cb5f) --- usr.bin/factor/factor.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/usr.bin/factor/factor.c b/usr.bin/factor/factor.c index cc25b9dd2bf5..53a369f10506 100644 --- a/usr.bin/factor/factor.c +++ b/usr.bin/factor/factor.c @@ -42,8 +42,6 @@ __SCCSID("@(#)factor.c 8.4 (Berkeley) 5/4/95"); #ifdef __RCSID __RCSID("$NetBSD: factor.c,v 1.19 2009/08/12 05:54:31 dholland Exp $"); #endif -#ifdef __FBSDID -#endif #endif /* not lint */ /* From nobody Tue Oct 24 18:37:00 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SFLPm3vnfz4yLbn; Tue, 24 Oct 2023 18:37: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 4SFLPm35b4z3Y6p; Tue, 24 Oct 2023 18:37:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698172620; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+LOd5bse5POtzVW1rz+ZIiXC/ICSybnhZ/BzJJwnd9I=; b=s3dYC40SBeZR6bVBU1DxAjufXFjXrV6aM4vq3zU4z1vLr+gCY9Tqn0O4aCJPsrWen/VDMn PEd3VRvnbZtFyQjATktkNAgdl9bvxYxCKoGzW5WKc9eJCQ7EMCr3wz79eET4bXl9YrYWx/ 3BiVQFpt7gl3Y4p1ahB1F3GLzHS7Buc/Z15aXvOkOisr3bPs3jABpol7il5RVTrxC1hXyH 84lb0gA2fTaGavsHWj8/cuKjOwOvx0vE8eOOlf2VjiWw9WLw7M3rXwSyHX2RKXDOG0rAg4 HkJpYqPuOnRvZyWupC3P2KUGcuaVpUmUvY1Fg+4bwSclce9oyJVBIRU0zpsP8g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698172620; a=rsa-sha256; cv=none; b=EzilzfEu/uLAW6tB3dDiPmkiDjaG1CMH94PLpW/IBipBosAB6ff73wcS7B4OJVgxi5zVwT UxjKXAYgpTROp2p/m0a5srUNJwmKQ2bAjFLbt18mQFgucFs0gRgVYIpdyQCDxJoMbtmUfq sdBFF5Q8TAYGdEcpKBHPXaZFPubbVC5q0mosZ9ne9eiNsskDvuU6sLMg99ynLXCPPOQmYE hpDGGZYGqiOj7wE37woo2iJYUn4Fl0bajy/rwg6h+h9RHlkTLjdQ/CTh37KlqrlUZS5sdL wHDcKN8r8lZM7pEVzOh86XppG3+Iolls62UGzNN7Nm0rIuLs2TfRP/tOZN8uZw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698172620; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+LOd5bse5POtzVW1rz+ZIiXC/ICSybnhZ/BzJJwnd9I=; b=p5nDS9OuEZaztX5DqQeLQuqkO4p/5TyfJIEt8M8jRFxG3awL6XfEKqddmznoKPOckhXL0R bJXSnqwlkmnBUB7mDwUfVotbObI0ZKscB9rONBn+N4AsKkYuG9eXw7jAGmRTaYjGqJHgAZ 4VcMXgyqqdYYiKoXRjvF/vFePXeimbuqKk8ar5GJqNVqJrV2VyVcgBeOVYabIxPcnLiHpc hkqSWrjLb8Q+3L1drSS212HscgQvHmnMadmUpwhci1J8BjJxw/33wjNaHsPQ3Ff1iWorOG EpIwxVJDCimCB2t7+bvwobJDRzg1bDNZKT5KsYD80lCaCPYdxTmGPvltbmKYHA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SFLPm1vPKzZ30; Tue, 24 Oct 2023 18:37: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 39OIb0Mb087677; Tue, 24 Oct 2023 18:37:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39OIb0K1087655; Tue, 24 Oct 2023 18:37:00 GMT (envelope-from git) Date: Tue, 24 Oct 2023 18:37:00 GMT Message-Id: <202310241837.39OIb0K1087655@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: a2972d873753 - stable/14 - make_*_driver.sh: Don't include $FreeBSD$ in generated files List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: a2972d87375377858698a3cfdfda171d79440a65 Auto-Submitted: auto-generated The branch stable/14 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=a2972d87375377858698a3cfdfda171d79440a65 commit a2972d87375377858698a3cfdfda171d79440a65 Author: John Baldwin AuthorDate: 2023-09-25 14:46:09 +0000 Commit: John Baldwin CommitDate: 2023-10-24 17:02:54 +0000 make_*_driver.sh: Don't include $FreeBSD$ in generated files Reviewed by: imp, emaste Differential Revision: https://reviews.freebsd.org/D41950 (cherry picked from commit 97232e04ca07dffeef629c1628f1cc95f062b41a) --- share/examples/drivers/make_device_driver.sh | 8 -------- share/examples/drivers/make_pseudo_driver.sh | 6 ------ 2 files changed, 14 deletions(-) diff --git a/share/examples/drivers/make_device_driver.sh b/share/examples/drivers/make_device_driver.sh index 3ed8d784c1c0..5b8f8efa6469 100755 --- a/share/examples/drivers/make_device_driver.sh +++ b/share/examples/drivers/make_device_driver.sh @@ -34,8 +34,6 @@ else fi UPPER=`echo ${1} |tr "[:lower:]" "[:upper:]"` -RCS_KEYWORD=FreeBSD - if [ -d ${TOP}/modules/${1} ]; then echo "There appears to already be a module called ${1}" echo -n "Should it be overwritten? [Y]" @@ -90,7 +88,6 @@ DONE ####################################################################### cat >${TOP}/i386/conf/${UPPER} <${TOP}/dev/${1}/${1}.c < -__FBSDID("\$${RCS_KEYWORD}$"); - #include #include #include /* cdevsw stuff */ @@ -956,8 +950,6 @@ fi cat >${TOP}/modules/${1}/Makefile <${TOP}/i386/conf/${UPPER} <${TOP}/dev/${1}/${1}.c < -__FBSDID("\$FreeBSD\$"); - #include #include #include /* SYSINIT stuff */ @@ -389,8 +385,6 @@ fi cat >${TOP}/modules/${1}/Makefile < To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 4ebc032713d5 - stable/13 - ifconfig/ifvlan.c: Whitespace fix List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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/stable/13 X-Git-Reftype: branch X-Git-Commit: 4ebc032713d523879b831c6b1fa3cd98803a9012 Auto-Submitted: auto-generated The branch stable/13 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=4ebc032713d523879b831c6b1fa3cd98803a9012 commit 4ebc032713d523879b831c6b1fa3cd98803a9012 Author: John Baldwin AuthorDate: 2023-09-23 20:27:49 +0000 Commit: John Baldwin CommitDate: 2023-10-24 18:13:18 +0000 ifconfig/ifvlan.c: Whitespace fix (cherry picked from commit 701468baa415c7d563d1ad28d3133d0a976908e6) --- sbin/ifconfig/ifvlan.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbin/ifconfig/ifvlan.c b/sbin/ifconfig/ifvlan.c index 40e1f697db7a..214af72f56fc 100644 --- a/sbin/ifconfig/ifvlan.c +++ b/sbin/ifconfig/ifvlan.c @@ -4,7 +4,7 @@ * Copyright (c) 1999 Bill Paul * Copyright (c) 2012 ADARA Networks, Inc. * All rights reserved. - * + * * Portions of this software were developed by Robert N. M. Watson under * contract to ADARA Networks, Inc. * From nobody Tue Oct 24 18:37:01 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SFLPn4BYzz4yLt3; Tue, 24 Oct 2023 18:37: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 4SFLPn3cDtz3Y0X; Tue, 24 Oct 2023 18:37:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698172621; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8nHgN3UvA51VS53NzQ1+8ih/zpGfl15IWavvbg161GA=; b=oFUwspUqTei11dktcKC/AzCz8wmNWhY5ZmcJXF9TUCzd4xr95kRlAYD13d+E1pGg/vYSGr ThG2dZ+svg2/du+ZrpHeUlal5kDts7rxxHUQwjSBAx5rKtfiu0HyGMv9bhQRzjG6fZFneW 6L7/8BBlsKyb+aHASYCzqJLU/KzBkgKeUuB2p7S+iG9oXVqTWcej+q05mAygS8pizoBxEo /qD1QgA6PPtUs/05RULqAUpNF2i+SRoV+dHWe6nG5lc0VHJPiRdqHS/V/FyC7EFNpJQlAW uIzhZO6HbkoJ1ZfMKHutV2GlyC5eAbeT/YS/GN5x4+eGP+trneKlBq88ymraYA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698172621; a=rsa-sha256; cv=none; b=B8hQ8PMaQScFJsIe1CLLYKYTR/ztGvEC2MaHm1kV846MgrQSm8EODWbYBdWc2QMeE9bVTx 8lipZdoxI86GcuSKcpCBmWuMJsCgr0kevnu+dYgV4aT1Zk+K6lFjbstST5Rym8WDc6U0Kn Icr8vUOU74qWNJ/nYTD7qdSdv25WOMWtd1xYGkeE+SLo2uzRTjhRMkwVzeF3PTGZ7uHo27 lI9CanD7+Fsfw85bzpOFNbaLvfsEIrv+vl2DSFrchz35Rp7ZEo9DVdz/EGWexv4qqGRRT+ PAyPSpWSfb2z2TXLgRUxc7dhp1zOqh7yY8DGoY3wbGBoZSuWjQNM5mf/ODNflw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698172621; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8nHgN3UvA51VS53NzQ1+8ih/zpGfl15IWavvbg161GA=; b=uy/GhOiow1MM7FfpHpuoir3qHImTtyDnTQzGoLYbjiFEmcXm8HHQr9TGSQPXjy9MXhuIXD 81SPwE2vD6OiwB9W/DgF30xUS2c9Tdgf4+0TZ3MDplUF3ds3ErCe4JRaB6S6/rUOQowDBj AmO31CCyt9z+n3iwX0+BPz5c/KJO1cc4ruKh2RLAwWXwwtoCn/0YOLNWDN5yuvesUfS6tn yvcRtTWD/0oU0ie9DL1lxNMB4/fGxzAPnvtbp5rwneKq+kPtW/1pxN5YcZ7RU4OyuffV9f 4nk+6h2thlEs6Ua9hKNvtlk/RUsHR5wSZAnm6OKgOQ1E453F6t//Yg7JtZvFxQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SFLPn2jjZzYX7; Tue, 24 Oct 2023 18:37: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 39OIb1J2087780; Tue, 24 Oct 2023 18:37:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39OIb1j6087771; Tue, 24 Oct 2023 18:37:01 GMT (envelope-from git) Date: Tue, 24 Oct 2023 18:37:01 GMT Message-Id: <202310241837.39OIb1j6087771@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 495a10475144 - stable/14 - Retire old diskless setup scripts List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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/stable/14 X-Git-Reftype: branch X-Git-Commit: 495a1047514482ec66edca26190c1049fff3518d Auto-Submitted: auto-generated The branch stable/14 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=495a1047514482ec66edca26190c1049fff3518d commit 495a1047514482ec66edca26190c1049fff3518d Author: John Baldwin AuthorDate: 2023-09-25 14:46:21 +0000 Commit: John Baldwin CommitDate: 2023-10-24 17:08:05 +0000 Retire old diskless setup scripts These scripts predate /etc/rc.diskless* and use a different scheme. A comment was added to them back in 2002 noting they were 3 years old at that point. Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D41951 (cherry picked from commit 7736786b08e8c9edb07088db3229695d0afed600) (cherry picked from commit f97a3f6a017103b2afaf451af055ec4131a455a9) --- ObsoleteFiles.inc | 6 + share/examples/Makefile | 8 - share/examples/diskless/ME | 52 ------ share/examples/diskless/README.BOOTP | 172 ----------------- share/examples/diskless/README.TEMPLATING | 301 ------------------------------ share/examples/diskless/clone_root | 137 -------------- 6 files changed, 6 insertions(+), 670 deletions(-) diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index dbb4eda24416..82caeac0db1d 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -58,6 +58,12 @@ OLD_FILES+=usr/tests/sys/netinet/tcp6_v4unmapped_bind_test OLD_FILES+=usr/share/man/man9/cr_seeothergids.9.gz OLD_FILES+=usr/share/man/man9/cr_seeotheruids.9.gz +# 20230925 +OLD_FILES+=usr/share/examples/diskless/ME +OLD_FILES+=usr/share/examples/diskless/README.BOOTP +OLD_FILES+=usr/share/examples/diskless/README.TEMPLATING +OLD_FILES+=usr/share/examples/diskless/clone_root + # 20230906: caroot bundle updated OLD_FILES+=usr/share/certs/trusted/E-Tugra_Certification_Authority.pem OLD_FILES+=usr/share/certs/trusted/E-Tugra_Global_Root_CA_ECC_v3.pem diff --git a/share/examples/Makefile b/share/examples/Makefile index 3ee7d8c0d840..06d10a0bc149 100644 --- a/share/examples/Makefile +++ b/share/examples/Makefile @@ -11,7 +11,6 @@ LDIRS= BSD_daemon \ IPv6 \ bootforth \ csh \ - diskless \ drivers \ etc \ find_interface \ @@ -74,13 +73,6 @@ SE_BOOTFORTH= \ SE_DIRS+= csh SE_CSH= dot.cshrc -SE_DIRS+= diskless -SE_DISKLESS= \ - ME \ - README.BOOTP \ - README.TEMPLATING \ - clone_root - SE_DIRS+= drivers SE_DRIVERS= \ README \ diff --git a/share/examples/diskless/ME b/share/examples/diskless/ME deleted file mode 100644 index ff06be2c5393..000000000000 --- a/share/examples/diskless/ME +++ /dev/null @@ -1,52 +0,0 @@ -IMPORTANT NOTE: - -As of Feb. 11, 2002 (and indeed, for quite some time before that), -the /etc/rc.diskless{1,2} scripts support a slightly different -diskless boot process than the one documented in the rest of -this file (which is 3 years old). - -I am not deleting the information below because it contains some -useful background information on diskless operation, but for the -actual details you should look at /etc/rc.diskless1, /etc/rc.diskless2, -and the /usr/share/examples/diskless/clone_root script which can -be useful to set up clients and server for diskless boot. - ---- $FreeBSD$ --- ------------------------------------------------------------------------- - -When templating, /conf/ME is typically a softlink to -/conf/. When doing a diskless boot, /conf/ME is -retargeted by /etc/rc.diskless1 from pointing to the server to pointing -to the client's directory, /conf/. The retargeting -is accomplished through an MFS -o union mount. - -When templating, this softlink should be different for each machine. -When doing a diskless boot, this softlink is typically part of the / NFS -mount from the server and points to the server's conf directory, but gets -retargeted during the /etc/rc.diskless1 phase. - -System-wide configuration files must generally be targeted through /conf/ME. -For example, your /etc/rc.conf.local should become a softlink to -/conf/ME/rc.conf.local and your real rc.conf.local should go into the -appropriate /conf/ directory. This is also true of -/etc/rc.local, /etc/fstab, /etc/syslog.conf, /etc/ccd.conf, /etc/ipfw.conf, -/etc/motd, /etc/resolv.conf, and possibly even /etc/ttys ( if you want -to start an X session up on boot on certain of your machines ). - -When templating, you duplicate your / and /usr partitions on each machine's -local disk from a single master ( assuming /var and /home reside elsewhere ), -EXCEPT for the /conf/ME softlink. The /conf/ME softlink is the only thing -on / that should be different for each machine. - -There are often categories of configuration files. For example, all of your -shell machines may use one resolv.conf while all of your mail proxies may -use another. Configuration files can be categorized fairly easily through -/conf/HT. directories. You put the actual configuration file in -/conf/HT. and make a softlink from -/conf/ME//config-file to "../HT.. - - In the BOOTP workstation /conf/$IP/rc.conf.local, you must typically - turn *OFF* most of the system option defaults in /etc/rc.conf as well - as do additional custom configuration of your environment - - The /usr/src/share/examples/diskless directory contains a typical - X session / sshd based workstation configuration. The directories - involved are HT.DISKLESS/ and 192.157.86.12/. - - Essentially, the $IP/ directory ( which rc.diskless looks for in - /conf/$IP/ ) contains all the junk. The HT.DISKLESS directory exists - to hold common elements of your custom configuration so you do not have - to repeat those elements for each workstation. The example /conf - structure included here shows how to create a working sshd setup ( so - you can sshd into the diskless workstation ), retarget xdm's pid and error - files to R+W directories if /usr is mounted read-only, and retarget - syslogd and other programs. This example is not designed to run out of - the box and some modifications are required. - - >> NOTE << HT.DISKLESS/ttys contains the typical configuration required - to bring X up at boot time. Essentially, it runs xdm in the foreground - with the appropriate arguments rather then a getty on ttyv0. You must - run xdm on ttyv0 in order to prevent xdm racing with getty on a virtual - terminal. Such a race can cause your keyboard to be directed away from - the X session, essentially making the session unusable. - - Typically you should start with a clean slate by tar-copying this example - directory to /conf and then hack on it in /conf rather then in - /usr/share/examples/diskless. - - BOOTP CLIENT SETUP - - Here is a typical kernel configuration. If you have only one ethernet - interface you do not need to wire BOOTP to a specific interface name. - BOOTP requires NFS and NFS_ROOT, and our boot scripts require MFS. If - your /tmp is *not* a softlink to /var/tmp, the scripts also require NULLFS - -# BootP -# -options BOOTP # Use BOOTP to obtain IP address/hostname -options BOOTP_NFSROOT # NFS mount root filesystem using BOOTP info -options "BOOTP_NFSV3" # Use NFS v3 to NFS mount rootoptions -options BOOTP_COMPAT # Workaround for broken bootp daemons. -#options "BOOTP_WIRED_TO=de0" - -options MFS # Memory File System -options NFS # Network Filesystem -options NFS_ROOT # Nfs can be root -options NULLFS # nullfs to map /var/tmp to /tmp - - BOOTP SERVER SETUP - - The BOOTP server must be running on the same logical LAN as the - BOOTP client(s). You need to setup two things: - - (1) You need to NFS-export /, /usr, and /var. - - (2) You need to run a BOOTP server. DHCPD can do this. - - - NFS Export: - - Here is an example "/etc/exports" file. - -/ -ro -maproot=root: -network 192.157.86.0 -mask 255.255.255.192 -/usr -ro -maproot=root: -network 192.157.86.0 -mask 255.255.255.192 -/var -ro -maproot=root: -network 192.157.86.0 -mask 255.255.255.192 - - In order to be an NFS server, the server must run portmap, mountd, - nfsd, and rpc.statd. The standard NFS server options in /etc/rc.conf - will work ( you should put your overrides in /etc/rc.conf.local on the - server and not edit the distribution /etc/rc.conf, though ). - - BOOTP Server: - - This configuration file "/etc/dhcpd.conf" example is for - the '/usr/ports/net/isc-dhcp' dhcpd port. - - subnet 192.157.86.0 netmask 255.255.255.192 { - # range if you want to run the core dhcpd service of - # dynamic IP assignment, but it is not used with BOOTP - # workstations - range 192.157.86.32 192.157.86.62; - - # misc configuration. - # - option routers 192.157.86.2; - option domain-name-servers 192.157.86.2; - - server-name "apollo.fubar.com"; - option subnet-mask 255.255.255.192; - option domain-name-servers 192.157.86.2; - option domain-name "fubar.com"; - option broadcast-address 192.157.86.63; - option routers 192.157.86.2; - } - - host test1 { - hardware ethernet 00:a0:c9:d3:38:25; - fixed-address 192.157.86.11; - option root-path "192.157.86.2:/"; - option option-128 "192.157.86.2:/images/swap"; - } - - host test2 { - # hardware ethernet 00:e0:29:1d:16:09; - hardware ethernet 00:10:5a:a8:94:0e; - fixed-address 192.157.86.12; - option root-path "192.157.86.2:/"; - option option-128 "192.157.86.2:/images/swap"; - } - - SWAP. This example includes options to automatically BOOTP configure - NFS swap on each workstation. In order to use this capabilities you - need to NFS-export a swap directory READ+WRITE to the workstations. - - You must then create a swap directory for each workstation you wish to - assign swap to. In this example I created a dummy user 'lander' and - did an NFS export of /images/swap enforcing a UID of 'lander' for - all accesses. - - apollo:/usr/ports/net# ls -la /images/swap - total 491786 - drwxr-xr-x 2 root wheel 512 Dec 28 07:00 . - drwxr-xr-x 8 root wheel 512 Jan 20 10:54 .. - -rw-r--r-- 1 lander wheel 33554432 Dec 23 14:35 swap.192.157.86.11 - -rw-r--r-- 1 lander wheel 335544320 Jan 24 16:55 swap.192.157.86.12 - -rw-r--r-- 1 lander wheel 134217728 Jan 21 17:19 swap.192.157.86.6 - - A swap file is best created with dd: - - # create a 32MB swap file for a BOOTP workstation - dd if=/dev/zero of=swap.IPADDRESS bs=1m count=32 - - It is generally a good idea to give your workstations some swap space, - but not a requirement if they have a lot of memory. - diff --git a/share/examples/diskless/README.TEMPLATING b/share/examples/diskless/README.TEMPLATING deleted file mode 100644 index 48984e02b1da..000000000000 --- a/share/examples/diskless/README.TEMPLATING +++ /dev/null @@ -1,301 +0,0 @@ -IMPORTANT NOTE: - -As of Feb. 11, 2002 (and indeed, for quite some time before that), -the /etc/rc.diskless{1,2} scripts support a slightly different -diskless boot process than the one documented in the rest of -this file (which is 3 years old). - -I am not deleting the information below because it contains some -useful background information on diskless operation, but for the -actual details you should look at /etc/rc.diskless1, /etc/rc.diskless2, -and the /usr/share/examples/diskless/clone_root script which can -be useful to set up clients and server for diskless boot. - ---- $FreeBSD$ --- ------------------------------------------------------------------------- - - TEMPLATING machine configurations - - Matthew Dillon - dillon@backplane.com - - This document describes a general mechanism by which you can template - / and /usr. That is, to keep a 'master template' of / and /usr on a - separate machine which is then used to update the rest of your machines. - - Generally speaking, you can't simply mirror /. You might be able to - get away with mirroring /usr. There are two main problems involved with - templating: - - (1) Avoiding overwriting run-time generated files - - By default, the system maintains a number of files in the root - partition. For example, sendmail will dbm /etc/aliases into - /etc/aliases.db. vipw or chpass or other password related routines - will regenerate the password dbm's /etc/spwd.db, /etc/pwd.db, and - passwd. /etc/namedb/s might contain generated secondaries. And - so forth. - - The templating mechanism must avoid copying over such files. - - (2) Customizing machines. - - Customizing machines is actually considerably simpler. You create - a configuration hierarchy and convert the configuration files that - have to be customized into softlinks that run through a special - softlink in the configuration directory. This will work for every - configuration file except possibly /etc/master.passwd - - For example, /etc/resolv.conf would be turned into a softlink to - /conf/ME/resolv.conf, and /conf/ME itself would be a softlink to - /conf/. The actual resolv.conf configuration file - would reside in /conf/. - - If you have a lot of hosts, some configuration files may be commonly - classified. For example, all your shell machines might have the - same /etc/resolv.conf. The solution is to make - /conf//resolv.conf a softlink to a common directory, say - /conf/HT.SHELL/resolv.conf. It may sound a little messy, but this - sort of categorization actually makes the sysadmins job much, much - easier. - - The /conf/ directory hierarchy is stored on the template and - distributed to all the machines along with the rest of the root - partition. - - This type of customization is taken from my direct experience - instituting such a system at BEST. At the time, BEST had over 45 - machines managed from a single template. - - RUN-TIME GENERATED OR MODIFIED FILES IN / or /USR - - /etc/aliases.db - /etc/master.passwd - /etc/spwd.db - /etc/pwd.db - /etc/passwd - /etc/namedb/s - /root/.history - /root/.ssh/identity - /root/.ssh/identity.pub - /root/.ssh/random_seed - /root/.ssh/known_hosts - /conf/ME - /kernel* ( note 2 ) - /dev ( note 3 ) - /var ( note 4 ) - /home ( note 4 ) - /lost+found - - /usr/lost+found - /usr/home ( note 4 ) - /usr/crash ( note 5 ) - /usr/obj ( note 5 ) - /usr/ports ( note 5 ) - /usr/src ( note 5 ) - /usr/local/crack ( note 5 ) - /usr/local/lib/X11/xdm/xdm-errors ( note 6 ) - /usr/local/lib/X11/xdm/xdm-pid ( note 6 ) - /usr/local/etc/ssh_host_key ( note 6 ) - /usr/local/etc/ssh_host_key.pub ( note 6 ) - /usr/local/etc/ssh_random_seed ( note 6 ) - - /conf/ME ( note 7 ) - - note 2: You typically want to update kernels manually and *NOT* - template them as a safety measure. This also allows you to run - different kernels on different machines or. - - note 3: /dev must be updated manually. Some devices, such as tty's and - pty's, use the access and/or modify time and/or user/group - operationally and regenerating the devices on the fly would be - bad. - - note 4: /var and /home are usually separately mounted partitions and - thus would not fall under the template, but as a safety measure - the template copier refuse to copy directories named 'home'. - - note 5: These are directories that are as often created directly on - /usr as they are separately-mounted partitions. You typically - do not want to template such directories. - - note 6: Note that you can solve the problem of xdm and sshd creating - files in /usr. With xdm, edit /usr/local/lib/xdm/xdm-config - and change the errorLogFile and pidFile config lines. - - With sshd, add 'HostKey' and 'RandomSeed' directives to specify - /var/db for the location of the host key and run-time sshd - random seed: - - HostKey /var/db/ssh_host_key - RandomSeed /var/db/ssh_random_seed - - note 7: In this example, /conf/ME is the machine customizer and must - be pointed to the /conf// directory, which is - different for each machine. Thus, the /conf/ME softlink - should never be overwritten by the templating copy. - - - TYPICAL CUSTOMIZED CONFIGURATION SOFTLINKS - - The following files typically need to be turned into softlinks - to /conf/ME/: - - /etc/ccd.conf -> /conf/ME/ccd.conf - /etc/ipfw.conf ... - /etc/fstab - /etc/motd - /etc/resolv.conf - /etc/aliases - /etc/sendmail.cw - /etc/organization - /etc/named.conf - /etc/rc.conf.local - /etc/printcap - /etc/inetd.conf - /etc/login.conf - /etc/gettytab - /etc/ntp.conf - /etc/exports - /root/.k5login -> /conf/ME/root/.k5login - - And, of course, /conf/ME is usually a softlink to the appropriate - /conf//. Depending on your system configuration, - there may be other files not listed above that you have to worry about. - - In many cases, /conf/ME/filename is itself a softlink to - "../HT.xxxx/filename", where HT.xxxx is something like HT.STD ... this - added complexity actually makes it easier to manage multiple - classifications of machines. - - DELETION OF FILES - - Any file found on the template destination that does not exist in the - source and is not listed as an exception by the source should be deleted. - However, deletion can be dangerous and cpdup will ask for confirmation - by default. Once you know you aren't going to blow things up, you can - turn this feature off and update your systems automatically from cron. - - By formalizing the delete operation, you can be 100% sure that it is - possible to recreate / and /usr on any machine with only the original - template and a backup of the ( relatively few ) explicitly-excepted - files. The most common mistake a sysop makes is to make a change to a - file in / or /usr on a target machine instead of the template machine. - If the target machine is updated once a night from cron, the sysop - quickly learns not to do this ( because his changes get overwritten - overnight ). With a manual update, these sorts of mistakes can propagate - for weeks or months before they are caught. - - TEMPLATE COPYING AND SAFETY - THE CPDUP PROGRAM - - The 'cpdup' program is a program which efficiently duplicates a directory - tree. The program copies source to destination, duplicating devices, - softlinks, hardlinks, files, modification times, uid, gid, flags, perms, - and so forth. The program incorporates several major features: - - * The program refuses, absolutely, to cross partition boundaries. - i.e. if you were copying the template /usr from an NFS mount to - your /usr, and you had a mount point called /usr/home, the - template copying program would *NOT* descend into /usr/home on - the destination. - - This is a safety. - - * The program accesses a file called .cpignore in each directory - it descends into on the source to obtain a list of exceptions - for that directory -- that is, files not to copy or mess with. - - This is a templating function. - - * The program refuses to delete a directory on the destination - being replaced by a softlink or file on the source. - - This is a safety mechanism - - * The program is capable of maintaining MD5 check cache files and - doing an MD5 check between source and destination during the - scan. - - * The program is capable of deleting files/directories on the - destination that do not exist on the source, but asks for - confirmation by default. - - This is a templating and a safety mechanism. - - * The program uses a copy-to-tmp-and-rename methodology allowing - it to be used to update live filesystems. - - This is a templating mechanism. - - * The program, by default, tries to determine if a copy is required - by checking modify times, file size, perms, and other stat - elements. If the elements match, it does not bother to copy - ( unless an MD5 check is being made, in which case it must read - the destination file ). - - You typically run cpdup on the target machine. The target machine - temporarily mounts the template machine's / and /usr via NFS, read-only, - and runs cpdup to update / and /usr. If you use this methodology note - that THERE ARE SECURITY CONSIDERATIONS! See 'SECURITY CONSIDERATIONS WITH - NFS' below. - - Whatever script you use that does the NFS mounts should ensure that the - mount succeeded before continuing with the cpdup. - - You should create .cpignore files in the appropriate directories on the - template machine's / and /usr partitions so as not to overwrite active - files on the target. The most critical .cpignore files should be - protected with 'chflags schg .cpignore'. Specifically, the ones in / - and /etc, but possibly others as well. For example, the .cpignore - hierarchy for protect /root is: - - # /root/.cpignore contains - .history - - # /root/.ssh/.cpignore contains - random_seed - known_hosts - authorized_keys - identity - identity.pub - - WHEN INITIALLY CONVERTING A TARGET MACHINE TO USE TEMPLATING, ALWAYS - MAKE A FULL BACKUP OF THE TARGET MACHINE FIRST! You may accidentally - delete files on the target during the conversion due to forgetting to - enter items into appropriate .cpignore files on the source. - - SECURITY CONSIDERATIONS WITH NFS ROOT EXPORT FROM TEMPLATE MACHINE - SECURITY CONSIDERATIONS WITH NFS USR EXPORT FROM TEMPLATE MACHINE - - There are some serious security considerations that must be taken into - account when exporting / and /usr on the template machine. - - * only export read-only - - * the password file ( aka vipw ) may not contain any crypted passwords - at all. You MUST use ssh or kerberos to access the template machine. - - You can get away with giving only root a crypted password, but only - if you disallow network root logins and only allow direct root - logins on the console. - - * The machine's private ssh_host_key usually resides in /usr/local/etc. - You must move this key to /var/db. You can softlink link so no - modification of sshd_config is required. - - * The machine's private ~root/.ssh/identity file is also exposed by - the NFS export, you should move this file to /var/db as well and - put a softlink in ~root/.ssh. - - * DON'T EXPORT /var ! Either that, or don't put the private keys - in /var/db ... put them somewhere else. - - * You may want to redirect the location of the random_seed file, which - can be done by editing ~root/.ssh/sshd_config and - /usr/local/etc/sshd_config so it is not exposed either. - - -Matt - Matthew Dillon - dillon@backplane.com - diff --git a/share/examples/diskless/clone_root b/share/examples/diskless/clone_root deleted file mode 100755 index be5d2d2a9efd..000000000000 --- a/share/examples/diskless/clone_root +++ /dev/null @@ -1,137 +0,0 @@ -#!/bin/sh -# -# (C) 2001 Luigi Rizzo, Gabriele Cecchetti -# -# Revised 2001.04.16 -# -# -# clone root filesystem for diskless root stuff -# -# usage -# clone_root all to do a full copy (e.g. bin, sbin...) -# clone_root update to recreate /var (including devices) -# clone_root to copy /conf and password-related files -# -# This script assumes that you use a shared readonly root and /usr -# partition. The script creates a partial clone of the root partition, -# and puts it into ${DEST} (defaults to /diskless_root ) on the server, -# where it is read. -# -# To run a diskless install you need to do the following: -# -# create /conf/default/etc/fstab -# this will replace the standard /etc/fstab and should contain -# as a minimum the following lines -# ${SERVER}:${DEST} / nfs ro 0 0 -# ${SERVER}:/usr /usr nfs ro 0 0 -# proc /proc procfs rw 0 0 -# -# create /conf/default/etc/rc.conf -# this will replace the standard rc.conf and should contain -# the startup options for the diskless client. Most likely -# you will not need to set hostname and ifconfig_* because these -# will be already set by the startup code. You will also -# probably need to set local_startup="" so that the server's -# local startup files will not be used. -# -# create a kernel config file in /sys/i386/conf/DISKLESS with -# options MD_ROOT -# options BOOTP -# options BOOTP_NFSROOT -# options BOOTP_COMPAT -# and do a full build of the kernel. -# If you use the firewall, remember to default to open or your kernel -# will not be able to send/receive the bootp packets. -# -# On the server: -# enable NFS server and set /etc/exports as -# ${DEST} -maproot=0 -alldirs -# /usr -alldirs -# -# enable bootpd by uncommenting the bootps line in /etc/inetd.conf -# and putting at least the following entries in /etc/bootptab: -# .default:\ -# hn:ht=1:vm=rfc1048:\ -# :sm=255.255.255.0:\ -# :sa=${SERVER}:\ -# :gw=${GATEWAY}:\ -# :rp="${SERVER}:${DEST}": -# -# client1:ha=0123456789ab:tc=.default -# -# and make sure that client1 is listed in /etc/hosts - -# VARIABLES: -# some manual init is needed here. -# DEST the diskless_root dir (goes into /etc/bootptab and /etc/exports -# on the server) -DEST=/diskless_root - -# you should not touch these vars: -# SYSDIRS system directories and mountpoints -# DIRS mountpoints (empty dirs) -# PWFILES files related to passwords -# TOCOPY files and dirs to copy from root partition - -SYSDIRS="dev proc root usr var" -DIRS="cdrom home mnt" -PWFILES="master.passwd passwd spwd.db pwd.db" -TOCOPY="bin boot compat etc modules sbin stand sys" - -init_diskless_root() { - echo "Cleaning old diskless root ($DEST)" - cd / - rm -rf ${DEST} && echo "Old diskless root removed." - echo "Creating $DEST..." - mkdir -p $DEST && echo "New diskless root created." - echo "+++ Now copy original tree from / ..." - ex="" - (cd / ; tar -clf - ${TOCOPY} ) | (cd $DEST; tar xvf - ) - #(cd / ; find -x dev | cpio -o -H newc ) | \ - # (cd $DEST; cpio -i -H newc -d ) - echo "+++ Fixing permissions on some objects" - chmod 555 $DEST/sbin/init -} - -update_conf_and_pw() { - echo "+++ Copying files in /conf and password files" - (cd ${DEST} ; rm -rf conf ) - (cd / ; tar clf - conf ) | (cd ${DEST}; tar xvf - ) - mkdir -p ${DEST}/conf/etc # used to mount things - (cd /etc ; tar cvf - ${PWFILES} ) | (cd ${DEST}/etc ; tar xf - ) -} - -update() { - echo "+++ update: create mountpoints and device entries, kernel" - for i in ${SYSDIRS} ${DIRS} - do - rm -r -f ${DEST}/$i - mkdir -p ${DEST}/$i && chown root:wheel ${DEST}/$i && echo -n "$i " - done - echo "." - ln -s /var/tmp ${DEST}/tmp - echo "+++ Copying kernel from /sys/compile/DISKLESS" - cp /sys/compile/DISKLESS/kernel $DEST/kernel - echo "." -} - - -# Main entry point -case $1 in - all) # clean and reinstall the whole diskless_root - init_diskless_root - update - update_conf_and_pw - ;; - - update) # clean and rebuild mountpoints and device entries - update - update_conf_and_pw - ;; - - *) # copy /conf and password files - update_conf_and_pw - ;; -esac -exit 0 -### end of file ### From nobody Tue Oct 24 18:37:01 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SFLPn4FWXz4yLt5; Tue, 24 Oct 2023 18:37: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 4SFLPn3pGdz3Y7M; Tue, 24 Oct 2023 18:37:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698172621; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=D3WDoyKXHDNWtfZFCSsQGFKWbahuuQYyMig7a0/xphY=; b=MSY1OxDogBKur5JTfvvbblypb/ygbMVIiPmkd7TymU4wi9WVBzl6MzTDqvw79VHVTDOGET n0FVhaUbHU3yxLJ0WVh4R5fR4nm/8OV8cQJXOq1jaIhyf82H21i5XWAtDr+igCsP8H6Sah xAEYn8V2wBObKp1KR/tzg1c+lo7XpGyRmwU706GkRLAbctOsr94zGQqoT0O+hTziLu3SEr L6iOl51bZg9e0DivgTDFWAhCbttqfIypo3wt2Nn9jPrkMYw1ZgiEpNOCq9EVCw+EFIUxNq HJlHiDpXC0Lr4gRaoaRn5no/VfmHcgbLeLla0rmAwqKSGZLuG/zc50oeYXW2nw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698172621; a=rsa-sha256; cv=none; b=mvavLQPBivfnlBefQcq52szSaWM7y7ilvmZpDTU0UnXFqGlB3DYbJc6doNNriyuP0iPoo1 VER17MjeAlE/hvDoAROi/7sZKTUuZ49RbZPRYoItNKVCYBi1IafKvbxzIkgau2KJsBBUTg KZ/Po5JT63kxFc+vQxYWBR1O1beGxHoeK26eEiiGHnyRZCxcAAoy9x8eZetvhXhwWjDV2l DR3DiYeO46pCWiosZ5QcCPMhO5vkgYkoai/PVcvptU1xz8kqxwYdBvo3ZRF6GJNt45lHoQ 9JfAs/0pBFWA9hl+N0uvbR2J9h9yg3bHPWyT1QoEjiR4Gic5Ci4jEFWgUE0ywQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698172621; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=D3WDoyKXHDNWtfZFCSsQGFKWbahuuQYyMig7a0/xphY=; b=XvBTYw2ZLc+FYr9+mBHR50XJAfZBnwhpkzh0+F3WkuIxZ5WkVdVfmaikDgCmiGcU8Zug2r pxMk/0sS95s3ZJ6N9ua8m9z23iBnp6bex6d5Y8th6OkTUV0ZxrlGFI3MsLqTfRucKfKee8 Vhv+kTl/n6+hXVV+dBWJ1nEIYC+p/gAMdgolI74v3NHNZydRjKu+P8ZZdzjOnUGu0bGqOH Jw/Mn98tbx6j8OapMYpGT+yEWbssmLTBt0QEuoIHTGDsr4dg6VXyHYPfiVVrHdYF2LjXsB a9ecbLz5Y4VnQkajbPYntW3jiDXndQD2Y5UJpt2xCmLbQ8wlyYOJolMipYjWvw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SFLPn2tDyzYqD; Tue, 24 Oct 2023 18:37: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 39OIb18q087779; Tue, 24 Oct 2023 18:37:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39OIb1b9087777; Tue, 24 Oct 2023 18:37:01 GMT (envelope-from git) Date: Tue, 24 Oct 2023 18:37:01 GMT Message-Id: <202310241837.39OIb1b9087777@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 7a5518ed1a88 - stable/13 - factor: Remove an empty #ifdef __FBSDID clause List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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/stable/13 X-Git-Reftype: branch X-Git-Commit: 7a5518ed1a88b07d7e571c74bbbd67d77cc286c2 Auto-Submitted: auto-generated The branch stable/13 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=7a5518ed1a88b07d7e571c74bbbd67d77cc286c2 commit 7a5518ed1a88b07d7e571c74bbbd67d77cc286c2 Author: John Baldwin AuthorDate: 2023-09-23 21:49:11 +0000 Commit: John Baldwin CommitDate: 2023-10-24 18:13:18 +0000 factor: Remove an empty #ifdef __FBSDID clause (cherry picked from commit f2f73fa7bd4b24c22ced0ff4566e03115dc9cb5f) --- usr.bin/factor/factor.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/usr.bin/factor/factor.c b/usr.bin/factor/factor.c index 8591976b70ed..279028572fe3 100644 --- a/usr.bin/factor/factor.c +++ b/usr.bin/factor/factor.c @@ -42,8 +42,6 @@ __SCCSID("@(#)factor.c 8.4 (Berkeley) 5/4/95"); #ifdef __RCSID __RCSID("$NetBSD: factor.c,v 1.19 2009/08/12 05:54:31 dholland Exp $"); #endif -#ifdef __FBSDID -#endif #endif /* not lint */ /* From nobody Tue Oct 24 18:37:02 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SFLPp5CGVz4yLfn; Tue, 24 Oct 2023 18:37: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 4SFLPp4l3Rz3Y7y; Tue, 24 Oct 2023 18:37:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698172622; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=X0bYV2co8G+2lCTijdImJqR6Q0yODnjdy0KgXlLbHtI=; b=qeLhOnnEIjBj5IOLIfJkrqmCag93qLIqxNmwaRVQR2cKWWi2kGrEqDXmOrkPv2GHBeTKWW osZ8JdbTK/crKaXcuWtK2RfGMaYiKIj9B9THFGbAU41hXNQ7lCZ5q8IIrO5Ts8TVGFfyH0 sE4Bmy3C+h2ZZuzD8rDq2JvsO2kLXRhyG6Gcp4KRGKPx1ztdgNcnmjjzOreUex4LtAxTjw kqtSZOWn302sbPwAf4G4hem5m4I0D9jYrarm83+fK3JjvbgbqCy3KJ8Usv6tA6amLMNz2H z47bTVJlOpyDs/SRG+6qoRGt1mnE8WUuInq3Rpe/B2xx8Iycz5PHpwS/T/KK0g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698172622; a=rsa-sha256; cv=none; b=Wey52fv+dk7cBDl9h7NSVhF9NlK0dTsfivEZ905iTAuxeIsN8NYKo3zh24CQ1YApmM1zkq g2ct7OKyjg64CyjxAakTSkfFZbi1cYp8YH/AJTD2+RJ4SMVbYRQeQnfaaitt6z54azHcMG g/qPrMirMFTHPk5/jMWBMlO5a4z4EsUfuaGSrkc6Hdj2u0wzaylY8HeCqmC2oz47k8zdr7 dm8R6HaB6yxsLmssynls33sTjxLy3plHUAuWGSiq2KgWnaSvITq8fjeuASTngrjIPEA60w w7z1yH6jqtbIEVPL3hF3oPoV6nIUY9pd3fGZlqf+3d5AMlZI7C0cC28Rz7/xKQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698172622; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=X0bYV2co8G+2lCTijdImJqR6Q0yODnjdy0KgXlLbHtI=; b=k3x6QUr0eohQwolI8uWr9eLHML9+B9kEiicuklztvE0RkTYnfvz5wKEbhekEt5kX0eYU2x KN+xn0BoycJTGDVDA1E1TenBI1WaXklBZo0ppOMMB+8F/hrbHf4trVCY8oVxr1+bTP3T6T HRh9mifkl0KJac0FAVxSHhefMB5Tzjjw3SE85ADjqtNT225j4ogo/rYYIquUBW7ZXc8AnW yDlZgXWbQT0ffPY8XVhqTJ4onuFghFkcSx6lQZGwyd0lkXeV1bk6jnJMbIfNLkcFYu8k7h p7IRzIWaejG22Jpi5veqw96Q2e52E+l7XrES3jMNtvSTBq6ia0AaVYwSdbWedQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SFLPp3lSYzYqF; Tue, 24 Oct 2023 18:37: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 39OIb2Vt087875; Tue, 24 Oct 2023 18:37:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39OIb2f1087867; Tue, 24 Oct 2023 18:37:02 GMT (envelope-from git) Date: Tue, 24 Oct 2023 18:37:02 GMT Message-Id: <202310241837.39OIb2f1087867@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: c6dc53e7c80d - stable/14 - videomode/devlist2h.awk: Don't include $FreeBSD$ in generated files List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: c6dc53e7c80dc2acddc3df9470fd1e3bc783c8ea Auto-Submitted: auto-generated The branch stable/14 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=c6dc53e7c80dc2acddc3df9470fd1e3bc783c8ea commit c6dc53e7c80dc2acddc3df9470fd1e3bc783c8ea Author: John Baldwin AuthorDate: 2023-09-25 14:46:53 +0000 Commit: John Baldwin CommitDate: 2023-10-24 17:08:19 +0000 videomode/devlist2h.awk: Don't include $FreeBSD$ in generated files Reviewed by: imp, emaste Differential Revision: https://reviews.freebsd.org/D41952 (cherry picked from commit bd524e2ddb77e1c691f308359ab917414ecb8bed) --- sys/dev/videomode/devlist2h.awk | 2 -- 1 file changed, 2 deletions(-) diff --git a/sys/dev/videomode/devlist2h.awk b/sys/dev/videomode/devlist2h.awk index 2bae373cd307..7fc75df2e8d0 100644 --- a/sys/dev/videomode/devlist2h.awk +++ b/sys/dev/videomode/devlist2h.awk @@ -39,7 +39,6 @@ NR == 1 { gsub("\\$", "", VERSION) gsub(/ $/, "", VERSION) - printf("/*\t$FreeBSD" "$\t*/\n\n") > dfile printf("/*\n") > dfile printf(" * THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT.\n") \ > dfile @@ -48,7 +47,6 @@ NR == 1 { printf(" *\t%s\n", VERSION) > dfile printf(" */\n") > dfile - printf("/*\t$NetBSD" "$\t*/\n\n") > hfile printf("/*\n") > hfile printf(" * THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT.\n") \ > hfile From nobody Tue Oct 24 18:37:02 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SFLPp5xx1z4yM4b; Tue, 24 Oct 2023 18:37: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 4SFLPp4vBXz3Y80; Tue, 24 Oct 2023 18:37:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698172622; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=R1nxWOMZAGjzBe40crYgO8dTG53Xw/QVHGJifZHHZLc=; b=ob3DYmGyp4Y0egey2qA3trIJyoZQBStsYWIvsd3z0Rb8WFP0Jx5hcwyl8Sfo9XvRAMyjIz FZ4YpnIb0o+it15Y0C5lflOog0C9ojNgd7sweWxsTWc5rNkek9pa1vjLs8ittRRys65yq/ ZFesLWPQyvDFbSszy3KPWNVSRJo+4XBrJjNdBG/hrxO3uzsOeSiOPbyy+qW9d/n5pmd3jN dwW3Yk4AVyjvOzOun+gkR4RHEIOqMeoGk3fVeUDoCnUSDAAhUoFQSJd5Wllyw/prNc4IYG 8vnehCPc4FPGHodade8QnDS5ouVaJ5yCf6wnJabIpQ1ZzRdgGWpysYs5URubtQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698172622; a=rsa-sha256; cv=none; b=S068Rjg+lph4z3PTvth/XEvbtPK6oz9Lf6yNRpYXom5zPQq4DcMzr251bDXLBSmdUemJzI wi3g50zCBcqFcfxbw5VvGJsf2GfhvL74nr/O8uqUVlDWs+Oq26heIqJ9pmH7m5LKAT4qJH mSd0UTMUNeFEnO+9Z66L+tqWMy4P4Z8Bvx6xFP58iMDGiXcFgdgCTtba2mpBgYmnowofCg Rn8xTQkMZ1Q+yewK4AuFkScemTPv49RRtkXZe/sRaMoDXW11xpr2wFswpqQOzi2zoX1nvk 3KLcZLiUhtFdkoAL86vSt94lLKvTdfyCUk1C1jm7EcVYBk6f+9dGatk2mdGzgw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698172622; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=R1nxWOMZAGjzBe40crYgO8dTG53Xw/QVHGJifZHHZLc=; b=DZCtIRJaOSnH5FGLajiLPfqEXMcZqRWKtQ1JKFE8c1GLTzgYXyCoWAXuhWndLFTCyCDkxr FkBf0L+iMpL8ROUa7qN2ouV+5fjzHYE3vN2VnHdEgg1S5puftEjUliPaZsNnFNi6v1s0gg Rzk/eh88ARjiWP779M/aHpl0E4rpkg9UM5rXkSbKF+vnOwQBNSpiabI0YBbR975P3r8eYE KRQU1lyWdi2BJTLS/ZhXl92Q9HjiWQ7uxGiI/SbHlGM2Roqf94ngf0kzTCWtvDHE0ZxEet pukwfP2tlADjtaM0mo2B5fLPpOKiBY/e8ITv7io1fUpH+nGv5yMcwEFU5ZUV8A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SFLPp3W5qzYmN; Tue, 24 Oct 2023 18:37: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 39OIb2fh087876; Tue, 24 Oct 2023 18:37:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39OIb2at087872; Tue, 24 Oct 2023 18:37:02 GMT (envelope-from git) Date: Tue, 24 Oct 2023 18:37:02 GMT Message-Id: <202310241837.39OIb2at087872@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 70b875694e35 - stable/13 - make_*_driver.sh: Don't include $FreeBSD$ in generated files List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 70b875694e352e6c1ea6a3cd90e554381046a58c Auto-Submitted: auto-generated The branch stable/13 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=70b875694e352e6c1ea6a3cd90e554381046a58c commit 70b875694e352e6c1ea6a3cd90e554381046a58c Author: John Baldwin AuthorDate: 2023-09-25 14:46:09 +0000 Commit: John Baldwin CommitDate: 2023-10-24 18:13:18 +0000 make_*_driver.sh: Don't include $FreeBSD$ in generated files Reviewed by: imp, emaste Differential Revision: https://reviews.freebsd.org/D41950 (cherry picked from commit 97232e04ca07dffeef629c1628f1cc95f062b41a) --- share/examples/drivers/make_device_driver.sh | 8 -------- share/examples/drivers/make_pseudo_driver.sh | 6 ------ 2 files changed, 14 deletions(-) diff --git a/share/examples/drivers/make_device_driver.sh b/share/examples/drivers/make_device_driver.sh index 3ed8d784c1c0..5b8f8efa6469 100755 --- a/share/examples/drivers/make_device_driver.sh +++ b/share/examples/drivers/make_device_driver.sh @@ -34,8 +34,6 @@ else fi UPPER=`echo ${1} |tr "[:lower:]" "[:upper:]"` -RCS_KEYWORD=FreeBSD - if [ -d ${TOP}/modules/${1} ]; then echo "There appears to already be a module called ${1}" echo -n "Should it be overwritten? [Y]" @@ -90,7 +88,6 @@ DONE ####################################################################### cat >${TOP}/i386/conf/${UPPER} <${TOP}/dev/${1}/${1}.c < -__FBSDID("\$${RCS_KEYWORD}$"); - #include #include #include /* cdevsw stuff */ @@ -956,8 +950,6 @@ fi cat >${TOP}/modules/${1}/Makefile <${TOP}/i386/conf/${UPPER} <${TOP}/dev/${1}/${1}.c < -__FBSDID("\$FreeBSD\$"); - #include #include #include /* SYSINIT stuff */ @@ -389,8 +385,6 @@ fi cat >${TOP}/modules/${1}/Makefile < To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: acbf45f5fc8d - stable/13 - videomode/devlist2h.awk: Don't include $FreeBSD$ in generated files List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: acbf45f5fc8d858c8fa143b4f429f2d76ba7ed8f Auto-Submitted: auto-generated The branch stable/13 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=acbf45f5fc8d858c8fa143b4f429f2d76ba7ed8f commit acbf45f5fc8d858c8fa143b4f429f2d76ba7ed8f Author: John Baldwin AuthorDate: 2023-09-25 14:46:53 +0000 Commit: John Baldwin CommitDate: 2023-10-24 18:13:18 +0000 videomode/devlist2h.awk: Don't include $FreeBSD$ in generated files Reviewed by: imp, emaste Differential Revision: https://reviews.freebsd.org/D41952 (cherry picked from commit bd524e2ddb77e1c691f308359ab917414ecb8bed) --- sys/dev/videomode/devlist2h.awk | 2 -- 1 file changed, 2 deletions(-) diff --git a/sys/dev/videomode/devlist2h.awk b/sys/dev/videomode/devlist2h.awk index 2bae373cd307..7fc75df2e8d0 100644 --- a/sys/dev/videomode/devlist2h.awk +++ b/sys/dev/videomode/devlist2h.awk @@ -39,7 +39,6 @@ NR == 1 { gsub("\\$", "", VERSION) gsub(/ $/, "", VERSION) - printf("/*\t$FreeBSD" "$\t*/\n\n") > dfile printf("/*\n") > dfile printf(" * THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT.\n") \ > dfile @@ -48,7 +47,6 @@ NR == 1 { printf(" *\t%s\n", VERSION) > dfile printf(" */\n") > dfile - printf("/*\t$NetBSD" "$\t*/\n\n") > hfile printf("/*\n") > hfile printf(" * THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT.\n") \ > hfile From nobody Tue Oct 24 18:37:03 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SFLPq70m1z4yLln; Tue, 24 Oct 2023 18:37: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 4SFLPq56k6z3YJt; Tue, 24 Oct 2023 18:37:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698172623; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6XS+8EOaczk7Bcqhx4mpSIb/EKpKCNE3QJOUAvjUUmw=; b=GqgzWcuiyEe03GbqQ1QHMy+mqMruVVH20IfveZgX69dSc3eygn3KzlZnXRmueUJYMWYql4 gMeAZh2bt0WUGSn3TVPH95PrYoHqBndbrpg+zy9I3XwlAUjtrG4PQTEZeBozn3FVRRT6oy yI1x4KPRRwRKksNwhKMemUR0rZYrwtBAU2aKh/Uhb2rcm5hBu3y/IL1HurK73o7uWzzrCI jX1sVtbzFeexq9wunG8WEJicKfml7eYIXWyD6YPGxrwm+w+GhlHefmCj6dR2AZY5MAXfp3 XvDarip9cBhHMKG+HqYE5ESFm+hz5l+dXt7WJ/G8cc75MZhhceaYCVomcwC/ug== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698172623; a=rsa-sha256; cv=none; b=AdOBlIwa0U48VgrD+EZrHVaZJIEZ4cdvKA0AsYeW6Rd4X57iCS4EzBNraMf+jAKQFWXABv YJSr5/g52fp7v9sHwuJsd09DWJt9TLchhz3ZTUFPwBAdxTgtB5tcgIgmxR3v3unwXtnSi3 xc//+yCEiWloSyNd/iwue9BBcwwQRkzgDGVcIT1SIEdEc622dgDFqvOSl0hWvD8sKOvAly MB7/ojYI/Y67xrdoBFI9Fe5UdqIByMEDGFhWGSstOzXMaBnfvdN2tcdjwSFqNWOZydWp3K /061WJLwlFoV3gfZ9mEVormfOkTN9/diSopcLjPuSS9PUwbFF97hYYVSZA6L+Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698172623; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6XS+8EOaczk7Bcqhx4mpSIb/EKpKCNE3QJOUAvjUUmw=; b=JWT2XauwC+vexTzDrDzsI0RE6aFrwhf1KJl/et4OslWYmeTiRUjYz2iqIvp0Vc6QDmAybE VrbETEhclugeRF2d/pX4oFuj/ot1XFoRUMCpz+nlTCPmaB+ZBqKTFV8ZOTGY/usZCzVFlq 4Hw787H+IKo/dQmpxskrua5SLLFS6qLuTOghJyjKxozCIMtp2cinh8kT+5OjaqNXQld8Dj EO7Wf6/k57wg8s2Qvq3ZAyrM/anhLGbc65YDjOYBbyyDbycsJyCyXeS/kTNZ5KNFMI4j+2 FKiu7/IH5oeXbYaFIhzx5btjUovx8eWZb7ab/QNG0hXcXVDGHhTNyoPc1qMtlw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SFLPq46T3zYqG; Tue, 24 Oct 2023 18:37: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 39OIb3mf087937; Tue, 24 Oct 2023 18:37:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39OIb3HZ087917; Tue, 24 Oct 2023 18:37:03 GMT (envelope-from git) Date: Tue, 24 Oct 2023 18:37:03 GMT Message-Id: <202310241837.39OIb3HZ087917@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 62ba76f3d149 - stable/14 - videomode: Regenerate files List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 62ba76f3d149fae73ca204ae75edc8cf5d388664 Auto-Submitted: auto-generated The branch stable/14 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=62ba76f3d149fae73ca204ae75edc8cf5d388664 commit 62ba76f3d149fae73ca204ae75edc8cf5d388664 Author: John Baldwin AuthorDate: 2023-09-25 14:49:30 +0000 Commit: John Baldwin CommitDate: 2023-10-24 17:08:29 +0000 videomode: Regenerate files Reviewed by: imp, emaste Differential Revision: https://reviews.freebsd.org/D41953 (cherry picked from commit fc3cc652e500bd8e33b4b77449d167f1df073acb) --- sys/dev/videomode/ediddevs.h | 13 +++++++++++-- sys/dev/videomode/ediddevs_data.h | 3 +-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/sys/dev/videomode/ediddevs.h b/sys/dev/videomode/ediddevs.h index a0dc4e2b181c..872192882c3e 100644 --- a/sys/dev/videomode/ediddevs.h +++ b/sys/dev/videomode/ediddevs.h @@ -1,9 +1,8 @@ - /* * THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT. * * generated from: - * NetBSD: ediddevs,v 1.1 2006/05/11 01:49:53 gdamore Exp + * NetBSD: ediddevs,v 1.2 2007/03/07 18:47:13 macallan Exp */ /*- @@ -81,6 +80,16 @@ #define EDID_VENDOR_VSC "ViewSonic" #define EDID_VENDOR_ZCM "Zenith" +/* + * List of known products, grouped and sorted by vendor. + * + * EDID version 1.3 requires that monitors expose the monitor name with + * the ASCII descriptor type 0xFC, so for monitors using that block, this + * information is redundant, and there is not point in listing them here, + * unless it is desired to have a symbolic macro to detect the monitor in + * special handling code or somesuch. + */ + /* Dell - this exists for now as a sample. I don't have one of these. */ #define EDID_PRODUCT_DEL_ULTRASCAN14XE_REVA 0x139A /* Ultrascan 14XE */ #define EDID_PRODUCT_DEL_ULTRASCAN14XE_REVB 0x139B /* Ultrascan 14XE */ diff --git a/sys/dev/videomode/ediddevs_data.h b/sys/dev/videomode/ediddevs_data.h index a953bcbf9981..c798bd85809d 100644 --- a/sys/dev/videomode/ediddevs_data.h +++ b/sys/dev/videomode/ediddevs_data.h @@ -1,9 +1,8 @@ - /* * THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT. * * generated from: - * NetBSD: ediddevs,v 1.1 2006/05/11 01:49:53 gdamore Exp + * NetBSD: ediddevs,v 1.2 2007/03/07 18:47:13 macallan Exp */ /*- From nobody Tue Oct 24 18:37:04 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SFLPr6ybpz4yLrK; Tue, 24 Oct 2023 18:37: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 4SFLPr5xyDz3Y49; Tue, 24 Oct 2023 18:37:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698172624; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NtbtbzJOD+ATtsUDg1tO9uw3oi2cVImldtRbx/wce3s=; b=ToBHHb+q//fjQo3X7vQcwnmqxL+B72+AylAd0xoyRIaMWPXyBQhg86r0NAL7FoRhG5DvOT myG47NMs5/n2ad7BExqw7bJ5TNNsgLtufAKbFOnbYD1ov6Jhm27K0p7ssmSDLm/xq+uFew l7ud2K/EnEwKppcWQCmiQbY4bF8cC20BGoCTWNQAMb0e608ywShHW/2aWWctXAqoOLVFxA iijnhr7Ii35aS1In6O+YsxjBwZa26amw9xCkZ+Mkrwc83/mJ4NYmIlB1ds3vh0PYdJecmy ymq8h+G98DGBbps/KN7DjHjPFlaZSsO/EKRJMuTBPryGmQmH9K3l8bB0L2EyUg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698172624; a=rsa-sha256; cv=none; b=i1xSStSzyA7OH/TvanUTBoJ3y0CpimURGosKlbx2faEqOWTgsnp3TjvBxszVvp2NPpire3 2nD6SyVMDnRdWV32QzU4/XKjCtXpVrwtccqQq5EHB6Mrsrd0bT+Eiq77sRIJ1LoyXPa7vu fb4cqQQdqHL4V1M142X8nQqEvttk77hCTAnuROzz7Z46/rnsbrwHmg78Lou/RAaBZHniDN 61BmwxquxyAvZaI0A76rJwf+7N6LTfqNCTFIa4AxfeZkG1epuOuQ1uUNdsM3QEiHvRGYwC 4ehILg2evjKGiH/0vopcFgyd9GuspAPRAbjBCMwpTcQaW4eraoKGH0twEjCpRg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698172624; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NtbtbzJOD+ATtsUDg1tO9uw3oi2cVImldtRbx/wce3s=; b=JhWBVqBXoJ18eaDBGKs/p2FNqB3lbYtIHsLBsE7NgYIAvxqSls+QgollnbwQykDphmMekv PSRyiwEc2bb8/f+v+kj7JZs7d9cerxed7mGG4QsSrYcbn8Bw0SdsfeiV832GzcW+aGhRBs ZRI1tYJlk7YRuNVaIJfDM5O4H6Gr04lOWtQtEfEV1myMx/gkiG5tojlFnaesroJRuUV4J8 2VgZlwjxJcMYFhNzrE7B8lAiqpqWUmitwF+4nyirkpuRqZoC+7Aq4bHKPiZzmxyWOt3rwh c+HKuCkPPBecOTGJlOpNbHCF/01E4Hcu6g7gPWXbhMHwPL367WDoFl+QfAg7Rw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SFLPr532SzYX8; Tue, 24 Oct 2023 18:37: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 39OIb4na088061; Tue, 24 Oct 2023 18:37:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39OIb4KF088053; Tue, 24 Oct 2023 18:37:04 GMT (envelope-from git) Date: Tue, 24 Oct 2023 18:37:04 GMT Message-Id: <202310241837.39OIb4KF088053@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 43a0b925c1b3 - stable/13 - videomode: Regenerate files List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 43a0b925c1b3bf3ef4f9ff801ad65baacd750030 Auto-Submitted: auto-generated The branch stable/13 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=43a0b925c1b3bf3ef4f9ff801ad65baacd750030 commit 43a0b925c1b3bf3ef4f9ff801ad65baacd750030 Author: John Baldwin AuthorDate: 2023-09-25 14:49:30 +0000 Commit: John Baldwin CommitDate: 2023-10-24 18:13:18 +0000 videomode: Regenerate files Reviewed by: imp, emaste Differential Revision: https://reviews.freebsd.org/D41953 (cherry picked from commit fc3cc652e500bd8e33b4b77449d167f1df073acb) --- sys/dev/videomode/ediddevs.h | 13 +++++++++++-- sys/dev/videomode/ediddevs_data.h | 3 +-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/sys/dev/videomode/ediddevs.h b/sys/dev/videomode/ediddevs.h index a0dc4e2b181c..872192882c3e 100644 --- a/sys/dev/videomode/ediddevs.h +++ b/sys/dev/videomode/ediddevs.h @@ -1,9 +1,8 @@ - /* * THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT. * * generated from: - * NetBSD: ediddevs,v 1.1 2006/05/11 01:49:53 gdamore Exp + * NetBSD: ediddevs,v 1.2 2007/03/07 18:47:13 macallan Exp */ /*- @@ -81,6 +80,16 @@ #define EDID_VENDOR_VSC "ViewSonic" #define EDID_VENDOR_ZCM "Zenith" +/* + * List of known products, grouped and sorted by vendor. + * + * EDID version 1.3 requires that monitors expose the monitor name with + * the ASCII descriptor type 0xFC, so for monitors using that block, this + * information is redundant, and there is not point in listing them here, + * unless it is desired to have a symbolic macro to detect the monitor in + * special handling code or somesuch. + */ + /* Dell - this exists for now as a sample. I don't have one of these. */ #define EDID_PRODUCT_DEL_ULTRASCAN14XE_REVA 0x139A /* Ultrascan 14XE */ #define EDID_PRODUCT_DEL_ULTRASCAN14XE_REVB 0x139B /* Ultrascan 14XE */ diff --git a/sys/dev/videomode/ediddevs_data.h b/sys/dev/videomode/ediddevs_data.h index a953bcbf9981..c798bd85809d 100644 --- a/sys/dev/videomode/ediddevs_data.h +++ b/sys/dev/videomode/ediddevs_data.h @@ -1,9 +1,8 @@ - /* * THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT. * * generated from: - * NetBSD: ediddevs,v 1.1 2006/05/11 01:49:53 gdamore Exp + * NetBSD: ediddevs,v 1.2 2007/03/07 18:47:13 macallan Exp */ /*- From nobody Tue Oct 24 18:37:04 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SFLPs0FGqz4yLc4; Tue, 24 Oct 2023 18:37: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 4SFLPr6C3mz3Y8r; Tue, 24 Oct 2023 18:37:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698172624; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8yAzyEjWeaZEZl53fIyIJ9UJAvDgBKobiC8Nd/ntNJo=; b=wqhcWOLw+3kTwz/RwemWsjm6hKW5QWM6Y6u3e73qnfbK1XgE6ETv1xa3OYKdE7Rdc2apKy kQImwnMHT3NYIe6t79wBKuWMAnAuJusyTeJEl1TwgSYpNpIAbppIWIGIU+rNblNf98m71R kVcTvPczXT8Dcj8h+6y/d6rIOjex6VNQt4AL3uc8PchsfOQdRd3CKan209XS3X4/TTaNxI qYRxSRUP2WV4Ghu5Nx7mlsmb9N8mK4SH89cWYMqRAM9draxZkBg69M8fpMXVQd8244F3HS 2Mvug62PUlYkMGdM1LmqJGpNwOoLPGzPq5bTQCjQOmdZp6j2LoPdShET3sH5yQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698172624; a=rsa-sha256; cv=none; b=ysqGi4CmGft8EObdk4WroZw5fk87tlAvMoCszfO0Dd5dLRoim7tAgJfxhF5e78j1IkArf3 m8uxBW0te0s54JTHkTmQq70PHF5N43ri1AJfVzm70/cmC0TxWiqDT81XW80EuUy16SRzN3 82qJyTN57DbJQfWuqa+BnDnki5SDUB8jX4d3fDbLsP+uBFc4JBUIN//l/LPSGGymqUEPF0 LXautMjD4GcA7JDGOSmr4ssNClcA4X0Uhj73e+Qno4QdHECGbLkG7Nqgt2NRItyie7FS3N bnp4JhCQwoAwdBp2oaeBrLBMbsm0THVLNrr+d2HNPxs3Zf0kYIPGN0AO+7yy1A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698172624; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8yAzyEjWeaZEZl53fIyIJ9UJAvDgBKobiC8Nd/ntNJo=; b=fbPFrv4aHMsPOTRE3wHjrusrMaNUR5PMJtWx+aybi0SYE4pQx9/lm4sFhclPhrNWHZozSu P+lyY7RA8fRcvGa89dGsEkjweRLcYXTJ0Hj7yKobBXPV3vxqzIFbGu9OQZSbvIXrQALvN3 usu71skj1UVREOUyHqWaAVZgC3/v017K2Y60aPC39gbnJdbOLky/P3ILdWi16Uy1qgb3i5 cNdFGaqTVHXWdGYBUeBGvNIj7TtQrdG/UwmpnddqaS+urBMDlw6rgEtOWLC2/omYmrvqjN BxJIH+C+ZhxAgvth91R7YSs+xIut1zgBhiC6P9h3hbtPtFBMBfd8XqhZmzpatg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SFLPr5JkhzYZw; Tue, 24 Oct 2023 18:37: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 39OIb4Ia088062; Tue, 24 Oct 2023 18:37:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39OIb4eF088058; Tue, 24 Oct 2023 18:37:04 GMT (envelope-from git) Date: Tue, 24 Oct 2023 18:37:04 GMT Message-Id: <202310241837.39OIb4eF088058@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 5db9e9e29605 - stable/14 - Remove a few more stray __FBSDID uses List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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/stable/14 X-Git-Reftype: branch X-Git-Commit: 5db9e9e29605616f071fc6a4cb01ff464d47848f Auto-Submitted: auto-generated The branch stable/14 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=5db9e9e29605616f071fc6a4cb01ff464d47848f commit 5db9e9e29605616f071fc6a4cb01ff464d47848f Author: John Baldwin AuthorDate: 2023-09-25 14:49:52 +0000 Commit: John Baldwin CommitDate: 2023-10-24 17:08:46 +0000 Remove a few more stray __FBSDID uses Reviewed by: imp, emaste Differential Revision: https://reviews.freebsd.org/D41954 (cherry picked from commit 16837d353cdde87672d08112610e51e4121c4e50) --- lib/libc/tests/sys/cpuset_test.c | 3 --- sys/arm/mv/clk/armada38x_coreclk.c | 3 --- sys/dev/enic/enic.h | 3 --- 3 files changed, 9 deletions(-) diff --git a/lib/libc/tests/sys/cpuset_test.c b/lib/libc/tests/sys/cpuset_test.c index 52c0dc877ab8..53d6a8215bbc 100644 --- a/lib/libc/tests/sys/cpuset_test.c +++ b/lib/libc/tests/sys/cpuset_test.c @@ -25,9 +25,6 @@ * SUCH DAMAGE. */ -#include -__FBSDID("$FreeBSD"); - #include #include #include diff --git a/sys/arm/mv/clk/armada38x_coreclk.c b/sys/arm/mv/clk/armada38x_coreclk.c index 14887ce88fb3..21e630d18b06 100644 --- a/sys/arm/mv/clk/armada38x_coreclk.c +++ b/sys/arm/mv/clk/armada38x_coreclk.c @@ -24,9 +24,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include -__FBSDID("$FressBSD$"); - #include #include #include diff --git a/sys/dev/enic/enic.h b/sys/dev/enic/enic.h index a2a40334986f..6d0eb8563efd 100644 --- a/sys/dev/enic/enic.h +++ b/sys/dev/enic/enic.h @@ -3,9 +3,6 @@ * Copyright 2007 Nuova Systems, Inc. All rights reserved. */ -#include -__FBSDID("$FreeBSD: $"); - #ifndef _ENIC_H #define _ENIC_H From nobody Tue Oct 24 18:37:05 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SFLPt0ZRBz4yLrS; Tue, 24 Oct 2023 18:37: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 4SFLPt03Lcz3YKb; Tue, 24 Oct 2023 18:37:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698172626; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ktvN3jMEshPCPrHJbejFlB9speUGyuAmyXv/farkLfc=; b=UljSYz7nJzyTbkqyI2P8bNJgU63jHmywd08tPXQYbpvrT2e/gbMgW/Yzjqef6IKyycgwxw HCuuoV2p3ar6u3jafxyxAFAFhc6zK8OPVFQRQ9Up40TfZkcJ44cb+EzpCjgBsbnxbRXIxZ 4oQuN8cPrxRqV6timhw91uiQdoARLq7G26Z6wj9H19Oa3abCYbO05bq7AHn4rY3a+L/m1E Cse4pZuX1EzYiMvul7FXZlsHRvWxJjjL1t2TH+CJtJKPqjbnZQgAhaxYxfjWEsgoMpnrPm UqfO0nnjaF6HiA1pzPrKKmQHGRJmzj6dN+hFhOKehdjSAEY9FTWVVirmMTh04w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698172626; a=rsa-sha256; cv=none; b=ntx6YwPxDhDcVXQeT72hueSbbAlhlNmC/p0SSs4cTTCsEtj1ipfDnB8zK71J75zMnbq53J L7aI9G49GAwjpRK9PYIhX841ME9mCnSkwR4eExTeCbokdIRFDx+nc/gzEf2YYA/OSLLV3N 8Y/Q9GRa1cOqlKG+WHuwbHjWitlVFBhBTB7ocE/HyeCws6sOJZfgjDD3sF29/LTIL3GJHz KDmIHeKRQA+6rFPWdxtKarsHAkEqmFYVuuPR8wqnUCMyKiuBCBG2WJVuEib139aGa+m/rO SjTqSWEUbFnSoZ6Fe/r2Eg0gTjGfAqtOZ+dl20hcwhlfX6bNxOCf1L1UoOZOTw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698172626; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ktvN3jMEshPCPrHJbejFlB9speUGyuAmyXv/farkLfc=; b=oB7YnM3StawxKCvj/WckI61X/Jb8jr+8dp2XIhA44/lnoq+UA+aUWYcngaWVvoPzRXMKPC qTFhd4/DjBW+wygxYc+DXs90KkoumuW+ojCAFpo6vjHKzAnNWsU95H5r7fWU9Wc29y2XhI tBsS1M1Vu1mJYDiXsKv1BZatKHDihFsDezCrFxuFYNz7VFOsmqW5KCmoQ/4Yu0UUBUj0se qfMiOVNHygH57TbGECwVYaePYqvLKw4w+4ED2LmSw+PdQZX34pIouML7kTCIhjfOHzSmq0 kYjugpBkQwPRgdTQ7ac/6XBxx/xwjd+BFvmeE+Aw8mJGjXl9RzR6l9fL7bKipQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SFLPs6BygzYmP; Tue, 24 Oct 2023 18:37: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 39OIb5QU088173; Tue, 24 Oct 2023 18:37:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39OIb5WW088169; Tue, 24 Oct 2023 18:37:05 GMT (envelope-from git) Date: Tue, 24 Oct 2023 18:37:05 GMT Message-Id: <202310241837.39OIb5WW088169@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: efb26b3fe6ca - stable/14 - Update a couple of tools to not embed __FBSDID in generated files List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: efb26b3fe6ca47738754b89d4d2e82fcd7473619 Auto-Submitted: auto-generated The branch stable/14 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=efb26b3fe6ca47738754b89d4d2e82fcd7473619 commit efb26b3fe6ca47738754b89d4d2e82fcd7473619 Author: John Baldwin AuthorDate: 2023-09-25 14:50:11 +0000 Commit: John Baldwin CommitDate: 2023-10-24 17:09:55 +0000 Update a couple of tools to not embed __FBSDID in generated files Reviewed by: imp, emaste Differential Revision: https://reviews.freebsd.org/D41955 (cherry picked from commit 99159b076a278d1feb0e18ae99fd866c90443893) --- sys/dev/bnxt/convert_hsi.pl | 6 ------ tools/tools/drm/radeon/mkregtable/mkregtable.c | 5 ----- 2 files changed, 11 deletions(-) diff --git a/sys/dev/bnxt/convert_hsi.pl b/sys/dev/bnxt/convert_hsi.pl index df59aeab6cc9..19f5d2d3aea1 100755 --- a/sys/dev/bnxt/convert_hsi.pl +++ b/sys/dev/bnxt/convert_hsi.pl @@ -55,9 +55,6 @@ print OUT < -__FBSDID("\$FreeBSD\$"); - END_OF_NOTICE # Convert line endings @@ -132,9 +129,6 @@ if ($do_decode) { * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ - #include - __FBSDID("\$FreeBSD\$"); - END_OF_NOTICE if(!open(HDR, ">", "hsi_struct_decode.h")) { diff --git a/tools/tools/drm/radeon/mkregtable/mkregtable.c b/tools/tools/drm/radeon/mkregtable/mkregtable.c index e0b94561f5cd..e39264fbcd2b 100644 --- a/tools/tools/drm/radeon/mkregtable/mkregtable.c +++ b/tools/tools/drm/radeon/mkregtable/mkregtable.c @@ -593,11 +593,6 @@ static void table_print(struct table *t) nlloop = (t->nentry + 3) / 4; c = t->nentry; - printf( - "#include \n" - "__FBSDID(\"$" "FreeBSD" "$\");\n" - "\n" - ); printf("static const unsigned %s_reg_safe_bm[%d] = {\n", t->gpu_prefix, t->nentry); for (i = 0, id = 0; i < nlloop; i++) { From nobody Tue Oct 24 18:37:05 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SFLPt0ThLz4yM91; Tue, 24 Oct 2023 18:37: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 4SFLPs6tXRz3YQD; Tue, 24 Oct 2023 18:37:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698172626; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BTnQ+2P3FLVhMzdzT5XeKtQuyz63i10U0xA88V9LhlQ=; b=YDYJftiw3r0KSBje6hoZfqcGxKoKNV+Cm8e8DH4Fibmvpt0Xi6/VkngEpZ28K1LHbSqSIX wmLQ2FlamaqJnPgJeOvQwQAQ/XttUPBPaHs9s0NZvKbv3qiUKJHvt6KIpHqZJaMBc+jwWR RE/SbHyf0UA8S4UOIsYmjZf6RITLZg2n88FhcFxk+kfzLi0OlgE02DovTVDbUOX1v7uhge d4v8GFrn+bk/OonuAa23pRghYHmWJvd55F2szv1aNsc1DtCVJr9sr+NPke08hQ5A8XsqB+ af8bznuGEEtHDFc1/xTNOYpTvrzmek8+n8QkjuECSP+eIOTwwiW3rEc4dAoKEA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698172626; a=rsa-sha256; cv=none; b=WRX67OJ7e3/K5J748raxS8k0KZ+2om9VGedzJ2Idzqoq8EiBCUibVWl3fWSVMIqGGYDBIb c6K1f9n/tmzQAHACPBedsQ/LIXvUi8RLnpBc3vLR9UQNWMPRAo5rJaHmPPF98ab/UkP/tJ EEr37GarVDgrFr23V6BQZrYqHIJngRbXCrE8qzs1zysh+AuTpQmRNUtDv4ADpi5+APozmX WTuLl8pgZvlw92ASeFQYmhUSnYc+0cA2b4doW0IFx+HweW9TErIADQFVWZbtylwh7HlfIZ HSrD1oumRYGwYNSwzLDMTKp+03LXl3dLaoNUS/1ZH0WoIhjxSFcDiycYuBb6yA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698172626; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BTnQ+2P3FLVhMzdzT5XeKtQuyz63i10U0xA88V9LhlQ=; b=FOAqJqL91BWI8N/baL/QdO7QkYjGPOwtIr5HaoP70iHTZ0+9EMz/UfmgsUmZ9DtfOHjvnP jRhPyNg+67zAPTP6lcCVD+j6ewGFcS6vJbX3oiDy8lR0rUkI/cwHsIcO5toudXNw8IECBH lBac4ktaL5NAoNu572O5c8t1eJcy6sUMa4JkkQg9oEEUc0xUfbHNbi5WcH82JptOSGl5vx Z6DQem2D+ydPo8Z6D2XnIGOBgun5L1j9oioKUyfQXWdElXy+1iUclTXtiavo9X9EWxZ7gb 2m1b28nsvwdf3Fu72/UQ/CfHdarn8JKno/qW2gDX8oIIQ8/HOi1DvqfqJV3JuA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SFLPs5xwZzZ3V; Tue, 24 Oct 2023 18:37: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 39OIb5wo088172; Tue, 24 Oct 2023 18:37:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39OIb5ZC088161; Tue, 24 Oct 2023 18:37:05 GMT (envelope-from git) Date: Tue, 24 Oct 2023 18:37:05 GMT Message-Id: <202310241837.39OIb5ZC088161@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: a94d45499f9f - stable/13 - Remove a few more stray __FBSDID uses List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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/stable/13 X-Git-Reftype: branch X-Git-Commit: a94d45499f9f6eec6bf04dac55cf5f2720df6509 Auto-Submitted: auto-generated The branch stable/13 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=a94d45499f9f6eec6bf04dac55cf5f2720df6509 commit a94d45499f9f6eec6bf04dac55cf5f2720df6509 Author: John Baldwin AuthorDate: 2023-09-25 14:49:52 +0000 Commit: John Baldwin CommitDate: 2023-10-24 18:13:18 +0000 Remove a few more stray __FBSDID uses Reviewed by: imp, emaste Differential Revision: https://reviews.freebsd.org/D41954 (cherry picked from commit 16837d353cdde87672d08112610e51e4121c4e50) --- lib/libc/tests/sys/cpuset_test.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/lib/libc/tests/sys/cpuset_test.c b/lib/libc/tests/sys/cpuset_test.c index 52c0dc877ab8..53d6a8215bbc 100644 --- a/lib/libc/tests/sys/cpuset_test.c +++ b/lib/libc/tests/sys/cpuset_test.c @@ -25,9 +25,6 @@ * SUCH DAMAGE. */ -#include -__FBSDID("$FreeBSD"); - #include #include #include From nobody Tue Oct 24 18:37:06 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SFLPv18Mhz4yM94; Tue, 24 Oct 2023 18:37: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 4SFLPv0f2mz3YQn; Tue, 24 Oct 2023 18:37:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698172627; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sdkQM8Cw/G4FMpzfnnQxWI9doemqzaXoyzYyIAChcWw=; b=niaQouM3Ivuhv2/NxGE1UTGkPan7RXXXoAp4VSoEgGZweHVgmKr/6lWG1s6Fqn0nLWUeUR AKGieE3woyRGUkArf73NPMNCYfESki8DZi3CqhlaXBXTfMef2O62i12H4X4Lodk9SgcSsp RF+fRarEp1OtLmwUHSpAb5tR86z0+X59YHIVS69OMogen/dbUePevDRYIcFONrFqfG5S6y iLZEulT8bJJMvzZFtrlnw/PLyC4yz6NwcaynU8QWi++WZ6MZIwi2z/fW/DV85rvWpaYy1D jU/YkJnvX0bktptVRTdg8MbBFuT9ADVVPpx38qz+bVUeXX1ZUXbZ8+phCZxe1A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698172627; a=rsa-sha256; cv=none; b=BR9a2O4rLRU2cKGXhl+vGHG/eEclqBC3CDNn/yNCt0f22XFyYvbmPa5XkSLxKsoDgtXrBS owZbdbVMq2gARav+cLvhYQW3Hf6eKahBG9iuyQEcDDa22pfMi31TCj/j94veAemmmtmo+s XXebIhMW9LrPT8N7YKe4ecvccjtp9k3QTD0PD4SOJoiRcZ5NbyDWHU2YDW6UODPaw3BZKh OKtHoCrktJWGfqgb3xD1DQ/T2SUR0b4f7H0Sj9EITfdwLlx7k2mzItyG+YmViRPaGvoVpR TUkrX7HJlN0S7DOWodwMJW6ORyP2eoZ1Iq0Ju+alH6ew/zaOIikRMYVVSuE88g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698172627; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sdkQM8Cw/G4FMpzfnnQxWI9doemqzaXoyzYyIAChcWw=; b=nZZRagqpAZmEQuIPzRBLf6viV5A81iM5qRL8/zewl1mNG7Ebh9cHyfxEK5vj0XRIbHeY9N xSXdZ6efnZ5veQYtGW93vQgvg6qxk7UtDAVhSmHE9JpRmSFPrMYPJvZP4bsXwXk5177HCZ 94JJs9ISiaM8G2IG4jXSKS8jx+COfwnswUGDMkF/CLXX52s9LpXOdGH1DfN1TXzbc8xpE0 ezQrg7k6bhfYLquYs+uXLkd6AAhvMr86xCj+NwBGjUA+p45VtXu89GXFTO5lqBxJa7Rudi lf0QcjO7Sr5DHPnOCtUYqKk4QmxttvadQVsOKXgD5N03aiuuhXRipyC+s53SEw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SFLPt6rBzzYmQ; Tue, 24 Oct 2023 18:37: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 39OIb6FR088288; Tue, 24 Oct 2023 18:37:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39OIb6bc088285; Tue, 24 Oct 2023 18:37:06 GMT (envelope-from git) Date: Tue, 24 Oct 2023 18:37:06 GMT Message-Id: <202310241837.39OIb6bc088285@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 8cc22227ffdf - stable/13 - Update a couple of tools to not embed __FBSDID in generated files List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 8cc22227ffdf98a49c6761431e493146fbeabf87 Auto-Submitted: auto-generated The branch stable/13 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=8cc22227ffdf98a49c6761431e493146fbeabf87 commit 8cc22227ffdf98a49c6761431e493146fbeabf87 Author: John Baldwin AuthorDate: 2023-09-25 14:50:11 +0000 Commit: John Baldwin CommitDate: 2023-10-24 18:13:18 +0000 Update a couple of tools to not embed __FBSDID in generated files Reviewed by: imp, emaste Differential Revision: https://reviews.freebsd.org/D41955 (cherry picked from commit 99159b076a278d1feb0e18ae99fd866c90443893) --- sys/dev/bnxt/convert_hsi.pl | 6 ------ tools/tools/drm/radeon/mkregtable/mkregtable.c | 5 ----- 2 files changed, 11 deletions(-) diff --git a/sys/dev/bnxt/convert_hsi.pl b/sys/dev/bnxt/convert_hsi.pl index df59aeab6cc9..19f5d2d3aea1 100755 --- a/sys/dev/bnxt/convert_hsi.pl +++ b/sys/dev/bnxt/convert_hsi.pl @@ -55,9 +55,6 @@ print OUT < -__FBSDID("\$FreeBSD\$"); - END_OF_NOTICE # Convert line endings @@ -132,9 +129,6 @@ if ($do_decode) { * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ - #include - __FBSDID("\$FreeBSD\$"); - END_OF_NOTICE if(!open(HDR, ">", "hsi_struct_decode.h")) { diff --git a/tools/tools/drm/radeon/mkregtable/mkregtable.c b/tools/tools/drm/radeon/mkregtable/mkregtable.c index e0b94561f5cd..e39264fbcd2b 100644 --- a/tools/tools/drm/radeon/mkregtable/mkregtable.c +++ b/tools/tools/drm/radeon/mkregtable/mkregtable.c @@ -593,11 +593,6 @@ static void table_print(struct table *t) nlloop = (t->nentry + 3) / 4; c = t->nentry; - printf( - "#include \n" - "__FBSDID(\"$" "FreeBSD" "$\");\n" - "\n" - ); printf("static const unsigned %s_reg_safe_bm[%d] = {\n", t->gpu_prefix, t->nentry); for (i = 0, id = 0; i < nlloop; i++) { From nobody Tue Oct 24 18:37:06 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SFLPv188Rz4yLrY; Tue, 24 Oct 2023 18:37: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 4SFLPv0Yzsz3YL9; Tue, 24 Oct 2023 18:37:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698172627; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rQXxAZLGxEiZeMHri71TzxEX9YJiLz9AJdrItzzzpnU=; b=lhJvlNQcmQS0arO+MeMy7JRL6XSp4Y1v2MclqHDj9hCbKfCUtYVunPAzS+JjSGRdzqBooX QO/E8slYoQxRYIpatZwiAL5I1XxjTgPGmVe2SPP66fN+DbreUxbzdJ6kMelg+RTFRDEZ9c 3SuBrkF/MsR+4IIxepxBY68LD4b2FQivvENOpC36zBTO3yC6bYxO+QyOWlXhIUSybY9wwF 2mEhKXpmHC/dFzchAuvsw6AiorMC/udVAID+SZAYjC4gYd+WVmD9YLbXTKPtZXaDtWkip8 qdwePY8uLfoqTg6PDKvjZJY0r6t2ZwTX8S8NJdn6tCp/oFgcFtigZT1dynZrhw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698172627; a=rsa-sha256; cv=none; b=rPA1wbtfzzEoKTx+67lTRfcwzEAwJr3eLchO0f2fi29lZkJAcbs/TDMeVdeFisG+owT2w/ MsDfzp65KyZAun2RjhzpvewbTiDzZsUkMcIJh9dkWra7QqIlvIeyTLqrbRjwYtUuW80yK7 PfwGYSEAdbWT82aGu9l5q4GxpR7SdCetNyEGAVEDB8xebwPaAqnTwZxdiZ/sXLI4Xv4AQi RChGZUoPKayeIiWNEwgxhYDEahHgZUwgp0qz0xeYIXFoXyW+xlKQs6QloV/l7gJVlx2JtM tQ0KMed9NY/DyH8izofWMULsPxudjvkDaW2yoKsdmB2iartf+COMx3vyym3Y5g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698172627; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rQXxAZLGxEiZeMHri71TzxEX9YJiLz9AJdrItzzzpnU=; b=buMLTweh3FcZzAavmrcu06O8rZN5p1bMbr4n7iFK8NxCOLFYvrR5yWx7VWn0XrilshZOou T88x/5qoxBoI4Dm3WfLbvtNyMHrImTpkqZMBQSFK+7cRaRF7kMxtB95EnI+Wo+hVWTsELD hbUNMZFJDPHfbxctD1345gQNxLbv3mw5aCUR2x3brRQXMeia90rhGJPCnKP2LUTQt4uFZU ScNgR0qDGNZmjy0mfUxLiOthQTJS3IrFbvnqEI26ESPS9Eg4shSGIDLAlyouVKKCBoenq+ Kh/NZJ8lp2sb7mKmiFQBf95SLEdtSPVRu5mfQ3xj7ls3jA3MkAr/F8rMPtGx0g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SFLPt6myFzYX9; Tue, 24 Oct 2023 18:37: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 39OIb6ZC088287; Tue, 24 Oct 2023 18:37:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39OIb6tZ088272; Tue, 24 Oct 2023 18:37:06 GMT (envelope-from git) Date: Tue, 24 Oct 2023 18:37:06 GMT Message-Id: <202310241837.39OIb6tZ088272@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 97cb7bde896d - stable/14 - lpr: Remove now unused fallback definition for __FBSDID List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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/stable/14 X-Git-Reftype: branch X-Git-Commit: 97cb7bde896d2661bd0405b94d60297c51eb7c7c Auto-Submitted: auto-generated The branch stable/14 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=97cb7bde896d2661bd0405b94d60297c51eb7c7c commit 97cb7bde896d2661bd0405b94d60297c51eb7c7c Author: John Baldwin AuthorDate: 2023-09-25 14:50:33 +0000 Commit: John Baldwin CommitDate: 2023-10-24 17:10:04 +0000 lpr: Remove now unused fallback definition for __FBSDID Reviewed by: imp, emaste Differential Revision: https://reviews.freebsd.org/D41956 (cherry picked from commit e4c68414d0854b5e43dfd1b2b0cfbc295702e831) --- usr.sbin/lpr/common_source/lp.cdefs.h | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/usr.sbin/lpr/common_source/lp.cdefs.h b/usr.sbin/lpr/common_source/lp.cdefs.h index c3ca409b6a8b..f5adf6e0ba5d 100644 --- a/usr.sbin/lpr/common_source/lp.cdefs.h +++ b/usr.sbin/lpr/common_source/lp.cdefs.h @@ -81,20 +81,6 @@ # define __unused #endif -/* - * All the lpr source files will want to reference __FBSDID() to - * handle rcs id's. - */ -#if !defined(__FBSDID) -# if defined(lint) || defined(STRIP_FBSDID) -# define __FBSDID(s) struct skip_rcsid_struct -# elif defined(__IDSTRING) /* NetBSD */ -# define __FBSDID(s) __IDSTRING(rcsid,s) -# else -# define __FBSDID(s) static const char rcsid[] __unused = s -# endif -#endif /* __FBSDID */ - /* * Some lpr include files use __BEGIN_DECLS and __END_DECLS. */ From nobody Tue Oct 24 18:37:07 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SFLPw26ZSz4yMCg; Tue, 24 Oct 2023 18:37: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 4SFLPw1NYvz3YTg; Tue, 24 Oct 2023 18:37:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698172628; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Xs5zCulZtWtHVL40+6pBNlB+ni/JPYms7pfO4G3sX4w=; b=r7O3KAwB17t18EDoentvM04SXVc2aFcDGL1DHW8I0Mz1EDRo/ZZMqd+fA92XuGtyAHeHZh tk9W/QQOeOyNULW8qPvJoEImMJd4WE1Mh5tMHlSPHORYJQximcFXjhe6SVkIHRl6d/wqqF oiRdPeKwAwwRJqgqtM8HBoZjmPxqp7gA1iSPLNceXBrpqqDOj6k4azeVyvkZl0467t7qGo 76kgRpU842As/y/2JE2P5knZEKk8DDXpRrZuq/X72YxotZeenkvhdUchqp+46u/vvQH/QC 4ZNKj50k9r6goDV+BTJxJdxlhc+Wtl6rKaT4z7bp+CH0vGvCmLWBqtChWxMWBA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698172628; a=rsa-sha256; cv=none; b=l1fP6SoU68vmnh0z+1JOvXHDDsMaMa5fM8WrNzMz1ZGnHryWKsY4EgTjDnlxe7/dngQRuF loIXfjqjL1GjCaqdrK9LIWjxBdgAt5Qg1Rgs6sx2/ihiRhS8AFyY5QtTsctamVVvntN5v+ /5EcNw0x8JqL1pWhJ3rdHXMIrOvYyauquNCAtCG/FrmCQmzdEnzxQavBkB/voq7GrhjeVi 0tIl3XjP+B2qweQrMB7eH88ChNNw0+PdiuzTrOCi6oMkQ2yVFWFdRLojtFE11sPNpT2FbL 0NT21G7arb+PQvnUFsz8aRAFXo/bedEpcoX3Xsr72RfrRXtaJbBNMFrzfGTnCA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698172628; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Xs5zCulZtWtHVL40+6pBNlB+ni/JPYms7pfO4G3sX4w=; b=xiJp/uKesNzgIKMrWZuZqUAgQeWAWZkbf+h8dpmXIJhpw5pKnzv4rHIk/XnQNf4UtE/o8g TaGB9G0VAvG1fdhbDWmIgwbqLa/Mmid3Vmx76zwOW+3ihhAqBxEW1px7xzr11Oh7cNW2Om vAo9se9V9EQ9Ny36d5cIQPywyoc+f+/v8rktKTxHabSgNT4kJ+msPfdpizMqq0nJVz4n2X rrz/YGeITZPffiN1scnRZ3Cw6A6sKzr0RAfrzU5dovtGtRZlAGrFrDn4TG0Qdq5g4qgnoA r3KfeD0mh5WDkx5bxsIrvltyDIZCl55fuk817XVZRmm7gUJmvzT2DIPgCNIOvw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SFLPw0Sp7zYZx; Tue, 24 Oct 2023 18:37: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 39OIb8jb088383; Tue, 24 Oct 2023 18:37:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39OIb7DB088375; Tue, 24 Oct 2023 18:37:07 GMT (envelope-from git) Date: Tue, 24 Oct 2023 18:37:07 GMT Message-Id: <202310241837.39OIb7DB088375@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 7ccea130e810 - stable/13 - lpr: Remove now unused fallback definition for __FBSDID List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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/stable/13 X-Git-Reftype: branch X-Git-Commit: 7ccea130e81099f1cd11ec97239e387b31a2a661 Auto-Submitted: auto-generated The branch stable/13 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=7ccea130e81099f1cd11ec97239e387b31a2a661 commit 7ccea130e81099f1cd11ec97239e387b31a2a661 Author: John Baldwin AuthorDate: 2023-09-25 14:50:33 +0000 Commit: John Baldwin CommitDate: 2023-10-24 18:13:18 +0000 lpr: Remove now unused fallback definition for __FBSDID Reviewed by: imp, emaste Differential Revision: https://reviews.freebsd.org/D41956 (cherry picked from commit e4c68414d0854b5e43dfd1b2b0cfbc295702e831) --- usr.sbin/lpr/common_source/lp.cdefs.h | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/usr.sbin/lpr/common_source/lp.cdefs.h b/usr.sbin/lpr/common_source/lp.cdefs.h index c3ca409b6a8b..f5adf6e0ba5d 100644 --- a/usr.sbin/lpr/common_source/lp.cdefs.h +++ b/usr.sbin/lpr/common_source/lp.cdefs.h @@ -81,20 +81,6 @@ # define __unused #endif -/* - * All the lpr source files will want to reference __FBSDID() to - * handle rcs id's. - */ -#if !defined(__FBSDID) -# if defined(lint) || defined(STRIP_FBSDID) -# define __FBSDID(s) struct skip_rcsid_struct -# elif defined(__IDSTRING) /* NetBSD */ -# define __FBSDID(s) __IDSTRING(rcsid,s) -# else -# define __FBSDID(s) static const char rcsid[] __unused = s -# endif -#endif /* __FBSDID */ - /* * Some lpr include files use __BEGIN_DECLS and __END_DECLS. */ From nobody Tue Oct 24 18:37:07 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SFLPw2HJyz4yLrc; Tue, 24 Oct 2023 18:37: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 4SFLPw1ypNz3YXF; Tue, 24 Oct 2023 18:37:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698172628; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=s2xeznI4gVFqIk4QmJ2LyjhSZ3mFZrtQa49yRXcCJ7Q=; b=JQeJbplXe3Wrmb4GvkH20+Yz6fHRUBMHP+Hp1WNRdchnzBQUObJB2C0sHdPTZzKT6WUwyU kcus8G6Hkc4z7tIHbg24/LrbxIBbu3gbIzgwQZ1nME/vxotGrU6xeumrP0XnoAfjMN4wFN tifaz6YCNsfzXzjfboA/lotZEpKSRCNk/+/hLk/Ue/qHxtnOa4k8a5XtjZq+otCUpDQhES J4EofIc2Lrk7iDPm+DoEFG2jAcN7cW43hpVMiZRZJ+gJ1VfbcCRIEWq2vn8QmWU8iB3St6 glyaRBgGE7GDjIXTyxS21pvQ5V7DsUeDEn4fHsABM9lnho6ZCNrGuY8rVxEDHw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698172628; a=rsa-sha256; cv=none; b=MBWDTHobHjWFlR8021r5tOaJjcz3ISedbvZx0qIr+MmQbl1g2Xx0dc0xCeLRvzMDc6IL3N mbLA5WXZ5Jbi0Wv14bflnlLDBR9GOvgcKn8DQAXQ5jF3qzMlJgBDAVKeXebQtMZ7vaN+rw makCictfyafqbsgNtAfjP0ajUUVJv1prsw4WJ7+Ev760JqZiIE2y3z+SvhL4gk1vakGuDh 4yLYzvMagEr1caEp5KY8zwsfcM2ZEvXrQXu9xowvBE3JJsIAMp+/b3TImrhOboe2r7Luhu c1RjA0W+enLQQwc6BIwmUegVnsozXkwudIsKEdVAzRQ34NMpG8rHv5m9todyqg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698172628; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=s2xeznI4gVFqIk4QmJ2LyjhSZ3mFZrtQa49yRXcCJ7Q=; b=J+GY1XKU+ZYYVcsMixbuKz+1YQMQVjQD2pD3g3Y8v1WS7NjK5oivgMng9dWBCZihq3Vph2 5mzU1RYek6Ost3tHoyxrBkBv+98TayNIE0uuAyd2S7l6kDYRA5hxuqaHGcSX70UK61fni7 WfW3JfS86BHhYA0RG4Kch84ZXvxJa3gJqT+UaiAn/yThTgnTlcOFzNt4M5lrT8UCcHyluX X2fL3SNLvxIakQ6lSxDzl674vgUD08kjuppF2833qqCj/2arqzBw7TygRUqRE6o/V/Mk/l so6Cao4qutgcQKCuQ1cpai/Lxvlsr6imJRnjh+BJwo0FyN/xfreNJzu6QyRteg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SFLPw0mpDzZ32; Tue, 24 Oct 2023 18:37: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 39OIb8oX088387; Tue, 24 Oct 2023 18:37:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39OIb7bn088380; Tue, 24 Oct 2023 18:37:07 GMT (envelope-from git) Date: Tue, 24 Oct 2023 18:37:07 GMT Message-Id: <202310241837.39OIb7bn088380@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 260bab9f1e6f - stable/14 - Purge more stray embedded $FreeBSD$ 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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/stable/14 X-Git-Reftype: branch X-Git-Commit: 260bab9f1e6f2a770eab029f5b37e6f4fa12edbe Auto-Submitted: auto-generated The branch stable/14 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=260bab9f1e6f2a770eab029f5b37e6f4fa12edbe commit 260bab9f1e6f2a770eab029f5b37e6f4fa12edbe Author: John Baldwin AuthorDate: 2023-09-25 14:54:56 +0000 Commit: John Baldwin CommitDate: 2023-10-24 17:10:12 +0000 Purge more stray embedded $FreeBSD$ strings These do not use __FBSDID but instead use bare char arrays. Reviewed by: imp, emaste Differential Revision: https://reviews.freebsd.org/D41957 (cherry picked from commit eba230afba4932f02a1ca44efc797cf7499a5cb0) --- lib/lib80211/lib80211_regdomain.c | 3 --- lib/libc/net/nslexer.l | 6 ------ lib/libc/powerpc/gen/syncicache.c | 5 ----- lib/libc/powerpc64/gen/syncicache.c | 5 ----- lib/msun/src/e_sqrtf.c | 4 ---- lib/msun/src/s_modf.c | 4 ---- lib/msun/src/w_cabsf.c | 5 ----- libexec/atrun/atrun.c | 5 ----- libexec/atrun/gloadavg.c | 5 ----- libexec/atrun/gloadavg.h | 3 --- libexec/comsat/comsat.c | 2 -- libexec/fingerd/fingerd.c | 2 -- libexec/getty/init.c | 2 -- libexec/getty/subr.c | 2 -- libexec/mknetid/hash.c | 5 ----- libexec/mknetid/mknetid.c | 5 ----- libexec/mknetid/parse_group.c | 2 -- libexec/rbootd/bpf.c | 2 -- libexec/rbootd/conf.c | 2 -- libexec/rbootd/parseconf.c | 2 -- libexec/rbootd/rmpproto.c | 2 -- libexec/rbootd/utils.c | 2 -- libexec/revnetgroup/hash.c | 5 ----- libexec/revnetgroup/parse_netgroup.c | 5 ----- libexec/revnetgroup/revnetgroup.c | 5 ----- libexec/rpc.rstatd/rstat_proc.c | 2 -- libexec/rpc.rstatd/rstatd.c | 5 ----- libexec/rpc.rusersd/rusers_proc.c | 5 ----- libexec/rpc.rusersd/rusersd.c | 5 ----- libexec/rpc.sprayd/sprayd.c | 5 ----- libexec/rtld-elf/rtld_malloc.c | 1 - libexec/talkd/announce.c | 2 -- libexec/talkd/print.c | 2 -- libexec/talkd/process.c | 2 -- libexec/talkd/table.c | 2 -- libexec/talkd/talkd.c | 2 -- sbin/dump/dumprmt.c | 2 -- sbin/dump/itime.c | 2 -- sbin/dump/main.c | 2 -- sbin/dump/optr.c | 2 -- sbin/dump/tape.c | 2 -- sbin/dump/traverse.c | 2 -- sbin/dump/unctime.c | 2 -- sbin/dumpfs/dumpfs.c | 2 -- sbin/ffsinfo/ffsinfo.c | 5 ----- sbin/fsck_msdosfs/boot.c | 2 -- sbin/fsck_msdosfs/check.c | 2 -- sbin/fsck_msdosfs/dir.c | 2 -- sbin/fsck_msdosfs/fat.c | 2 -- sbin/fsck_msdosfs/main.c | 2 -- sbin/fsdb/fsdb.c | 5 ----- sbin/fsdb/fsdbutil.c | 5 ----- sbin/fsirand/fsirand.c | 5 ----- sbin/growfs/debug.c | 5 ----- sbin/ifconfig/af_inet.c | 5 ----- sbin/ifconfig/af_inet6.c | 5 ----- sbin/ifconfig/af_link.c | 5 ----- sbin/ifconfig/af_nd6.c | 5 ----- sbin/ifconfig/ifbridge.c | 5 ----- sbin/ifconfig/ifclone.c | 5 ----- sbin/ifconfig/ifconfig.c | 2 -- sbin/ifconfig/ifgif.c | 5 ----- sbin/ifconfig/ifgroup.c | 5 ----- sbin/ifconfig/iflagg.c | 5 ----- sbin/ifconfig/ifvlan.c | 5 ----- sbin/ifconfig/sfp.c | 5 ----- sbin/init/init.c | 2 -- sbin/mknod/mknod.c | 2 -- sbin/mount/mount_fs.c | 2 -- sbin/mount_cd9660/mount_cd9660.c | 2 -- sbin/mount_msdosfs/mount_msdosfs.c | 5 ----- sbin/mount_nullfs/mount_nullfs.c | 2 -- sbin/mount_unionfs/mount_unionfs.c | 3 --- sbin/newfs_msdos/mkfs_msdos.c | 5 ----- sbin/newfs_msdos/newfs_msdos.c | 5 ----- sbin/nos-tun/nos-tun.c | 5 ----- sbin/restore/dirs.c | 2 -- sbin/restore/symtab.c | 2 -- sbin/restore/utilities.c | 2 -- sbin/umount/umount.c | 2 -- stand/libsa/powerpc/syncicache.c | 5 ----- sys/netpfil/ipfilter/netinet/fil.c | 1 - sys/netpfil/ipfilter/netinet/ip_auth.c | 1 - sys/netpfil/ipfilter/netinet/ip_frag.c | 1 - sys/netpfil/ipfilter/netinet/ip_nat.c | 1 - usr.bin/locate/locate/locate.c | 2 -- usr.bin/mktemp/mktemp.c | 5 ----- usr.bin/morse/morse.c | 2 -- usr.bin/nfsstat/nfsstat.c | 2 -- usr.bin/number/number.c | 2 -- usr.bin/primes/pattern.c | 2 -- usr.bin/primes/pr_tbl.c | 2 -- usr.bin/primes/primes.c | 2 -- usr.bin/printf/printf.c | 2 -- usr.bin/showmount/showmount.c | 2 -- usr.bin/tee/tee.c | 2 -- usr.bin/time/time.c | 2 -- usr.bin/truncate/truncate.c | 3 --- usr.bin/ul/ul.c | 2 -- usr.bin/uniq/uniq.c | 2 -- usr.bin/units/units.c | 5 ----- usr.bin/yes/yes.c | 2 -- usr.sbin/apmd/apmd.c | 5 ----- usr.sbin/btxld/btxld.c | 5 ----- usr.sbin/ckdist/ckdist.c | 5 ----- usr.sbin/config/main.cc | 2 -- usr.sbin/config/mkheaders.c | 2 -- usr.sbin/config/mkmakefile.cc | 2 -- usr.sbin/config/mkoptions.cc | 2 -- usr.sbin/flowctl/flowctl.c | 5 ----- usr.sbin/keyserv/crypt_server.c | 5 ----- usr.sbin/keyserv/keyserv.c | 2 -- usr.sbin/keyserv/setkey.c | 2 -- usr.sbin/mptable/mptable.c | 5 ----- usr.sbin/nfsd/nfsd.c | 2 -- usr.sbin/pciconf/cap.c | 5 ----- usr.sbin/pciconf/err.c | 5 ----- usr.sbin/pciconf/pciconf.c | 5 ----- usr.sbin/pw/bitmap.c | 5 ----- usr.sbin/pw/cpdir.c | 5 ----- usr.sbin/pw/grupd.c | 5 ----- usr.sbin/pw/psdate.c | 5 ----- usr.sbin/pw/pw.c | 5 ----- usr.sbin/pw/pw_conf.c | 5 ----- usr.sbin/pw/pw_group.c | 5 ----- usr.sbin/pw/pw_log.c | 5 ----- usr.sbin/pw/pw_nis.c | 5 ----- usr.sbin/pw/pw_user.c | 5 ----- usr.sbin/pw/pw_vpw.c | 5 ----- usr.sbin/pw/pwupd.c | 5 ----- usr.sbin/pw/rm_r.c | 5 ----- usr.sbin/rpc.lockd/test.c | 1 - usr.sbin/rpc.statd/test.c | 5 ----- usr.sbin/rpc.umntall/rpc.umntall.c | 5 ----- usr.sbin/rpc.ypupdated/update.c | 2 -- usr.sbin/spray/spray.c | 5 ----- usr.sbin/traceroute6/traceroute6.c | 2 -- usr.sbin/vidcontrol/decode.c | 5 ----- usr.sbin/vidcontrol/vidcontrol.c | 5 ----- 139 files changed, 476 deletions(-) diff --git a/lib/lib80211/lib80211_regdomain.c b/lib/lib80211/lib80211_regdomain.c index f5ed236467f5..189d4661c78b 100644 --- a/lib/lib80211/lib80211_regdomain.c +++ b/lib/lib80211/lib80211_regdomain.c @@ -22,9 +22,6 @@ * (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 lint -static const char rcsid[] = "$FreeBSD$"; -#endif /* not lint */ #include #include diff --git a/lib/libc/net/nslexer.l b/lib/libc/net/nslexer.l index bd3c02dcacf4..ce0f18670e21 100644 --- a/lib/libc/net/nslexer.l +++ b/lib/libc/net/nslexer.l @@ -32,12 +32,6 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include -#if defined(LIBC_SCCS) && !defined(lint) -static char *rcsid = - "$FreeBSD$"; -#endif /* LIBC_SCCS and not lint */ - #include "namespace.h" #include #define _NS_PRIVATE diff --git a/lib/libc/powerpc/gen/syncicache.c b/lib/libc/powerpc/gen/syncicache.c index 5192d1356153..6376cb0e576d 100644 --- a/lib/libc/powerpc/gen/syncicache.c +++ b/lib/libc/powerpc/gen/syncicache.c @@ -33,11 +33,6 @@ * $NetBSD: syncicache.c,v 1.2 1999/05/05 12:36:40 tsubai Exp $ */ -#ifndef lint -static const char rcsid[] = - "$FreeBSD$"; -#endif /* not lint */ - #include #if defined(_KERNEL) || defined(_STANDALONE) #include diff --git a/lib/libc/powerpc64/gen/syncicache.c b/lib/libc/powerpc64/gen/syncicache.c index d96529bc3833..7885a36bd1d1 100644 --- a/lib/libc/powerpc64/gen/syncicache.c +++ b/lib/libc/powerpc64/gen/syncicache.c @@ -33,11 +33,6 @@ * $NetBSD: syncicache.c,v 1.2 1999/05/05 12:36:40 tsubai Exp $ */ -#ifndef lint -static const char rcsid[] = - "$FreeBSD$"; -#endif /* not lint */ - #include #if defined(_KERNEL) || defined(_STANDALONE) #include diff --git a/lib/msun/src/e_sqrtf.c b/lib/msun/src/e_sqrtf.c index 1fd0cec447fb..f9e2a320f20e 100644 --- a/lib/msun/src/e_sqrtf.c +++ b/lib/msun/src/e_sqrtf.c @@ -13,10 +13,6 @@ * ==================================================== */ -#ifndef lint -static char rcsid[] = "$FreeBSD$"; -#endif - #include "math.h" #include "math_private.h" diff --git a/lib/msun/src/s_modf.c b/lib/msun/src/s_modf.c index ab13191b9004..ffb1702751fa 100644 --- a/lib/msun/src/s_modf.c +++ b/lib/msun/src/s_modf.c @@ -10,10 +10,6 @@ * ==================================================== */ -#ifndef lint -static char rcsid[] = "$FreeBSD$"; -#endif - /* * modf(double x, double *iptr) * return fraction part of x, and return x's integral part in *iptr. diff --git a/lib/msun/src/w_cabsf.c b/lib/msun/src/w_cabsf.c index b5065c8a5683..aedbdef217ca 100644 --- a/lib/msun/src/w_cabsf.c +++ b/lib/msun/src/w_cabsf.c @@ -5,11 +5,6 @@ * Placed into the Public Domain, 1994. */ -#ifndef lint -static const char rcsid[] = - "$FreeBSD$"; -#endif /* not lint */ - #include #include #include "math_private.h" diff --git a/libexec/atrun/atrun.c b/libexec/atrun/atrun.c index e9e49146ba7a..ee312591ccd4 100644 --- a/libexec/atrun/atrun.c +++ b/libexec/atrun/atrun.c @@ -26,11 +26,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef lint -static const char rcsid[] = - "$FreeBSD$"; -#endif /* not lint */ - /* System Headers */ #include diff --git a/libexec/atrun/gloadavg.c b/libexec/atrun/gloadavg.c index 86651aac3e67..e513183a391c 100644 --- a/libexec/atrun/gloadavg.c +++ b/libexec/atrun/gloadavg.c @@ -25,11 +25,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef lint -static const char rcsid[] = - "$FreeBSD$"; -#endif /* not lint */ - #ifndef __FreeBSD__ #define _POSIX_SOURCE 1 diff --git a/libexec/atrun/gloadavg.h b/libexec/atrun/gloadavg.h index f0ae6b45e868..a202cf0b3700 100644 --- a/libexec/atrun/gloadavg.h +++ b/libexec/atrun/gloadavg.h @@ -26,6 +26,3 @@ */ double gloadavg(void); -#if 0 -static char atrun_h_rcsid[] = "$FreeBSD$"; -#endif diff --git a/libexec/comsat/comsat.c b/libexec/comsat/comsat.c index c9d490d2cf6e..138881db9e4a 100644 --- a/libexec/comsat/comsat.c +++ b/libexec/comsat/comsat.c @@ -39,8 +39,6 @@ static const char copyright[] = #if 0 static char sccsid[] = "@(#)comsat.c 8.1 (Berkeley) 6/4/93"; #endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* not lint */ #include diff --git a/libexec/fingerd/fingerd.c b/libexec/fingerd/fingerd.c index ff8d5046a577..dd51064a00a6 100644 --- a/libexec/fingerd/fingerd.c +++ b/libexec/fingerd/fingerd.c @@ -39,8 +39,6 @@ static const char copyright[] = #if 0 static char sccsid[] = "@(#)fingerd.c 8.1 (Berkeley) 6/4/93"; #endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* not lint */ #include diff --git a/libexec/getty/init.c b/libexec/getty/init.c index 79b9601a2be1..e09cbf2c3e94 100644 --- a/libexec/getty/init.c +++ b/libexec/getty/init.c @@ -33,8 +33,6 @@ #if 0 static char sccsid[] = "@(#)from: init.c 8.1 (Berkeley) 6/4/93"; #endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* not lint */ /* diff --git a/libexec/getty/subr.c b/libexec/getty/subr.c index 68682df6d5bd..2c262e0968ca 100644 --- a/libexec/getty/subr.c +++ b/libexec/getty/subr.c @@ -33,8 +33,6 @@ #if 0 static char sccsid[] = "@(#)from: subr.c 8.1 (Berkeley) 6/4/93"; #endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* not lint */ /* diff --git a/libexec/mknetid/hash.c b/libexec/mknetid/hash.c index d340142aad90..5375b80fbe3b 100644 --- a/libexec/mknetid/hash.c +++ b/libexec/mknetid/hash.c @@ -38,11 +38,6 @@ #include #include "hash.h" -#ifndef lint -static const char rcsid[] = - "$FreeBSD$"; -#endif /* not lint */ - /* * This hash function is stolen directly from the * Berkeley DB package. It already exists inside libc, but diff --git a/libexec/mknetid/mknetid.c b/libexec/mknetid/mknetid.c index 3a39b4b3e675..a5c8281ef34d 100644 --- a/libexec/mknetid/mknetid.c +++ b/libexec/mknetid/mknetid.c @@ -55,11 +55,6 @@ #include "hash.h" -#ifndef lint -static const char rcsid[] = - "$FreeBSD$"; -#endif /* not lint */ - #define LINSIZ 1024 #define OPSYS "unix" diff --git a/libexec/mknetid/parse_group.c b/libexec/mknetid/parse_group.c index e876bd9f2ff0..59ebf44eab37 100644 --- a/libexec/mknetid/parse_group.c +++ b/libexec/mknetid/parse_group.c @@ -33,8 +33,6 @@ #if 0 static const char sccsid[] = "@(#)getgrent.c 8.2 (Berkeley) 3/21/94"; #endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* not lint */ /* diff --git a/libexec/rbootd/bpf.c b/libexec/rbootd/bpf.c index 0edcc06ccf7e..6fbe34111a67 100644 --- a/libexec/rbootd/bpf.c +++ b/libexec/rbootd/bpf.c @@ -46,8 +46,6 @@ #if 0 static const char sccsid[] = "@(#)bpf.c 8.1 (Berkeley) 6/4/93"; #endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* not lint */ #include diff --git a/libexec/rbootd/conf.c b/libexec/rbootd/conf.c index af46f53c3c88..a48d3efdb9c1 100644 --- a/libexec/rbootd/conf.c +++ b/libexec/rbootd/conf.c @@ -46,8 +46,6 @@ #if 0 static const char sccsid[] = "@(#)conf.c 8.1 (Berkeley) 6/4/93"; #endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* not lint */ #include diff --git a/libexec/rbootd/parseconf.c b/libexec/rbootd/parseconf.c index 9585e87185c6..262f81fb68d7 100644 --- a/libexec/rbootd/parseconf.c +++ b/libexec/rbootd/parseconf.c @@ -46,8 +46,6 @@ #if 0 static const char sccsid[] = "@(#)parseconf.c 8.1 (Berkeley) 6/4/93"; #endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* not lint */ #include diff --git a/libexec/rbootd/rmpproto.c b/libexec/rbootd/rmpproto.c index a31ec1de8abf..2603e697d8b8 100644 --- a/libexec/rbootd/rmpproto.c +++ b/libexec/rbootd/rmpproto.c @@ -46,8 +46,6 @@ #if 0 static const char sccsid[] = "@(#)rmpproto.c 8.1 (Berkeley) 6/4/93"; #endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* not lint */ #include diff --git a/libexec/rbootd/utils.c b/libexec/rbootd/utils.c index f5c2d62d30d7..36a7116a05c4 100644 --- a/libexec/rbootd/utils.c +++ b/libexec/rbootd/utils.c @@ -46,8 +46,6 @@ #if 0 static const char sccsid[] = "@(#)utils.c 8.1 (Berkeley) 6/4/93"; #endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* not lint */ #include diff --git a/libexec/revnetgroup/hash.c b/libexec/revnetgroup/hash.c index 2dd1a3f91d74..db8e95e3040c 100644 --- a/libexec/revnetgroup/hash.c +++ b/libexec/revnetgroup/hash.c @@ -32,11 +32,6 @@ * SUCH DAMAGE. */ -#ifndef lint -static const char rcsid[] = - "$FreeBSD$"; -#endif /* not lint */ - #include #include #include diff --git a/libexec/revnetgroup/parse_netgroup.c b/libexec/revnetgroup/parse_netgroup.c index a1e954164ea9..3d6a7939fa1d 100644 --- a/libexec/revnetgroup/parse_netgroup.c +++ b/libexec/revnetgroup/parse_netgroup.c @@ -32,11 +32,6 @@ * SUCH DAMAGE. */ -#ifndef lint -static const char rcsid[] = - "$FreeBSD$"; -#endif /* not lint */ - /* * This is a specially hacked-up version of getnetgrent.c used to parse * data from the stored hash table of netgroup info rather than from a diff --git a/libexec/revnetgroup/revnetgroup.c b/libexec/revnetgroup/revnetgroup.c index 11fba515a7ba..34ec0d9491c4 100644 --- a/libexec/revnetgroup/revnetgroup.c +++ b/libexec/revnetgroup/revnetgroup.c @@ -38,11 +38,6 @@ * Columbia University, New York City */ -#ifndef lint -static const char rcsid[] = - "$FreeBSD$"; -#endif /* not lint */ - #include #include #include diff --git a/libexec/rpc.rstatd/rstat_proc.c b/libexec/rpc.rstatd/rstat_proc.c index 1f1bb7cf4048..cc488657c077 100644 --- a/libexec/rpc.rstatd/rstat_proc.c +++ b/libexec/rpc.rstatd/rstat_proc.c @@ -32,8 +32,6 @@ static char sccsid[] = "from: @(#)rpc.rstatd.c 1.1 86/09/25 Copyr 1984 Sun Micro"; static char sccsid[] = "from: @(#)rstat_proc.c 2.2 88/08/01 4.0 RPCSRC"; #endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* diff --git a/libexec/rpc.rstatd/rstatd.c b/libexec/rpc.rstatd/rstatd.c index 6a6b09b9ae0c..7cc3bac71c5d 100644 --- a/libexec/rpc.rstatd/rstatd.c +++ b/libexec/rpc.rstatd/rstatd.c @@ -29,11 +29,6 @@ * SUCH DAMAGE. */ -#ifndef lint -static const char rcsid[] = - "$FreeBSD$"; -#endif /* not lint */ - #include #include #include diff --git a/libexec/rpc.rusersd/rusers_proc.c b/libexec/rpc.rusersd/rusers_proc.c index bfb65dadb004..3bc4169a989f 100644 --- a/libexec/rpc.rusersd/rusers_proc.c +++ b/libexec/rpc.rusersd/rusers_proc.c @@ -29,11 +29,6 @@ * SUCH DAMAGE. */ -#ifndef lint -static const char rcsid[] = - "$FreeBSD$"; -#endif /* not lint */ - #ifdef DEBUG #include #endif diff --git a/libexec/rpc.rusersd/rusersd.c b/libexec/rpc.rusersd/rusersd.c index e1e77398c8ff..cf00dd8d181e 100644 --- a/libexec/rpc.rusersd/rusersd.c +++ b/libexec/rpc.rusersd/rusersd.c @@ -29,11 +29,6 @@ * SUCH DAMAGE. */ -#ifndef lint -static const char rcsid[] = - "$FreeBSD$"; -#endif /* not lint */ - #include #include #include diff --git a/libexec/rpc.sprayd/sprayd.c b/libexec/rpc.sprayd/sprayd.c index 209d74af59af..2a71a93bf4ef 100644 --- a/libexec/rpc.sprayd/sprayd.c +++ b/libexec/rpc.sprayd/sprayd.c @@ -27,11 +27,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef lint -static const char rcsid[] = - "$FreeBSD$"; -#endif /* not lint */ - #include #include #include diff --git a/libexec/rtld-elf/rtld_malloc.c b/libexec/rtld-elf/rtld_malloc.c index 4b5140551675..dafbc222322e 100644 --- a/libexec/rtld-elf/rtld_malloc.c +++ b/libexec/rtld-elf/rtld_malloc.c @@ -31,7 +31,6 @@ #if defined(LIBC_SCCS) && !defined(lint) /*static char *sccsid = "from: @(#)malloc.c 5.11 (Berkeley) 2/23/91";*/ -static char *rcsid = "$FreeBSD$"; #endif /* LIBC_SCCS and not lint */ /* diff --git a/libexec/talkd/announce.c b/libexec/talkd/announce.c index 9cf326669998..b1b1acc09553 100644 --- a/libexec/talkd/announce.c +++ b/libexec/talkd/announce.c @@ -33,8 +33,6 @@ #if 0 static char sccsid[] = "@(#)announce.c 8.3 (Berkeley) 4/28/95"; #endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* not lint */ #include diff --git a/libexec/talkd/print.c b/libexec/talkd/print.c index 4d10329dd7f8..47ccb89f20d6 100644 --- a/libexec/talkd/print.c +++ b/libexec/talkd/print.c @@ -33,8 +33,6 @@ #if 0 static char sccsid[] = "@(#)print.c 8.1 (Berkeley) 6/4/93"; #endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* not lint */ /* debug print routines */ diff --git a/libexec/talkd/process.c b/libexec/talkd/process.c index 2bd22a1becb2..886fc038ab97 100644 --- a/libexec/talkd/process.c +++ b/libexec/talkd/process.c @@ -33,8 +33,6 @@ #if 0 static char sccsid[] = "@(#)process.c 8.2 (Berkeley) 11/16/93"; #endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* not lint */ /* diff --git a/libexec/talkd/table.c b/libexec/talkd/table.c index ed1560f86ff8..495d63b02b06 100644 --- a/libexec/talkd/table.c +++ b/libexec/talkd/table.c @@ -33,8 +33,6 @@ #if 0 static char sccsid[] = "@(#)table.c 8.1 (Berkeley) 6/4/93"; #endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* not lint */ /* diff --git a/libexec/talkd/talkd.c b/libexec/talkd/talkd.c index eb609207b156..76d0ec5a09ad 100644 --- a/libexec/talkd/talkd.c +++ b/libexec/talkd/talkd.c @@ -39,8 +39,6 @@ static const char copyright[] = #if 0 static char sccsid[] = "@(#)talkd.c 8.1 (Berkeley) 6/4/93"; #endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* not lint */ /* diff --git a/sbin/dump/dumprmt.c b/sbin/dump/dumprmt.c index d1769faa3daf..a8b2d9c221da 100644 --- a/sbin/dump/dumprmt.c +++ b/sbin/dump/dumprmt.c @@ -33,8 +33,6 @@ #if 0 static char sccsid[] = "@(#)dumprmt.c 8.3 (Berkeley) 4/28/95"; #endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* not lint */ #include diff --git a/sbin/dump/itime.c b/sbin/dump/itime.c index cb6d55625e6d..d9121e4df05a 100644 --- a/sbin/dump/itime.c +++ b/sbin/dump/itime.c @@ -33,8 +33,6 @@ #if 0 static char sccsid[] = "@(#)itime.c 8.1 (Berkeley) 6/5/93"; #endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* not lint */ #include diff --git a/sbin/dump/main.c b/sbin/dump/main.c index 779db5fb4b43..a5b4eaa6f8ac 100644 --- a/sbin/dump/main.c +++ b/sbin/dump/main.c @@ -39,8 +39,6 @@ static const char copyright[] = #if 0 static char sccsid[] = "@(#)main.c 8.6 (Berkeley) 5/1/95"; #endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* not lint */ #include diff --git a/sbin/dump/optr.c b/sbin/dump/optr.c index 8eb163516c72..d3ca5b2a926e 100644 --- a/sbin/dump/optr.c +++ b/sbin/dump/optr.c @@ -33,8 +33,6 @@ #if 0 static char sccsid[] = "@(#)optr.c 8.2 (Berkeley) 1/6/94"; #endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* not lint */ #include diff --git a/sbin/dump/tape.c b/sbin/dump/tape.c index c123f7fa9404..3a3574f6d44d 100644 --- a/sbin/dump/tape.c +++ b/sbin/dump/tape.c @@ -33,8 +33,6 @@ #if 0 static char sccsid[] = "@(#)tape.c 8.4 (Berkeley) 5/1/95"; #endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* not lint */ #include diff --git a/sbin/dump/traverse.c b/sbin/dump/traverse.c index 08e902667759..281cffcdf6f2 100644 --- a/sbin/dump/traverse.c +++ b/sbin/dump/traverse.c @@ -33,8 +33,6 @@ #if 0 static char sccsid[] = "@(#)traverse.c 8.7 (Berkeley) 6/15/95"; #endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* not lint */ #include diff --git a/sbin/dump/unctime.c b/sbin/dump/unctime.c index 3e03a65f1a7c..5f44c80f9358 100644 --- a/sbin/dump/unctime.c +++ b/sbin/dump/unctime.c @@ -33,8 +33,6 @@ #if 0 static char sccsid[] = "@(#)unctime.c 8.2 (Berkeley) 6/14/94"; #endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* not lint */ #include diff --git a/sbin/dumpfs/dumpfs.c b/sbin/dumpfs/dumpfs.c index 739f281feb7f..7d2598c190e8 100644 --- a/sbin/dumpfs/dumpfs.c +++ b/sbin/dumpfs/dumpfs.c @@ -54,8 +54,6 @@ static const char copyright[] = #if 0 static char sccsid[] = "@(#)dumpfs.c 8.5 (Berkeley) 4/29/95"; #endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* not lint */ #include diff --git a/sbin/ffsinfo/ffsinfo.c b/sbin/ffsinfo/ffsinfo.c index 9d447d209ffd..539cbd1631e1 100644 --- a/sbin/ffsinfo/ffsinfo.c +++ b/sbin/ffsinfo/ffsinfo.c @@ -48,11 +48,6 @@ Copyright (c) 1980, 1989, 1993 The Regents of the University of California.\n\ All rights reserved.\n"; #endif /* not lint */ -#ifndef lint -static const char rcsid[] = - "$FreeBSD$"; -#endif /* not lint */ - /* ********************************************************** INCLUDES ***** */ #include #include diff --git a/sbin/fsck_msdosfs/boot.c b/sbin/fsck_msdosfs/boot.c index 3d1657ad66f3..f91609470ad7 100644 --- a/sbin/fsck_msdosfs/boot.c +++ b/sbin/fsck_msdosfs/boot.c @@ -29,8 +29,6 @@ #include #ifndef lint __RCSID("$NetBSD: boot.c,v 1.22 2020/01/11 16:29:07 christos Exp $"); -static const char rcsid[] = - "$FreeBSD$"; #endif /* not lint */ #include diff --git a/sbin/fsck_msdosfs/check.c b/sbin/fsck_msdosfs/check.c index 654ceeb9c5ca..f672a2ac515c 100644 --- a/sbin/fsck_msdosfs/check.c +++ b/sbin/fsck_msdosfs/check.c @@ -29,8 +29,6 @@ #include #ifndef lint __RCSID("$NetBSD: check.c,v 1.14 2006/06/05 16:51:18 christos Exp $"); -static const char rcsid[] = - "$FreeBSD$"; #endif /* not lint */ #ifdef HAVE_LIBUTIL_H diff --git a/sbin/fsck_msdosfs/dir.c b/sbin/fsck_msdosfs/dir.c index 02fe07880e0e..c60eaab59b12 100644 --- a/sbin/fsck_msdosfs/dir.c +++ b/sbin/fsck_msdosfs/dir.c @@ -32,8 +32,6 @@ #include #ifndef lint __RCSID("$NetBSD: dir.c,v 1.20 2006/06/05 16:51:18 christos Exp $"); -static const char rcsid[] = - "$FreeBSD$"; #endif /* not lint */ #include diff --git a/sbin/fsck_msdosfs/fat.c b/sbin/fsck_msdosfs/fat.c index e35e2f27d305..567bfcd428cb 100644 --- a/sbin/fsck_msdosfs/fat.c +++ b/sbin/fsck_msdosfs/fat.c @@ -30,8 +30,6 @@ #include #ifndef lint __RCSID("$NetBSD: fat.c,v 1.18 2006/06/05 16:51:18 christos Exp $"); -static const char rcsid[] = - "$FreeBSD$"; #endif /* not lint */ #include diff --git a/sbin/fsck_msdosfs/main.c b/sbin/fsck_msdosfs/main.c index de54cd18eae7..0713189daa2d 100644 --- a/sbin/fsck_msdosfs/main.c +++ b/sbin/fsck_msdosfs/main.c @@ -29,8 +29,6 @@ #include #ifndef lint __RCSID("$NetBSD: main.c,v 1.10 1997/10/01 02:18:14 enami Exp $"); -static const char rcsid[] = - "$FreeBSD$"; #endif /* not lint */ #include diff --git a/sbin/fsdb/fsdb.c b/sbin/fsdb/fsdb.c index 2d8c75cce5fe..48526ad4044b 100644 --- a/sbin/fsdb/fsdb.c +++ b/sbin/fsdb/fsdb.c @@ -30,11 +30,6 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef lint -static const char rcsid[] = - "$FreeBSD$"; -#endif /* not lint */ - #include #include #include diff --git a/sbin/fsdb/fsdbutil.c b/sbin/fsdb/fsdbutil.c index c8a3a8a525e3..737dabba643f 100644 --- a/sbin/fsdb/fsdbutil.c +++ b/sbin/fsdb/fsdbutil.c @@ -30,11 +30,6 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef lint -static const char rcsid[] = - "$FreeBSD$"; -#endif /* not lint */ - #include #include #include diff --git a/sbin/fsirand/fsirand.c b/sbin/fsirand/fsirand.c index cd60093e3642..2a5eb0c5136d 100644 --- a/sbin/fsirand/fsirand.c +++ b/sbin/fsirand/fsirand.c @@ -32,11 +32,6 @@ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef lint -static const char rcsid[] = - "$FreeBSD$"; -#endif /* not lint */ - #include #include diff --git a/sbin/growfs/debug.c b/sbin/growfs/debug.c index e0dfc997fcf6..456e67dbc5c2 100644 --- a/sbin/growfs/debug.c +++ b/sbin/growfs/debug.c @@ -41,11 +41,6 @@ * */ -#ifndef lint -static const char rcsid[] = - "$FreeBSD$"; -#endif /* not lint */ - #include #include diff --git a/sbin/ifconfig/af_inet.c b/sbin/ifconfig/af_inet.c index bcf2a8ab0ffd..5e3084165b33 100644 --- a/sbin/ifconfig/af_inet.c +++ b/sbin/ifconfig/af_inet.c @@ -29,11 +29,6 @@ * SUCH DAMAGE. */ -#ifndef lint -static const char rcsid[] = - "$FreeBSD$"; -#endif /* not lint */ - #include #include #include diff --git a/sbin/ifconfig/af_inet6.c b/sbin/ifconfig/af_inet6.c index b3da21758982..fcd04139a8c1 100644 --- a/sbin/ifconfig/af_inet6.c +++ b/sbin/ifconfig/af_inet6.c @@ -29,11 +29,6 @@ * SUCH DAMAGE. */ -#ifndef lint -static const char rcsid[] = - "$FreeBSD$"; -#endif /* not lint */ - #include #include #include diff --git a/sbin/ifconfig/af_link.c b/sbin/ifconfig/af_link.c index 17de87539d9a..6c23f7016806 100644 --- a/sbin/ifconfig/af_link.c +++ b/sbin/ifconfig/af_link.c @@ -29,11 +29,6 @@ * SUCH DAMAGE. */ -#ifndef lint -static const char rcsid[] = - "$FreeBSD$"; -#endif /* not lint */ - #include #include #include diff --git a/sbin/ifconfig/af_nd6.c b/sbin/ifconfig/af_nd6.c index 7eeb86585197..73044e95740a 100644 --- a/sbin/ifconfig/af_nd6.c +++ b/sbin/ifconfig/af_nd6.c @@ -25,11 +25,6 @@ * SUCH DAMAGE. */ -#ifndef lint -static const char rcsid[] = - "$FreeBSD$"; -#endif /* not lint */ - *** 1173 LINES SKIPPED *** From nobody Tue Oct 24 18:37:09 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SFLPx4GrCz4yMG8; Tue, 24 Oct 2023 18:37: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 4SFLPx2RGvz3YXY; Tue, 24 Oct 2023 18:37:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698172629; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=s29XMgTmCj2uuMruxrOpiS7DavA8atb6qJC6jGXwH6Q=; b=tXUY5o5bW7dNuhmPPAZME77RsWvvu+DR0jK0KNNBoC2Hl6WCSW4CSUyitkG90KLYeLFpO7 wX7ab4GKmIuGmlxyLpYxy9tWAapYI33Yd1P5Ilk8yKsq3YWlqAmWgw42LuCz5GtQ7Vyo4E /Z8vfLvUeLgJA9q48fvwd6RPa0Eb2+8Dt1lNLA39zOkAnFJuLMSja5v7fMCqFP8BujMFRf HZP5vDKEz0FK9n2kr7RzC4N9xEzjJ/WhyiGcrRWzi1bMiXUo5VpQBwkt8Po8WElP/nagAy eqgc3ptmiOeKXRdYLX89HaKlj355zr5AuZLENIcnpTFPR0MgBoz6uMmrRer6xg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698172629; a=rsa-sha256; cv=none; b=XepDQqD1WX1sZz9njYBE/K2tQq3yc5PA6c6WxCCrUeea5pKKzT/3U986QEaGwoDUSvSzxs V+YQwfd9eKvBlxE86caqw4bP8P5cMS0ioCNey39CNr0yN4hE79xUO2E4bI0kQ3r8g1yXby lvkuncRwXila4ejLmoe2i+di3QKCJHa40G41GESCDlowkFeuNxSxWSJoxemeDYCWbCoy+w vZ6ICmOIGlYZXuUa/eGPc0xfanklUy1urPFKASyNcYOut7ut12qODznV22ENlEbnw5g2Fy l5udCpcvM130/nX+3zzkIb88JLg3jiTh/x+8p/v3ZRoIfC11RHtn7it4Ucip9g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698172629; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=s29XMgTmCj2uuMruxrOpiS7DavA8atb6qJC6jGXwH6Q=; b=qpgE13D214gfggbL15uK29MHpsnK7TEY/zIYj6ytiLUqii+TiyxLBwnItG5lM7ArIN15lu olSO3WqJa9eN/X0iI+u7cc0iXpik2IR0CdVaXHEGFFofIzpuuk+id5n93gN4GFi0oWL0EK 5g+JRcz3lTv/n6qUihaZ2xkvQIC/0TKMj7nkjmOUEz/LJfwhwXI8k0nm68jcCFN30q2nHw jtbKq4Gz8KyyCeScK7vEzb4GVk1oyRI7/LW4WHYpT/KGV/0kPMLEYSyFsKzLVF3pSgOHrf ovVdCRguuMa43+jVH1zQdougc68VahKKavgHsx8aRVp2eA+EcBn/juwXqV6mpw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SFLPx1Y6FzZ3W; Tue, 24 Oct 2023 18:37: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 39OIb94G088482; Tue, 24 Oct 2023 18:37:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39OIb9oX088480; Tue, 24 Oct 2023 18:37:09 GMT (envelope-from git) Date: Tue, 24 Oct 2023 18:37:09 GMT Message-Id: <202310241837.39OIb9oX088480@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 058aa09fa32f - stable/14 - powerpc/generate-hfs.sh: Don't include $FreeBSD$ in prefix to uuencoded image List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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/stable/14 X-Git-Reftype: branch X-Git-Commit: 058aa09fa32f4b97887dacffa0651f455379546e Auto-Submitted: auto-generated The branch stable/14 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=058aa09fa32f4b97887dacffa0651f455379546e commit 058aa09fa32f4b97887dacffa0651f455379546e Author: John Baldwin AuthorDate: 2023-09-25 14:55:18 +0000 Commit: John Baldwin CommitDate: 2023-10-24 17:11:12 +0000 powerpc/generate-hfs.sh: Don't include $FreeBSD$ in prefix to uuencoded image Reviewed by: imp, emaste Differential Revision: https://reviews.freebsd.org/D41958 (cherry picked from commit 5919ab299160e6d330bfd8bacf7bd1c5ad8cabb9) --- release/powerpc/generate-hfs.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/release/powerpc/generate-hfs.sh b/release/powerpc/generate-hfs.sh index 46f66d601ce3..50f77933f273 100755 --- a/release/powerpc/generate-hfs.sh +++ b/release/powerpc/generate-hfs.sh @@ -55,7 +55,6 @@ rm loader.tmp bzip2 $OUTPUT_FILE echo 'HFS boot filesystem created by generate-hfs.sh' > $OUTPUT_FILE.bz2.uu echo 'DO NOT EDIT' >> $OUTPUT_FILE.bz2.uu -echo '$FreeBSD$' >> $OUTPUT_FILE.bz2.uu uuencode $OUTPUT_FILE.bz2 $OUTPUT_FILE.bz2 >> $OUTPUT_FILE.bz2.uu rm $OUTPUT_FILE.bz2 From nobody Tue Oct 24 18:37:09 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SFLPx4HVzz4yMG9; Tue, 24 Oct 2023 18:37: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 4SFLPx2WfYz3YJY; Tue, 24 Oct 2023 18:37:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698172629; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6GEASAnILP3M1IcyhN35xi12k6TExdf/yo24RGciwFw=; b=O+nmEaQii+6P8wcKT4noU3lo0gaklb/2SgnUbHnyeMCUGpOCF7WFVzSGlEEerNIPBVqsOU fc0rO1/MsXpFMKHea+YJhkWrGMbW/elcwlW/kavNVTo4OJHizc6qxWLSe1TezfiGh3Exc3 s0qZSUu9/ayvzj6ZbD4iFaeoy34vod8NpRKSDvG4RvbWQXyiQxWvrolgYjC1WICQGaJak7 OWVOCc/tJPH+FleDBV6/3nZMsz/jDZMkztN/mIJYOckYGtHw8c1UQdald1LaA5d07dGWTS PCu8ZDkQ1Ou1wZGgQ6Nr8WVAbLBXZxSD8uRY5nNHUBkTKwlRRPtPN4a7iUbsbg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698172629; a=rsa-sha256; cv=none; b=UwHdMrYAqnDlYx3gj08d3230JQr0yJCaXIA+b1/1Haw7ryRlBgdLiHNknmExandUAZ4sMM l+A9ZAerYRtMzjWWq6KlMyMcow31L5uvdXUBfUSipr5Jpbpj8gIqp120BoQbwfizKQOcaT zYRgUy55x+dx1ZSmBMpCyErqpRT/LVAaDC7R/HNAU4GlYXqAgieHPSTlgqbpxpGovJl+2v 54cXD+ZC3+bHLrEYMB7onMV3papv28xWs4HibHwlVeVUq9gbG0tAA5Kr9MQ5fer9LLOC8S 13cAYw8swnQoEmM0h71QLYwar1EbDp8xzjWuwpZ6eqwzZjRms/o45Xs+TMUXEw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698172629; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6GEASAnILP3M1IcyhN35xi12k6TExdf/yo24RGciwFw=; b=Nw/LVvEwY7fZOd7hk/+M1JYMZtlzuc34CqeUbESxTzHrLhr5niBiJYpE4SMFc2K7DUr1rn Fg/oVtRXFyM7z7FXQgTbXoqmwdIKA8PuqoUHGCQCRnbY5Sm040fXK2vVvXw9nihs/bxEe4 SW59hD+X9AYZPiS6AkTqzQTOp1GzVSj+Ho6931TVIzTVgKtxJ76W1AZvxmk1mQwrYv6vSA mA+IclW9a8NJ07H1P15yuizNExw2P5e7TaMD63fDzt6ykSKmrf4ZpbBeewhnkykubNkrxS O2TwhdRynz//XccSt+kmwrINDYVRfxgl46eoad61sicw6ZR8g368Q/5ZNhXiLw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SFLPx1czwzYlN; Tue, 24 Oct 2023 18:37: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 39OIb9js088486; Tue, 24 Oct 2023 18:37:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39OIb96h088475; Tue, 24 Oct 2023 18:37:09 GMT (envelope-from git) Date: Tue, 24 Oct 2023 18:37:09 GMT Message-Id: <202310241837.39OIb96h088475@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: de270f81b246 - stable/13 - Purge more stray embedded $FreeBSD$ 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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/stable/13 X-Git-Reftype: branch X-Git-Commit: de270f81b246e154640c0d250696c458ff1c0e3b Auto-Submitted: auto-generated The branch stable/13 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=de270f81b246e154640c0d250696c458ff1c0e3b commit de270f81b246e154640c0d250696c458ff1c0e3b Author: John Baldwin AuthorDate: 2023-09-25 14:54:56 +0000 Commit: John Baldwin CommitDate: 2023-10-24 18:13:18 +0000 Purge more stray embedded $FreeBSD$ strings These do not use __FBSDID but instead use bare char arrays. Reviewed by: imp, emaste Differential Revision: https://reviews.freebsd.org/D41957 (cherry picked from commit eba230afba4932f02a1ca44efc797cf7499a5cb0) --- lib/lib80211/lib80211_regdomain.c | 3 --- lib/libc/net/nslexer.l | 6 ------ lib/libc/powerpc/gen/syncicache.c | 5 ----- lib/libc/powerpc64/gen/syncicache.c | 5 ----- lib/msun/src/e_sqrtf.c | 4 ---- lib/msun/src/s_modf.c | 4 ---- lib/msun/src/w_cabsf.c | 5 ----- libexec/atrun/atrun.c | 5 ----- libexec/atrun/gloadavg.c | 5 ----- libexec/atrun/gloadavg.h | 3 --- libexec/comsat/comsat.c | 2 -- libexec/fingerd/fingerd.c | 2 -- libexec/getty/init.c | 2 -- libexec/getty/subr.c | 2 -- libexec/mknetid/hash.c | 5 ----- libexec/mknetid/mknetid.c | 5 ----- libexec/mknetid/parse_group.c | 2 -- libexec/rbootd/bpf.c | 2 -- libexec/rbootd/conf.c | 2 -- libexec/rbootd/parseconf.c | 2 -- libexec/rbootd/rmpproto.c | 2 -- libexec/rbootd/utils.c | 2 -- libexec/revnetgroup/hash.c | 5 ----- libexec/revnetgroup/parse_netgroup.c | 5 ----- libexec/revnetgroup/revnetgroup.c | 5 ----- libexec/rpc.rstatd/rstat_proc.c | 2 -- libexec/rpc.rstatd/rstatd.c | 5 ----- libexec/rpc.rusersd/rusers_proc.c | 5 ----- libexec/rpc.rusersd/rusersd.c | 5 ----- libexec/rpc.sprayd/sprayd.c | 5 ----- libexec/rtld-elf/rtld_malloc.c | 1 - libexec/talkd/announce.c | 2 -- libexec/talkd/print.c | 2 -- libexec/talkd/process.c | 2 -- libexec/talkd/table.c | 2 -- libexec/talkd/talkd.c | 2 -- sbin/dump/dumprmt.c | 2 -- sbin/dump/itime.c | 2 -- sbin/dump/main.c | 2 -- sbin/dump/optr.c | 2 -- sbin/dump/tape.c | 2 -- sbin/dump/traverse.c | 2 -- sbin/dump/unctime.c | 2 -- sbin/dumpfs/dumpfs.c | 2 -- sbin/ffsinfo/ffsinfo.c | 5 ----- sbin/fsck_msdosfs/boot.c | 2 -- sbin/fsck_msdosfs/check.c | 2 -- sbin/fsck_msdosfs/dir.c | 2 -- sbin/fsck_msdosfs/fat.c | 2 -- sbin/fsck_msdosfs/main.c | 2 -- sbin/fsdb/fsdb.c | 5 ----- sbin/fsdb/fsdbutil.c | 5 ----- sbin/fsirand/fsirand.c | 5 ----- sbin/growfs/debug.c | 5 ----- sbin/ifconfig/af_inet.c | 5 ----- sbin/ifconfig/af_inet6.c | 5 ----- sbin/ifconfig/af_link.c | 5 ----- sbin/ifconfig/af_nd6.c | 5 ----- sbin/ifconfig/ifbridge.c | 5 ----- sbin/ifconfig/ifclone.c | 5 ----- sbin/ifconfig/ifconfig.c | 2 -- sbin/ifconfig/ifgif.c | 5 ----- sbin/ifconfig/ifgroup.c | 5 ----- sbin/ifconfig/iflagg.c | 5 ----- sbin/ifconfig/ifvlan.c | 5 ----- sbin/ifconfig/sfp.c | 5 ----- sbin/init/init.c | 2 -- sbin/mknod/mknod.c | 2 -- sbin/mount/mount_fs.c | 2 -- sbin/mount_cd9660/mount_cd9660.c | 2 -- sbin/mount_msdosfs/mount_msdosfs.c | 5 ----- sbin/mount_nullfs/mount_nullfs.c | 2 -- sbin/mount_unionfs/mount_unionfs.c | 3 --- sbin/newfs_msdos/mkfs_msdos.c | 5 ----- sbin/newfs_msdos/newfs_msdos.c | 5 ----- sbin/nos-tun/nos-tun.c | 5 ----- sbin/restore/dirs.c | 2 -- sbin/restore/symtab.c | 2 -- sbin/restore/utilities.c | 2 -- sbin/umount/umount.c | 2 -- stand/libsa/powerpc/syncicache.c | 5 ----- sys/netpfil/ipfilter/netinet/fil.c | 1 - sys/netpfil/ipfilter/netinet/ip_auth.c | 1 - sys/netpfil/ipfilter/netinet/ip_frag.c | 1 - sys/netpfil/ipfilter/netinet/ip_nat.c | 1 - usr.bin/locate/locate/locate.c | 2 -- usr.bin/mktemp/mktemp.c | 5 ----- usr.bin/morse/morse.c | 2 -- usr.bin/nfsstat/nfsstat.c | 2 -- usr.bin/number/number.c | 2 -- usr.bin/primes/pattern.c | 2 -- usr.bin/primes/pr_tbl.c | 2 -- usr.bin/primes/primes.c | 2 -- usr.bin/printf/printf.c | 2 -- usr.bin/showmount/showmount.c | 2 -- usr.bin/tee/tee.c | 2 -- usr.bin/time/time.c | 2 -- usr.bin/truncate/truncate.c | 3 --- usr.bin/ul/ul.c | 2 -- usr.bin/uniq/uniq.c | 2 -- usr.bin/units/units.c | 5 ----- usr.bin/yes/yes.c | 2 -- usr.sbin/apmd/apmd.c | 5 ----- usr.sbin/btxld/btxld.c | 5 ----- usr.sbin/ckdist/ckdist.c | 5 ----- usr.sbin/config/main.c | 2 -- usr.sbin/config/mkheaders.c | 2 -- usr.sbin/config/mkmakefile.c | 2 -- usr.sbin/config/mkoptions.c | 2 -- usr.sbin/flowctl/flowctl.c | 5 ----- usr.sbin/keyserv/crypt_server.c | 5 ----- usr.sbin/keyserv/keyserv.c | 2 -- usr.sbin/keyserv/setkey.c | 2 -- usr.sbin/mptable/mptable.c | 5 ----- usr.sbin/nfsd/nfsd.c | 2 -- usr.sbin/pciconf/cap.c | 5 ----- usr.sbin/pciconf/err.c | 5 ----- usr.sbin/pciconf/pciconf.c | 5 ----- usr.sbin/pw/bitmap.c | 5 ----- usr.sbin/pw/cpdir.c | 5 ----- usr.sbin/pw/grupd.c | 5 ----- usr.sbin/pw/psdate.c | 5 ----- usr.sbin/pw/pw.c | 5 ----- usr.sbin/pw/pw_conf.c | 5 ----- usr.sbin/pw/pw_group.c | 5 ----- usr.sbin/pw/pw_log.c | 5 ----- usr.sbin/pw/pw_nis.c | 5 ----- usr.sbin/pw/pw_user.c | 5 ----- usr.sbin/pw/pw_vpw.c | 5 ----- usr.sbin/pw/pwupd.c | 5 ----- usr.sbin/pw/rm_r.c | 5 ----- usr.sbin/rpc.lockd/test.c | 1 - usr.sbin/rpc.statd/test.c | 5 ----- usr.sbin/rpc.umntall/rpc.umntall.c | 5 ----- usr.sbin/rpc.ypupdated/update.c | 2 -- usr.sbin/spray/spray.c | 5 ----- usr.sbin/traceroute6/traceroute6.c | 2 -- usr.sbin/vidcontrol/decode.c | 5 ----- usr.sbin/vidcontrol/vidcontrol.c | 5 ----- 139 files changed, 476 deletions(-) diff --git a/lib/lib80211/lib80211_regdomain.c b/lib/lib80211/lib80211_regdomain.c index f5ed236467f5..189d4661c78b 100644 --- a/lib/lib80211/lib80211_regdomain.c +++ b/lib/lib80211/lib80211_regdomain.c @@ -22,9 +22,6 @@ * (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 lint -static const char rcsid[] = "$FreeBSD$"; -#endif /* not lint */ #include #include diff --git a/lib/libc/net/nslexer.l b/lib/libc/net/nslexer.l index bd3c02dcacf4..ce0f18670e21 100644 --- a/lib/libc/net/nslexer.l +++ b/lib/libc/net/nslexer.l @@ -32,12 +32,6 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include -#if defined(LIBC_SCCS) && !defined(lint) -static char *rcsid = - "$FreeBSD$"; -#endif /* LIBC_SCCS and not lint */ - #include "namespace.h" #include #define _NS_PRIVATE diff --git a/lib/libc/powerpc/gen/syncicache.c b/lib/libc/powerpc/gen/syncicache.c index 5192d1356153..6376cb0e576d 100644 --- a/lib/libc/powerpc/gen/syncicache.c +++ b/lib/libc/powerpc/gen/syncicache.c @@ -33,11 +33,6 @@ * $NetBSD: syncicache.c,v 1.2 1999/05/05 12:36:40 tsubai Exp $ */ -#ifndef lint -static const char rcsid[] = - "$FreeBSD$"; -#endif /* not lint */ - #include #if defined(_KERNEL) || defined(_STANDALONE) #include diff --git a/lib/libc/powerpc64/gen/syncicache.c b/lib/libc/powerpc64/gen/syncicache.c index d96529bc3833..7885a36bd1d1 100644 --- a/lib/libc/powerpc64/gen/syncicache.c +++ b/lib/libc/powerpc64/gen/syncicache.c @@ -33,11 +33,6 @@ * $NetBSD: syncicache.c,v 1.2 1999/05/05 12:36:40 tsubai Exp $ */ -#ifndef lint -static const char rcsid[] = - "$FreeBSD$"; -#endif /* not lint */ - #include #if defined(_KERNEL) || defined(_STANDALONE) #include diff --git a/lib/msun/src/e_sqrtf.c b/lib/msun/src/e_sqrtf.c index 1fd0cec447fb..f9e2a320f20e 100644 --- a/lib/msun/src/e_sqrtf.c +++ b/lib/msun/src/e_sqrtf.c @@ -13,10 +13,6 @@ * ==================================================== */ -#ifndef lint -static char rcsid[] = "$FreeBSD$"; -#endif - #include "math.h" #include "math_private.h" diff --git a/lib/msun/src/s_modf.c b/lib/msun/src/s_modf.c index ab13191b9004..ffb1702751fa 100644 --- a/lib/msun/src/s_modf.c +++ b/lib/msun/src/s_modf.c @@ -10,10 +10,6 @@ * ==================================================== */ -#ifndef lint -static char rcsid[] = "$FreeBSD$"; -#endif - /* * modf(double x, double *iptr) * return fraction part of x, and return x's integral part in *iptr. diff --git a/lib/msun/src/w_cabsf.c b/lib/msun/src/w_cabsf.c index b5065c8a5683..aedbdef217ca 100644 --- a/lib/msun/src/w_cabsf.c +++ b/lib/msun/src/w_cabsf.c @@ -5,11 +5,6 @@ * Placed into the Public Domain, 1994. */ -#ifndef lint -static const char rcsid[] = - "$FreeBSD$"; -#endif /* not lint */ - #include #include #include "math_private.h" diff --git a/libexec/atrun/atrun.c b/libexec/atrun/atrun.c index 78d4ab32157b..28b3fe0fe1cf 100644 --- a/libexec/atrun/atrun.c +++ b/libexec/atrun/atrun.c @@ -26,11 +26,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef lint -static const char rcsid[] = - "$FreeBSD$"; -#endif /* not lint */ - /* System Headers */ #include diff --git a/libexec/atrun/gloadavg.c b/libexec/atrun/gloadavg.c index 86651aac3e67..e513183a391c 100644 --- a/libexec/atrun/gloadavg.c +++ b/libexec/atrun/gloadavg.c @@ -25,11 +25,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef lint -static const char rcsid[] = - "$FreeBSD$"; -#endif /* not lint */ - #ifndef __FreeBSD__ #define _POSIX_SOURCE 1 diff --git a/libexec/atrun/gloadavg.h b/libexec/atrun/gloadavg.h index f0ae6b45e868..a202cf0b3700 100644 --- a/libexec/atrun/gloadavg.h +++ b/libexec/atrun/gloadavg.h @@ -26,6 +26,3 @@ */ double gloadavg(void); -#if 0 -static char atrun_h_rcsid[] = "$FreeBSD$"; -#endif diff --git a/libexec/comsat/comsat.c b/libexec/comsat/comsat.c index c9d490d2cf6e..138881db9e4a 100644 --- a/libexec/comsat/comsat.c +++ b/libexec/comsat/comsat.c @@ -39,8 +39,6 @@ static const char copyright[] = #if 0 static char sccsid[] = "@(#)comsat.c 8.1 (Berkeley) 6/4/93"; #endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* not lint */ #include diff --git a/libexec/fingerd/fingerd.c b/libexec/fingerd/fingerd.c index ff8d5046a577..dd51064a00a6 100644 --- a/libexec/fingerd/fingerd.c +++ b/libexec/fingerd/fingerd.c @@ -39,8 +39,6 @@ static const char copyright[] = #if 0 static char sccsid[] = "@(#)fingerd.c 8.1 (Berkeley) 6/4/93"; #endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* not lint */ #include diff --git a/libexec/getty/init.c b/libexec/getty/init.c index 79b9601a2be1..e09cbf2c3e94 100644 --- a/libexec/getty/init.c +++ b/libexec/getty/init.c @@ -33,8 +33,6 @@ #if 0 static char sccsid[] = "@(#)from: init.c 8.1 (Berkeley) 6/4/93"; #endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* not lint */ /* diff --git a/libexec/getty/subr.c b/libexec/getty/subr.c index 68682df6d5bd..2c262e0968ca 100644 --- a/libexec/getty/subr.c +++ b/libexec/getty/subr.c @@ -33,8 +33,6 @@ #if 0 static char sccsid[] = "@(#)from: subr.c 8.1 (Berkeley) 6/4/93"; #endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* not lint */ /* diff --git a/libexec/mknetid/hash.c b/libexec/mknetid/hash.c index d340142aad90..5375b80fbe3b 100644 --- a/libexec/mknetid/hash.c +++ b/libexec/mknetid/hash.c @@ -38,11 +38,6 @@ #include #include "hash.h" -#ifndef lint -static const char rcsid[] = - "$FreeBSD$"; -#endif /* not lint */ - /* * This hash function is stolen directly from the * Berkeley DB package. It already exists inside libc, but diff --git a/libexec/mknetid/mknetid.c b/libexec/mknetid/mknetid.c index 3a39b4b3e675..a5c8281ef34d 100644 --- a/libexec/mknetid/mknetid.c +++ b/libexec/mknetid/mknetid.c @@ -55,11 +55,6 @@ #include "hash.h" -#ifndef lint -static const char rcsid[] = - "$FreeBSD$"; -#endif /* not lint */ - #define LINSIZ 1024 #define OPSYS "unix" diff --git a/libexec/mknetid/parse_group.c b/libexec/mknetid/parse_group.c index e876bd9f2ff0..59ebf44eab37 100644 --- a/libexec/mknetid/parse_group.c +++ b/libexec/mknetid/parse_group.c @@ -33,8 +33,6 @@ #if 0 static const char sccsid[] = "@(#)getgrent.c 8.2 (Berkeley) 3/21/94"; #endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* not lint */ /* diff --git a/libexec/rbootd/bpf.c b/libexec/rbootd/bpf.c index 0edcc06ccf7e..6fbe34111a67 100644 --- a/libexec/rbootd/bpf.c +++ b/libexec/rbootd/bpf.c @@ -46,8 +46,6 @@ #if 0 static const char sccsid[] = "@(#)bpf.c 8.1 (Berkeley) 6/4/93"; #endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* not lint */ #include diff --git a/libexec/rbootd/conf.c b/libexec/rbootd/conf.c index af46f53c3c88..a48d3efdb9c1 100644 --- a/libexec/rbootd/conf.c +++ b/libexec/rbootd/conf.c @@ -46,8 +46,6 @@ #if 0 static const char sccsid[] = "@(#)conf.c 8.1 (Berkeley) 6/4/93"; #endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* not lint */ #include diff --git a/libexec/rbootd/parseconf.c b/libexec/rbootd/parseconf.c index 9585e87185c6..262f81fb68d7 100644 --- a/libexec/rbootd/parseconf.c +++ b/libexec/rbootd/parseconf.c @@ -46,8 +46,6 @@ #if 0 static const char sccsid[] = "@(#)parseconf.c 8.1 (Berkeley) 6/4/93"; #endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* not lint */ #include diff --git a/libexec/rbootd/rmpproto.c b/libexec/rbootd/rmpproto.c index a31ec1de8abf..2603e697d8b8 100644 --- a/libexec/rbootd/rmpproto.c +++ b/libexec/rbootd/rmpproto.c @@ -46,8 +46,6 @@ #if 0 static const char sccsid[] = "@(#)rmpproto.c 8.1 (Berkeley) 6/4/93"; #endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* not lint */ #include diff --git a/libexec/rbootd/utils.c b/libexec/rbootd/utils.c index f5c2d62d30d7..36a7116a05c4 100644 --- a/libexec/rbootd/utils.c +++ b/libexec/rbootd/utils.c @@ -46,8 +46,6 @@ #if 0 static const char sccsid[] = "@(#)utils.c 8.1 (Berkeley) 6/4/93"; #endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* not lint */ #include diff --git a/libexec/revnetgroup/hash.c b/libexec/revnetgroup/hash.c index 2dd1a3f91d74..db8e95e3040c 100644 --- a/libexec/revnetgroup/hash.c +++ b/libexec/revnetgroup/hash.c @@ -32,11 +32,6 @@ * SUCH DAMAGE. */ -#ifndef lint -static const char rcsid[] = - "$FreeBSD$"; -#endif /* not lint */ - #include #include #include diff --git a/libexec/revnetgroup/parse_netgroup.c b/libexec/revnetgroup/parse_netgroup.c index a1e954164ea9..3d6a7939fa1d 100644 --- a/libexec/revnetgroup/parse_netgroup.c +++ b/libexec/revnetgroup/parse_netgroup.c @@ -32,11 +32,6 @@ * SUCH DAMAGE. */ -#ifndef lint -static const char rcsid[] = - "$FreeBSD$"; -#endif /* not lint */ - /* * This is a specially hacked-up version of getnetgrent.c used to parse * data from the stored hash table of netgroup info rather than from a diff --git a/libexec/revnetgroup/revnetgroup.c b/libexec/revnetgroup/revnetgroup.c index 11fba515a7ba..34ec0d9491c4 100644 --- a/libexec/revnetgroup/revnetgroup.c +++ b/libexec/revnetgroup/revnetgroup.c @@ -38,11 +38,6 @@ * Columbia University, New York City */ -#ifndef lint -static const char rcsid[] = - "$FreeBSD$"; -#endif /* not lint */ - #include #include #include diff --git a/libexec/rpc.rstatd/rstat_proc.c b/libexec/rpc.rstatd/rstat_proc.c index f0f2ffd65b57..7d363f65d7d1 100644 --- a/libexec/rpc.rstatd/rstat_proc.c +++ b/libexec/rpc.rstatd/rstat_proc.c @@ -32,8 +32,6 @@ static char sccsid[] = "from: @(#)rpc.rstatd.c 1.1 86/09/25 Copyr 1984 Sun Micro"; static char sccsid[] = "from: @(#)rstat_proc.c 2.2 88/08/01 4.0 RPCSRC"; #endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* diff --git a/libexec/rpc.rstatd/rstatd.c b/libexec/rpc.rstatd/rstatd.c index 6a6b09b9ae0c..7cc3bac71c5d 100644 --- a/libexec/rpc.rstatd/rstatd.c +++ b/libexec/rpc.rstatd/rstatd.c @@ -29,11 +29,6 @@ * SUCH DAMAGE. */ -#ifndef lint -static const char rcsid[] = - "$FreeBSD$"; -#endif /* not lint */ - #include #include #include diff --git a/libexec/rpc.rusersd/rusers_proc.c b/libexec/rpc.rusersd/rusers_proc.c index bfb65dadb004..3bc4169a989f 100644 --- a/libexec/rpc.rusersd/rusers_proc.c +++ b/libexec/rpc.rusersd/rusers_proc.c @@ -29,11 +29,6 @@ * SUCH DAMAGE. */ -#ifndef lint -static const char rcsid[] = - "$FreeBSD$"; -#endif /* not lint */ - #ifdef DEBUG #include #endif diff --git a/libexec/rpc.rusersd/rusersd.c b/libexec/rpc.rusersd/rusersd.c index e1e77398c8ff..cf00dd8d181e 100644 --- a/libexec/rpc.rusersd/rusersd.c +++ b/libexec/rpc.rusersd/rusersd.c @@ -29,11 +29,6 @@ * SUCH DAMAGE. */ -#ifndef lint -static const char rcsid[] = - "$FreeBSD$"; -#endif /* not lint */ - #include #include #include diff --git a/libexec/rpc.sprayd/sprayd.c b/libexec/rpc.sprayd/sprayd.c index 209d74af59af..2a71a93bf4ef 100644 --- a/libexec/rpc.sprayd/sprayd.c +++ b/libexec/rpc.sprayd/sprayd.c @@ -27,11 +27,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef lint -static const char rcsid[] = - "$FreeBSD$"; -#endif /* not lint */ - #include #include #include diff --git a/libexec/rtld-elf/rtld_malloc.c b/libexec/rtld-elf/rtld_malloc.c index 4b5140551675..dafbc222322e 100644 --- a/libexec/rtld-elf/rtld_malloc.c +++ b/libexec/rtld-elf/rtld_malloc.c @@ -31,7 +31,6 @@ #if defined(LIBC_SCCS) && !defined(lint) /*static char *sccsid = "from: @(#)malloc.c 5.11 (Berkeley) 2/23/91";*/ -static char *rcsid = "$FreeBSD$"; #endif /* LIBC_SCCS and not lint */ /* diff --git a/libexec/talkd/announce.c b/libexec/talkd/announce.c index 9cf326669998..b1b1acc09553 100644 --- a/libexec/talkd/announce.c +++ b/libexec/talkd/announce.c @@ -33,8 +33,6 @@ #if 0 static char sccsid[] = "@(#)announce.c 8.3 (Berkeley) 4/28/95"; #endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* not lint */ #include diff --git a/libexec/talkd/print.c b/libexec/talkd/print.c index 4d10329dd7f8..47ccb89f20d6 100644 --- a/libexec/talkd/print.c +++ b/libexec/talkd/print.c @@ -33,8 +33,6 @@ #if 0 static char sccsid[] = "@(#)print.c 8.1 (Berkeley) 6/4/93"; #endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* not lint */ /* debug print routines */ diff --git a/libexec/talkd/process.c b/libexec/talkd/process.c index 2bd22a1becb2..886fc038ab97 100644 --- a/libexec/talkd/process.c +++ b/libexec/talkd/process.c @@ -33,8 +33,6 @@ #if 0 static char sccsid[] = "@(#)process.c 8.2 (Berkeley) 11/16/93"; #endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* not lint */ /* diff --git a/libexec/talkd/table.c b/libexec/talkd/table.c index ed1560f86ff8..495d63b02b06 100644 --- a/libexec/talkd/table.c +++ b/libexec/talkd/table.c @@ -33,8 +33,6 @@ #if 0 static char sccsid[] = "@(#)table.c 8.1 (Berkeley) 6/4/93"; #endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* not lint */ /* diff --git a/libexec/talkd/talkd.c b/libexec/talkd/talkd.c index eb609207b156..76d0ec5a09ad 100644 --- a/libexec/talkd/talkd.c +++ b/libexec/talkd/talkd.c @@ -39,8 +39,6 @@ static const char copyright[] = #if 0 static char sccsid[] = "@(#)talkd.c 8.1 (Berkeley) 6/4/93"; #endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* not lint */ /* diff --git a/sbin/dump/dumprmt.c b/sbin/dump/dumprmt.c index d1769faa3daf..a8b2d9c221da 100644 --- a/sbin/dump/dumprmt.c +++ b/sbin/dump/dumprmt.c @@ -33,8 +33,6 @@ #if 0 static char sccsid[] = "@(#)dumprmt.c 8.3 (Berkeley) 4/28/95"; #endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* not lint */ #include diff --git a/sbin/dump/itime.c b/sbin/dump/itime.c index cb6d55625e6d..d9121e4df05a 100644 --- a/sbin/dump/itime.c +++ b/sbin/dump/itime.c @@ -33,8 +33,6 @@ #if 0 static char sccsid[] = "@(#)itime.c 8.1 (Berkeley) 6/5/93"; #endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* not lint */ #include diff --git a/sbin/dump/main.c b/sbin/dump/main.c index bbc54d7ab5d7..59e538051a29 100644 --- a/sbin/dump/main.c +++ b/sbin/dump/main.c @@ -39,8 +39,6 @@ static const char copyright[] = #if 0 static char sccsid[] = "@(#)main.c 8.6 (Berkeley) 5/1/95"; #endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* not lint */ #include diff --git a/sbin/dump/optr.c b/sbin/dump/optr.c index 8eb163516c72..d3ca5b2a926e 100644 --- a/sbin/dump/optr.c +++ b/sbin/dump/optr.c @@ -33,8 +33,6 @@ #if 0 static char sccsid[] = "@(#)optr.c 8.2 (Berkeley) 1/6/94"; #endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* not lint */ #include diff --git a/sbin/dump/tape.c b/sbin/dump/tape.c index c123f7fa9404..3a3574f6d44d 100644 --- a/sbin/dump/tape.c +++ b/sbin/dump/tape.c @@ -33,8 +33,6 @@ #if 0 static char sccsid[] = "@(#)tape.c 8.4 (Berkeley) 5/1/95"; #endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* not lint */ #include diff --git a/sbin/dump/traverse.c b/sbin/dump/traverse.c index 08e902667759..281cffcdf6f2 100644 --- a/sbin/dump/traverse.c +++ b/sbin/dump/traverse.c @@ -33,8 +33,6 @@ #if 0 static char sccsid[] = "@(#)traverse.c 8.7 (Berkeley) 6/15/95"; #endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* not lint */ #include diff --git a/sbin/dump/unctime.c b/sbin/dump/unctime.c index 3e03a65f1a7c..5f44c80f9358 100644 --- a/sbin/dump/unctime.c +++ b/sbin/dump/unctime.c @@ -33,8 +33,6 @@ #if 0 static char sccsid[] = "@(#)unctime.c 8.2 (Berkeley) 6/14/94"; #endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* not lint */ #include diff --git a/sbin/dumpfs/dumpfs.c b/sbin/dumpfs/dumpfs.c index 7f3e7bb3e910..7e5b52a23067 100644 --- a/sbin/dumpfs/dumpfs.c +++ b/sbin/dumpfs/dumpfs.c @@ -54,8 +54,6 @@ static const char copyright[] = #if 0 static char sccsid[] = "@(#)dumpfs.c 8.5 (Berkeley) 4/29/95"; #endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* not lint */ #include diff --git a/sbin/ffsinfo/ffsinfo.c b/sbin/ffsinfo/ffsinfo.c index 9bd3210986a9..b1c86a60ff2b 100644 --- a/sbin/ffsinfo/ffsinfo.c +++ b/sbin/ffsinfo/ffsinfo.c @@ -48,11 +48,6 @@ Copyright (c) 1980, 1989, 1993 The Regents of the University of California.\n\ All rights reserved.\n"; #endif /* not lint */ -#ifndef lint -static const char rcsid[] = - "$FreeBSD$"; -#endif /* not lint */ - /* ********************************************************** INCLUDES ***** */ #include #include diff --git a/sbin/fsck_msdosfs/boot.c b/sbin/fsck_msdosfs/boot.c index 3d1657ad66f3..f91609470ad7 100644 --- a/sbin/fsck_msdosfs/boot.c +++ b/sbin/fsck_msdosfs/boot.c @@ -29,8 +29,6 @@ #include #ifndef lint __RCSID("$NetBSD: boot.c,v 1.22 2020/01/11 16:29:07 christos Exp $"); -static const char rcsid[] = - "$FreeBSD$"; #endif /* not lint */ #include diff --git a/sbin/fsck_msdosfs/check.c b/sbin/fsck_msdosfs/check.c index 654ceeb9c5ca..f672a2ac515c 100644 --- a/sbin/fsck_msdosfs/check.c +++ b/sbin/fsck_msdosfs/check.c @@ -29,8 +29,6 @@ #include #ifndef lint __RCSID("$NetBSD: check.c,v 1.14 2006/06/05 16:51:18 christos Exp $"); -static const char rcsid[] = - "$FreeBSD$"; #endif /* not lint */ #ifdef HAVE_LIBUTIL_H diff --git a/sbin/fsck_msdosfs/dir.c b/sbin/fsck_msdosfs/dir.c index 02c93c10faac..be3d5ddc5425 100644 --- a/sbin/fsck_msdosfs/dir.c +++ b/sbin/fsck_msdosfs/dir.c @@ -32,8 +32,6 @@ #include #ifndef lint __RCSID("$NetBSD: dir.c,v 1.20 2006/06/05 16:51:18 christos Exp $"); -static const char rcsid[] = - "$FreeBSD$"; #endif /* not lint */ #include diff --git a/sbin/fsck_msdosfs/fat.c b/sbin/fsck_msdosfs/fat.c index e35e2f27d305..567bfcd428cb 100644 --- a/sbin/fsck_msdosfs/fat.c +++ b/sbin/fsck_msdosfs/fat.c @@ -30,8 +30,6 @@ #include #ifndef lint __RCSID("$NetBSD: fat.c,v 1.18 2006/06/05 16:51:18 christos Exp $"); -static const char rcsid[] = - "$FreeBSD$"; #endif /* not lint */ #include diff --git a/sbin/fsck_msdosfs/main.c b/sbin/fsck_msdosfs/main.c index de54cd18eae7..0713189daa2d 100644 --- a/sbin/fsck_msdosfs/main.c +++ b/sbin/fsck_msdosfs/main.c @@ -29,8 +29,6 @@ #include #ifndef lint __RCSID("$NetBSD: main.c,v 1.10 1997/10/01 02:18:14 enami Exp $"); -static const char rcsid[] = - "$FreeBSD$"; #endif /* not lint */ #include diff --git a/sbin/fsdb/fsdb.c b/sbin/fsdb/fsdb.c index 1564810ee79d..8f1cac3aaa87 100644 --- a/sbin/fsdb/fsdb.c +++ b/sbin/fsdb/fsdb.c @@ -30,11 +30,6 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef lint -static const char rcsid[] = - "$FreeBSD$"; -#endif /* not lint */ - #include #include #include diff --git a/sbin/fsdb/fsdbutil.c b/sbin/fsdb/fsdbutil.c index c8a3a8a525e3..737dabba643f 100644 --- a/sbin/fsdb/fsdbutil.c +++ b/sbin/fsdb/fsdbutil.c @@ -30,11 +30,6 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef lint -static const char rcsid[] = - "$FreeBSD$"; -#endif /* not lint */ - #include #include #include diff --git a/sbin/fsirand/fsirand.c b/sbin/fsirand/fsirand.c index ca9a808f6717..c1900dc9e479 100644 --- a/sbin/fsirand/fsirand.c +++ b/sbin/fsirand/fsirand.c @@ -32,11 +32,6 @@ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef lint -static const char rcsid[] = - "$FreeBSD$"; -#endif /* not lint */ - #include #include diff --git a/sbin/growfs/debug.c b/sbin/growfs/debug.c index e0dfc997fcf6..456e67dbc5c2 100644 --- a/sbin/growfs/debug.c +++ b/sbin/growfs/debug.c @@ -41,11 +41,6 @@ * */ -#ifndef lint -static const char rcsid[] = - "$FreeBSD$"; -#endif /* not lint */ - #include #include diff --git a/sbin/ifconfig/af_inet.c b/sbin/ifconfig/af_inet.c index c5c40de155d6..37c681ea6df9 100644 --- a/sbin/ifconfig/af_inet.c +++ b/sbin/ifconfig/af_inet.c @@ -29,11 +29,6 @@ * SUCH DAMAGE. */ -#ifndef lint -static const char rcsid[] = - "$FreeBSD$"; -#endif /* not lint */ - #include #include #include diff --git a/sbin/ifconfig/af_inet6.c b/sbin/ifconfig/af_inet6.c index 08902b934ad8..f883c88949da 100644 --- a/sbin/ifconfig/af_inet6.c +++ b/sbin/ifconfig/af_inet6.c @@ -29,11 +29,6 @@ * SUCH DAMAGE. */ -#ifndef lint -static const char rcsid[] = - "$FreeBSD$"; -#endif /* not lint */ - #include #include #include diff --git a/sbin/ifconfig/af_link.c b/sbin/ifconfig/af_link.c index fb7a235b2f49..cd5422c5541c 100644 --- a/sbin/ifconfig/af_link.c +++ b/sbin/ifconfig/af_link.c @@ -29,11 +29,6 @@ * SUCH DAMAGE. */ -#ifndef lint -static const char rcsid[] = - "$FreeBSD$"; -#endif /* not lint */ - #include #include #include diff --git a/sbin/ifconfig/af_nd6.c b/sbin/ifconfig/af_nd6.c index d1be5a4dc00f..3116d03534bc 100644 --- a/sbin/ifconfig/af_nd6.c +++ b/sbin/ifconfig/af_nd6.c @@ -25,11 +25,6 @@ * SUCH DAMAGE. */ -#ifndef lint -static const char rcsid[] = - "$FreeBSD$"; -#endif /* not lint */ - *** 1173 LINES SKIPPED *** From nobody Tue Oct 24 18:37:10 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SFLPy56LYz4yMJX; Tue, 24 Oct 2023 18:37: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 4SFLPy35GCz3YPc; Tue, 24 Oct 2023 18:37:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698172630; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4GMZzk/5NL136dzfQyuxLxCu7g4OhKFI3MBf7Z9E27o=; b=pUeSE1wLLuVTuj+5n6HQCxS6w4GFqeSbF4zpht0n5THn9tgaNuDAs8OcQBdhNQ743amyo9 xkuDnGBZJZGjA7UNNXpKLGDmxCzQy+3VxubO7j8VRfpZWgm/P5EjUS+hqRvY3QMhaRcoLf N48sbmfJbb3sd1XibJR090fr+uvaVhGRl4hNJpT+gSvm3X6BIdQlbhT4ZfM04W2yMfUPaQ NAuo408BZJKB2amiLk1KkeJi+/2oUOqBHpwWxQvTHLVino9TDsoK8pPoMdr7kGshv3lYm7 Is+ZqzrzpjjA0xxPBEoYfxW8OwMe00MAL7ERgdjPm6Cjp05rs/C+b2zUaolTZA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698172630; a=rsa-sha256; cv=none; b=e83G8e7OR3i8BO99Z7tHT6obUYnbkTE7pELZIQpEfI41hV/o7CNCw0H5fg+cSrsLZ2M/1V xJGUOoR0Vfbz8aHsEVrnmovgupN55DqtfRSgdhpW8W4MfiBilSgG4UfNLjeYVfGpHV2je/ EakPHByyK9ysYomo0Da2/ok4a0siaLiUZEsUWvtgBNWsa6WYnTTzut/8ovaLxfgzErliqO 7kBFJ8tY4Xys+y2m0CCpWZPu99ddHSAkf1uAT4b0/mJG3ZaMKDYI0jPr74mwyFsJly64W4 L9K7BnnsC3YVlhZKp8jt4XuNE4ZaNuAZASMoFwFxt8TBstkSIvfp+6cStwAXOw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698172630; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4GMZzk/5NL136dzfQyuxLxCu7g4OhKFI3MBf7Z9E27o=; b=XHDISFoRa2BJXTGanwaxot4fMlRL386koKiJPZwhU6wWrgGLZcAQ785odkSwfJUrkfdupG j4pJN+31c57IjFd9w2Hq7cZu1Obc4cKYkl/Ear6oNUJPESJXRRKXGkWVc5+8v+/MOawq5h +4HcMCEAyCjkeCia+1qIafepBwlc6bKJdLwZC2tP34dF2cY20eGLHb5AN3Y1sSGkp96psk wyk851oDW0Uo39nVDYrzDMqj0cO7LRYEdKYCJY06yejBfLct3/+hSj22L75fhI2a4CUeJ2 JCVNJzv8IgXe0o7g6AxELAAYTkWEgE13zcdHZkhrAdYXqiHlfSAXLh3wUVd4Yw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SFLPy2BzvzYvJ; Tue, 24 Oct 2023 18:37: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 39OIbAT3088603; Tue, 24 Oct 2023 18:37:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39OIbAcj088601; Tue, 24 Oct 2023 18:37:10 GMT (envelope-from git) Date: Tue, 24 Oct 2023 18:37:10 GMT Message-Id: <202310241837.39OIbAcj088601@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: bc1cddbd4ae7 - stable/13 - powerpc/generate-hfs.sh: Don't include $FreeBSD$ in prefix to uuencoded image List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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/stable/13 X-Git-Reftype: branch X-Git-Commit: bc1cddbd4ae70fedcb26d8f0f4e5aa1ff10e3e8e Auto-Submitted: auto-generated The branch stable/13 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=bc1cddbd4ae70fedcb26d8f0f4e5aa1ff10e3e8e commit bc1cddbd4ae70fedcb26d8f0f4e5aa1ff10e3e8e Author: John Baldwin AuthorDate: 2023-09-25 14:55:18 +0000 Commit: John Baldwin CommitDate: 2023-10-24 18:13:18 +0000 powerpc/generate-hfs.sh: Don't include $FreeBSD$ in prefix to uuencoded image Reviewed by: imp, emaste Differential Revision: https://reviews.freebsd.org/D41958 (cherry picked from commit 5919ab299160e6d330bfd8bacf7bd1c5ad8cabb9) --- release/powerpc/generate-hfs.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/release/powerpc/generate-hfs.sh b/release/powerpc/generate-hfs.sh index 46f66d601ce3..50f77933f273 100755 --- a/release/powerpc/generate-hfs.sh +++ b/release/powerpc/generate-hfs.sh @@ -55,7 +55,6 @@ rm loader.tmp bzip2 $OUTPUT_FILE echo 'HFS boot filesystem created by generate-hfs.sh' > $OUTPUT_FILE.bz2.uu echo 'DO NOT EDIT' >> $OUTPUT_FILE.bz2.uu -echo '$FreeBSD$' >> $OUTPUT_FILE.bz2.uu uuencode $OUTPUT_FILE.bz2 $OUTPUT_FILE.bz2 >> $OUTPUT_FILE.bz2.uu rm $OUTPUT_FILE.bz2 From nobody Tue Oct 24 18:37:10 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SFLPy5Hk5z4yLrg; Tue, 24 Oct 2023 18:37: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 4SFLPy34XVz3YRt; Tue, 24 Oct 2023 18:37:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698172630; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dUOGDdzp0ChbC4d28yes41g7lpvUjUYirMRf5FyTGDY=; b=INi+uDrlnX2Z9kA84NGil+s5cF/cJTc/4Qa3ZiaJs4dAGMvnbM/DzeI8awwZK1u2zFsFz9 hN7zDMKdy8Qq2brhYr2WhICYIFmhAb/M2Hu5fAe5f4l2uv0d2/oEEBuHuK10AlfayoWM1M o5jjAGO1FDjxdLPXT04EihonZVFAi96FUJoIjAbkohM7AVV1gf8nLsHQUV+zgPI5q5GHWs Dww8YYtfF4vEbotaI9IvldNgeo/jK9Xmh7DdGIU04rR0BQyD5dImMI1UOAoAaocg5uv8um zi3KRGUi2jTdFVnxxDqqBf74X0Apf0xm2ZcozQHN5zmZCRGR0qkpbhPoUscQ3g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698172630; a=rsa-sha256; cv=none; b=Xr0Zo67dVm/tNTCsdWjWnkhybInWamv0bOqoAUHods2Z+PN5nDkYfHyTIx4AjLE2kgQKag 1a8eQBe6aoVl1+aNUJe12zQIJYY0dSoqssecXjP2BHLdNpzN9aX5xadDoG7kzkxgNA9V+r xX0zEMVLeQCV77hr89TyoXGY1JyPjsO0wmNPJkozEzo8AwNUf5jaEMH6xXMnfn3IF7Cjgj ENlPyzrKXayHxhDymaVTM5Ne1Esd159eTs1uMmWF3hzNJ/ZXMqK5NRqSKX5ViLxOJ1NdxX wobFCaQcPxoIkH/aBb5XBnyncW7GV1xC9mrMsDHKwGwszeyg6M9BRMrdYDoGKw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698172630; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dUOGDdzp0ChbC4d28yes41g7lpvUjUYirMRf5FyTGDY=; b=S/8KjouYNjLHJIw97q1c7kRdXnIUE7EVtjeSOtXHMksI9m83FmcSdB5rCmPbNMChjoIzqg TXAwsttp0AZ4JHy167NGFkzintvSNKQ399N+HHK2NxTb/qhp0XOwLSp/ahMbti1dtC4IQB t/HR1mZNOCX+zm2L8AxMAwaxRwMyFx3UyDPcPGRErOeHCmM/zRp23AF6Z7DLL2iMBx+2vx WIWtwdevwv6+w4UYnRmbol3VntYQoL2xaDf4BCca5GV6UqM+m3QbMBlpVmm1DDQC+wogiG +yIlNrX72BBLOQcVMl2ZI6DGDAvipSzWniF67EwWr657jaAv8ekELva/SkJWbw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SFLPy2BRKzZ3X; Tue, 24 Oct 2023 18:37: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 39OIbAYC088604; Tue, 24 Oct 2023 18:37:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39OIbAkl088596; Tue, 24 Oct 2023 18:37:10 GMT (envelope-from git) Date: Tue, 24 Oct 2023 18:37:10 GMT Message-Id: <202310241837.39OIbAkl088596@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 8f7aafe29f4a - stable/14 - Update a few tools to not embed $FreeBSD$ in generated files List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 8f7aafe29f4a3716635a501ea3ef0177a5fdffe9 Auto-Submitted: auto-generated The branch stable/14 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=8f7aafe29f4a3716635a501ea3ef0177a5fdffe9 commit 8f7aafe29f4a3716635a501ea3ef0177a5fdffe9 Author: John Baldwin AuthorDate: 2023-09-25 14:55:43 +0000 Commit: John Baldwin CommitDate: 2023-10-24 17:11:20 +0000 Update a few tools to not embed $FreeBSD$ in generated files Reviewed by: imp, emaste Differential Revision: https://reviews.freebsd.org/D41959 (cherry picked from commit c4e2333cb2a59e44004d824a1093d9bf1d9fe273) --- tools/test/iconv/tablegen/tablegen.c | 2 -- tools/tools/drm/gen-drm_pciids | 4 ---- tools/tools/locale/tools/cldr2def.pl | 1 - 3 files changed, 7 deletions(-) diff --git a/tools/test/iconv/tablegen/tablegen.c b/tools/test/iconv/tablegen/tablegen.c index 843f8f6cb135..ecc1c7fdb44d 100644 --- a/tools/test/iconv/tablegen/tablegen.c +++ b/tools/test/iconv/tablegen/tablegen.c @@ -254,7 +254,6 @@ main (int argc, char *argv[]) if (dflag && iconvctl(cd, ICONV_SET_FALLBACKS, &fbs) != 0) err(1, NULL); if (cflag) { - printf("# $FreeBSD$\n\n"); printf("TYPE\t\tROWCOL\n"); printf("NAME\t\tUCS/%s\n", argv[0]); printf("%s", citrus_common); @@ -266,7 +265,6 @@ main (int argc, char *argv[]) if (dflag && (iconvctl(cd, ICONV_SET_FALLBACKS, &fbs) != 0)) err(1, NULL); if (cflag) { - printf("# $FreeBSD$\n\n"); printf("TYPE\t\tROWCOL\n"); printf("NAME\t\t%s/UCS\n", argv[0]); printf("%s", citrus_common); diff --git a/tools/tools/drm/gen-drm_pciids b/tools/tools/drm/gen-drm_pciids index ecb8e3aef6e4..472c75cb80dc 100755 --- a/tools/tools/drm/gen-drm_pciids +++ b/tools/tools/drm/gen-drm_pciids @@ -156,10 +156,6 @@ foreach my $vendor_define (sort keys(%linux_pciids)) { print STDERR "\nWrite FreeBSD header to stdout...\n"; print <<"EOF"; -/* - * \$FreeBSD\$ - */ - /* * Generated by $progname from: * o previous FreeBSD's drm_pciids.h diff --git a/tools/tools/locale/tools/cldr2def.pl b/tools/tools/locale/tools/cldr2def.pl index 8e48f32f263c..e59e6d3b13a1 100755 --- a/tools/tools/locale/tools/cldr2def.pl +++ b/tools/tools/locale/tools/cldr2def.pl @@ -947,7 +947,6 @@ sub make_makefile { } open(FOUT, ">$TYPE.draft/Makefile"); print FOUT < To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 050bfa51fe96 - stable/13 - Update a few tools to not embed $FreeBSD$ in generated files List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 050bfa51fe968a024763afaa67dd6caebc2a7c66 Auto-Submitted: auto-generated The branch stable/13 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=050bfa51fe968a024763afaa67dd6caebc2a7c66 commit 050bfa51fe968a024763afaa67dd6caebc2a7c66 Author: John Baldwin AuthorDate: 2023-09-25 14:55:43 +0000 Commit: John Baldwin CommitDate: 2023-10-24 18:13:18 +0000 Update a few tools to not embed $FreeBSD$ in generated files Reviewed by: imp, emaste Differential Revision: https://reviews.freebsd.org/D41959 (cherry picked from commit c4e2333cb2a59e44004d824a1093d9bf1d9fe273) --- tools/test/iconv/tablegen/tablegen.c | 2 -- tools/tools/drm/gen-drm_pciids | 4 ---- tools/tools/locale/tools/cldr2def.pl | 1 - 3 files changed, 7 deletions(-) diff --git a/tools/test/iconv/tablegen/tablegen.c b/tools/test/iconv/tablegen/tablegen.c index 6cb7ff1a4095..8c544d9a0aa5 100644 --- a/tools/test/iconv/tablegen/tablegen.c +++ b/tools/test/iconv/tablegen/tablegen.c @@ -254,7 +254,6 @@ main (int argc, char *argv[]) if (dflag && iconvctl(cd, ICONV_SET_FALLBACKS, &fbs) != 0) err(1, NULL); if (cflag) { - printf("# $FreeBSD$\n\n"); printf("TYPE\t\tROWCOL\n"); printf("NAME\t\tUCS/%s\n", argv[0]); printf("%s", citrus_common); @@ -266,7 +265,6 @@ main (int argc, char *argv[]) if (dflag && (iconvctl(cd, ICONV_SET_FALLBACKS, &fbs) != 0)) err(1, NULL); if (cflag) { - printf("# $FreeBSD$\n\n"); printf("TYPE\t\tROWCOL\n"); printf("NAME\t\t%s/UCS\n", argv[0]); printf("%s", citrus_common); diff --git a/tools/tools/drm/gen-drm_pciids b/tools/tools/drm/gen-drm_pciids index ecb8e3aef6e4..472c75cb80dc 100755 --- a/tools/tools/drm/gen-drm_pciids +++ b/tools/tools/drm/gen-drm_pciids @@ -156,10 +156,6 @@ foreach my $vendor_define (sort keys(%linux_pciids)) { print STDERR "\nWrite FreeBSD header to stdout...\n"; print <<"EOF"; -/* - * \$FreeBSD\$ - */ - /* * Generated by $progname from: * o previous FreeBSD's drm_pciids.h diff --git a/tools/tools/locale/tools/cldr2def.pl b/tools/tools/locale/tools/cldr2def.pl index 4d3711664869..4f6adefedd78 100755 --- a/tools/tools/locale/tools/cldr2def.pl +++ b/tools/tools/locale/tools/cldr2def.pl @@ -982,7 +982,6 @@ sub make_makefile { } open(FOUT, ">$TYPE.draft/Makefile"); print FOUT < To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 37d19dd86af3 - stable/14 - sendmail: Drop $FreeBSD$ from .mc files List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 37d19dd86af32bb44f82f7b00c5a95cbee7642dc Auto-Submitted: auto-generated The branch stable/14 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=37d19dd86af32bb44f82f7b00c5a95cbee7642dc commit 37d19dd86af32bb44f82f7b00c5a95cbee7642dc Author: John Baldwin AuthorDate: 2023-09-25 14:56:02 +0000 Commit: John Baldwin CommitDate: 2023-10-24 17:11:29 +0000 sendmail: Drop $FreeBSD$ from .mc files Reviewed by: imp, emaste Differential Revision: https://reviews.freebsd.org/D41960 (cherry picked from commit 3aaa7724d68fb001ca3c7e75950edcb617aaeb65) --- etc/sendmail/freebsd.mc | 1 - etc/sendmail/freebsd.submit.mc | 1 - etc/sendmail/freefall.mc | 1 - 3 files changed, 3 deletions(-) diff --git a/etc/sendmail/freebsd.mc b/etc/sendmail/freebsd.mc index 5fd201da3900..cf80a3133c74 100644 --- a/etc/sendmail/freebsd.mc +++ b/etc/sendmail/freebsd.mc @@ -48,7 +48,6 @@ divert(-1) # divert(0) -VERSIONID(`$FreeBSD$') OSTYPE(freebsd6) DOMAIN(generic) diff --git a/etc/sendmail/freebsd.submit.mc b/etc/sendmail/freebsd.submit.mc index 165c5f8eadf8..e14a6bc56500 100644 --- a/etc/sendmail/freebsd.submit.mc +++ b/etc/sendmail/freebsd.submit.mc @@ -14,7 +14,6 @@ divert(-1) # divert(0)dnl -VERSIONID(`$FreeBSD$') define(`confCF_VERSION', `Submit')dnl define(`__OSTYPE__',`')dnl dirty hack to keep proto.m4 from complaining define(`_USE_DECNET_SYNTAX_', `1')dnl support DECnet diff --git a/etc/sendmail/freefall.mc b/etc/sendmail/freefall.mc index df07fea8b673..6406ab502ae1 100644 --- a/etc/sendmail/freefall.mc +++ b/etc/sendmail/freefall.mc @@ -40,7 +40,6 @@ divert(-1) # divert(0)dnl -VERSIONID(`$FreeBSD$') OSTYPE(freebsd6) FEATURE(nullclient, smarthost.ysv.freebsd.org) From nobody Tue Oct 24 18:37:12 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SFLQ05ry5z4yMGN; Tue, 24 Oct 2023 18:37: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 4SFLQ04vBvz3Yxn; Tue, 24 Oct 2023 18:37:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698172632; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=p4sNGCn8IHHRKQkfxVHsjeZrjWLRiA6lLLFjiiqEXdc=; b=akhauu47CWWRLdaibmV0I+SxBs+zB3gzV3jSA5q/MGsLaDFmzwIBdE37desdu/IYhWiVa5 SzDin58uA2eei1RstfZ6wStC6fDOU+8FB3qdvUMwOZTjlsXuTWo8mFhj8A5B3RkxmYTco0 gEQ657KtEJJCp2u/hUUoELy6yagtfcWYOryGvbo30nGuQFW0uyPdfZiLI3yjIa+42h+8V2 ZuYQ8HbLQRU7K2Dia6NWJgT1kmtbmh5oitDB3U4M2BY/GDWIpZXd50KVGber53YhgZh2Rt i5Tbp8N+O4rqwx/ZpL0Sh79z4ICJhHLLmpZ73LBu2b7DT0qeOf3ANPs9SYIYRw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698172632; a=rsa-sha256; cv=none; b=V84dJVWmXg9TO3uW8YAWoFpf5QWz/ExcOmcrwKj1S7izJMc/g/Umylvmm0xJKzYVgbPJk1 yA2CSXBGYL8CN2vZ4b47kGOagCuUL1U8VCwmfLufuVwVYvkPK8UtXV4JYJzQR2P9MYqEqX fujaGhprSAaRIVJWgPrd/feKxn0WRVXZBt52qypHeLDTF2DNX58d7wncZ7vZpzFyTYDRGN muL1fFuwdV1QtyB8T6yFTaXdcdPsl4GJRvhfAhQft1pqYmfKUVn5w9YE9w2yiJ/0ZLy6um /b5ug53KBiReiFUMt5IFXcr61mtG944ySjZUanbfYOLkc9xkoIIRdDPLQ1t0/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=1698172632; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=p4sNGCn8IHHRKQkfxVHsjeZrjWLRiA6lLLFjiiqEXdc=; b=F9n9Auby4T+2SSLcG++gs6SqGY55PG7Pf4pk/pzERXoe+MuwlDyvrnFsQgpxhmvxYqbM3f rUPT6matbOSLKCyNqgSIpU5C5+nspvA20DFKLctCA2l67yUQdv6dKeEB9UdbtZMl+TicqB WEdjGB9aG0QkcoqYXNFU1qWZNj4hJK2RKFXWzkiKe/oW7E3JNh2LpzHxTuKATUA7O7SSAU 6X6Y52ODoyOehI+vDdAidZmHFYp6rH5PAiPx2pEFzDUfF/mP90dhd7kH0SLzUPyS2Cw8Yg 9JMttzCuuDF/YDbRxJvUccwskZpVykUZEpoOIOKmtcmGKrPXplOTQ4CU70qzNA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SFLQ040Z6zYlP; Tue, 24 Oct 2023 18:37: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 39OIbCUU088789; Tue, 24 Oct 2023 18:37:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39OIbCJo088786; Tue, 24 Oct 2023 18:37:12 GMT (envelope-from git) Date: Tue, 24 Oct 2023 18:37:12 GMT Message-Id: <202310241837.39OIbCJo088786@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 2813a9b929d7 - stable/13 - sendmail: Drop $FreeBSD$ from .mc files List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 2813a9b929d771d04f08242ebce4214c7c68f3ea Auto-Submitted: auto-generated The branch stable/13 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=2813a9b929d771d04f08242ebce4214c7c68f3ea commit 2813a9b929d771d04f08242ebce4214c7c68f3ea Author: John Baldwin AuthorDate: 2023-09-25 14:56:02 +0000 Commit: John Baldwin CommitDate: 2023-10-24 18:13:18 +0000 sendmail: Drop $FreeBSD$ from .mc files Reviewed by: imp, emaste Differential Revision: https://reviews.freebsd.org/D41960 (cherry picked from commit 3aaa7724d68fb001ca3c7e75950edcb617aaeb65) --- etc/sendmail/freebsd.mc | 1 - etc/sendmail/freebsd.submit.mc | 1 - etc/sendmail/freefall.mc | 1 - 3 files changed, 3 deletions(-) diff --git a/etc/sendmail/freebsd.mc b/etc/sendmail/freebsd.mc index 5fd201da3900..cf80a3133c74 100644 --- a/etc/sendmail/freebsd.mc +++ b/etc/sendmail/freebsd.mc @@ -48,7 +48,6 @@ divert(-1) # divert(0) -VERSIONID(`$FreeBSD$') OSTYPE(freebsd6) DOMAIN(generic) diff --git a/etc/sendmail/freebsd.submit.mc b/etc/sendmail/freebsd.submit.mc index 165c5f8eadf8..e14a6bc56500 100644 --- a/etc/sendmail/freebsd.submit.mc +++ b/etc/sendmail/freebsd.submit.mc @@ -14,7 +14,6 @@ divert(-1) # divert(0)dnl -VERSIONID(`$FreeBSD$') define(`confCF_VERSION', `Submit')dnl define(`__OSTYPE__',`')dnl dirty hack to keep proto.m4 from complaining define(`_USE_DECNET_SYNTAX_', `1')dnl support DECnet diff --git a/etc/sendmail/freefall.mc b/etc/sendmail/freefall.mc index df07fea8b673..6406ab502ae1 100644 --- a/etc/sendmail/freefall.mc +++ b/etc/sendmail/freefall.mc @@ -40,7 +40,6 @@ divert(-1) # divert(0)dnl -VERSIONID(`$FreeBSD$') OSTYPE(freebsd6) FEATURE(nullclient, smarthost.ysv.freebsd.org) From nobody Tue Oct 24 18:37:12 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SFLQ05qyQz4yMGM; Tue, 24 Oct 2023 18:37: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 4SFLQ04vBGz3YpY; Tue, 24 Oct 2023 18:37:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698172632; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SB62KzxMad7ApWMnnf0LyI2yBIOxdXQSgPW5O8CSbvw=; b=aYZaouVPs3SKwaP0tLjSQTv3gdliG4VILKqMzeGNDf9v+DrgD8rDm4SLaKlAPfmPoXZO4a IudyTm4Go1idNOGBzXJKySZTRHCOfooNxs1hjaoB3BE7CJjjyuvNCb9zKz0S+F2pE++91n TShY+wKNEPm/32BH+EzL9TyzDJGnW1GZPKvXPX1BFCCaUemwuupZSO3qYfs8lzF8qdbehI PbjtQcavNKMXHNJ/be18urK1q/9L8FCPugT5xV/PNXZGJE2dk7k1HidmZPxrCDgZAnTTis FhFD9XfdsOSl5alkczEVYJKUej4HgSPuYkHc38U5oUcDuDHL2BHsltItjR9Xdg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698172632; a=rsa-sha256; cv=none; b=pHQFj4EqtsnATVZ8z5wCMtYgI/mTyFbGKzf99o7L/kZO/bHGEtEL8CgyehGGjbG+kQGGFU dMZ7V3Kuy94+jU+QSp4T0AmaQNjv5n/CxrtAQJj4Xz2/W2YSf5cRSge2PR0e4RGcv20r+3 ldUOB4o4m//2RbymVewvrNlTtJT9cSIHbrAxXpEiogR95eFCGiH4RyXqkyChUUbNN076co QzQBlo33ZFHnA0pH+LASV0o4RcWlAZC30bS+QC0nB6NORA2AxIVS4DtG539+4xRPWN8nRK HLUAF1ckDySRcop7Q7Vkol8lHnmK0TFSLQGC4zJ40Uo5E4SZ33duOfUCKObvFg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698172632; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SB62KzxMad7ApWMnnf0LyI2yBIOxdXQSgPW5O8CSbvw=; b=ICg/knyVpHB/b5kGuVk+xFnnDeTO2cAvmHwMtX/7lVV4dYWmCnXMQGn+U4FMopd+hSUsNz StXAJPiTWbMjzqiVnnPNovI0wHTi2sjiw8nXRP+va5Kdk5swLPQMcRssyYIM5gdNktM3c3 DwYkaxGV2cdnSHsSTWrReU3GgxjpuwNA49aicPApY2fkpRSqK77ve/KMcXfKNNlcwOLSbi 7kqhh41ZCpffIzik1FCeoAwupZfq6Uho3FDBD8y6bpM/iXSdzetJZFCMoZDFdSR4VcLAxE pl3HaJKJ6kD7KbZdbdgPDiVqN2w6ucpQadtN8KxUA2bCTSiLx2X9cqf9tKW/2w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SFLQ040WYzYvK; Tue, 24 Oct 2023 18:37: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 39OIbCI5088790; Tue, 24 Oct 2023 18:37:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39OIbCCs088781; Tue, 24 Oct 2023 18:37:12 GMT (envelope-from git) Date: Tue, 24 Oct 2023 18:37:12 GMT Message-Id: <202310241837.39OIbCCs088781@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: bfa1565246cf - stable/14 - Trim various $FreeBSD$ List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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/stable/14 X-Git-Reftype: branch X-Git-Commit: bfa1565246cf02153749d2635814b03ad5d61d38 Auto-Submitted: auto-generated The branch stable/14 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=bfa1565246cf02153749d2635814b03ad5d61d38 commit bfa1565246cf02153749d2635814b03ad5d61d38 Author: John Baldwin AuthorDate: 2023-10-10 17:34:43 +0000 Commit: John Baldwin CommitDate: 2023-10-24 18:22:23 +0000 Trim various $FreeBSD$ Approved by: markj (cddl/contrib changes) Reviewed by: imp, emaste Differential Revision: https://reviews.freebsd.org/D41961 (cherry picked from commit f53355131f65d64e7643d734dbcd4fb2a5de20ed) --- cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 | 2 -- cddl/contrib/opensolaris/cmd/lockstat/lockstat.1 | 2 -- cddl/usr.sbin/dwatch/dwatch | 1 - include/rpc/rpcb_prot.x | 2 -- lib/ofed/libirdma/Makefile | 2 -- share/man/man4/pcf8591.4 | 2 -- share/vt/keymaps/colemak-dh.acc.kbd | 2 -- stand/kboot/arch/powerpc64/ldscript.powerpc | 2 -- sys/dev/firmware/xilinx/zynqmp_firmware_if.m | 2 -- sys/modules/ath12k/Makefile | 2 -- sys/modules/mt76/mt7996/Makefile | 2 -- tools/tools/editing/freebsd.vim | 2 -- tools/tools/locale/etc/charmaps.xml | 1 - usr.sbin/ypldap/ypldap.c | 1 - 14 files changed, 25 deletions(-) diff --git a/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 b/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 index 42367b99b786..1745519c2c1a 100644 --- a/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 +++ b/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 @@ -18,8 +18,6 @@ .\" CDDL HEADER END .\" Copyright (c) 2006, Sun Microsystems, Inc. All Rights Reserved. .\" -.\" $FreeBSD$ -.\" .Dd February 24, 2023 .Dt DTRACE 1 .Os diff --git a/cddl/contrib/opensolaris/cmd/lockstat/lockstat.1 b/cddl/contrib/opensolaris/cmd/lockstat/lockstat.1 index c649e21bb67e..6c9657fa5406 100644 --- a/cddl/contrib/opensolaris/cmd/lockstat/lockstat.1 +++ b/cddl/contrib/opensolaris/cmd/lockstat/lockstat.1 @@ -19,8 +19,6 @@ .\" CDDL HEADER END .\" Copyright (c) 2008, Sun Microsystems, Inc. All Rights Reserved. .\" -.\" $FreeBSD$ -.\" .Dd February 25, 2020 .Dt LOCKSTAT 1 .Os diff --git a/cddl/usr.sbin/dwatch/dwatch b/cddl/usr.sbin/dwatch/dwatch index 9adde7eb8d49..c9af8258f4ac 100755 --- a/cddl/usr.sbin/dwatch/dwatch +++ b/cddl/usr.sbin/dwatch/dwatch @@ -1327,7 +1327,6 @@ PSARGS_ACTION=$( cat <&9 ) * SUCH DAMAGE. * * $TITLE dtrace(1) script to log process(es) triggering $PROBE $ - * \$FreeBSD$ */ $( echo "$DTRACE_PRAGMA" | awk ' diff --git a/include/rpc/rpcb_prot.x b/include/rpc/rpcb_prot.x index a34bcc12502a..b5de5c6d865d 100644 --- a/include/rpc/rpcb_prot.x +++ b/include/rpc/rpcb_prot.x @@ -1,6 +1,4 @@ %/*- -% * $FreeBSD$ -% * % * Copyright (c) 2009, Sun Microsystems, Inc. % * All rights reserved. % * diff --git a/lib/ofed/libirdma/Makefile b/lib/ofed/libirdma/Makefile index 368bd536c587..349590672b44 100644 --- a/lib/ofed/libirdma/Makefile +++ b/lib/ofed/libirdma/Makefile @@ -1,5 +1,3 @@ -# $FreeBSD: releng/12.1/lib/ofed/libirdma/Makefile 336568 2018-07-20 23:49:57Z kib $ - _spath= ${SRCTOP}/contrib/ofed/libirdma _ipath= ${SRCTOP}/contrib/ofed/include lin_inc=/usr/src/sys/compat/linuxkpi/common/include diff --git a/share/man/man4/pcf8591.4 b/share/man/man4/pcf8591.4 index 6133d6cfa0d8..9acaf6502b38 100644 --- a/share/man/man4/pcf8591.4 +++ b/share/man/man4/pcf8591.4 @@ -24,8 +24,6 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: head/share/man/man4/cp2112.4 364144 2020-08-12 09:42:05Z avg $ -.\" .Dd November 6, 2021 .Dt PCF8591 4 .Os diff --git a/share/vt/keymaps/colemak-dh.acc.kbd b/share/vt/keymaps/colemak-dh.acc.kbd index 82c5faa2c6a6..b3f1b7d5ba83 100644 --- a/share/vt/keymaps/colemak-dh.acc.kbd +++ b/share/vt/keymaps/colemak-dh.acc.kbd @@ -1,5 +1,3 @@ -# $FreeBSD $ -# # Colemak Mod-DH (rev. 2) layout for FreeBSD console # 2006-01-01 Shai Coleman (http://colemak.com/), # 2014-10-27 Steve P (http://colemakmods.github.io/mod-dh/). diff --git a/stand/kboot/arch/powerpc64/ldscript.powerpc b/stand/kboot/arch/powerpc64/ldscript.powerpc index 662871eb7c09..f9fcc37f02d8 100644 --- a/stand/kboot/arch/powerpc64/ldscript.powerpc +++ b/stand/kboot/arch/powerpc64/ldscript.powerpc @@ -1,5 +1,3 @@ -/* $FreeBSD: user/nwhitehorn/kboot/powerpc/kboot/ldscript.powerpc 272888 2014-10-10 06:24:09Z bapt $ */ - OUTPUT_FORMAT("elf32-powerpc-freebsd", "elf32-powerpc-freebsd", "elf32-powerpc-freebsd") OUTPUT_ARCH(powerpc:common) diff --git a/sys/dev/firmware/xilinx/zynqmp_firmware_if.m b/sys/dev/firmware/xilinx/zynqmp_firmware_if.m index 1007d721952d..53b9fa5399bb 100644 --- a/sys/dev/firmware/xilinx/zynqmp_firmware_if.m +++ b/sys/dev/firmware/xilinx/zynqmp_firmware_if.m @@ -23,8 +23,6 @@ # 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. -# -# $FreeBSD$ INTERFACE zynqmp_firmware; diff --git a/sys/modules/ath12k/Makefile b/sys/modules/ath12k/Makefile index e72d061d0c08..674a68e12813 100644 --- a/sys/modules/ath12k/Makefile +++ b/sys/modules/ath12k/Makefile @@ -1,5 +1,3 @@ -# $FreeBSD$ - DEVATH12KDIR= ${SRCTOP}/sys/contrib/dev/athk/ath12k .PATH: ${DEVATH12KDIR} diff --git a/sys/modules/mt76/mt7996/Makefile b/sys/modules/mt76/mt7996/Makefile index 3a4a56d839a5..a43721b6079e 100644 --- a/sys/modules/mt76/mt7996/Makefile +++ b/sys/modules/mt76/mt7996/Makefile @@ -1,5 +1,3 @@ -# $FreeBSD$ - DEVDIR= ${SRCTOP}/sys/contrib/dev/mediatek/mt76/mt7996 .PATH: ${DEVDIR} diff --git a/tools/tools/editing/freebsd.vim b/tools/tools/editing/freebsd.vim index fa7977b30361..e515f81890df 100644 --- a/tools/tools/editing/freebsd.vim +++ b/tools/tools/editing/freebsd.vim @@ -21,8 +21,6 @@ " 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. -" -" $FreeBSD$ " This is a plugin for Vim (tested with Vim v7.1) to follow the FreeBSD style(9) " indentation. It registers a macro (see below) for changing a buffer's diff --git a/tools/tools/locale/etc/charmaps.xml b/tools/tools/locale/etc/charmaps.xml index dcf1644e4371..0193912b9a01 100644 --- a/tools/tools/locale/etc/charmaps.xml +++ b/tools/tools/locale/etc/charmaps.xml @@ -1,4 +1,3 @@ - +[CVE-2023-5363]: https://www.openssl.org/news/vulnerabilities.html#CVE-2023-5363 [CVE-2023-4807]: https://www.openssl.org/news/vulnerabilities.html#CVE-2023-4807 [CVE-2023-3817]: https://www.openssl.org/news/vulnerabilities.html#CVE-2023-3817 [CVE-2023-3446]: https://www.openssl.org/news/vulnerabilities.html#CVE-2023-3446 diff --git a/crypto/openssl/INSTALL.md b/crypto/openssl/INSTALL.md index ad4a51026d7c..fef408e9d1e3 100644 --- a/crypto/openssl/INSTALL.md +++ b/crypto/openssl/INSTALL.md @@ -2,8 +2,8 @@ Build and Install ================= This document describes installation on all supported operating -systems (the Unix/Linux family, including macOS), OpenVMS, -and Windows). +systems: the Unix/Linux family (including macOS), OpenVMS, +and Windows. Table of Contents ================= diff --git a/crypto/openssl/NEWS.md b/crypto/openssl/NEWS.md index f7ca47baff87..8f0d973e057b 100644 --- a/crypto/openssl/NEWS.md +++ b/crypto/openssl/NEWS.md @@ -18,6 +18,11 @@ OpenSSL Releases OpenSSL 3.0 ----------- +### Major changes between OpenSSL 3.0.11 and OpenSSL 3.0.12 [24 Oct 2023] + + * Mitigate incorrect resize handling for symmetric cipher keys and IVs. + ([CVE-2023-5363]) + ### Major changes between OpenSSL 3.0.10 and OpenSSL 3.0.11 [19 Sep 2023] * Fix POLY1305 MAC implementation corrupting XMM registers on Windows @@ -1453,6 +1458,7 @@ OpenSSL 0.9.x +[CVE-2023-5363]: https://www.openssl.org/news/vulnerabilities.html#CVE-2023-5363 [CVE-2023-4807]: https://www.openssl.org/news/vulnerabilities.html#CVE-2023-4807 [CVE-2023-3817]: https://www.openssl.org/news/vulnerabilities.html#CVE-2023-3817 [CVE-2023-3446]: https://www.openssl.org/news/vulnerabilities.html#CVE-2023-3446 diff --git a/crypto/openssl/VERSION.dat b/crypto/openssl/VERSION.dat index c4157a86274d..9d9448118e6d 100644 --- a/crypto/openssl/VERSION.dat +++ b/crypto/openssl/VERSION.dat @@ -1,7 +1,7 @@ MAJOR=3 MINOR=0 -PATCH=11 +PATCH=12 PRE_RELEASE_TAG= BUILD_METADATA= -RELEASE_DATE="19 Sep 2023" +RELEASE_DATE="24 Oct 2023" SHLIB_VERSION=3 diff --git a/crypto/openssl/apps/dgst.c b/crypto/openssl/apps/dgst.c index e12389197de4..3f02af0d5738 100644 --- a/crypto/openssl/apps/dgst.c +++ b/crypto/openssl/apps/dgst.c @@ -320,6 +320,8 @@ int dgst_main(int argc, char **argv) sigkey = app_keygen(mac_ctx, mac_name, 0, 0 /* not verbose */); /* Verbose output would make external-tests gost-engine fail */ EVP_PKEY_CTX_free(mac_ctx); + if (sigkey == NULL) + goto end; } if (hmac_key != NULL) { diff --git a/crypto/openssl/apps/dhparam.c b/crypto/openssl/apps/dhparam.c index 43906cea5649..2a54dca9d8b5 100644 --- a/crypto/openssl/apps/dhparam.c +++ b/crypto/openssl/apps/dhparam.c @@ -1,5 +1,5 @@ /* - * Copyright 1995-2022 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -222,6 +222,8 @@ int dhparam_main(int argc, char **argv) } tmppkey = app_paramgen(ctx, alg); + if (tmppkey == NULL) + goto end; EVP_PKEY_CTX_free(ctx); ctx = NULL; if (dsaparam) { diff --git a/crypto/openssl/apps/dsaparam.c b/crypto/openssl/apps/dsaparam.c index b5555282be6e..ca91beb5b893 100644 --- a/crypto/openssl/apps/dsaparam.c +++ b/crypto/openssl/apps/dsaparam.c @@ -1,5 +1,5 @@ /* - * Copyright 1995-2022 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -218,6 +218,8 @@ int dsaparam_main(int argc, char **argv) goto end; } pkey = app_keygen(ctx, "DSA", numbits, verbose); + if (pkey == NULL) + goto end; assert(private); if (outformat == FORMAT_ASN1) i = i2d_PrivateKey_bio(out, pkey); diff --git a/crypto/openssl/apps/enc.c b/crypto/openssl/apps/enc.c index b3bf4cc2592d..c275046cf57a 100644 --- a/crypto/openssl/apps/enc.c +++ b/crypto/openssl/apps/enc.c @@ -624,7 +624,10 @@ int enc_main(int argc, char **argv) } } if (!BIO_flush(wbio)) { - BIO_printf(bio_err, "bad decrypt\n"); + if (enc) + BIO_printf(bio_err, "bad encrypt\n"); + else + BIO_printf(bio_err, "bad decrypt\n"); goto end; } diff --git a/crypto/openssl/apps/gendsa.c b/crypto/openssl/apps/gendsa.c index 27feb793fed2..8aefca65566c 100644 --- a/crypto/openssl/apps/gendsa.c +++ b/crypto/openssl/apps/gendsa.c @@ -1,5 +1,5 @@ /* - * Copyright 1995-2022 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -146,6 +146,8 @@ int gendsa_main(int argc, char **argv) goto end; } pkey = app_keygen(ctx, "DSA", nbits, verbose); + if (pkey == NULL) + goto end; assert(private); if (!PEM_write_bio_PrivateKey(out, pkey, enc, NULL, 0, NULL, passout)) { diff --git a/crypto/openssl/apps/genpkey.c b/crypto/openssl/apps/genpkey.c index d00754eeaca0..705e5c76b47d 100644 --- a/crypto/openssl/apps/genpkey.c +++ b/crypto/openssl/apps/genpkey.c @@ -1,5 +1,5 @@ /* - * Copyright 2006-2021 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2006-2023 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -183,6 +183,8 @@ int genpkey_main(int argc, char **argv) pkey = do_param ? app_paramgen(ctx, algname) : app_keygen(ctx, algname, 0, 0 /* not verbose */); + if (pkey == NULL) + goto end; if (do_param) { rv = PEM_write_bio_Parameters(out, pkey); diff --git a/crypto/openssl/apps/genrsa.c b/crypto/openssl/apps/genrsa.c index 4436b7fa1745..6a683517a15f 100644 --- a/crypto/openssl/apps/genrsa.c +++ b/crypto/openssl/apps/genrsa.c @@ -1,5 +1,5 @@ /* - * Copyright 1995-2022 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -203,6 +203,8 @@ opthelp: goto end; } pkey = app_keygen(ctx, "RSA", num, verbose); + if (pkey == NULL) + goto end; if (verbose) { BIGNUM *e = NULL; diff --git a/crypto/openssl/apps/lib/apps.c b/crypto/openssl/apps/lib/apps.c index 572f6a3f8f28..a632b0cff2bf 100644 --- a/crypto/openssl/apps/lib/apps.c +++ b/crypto/openssl/apps/lib/apps.c @@ -960,10 +960,14 @@ int load_key_certs_crls_suppress(const char *uri, int format, int maybe_stdin, ctx = OSSL_STORE_open_ex(uri, libctx, propq, get_ui_method(), &uidata, params, NULL, NULL); } - if (ctx == NULL) + if (ctx == NULL) { + BIO_printf(bio_err, "Could not open file or uri for loading"); goto end; - if (expect > 0 && !OSSL_STORE_expect(ctx, expect)) + } + if (expect > 0 && !OSSL_STORE_expect(ctx, expect)) { + BIO_printf(bio_err, "Internal error trying to load"); goto end; + } failed = NULL; while (cnt_expectations > 0 && !OSSL_STORE_eof(ctx)) { @@ -3359,8 +3363,8 @@ EVP_PKEY *app_keygen(EVP_PKEY_CTX *ctx, const char *alg, int bits, int verbose) BIO_printf(bio_err, "Warning: generating random key material may take a long time\n" "if the system has a poor entropy source\n"); if (EVP_PKEY_keygen(ctx, &res) <= 0) - app_bail_out("%s: Error generating %s key\n", opt_getprog(), - alg != NULL ? alg : "asymmetric"); + BIO_printf(bio_err, "%s: Error generating %s key\n", opt_getprog(), + alg != NULL ? alg : "asymmetric"); return res; } @@ -3372,8 +3376,8 @@ EVP_PKEY *app_paramgen(EVP_PKEY_CTX *ctx, const char *alg) BIO_printf(bio_err, "Warning: generating random key parameters may take a long time\n" "if the system has a poor entropy source\n"); if (EVP_PKEY_paramgen(ctx, &res) <= 0) - app_bail_out("%s: Generating %s key parameters failed\n", - opt_getprog(), alg != NULL ? alg : "asymmetric"); + BIO_printf(bio_err, "%s: Generating %s key parameters failed\n", + opt_getprog(), alg != NULL ? alg : "asymmetric"); return res; } diff --git a/crypto/openssl/apps/req.c b/crypto/openssl/apps/req.c index 926f0796bc8f..41191803aef4 100644 --- a/crypto/openssl/apps/req.c +++ b/crypto/openssl/apps/req.c @@ -685,6 +685,8 @@ int req_main(int argc, char **argv) EVP_PKEY_CTX_set_app_data(genctx, bio_err); pkey = app_keygen(genctx, keyalgstr, newkey_len, verbose); + if (pkey == NULL) + goto end; EVP_PKEY_CTX_free(genctx); genctx = NULL; diff --git a/crypto/openssl/apps/speed.c b/crypto/openssl/apps/speed.c index f30435704d19..1113d775b8ab 100644 --- a/crypto/openssl/apps/speed.c +++ b/crypto/openssl/apps/speed.c @@ -3700,7 +3700,8 @@ static void multiblock_speed(const EVP_CIPHER *evp_cipher, int lengths_single, } else { int pad; - RAND_bytes(out, 16); + if (RAND_bytes(inp, 16) <= 0) + app_bail_out("error setting random bytes\n"); len += 16; aad[11] = (unsigned char)(len >> 8); aad[12] = (unsigned char)(len); diff --git a/crypto/openssl/crypto/aes/asm/aesv8-armx.pl b/crypto/openssl/crypto/aes/asm/aesv8-armx.pl index 544dc7e8effe..d0e0be6187bd 100755 --- a/crypto/openssl/crypto/aes/asm/aesv8-armx.pl +++ b/crypto/openssl/crypto/aes/asm/aesv8-armx.pl @@ -3661,6 +3661,9 @@ if ($flavour =~ /64/) { ######## 64-bit code s/\.[ui]?64//o and s/\.16b/\.2d/go; s/\.[42]([sd])\[([0-3])\]/\.$1\[$2\]/o; + # Switch preprocessor checks to aarch64 versions. + s/__ARME([BL])__/__AARCH64E$1__/go; + print $_,"\n"; } } else { ######## 32-bit code diff --git a/crypto/openssl/crypto/arm_arch.h b/crypto/openssl/crypto/arm_arch.h index 45d7e1556475..ec4a087fede2 100644 --- a/crypto/openssl/crypto/arm_arch.h +++ b/crypto/openssl/crypto/arm_arch.h @@ -1,5 +1,5 @@ /* - * Copyright 2011-2022 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2011-2023 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -21,11 +21,6 @@ # elif defined(__GNUC__) # if defined(__aarch64__) # define __ARM_ARCH__ 8 -# if __BYTE_ORDER__==__ORDER_BIG_ENDIAN__ -# define __ARMEB__ -# else -# define __ARMEL__ -# endif /* * Why doesn't gcc define __ARM_ARCH__? Instead it defines * bunch of below macros. See all_architectures[] table in diff --git a/crypto/openssl/crypto/bn/bn_gcd.c b/crypto/openssl/crypto/bn/bn_gcd.c index 59d024f674eb..cd0b0151ec7e 100644 --- a/crypto/openssl/crypto/bn/bn_gcd.c +++ b/crypto/openssl/crypto/bn/bn_gcd.c @@ -1,5 +1,5 @@ /* - * Copyright 1995-2022 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -611,9 +611,9 @@ int BN_gcd(BIGNUM *r, const BIGNUM *in_a, const BIGNUM *in_b, BN_CTX *ctx) for (i = 0; i < m; i++) { /* conditionally flip signs if delta is positive and g is odd */ - cond = (-delta >> (8 * sizeof(delta) - 1)) & g->d[0] & 1 + cond = ((unsigned int)-delta >> (8 * sizeof(delta) - 1)) & g->d[0] & 1 /* make sure g->top > 0 (i.e. if top == 0 then g == 0 always) */ - & (~((g->top - 1) >> (sizeof(g->top) * 8 - 1))); + & (~((unsigned int)(g->top - 1) >> (sizeof(g->top) * 8 - 1))); delta = (-cond & -delta) | ((cond - 1) & delta); r->neg ^= cond; /* swap */ @@ -625,7 +625,7 @@ int BN_gcd(BIGNUM *r, const BIGNUM *in_a, const BIGNUM *in_b, BN_CTX *ctx) goto err; BN_consttime_swap(g->d[0] & 1 /* g is odd */ /* make sure g->top > 0 (i.e. if top == 0 then g == 0 always) */ - & (~((g->top - 1) >> (sizeof(g->top) * 8 - 1))), + & (~((unsigned int)(g->top - 1) >> (sizeof(g->top) * 8 - 1))), g, temp, top); if (!BN_rshift1(g, g)) goto err; diff --git a/crypto/openssl/crypto/build.info b/crypto/openssl/crypto/build.info index b90390ae864c..c04db5591120 100644 --- a/crypto/openssl/crypto/build.info +++ b/crypto/openssl/crypto/build.info @@ -97,8 +97,6 @@ $UTIL_COMMON=\ context.c sparse_array.c asn1_dsa.c packet.c param_build.c \ param_build_set.c der_writer.c threads_lib.c params_dup.c -SHARED_SOURCE[../libssl]=sparse_array.c - SOURCE[../libcrypto]=$UTIL_COMMON \ mem.c mem_sec.c \ cversion.c info.c cpt_err.c ebcdic.c uid.c o_time.c o_dir.c \ diff --git a/crypto/openssl/crypto/cms/cms_enc.c b/crypto/openssl/crypto/cms/cms_enc.c index f7007c12319e..ae88df33a7f0 100644 --- a/crypto/openssl/crypto/cms/cms_enc.c +++ b/crypto/openssl/crypto/cms/cms_enc.c @@ -1,5 +1,5 @@ /* - * Copyright 2008-2022 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2008-2023 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -15,6 +15,7 @@ #include #include #include "crypto/evp.h" +#include "crypto/asn1.h" #include "cms_local.h" /* CMS EncryptedData Utilities */ @@ -81,7 +82,7 @@ BIO *ossl_cms_EncryptedContent_init_bio(CMS_EncryptedContentInfo *ec, if (enc) { calg->algorithm = OBJ_nid2obj(EVP_CIPHER_CTX_get_type(ctx)); - if (calg->algorithm == NULL) { + if (calg->algorithm == NULL || calg->algorithm->nid == NID_undef) { ERR_raise(ERR_LIB_CMS, CMS_R_UNSUPPORTED_CONTENT_ENCRYPTION_ALGORITHM); goto err; } diff --git a/crypto/openssl/crypto/cms/cms_err.c b/crypto/openssl/crypto/cms/cms_err.c index dcbea201c8e5..4bd6a0dc1bf1 100644 --- a/crypto/openssl/crypto/cms/cms_err.c +++ b/crypto/openssl/crypto/cms/cms_err.c @@ -1,6 +1,6 @@ /* * Generated by util/mkerr.pl DO NOT EDIT - * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -154,6 +154,8 @@ static const ERR_STRING_DATA CMS_str_reasons[] = { "unsupported recipientinfo type"}, {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_UNSUPPORTED_RECIPIENT_TYPE), "unsupported recipient type"}, + {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_UNSUPPORTED_SIGNATURE_ALGORITHM), + "unsupported signature algorithm"}, {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_UNSUPPORTED_TYPE), "unsupported type"}, {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_UNWRAP_ERROR), "unwrap error"}, {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_UNWRAP_FAILURE), "unwrap failure"}, diff --git a/crypto/openssl/crypto/cms/cms_sd.c b/crypto/openssl/crypto/cms/cms_sd.c index 53c8e378f318..2093657a2a4a 100644 --- a/crypto/openssl/crypto/cms/cms_sd.c +++ b/crypto/openssl/crypto/cms/cms_sd.c @@ -354,11 +354,16 @@ CMS_SignerInfo *CMS_add1_signer(CMS_ContentInfo *cms, if (md == NULL) { int def_nid; - if (EVP_PKEY_get_default_digest_nid(pk, &def_nid) <= 0) + + if (EVP_PKEY_get_default_digest_nid(pk, &def_nid) <= 0) { + ERR_raise_data(ERR_LIB_CMS, CMS_R_NO_DEFAULT_DIGEST, + "pkey nid=%d", EVP_PKEY_get_id(pk)); goto err; + } md = EVP_get_digestbynid(def_nid); if (md == NULL) { - ERR_raise(ERR_LIB_CMS, CMS_R_NO_DEFAULT_DIGEST); + ERR_raise_data(ERR_LIB_CMS, CMS_R_NO_DEFAULT_DIGEST, + "default md nid=%d", def_nid); goto err; } } @@ -398,8 +403,11 @@ CMS_SignerInfo *CMS_add1_signer(CMS_ContentInfo *cms, } } - if (!(flags & CMS_KEY_PARAM) && !cms_sd_asn1_ctrl(si, 0)) + if (!(flags & CMS_KEY_PARAM) && !cms_sd_asn1_ctrl(si, 0)) { + ERR_raise_data(ERR_LIB_CMS, CMS_R_UNSUPPORTED_SIGNATURE_ALGORITHM, + "pkey nid=%d", EVP_PKEY_get_id(pk)); goto err; + } if (!(flags & CMS_NOATTR)) { /* * Initialize signed attributes structure so other attributes diff --git a/crypto/openssl/crypto/dh/dh_check.c b/crypto/openssl/crypto/dh/dh_check.c index f4173e21371e..7ba2beae7fd6 100644 --- a/crypto/openssl/crypto/dh/dh_check.c +++ b/crypto/openssl/crypto/dh/dh_check.c @@ -259,7 +259,8 @@ int DH_check_pub_key(const DH *dh, const BIGNUM *pub_key, int *ret) */ int ossl_dh_check_pub_key_partial(const DH *dh, const BIGNUM *pub_key, int *ret) { - return ossl_ffc_validate_public_key_partial(&dh->params, pub_key, ret); + return ossl_ffc_validate_public_key_partial(&dh->params, pub_key, ret) + && *ret == 0; } int ossl_dh_check_priv_key(const DH *dh, const BIGNUM *priv_key, int *ret) diff --git a/crypto/openssl/crypto/dh/dh_key.c b/crypto/openssl/crypto/dh/dh_key.c index 4e9705beef73..d84ea99241b9 100644 --- a/crypto/openssl/crypto/dh/dh_key.c +++ b/crypto/openssl/crypto/dh/dh_key.c @@ -1,5 +1,5 @@ /* - * Copyright 1995-2022 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -190,7 +190,6 @@ static int dh_bn_mod_exp(const DH *dh, BIGNUM *r, static int dh_init(DH *dh) { dh->flags |= DH_FLAG_CACHE_MONT_P; - ossl_ffc_params_init(&dh->params); dh->dirty_cnt++; return 1; } diff --git a/crypto/openssl/crypto/dh/dh_lib.c b/crypto/openssl/crypto/dh/dh_lib.c index 29cda5d7bfa8..5577413e1e0c 100644 --- a/crypto/openssl/crypto/dh/dh_lib.c +++ b/crypto/openssl/crypto/dh/dh_lib.c @@ -1,5 +1,5 @@ /* - * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -116,6 +116,8 @@ static DH *dh_new_intern(ENGINE *engine, OSSL_LIB_CTX *libctx) goto err; #endif /* FIPS_MODULE */ + ossl_ffc_params_init(&ret->params); + if ((ret->meth->init != NULL) && !ret->meth->init(ret)) { ERR_raise(ERR_LIB_DH, ERR_R_INIT_FAIL); goto err; diff --git a/crypto/openssl/crypto/dsa/dsa_check.c b/crypto/openssl/crypto/dsa/dsa_check.c index 7ee914a477ec..fb0e9129a295 100644 --- a/crypto/openssl/crypto/dsa/dsa_check.c +++ b/crypto/openssl/crypto/dsa/dsa_check.c @@ -1,5 +1,5 @@ /* - * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -39,7 +39,8 @@ int ossl_dsa_check_params(const DSA *dsa, int checktype, int *ret) */ int ossl_dsa_check_pub_key(const DSA *dsa, const BIGNUM *pub_key, int *ret) { - return ossl_ffc_validate_public_key(&dsa->params, pub_key, ret); + return ossl_ffc_validate_public_key(&dsa->params, pub_key, ret) + && *ret == 0; } /* @@ -49,7 +50,8 @@ int ossl_dsa_check_pub_key(const DSA *dsa, const BIGNUM *pub_key, int *ret) */ int ossl_dsa_check_pub_key_partial(const DSA *dsa, const BIGNUM *pub_key, int *ret) { - return ossl_ffc_validate_public_key_partial(&dsa->params, pub_key, ret); + return ossl_ffc_validate_public_key_partial(&dsa->params, pub_key, ret) + && *ret == 0; } int ossl_dsa_check_priv_key(const DSA *dsa, const BIGNUM *priv_key, int *ret) diff --git a/crypto/openssl/crypto/dsa/dsa_lib.c b/crypto/openssl/crypto/dsa/dsa_lib.c index ccc701659217..2ae3f8e36b26 100644 --- a/crypto/openssl/crypto/dsa/dsa_lib.c +++ b/crypto/openssl/crypto/dsa/dsa_lib.c @@ -1,5 +1,5 @@ /* - * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -176,6 +176,8 @@ static DSA *dsa_new_intern(ENGINE *engine, OSSL_LIB_CTX *libctx) goto err; #endif + ossl_ffc_params_init(&ret->params); + if ((ret->meth->init != NULL) && !ret->meth->init(ret)) { ERR_raise(ERR_LIB_DSA, ERR_R_INIT_FAIL); goto err; diff --git a/crypto/openssl/crypto/dsa/dsa_ossl.c b/crypto/openssl/crypto/dsa/dsa_ossl.c index 62f7c70149f4..8fd66a950e37 100644 --- a/crypto/openssl/crypto/dsa/dsa_ossl.c +++ b/crypto/openssl/crypto/dsa/dsa_ossl.c @@ -441,7 +441,6 @@ static int dsa_do_verify(const unsigned char *dgst, int dgst_len, static int dsa_init(DSA *dsa) { dsa->flags |= DSA_FLAG_CACHE_MONT_P; - ossl_ffc_params_init(&dsa->params); dsa->dirty_cnt++; return 1; } diff --git a/crypto/openssl/crypto/engine/eng_pkey.c b/crypto/openssl/crypto/engine/eng_pkey.c index 6e6d6df35b2b..f84fcde46016 100644 --- a/crypto/openssl/crypto/engine/eng_pkey.c +++ b/crypto/openssl/crypto/engine/eng_pkey.c @@ -1,5 +1,5 @@ /* - * Copyright 2001-2021 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2001-2023 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -79,6 +79,48 @@ EVP_PKEY *ENGINE_load_private_key(ENGINE *e, const char *key_id, ERR_raise(ERR_LIB_ENGINE, ENGINE_R_FAILED_LOADING_PRIVATE_KEY); return NULL; } + /* We enforce check for legacy key */ + switch (EVP_PKEY_get_id(pkey)) { + case EVP_PKEY_RSA: + { + RSA *rsa = EVP_PKEY_get1_RSA(pkey); + EVP_PKEY_set1_RSA(pkey, rsa); + RSA_free(rsa); + } + break; +# ifndef OPENSSL_NO_EC + case EVP_PKEY_SM2: + case EVP_PKEY_EC: + { + EC_KEY *ec = EVP_PKEY_get1_EC_KEY(pkey); + EVP_PKEY_set1_EC_KEY(pkey, ec); + EC_KEY_free(ec); + } + break; +# endif +# ifndef OPENSSL_NO_DSA + case EVP_PKEY_DSA: + { + DSA *dsa = EVP_PKEY_get1_DSA(pkey); + EVP_PKEY_set1_DSA(pkey, dsa); + DSA_free(dsa); + } + break; +#endif +# ifndef OPENSSL_NO_DH + case EVP_PKEY_DH: + { + DH *dh = EVP_PKEY_get1_DH(pkey); + EVP_PKEY_set1_DH(pkey, dh); + DH_free(dh); + } + break; +#endif + default: + /*Do nothing */ + break; + } + return pkey; } diff --git a/crypto/openssl/crypto/engine/eng_table.c b/crypto/openssl/crypto/engine/eng_table.c index 3138a1526002..9dc3144bbfd7 100644 --- a/crypto/openssl/crypto/engine/eng_table.c +++ b/crypto/openssl/crypto/engine/eng_table.c @@ -97,6 +97,7 @@ int engine_table_register(ENGINE_TABLE **table, ENGINE_CLEANUP_CB *cleanup, if (added && !engine_cleanup_add_first(cleanup)) { lh_ENGINE_PILE_free(&(*table)->piles); *table = NULL; + goto end; } while (num_nids--) { tmplate.nid = *nids; diff --git a/crypto/openssl/crypto/err/openssl.txt b/crypto/openssl/crypto/err/openssl.txt index a6f61ca3b02f..e51504b7abd5 100644 --- a/crypto/openssl/crypto/err/openssl.txt +++ b/crypto/openssl/crypto/err/openssl.txt @@ -375,6 +375,7 @@ CMS_R_UNSUPPORTED_KEY_ENCRYPTION_ALGORITHM:179:\ CMS_R_UNSUPPORTED_LABEL_SOURCE:193:unsupported label source CMS_R_UNSUPPORTED_RECIPIENTINFO_TYPE:155:unsupported recipientinfo type CMS_R_UNSUPPORTED_RECIPIENT_TYPE:154:unsupported recipient type +CMS_R_UNSUPPORTED_SIGNATURE_ALGORITHM:195:unsupported signature algorithm CMS_R_UNSUPPORTED_TYPE:156:unsupported type CMS_R_UNWRAP_ERROR:157:unwrap error CMS_R_UNWRAP_FAILURE:180:unwrap failure diff --git a/crypto/openssl/crypto/evp/evp_enc.c b/crypto/openssl/crypto/evp/evp_enc.c index b178d1086473..4e6f83e3d0a9 100644 --- a/crypto/openssl/crypto/evp/evp_enc.c +++ b/crypto/openssl/crypto/evp/evp_enc.c @@ -1,5 +1,5 @@ /* - * Copyright 1995-2022 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -192,7 +192,12 @@ static int evp_cipher_init_internal(EVP_CIPHER_CTX *ctx, #endif } - if (cipher->prov != NULL) { + if (!ossl_assert(cipher->prov != NULL)) { + ERR_raise(ERR_LIB_EVP, EVP_R_INITIALIZATION_ERROR); + return 0; + } + + if (cipher != ctx->fetched_cipher) { if (!EVP_CIPHER_up_ref((EVP_CIPHER *)cipher)) { ERR_raise(ERR_LIB_EVP, EVP_R_INITIALIZATION_ERROR); return 0; @@ -218,6 +223,42 @@ static int evp_cipher_init_internal(EVP_CIPHER_CTX *ctx, return 0; } +#ifndef FIPS_MODULE + /* + * Fix for CVE-2023-5363 + * Passing in a size as part of the init call takes effect late + * so, force such to occur before the initialisation. + * + * The FIPS provider's internal library context is used in a manner + * such that this is not an issue. + */ + if (params != NULL) { + OSSL_PARAM param_lens[3] = { OSSL_PARAM_END, OSSL_PARAM_END, + OSSL_PARAM_END }; + OSSL_PARAM *q = param_lens; + const OSSL_PARAM *p; + + p = OSSL_PARAM_locate_const(params, OSSL_CIPHER_PARAM_KEYLEN); + if (p != NULL) + memcpy(q++, p, sizeof(*q)); + + /* + * Note that OSSL_CIPHER_PARAM_AEAD_IVLEN is a synomym for + * OSSL_CIPHER_PARAM_IVLEN so both are covered here. + */ + p = OSSL_PARAM_locate_const(params, OSSL_CIPHER_PARAM_IVLEN); + if (p != NULL) + memcpy(q++, p, sizeof(*q)); + + if (q != param_lens) { + if (!EVP_CIPHER_CTX_set_params(ctx, param_lens)) { + ERR_raise(ERR_LIB_EVP, EVP_R_INVALID_LENGTH); + return 0; + } + } + } +#endif + if (enc) { if (ctx->cipher->einit == NULL) { ERR_raise(ERR_LIB_EVP, EVP_R_INITIALIZATION_ERROR); diff --git a/crypto/openssl/crypto/evp/legacy_sha.c b/crypto/openssl/crypto/evp/legacy_sha.c index 3859286eeb20..ca9a3264978a 100644 --- a/crypto/openssl/crypto/evp/legacy_sha.c +++ b/crypto/openssl/crypto/evp/legacy_sha.c @@ -1,5 +1,5 @@ /* - * Copyright 2019-2021 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2019-2023 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -71,7 +71,11 @@ static int sha1_int_ctrl(EVP_MD_CTX *ctx, int cmd, int p1, void *p2) static int shake_ctrl(EVP_MD_CTX *evp_ctx, int cmd, int p1, void *p2) { - KECCAK1600_CTX *ctx = evp_ctx->md_data; + KECCAK1600_CTX *ctx; + + if (evp_ctx == NULL) + return 0; + ctx = evp_ctx->md_data; switch (cmd) { case EVP_MD_CTRL_XOF_LEN: diff --git a/crypto/openssl/crypto/evp/p_lib.c b/crypto/openssl/crypto/evp/p_lib.c index 59a7a867ecbb..04b148a91218 100644 --- a/crypto/openssl/crypto/evp/p_lib.c +++ b/crypto/openssl/crypto/evp/p_lib.c @@ -1201,7 +1201,7 @@ int EVP_PKEY_print_public(BIO *out, const EVP_PKEY *pkey, int EVP_PKEY_print_private(BIO *out, const EVP_PKEY *pkey, int indent, ASN1_PCTX *pctx) { - return print_pkey(pkey, out, indent, EVP_PKEY_KEYPAIR, NULL, + return print_pkey(pkey, out, indent, EVP_PKEY_PRIVATE_KEY, NULL, (pkey->ameth != NULL ? pkey->ameth->priv_print : NULL), pctx); } diff --git a/crypto/openssl/crypto/evp/pmeth_lib.c b/crypto/openssl/crypto/evp/pmeth_lib.c index ce6e1a1ccbd5..ba1971ce461d 100644 --- a/crypto/openssl/crypto/evp/pmeth_lib.c +++ b/crypto/openssl/crypto/evp/pmeth_lib.c @@ -251,10 +251,11 @@ static EVP_PKEY_CTX *int_ctx_new(OSSL_LIB_CTX *libctx, */ if (e != NULL) pmeth = ENGINE_get_pkey_meth(e, id); - else if (pkey != NULL && pkey->foreign) + else +# endif /* OPENSSL_NO_ENGINE */ + if (pkey != NULL && pkey->foreign) pmeth = EVP_PKEY_meth_find(id); else -# endif app_pmeth = pmeth = evp_pkey_meth_find_added_by_application(id); /* END legacy */ diff --git a/crypto/openssl/crypto/ex_data.c b/crypto/openssl/crypto/ex_data.c index 40223f06e4ec..13b928899456 100644 --- a/crypto/openssl/crypto/ex_data.c +++ b/crypto/openssl/crypto/ex_data.c @@ -1,5 +1,5 @@ /* - * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -163,6 +163,8 @@ int ossl_crypto_get_ex_new_index_ex(OSSL_LIB_CTX *ctx, int class_index, * "app_data" routines use ex_data index zero. See RT 3710. */ if (ip->meth == NULL || !sk_EX_CALLBACK_push(ip->meth, NULL)) { + sk_EX_CALLBACK_free(ip->meth); + ip->meth = NULL; ERR_raise(ERR_LIB_CRYPTO, ERR_R_MALLOC_FAILURE); goto err; } diff --git a/crypto/openssl/crypto/ffc/ffc_key_validate.c b/crypto/openssl/crypto/ffc/ffc_key_validate.c index 342789621d6d..a4a2a58e9a7f 100644 --- a/crypto/openssl/crypto/ffc/ffc_key_validate.c +++ b/crypto/openssl/crypto/ffc/ffc_key_validate.c @@ -26,7 +26,7 @@ int ossl_ffc_validate_public_key_partial(const FFC_PARAMS *params, *ret = 0; if (params == NULL || pub_key == NULL || params->p == NULL) { *ret = FFC_ERROR_PASSED_NULL_PARAM; - return 0; + return 1; } ctx = BN_CTX_new_ex(NULL); @@ -39,18 +39,14 @@ int ossl_ffc_validate_public_key_partial(const FFC_PARAMS *params, if (tmp == NULL || !BN_set_word(tmp, 1)) goto err; - if (BN_cmp(pub_key, tmp) <= 0) { + if (BN_cmp(pub_key, tmp) <= 0) *ret |= FFC_ERROR_PUBKEY_TOO_SMALL; - goto err; - } /* Step(1): Verify pub_key <= p-2 */ if (BN_copy(tmp, params->p) == NULL || !BN_sub_word(tmp, 1)) goto err; - if (BN_cmp(pub_key, tmp) >= 0) { + if (BN_cmp(pub_key, tmp) >= 0) *ret |= FFC_ERROR_PUBKEY_TOO_LARGE; - goto err; - } ok = 1; err: if (ctx != NULL) { @@ -73,7 +69,7 @@ int ossl_ffc_validate_public_key(const FFC_PARAMS *params, if (!ossl_ffc_validate_public_key_partial(params, pub_key, ret)) return 0; - if (params->q != NULL) { + if (*ret == 0 && params->q != NULL) { ctx = BN_CTX_new_ex(NULL); if (ctx == NULL) goto err; @@ -84,10 +80,8 @@ int ossl_ffc_validate_public_key(const FFC_PARAMS *params, if (tmp == NULL || !BN_mod_exp(tmp, pub_key, params->q, params->p, ctx)) goto err; - if (!BN_is_one(tmp)) { + if (!BN_is_one(tmp)) *ret |= FFC_ERROR_PUBKEY_INVALID; - goto err; - } } ok = 1; diff --git a/crypto/openssl/crypto/lhash/lhash.c b/crypto/openssl/crypto/lhash/lhash.c index 1cd988f01fc7..a01cfa725e38 100644 --- a/crypto/openssl/crypto/lhash/lhash.c +++ b/crypto/openssl/crypto/lhash/lhash.c @@ -1,5 +1,5 @@ /* - * Copyright 1995-2022 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -266,12 +266,12 @@ static void contract(OPENSSL_LHASH *lh) if (n == NULL) { /* fputs("realloc error in lhash",stderr); */ lh->error++; - return; + } else { + lh->b = n; } lh->num_alloc_nodes /= 2; lh->pmax /= 2; lh->p = lh->pmax - 1; - lh->b = n; } else *** 1726 LINES SKIPPED *** From nobody Wed Oct 25 22:38:31 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SG3jz55rrz4y7x8; Wed, 25 Oct 2023 22:38: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 4SG3jz4bBKz4DwL; Wed, 25 Oct 2023 22:38:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698273511; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4NLPWV2PkSs5Ky+jo0jDqPZpfI05kF3pp3i+yucQKtU=; b=GVdUstmFqLTFbIYq5SIJodmyykX6BKFPITsUPpepubAk2k6HLLobowbXxmpYdK9iMn030V iJ1075oW625HqudXiYtJpfExPwJ+PsJlyDJZZVttLKfBvOceRrKbf91fEuI95G5yR/aMWO yQXNYv+D3GyfkQN2Ybh1reTLDmlFT/6nL1uebgcLoCoOz+ysM1uLLqFSnWqDnfQy7nPhdq zC79/BObI9SJQPvsUwFzmCJjN6T8gujUics5X9+yLl2NeAb/PdJiOluPPuWOLD2ECSbWXA cr/pOG6Vv1/wfi44bOVkeLs2x0ez4ry+kCa8mN9o4+HYB8CGEwyxQUbOw3ltHw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698273511; a=rsa-sha256; cv=none; b=epMxjF6E7xpiLHOPo4Q9aJMFzwQoHEbDcb7V1N50joCSSdFTTvXz6QyEFWBJ7/1xVkYm4W glultkn5c0yvu68rf0xmfyZA4XW3c20E0UPySbVyIBYqkjgVK+xC3mxEzI/WyuKAlaT9CD d459L8yOLITR4lKPyzCG3UFQ7RmFlj+v5lfcKlT5GWaXR1GyyI90UHuDckbEoXJ0L3WR4W bYahIAd0sEKCn8LfhbVolOZWw7qGqR/wpfM8IxO9lADtykxDulKsnMlo9PKoueKJkAdvdV 3wQugTT+QFKB7L8aucgW/HTx5UdeI7CoymhhD/v7kXINdMZVvrp4UcG/vLeHfQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698273511; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4NLPWV2PkSs5Ky+jo0jDqPZpfI05kF3pp3i+yucQKtU=; b=mVgndDGWzsTc3c2qkGeSldRbDqRIlG++LYbIRS1zS9LiTe+fY1x3WeYJLRznElsPewIJmX tzg2lZkmUBLIVHV0WwGYvdNBjdkyIKdbcCVKjfg0zoPmOUb+CJRsnuhaCH32Z6yAjRZ+WV oxXGanJ32EGG3YnXZM41pMB9fPNG/pxQQYOUA6fnG8qer3UROaSMx9ui36MTzo/TSMvBdl YLhXSPSKh++5YW+QvHcA6qom1uGP8kBnFqi4DdwswWol5QALdBGyplZiVvED4edsURiLJz 46Wt1xEryIv3/jrFhpyc6RgmqsiiRCG0/vMUGYRI5ibNu9YXWiSmdRyB1Yl13A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SG3jz3YLQz1M91; Wed, 25 Oct 2023 22:38: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 39PMcVM2090260; Wed, 25 Oct 2023 22:38:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39PMcVYQ090257; Wed, 25 Oct 2023 22:38:31 GMT (envelope-from git) Date: Wed, 25 Oct 2023 22:38:31 GMT Message-Id: <202310252238.39PMcVYQ090257@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kirk McKusick Subject: git: d3a36e4b7459 - main - Delete snapshot after opening it when running fsck_ffs(9) in background. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mckusick X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d3a36e4b7459b2d62c4cd50de7a8e3195d7241c7 Auto-Submitted: auto-generated The branch main has been updated by mckusick: URL: https://cgit.FreeBSD.org/src/commit/?id=d3a36e4b7459b2d62c4cd50de7a8e3195d7241c7 commit d3a36e4b7459b2d62c4cd50de7a8e3195d7241c7 Author: Kirk McKusick AuthorDate: 2023-10-25 22:36:45 +0000 Commit: Kirk McKusick CommitDate: 2023-10-25 22:38:11 +0000 Delete snapshot after opening it when running fsck_ffs(9) in background. When fsck_ffs(8) runs in background, it creates a snapshot named fsck_snapshot in the filesystem's .snap directory. The fsck_snapshot file was removed when the background fsck finished. If the system crashed or the fsck exited unexpectedly, the fsck_snapshot file would remain. The snapshot would consume ever more space as the filesystem changed over time until it was removed by a system administrator or a future run of background fsck removed it to create a new snapshot file. This commit unlinks the .snap/fsck_snapshot file immediately after opening it so that it will be reclaimed when fsck closes it at the conclusion of its run. After a system crash, it will be removed as part of the filesystem cleanup because of its zero reference count. As only a few milliseconds pass between its creation and unlinking, there is far less opportunity for it to be accidentally left behind. PR: 106107 MFC-after: 1 week --- sbin/fsck_ffs/fsck.h | 1 - sbin/fsck_ffs/fsutil.c | 1 - sbin/fsck_ffs/globs.c | 2 -- sbin/fsck_ffs/main.c | 8 +++++--- sbin/fsck_ffs/setup.c | 8 ++++---- 5 files changed, 9 insertions(+), 11 deletions(-) diff --git a/sbin/fsck_ffs/fsck.h b/sbin/fsck_ffs/fsck.h index 1864ea19f4ca..3b795783f39c 100644 --- a/sbin/fsck_ffs/fsck.h +++ b/sbin/fsck_ffs/fsck.h @@ -376,7 +376,6 @@ extern long secsize; /* actual disk sector size */ extern char skipclean; /* skip clean file systems if preening */ extern int snapcnt; /* number of active snapshots */ extern struct inode snaplist[FSMAXSNAP + 1]; /* list of active snapshots */ -extern char snapname[BUFSIZ]; /* when doing snapshots, the name of the file */ extern int sujrecovery; /* 1 => doing check using the journal */ extern int surrender; /* Give up if reads fail */ extern char usedsoftdep; /* just fix soft dependency inconsistencies */ diff --git a/sbin/fsck_ffs/fsutil.c b/sbin/fsck_ffs/fsutil.c index 5cf17e22fe80..2583e324e94c 100644 --- a/sbin/fsck_ffs/fsutil.c +++ b/sbin/fsck_ffs/fsutil.c @@ -616,7 +616,6 @@ ckfini(int markclean) int ofsmodified, cnt, cg; if (bkgrdflag) { - unlink(snapname); if ((!(sblock.fs_flags & FS_UNCLEAN)) != markclean) { cmd.value = FS_UNCLEAN; cmd.size = markclean ? -1 : 1; diff --git a/sbin/fsck_ffs/globs.c b/sbin/fsck_ffs/globs.c index 038fc3475742..b004dd7d48b7 100644 --- a/sbin/fsck_ffs/globs.c +++ b/sbin/fsck_ffs/globs.c @@ -71,7 +71,6 @@ int freefiles[MIBSIZE]; /* MIB cmd to free a set of files */ int freedirs[MIBSIZE]; /* MIB cmd to free a set of directories */ int freeblks[MIBSIZE]; /* MIB cmd to free a set of data blocks */ struct fsck_cmd cmd; /* sysctl file system update commands */ -char snapname[BUFSIZ]; /* when doing snapshots, the name of the file */ char *cdevname; /* name of device being checked */ long dev_bsize; /* computed value of DEV_BSIZE */ long secsize; /* actual disk sector size */ @@ -144,7 +143,6 @@ fsckinit(void) bzero(freedirs, sizeof(int) * MIBSIZE); bzero(freeblks, sizeof(int) * MIBSIZE); bzero(&cmd, sizeof(struct fsck_cmd)); - bzero(snapname, sizeof(char) * BUFSIZ); cdevname = NULL; dev_bsize = 0; secsize = 0; diff --git a/sbin/fsck_ffs/main.c b/sbin/fsck_ffs/main.c index 58e184f3581f..ee39760f4dd2 100644 --- a/sbin/fsck_ffs/main.c +++ b/sbin/fsck_ffs/main.c @@ -68,7 +68,8 @@ static char sccsid[] = "@(#)main.c 8.6 (Berkeley) 5/14/95"; #include "fsck.h" -static int restarts; +static int restarts; +static char snapname[BUFSIZ]; /* when doing snapshots, the name of the file */ static void usage(void) __dead2; static intmax_t argtoimax(int flag, const char *req, const char *str, int base); @@ -664,8 +665,7 @@ setup_bkgrdchk(struct statfs *mntp, int sbreadfailed, char **filesys) "SUPPORT\n"); } /* Find or create the snapshot directory */ - snprintf(snapname, sizeof snapname, "%s/.snap", - mntp->f_mntonname); + snprintf(snapname, sizeof snapname, "%s/.snap", mntp->f_mntonname); if (stat(snapname, &snapdir) < 0) { if (errno != ENOENT) { pwarn("CANNOT FIND SNAPSHOT DIRECTORY %s: %s, CANNOT " @@ -713,6 +713,8 @@ setup_bkgrdchk(struct statfs *mntp, int sbreadfailed, char **filesys) "BACKGROUND\n", snapname, strerror(errno)); return (0); } + /* Immediately unlink snapshot so that it will be deleted when closed */ + unlink(snapname); free(sblock.fs_csp); free(sblock.fs_si); if (readsb() == 0) { diff --git a/sbin/fsck_ffs/setup.c b/sbin/fsck_ffs/setup.c index d1d09d07b43a..c9aa19c7eded 100644 --- a/sbin/fsck_ffs/setup.c +++ b/sbin/fsck_ffs/setup.c @@ -380,14 +380,14 @@ openfilesys(char *dev) if ((statb.st_mode & S_IFMT) != S_IFCHR && (statb.st_mode & S_IFMT) != S_IFBLK) { if (bkgrdflag != 0 && (statb.st_flags & SF_SNAPSHOT) == 0) { - pfatal("BACKGROUND FSCK LACKS A SNAPSHOT\n"); - exit(EEXIT); + pwarn("BACKGROUND FSCK LACKS A SNAPSHOT\n"); + return (0); } if (bkgrdflag != 0) { cursnapshot = statb.st_ino; } else { - pfatal("%s IS NOT A DISK DEVICE\n", dev); - if (reply("CONTINUE") == 0) + pwarn("%s IS NOT A DISK DEVICE\n", dev); + if (preen || reply("CONTINUE") == 0) return (0); } } From nobody Thu Oct 26 03:52:19 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SGBh35twHz4ySF9; Thu, 26 Oct 2023 03:52: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 4SGBh35S38z4grK; Thu, 26 Oct 2023 03:52:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698292339; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=n5ddSW1M1v0Ah2juyRu0qW+0ElWNe8284a5+s2URcX8=; b=SueeyhcgGOUzNyk8XJp3xZVZ85NkemuESP1mvAx1BonZMACObQV6Jlm02zxmviyO8HczeM 1xvlwnIWG/vLy38ES9LEm1E0nZzXEBFvLa43hxUOL5+SX2xFHV5DWYBqbhox0+AHatnfwD W0xidQwRiJBtO5yyxyL7960ek9Vzk0ayY/bg/6MVRsUvPhUebVdXhZRzuzOiWoKM4WXrXV hErAWBp0ObbNNwThGkvLV8PwAg7O5lZ8RtuxJ2tRUUleYVU+RwAn5RtMu9zApBnvfCBzTN LeiB3gAQbDdrMgOAnscL2o5BrJZq8h3wIRVXP/bqWhmHl57d/+nUZqsHb7+P5w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698292339; a=rsa-sha256; cv=none; b=fd9fb1M7Dosy8rRrC+PWjvvdqPt+EvsVAzwhci4WtR63aqM5iS5fB67JU5ICDddMX0LGLh cApwxbDoE5nAvE1voSPBWG6GJBjfTM6hifU+yn37hH+eq/NNZslmnDHSeWvlcQI6dJKkzI krtTxugD2cKzxG/zZ3TzZC6X5ae8V7kLs4UUmmQAMSIRa+5dZs4hex0+qz+arCrHtTRB2f THe+znCdlKlSW5Th/zBBszEaaoZf2/nQuJaU4lhuRlmcWn18PgtuOJ6B0g6sJycrQ+rCFE 5EDvCrHbvzEUapsAxvbOI0Hk4yMebbqcu6F7RbRxaOjji8JfEPEveYz5kG8VSQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698292339; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=n5ddSW1M1v0Ah2juyRu0qW+0ElWNe8284a5+s2URcX8=; b=fIRHNyIdEZVohL6fkhOAHb/bhnjQah9mPfwsMrP2iXREasrhLj5JX9emInFxEdOBWPjNT2 BPXv4uASSotCsNqf2+mEmN8UeLlighr0DuqHJq3PRxkDnIHM6EptIfLFFNWV1QeR0aVn3G zRnFse9WEOk6FyJXRpXyREbdnxW7xA03sY9ZB1DHqlC9QEDAPZ0ZGBmCmdD9N6xsCrO1IT PZi4utrTM3bp3aY0pXFD28DGdxA7QuDopKlPgajO8wimbZZTkTgmpUz7mS3e8/IUB+wdcz KYoKTHdoOUfJTBHb8cvBwIuENT7QVlgswQV/eiopDe02BQfb0zgEhKbEF2SQBQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SGBh34WS2z1qk; Thu, 26 Oct 2023 03:52: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 39Q3qJXD021795; Thu, 26 Oct 2023 03:52:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39Q3qJFo021792; Thu, 26 Oct 2023 03:52:19 GMT (envelope-from git) Date: Thu, 26 Oct 2023 03:52:19 GMT Message-Id: <202310260352.39Q3qJFo021792@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: 0e5b8fe9ea5c - stable/13 - makesyscalls.lua: Make more luaish List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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/stable/13 X-Git-Reftype: branch X-Git-Commit: 0e5b8fe9ea5c2bf2080df1491477c7dcb557a2fb Auto-Submitted: auto-generated The branch stable/13 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=0e5b8fe9ea5c2bf2080df1491477c7dcb557a2fb commit 0e5b8fe9ea5c2bf2080df1491477c7dcb557a2fb Author: Warner Losh AuthorDate: 2023-04-20 22:15:57 +0000 Commit: Warner Losh CommitDate: 2023-10-26 03:48:35 +0000 makesyscalls.lua: Make more luaish x["y"] can be written as x.y, which looks better and is a more typical lua idiom. Sponsored by: Netflix Reviewed by: kevans Differential Revision: https://reviews.freebsd.org/D39709 (cherry picked from commit 1dd350fce0aad85c559b962654f71d1449f21727) --- sys/tools/makesyscalls.lua | 174 ++++++++++++++++++++++----------------------- 1 file changed, 87 insertions(+), 87 deletions(-) diff --git a/sys/tools/makesyscalls.lua b/sys/tools/makesyscalls.lua index 9efda5db52d1..63e86f6c0269 100644 --- a/sys/tools/makesyscalls.lua +++ b/sys/tools/makesyscalls.lua @@ -333,41 +333,41 @@ local function process_compat() nval = nval << 1 for _, v in pairs(compat_options) do - if v["stdcompat"] ~= nil then - local stdcompat = v["stdcompat"] - v["definition"] = "COMPAT_" .. stdcompat:upper() - v["compatlevel"] = tonumber(stdcompat:match("([0-9]+)$")) - v["flag"] = stdcompat:gsub("FREEBSD", "COMPAT") - v["prefix"] = stdcompat:lower() .. "_" - v["descr"] = stdcompat:lower() + if v.stdcompat ~= nil then + local stdcompat = v.stdcompat + v.definition = "COMPAT_" .. stdcompat:upper() + v.compatlevel = tonumber(stdcompat:match("([0-9]+)$")) + v.flag = stdcompat:gsub("FREEBSD", "COMPAT") + v.prefix = stdcompat:lower() .. "_" + v.descr = stdcompat:lower() end - local tmpname = "sys" .. v["flag"]:lower() + local tmpname = "sys" .. v.flag:lower() local dcltmpname = tmpname .. "dcl" files[tmpname] = io.tmpfile() files[dcltmpname] = io.tmpfile() - v["tmp"] = tmpname - v["dcltmp"] = dcltmpname + v.tmp = tmpname + v.dcltmp = dcltmpname - known_flags[v["flag"]] = nval - v["mask"] = nval + known_flags[v.flag] = nval + v.mask = nval nval = nval << 1 - v["count"] = 0 + v.count = 0 end end local function process_abi_flags() - local flags, mask = config["abi_flags"], 0 + local flags, mask = config.abi_flags, 0 for txtflag in flags:gmatch("([^|]+)") do if known_abi_flags[txtflag] == nil then abort(1, "Unknown abi_flag: " .. txtflag) end - mask = mask | known_abi_flags[txtflag]["value"] + mask = mask | known_abi_flags[txtflag].value end - config["abi_flags_mask"] = mask + config.abi_flags_mask = mask end local function abi_changes(name) @@ -375,11 +375,11 @@ local function abi_changes(name) abort(1, "abi_changes: unknown flag: " .. name) end - return config["abi_flags_mask"] & known_abi_flags[name]["value"] ~= 0 + return config.abi_flags_mask & known_abi_flags[name].value ~= 0 end local function strip_abi_prefix(funcname) - local abiprefix = config["abi_func_prefix"] + local abiprefix = config.abi_func_prefix local stripped_name if abiprefix ~= "" and funcname:find("^" .. abiprefix) then stripped_name = funcname:gsub("^" .. abiprefix, "") @@ -427,7 +427,7 @@ local process_syscall_def -- These patterns are processed in order on any line that isn't empty. local pattern_table = { { - pattern = "%s*$" .. config['os_id_keyword'], + pattern = "%s*$" .. config.os_id_keyword, process = function(_, _) -- Ignore... ID tag end, @@ -503,9 +503,9 @@ local function process_sysfile(file) local function do_match(nextline, prevline) local pattern, handler, dump for _, v in pairs(pattern_table) do - pattern = v['pattern'] - handler = v['process'] - dump = v['dump_prevline'] + pattern = v.pattern + handler = v.process + dump = v.dump_prevline if nextline:match(pattern) then if dump and prevline then process_syscall_def(prevline) @@ -578,7 +578,7 @@ end local function check_abi_changes(arg) for k, v in pairs(known_abi_flags) do - local expr = v["expr"] + local expr = v.expr if abi_changes(k) and expr ~= nil and arg:find(expr) then return true end @@ -606,7 +606,7 @@ local function process_args(args) -- XX TODO: Forward declarations? See: sysstubfwd in CheriBSD if abi_change then - local abi_type_suffix = config["abi_type_suffix"] + local abi_type_suffix = config.abi_type_suffix argtype = argtype:gsub("_native ", "") argtype = argtype:gsub("(struct [^ ]*)", "%1" .. abi_type_suffix) @@ -628,7 +628,7 @@ local function handle_noncompat(sysnum, thr_flag, flags, sysflags, rettype, auditev, syscallret, funcname, funcalias, funcargs, argalias) local argssize - if #funcargs > 0 or flags & known_flags["NODEF"] ~= 0 then + if #funcargs > 0 or flags & known_flags.NODEF ~= 0 then argssize = "AS(" .. argalias .. ")" else argssize = "0" @@ -654,8 +654,8 @@ local function handle_noncompat(sysnum, thr_flag, flags, sysflags, rettype, local argtype, argname for idx, arg in ipairs(funcargs) do - argtype = arg["type"] - argname = arg["name"] + argtype = arg.type + argname = arg.name argtype = trim(argtype:gsub("__restrict$", ""), nil) -- Pointer arg? @@ -672,7 +672,7 @@ local function handle_noncompat(sysnum, thr_flag, flags, sysflags, rettype, if isptrtype(argtype) then write_line("systrace", string.format( "\t\tuarg[%d] = (%s)p->%s; /* %s */\n", - idx - 1, config["ptr_intptr_t_cast"], + idx - 1, config.ptr_intptr_t_cast, argname, argtype)) elseif argtype == "union l_semun" then write_line("systrace", string.format( @@ -708,7 +708,7 @@ local function handle_noncompat(sysnum, thr_flag, flags, sysflags, rettype, write_line("sysarg", string.format("struct %s {\n", argalias)) for _, v in ipairs(funcargs) do - local argname, argtype = v["name"], v["type"] + local argname, argtype = v.name, v.type write_line("sysarg", string.format( "\tchar %s_l_[PADL_(%s)]; %s %s; char %s_r_[PADR_(%s)];\n", argname, argtype, @@ -738,14 +738,14 @@ local function handle_noncompat(sysnum, thr_flag, flags, sysflags, rettype, end write_line("sysdcl", ";\n") write_line("sysaue", string.format("#define\t%sAUE_%s\t%s\n", - config['syscallprefix'], funcalias, auditev)) + config.syscallprefix, funcalias, auditev)) end write_line("sysent", string.format("\t{ .sy_narg = %s, .sy_call = (sy_call_t *)", argssize)) local column = 8 + 2 + #argssize + 15 - if flags & known_flags["NOSTD"] ~= 0 then + if flags & known_flags.NOSTD ~= 0 then write_line("sysent", string.format( "lkmressys, .sy_auevent = AUE_NULL, " .. ".sy_flags = %s, .sy_thrcnt = SY_THR_ABSENT },", @@ -774,9 +774,9 @@ local function handle_noncompat(sysnum, thr_flag, flags, sysflags, rettype, write_line("sysnames", string.format("\t\"%s\",\t\t\t/* %d = %s */\n", funcalias, sysnum, funcalias)) - if flags & known_flags["NODEF"] == 0 then + if flags & known_flags.NODEF == 0 then write_line("syshdr", string.format("#define\t%s%s\t%d\n", - config['syscallprefix'], funcalias, sysnum)) + config.syscallprefix, funcalias, sysnum)) write_line("sysmk", string.format(" \\\n\t%s.o", funcalias)) end @@ -801,36 +801,36 @@ local function handle_compat(sysnum, thr_flag, flags, sysflags, rettype, auditev, funcname, funcalias, funcargs, argalias) local argssize, out, outdcl, wrap, prefix, descr - if #funcargs > 0 or flags & known_flags["NODEF"] ~= 0 then + if #funcargs > 0 or flags & known_flags.NODEF ~= 0 then argssize = "AS(" .. argalias .. ")" else argssize = "0" end for _, v in pairs(compat_options) do - if flags & v["mask"] ~= 0 then - if config["mincompat"] > v["compatlevel"] then + if flags & v.mask ~= 0 then + if config.mincompat > v.compatlevel then funcname = strip_abi_prefix(funcname) - funcname = v["prefix"] .. funcname + funcname = v.prefix .. funcname return handle_obsol(sysnum, funcname, funcname) end - v["count"] = v["count"] + 1 - out = v["tmp"] - outdcl = v["dcltmp"] - wrap = v["flag"]:lower() - prefix = v["prefix"] - descr = v["descr"] + v.count = v.count + 1 + out = v.tmp + outdcl = v.dcltmp + wrap = v.flag:lower() + prefix = v.prefix + descr = v.descr goto compatdone end end ::compatdone:: local dprotoflags = get_mask({"NOPROTO", "NODEF"}) - local nargflags = dprotoflags | known_flags["NOARGS"] + local nargflags = dprotoflags | known_flags.NOARGS if #funcargs > 0 and flags & nargflags == 0 then write_line(out, string.format("struct %s {\n", argalias)) for _, v in ipairs(funcargs) do - local argname, argtype = v["name"], v["type"] + local argname, argtype = v.name, v.type write_line(out, string.format( "\tchar %s_l_[PADL_(%s)]; %s %s; char %s_r_[PADR_(%s)];\n", argname, argtype, @@ -847,11 +847,11 @@ local function handle_compat(sysnum, thr_flag, flags, sysflags, rettype, "%s\t%s%s(struct thread *, struct %s *);\n", rettype, prefix, funcname, argalias)) write_line("sysaue", string.format( - "#define\t%sAUE_%s%s\t%s\n", config['syscallprefix'], + "#define\t%sAUE_%s%s\t%s\n", config.syscallprefix, prefix, funcname, auditev)) end - if flags & known_flags['NOSTD'] ~= 0 then + if flags & known_flags.NOSTD ~= 0 then write_line("sysent", string.format( "\t{ .sy_narg = %s, .sy_call = (sy_call_t *)%s, " .. ".sy_auevent = %s, .sy_flags = 0, " .. @@ -878,9 +878,9 @@ local function handle_compat(sysnum, thr_flag, flags, sysflags, rettype, write_line("syshdr", string.format( "\t\t\t\t/* %d is %s %s */\n", sysnum, descr, funcalias)) - elseif flags & known_flags["NODEF"] == 0 then + elseif flags & known_flags.NODEF == 0 then write_line("syshdr", string.format("#define\t%s%s%s\t%d\n", - config['syscallprefix'], prefix, funcalias, sysnum)) + config.syscallprefix, prefix, funcalias, sysnum)) write_line("sysmk", string.format(" \\\n\t%s%s.o", prefix, funcalias)) end @@ -958,7 +958,7 @@ process_syscall_def = function(line) abort(1, "Range only allowed with RESERVED and UNIMPL: " .. line) end - if (flags & known_flags["NOTSTATIC"]) ~= 0 then + if (flags & known_flags.NOTSTATIC) ~= 0 then thr_flag = "SY_THR_ABSENT" end @@ -1052,16 +1052,16 @@ process_syscall_def = function(line) sysflags = "0" -- NODEF events do not get audited - if flags & known_flags['NODEF'] ~= 0 then + if flags & known_flags.NODEF ~= 0 then auditev = 'AUE_NULL' end -- If applicable; strip the ABI prefix from the name local stripped_name = strip_abi_prefix(funcname) - if flags & known_flags['CAPENABLED'] ~= 0 or - config["capenabled"][funcname] ~= nil or - config["capenabled"][stripped_name] ~= nil then + if flags & known_flags.CAPENABLED ~= 0 or + config.capenabled[funcname] ~= nil or + config.capenabled[stripped_name] ~= nil then sysflags = "SYF_CAPENABLED" end @@ -1073,11 +1073,11 @@ process_syscall_def = function(line) local argprefix = '' if abi_changes("pointer_args") then for _, v in ipairs(funcargs) do - if isptrtype(v["type"]) then + if isptrtype(v.type) then -- argalias should be: -- COMPAT_PREFIX + ABI Prefix + funcname - argprefix = config['abi_func_prefix'] - funcalias = config['abi_func_prefix'] .. + argprefix = config.abi_func_prefix + funcalias = config.abi_func_prefix .. funcname goto ptrfound end @@ -1091,11 +1091,11 @@ process_syscall_def = function(line) if argalias == nil and funcname ~= nil then argalias = argprefix .. funcname .. "_args" for _, v in pairs(compat_options) do - local mask = v["mask"] + local mask = v.mask if (flags & mask) ~= 0 then -- Multiple aliases doesn't seem to make -- sense. - argalias = v["prefix"] .. argalias + argalias = v.prefix .. argalias goto out end end @@ -1109,7 +1109,7 @@ process_syscall_def = function(line) local compatflags = get_mask_pat("COMPAT.*") -- Now try compat... if flags & compatflags ~= 0 then - if flags & known_flags['STD'] ~= 0 then + if flags & known_flags.STD ~= 0 then abort(1, "Incompatible COMPAT/STD: " .. line) end handle_compat(sysnum, thr_flag, flags, sysflags, rettype, @@ -1118,11 +1118,11 @@ process_syscall_def = function(line) handle_noncompat(sysnum, thr_flag, flags, sysflags, rettype, auditev, syscallret, funcname, funcalias, funcargs, argalias) - elseif flags & known_flags["OBSOL"] ~= 0 then + elseif flags & known_flags.OBSOL ~= 0 then handle_obsol(sysnum, funcname, funcomment) - elseif flags & known_flags["RESERVED"] ~= 0 then + elseif flags & known_flags.RESERVED ~= 0 then handle_reserved(sysnum, sysstart, sysend) - elseif flags & known_flags["UNIMPL"] ~= 0 then + elseif flags & known_flags.UNIMPL ~= 0 then handle_unimpl(sysnum, sysstart, sysend, funcomment) else abort(1, "Bad flags? " .. line) @@ -1157,18 +1157,18 @@ if configfile ~= nil then end -- We ignore errors here if we're relying on the default configuration. -if not config_modified["capenabled"] then - config["capenabled"] = grab_capenabled(config['capabilities_conf'], - config_modified["capabilities_conf"] == nil) -elseif config["capenabled"] ~= "" then +if not config_modified.capenabled then + config.capenabled = grab_capenabled(config.capabilities_conf, + config_modified.capabilities_conf == nil) +elseif config.capenabled ~= "" then -- Due to limitations in the config format mostly, we'll have a comma -- separated list. Parse it into lines local capenabled = {} - -- print("here: " .. config["capenabled"]) - for sysc in config["capenabled"]:gmatch("([^,]+)") do + -- print("here: " .. config.capenabled) + for sysc in config.capenabled:gmatch("([^,]+)") do capenabled[sysc] = true end - config["capenabled"] = capenabled + config.capenabled = capenabled end process_compat() process_abi_flags() @@ -1203,7 +1203,7 @@ write_line("sysent", string.format([[ /* The casts are bogus but will do for now. */ struct sysent %s[] = { -]], config['switchname'])) +]], config.switchname)) write_line("syssw", string.format([[/* * System call switch table. @@ -1212,7 +1212,7 @@ write_line("syssw", string.format([[/* * $%s$ */ -]], generated_tag, config['os_id_keyword'])) +]], generated_tag, config.os_id_keyword)) write_line("sysarg", string.format([[/* * System call prototypes. @@ -1250,10 +1250,10 @@ struct thread; #define PADR_(t) 0 #endif -]], generated_tag, config['os_id_keyword'], config['sysproto_h'], - config['sysproto_h'])) +]], generated_tag, config.os_id_keyword, config.sysproto_h, + config.sysproto_h)) for _, v in pairs(compat_options) do - write_line(v["tmp"], string.format("\n#ifdef %s\n\n", v["definition"])) + write_line(v.tmp, string.format("\n#ifdef %s\n\n", v.definition)) end write_line("sysnames", string.format([[/* @@ -1264,7 +1264,7 @@ write_line("sysnames", string.format([[/* */ const char *%s[] = { -]], generated_tag, config['os_id_keyword'], config['namesname'])) +]], generated_tag, config.os_id_keyword, config.namesname)) write_line("syshdr", string.format([[/* * System call numbers. @@ -1273,12 +1273,12 @@ write_line("syshdr", string.format([[/* * $%s$ */ -]], generated_tag, config['os_id_keyword'])) +]], generated_tag, config.os_id_keyword)) write_line("sysmk", string.format([[# FreeBSD system call object files. # DO NOT EDIT-- this file is automatically %s. # $%s$ -MIASM = ]], generated_tag, config['os_id_keyword'])) +MIASM = ]], generated_tag, config.os_id_keyword)) write_line("systrace", string.format([[/* * System call argument to DTrace register array converstion. @@ -1293,7 +1293,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args) { int64_t *iarg = (int64_t *)uarg; switch (sysnum) { -]], generated_tag, config['os_id_keyword'])) +]], generated_tag, config.os_id_keyword)) write_line("systracetmp", [[static void systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) @@ -1318,7 +1318,7 @@ write_line("sysinc", "\n#define AS(name) (sizeof(struct name) / sizeof(register_t))\n") for _, v in pairs(compat_options) do - if v["count"] > 0 then + if v.count > 0 then write_line("sysinc", string.format([[ #ifdef %s @@ -1326,11 +1326,11 @@ for _, v in pairs(compat_options) do #else #define %s(n, name) .sy_narg = 0, .sy_call = (sy_call_t *)nosys #endif -]], v["definition"], v["flag"]:lower(), v["prefix"], v["flag"]:lower())) +]], v.definition, v.flag:lower(), v.prefix, v.flag:lower())) end - write_line(v["dcltmp"], string.format("\n#endif /* %s */\n\n", - v["definition"])) + write_line(v.dcltmp, string.format("\n#endif /* %s */\n\n", + v.definition)) end write_line("sysprotoend", string.format([[ @@ -1340,14 +1340,14 @@ write_line("sysprotoend", string.format([[ #undef PADR_ #endif /* !%s */ -]], config["sysproto_h"])) +]], config.sysproto_h)) write_line("sysmk", "\n") write_line("sysent", "};\n") write_line("sysnames", "};\n") -- maxsyscall is the highest seen; MAXSYSCALL should be one higher write_line("syshdr", string.format("#define\t%sMAXSYSCALL\t%d\n", - config["syscallprefix"], maxsyscall + 1)) + config.syscallprefix, maxsyscall + 1)) write_line("systrace", [[ default: *n_args = 0; @@ -1381,8 +1381,8 @@ write_line("syssw", read_file("sysent")) write_line("sysproto", read_file("sysarg")) write_line("sysproto", read_file("sysdcl")) for _, v in pairs(compat_options) do - write_line("sysproto", read_file(v["tmp"])) - write_line("sysproto", read_file(v["dcltmp"])) + write_line("sysproto", read_file(v.tmp)) + write_line("sysproto", read_file(v.dcltmp)) end write_line("sysproto", read_file("sysaue")) write_line("sysproto", read_file("sysprotoend")) From nobody Thu Oct 26 03:52:20 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SGBh51MMHz4ySWr; Thu, 26 Oct 2023 03:52: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 4SGBh501vzz4hBr; Thu, 26 Oct 2023 03:52:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698292341; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7tpdKrXzezjHx0TlNDDdgjf+L8gxJXzllM+Tby+Abtw=; b=tcDBZ9cdaCEj1q+a8erXs1hP2EUJ0cY05PHT67RHdb5vtvfGMV6IZ0tco9/s6Xn9SwjuNe pP1CmMVR7BazetQP281VjqlCrHYgHdilPRc2G0btP+5egAVw2oPduPXeJ0t6yH9vx38sGD tYL/FdAUXV9vzD/jKnQC/W8X4kM0guZvbe2DWbGWxFMqC9kL7kKp+ql5gZoaylSf2Gy6kg llzNZL8ujF4YF8bcO7hTrsFEMV9UjEGHypyyRP5w8ir+nGbYV0kv5iyNoLtdUjh/GHlHLD T3fZVAAIEyhtYTJg36FTu7tfLSHsv8OPfJv3GvQW31rWJ6R86lFRIi7VoJTK6A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698292341; a=rsa-sha256; cv=none; b=v7yhnPPZeWUJVco0DPb78FfBDC00tShxvqBPZitVleCEvSQ6/dcCS3+GXYka9Rojo3CLYh Rcm+JJrI0hB2zoJEMvMMbCY6OiGwFPJ2uk7AEoHKP/x09/I8dgSvNYrrB8fEMHJ6ZpPz/k odbZ9C9I46h4iOQthlsCsTGh1UbVVcmPCfoDlJ3P4TLVwOAUa3sLhMT/I+laBFzumFLBpk A4/zPTRyBsEw6W2zpAOFoxiDTN8MGGdOI3Fj6oaema/+F1iiLhnR8IV+KbT4ebTdVb+xy5 vJpsY02LEpjl6Xa9dpN3smtQGU3eqai5aHTEVEljotieiOyqrmPfxquh6XWUQQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698292341; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7tpdKrXzezjHx0TlNDDdgjf+L8gxJXzllM+Tby+Abtw=; b=cqXelSiOhdi9HEmEW/zo+LHMlAM4b1X9x9nZzm31vPQNQ+E8LgqklLYBNBu+Ea7n++kw8p nEOfraL9FgK6MaxU6BJjkGECOTxzWcEwzM+Wkg6Zl6yB+XfnALsDqWdH0KRoeFtsb9ievO 8MzEsN2dVpBWyKVbe0UL5iVbp0wBRjtlgUuqFfhenntUQycny4k2LcYYQoYvqUH0cOxMyK /EF8cz+Kdm3Rpk25j0aItTJXWROL/kNEI9Fpx+5ouF6zPAn3ZOnqi2/TvCUNjzeKkpaht1 xHNteRQd/rpg3EOhUxnlm1s2XGLl6UpObD5ba+ubLWjfVpA0hrWKybak3c0T6A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SGBh45kL5z1ql; Thu, 26 Oct 2023 03:52: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 39Q3qKKr021834; Thu, 26 Oct 2023 03:52:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39Q3qKSA021831; Thu, 26 Oct 2023 03:52:20 GMT (envelope-from git) Date: Thu, 26 Oct 2023 03:52:20 GMT Message-Id: <202310260352.39Q3qKSA021831@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: 3a13adb4c55c - stable/13 - makesyscalls.lua: Minor fluff removal List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 3a13adb4c55c6447082e93aea660f49a04a51348 Auto-Submitted: auto-generated The branch stable/13 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=3a13adb4c55c6447082e93aea660f49a04a51348 commit 3a13adb4c55c6447082e93aea660f49a04a51348 Author: Warner Losh AuthorDate: 2023-04-20 22:16:16 +0000 Commit: Warner Losh CommitDate: 2023-10-26 03:48:35 +0000 makesyscalls.lua: Minor fluff removal luacheck pointed out two minor issues: line isn't declared as a global, so declare it local. Also remove an unused parameter. Suggested by: kevans Sponsored by: Netflix (cherry picked from commit c1e987e0624ebf509a6d86099dd47ae6d72a8c03) --- sys/tools/makesyscalls.lua | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/sys/tools/makesyscalls.lua b/sys/tools/makesyscalls.lua index 63e86f6c0269..aa7e18bef853 100644 --- a/sys/tools/makesyscalls.lua +++ b/sys/tools/makesyscalls.lua @@ -450,12 +450,12 @@ local pattern_table = { maxsyscall = savesyscall end line = line .. "\n" - write_line('sysent', line) - write_line('sysdcl', line) - write_line('sysarg', line) - write_line_pfile('syscompat[0-9]*$', line) - write_line('sysnames', line) - write_line_pfile('systrace.*', line) + write_line("sysent", line) + write_line("sysdcl", line) + write_line("sysarg", line) + write_line_pfile("syscompat[0-9]*$", line) + write_line("sysnames", line) + write_line_pfile("systrace.*", line) end, }, { @@ -906,7 +906,7 @@ local function handle_unimpl(sysnum, sysstart, sysend, comment) end end -local function handle_reserved(sysnum, sysstart, sysend, comment) +local function handle_reserved(sysnum, sysstart, sysend) handle_unimpl(sysnum, sysstart, sysend, "reserved for local use") end From nobody Thu Oct 26 03:52:21 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SGBh61x9Yz4ySWt; Thu, 26 Oct 2023 03:52: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 4SGBh60hMBz4h8q; Thu, 26 Oct 2023 03:52:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698292342; h=from:from:reply-to:subject:subject: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+eSN+kmQlSYJGjGr4SbHCJ0QI66zgATTb/xHHK4qN4=; b=mtYhioLBnwHmoEzNHuzrutsLAKiwyQrQNz4XGx82OZ1Zm5NDzrSeuTzW6Foj4/l0xvs6lE aBO5KvL4BeIhUpl8KkIKIDBDe5NYdqVFovuDfIrtbQXJ74ovsRmXAd8zeSb0b/EMU1yf9v 3IzbcLtMWvR7AtzTnzLVXBjRgqGhH40BYRx8jlakLaU1Rek4tO0NvAMM/E5hzbbtio85xU 0O5uKx0mpySHpCYzWRzPzz00Jnu48s4th2+ziu0xWVAZk60CqgOJo/ty/aXWddijN1QnE+ wxHT9wNCPg7hKF9cZI/jsf47/53qwt87jSF7jsFRSDsY88KtpxlnS4Enibid7A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698292342; a=rsa-sha256; cv=none; b=l/CqxryGkasYtJ5VWw2exLRH8hyuLwZ38nlzCXkqVjoVHopATIkYxMVpZv5GyMF7M2wjLP HS6e57FyGHWAh4QvSuHi0Nv4iK7iTJZg6o2Wjr4PIGwH/mgbaEfk4uijNvoB/18kCW6c5U y2nnROD/0w0ZR6XEA6T8iOPLNV3koPcFenx+/UmrVVOSERt8i4PN9JReh5Ud2tohPqxaRf 5jhONWhJvzskAhyzYWwGaTHugr5SiZ7O4Ni4xqnW4bGzpo2gpoNM5rDHUQu3aLPbgWhzeO N5jwqgCWJLIIM15EbtBpdz9NzvkKnm2pwQdmVSv5nSgs28MxodFwtZg1XbDOWQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698292342; h=from:from:reply-to:subject:subject: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+eSN+kmQlSYJGjGr4SbHCJ0QI66zgATTb/xHHK4qN4=; b=tPY6HSDXppmcug/gc0oWZU+/gEUHbMeJT0MxR2LKg3kl44jDK4kClfA7nK3REk7A44OQry lFwW+TK3PdGPbajNxEAKkrVygOW7vxHRYcc6uMMCtNJtTuTWdjr2Rfiae/e+n1V5V/JQAi I9Nyx3gSH3m4ajIaAUmGcqZSRo/Wub0yuO1RIGBp1WX/t2YGJfwDyFpTGR+W+hamvS6xPL raU+4+mksDDxsyXqhUcMUyH/GJ5/ToIHtvWZ3+SXJGH0875zXwMmNjgRjBmU2g7k95WZs1 Z/h6UmqKfvpJ/UtiQiZ1R2JtCKKjIUKYoWY2Ayhgq+/jFYsbUNiAdIprdgzJcA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SGBh56Xf8z1qm; Thu, 26 Oct 2023 03:52: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 39Q3qLtd021873; Thu, 26 Oct 2023 03:52:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39Q3qL0N021870; Thu, 26 Oct 2023 03:52:21 GMT (envelope-from git) Date: Thu, 26 Oct 2023 03:52:21 GMT Message-Id: <202310260352.39Q3qL0N021870@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: c8456bb18643 - stable/13 - makesyscall: Stop generating $FreeBSD$ List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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/stable/13 X-Git-Reftype: branch X-Git-Commit: c8456bb18643d3a8ff79955c10b7242f0a599071 Auto-Submitted: auto-generated The branch stable/13 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=c8456bb18643d3a8ff79955c10b7242f0a599071 commit c8456bb18643d3a8ff79955c10b7242f0a599071 Author: Warner Losh AuthorDate: 2023-06-09 13:26:07 +0000 Commit: Warner Losh CommitDate: 2023-10-26 03:48:35 +0000 makesyscall: Stop generating $FreeBSD$ With 14 coming, we no longer need to generate the $FreeBSD$. We can likely MFC that to 13 as well. MFC After: 2 weeks Sponsored by: Netflix Differential Revision: https://reviews.freebsd.org/D39879 (cherry picked from commit 61fe63f698148f8d63fe6f366c5e20bc7ad60b87) --- sys/tools/makesyscalls.lua | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/sys/tools/makesyscalls.lua b/sys/tools/makesyscalls.lua index aa7e18bef853..cc2a4f1362ae 100644 --- a/sys/tools/makesyscalls.lua +++ b/sys/tools/makesyscalls.lua @@ -40,7 +40,7 @@ local generated_tag = "@" .. "generated" -- Default configuration; any of these may get replaced by a configuration file -- optionally specified. local config = { - os_id_keyword = "FreeBSD", + os_id_keyword = "FreeBSD", -- obsolete, ignored on input, not generated abi_func_prefix = "", sysnames = "syscalls.c", sysproto = "../sys/sysproto.h", @@ -427,6 +427,7 @@ local process_syscall_def -- These patterns are processed in order on any line that isn't empty. local pattern_table = { { + -- To be removed soon pattern = "%s*$" .. config.os_id_keyword, process = function(_, _) -- Ignore... ID tag @@ -1209,16 +1210,14 @@ write_line("syssw", string.format([[/* * System call switch table. * * DO NOT EDIT-- this file is automatically %s. - * $%s$ */ -]], generated_tag, config.os_id_keyword)) +]], generated_tag)) write_line("sysarg", string.format([[/* * System call prototypes. * * DO NOT EDIT-- this file is automatically %s. - * $%s$ */ #ifndef %s @@ -1250,7 +1249,7 @@ struct thread; #define PADR_(t) 0 #endif -]], generated_tag, config.os_id_keyword, config.sysproto_h, +]], generated_tag, config.sysproto_h, config.sysproto_h)) for _, v in pairs(compat_options) do write_line(v.tmp, string.format("\n#ifdef %s\n\n", v.definition)) @@ -1260,31 +1259,27 @@ write_line("sysnames", string.format([[/* * System call names. * * DO NOT EDIT-- this file is automatically %s. - * $%s$ */ const char *%s[] = { -]], generated_tag, config.os_id_keyword, config.namesname)) +]], generated_tag, config.namesname)) write_line("syshdr", string.format([[/* * System call numbers. * * DO NOT EDIT-- this file is automatically %s. - * $%s$ */ -]], generated_tag, config.os_id_keyword)) +]], generated_tag)) write_line("sysmk", string.format([[# FreeBSD system call object files. # DO NOT EDIT-- this file is automatically %s. -# $%s$ -MIASM = ]], generated_tag, config.os_id_keyword)) +MIASM = ]], generated_tag)) write_line("systrace", string.format([[/* * System call argument to DTrace register array converstion. * * DO NOT EDIT-- this file is automatically %s. - * $%s$ * This file is part of the DTrace syscall provider. */ @@ -1293,7 +1288,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args) { int64_t *iarg = (int64_t *)uarg; switch (sysnum) { -]], generated_tag, config.os_id_keyword)) +]], generated_tag)) write_line("systracetmp", [[static void systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) From nobody Thu Oct 26 10:01:52 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SGLtS6yMjz4xb4Y; Thu, 26 Oct 2023 10:01: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 4SGLtS6Wl7z3N1R; Thu, 26 Oct 2023 10:01:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698314512; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=stETuPhZmf+tDNmM5BKvKKg0e5r68WGkbOSJOwCarmc=; b=oEEga2XQirj/FuDHMYLie+DxRrgd4ub4Sn8ya4IRcrebQacqNbltoB/tDJx1o4G5cfPBEz gG9323Efau3+kFW8O1ejZZqZ36SoPzfTuTnu5DrisbRXK8UCjDdwcb79D/Jng8KQnP/l7M uz4DMNeVDuAU+6zWDyIad3XisQXiEzfCxmHX1FMJZLzzRj+bTumxpSt7HSLL+DC3joGmn/ a6KBpUPha7Wo8yUtWSK1I1XUxKKx/XOgZQ3BIONNfLaE37/p7OrVMZyaM2ne7k1c5ph+gI /7Qexr0ZYeM4KTSgol6/5+leTvToMB+38DzGIAGVxsoYS4rlILwMNPwc3P8kfg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698314512; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=stETuPhZmf+tDNmM5BKvKKg0e5r68WGkbOSJOwCarmc=; b=OiWGxfqdHKKD6UcqGzmHbpIdDNUltZZCY3umOrJd+2v3Cba8PThCM48mQB6x3fIM6kQKsO pTAV5oVb+lm8dfs7igfPUyW+ZK3+a+pZSHN4NXywB4JCETAPDhmvBd6jK3uF8+cYPByiZS zKaxydceKO0PxbBDojDGNnK7clF2S+nDFM8hX2g5y2ky5waWWORyQErz4cUY9UTh+7KQGw 9KsAIQuAldVa2K5xAXSjUUz9gNCTG4S0xS6IggVMBhIgI8JNcQR/4rSj23ENyXVgVX9X18 R1wmCYVfdPDesnH4BeFGzS4BzKBL+ERtBkw+O2foAtUEjir5fTXhfvRiTif5cA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698314512; a=rsa-sha256; cv=none; b=TbMYUqJZeZT+F/14S9kw7gD70KeHeIl5bDkFgedBus629jL2mmY7yJQLg/WeetmyAcS5aA YnkXB7PozO27fOV1VXCE/rq6jAU8lGKMOv3CqGnWoNR7oQI+6YNcdKBeFDiVL6MNnc+oPr 6eUJm8RYSlAlAVdZmxlQHRx/tADEPFy4gLue9uyYjer8Tg0iTYUxTfel7f/EIEYafxDCuf wcfM1CwjccobD5Kvu4HCIJ05vcCRf41vEh7G0aMjseAmg+PYdSTGy+CDAFcCeA/hIBKNgR +5/pFzqSWijIsqLuMw4umICcfAkqktFTAy5Qde15TwyVn0YU58IucqpdyCn8Hg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SGLtS5ZVYzBbh; Thu, 26 Oct 2023 10:01: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 39QA1qKD034784; Thu, 26 Oct 2023 10:01:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39QA1q2p034781; Thu, 26 Oct 2023 10:01:52 GMT (envelope-from git) Date: Thu, 26 Oct 2023 10:01:52 GMT Message-Id: <202310261001.39QA1q2p034781@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: f407a72a506d - main - bhyve: fix arguments to ioctl(VMIO_SIOCSIFFLAGS) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: f407a72a506d2630d60d9096c42058f12dff874e Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=f407a72a506d2630d60d9096c42058f12dff874e commit f407a72a506d2630d60d9096c42058f12dff874e Author: Gleb Smirnoff AuthorDate: 2023-10-26 09:59:21 +0000 Commit: Gleb Smirnoff CommitDate: 2023-10-26 09:59:21 +0000 bhyve: fix arguments to ioctl(VMIO_SIOCSIFFLAGS) ioctl(2)'s with integer argument shall pass command argument by value, not by pointer. The ioctl(2) manual page is not very clear about that. See sys/kern/sys_generic.c:sys_ioctl() near IOC_VOID. Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D42366 Fixes: fd8b9c73a5a63a7aa438a73951d7a535b4f25d9a --- usr.sbin/bhyve/net_backends.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/bhyve/net_backends.c b/usr.sbin/bhyve/net_backends.c index 99781cfdcbb6..de6afab53854 100644 --- a/usr.sbin/bhyve/net_backends.c +++ b/usr.sbin/bhyve/net_backends.c @@ -238,7 +238,7 @@ tap_init(struct net_backend *be, const char *devname, goto error; } - if (ioctl(be->fd, VMIO_SIOCSIFFLAGS, &up)) { + if (ioctl(be->fd, VMIO_SIOCSIFFLAGS, up)) { WPRINTF(("tap device link up failed")); goto error; } From nobody Thu Oct 26 14:16:53 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SGSXj4l42z4xsBV; Thu, 26 Oct 2023 14:16: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 4SGSXj4BwMz4G3P; Thu, 26 Oct 2023 14:16:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698329813; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6rOXXM5l/islqA/RKU5VWJUByqS3vhoAAsyqqZnKbjs=; b=o3xjpc6Xgg5Jbj72lqSPJ9r8OWoUibCWHcHpNpjq/LNFD2l8BESHoz5sn/Bf3nOefyhAj5 jFsrvPCDOlYsPTLH3yTrI84emhmv2lvEKIGSTqZYYT3huKs9zgx3FfZLZM8JccL/lSc9Dn Axb3U3GFrcw1wavUuPih+vSVPJnQMCticgIlRfBjxxHXxKKDflkituxD6hUEPR+8NIxt1V 97TkN+p0oOuBEPs+8tWECfwEZrrA097qFF1PbjTMRjIbfJMIxBrD5Z/ZbjNfPitP/jGJix a79yGrOTn1oEThrIJFaXEdkzHlugRenqQTvSW5unbLaRmGjbc0rWSvcklKjJiA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698329813; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6rOXXM5l/islqA/RKU5VWJUByqS3vhoAAsyqqZnKbjs=; b=jVFZWD4eTqOVml6ZJBxRNr18dWaQdMBvRoN/bgr+YUgrylHo9hBT51S+Mu0+koYCH0mCpp ER9pZMxL1qaat1JJhF68Oc0HwKINzeJ5sJNdT3tMto1Vx5ufiN6c+BbmgtQZXYNsYQVtYG vkbdSwyBdZa+SydFrB7TVKx+BupZaXk/9HMqdqM9ZaQXb1+cfUE79tqV4qcv4BV3tOX7SY lbd1Ot/heanJbgoWAlEz7KL1TeD9Vo/eMpqOepe8alV8JUznorsME1TOdfR9G2FAE+PutE fr3jQHARKTb1Nl41LVdTaqpfAaTFcdOSPckRTzQf1+J+DV9nY4rSHXNIMrgMvw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698329813; a=rsa-sha256; cv=none; b=E56DNWkDN4BupBGn/CiyX7RaflwpHyA7Uva+e4rVwaoK1xffjboIZ/1QCTMKZ0AP8dL4ca DGG6851eZuBg6sjC5h4qum90kkI/xpHnCoSd2RvXLaPEc7lFMMPP9aXyYIlXR/PP8w09fb sphBjlZgjEZA+iejlg8H7vS02rU0YlUCbWy21fka2HQkHP5f29LC9mGT2ht05xAIv+D0Fz F8foiZsAZCQIwHNVotgMuIBtf4qHo2s8306X4yclYwKXlgAq0QKRRnBnMKlC9/crpTWT+2 2oJvhrn9oBh6oSAnB0wVgPMadU91UW2CpM1TD/JuoBZCDOdXbbvdiTjR8MyJLQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SGSXj3BDRzb0D; Thu, 26 Oct 2023 14:16: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 39QEGrgx055043; Thu, 26 Oct 2023 14:16:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39QEGrnK055040; Thu, 26 Oct 2023 14:16:53 GMT (envelope-from git) Date: Thu, 26 Oct 2023 14:16:53 GMT Message-Id: <202310261416.39QEGrnK055040@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: d7c9de2d68ca - main - pf tests: Add option to send fragmented packets List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: d7c9de2d68ca81c557e069c2b431529cf597886c Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=d7c9de2d68ca81c557e069c2b431529cf597886c commit d7c9de2d68ca81c557e069c2b431529cf597886c Author: Kajetan Staszkiewicz AuthorDate: 2023-10-26 09:14:14 +0000 Commit: Kristof Provost CommitDate: 2023-10-26 13:25:20 +0000 pf tests: Add option to send fragmented packets Add option to send fragmented packets and to properly sniff them by reassembling them by the sniffer itself. Reviewed by: kp Sponsored by: InnoGames GmbH Differential Revision: https://reviews.freebsd.org/D42354 --- tests/sys/netpfil/common/pft_ping.py | 39 +++++++++++++++++++++++++++--------- tests/sys/netpfil/common/sniffer.py | 18 +++++++++++++---- 2 files changed, 44 insertions(+), 13 deletions(-) diff --git a/tests/sys/netpfil/common/pft_ping.py b/tests/sys/netpfil/common/pft_ping.py index af5b84e34c67..1abf4f609832 100644 --- a/tests/sys/netpfil/common/pft_ping.py +++ b/tests/sys/netpfil/common/pft_ping.py @@ -82,17 +82,29 @@ def prepare_ipv4(dst_address, send_params): def send_icmp_ping(dst_address, sendif, send_params): send_length = send_params['length'] + send_frag_length = send_params['frag_length'] + packets = [] ether = sp.Ether() if ':' in dst_address: ip6 = prepare_ipv6(dst_address, send_params) icmp = sp.ICMPv6EchoRequest(data=sp.raw(build_payload(send_length))) - req = ether / ip6 / icmp + if send_frag_length: + for packet in sp.fragment(ip6 / icmp, fragsize=send_frag_length): + packets.append(ether / packet) + else: + packets.append(ether / ip6 / icmp) + else: ip = prepare_ipv4(dst_address, send_params) icmp = sp.ICMP(type='echo-request') raw = sp.raw(build_payload(send_length)) - req = ether / ip / icmp / raw - sp.sendp(req, sendif, verbose=False) + if send_frag_length: + for packet in sp.fragment(ip / icmp / raw, fragsize=send_frag_length): + packets.append(ether / packet) + else: + packets.append(ether / ip / icmp / raw) + for packet in packets: + sp.sendp(packet, sendif, verbose=False) def send_tcp_syn(dst_address, sendif, send_params): @@ -372,7 +384,7 @@ def check_tcp_syn_reply(expect_params, packet): return check_tcp_syn_reply_4(expect_params, packet) -def setup_sniffer(recvif, ping_type, sniff_type, expect_params): +def setup_sniffer(recvif, ping_type, sniff_type, expect_params, defrag): if ping_type == 'icmp' and sniff_type == 'request': checkfn = check_ping_request elif ping_type == 'icmp' and sniff_type == 'reply': @@ -384,7 +396,7 @@ def setup_sniffer(recvif, ping_type, sniff_type, expect_params): else: raise Exception('Unspported ping or sniff type') - return Sniffer(expect_params, checkfn, recvif) + return Sniffer(expect_params, checkfn, recvif, defrag=defrag) def parse_args(): @@ -417,6 +429,8 @@ def parse_args(): parser_send = parser.add_argument_group('Values set in transmitted packets') parser_send.add_argument('--send-flags', nargs=1, type=str, help='IPv4 fragmentation flags') + parser_send.add_argument('--send-frag-length', nargs=1, type=int, + help='Force IP fragmentation with given fragment length') parser_send.add_argument('--send-hlim', nargs=1, type=int, help='IPv6 Hop Limit or IPv4 Time To Live') parser_send.add_argument('--send-mss', nargs=1, type=int, @@ -428,7 +442,7 @@ def parse_args(): parser_send.add_argument('--send-tc', nargs=1, type=int, help='IPv6 Traffic Class or IPv4 DiffServ / ToS') parser_send.add_argument('--send-tcpopt-unaligned', action='store_true', - help='Include unaligned TCP options') + help='Include unaligned TCP options') # Expectations parser_expect = parser.add_argument_group('Values expected in sniffed packets') @@ -467,7 +481,7 @@ def main(): # Standardize parameters which have nargs=1. send_params = {} expect_params = {} - for param_name in ('flags', 'hlim', 'length', 'mss', 'seq', 'tc'): + for param_name in ('flags', 'hlim', 'length', 'mss', 'seq', 'tc', 'frag_length'): param_arg = vars(args).get(f'send_{param_name}') send_params[param_name] = param_arg[0] if param_arg else None param_arg = vars(args).get(f'expect_{param_name}') @@ -488,6 +502,11 @@ def main(): sniffers = [] + if send_params['frag_length']: + defrag = True + else: + defrag = False + if recv_ifs: sniffer_params = copy(expect_params) sniffer_params['src_address'] = None @@ -495,7 +514,8 @@ def main(): for iface in recv_ifs: LOGGER.debug(f'Installing receive sniffer on {iface}') sniffers.append( - setup_sniffer(iface, args.ping_type, 'request', sniffer_params, + setup_sniffer(iface, args.ping_type, 'request', + sniffer_params, defrag, )) if reply_ifs: @@ -505,7 +525,8 @@ def main(): for iface in reply_ifs: LOGGER.debug(f'Installing reply sniffer on {iface}') sniffers.append( - setup_sniffer(iface, args.ping_type, 'reply', sniffer_params, + setup_sniffer(iface, args.ping_type, 'reply', + sniffer_params, defrag, )) LOGGER.debug(f'Installed {len(sniffers)} sniffers') diff --git a/tests/sys/netpfil/common/sniffer.py b/tests/sys/netpfil/common/sniffer.py index ab3ddc0aea3c..14305a37278c 100644 --- a/tests/sys/netpfil/common/sniffer.py +++ b/tests/sys/netpfil/common/sniffer.py @@ -30,7 +30,7 @@ import scapy.all as sp import sys class Sniffer(threading.Thread): - def __init__(self, args, check_function, recvif, timeout=3): + def __init__(self, args, check_function, recvif, timeout=3, defrag=False): threading.Thread.__init__(self) self._sem = threading.Semaphore(0) @@ -38,6 +38,7 @@ class Sniffer(threading.Thread): self._timeout = timeout self._recvif = recvif self._check_function = check_function + self._defrag = defrag self.correctPackets = 0 self.start() @@ -55,6 +56,15 @@ class Sniffer(threading.Thread): def run(self): self.packets = [] - self.packets = sp.sniff(iface=self._recvif, - stop_filter=self._checkPacket, timeout=self._timeout, - started_callback=self._startedCb) + if self._defrag: + # With fragment reassembly we can't stop the sniffer after catching + # the good packets, as those have not been reassembled. We must + # wait for sniffer to finish and check returned packets instead. + self.packets = sp.sniff(session=sp.IPSession, iface=self._recvif, + timeout=self._timeout, started_callback=self._startedCb) + for p in self.packets: + self._checkPacket(p) + else: + self.packets = sp.sniff(iface=self._recvif, + stop_filter=self._checkPacket, timeout=self._timeout, + started_callback=self._startedCb) From nobody Thu Oct 26 14:16:54 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SGSXk50jTz4xsKC; Thu, 26 Oct 2023 14:16:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SGSXk4P7lz4G2C; Thu, 26 Oct 2023 14:16:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698329814; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=whw/laHq22ql/dD5uP3+E27NuAbw6pOvCIbm0vHuGZU=; b=XE3aTL8eRViGvmcb4p4HMWmxsmFIW6TsB9WqXZ9tFVV7PENyNl3cT2nTvAaXu6bEVsOZKa Wo11FTWKB1nevaKGgp3rq7FPVypOb24EjRolpZXBNjH0txUSd2dSkYYvcROEHpsO4hMNSA P21rJpcgvP7RrPU2Nfw0NbmtbUsEDIsHBXyUMLfC984UJ7s3asWQjTkNqhv1AjoHcxYTG0 +ar2lI4nexJgZJt4t6FYKwhjhsYBI4+U+IkN7t3qGGGMChoJxo7sQoE3VtqISqNoCJxlGF DXoe8z6mBuuZu2SerDeybnLDWebapvjnPKuYsWGOThHtkoxkGxw4jJttqwQxlA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698329814; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=whw/laHq22ql/dD5uP3+E27NuAbw6pOvCIbm0vHuGZU=; b=rNpiK5qK82y4cfewrI1FJJwqqmg5GvrlMbjRbhHZEatbEHPXTGOrgjvfmK0k8BhmzLMtrH wZKAwQrm9wvOk/WJI73QfmJcVchsidX7sYXg6lwrBzrimVSf+z4icvYiBvhQs43KCF0Agy 5VdFqeGTdRehy1TrysGWNIo0+y+4TOdWUvJeD9E+RsNrl+IoD//sF/9aBarkijyGbN9PrC a6tee1BgggOaSfrIc4UR0t52ZNAuJP9IHdZj1O21PyP3C0l5Z0pq05oPkpEMd5GyHdLcfI nu0rn9N11DzwyiYfuRGVGpfugKu7tk/tTNqUXlDdPaspE3jmsjEmtNMSLI+l6A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698329814; a=rsa-sha256; cv=none; b=w/KFXT8HVbMsLOwXBHFiSmKEo3FvR5d5Y9ErFHxT3TRBFjemM8r6W7BRpbI+rRLcpBVGrz LcVap4Ljm13jq5odk+iOpRbGwePtMXjNZG8wDrYcqdGcB7efqK34a1+NpTumRyxHLa992T 9p+fkEZTV95EvPCzGmLpMJEKu4FQARfG+DgF8KiEx7aHZFQwEV66X2Z6oG2q4hUqhErSlx jOTl5r+81VDVQHX93EKEBEH3LqmTBLdagwsSU8+sqBBlo/uUcsRsHLOhw8Q8lXbydu07Ug Dbq+0Hhe587wsGVM3i+YYo75DvqZWNE/mchym/3Rjh3CXWOT/LukJyhf9aZb/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 4SGSXk3R64zb0F; Thu, 26 Oct 2023 14:16:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39QEGsD6055082; Thu, 26 Oct 2023 14:16:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39QEGs6V055079; Thu, 26 Oct 2023 14:16:54 GMT (envelope-from git) Date: Thu, 26 Oct 2023 14:16:54 GMT Message-Id: <202310261416.39QEGs6V055079@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: ede5d4ff5b39 - main - pf: Fix packet reassembly List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: ede5d4ff5b39ccbc193c30fb6c093c7c4de9a464 Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=ede5d4ff5b39ccbc193c30fb6c093c7c4de9a464 commit ede5d4ff5b39ccbc193c30fb6c093c7c4de9a464 Author: Kajetan Staszkiewicz AuthorDate: 2023-10-26 12:26:33 +0000 Commit: Kristof Provost CommitDate: 2023-10-26 13:25:44 +0000 pf: Fix packet reassembly Don't drop fragmented packets when reassembly is disabled, they can be matched by rules with "fragment" keyword. Ensure that presence of scrub rules forces old behaviour. Reviewed by: kp Sponsored by: InnoGames GmbH Differential Revision: https://reviews.freebsd.org/D42355 --- sys/netpfil/pf/pf_norm.c | 51 ++++---- tests/sys/netpfil/pf/Makefile | 1 + tests/sys/netpfil/pf/fragmentation_compat.sh | 11 -- .../sys/netpfil/pf/fragmentation_no_reassembly.sh | 130 +++++++++++++++++++++ 4 files changed, 162 insertions(+), 31 deletions(-) diff --git a/sys/netpfil/pf/pf_norm.c b/sys/netpfil/pf/pf_norm.c index d63cf0ebe54e..9963fe2b741b 100644 --- a/sys/netpfil/pf/pf_norm.c +++ b/sys/netpfil/pf/pf_norm.c @@ -1043,14 +1043,22 @@ pf_normalize_ip(struct mbuf **m0, struct pfi_kkif *kif, u_short *reason, int ip_len; int tag = -1; int verdict; - int srs; + bool scrub_compat; PF_RULES_RASSERT(); r = TAILQ_FIRST(pf_main_ruleset.rules[PF_RULESET_SCRUB].active.ptr); - /* Check if there any scrub rules. Lack of scrub rules means enforced - * packet normalization operation just like in OpenBSD. */ - srs = (r != NULL); + /* + * Check if there are any scrub rules, matching or not. + * Lack of scrub rules means: + * - enforced packet normalization operation just like in OpenBSD + * - fragment reassembly depends on V_pf_status.reass + * With scrub rules: + * - packet normalization is performed if there is a matching scrub rule + * - fragment reassembly is performed if the matching rule has no + * PFRULE_FRAGMENT_NOREASS flag + */ + scrub_compat = (r != NULL); while (r != NULL) { pf_counter_u64_add(&r->evaluations, 1); if (pfi_kkif_match(r->kif, kif) == r->ifnot) @@ -1076,7 +1084,7 @@ pf_normalize_ip(struct mbuf **m0, struct pfi_kkif *kif, u_short *reason, break; } - if (srs) { + if (scrub_compat) { /* With scrub rules present IPv4 normalization happens only * if one of rules has matched and it's not a "no scrub" rule */ if (r == NULL || r->action == PF_NOSCRUB) @@ -1087,12 +1095,6 @@ pf_normalize_ip(struct mbuf **m0, struct pfi_kkif *kif, u_short *reason, pf_counter_u64_add_protected(&r->bytes[pd->dir == PF_OUT], pd->tot_len); pf_counter_u64_critical_exit(); pf_rule_to_actions(r, &pd->act); - } else if ((!V_pf_status.reass && (h->ip_off & htons(IP_MF | IP_OFFMASK)))) { - /* With no scrub rules IPv4 fragment reassembly depends on the - * global switch. Fragments can be dropped early if reassembly - * is disabled. */ - REASON_SET(reason, PFRES_NORM); - goto drop; } /* Check for illegal packets */ @@ -1107,9 +1109,10 @@ pf_normalize_ip(struct mbuf **m0, struct pfi_kkif *kif, u_short *reason, } /* Clear IP_DF if the rule uses the no-df option or we're in no-df mode */ - if ((((r && r->rule_flag & PFRULE_NODF) || - (V_pf_status.reass & PF_REASS_NODF)) && h->ip_off & htons(IP_DF) - )) { + if (((!scrub_compat && V_pf_status.reass & PF_REASS_NODF) || + (r != NULL && r->rule_flag & PFRULE_NODF)) && + (h->ip_off & htons(IP_DF)) + ) { u_int16_t ip_off = h->ip_off; h->ip_off &= htons(~IP_DF); @@ -1143,7 +1146,9 @@ pf_normalize_ip(struct mbuf **m0, struct pfi_kkif *kif, u_short *reason, goto bad; } - if (r==NULL || !(r->rule_flag & PFRULE_FRAGMENT_NOREASS)) { + if ((!scrub_compat && V_pf_status.reass) || + (r != NULL && !(r->rule_flag & PFRULE_FRAGMENT_NOREASS)) + ) { max = fragoff + ip_len; /* Fully buffer all of the fragments @@ -1203,14 +1208,20 @@ pf_normalize_ip6(struct mbuf **m0, struct pfi_kkif *kif, int ooff; u_int8_t proto; int terminal; - int srs; + bool scrub_compat; PF_RULES_RASSERT(); r = TAILQ_FIRST(pf_main_ruleset.rules[PF_RULESET_SCRUB].active.ptr); - /* Check if there any scrub rules. Lack of scrub rules means enforced - * packet normalization operation just like in OpenBSD. */ - srs = (r != NULL); + /* + * Check if there are any scrub rules, matching or not. + * Lack of scrub rules means: + * - enforced packet normalization operation just like in OpenBSD + * With scrub rules: + * - packet normalization is performed if there is a matching scrub rule + * XXX: Fragment reassembly always performed for IPv6! + */ + scrub_compat = (r != NULL); while (r != NULL) { pf_counter_u64_add(&r->evaluations, 1); if (pfi_kkif_match(r->kif, kif) == r->ifnot) @@ -1235,7 +1246,7 @@ pf_normalize_ip6(struct mbuf **m0, struct pfi_kkif *kif, break; } - if (srs) { + if (scrub_compat) { /* With scrub rules present IPv6 normalization happens only * if one of rules has matched and it's not a "no scrub" rule */ if (r == NULL || r->action == PF_NOSCRUB) diff --git a/tests/sys/netpfil/pf/Makefile b/tests/sys/netpfil/pf/Makefile index c9adab5626d4..9337b95baf4e 100644 --- a/tests/sys/netpfil/pf/Makefile +++ b/tests/sys/netpfil/pf/Makefile @@ -13,6 +13,7 @@ ATF_TESTS_SH+= altq \ forward \ fragmentation_compat \ fragmentation_pass \ + fragmentation_no_reassembly \ get_state \ icmp \ killstate \ diff --git a/tests/sys/netpfil/pf/fragmentation_compat.sh b/tests/sys/netpfil/pf/fragmentation_compat.sh index f66ebbad6b33..21ce6b734ea1 100644 --- a/tests/sys/netpfil/pf/fragmentation_compat.sh +++ b/tests/sys/netpfil/pf/fragmentation_compat.sh @@ -300,17 +300,6 @@ reassemble_body() atf_check -s exit:0 -o ignore ping -c 1 192.0.2.2 jexec alcatraz pfctl -e - pft_set_rules alcatraz \ - "pass out" \ - "block in" \ - "pass in inet proto icmp all icmp-type echoreq" - - # Single fragment passes - atf_check -s exit:0 -o ignore ping -c 1 192.0.2.2 - - # But a fragmented ping does not - atf_check -s exit:2 -o ignore ping -c 1 -s 2000 192.0.2.2 - pft_set_rules alcatraz \ "scrub in" \ "pass out" \ diff --git a/tests/sys/netpfil/pf/fragmentation_no_reassembly.sh b/tests/sys/netpfil/pf/fragmentation_no_reassembly.sh new file mode 100644 index 000000000000..fb5c15ac2ff8 --- /dev/null +++ b/tests/sys/netpfil/pf/fragmentation_no_reassembly.sh @@ -0,0 +1,130 @@ +# +# SPDX-License-Identifier: BSD-2-Clause +# +# Copyright (c) 2017 Kristof Provost +# Copyright (c) 2023 Kajetan Staszkiewicz +# +# 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. + +. $(atf_get_srcdir)/utils.subr + +atf_test_case "match_full_v4" "cleanup" +match_full_v4_head() +{ + atf_set descr 'Matching non-fragmented IPv4 packets' + atf_set require.user root + atf_set require.progs scapy +} + +match_full_v4_body() +{ + setup_router_dummy_ipv4 + + # Sanity check. + ping_dummy_check_request exit:0 --ping-type=icmp + + # Only non-fragmented packets are passed + jexec router pfctl -e + pft_set_rules router \ + "pass out" \ + "block in" \ + "pass in inet proto icmp all icmp-type echoreq" + ping_dummy_check_request exit:0 --ping-type=icmp + ping_dummy_check_request exit:1 --ping-type=icmp --send-length=2000 --send-frag-length 1000 +} + +match_full_v4_cleanup() +{ + pft_cleanup +} + + +atf_test_case "match_fragment_v4" "cleanup" +match_fragment_v4_head() +{ + atf_set descr 'Matching fragmented IPv4 packets' + atf_set require.user root + atf_set require.progs scapy +} + +match_fragment_v4_body() +{ + setup_router_dummy_ipv4 + + # Sanity check. + ping_dummy_check_request exit:0 --ping-type=icmp + + # Only fragmented packets are passed + pft_set_rules router \ + "pass out" \ + "block in" \ + "pass in inet proto icmp fragment" + ping_dummy_check_request exit:1 --ping-type=icmp + ping_dummy_check_request exit:0 --ping-type=icmp --send-length=2000 --send-frag-length 1000 +} + +match_fragment_v4_cleanup() +{ + pft_cleanup +} + + +atf_test_case "compat_override_v4" "cleanup" +compat_override_v4_head() +{ + atf_set descr 'Scrub rules override "set reassemble" for IPv4' + atf_set require.user root + atf_set require.progs scapy +} + +compat_override_v4_body() +{ + setup_router_dummy_ipv4 + + # Sanity check. + ping_dummy_check_request exit:0 --ping-type=icmp + + # The same as match_fragment_v4 but with "set reassemble yes" which + # is ignored because of presence of scrub rules. + # Only fragmented packets are passed. + pft_set_rules router \ + "set reassemble yes" \ + "no scrub" \ + "pass out" \ + "block in" \ + "pass in inet proto icmp fragment" + ping_dummy_check_request exit:1 --ping-type=icmp + ping_dummy_check_request exit:0 --ping-type=icmp --send-length=2000 --send-frag-length 1000 +} + +compat_override_v4_cleanup() +{ + pft_cleanup +} + + +atf_init_test_cases() +{ + atf_add_test_case "match_full_v4" + atf_add_test_case "match_fragment_v4" + atf_add_test_case "compat_override_v4" +} From nobody Thu Oct 26 16:15:48 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SGW9w586Fz4y0vy; Thu, 26 Oct 2023 16:15: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 4SGW9w3flwz4P86; Thu, 26 Oct 2023 16:15:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698336948; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/JlESpDCf30oXkjgzhQZUs9xDMIwhzLLryRq7JuAqg0=; b=hUdVvit1k2SUzMKRI3XiKrfj8JwtWpIsZdh4Q+I6QcEvS9NZwq7qTo/UmiLfyHEKnzEYUE 4XKmvbI8s3bb5YKdKaxF0PQGAh0bfeB5UiamfNYXXBnd+I5D0L3K/gagkzW19diZcnbtVd V28XPv9/AqJFE/06lrqh68i/rZQdY+II2NyF/WWxc4Cc62SQIPxzUaQnbroQr7YWwUTmTC OO0vZT+KuAnyhzsL2DLTH79OsGv/XHV5U82P0Ai1QJzi3QKMryw8ekX2msjqlA8m4MgCV/ YwZKZj2zlCwYomA6QqdvrAM6W3Le1aCcLKj9WOYPbV6w+ycqiDl4rQ+abj35ZQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698336948; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/JlESpDCf30oXkjgzhQZUs9xDMIwhzLLryRq7JuAqg0=; b=Z1ORieoMcXFwyvRH1mmMOyrwoPTFqKCy+4RMO7yN/4zP6fPZVFILtBaDITeIpuHxVjqYL2 MqA+nswgBO4LurevZj7BCS2TBZGv0M58iDlNILE/d6YtJfbHmxxD9HvyaGCgu6k1kP8Uzm Uog7kCX7i31AYZ2lPAT4VddGpdoQvQmIkKG0rU+3DPSOPOHpAiDdsZmB7CHRU0uqpAXIzn q+Tbdlh0sB81qOCSZ0lo8sDqYXNjiv8JvPMjPbuT2GzyGN/te1vCfRLx6eS7tz3d7Wsxe9 GZ4XMaEzumn48VB3pvTG6I0t+TojV21maWPoQB/kx67YQ55D/fmVsQj7jERn1w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698336948; a=rsa-sha256; cv=none; b=yCAQWWQVeH3jH1sU2Fgqu2WAe5LygEFtaT65Oa0YigxvPClN0WPC8dI/4JIRKM3AIrH6pA Z9zPNF/kVO5agKjbkpwW5yW4ZwsZ0tc8nacUTzfAixCiTPDNZtOujdu4cbeLpaqwjqATNT mlQotbd2berybAcKojKozfZtgRrTQlwKqjrFRL+EK2rzvDAZ/zBJRYLrnTGovnIbrdPNyu XFfqR72tnoNYnM+bjQOLexPo7Ur4uN4igSPbDzT0tC5RRD8zVk+rNximpGCth+CSs/JEcv BpRWDaIcaE0mB8mJmMy0rswx29/vo3c4Vk+QssNKg7M4Cw8myzTBgfnDu/hTrQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SGW9w2lKlzdfZ; Thu, 26 Oct 2023 16:15: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 39QGFmuY055975; Thu, 26 Oct 2023 16:15:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39QGFmWg055972; Thu, 26 Oct 2023 16:15:48 GMT (envelope-from git) Date: Thu, 26 Oct 2023 16:15:48 GMT Message-Id: <202310261615.39QGFmWg055972@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: 5e50df6dc026 - main - devd: Restore WARNS=6 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5e50df6dc026853d578b295af7891b34c59adfe9 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=5e50df6dc026853d578b295af7891b34c59adfe9 commit 5e50df6dc026853d578b295af7891b34c59adfe9 Author: Warner Losh AuthorDate: 2023-10-26 04:35:45 +0000 Commit: Warner Losh CommitDate: 2023-10-26 16:11:59 +0000 devd: Restore WARNS=6 We compile correctly on all platforms with clang and WARNS=6. We build on amd64 with gcc12 and WARNS.6. Restore WARNS=6. This reverts 3741a56c310d, since that's no longer relevant. Sponsored by: Netflix --- sbin/devd/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbin/devd/Makefile b/sbin/devd/Makefile index f1a5f12ac478..7f334ad6b409 100644 --- a/sbin/devd/Makefile +++ b/sbin/devd/Makefile @@ -1,7 +1,7 @@ .include -WARNS?= 3 +WARNS?= 6 PACKAGE=devd CONFGROUPS= CONFS DEVD CONFS= devd.conf From nobody Thu Oct 26 16:15:49 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SGW9x56f3z4y0sn; Thu, 26 Oct 2023 16:15: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 4SGW9x4g1qz4PDx; Thu, 26 Oct 2023 16:15:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698336949; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=t78F7AXUNAPWBSrzL98hi3oaPxYY0EJYGOEpoMi1hJ4=; b=GJOzJaP5kkDSd32mEYXDBl3fN5vTPLdbju09l0M1E4fk6bnRqNzqbPF63XK1n4+9twvwCz Qnp+S5K12LA8wzNmKqxuLUqSEjnAn2DhRgNTi7AT/gGY5QUd10bxLL3FNI2/ZBQKJxeXpa 56lvo8rRHHq34xUvkUd459xAGu0fcUIBwp2gzOXaE0lph0Pim8IyTi1xCOSXMeZRbuLcMs mgaZTp5RPXa/K0n618RaQNJRc9gq5j5axD7+RssdEb1DHZarhKCoqsC5K9XjbfaDeb/j/q etPsiUMTo10Jg2ZVFt9jQ/d8rmn7asoWHdrY90Dcd89mBICDFZ44dYgapbyBNw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698336949; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=t78F7AXUNAPWBSrzL98hi3oaPxYY0EJYGOEpoMi1hJ4=; b=nv3A061VA6mr1YVePUZGAfjrrZOJuIlALynKCGhGLV7ixVjRlTJ+f/RsLRaKWeheGSbUKq +SOm6S4JibdAxAztZv6hDuictHAvSraGArdva0Q5UxsJSLz0O346LGH0gbWW//qymBDHse jUx/4Cr7lbYMIkkzlsJQ0ChKQTB7htXcw4wBNC8SxyTZI4WLjYXfaXCV9/W4B2y2wxyUkK Tqk1TEMu/hsLng84bNyt9sJe3YgJXmChYjqqstPP2ekyd0APi5swgtlW+lRVJuCmcTLpHl 8PMeihbKu8OvJNMlu/kXHhK0ZkRliSqEWdBliGyOeEnIIIa+tvM7jQEH6+zV9w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698336949; a=rsa-sha256; cv=none; b=M6BGAktws3ob9cHJ3lQPnuU/81XMfjOSMwQVrGn2AzkER3sut0OtD157FvIwIYHRh3SWGl TWAe7lqnaOIpxOQR9cWkHVMnmWeRxu5KZLdDCo+kplQXliskrO0KDvXxhDrr84SqsrYDGT G1pApTc6blEfNpEphWTT0FziCH1yrtUOBgHznyaZA6yrDgWzfcxjHzCfOXvG1tLWkvP3Mv hsL+VAPxjlOKhF8ec9iWEbN5bODranXuuauiNc2B3EzOoUgicknpRh4wBg0s0Hu6zV0kEZ fSAgCPOC96+RDtkMOTYf7XqwHhOYU3RIivFka+9ij/+HEYZtVVfYTuALkb4mWQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SGW9x3jghzdYb; Thu, 26 Oct 2023 16:15: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 39QGFnis056021; Thu, 26 Oct 2023 16:15:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39QGFn6g056018; Thu, 26 Oct 2023 16:15:49 GMT (envelope-from git) Date: Thu, 26 Oct 2023 16:15:49 GMT Message-Id: <202310261615.39QGFn6g056018@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: 860b8fec5374 - main - ttys: Document insecure flag List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 860b8fec5374e3d88950ff4160cd04c53c9d571c Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=860b8fec5374e3d88950ff4160cd04c53c9d571c commit 860b8fec5374e3d88950ff4160cd04c53c9d571c Author: Warner Losh AuthorDate: 2023-10-26 16:09:16 +0000 Commit: Warner Losh CommitDate: 2023-10-26 16:12:57 +0000 ttys: Document insecure flag Both the secure and insecure flag is documented in init(8). the secure flag is documented here; however, the insecure flag is not. Nor is the nuance that a line missing the 'secure' flag is also considered insecure. Document both here. Sponsored by: Netflix --- libexec/getty/ttys.5 | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libexec/getty/ttys.5 b/libexec/getty/ttys.5 index f0173e0f4516..132b921084d8 100644 --- a/libexec/getty/ttys.5 +++ b/libexec/getty/ttys.5 @@ -111,8 +111,9 @@ path. Otherwise, it is considered a path relative to .Pa /dev . The flag ``secure'' (if the console is enabled) allows users with a -uid of 0 to login on -this line. +uid of 0 to login on this line. +The flag ``insecure'' as well as the absence of the ``secure'' flag +disallows users with uid of 0 to login on this line. The flag ``dialup'' indicates that a tty entry describes a dialin line, and ``network'' is obsolete and does nothing. Either of these strings may also be specified in the terminal type From nobody Thu Oct 26 16:20:31 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SGWHM5NY0z4y0wp; Thu, 26 Oct 2023 16:20: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 4SGWHM4YRzz4Pmc; Thu, 26 Oct 2023 16:20:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698337231; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pwLyIqnQGlSntEuIvfXgLQyghAaJUOjx4AZI10PkqdY=; b=Bz+SYLoflpIvhOsYdYeugVG89nQTEYlmsHhOs8pwUY4Rs9oKuurUm7Y0u/jY4jU1nx4Wy7 dnBSBIukUX2nHlc0wuDSqMZokMCrJ/2Qc06YePL3yjGdjb9Kkhd8FaEQP2FiHQw3FRKdUy c2nmd+8dXQXtYSdp1SXbWeA+jx4A8m6MRryQKDR3poDMv64pDDT5uNPg8mszXvOElq575p lmZu4SfB6y0n1whfrEBh+HVplS6kuoLBTgKfCMqLNHbIr/f8uoBnR16clVt3Up5ImkIpsb ZmWI+bliGZV0K+B+lK/aboMsbgjZhioubd56OmXthXrmZIE0/HR4WQb3U0Fnnw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698337231; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pwLyIqnQGlSntEuIvfXgLQyghAaJUOjx4AZI10PkqdY=; b=CMPOA/i9iJnS7fDIXbX6GZVi3+3pLwtV7TIB2FDJiVXAL4ihfxSAUZ+tA8QxhUG1NpC7WU pVV95fItPrz4PSOxKs2Byn6XKbosjr2zEJsk22i3iKwRVlh8a1EZVt9nbVjFzgB9X8c672 JOr5+e1fQXNB8MwS84aO4oPIZdqmY1pvHC5/ZMGu8TZALgxCwjNULuEEomz5GxfZdr5QdQ yEihlKUjssFuG/pT6DMaz0e+JofiMGE7JJz8WUA/b6MzhLS9otUlfrwFIQuCmghVAHn6iJ hqqAK4WDLgeqpicGQcfYIXttTsRxCZGCjokRfl0AVJalN3sREAgbYMUzYLy/+A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698337231; a=rsa-sha256; cv=none; b=x+07HBeK88Cf/4eTx5MpKsTV2nQJz1y4rXU93Yw3yWk6TxMql3Keqi+d2Sp3ARXhOEDHZe kTx21kmIZxqq69i3GEDuji6WFdcCmkVtvHOlsUIpbIfpoxGoW2cV2O0VuIBXJ1/HINWnaG 2d8AMbKvrZOajR6ExPpa7nUXCWpNkCy6z8FoNaqNqjWnX3J9aVN1LM7qTPXmjBA9nff3dZ bA9amQr6Um88WiS8TnmmXeK2nm2X7YCUv5eb4nGp3sUtWUYAG+1Bnf/y3bcZ2KPV2oyjEH lmCUMDAktnZ0JtbtgdufWCCePEqnkl3kRdAy8hZ6EwROe50B09xVNFdsdAod9A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SGWHM3dBRzdWC; Thu, 26 Oct 2023 16:20: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 39QGKVFs065214; Thu, 26 Oct 2023 16:20:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39QGKVmw065211; Thu, 26 Oct 2023 16:20:31 GMT (envelope-from git) Date: Thu, 26 Oct 2023 16:20:31 GMT Message-Id: <202310261620.39QGKVmw065211@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: 5c9f0f72f47e - main - gpart: Be less picky about GPT Tables in some cases List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5c9f0f72f47ea5315e5147185e47c2efca2e8c85 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=5c9f0f72f47ea5315e5147185e47c2efca2e8c85 commit 5c9f0f72f47ea5315e5147185e47c2efca2e8c85 Author: Warner Losh AuthorDate: 2023-10-26 16:14:54 +0000 Commit: Warner Losh CommitDate: 2023-10-26 16:14:54 +0000 gpart: Be less picky about GPT Tables in some cases When we're recoverying a damangae GPT, or when we're restoring a backed up partition tables, don't enforce the 4k alignment for start/end LBAs. This is useful for 512e/4kn drives when we're creating a new partition table or partition. However, when we're trying to fix / restore an old partition, we shouldn't force this alignment, since in that case it's more important to use the partition table as is than to optimize performance by rounding (which isn't required by the standard). MFC After: 1 week Sponsored by: Netflix Differential Revision: https://reviews.freebsd.org/D42359 --- sys/geom/part/g_part_gpt.c | 41 +++++++++++++++++++++++++++++------------ 1 file changed, 29 insertions(+), 12 deletions(-) diff --git a/sys/geom/part/g_part_gpt.c b/sys/geom/part/g_part_gpt.c index 990ace4a25d4..c4cc840f583d 100644 --- a/sys/geom/part/g_part_gpt.c +++ b/sys/geom/part/g_part_gpt.c @@ -103,7 +103,8 @@ struct g_part_gpt_entry { static void g_gpt_printf_utf16(struct sbuf *, uint16_t *, size_t); static void g_gpt_utf8_to_utf16(const uint8_t *, uint16_t *, size_t); -static void g_gpt_set_defaults(struct g_part_table *, struct g_provider *); +static void g_gpt_set_defaults(struct g_part_table *, struct g_provider *, + struct g_part_parms *); static int g_part_gpt_add(struct g_part_table *, struct g_part_entry *, struct g_part_parms *); @@ -717,7 +718,7 @@ g_part_gpt_create(struct g_part_table *basetable, struct g_part_parms *gpp) table->hdr->hdr_entries = basetable->gpt_entries; table->hdr->hdr_entsz = sizeof(struct gpt_ent); - g_gpt_set_defaults(basetable, pp); + g_gpt_set_defaults(basetable, pp, gpp); return (0); } @@ -1083,7 +1084,7 @@ g_part_gpt_recover(struct g_part_table *basetable) table = (struct g_part_gpt_table *)basetable; pp = LIST_FIRST(&basetable->gpt_gp->consumer)->provider; gpt_create_pmbr(table, pp); - g_gpt_set_defaults(basetable, pp); + g_gpt_set_defaults(basetable, pp, NULL); basetable->gpt_corrupt = 0; return (0); } @@ -1300,7 +1301,8 @@ g_part_gpt_write(struct g_part_table *basetable, struct g_consumer *cp) } static void -g_gpt_set_defaults(struct g_part_table *basetable, struct g_provider *pp) +g_gpt_set_defaults(struct g_part_table *basetable, struct g_provider *pp, + struct g_part_parms *gpp) { struct g_part_entry *baseentry; struct g_part_gpt_entry *entry; @@ -1334,14 +1336,29 @@ g_gpt_set_defaults(struct g_part_table *basetable, struct g_provider *pp) if (entry->ent.ent_lba_end > max) max = entry->ent.ent_lba_end; } - spb = 4096 / pp->sectorsize; - if (spb > 1) { - lba = start + ((start % spb) ? spb - start % spb : 0); - if (lba <= min) - start = lba; - lba = end - (end + 1) % spb; - if (max <= lba) - end = lba; + /* + * Don't force alignment of any kind whatsoever on resize, restore or + * recover. resize doesn't go through this path, recover has a NULL gpp + * and restore has flags == restore (maybe with an appended 'C' to + * commit the operation). For these operations, we have to trust the + * user knows what they are doing. + * + * Otherwise it some flavor of creation of a new partition, so we align + * to a 4k offset on the drive, to make 512e/4kn drives more performant + * by default. + */ + if (gpp == NULL || + (gpp->gpp_parms & G_PART_PARM_FLAGS) == 0 || + strstr(gpp->gpp_flags, "restore") == NULL) { + spb = 4096 / pp->sectorsize; + if (spb > 1) { + lba = start + ((start % spb) ? spb - start % spb : 0); + if (lba <= min) + start = lba; + lba = end - (end + 1) % spb; + if (max <= lba) + end = lba; + } } table->hdr->hdr_lba_start = start; table->hdr->hdr_lba_end = end; From nobody Thu Oct 26 17:03:07 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SGXDW42L1z4y35T; Thu, 26 Oct 2023 17:03: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 4SGXDW3T92z4TCD; Thu, 26 Oct 2023 17:03:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698339787; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=x9H7pwiHiVFI44FpDPJJvdWtMXvjdwEHxO9puVYIQ2k=; b=BDk8wudutW5amnbHDJxFEXsDP3RWNVFLVjy3XYcRa9QUzciziCcev9eRK96XjiAb+8Ifd+ +vuXpuRj44ph0jePcspCRgNjri42nUgFCXeiMMGNqgBnHfVNRJebDy/W+qQ2yzjTEuSmjr OAGp5o2o/5kYvcN35urk83oW98/FFGrzK+FSWoNrr7ajMxzw34ISRVQkBc202dcp1yRSIr 7letubL4lE+UO/U/2ggOfFQ+EcU+AIaG3w5DWwJtYuAMDETY51ZjlZG38ebN5Ud2srzV+Q msnUQ7llFXF/oot5uv/lV8w6TemJsoSEE0tnybnX5lrPuqvBxxLXka+//xFUvg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698339787; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=x9H7pwiHiVFI44FpDPJJvdWtMXvjdwEHxO9puVYIQ2k=; b=lF3oM7YQsQo0nbqGpspd5ttQqb2T36w7gtthYA/biJd0mrfFXdEPPkrfinklYYOGIxo/Mg tVV0S/ixjo2/EYpgk6QAPZsrp8zwE7GNmHdZOSAP11nlb99DA1lmTAey2TIxD0+DS77r5G EyX7vwrXlJgSWA9YfmKOPPHF07hXsOyVPnS9qc7wRVRGCaiscDcHUKxGAdXVZ7rjEJpoEe rtzQ75lJo6ZK+UydcCn+OqQ/iKMWXcKjypVHov+TpxIkh/0FTFA3V6EIwZnm6zNCErtO5i be0ir/i+pig0JUHl4u2DgNgwI+TRvXxH/I2/pnrsqSswjaN0b8ZtwU07En8rTQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698339787; a=rsa-sha256; cv=none; b=wob9FrOahL9034Op7PSQU2SA2n+qQbYMRVLbwH/bp7nF+sn5CNR0X1u0CQdO8OMwovooOV hXjr0Eiv/wGTn7jixkREqc9m6X+vVP9m3FYGaA7MeZmlhtGYKflxeJJ7Hc6vFqK8VQfwAD HVXk4hc0vO7Rsbv/P0Fn/zHE7ZL2OZcOhmSHfDejXEOt+dTKUeRl4AlObPbFKkY12I+lKM 66rUDuaY0GCMbxJ5wrQbDyHl2PgLBV4NbILuCIUbKbYtN0Vl8cfS7ABFXnnVFdS6nwh8/9 V+dkx4iIuBoSbZueljm3kCnNY6R5Trnpdqy7ixAy6BYq+L3KLPqH37u30AVLwQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SGXDW2Nt6zf7j; Thu, 26 Oct 2023 17:03: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 39QH37oA039486; Thu, 26 Oct 2023 17:03:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39QH373i039483; Thu, 26 Oct 2023 17:03:07 GMT (envelope-from git) Date: Thu, 26 Oct 2023 17:03:07 GMT Message-Id: <202310261703.39QH373i039483@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: 930cec16d9ee - releng/14.0 - OpenSSL: update to 3.0.12 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.0 X-Git-Reftype: branch X-Git-Commit: 930cec16d9ee11584a10130bef9be002113e31de Auto-Submitted: auto-generated The branch releng/14.0 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=930cec16d9ee11584a10130bef9be002113e31de commit 930cec16d9ee11584a10130bef9be002113e31de Author: Ed Maste AuthorDate: 2023-10-24 18:55:56 +0000 Commit: Ed Maste CommitDate: 2023-10-26 17:02:36 +0000 OpenSSL: update to 3.0.12 OpenSSL 3.0.12 addresses: * Fix incorrect key and IV resizing issues when calling EVP_EncryptInit_ex2(), EVP_DecryptInit_ex2() or EVP_CipherInit_ex2() with OSSL_PARAM parameters that alter the key or IV length ([CVE-2023-5363]). Relnotes: Yes Sponsored by: The FreeBSD Foundation (cherry picked from commit ad991e4c142ebabad7aef488ad97b189ecabb270) (cherry picked from commit 575878a533823aa3e5bab715928d9cdffbc4dcbc) (cherry picked from commit e833378cf9589171562ccad4c6ff59c3713770bd) Approved by: so Approved by: re (gjb) --- crypto/openssl/CHANGES.md | 9 +++ crypto/openssl/INSTALL.md | 4 +- crypto/openssl/NEWS.md | 6 ++ crypto/openssl/VERSION.dat | 4 +- crypto/openssl/apps/dgst.c | 2 + crypto/openssl/apps/dhparam.c | 4 +- crypto/openssl/apps/dsaparam.c | 4 +- crypto/openssl/apps/enc.c | 5 +- crypto/openssl/apps/gendsa.c | 4 +- crypto/openssl/apps/genpkey.c | 4 +- crypto/openssl/apps/genrsa.c | 4 +- crypto/openssl/apps/lib/apps.c | 16 ++++-- crypto/openssl/apps/req.c | 2 + crypto/openssl/apps/speed.c | 3 +- crypto/openssl/crypto/aes/asm/aesv8-armx.pl | 3 + crypto/openssl/crypto/arm_arch.h | 7 +-- crypto/openssl/crypto/bn/bn_gcd.c | 8 +-- crypto/openssl/crypto/build.info | 2 - crypto/openssl/crypto/cms/cms_enc.c | 5 +- crypto/openssl/crypto/cms/cms_err.c | 4 +- crypto/openssl/crypto/cms/cms_sd.c | 14 ++++- crypto/openssl/crypto/dh/dh_check.c | 3 +- crypto/openssl/crypto/dh/dh_key.c | 3 +- crypto/openssl/crypto/dh/dh_lib.c | 4 +- crypto/openssl/crypto/dsa/dsa_check.c | 8 ++- crypto/openssl/crypto/dsa/dsa_lib.c | 4 +- crypto/openssl/crypto/dsa/dsa_ossl.c | 1 - crypto/openssl/crypto/engine/eng_pkey.c | 44 ++++++++++++++- crypto/openssl/crypto/engine/eng_table.c | 1 + crypto/openssl/crypto/err/openssl.txt | 1 + crypto/openssl/crypto/evp/evp_enc.c | 45 ++++++++++++++- crypto/openssl/crypto/evp/legacy_sha.c | 8 ++- crypto/openssl/crypto/evp/p_lib.c | 2 +- crypto/openssl/crypto/evp/pmeth_lib.c | 5 +- crypto/openssl/crypto/ex_data.c | 4 +- crypto/openssl/crypto/ffc/ffc_key_validate.c | 16 ++---- crypto/openssl/crypto/lhash/lhash.c | 6 +- crypto/openssl/crypto/mem.c | 12 +++- crypto/openssl/crypto/modes/asm/ghashv8-armx.pl | 5 +- crypto/openssl/crypto/objects/obj_dat.c | 7 ++- crypto/openssl/crypto/param_build_set.c | 13 +++-- .../openssl/crypto/poly1305/asm/poly1305-armv8.pl | 26 ++++----- crypto/openssl/crypto/property/property_parse.c | 34 +++++++++-- crypto/openssl/crypto/rsa/rsa_backend.c | 14 +---- crypto/openssl/crypto/rsa/rsa_lib.c | 32 ++++++++--- crypto/openssl/doc/man3/CMS_add1_signer.pod | 8 ++- crypto/openssl/doc/man3/DH_generate_parameters.pod | 6 +- .../openssl/doc/man3/DSA_generate_parameters.pod | 4 +- crypto/openssl/doc/man3/EVP_aes_128_gcm.pod | 8 +-- crypto/openssl/doc/man3/EVP_aria_128_gcm.pod | 2 +- crypto/openssl/doc/man3/EVP_bf_cbc.pod | 2 +- crypto/openssl/doc/man3/EVP_blake2b512.pod | 2 +- crypto/openssl/doc/man3/EVP_camellia_128_ecb.pod | 2 +- crypto/openssl/doc/man3/EVP_cast5_cbc.pod | 2 +- crypto/openssl/doc/man3/EVP_chacha20.pod | 2 +- crypto/openssl/doc/man3/EVP_des_cbc.pod | 2 +- crypto/openssl/doc/man3/EVP_desx_cbc.pod | 2 +- crypto/openssl/doc/man3/EVP_idea_cbc.pod | 2 +- crypto/openssl/doc/man3/EVP_md2.pod | 2 +- crypto/openssl/doc/man3/EVP_md4.pod | 2 +- crypto/openssl/doc/man3/EVP_md5.pod | 2 +- crypto/openssl/doc/man3/EVP_mdc2.pod | 2 +- crypto/openssl/doc/man3/EVP_rc2_cbc.pod | 2 +- crypto/openssl/doc/man3/EVP_rc4.pod | 2 +- crypto/openssl/doc/man3/EVP_rc5_32_12_16_cbc.pod | 2 +- crypto/openssl/doc/man3/EVP_ripemd160.pod | 2 +- crypto/openssl/doc/man3/EVP_seed_cbc.pod | 2 +- crypto/openssl/doc/man3/EVP_sha1.pod | 2 +- crypto/openssl/doc/man3/EVP_sha224.pod | 2 +- crypto/openssl/doc/man3/EVP_sha3_224.pod | 2 +- crypto/openssl/doc/man3/EVP_sm3.pod | 2 +- crypto/openssl/doc/man3/EVP_sm4_cbc.pod | 2 +- crypto/openssl/doc/man3/EVP_whirlpool.pod | 2 +- crypto/openssl/doc/man3/PKCS5_PBKDF2_HMAC.pod | 5 +- .../openssl/doc/man3/SSL_CONF_CTX_set_ssl_ctx.pod | 10 +++- .../openssl/doc/man3/SSL_CTX_set_info_callback.pod | 16 ++++-- .../openssl/doc/man3/d2i_PKCS8PrivateKey_bio.pod | 4 +- crypto/openssl/doc/man3/d2i_X509.pod | 26 +++++++-- crypto/openssl/include/openssl/cmserr.h | 3 +- crypto/openssl/include/openssl/evp.h | 4 +- crypto/openssl/include/openssl/opensslv.h | 10 ++-- crypto/openssl/include/openssl/pkcs7.h.in | 6 +- crypto/openssl/providers/fips-sources.checksums | 40 ++++++------- crypto/openssl/providers/fips.checksum | 2 +- .../encode_decode/encode_key2text.c | 65 +++++++++------------- .../providers/implementations/keymgmt/dh_kmgmt.c | 2 +- .../providers/implementations/macs/kmac_prov.c | 6 +- secure/lib/libcrypto/Makefile.inc | 4 +- sys/crypto/openssl/aarch64/aesv8-armx.S | 6 +- sys/crypto/openssl/aarch64/arm_arch.h | 7 +-- sys/crypto/openssl/aarch64/ghashv8-armx.S | 26 ++++----- sys/crypto/openssl/aarch64/poly1305-armv8.S | 24 ++++---- 92 files changed, 471 insertions(+), 281 deletions(-) diff --git a/crypto/openssl/CHANGES.md b/crypto/openssl/CHANGES.md index a26bdbdd0ad0..f464b2320e9c 100644 --- a/crypto/openssl/CHANGES.md +++ b/crypto/openssl/CHANGES.md @@ -28,6 +28,14 @@ breaking changes, and mappings for the large list of deprecated functions. [Migration guide]: https://github.com/openssl/openssl/tree/master/doc/man7/migration_guide.pod +### Changes between 3.0.11 and 3.0.12 [24 Oct 2023] + + * Fix incorrect key and IV resizing issues when calling EVP_EncryptInit_ex2(), + EVP_DecryptInit_ex2() or EVP_CipherInit_ex2() with OSSL_PARAM parameters + that alter the key or IV length ([CVE-2023-5363]). + + *Paul Dale* + ### Changes between 3.0.10 and 3.0.11 [19 Sep 2023] * Fix POLY1305 MAC implementation corrupting XMM registers on Windows. @@ -19732,6 +19740,7 @@ ndif +[CVE-2023-5363]: https://www.openssl.org/news/vulnerabilities.html#CVE-2023-5363 [CVE-2023-4807]: https://www.openssl.org/news/vulnerabilities.html#CVE-2023-4807 [CVE-2023-3817]: https://www.openssl.org/news/vulnerabilities.html#CVE-2023-3817 [CVE-2023-3446]: https://www.openssl.org/news/vulnerabilities.html#CVE-2023-3446 diff --git a/crypto/openssl/INSTALL.md b/crypto/openssl/INSTALL.md index ad4a51026d7c..fef408e9d1e3 100644 --- a/crypto/openssl/INSTALL.md +++ b/crypto/openssl/INSTALL.md @@ -2,8 +2,8 @@ Build and Install ================= This document describes installation on all supported operating -systems (the Unix/Linux family, including macOS), OpenVMS, -and Windows). +systems: the Unix/Linux family (including macOS), OpenVMS, +and Windows. Table of Contents ================= diff --git a/crypto/openssl/NEWS.md b/crypto/openssl/NEWS.md index f7ca47baff87..8f0d973e057b 100644 --- a/crypto/openssl/NEWS.md +++ b/crypto/openssl/NEWS.md @@ -18,6 +18,11 @@ OpenSSL Releases OpenSSL 3.0 ----------- +### Major changes between OpenSSL 3.0.11 and OpenSSL 3.0.12 [24 Oct 2023] + + * Mitigate incorrect resize handling for symmetric cipher keys and IVs. + ([CVE-2023-5363]) + ### Major changes between OpenSSL 3.0.10 and OpenSSL 3.0.11 [19 Sep 2023] * Fix POLY1305 MAC implementation corrupting XMM registers on Windows @@ -1453,6 +1458,7 @@ OpenSSL 0.9.x +[CVE-2023-5363]: https://www.openssl.org/news/vulnerabilities.html#CVE-2023-5363 [CVE-2023-4807]: https://www.openssl.org/news/vulnerabilities.html#CVE-2023-4807 [CVE-2023-3817]: https://www.openssl.org/news/vulnerabilities.html#CVE-2023-3817 [CVE-2023-3446]: https://www.openssl.org/news/vulnerabilities.html#CVE-2023-3446 diff --git a/crypto/openssl/VERSION.dat b/crypto/openssl/VERSION.dat index c4157a86274d..9d9448118e6d 100644 --- a/crypto/openssl/VERSION.dat +++ b/crypto/openssl/VERSION.dat @@ -1,7 +1,7 @@ MAJOR=3 MINOR=0 -PATCH=11 +PATCH=12 PRE_RELEASE_TAG= BUILD_METADATA= -RELEASE_DATE="19 Sep 2023" +RELEASE_DATE="24 Oct 2023" SHLIB_VERSION=3 diff --git a/crypto/openssl/apps/dgst.c b/crypto/openssl/apps/dgst.c index e12389197de4..3f02af0d5738 100644 --- a/crypto/openssl/apps/dgst.c +++ b/crypto/openssl/apps/dgst.c @@ -320,6 +320,8 @@ int dgst_main(int argc, char **argv) sigkey = app_keygen(mac_ctx, mac_name, 0, 0 /* not verbose */); /* Verbose output would make external-tests gost-engine fail */ EVP_PKEY_CTX_free(mac_ctx); + if (sigkey == NULL) + goto end; } if (hmac_key != NULL) { diff --git a/crypto/openssl/apps/dhparam.c b/crypto/openssl/apps/dhparam.c index 43906cea5649..2a54dca9d8b5 100644 --- a/crypto/openssl/apps/dhparam.c +++ b/crypto/openssl/apps/dhparam.c @@ -1,5 +1,5 @@ /* - * Copyright 1995-2022 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -222,6 +222,8 @@ int dhparam_main(int argc, char **argv) } tmppkey = app_paramgen(ctx, alg); + if (tmppkey == NULL) + goto end; EVP_PKEY_CTX_free(ctx); ctx = NULL; if (dsaparam) { diff --git a/crypto/openssl/apps/dsaparam.c b/crypto/openssl/apps/dsaparam.c index b5555282be6e..ca91beb5b893 100644 --- a/crypto/openssl/apps/dsaparam.c +++ b/crypto/openssl/apps/dsaparam.c @@ -1,5 +1,5 @@ /* - * Copyright 1995-2022 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -218,6 +218,8 @@ int dsaparam_main(int argc, char **argv) goto end; } pkey = app_keygen(ctx, "DSA", numbits, verbose); + if (pkey == NULL) + goto end; assert(private); if (outformat == FORMAT_ASN1) i = i2d_PrivateKey_bio(out, pkey); diff --git a/crypto/openssl/apps/enc.c b/crypto/openssl/apps/enc.c index b3bf4cc2592d..c275046cf57a 100644 --- a/crypto/openssl/apps/enc.c +++ b/crypto/openssl/apps/enc.c @@ -624,7 +624,10 @@ int enc_main(int argc, char **argv) } } if (!BIO_flush(wbio)) { - BIO_printf(bio_err, "bad decrypt\n"); + if (enc) + BIO_printf(bio_err, "bad encrypt\n"); + else + BIO_printf(bio_err, "bad decrypt\n"); goto end; } diff --git a/crypto/openssl/apps/gendsa.c b/crypto/openssl/apps/gendsa.c index 27feb793fed2..8aefca65566c 100644 --- a/crypto/openssl/apps/gendsa.c +++ b/crypto/openssl/apps/gendsa.c @@ -1,5 +1,5 @@ /* - * Copyright 1995-2022 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -146,6 +146,8 @@ int gendsa_main(int argc, char **argv) goto end; } pkey = app_keygen(ctx, "DSA", nbits, verbose); + if (pkey == NULL) + goto end; assert(private); if (!PEM_write_bio_PrivateKey(out, pkey, enc, NULL, 0, NULL, passout)) { diff --git a/crypto/openssl/apps/genpkey.c b/crypto/openssl/apps/genpkey.c index d00754eeaca0..705e5c76b47d 100644 --- a/crypto/openssl/apps/genpkey.c +++ b/crypto/openssl/apps/genpkey.c @@ -1,5 +1,5 @@ /* - * Copyright 2006-2021 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2006-2023 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -183,6 +183,8 @@ int genpkey_main(int argc, char **argv) pkey = do_param ? app_paramgen(ctx, algname) : app_keygen(ctx, algname, 0, 0 /* not verbose */); + if (pkey == NULL) + goto end; if (do_param) { rv = PEM_write_bio_Parameters(out, pkey); diff --git a/crypto/openssl/apps/genrsa.c b/crypto/openssl/apps/genrsa.c index 4436b7fa1745..6a683517a15f 100644 --- a/crypto/openssl/apps/genrsa.c +++ b/crypto/openssl/apps/genrsa.c @@ -1,5 +1,5 @@ /* - * Copyright 1995-2022 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -203,6 +203,8 @@ opthelp: goto end; } pkey = app_keygen(ctx, "RSA", num, verbose); + if (pkey == NULL) + goto end; if (verbose) { BIGNUM *e = NULL; diff --git a/crypto/openssl/apps/lib/apps.c b/crypto/openssl/apps/lib/apps.c index 572f6a3f8f28..a632b0cff2bf 100644 --- a/crypto/openssl/apps/lib/apps.c +++ b/crypto/openssl/apps/lib/apps.c @@ -960,10 +960,14 @@ int load_key_certs_crls_suppress(const char *uri, int format, int maybe_stdin, ctx = OSSL_STORE_open_ex(uri, libctx, propq, get_ui_method(), &uidata, params, NULL, NULL); } - if (ctx == NULL) + if (ctx == NULL) { + BIO_printf(bio_err, "Could not open file or uri for loading"); goto end; - if (expect > 0 && !OSSL_STORE_expect(ctx, expect)) + } + if (expect > 0 && !OSSL_STORE_expect(ctx, expect)) { + BIO_printf(bio_err, "Internal error trying to load"); goto end; + } failed = NULL; while (cnt_expectations > 0 && !OSSL_STORE_eof(ctx)) { @@ -3359,8 +3363,8 @@ EVP_PKEY *app_keygen(EVP_PKEY_CTX *ctx, const char *alg, int bits, int verbose) BIO_printf(bio_err, "Warning: generating random key material may take a long time\n" "if the system has a poor entropy source\n"); if (EVP_PKEY_keygen(ctx, &res) <= 0) - app_bail_out("%s: Error generating %s key\n", opt_getprog(), - alg != NULL ? alg : "asymmetric"); + BIO_printf(bio_err, "%s: Error generating %s key\n", opt_getprog(), + alg != NULL ? alg : "asymmetric"); return res; } @@ -3372,8 +3376,8 @@ EVP_PKEY *app_paramgen(EVP_PKEY_CTX *ctx, const char *alg) BIO_printf(bio_err, "Warning: generating random key parameters may take a long time\n" "if the system has a poor entropy source\n"); if (EVP_PKEY_paramgen(ctx, &res) <= 0) - app_bail_out("%s: Generating %s key parameters failed\n", - opt_getprog(), alg != NULL ? alg : "asymmetric"); + BIO_printf(bio_err, "%s: Generating %s key parameters failed\n", + opt_getprog(), alg != NULL ? alg : "asymmetric"); return res; } diff --git a/crypto/openssl/apps/req.c b/crypto/openssl/apps/req.c index 926f0796bc8f..41191803aef4 100644 --- a/crypto/openssl/apps/req.c +++ b/crypto/openssl/apps/req.c @@ -685,6 +685,8 @@ int req_main(int argc, char **argv) EVP_PKEY_CTX_set_app_data(genctx, bio_err); pkey = app_keygen(genctx, keyalgstr, newkey_len, verbose); + if (pkey == NULL) + goto end; EVP_PKEY_CTX_free(genctx); genctx = NULL; diff --git a/crypto/openssl/apps/speed.c b/crypto/openssl/apps/speed.c index f30435704d19..1113d775b8ab 100644 --- a/crypto/openssl/apps/speed.c +++ b/crypto/openssl/apps/speed.c @@ -3700,7 +3700,8 @@ static void multiblock_speed(const EVP_CIPHER *evp_cipher, int lengths_single, } else { int pad; - RAND_bytes(out, 16); + if (RAND_bytes(inp, 16) <= 0) + app_bail_out("error setting random bytes\n"); len += 16; aad[11] = (unsigned char)(len >> 8); aad[12] = (unsigned char)(len); diff --git a/crypto/openssl/crypto/aes/asm/aesv8-armx.pl b/crypto/openssl/crypto/aes/asm/aesv8-armx.pl index 544dc7e8effe..d0e0be6187bd 100755 --- a/crypto/openssl/crypto/aes/asm/aesv8-armx.pl +++ b/crypto/openssl/crypto/aes/asm/aesv8-armx.pl @@ -3661,6 +3661,9 @@ if ($flavour =~ /64/) { ######## 64-bit code s/\.[ui]?64//o and s/\.16b/\.2d/go; s/\.[42]([sd])\[([0-3])\]/\.$1\[$2\]/o; + # Switch preprocessor checks to aarch64 versions. + s/__ARME([BL])__/__AARCH64E$1__/go; + print $_,"\n"; } } else { ######## 32-bit code diff --git a/crypto/openssl/crypto/arm_arch.h b/crypto/openssl/crypto/arm_arch.h index 45d7e1556475..ec4a087fede2 100644 --- a/crypto/openssl/crypto/arm_arch.h +++ b/crypto/openssl/crypto/arm_arch.h @@ -1,5 +1,5 @@ /* - * Copyright 2011-2022 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2011-2023 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -21,11 +21,6 @@ # elif defined(__GNUC__) # if defined(__aarch64__) # define __ARM_ARCH__ 8 -# if __BYTE_ORDER__==__ORDER_BIG_ENDIAN__ -# define __ARMEB__ -# else -# define __ARMEL__ -# endif /* * Why doesn't gcc define __ARM_ARCH__? Instead it defines * bunch of below macros. See all_architectures[] table in diff --git a/crypto/openssl/crypto/bn/bn_gcd.c b/crypto/openssl/crypto/bn/bn_gcd.c index 59d024f674eb..cd0b0151ec7e 100644 --- a/crypto/openssl/crypto/bn/bn_gcd.c +++ b/crypto/openssl/crypto/bn/bn_gcd.c @@ -1,5 +1,5 @@ /* - * Copyright 1995-2022 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -611,9 +611,9 @@ int BN_gcd(BIGNUM *r, const BIGNUM *in_a, const BIGNUM *in_b, BN_CTX *ctx) for (i = 0; i < m; i++) { /* conditionally flip signs if delta is positive and g is odd */ - cond = (-delta >> (8 * sizeof(delta) - 1)) & g->d[0] & 1 + cond = ((unsigned int)-delta >> (8 * sizeof(delta) - 1)) & g->d[0] & 1 /* make sure g->top > 0 (i.e. if top == 0 then g == 0 always) */ - & (~((g->top - 1) >> (sizeof(g->top) * 8 - 1))); + & (~((unsigned int)(g->top - 1) >> (sizeof(g->top) * 8 - 1))); delta = (-cond & -delta) | ((cond - 1) & delta); r->neg ^= cond; /* swap */ @@ -625,7 +625,7 @@ int BN_gcd(BIGNUM *r, const BIGNUM *in_a, const BIGNUM *in_b, BN_CTX *ctx) goto err; BN_consttime_swap(g->d[0] & 1 /* g is odd */ /* make sure g->top > 0 (i.e. if top == 0 then g == 0 always) */ - & (~((g->top - 1) >> (sizeof(g->top) * 8 - 1))), + & (~((unsigned int)(g->top - 1) >> (sizeof(g->top) * 8 - 1))), g, temp, top); if (!BN_rshift1(g, g)) goto err; diff --git a/crypto/openssl/crypto/build.info b/crypto/openssl/crypto/build.info index b90390ae864c..c04db5591120 100644 --- a/crypto/openssl/crypto/build.info +++ b/crypto/openssl/crypto/build.info @@ -97,8 +97,6 @@ $UTIL_COMMON=\ context.c sparse_array.c asn1_dsa.c packet.c param_build.c \ param_build_set.c der_writer.c threads_lib.c params_dup.c -SHARED_SOURCE[../libssl]=sparse_array.c - SOURCE[../libcrypto]=$UTIL_COMMON \ mem.c mem_sec.c \ cversion.c info.c cpt_err.c ebcdic.c uid.c o_time.c o_dir.c \ diff --git a/crypto/openssl/crypto/cms/cms_enc.c b/crypto/openssl/crypto/cms/cms_enc.c index f7007c12319e..ae88df33a7f0 100644 --- a/crypto/openssl/crypto/cms/cms_enc.c +++ b/crypto/openssl/crypto/cms/cms_enc.c @@ -1,5 +1,5 @@ /* - * Copyright 2008-2022 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2008-2023 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -15,6 +15,7 @@ #include #include #include "crypto/evp.h" +#include "crypto/asn1.h" #include "cms_local.h" /* CMS EncryptedData Utilities */ @@ -81,7 +82,7 @@ BIO *ossl_cms_EncryptedContent_init_bio(CMS_EncryptedContentInfo *ec, if (enc) { calg->algorithm = OBJ_nid2obj(EVP_CIPHER_CTX_get_type(ctx)); - if (calg->algorithm == NULL) { + if (calg->algorithm == NULL || calg->algorithm->nid == NID_undef) { ERR_raise(ERR_LIB_CMS, CMS_R_UNSUPPORTED_CONTENT_ENCRYPTION_ALGORITHM); goto err; } diff --git a/crypto/openssl/crypto/cms/cms_err.c b/crypto/openssl/crypto/cms/cms_err.c index dcbea201c8e5..4bd6a0dc1bf1 100644 --- a/crypto/openssl/crypto/cms/cms_err.c +++ b/crypto/openssl/crypto/cms/cms_err.c @@ -1,6 +1,6 @@ /* * Generated by util/mkerr.pl DO NOT EDIT - * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -154,6 +154,8 @@ static const ERR_STRING_DATA CMS_str_reasons[] = { "unsupported recipientinfo type"}, {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_UNSUPPORTED_RECIPIENT_TYPE), "unsupported recipient type"}, + {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_UNSUPPORTED_SIGNATURE_ALGORITHM), + "unsupported signature algorithm"}, {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_UNSUPPORTED_TYPE), "unsupported type"}, {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_UNWRAP_ERROR), "unwrap error"}, {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_UNWRAP_FAILURE), "unwrap failure"}, diff --git a/crypto/openssl/crypto/cms/cms_sd.c b/crypto/openssl/crypto/cms/cms_sd.c index 53c8e378f318..2093657a2a4a 100644 --- a/crypto/openssl/crypto/cms/cms_sd.c +++ b/crypto/openssl/crypto/cms/cms_sd.c @@ -354,11 +354,16 @@ CMS_SignerInfo *CMS_add1_signer(CMS_ContentInfo *cms, if (md == NULL) { int def_nid; - if (EVP_PKEY_get_default_digest_nid(pk, &def_nid) <= 0) + + if (EVP_PKEY_get_default_digest_nid(pk, &def_nid) <= 0) { + ERR_raise_data(ERR_LIB_CMS, CMS_R_NO_DEFAULT_DIGEST, + "pkey nid=%d", EVP_PKEY_get_id(pk)); goto err; + } md = EVP_get_digestbynid(def_nid); if (md == NULL) { - ERR_raise(ERR_LIB_CMS, CMS_R_NO_DEFAULT_DIGEST); + ERR_raise_data(ERR_LIB_CMS, CMS_R_NO_DEFAULT_DIGEST, + "default md nid=%d", def_nid); goto err; } } @@ -398,8 +403,11 @@ CMS_SignerInfo *CMS_add1_signer(CMS_ContentInfo *cms, } } - if (!(flags & CMS_KEY_PARAM) && !cms_sd_asn1_ctrl(si, 0)) + if (!(flags & CMS_KEY_PARAM) && !cms_sd_asn1_ctrl(si, 0)) { + ERR_raise_data(ERR_LIB_CMS, CMS_R_UNSUPPORTED_SIGNATURE_ALGORITHM, + "pkey nid=%d", EVP_PKEY_get_id(pk)); goto err; + } if (!(flags & CMS_NOATTR)) { /* * Initialize signed attributes structure so other attributes diff --git a/crypto/openssl/crypto/dh/dh_check.c b/crypto/openssl/crypto/dh/dh_check.c index f4173e21371e..7ba2beae7fd6 100644 --- a/crypto/openssl/crypto/dh/dh_check.c +++ b/crypto/openssl/crypto/dh/dh_check.c @@ -259,7 +259,8 @@ int DH_check_pub_key(const DH *dh, const BIGNUM *pub_key, int *ret) */ int ossl_dh_check_pub_key_partial(const DH *dh, const BIGNUM *pub_key, int *ret) { - return ossl_ffc_validate_public_key_partial(&dh->params, pub_key, ret); + return ossl_ffc_validate_public_key_partial(&dh->params, pub_key, ret) + && *ret == 0; } int ossl_dh_check_priv_key(const DH *dh, const BIGNUM *priv_key, int *ret) diff --git a/crypto/openssl/crypto/dh/dh_key.c b/crypto/openssl/crypto/dh/dh_key.c index 4e9705beef73..d84ea99241b9 100644 --- a/crypto/openssl/crypto/dh/dh_key.c +++ b/crypto/openssl/crypto/dh/dh_key.c @@ -1,5 +1,5 @@ /* - * Copyright 1995-2022 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -190,7 +190,6 @@ static int dh_bn_mod_exp(const DH *dh, BIGNUM *r, static int dh_init(DH *dh) { dh->flags |= DH_FLAG_CACHE_MONT_P; - ossl_ffc_params_init(&dh->params); dh->dirty_cnt++; return 1; } diff --git a/crypto/openssl/crypto/dh/dh_lib.c b/crypto/openssl/crypto/dh/dh_lib.c index 29cda5d7bfa8..5577413e1e0c 100644 --- a/crypto/openssl/crypto/dh/dh_lib.c +++ b/crypto/openssl/crypto/dh/dh_lib.c @@ -1,5 +1,5 @@ /* - * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -116,6 +116,8 @@ static DH *dh_new_intern(ENGINE *engine, OSSL_LIB_CTX *libctx) goto err; #endif /* FIPS_MODULE */ + ossl_ffc_params_init(&ret->params); + if ((ret->meth->init != NULL) && !ret->meth->init(ret)) { ERR_raise(ERR_LIB_DH, ERR_R_INIT_FAIL); goto err; diff --git a/crypto/openssl/crypto/dsa/dsa_check.c b/crypto/openssl/crypto/dsa/dsa_check.c index 7ee914a477ec..fb0e9129a295 100644 --- a/crypto/openssl/crypto/dsa/dsa_check.c +++ b/crypto/openssl/crypto/dsa/dsa_check.c @@ -1,5 +1,5 @@ /* - * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -39,7 +39,8 @@ int ossl_dsa_check_params(const DSA *dsa, int checktype, int *ret) */ int ossl_dsa_check_pub_key(const DSA *dsa, const BIGNUM *pub_key, int *ret) { - return ossl_ffc_validate_public_key(&dsa->params, pub_key, ret); + return ossl_ffc_validate_public_key(&dsa->params, pub_key, ret) + && *ret == 0; } /* @@ -49,7 +50,8 @@ int ossl_dsa_check_pub_key(const DSA *dsa, const BIGNUM *pub_key, int *ret) */ int ossl_dsa_check_pub_key_partial(const DSA *dsa, const BIGNUM *pub_key, int *ret) { - return ossl_ffc_validate_public_key_partial(&dsa->params, pub_key, ret); + return ossl_ffc_validate_public_key_partial(&dsa->params, pub_key, ret) + && *ret == 0; } int ossl_dsa_check_priv_key(const DSA *dsa, const BIGNUM *priv_key, int *ret) diff --git a/crypto/openssl/crypto/dsa/dsa_lib.c b/crypto/openssl/crypto/dsa/dsa_lib.c index ccc701659217..2ae3f8e36b26 100644 --- a/crypto/openssl/crypto/dsa/dsa_lib.c +++ b/crypto/openssl/crypto/dsa/dsa_lib.c @@ -1,5 +1,5 @@ /* - * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -176,6 +176,8 @@ static DSA *dsa_new_intern(ENGINE *engine, OSSL_LIB_CTX *libctx) goto err; #endif + ossl_ffc_params_init(&ret->params); + if ((ret->meth->init != NULL) && !ret->meth->init(ret)) { ERR_raise(ERR_LIB_DSA, ERR_R_INIT_FAIL); goto err; diff --git a/crypto/openssl/crypto/dsa/dsa_ossl.c b/crypto/openssl/crypto/dsa/dsa_ossl.c index 62f7c70149f4..8fd66a950e37 100644 --- a/crypto/openssl/crypto/dsa/dsa_ossl.c +++ b/crypto/openssl/crypto/dsa/dsa_ossl.c @@ -441,7 +441,6 @@ static int dsa_do_verify(const unsigned char *dgst, int dgst_len, static int dsa_init(DSA *dsa) { dsa->flags |= DSA_FLAG_CACHE_MONT_P; - ossl_ffc_params_init(&dsa->params); dsa->dirty_cnt++; return 1; } diff --git a/crypto/openssl/crypto/engine/eng_pkey.c b/crypto/openssl/crypto/engine/eng_pkey.c index 6e6d6df35b2b..f84fcde46016 100644 --- a/crypto/openssl/crypto/engine/eng_pkey.c +++ b/crypto/openssl/crypto/engine/eng_pkey.c @@ -1,5 +1,5 @@ /* - * Copyright 2001-2021 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2001-2023 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -79,6 +79,48 @@ EVP_PKEY *ENGINE_load_private_key(ENGINE *e, const char *key_id, ERR_raise(ERR_LIB_ENGINE, ENGINE_R_FAILED_LOADING_PRIVATE_KEY); return NULL; } + /* We enforce check for legacy key */ + switch (EVP_PKEY_get_id(pkey)) { + case EVP_PKEY_RSA: + { + RSA *rsa = EVP_PKEY_get1_RSA(pkey); + EVP_PKEY_set1_RSA(pkey, rsa); + RSA_free(rsa); + } + break; +# ifndef OPENSSL_NO_EC + case EVP_PKEY_SM2: + case EVP_PKEY_EC: + { + EC_KEY *ec = EVP_PKEY_get1_EC_KEY(pkey); + EVP_PKEY_set1_EC_KEY(pkey, ec); + EC_KEY_free(ec); + } + break; +# endif +# ifndef OPENSSL_NO_DSA + case EVP_PKEY_DSA: + { + DSA *dsa = EVP_PKEY_get1_DSA(pkey); + EVP_PKEY_set1_DSA(pkey, dsa); + DSA_free(dsa); + } + break; +#endif +# ifndef OPENSSL_NO_DH + case EVP_PKEY_DH: + { + DH *dh = EVP_PKEY_get1_DH(pkey); + EVP_PKEY_set1_DH(pkey, dh); + DH_free(dh); + } + break; +#endif + default: + /*Do nothing */ + break; + } + return pkey; } diff --git a/crypto/openssl/crypto/engine/eng_table.c b/crypto/openssl/crypto/engine/eng_table.c index 3138a1526002..9dc3144bbfd7 100644 --- a/crypto/openssl/crypto/engine/eng_table.c +++ b/crypto/openssl/crypto/engine/eng_table.c @@ -97,6 +97,7 @@ int engine_table_register(ENGINE_TABLE **table, ENGINE_CLEANUP_CB *cleanup, if (added && !engine_cleanup_add_first(cleanup)) { lh_ENGINE_PILE_free(&(*table)->piles); *table = NULL; + goto end; } while (num_nids--) { tmplate.nid = *nids; diff --git a/crypto/openssl/crypto/err/openssl.txt b/crypto/openssl/crypto/err/openssl.txt index a6f61ca3b02f..e51504b7abd5 100644 --- a/crypto/openssl/crypto/err/openssl.txt +++ b/crypto/openssl/crypto/err/openssl.txt @@ -375,6 +375,7 @@ CMS_R_UNSUPPORTED_KEY_ENCRYPTION_ALGORITHM:179:\ CMS_R_UNSUPPORTED_LABEL_SOURCE:193:unsupported label source CMS_R_UNSUPPORTED_RECIPIENTINFO_TYPE:155:unsupported recipientinfo type CMS_R_UNSUPPORTED_RECIPIENT_TYPE:154:unsupported recipient type +CMS_R_UNSUPPORTED_SIGNATURE_ALGORITHM:195:unsupported signature algorithm CMS_R_UNSUPPORTED_TYPE:156:unsupported type CMS_R_UNWRAP_ERROR:157:unwrap error CMS_R_UNWRAP_FAILURE:180:unwrap failure diff --git a/crypto/openssl/crypto/evp/evp_enc.c b/crypto/openssl/crypto/evp/evp_enc.c index b178d1086473..4e6f83e3d0a9 100644 --- a/crypto/openssl/crypto/evp/evp_enc.c +++ b/crypto/openssl/crypto/evp/evp_enc.c @@ -1,5 +1,5 @@ /* - * Copyright 1995-2022 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -192,7 +192,12 @@ static int evp_cipher_init_internal(EVP_CIPHER_CTX *ctx, #endif } - if (cipher->prov != NULL) { + if (!ossl_assert(cipher->prov != NULL)) { + ERR_raise(ERR_LIB_EVP, EVP_R_INITIALIZATION_ERROR); + return 0; + } + + if (cipher != ctx->fetched_cipher) { if (!EVP_CIPHER_up_ref((EVP_CIPHER *)cipher)) { ERR_raise(ERR_LIB_EVP, EVP_R_INITIALIZATION_ERROR); return 0; @@ -218,6 +223,42 @@ static int evp_cipher_init_internal(EVP_CIPHER_CTX *ctx, return 0; } +#ifndef FIPS_MODULE + /* + * Fix for CVE-2023-5363 + * Passing in a size as part of the init call takes effect late + * so, force such to occur before the initialisation. + * + * The FIPS provider's internal library context is used in a manner + * such that this is not an issue. + */ + if (params != NULL) { + OSSL_PARAM param_lens[3] = { OSSL_PARAM_END, OSSL_PARAM_END, + OSSL_PARAM_END }; + OSSL_PARAM *q = param_lens; + const OSSL_PARAM *p; + + p = OSSL_PARAM_locate_const(params, OSSL_CIPHER_PARAM_KEYLEN); + if (p != NULL) + memcpy(q++, p, sizeof(*q)); + + /* + * Note that OSSL_CIPHER_PARAM_AEAD_IVLEN is a synomym for + * OSSL_CIPHER_PARAM_IVLEN so both are covered here. + */ + p = OSSL_PARAM_locate_const(params, OSSL_CIPHER_PARAM_IVLEN); + if (p != NULL) + memcpy(q++, p, sizeof(*q)); + + if (q != param_lens) { + if (!EVP_CIPHER_CTX_set_params(ctx, param_lens)) { + ERR_raise(ERR_LIB_EVP, EVP_R_INVALID_LENGTH); + return 0; + } + } + } +#endif + if (enc) { if (ctx->cipher->einit == NULL) { ERR_raise(ERR_LIB_EVP, EVP_R_INITIALIZATION_ERROR); diff --git a/crypto/openssl/crypto/evp/legacy_sha.c b/crypto/openssl/crypto/evp/legacy_sha.c index 3859286eeb20..ca9a3264978a 100644 --- a/crypto/openssl/crypto/evp/legacy_sha.c +++ b/crypto/openssl/crypto/evp/legacy_sha.c @@ -1,5 +1,5 @@ /* - * Copyright 2019-2021 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2019-2023 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -71,7 +71,11 @@ static int sha1_int_ctrl(EVP_MD_CTX *ctx, int cmd, int p1, void *p2) static int shake_ctrl(EVP_MD_CTX *evp_ctx, int cmd, int p1, void *p2) { - KECCAK1600_CTX *ctx = evp_ctx->md_data; + KECCAK1600_CTX *ctx; + + if (evp_ctx == NULL) + return 0; + ctx = evp_ctx->md_data; switch (cmd) { case EVP_MD_CTRL_XOF_LEN: diff --git a/crypto/openssl/crypto/evp/p_lib.c b/crypto/openssl/crypto/evp/p_lib.c index 59a7a867ecbb..04b148a91218 100644 --- a/crypto/openssl/crypto/evp/p_lib.c +++ b/crypto/openssl/crypto/evp/p_lib.c @@ -1201,7 +1201,7 @@ int EVP_PKEY_print_public(BIO *out, const EVP_PKEY *pkey, int EVP_PKEY_print_private(BIO *out, const EVP_PKEY *pkey, int indent, ASN1_PCTX *pctx) { - return print_pkey(pkey, out, indent, EVP_PKEY_KEYPAIR, NULL, + return print_pkey(pkey, out, indent, EVP_PKEY_PRIVATE_KEY, NULL, (pkey->ameth != NULL ? pkey->ameth->priv_print : NULL), pctx); } diff --git a/crypto/openssl/crypto/evp/pmeth_lib.c b/crypto/openssl/crypto/evp/pmeth_lib.c index ce6e1a1ccbd5..ba1971ce461d 100644 --- a/crypto/openssl/crypto/evp/pmeth_lib.c +++ b/crypto/openssl/crypto/evp/pmeth_lib.c @@ -251,10 +251,11 @@ static EVP_PKEY_CTX *int_ctx_new(OSSL_LIB_CTX *libctx, */ if (e != NULL) pmeth = ENGINE_get_pkey_meth(e, id); - else if (pkey != NULL && pkey->foreign) + else +# endif /* OPENSSL_NO_ENGINE */ + if (pkey != NULL && pkey->foreign) pmeth = EVP_PKEY_meth_find(id); else -# endif app_pmeth = pmeth = evp_pkey_meth_find_added_by_application(id); /* END legacy */ diff --git a/crypto/openssl/crypto/ex_data.c b/crypto/openssl/crypto/ex_data.c index 40223f06e4ec..13b928899456 100644 --- a/crypto/openssl/crypto/ex_data.c +++ b/crypto/openssl/crypto/ex_data.c @@ -1,5 +1,5 @@ /* - * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -163,6 +163,8 @@ int ossl_crypto_get_ex_new_index_ex(OSSL_LIB_CTX *ctx, int class_index, * "app_data" routines use ex_data index zero. See RT 3710. */ if (ip->meth == NULL || !sk_EX_CALLBACK_push(ip->meth, NULL)) { + sk_EX_CALLBACK_free(ip->meth); + ip->meth = NULL; ERR_raise(ERR_LIB_CRYPTO, ERR_R_MALLOC_FAILURE); goto err; } diff --git a/crypto/openssl/crypto/ffc/ffc_key_validate.c b/crypto/openssl/crypto/ffc/ffc_key_validate.c index 342789621d6d..a4a2a58e9a7f 100644 --- a/crypto/openssl/crypto/ffc/ffc_key_validate.c +++ b/crypto/openssl/crypto/ffc/ffc_key_validate.c @@ -26,7 +26,7 @@ int ossl_ffc_validate_public_key_partial(const FFC_PARAMS *params, *ret = 0; if (params == NULL || pub_key == NULL || params->p == NULL) { *ret = FFC_ERROR_PASSED_NULL_PARAM; - return 0; + return 1; } ctx = BN_CTX_new_ex(NULL); @@ -39,18 +39,14 @@ int ossl_ffc_validate_public_key_partial(const FFC_PARAMS *params, if (tmp == NULL || !BN_set_word(tmp, 1)) goto err; - if (BN_cmp(pub_key, tmp) <= 0) { + if (BN_cmp(pub_key, tmp) <= 0) *ret |= FFC_ERROR_PUBKEY_TOO_SMALL; - goto err; - } /* Step(1): Verify pub_key <= p-2 */ if (BN_copy(tmp, params->p) == NULL || !BN_sub_word(tmp, 1)) goto err; - if (BN_cmp(pub_key, tmp) >= 0) { + if (BN_cmp(pub_key, tmp) >= 0) *ret |= FFC_ERROR_PUBKEY_TOO_LARGE; - goto err; - } ok = 1; err: if (ctx != NULL) { @@ -73,7 +69,7 @@ int ossl_ffc_validate_public_key(const FFC_PARAMS *params, if (!ossl_ffc_validate_public_key_partial(params, pub_key, ret)) return 0; - if (params->q != NULL) { + if (*ret == 0 && params->q != NULL) { ctx = BN_CTX_new_ex(NULL); if (ctx == NULL) goto err; @@ -84,10 +80,8 @@ int ossl_ffc_validate_public_key(const FFC_PARAMS *params, if (tmp == NULL || !BN_mod_exp(tmp, pub_key, params->q, params->p, ctx)) goto err; - if (!BN_is_one(tmp)) { + if (!BN_is_one(tmp)) *ret |= FFC_ERROR_PUBKEY_INVALID; - goto err; - } } ok = 1; diff --git a/crypto/openssl/crypto/lhash/lhash.c b/crypto/openssl/crypto/lhash/lhash.c index 1cd988f01fc7..a01cfa725e38 100644 --- a/crypto/openssl/crypto/lhash/lhash.c +++ b/crypto/openssl/crypto/lhash/lhash.c @@ -1,5 +1,5 @@ /* - * Copyright 1995-2022 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -266,12 +266,12 @@ static void contract(OPENSSL_LHASH *lh) if (n == NULL) { /* fputs("realloc error in lhash",stderr); */ lh->error++; - return; + } else { + lh->b = n; } lh->num_alloc_nodes /= 2; *** 1730 LINES SKIPPED *** From nobody Thu Oct 26 17:37:32 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SGY0F1Z6Cz4y5Fm; Thu, 26 Oct 2023 17:37: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 4SGY0F127Yz4ZPl; Thu, 26 Oct 2023 17:37:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698341853; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JTpKZG3R+aMwxNYlKBuqpqZ75T5MoaUTNcMjg1kvTzI=; b=jfVYwKGhASZLUEOEssYhpKogrx6dYo391wzCz+FM9mCs5Oh25xfNJQqUJsWEeg0E52IWeM CvxrzhmWCvcgbCV0kLXrT2ym4pHmtrlOPKCWD9XsU8NdQKIYviE3QFdR564I4VWxrEmwOh aIC8OYTNpcxbVyTZjS8xw5cZa8Mc3wgpZYIcjjzY53cFfXqdnJNM5UUBzx9PoejvoRgO8p j3kPuvd3Vd0j3iKGDkn66Rd+QpMVdrnaDqNg7DxsHPcSfVVca4ZCJiaA2p1ub2tNEljqhu S8GXK7JK6uz0x6LcBaUc6cmglM7SPVPwKskYo6l/gieGlPhUpXO4a2KoD87qIA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698341853; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JTpKZG3R+aMwxNYlKBuqpqZ75T5MoaUTNcMjg1kvTzI=; b=u1h8vXdfJQlGWZRGEbJpdEJgXPB1jaOAZXKKs4Gj8WqmkNtbMEFZqChBxh+MhdwApXpNYF sgmhczAcFbGzxas+51OeKDRyfNjM0bgDSxtV9lRJVgn3FRjCUSxc3gFYk8hh7uSpTgGcPb 4mE4LmF9Tnfzl99eBNoAdNmS9RAwdoUIWkYTaORMavxWeSp8lMz0D2wqmGRxg+nCMWlAcZ LvPI4BaUF/hccfKpOgQjz7JIBHLUFJJAdJZQJfbEroVZQ3s7HV7uI88Fs82WVyqKlADcGJ gn2f1eKlMZNOwDBavy76IyEnxITzkQ66J+t4PApLvKX1hfH2VdOmZnNftInxZg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698341853; a=rsa-sha256; cv=none; b=G2c64+vBZxwgGm/U/6jIHLryq8SM4fn8UUaceYWl8fJ6rnZRJ7lKfn7wbN15UYDeaiL+4s 9oeu6bVaPoDwiE2XUCdsAAfWiUke+NCQ8Y4bhjhCjO/ImzOJTP5DNFLwnr5z/LQQKJ1ZCq 9shtfC5jt16yVLOPtjGvY4LzH6XFOx0lxh1c0zEZzkUDRSON0rwMTlKx5sIsqQMgRLKzhe zDpjOhyvidEZ8XYCNGb9YMcJE9DPISHozESKTaIO8QHE1sDvN8GPXvODMK9/aFMQd/NgHH cF28xt24uDtzhC/moIoNcwu51L1MPK/TjetAnmebIZ23t+VwIV2UAPqW1yO9FA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SGY0F07Qczgcr; Thu, 26 Oct 2023 17:37: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 39QHbWcH089669; Thu, 26 Oct 2023 17:37:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39QHbWZG089666; Thu, 26 Oct 2023 17:37:32 GMT (envelope-from git) Date: Thu, 26 Oct 2023 17:37:32 GMT Message-Id: <202310261737.39QHbWZG089666@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Brooks Davis Subject: git: b2f6c1f5488f - stable/14 - libprocstat: style: space after switch List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: b2f6c1f5488f93601e8d197bb6f5f6a99a0a9847 Auto-Submitted: auto-generated The branch stable/14 has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=b2f6c1f5488f93601e8d197bb6f5f6a99a0a9847 commit b2f6c1f5488f93601e8d197bb6f5f6a99a0a9847 Author: Brooks Davis AuthorDate: 2023-10-02 21:50:00 +0000 Commit: Brooks Davis CommitDate: 2023-10-25 23:30:37 +0000 libprocstat: style: space after switch Style demands a space after the switch keyword. Noticed reviewing code in CheriBSD that propagated the style bug. Reported by: markj Sponsored by: DARPA Reviewed by: kib, markj Differential Revision: https://reviews.freebsd.org/D42041 (cherry picked from commit ccac440f7cbb013de41aa3933f3f7be77225c44f) --- lib/libprocstat/libprocstat.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/lib/libprocstat/libprocstat.c b/lib/libprocstat/libprocstat.c index 0af79b6e63a0..a302310dfb9a 100644 --- a/lib/libprocstat/libprocstat.c +++ b/lib/libprocstat/libprocstat.c @@ -347,7 +347,7 @@ struct filestat_list * procstat_getfiles(struct procstat *procstat, struct kinfo_proc *kp, int mmapped) { - switch(procstat->type) { + switch (procstat->type) { case PROCSTAT_KVM: return (procstat_getfiles_kvm(procstat, kp, mmapped)); case PROCSTAT_SYSCTL: @@ -1527,7 +1527,7 @@ procstat_get_socket_info_kvm(kvm_t *kd, struct filestat *fst, /* * Protocol specific data. */ - switch(dom.dom_family) { + switch (dom.dom_family) { case AF_INET: case AF_INET6: if (proto.pr_protocol == IPPROTO_TCP) { @@ -1600,7 +1600,7 @@ procstat_get_socket_info_sysctl(struct filestat *fst, struct sockstat *sock, /* * Protocol specific data. */ - switch(sock->dom_family) { + switch (sock->dom_family) { case AF_INET: case AF_INET6: if (sock->proto == IPPROTO_TCP) { @@ -1961,7 +1961,7 @@ procstat_getvmmap(struct procstat *procstat, struct kinfo_proc *kp, unsigned int *cntp) { - switch(procstat->type) { + switch (procstat->type) { case PROCSTAT_KVM: warnx("kvm method is not supported"); return (NULL); @@ -2066,7 +2066,7 @@ gid_t * procstat_getgroups(struct procstat *procstat, struct kinfo_proc *kp, unsigned int *cntp) { - switch(procstat->type) { + switch (procstat->type) { case PROCSTAT_KVM: return (procstat_getgroups_kvm(procstat->kd, kp, cntp)); case PROCSTAT_SYSCTL: @@ -2144,7 +2144,7 @@ int procstat_getumask(struct procstat *procstat, struct kinfo_proc *kp, unsigned short *maskp) { - switch(procstat->type) { + switch (procstat->type) { case PROCSTAT_KVM: return (procstat_getumask_kvm(procstat->kd, kp, maskp)); case PROCSTAT_SYSCTL: @@ -2234,7 +2234,7 @@ int procstat_getrlimit(struct procstat *procstat, struct kinfo_proc *kp, int which, struct rlimit* rlimit) { - switch(procstat->type) { + switch (procstat->type) { case PROCSTAT_KVM: return (procstat_getrlimit_kvm(procstat->kd, kp, which, rlimit)); @@ -2293,7 +2293,7 @@ int procstat_getpathname(struct procstat *procstat, struct kinfo_proc *kp, char *pathname, size_t maxlen) { - switch(procstat->type) { + switch (procstat->type) { case PROCSTAT_KVM: /* XXX: Return empty string. */ if (maxlen > 0) @@ -2366,7 +2366,7 @@ procstat_getosrel_core(struct procstat_core *core, int *osrelp) int procstat_getosrel(struct procstat *procstat, struct kinfo_proc *kp, int *osrelp) { - switch(procstat->type) { + switch (procstat->type) { case PROCSTAT_KVM: return (procstat_getosrel_kvm(procstat->kd, kp, osrelp)); case PROCSTAT_SYSCTL: @@ -2506,7 +2506,7 @@ Elf_Auxinfo * procstat_getauxv(struct procstat *procstat, struct kinfo_proc *kp, unsigned int *cntp) { - switch(procstat->type) { + switch (procstat->type) { case PROCSTAT_KVM: warnx("kvm method is not supported"); return (NULL); @@ -2620,7 +2620,7 @@ struct kinfo_kstack * procstat_getkstack(struct procstat *procstat, struct kinfo_proc *kp, unsigned int *cntp) { - switch(procstat->type) { + switch (procstat->type) { case PROCSTAT_KVM: warnx("kvm method is not supported"); return (NULL); @@ -2749,7 +2749,7 @@ fail: struct advlock_list * procstat_getadvlock(struct procstat *procstat) { - switch(procstat->type) { + switch (procstat->type) { case PROCSTAT_KVM: warnx("kvm method is not supported"); return (NULL); From nobody Thu Oct 26 17:37:34 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SGY0G2ZKWz4y5Bx; Thu, 26 Oct 2023 17:37: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 4SGY0G1wTBz4ZVx; Thu, 26 Oct 2023 17:37:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698341854; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uGh5oHmQtzmz4BuaIVJbCmjFdkR7HDYOFNMCLWsu4UQ=; b=w67pulvgoTTrorsql390YlkF+kWKfAWSN3QVqt/3XGrRX2B1U/bw7x+N/8pJWmlw1vOytu oZiXoeT+1iErulgglnXtM1/bolldp3Ukt9jW5Nz33+RXl+rn/LBw2rg29NTdcd9aqTB854 GpJ9JsgKw0Gu02bYAZG6ytPu3Rs8aqaYm3J6SB+gpJjbvgS2FiGBtm86CopUxhhJpXD9kR icReHYtLbxbfbEnQ9cRWBN43EnwVtszxd4jfb/abYZy9I76Adc1ykQK+x7d5JS3nemczEm dK29pqR49mCWEHfP/NZFjIvbjfHAALCjz9xLBHq3A5yKk/JkC1HLjrztrCaIew== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698341854; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uGh5oHmQtzmz4BuaIVJbCmjFdkR7HDYOFNMCLWsu4UQ=; b=J/1ebFkR+Wd8C8lN+8mZ/crt+/daWCVEeFCk42fEZy4rFvi/Qr0sWarbiBTwcAw0eQPO/E hjPZYmVWsW2i3fEhalT+YPLIM7pQK+NroF06cWlNB3DwRVA+/4wDTwHJqtB0wmMgZ9+elz 79xreriupSoWzwyZnZE4r98c0mR5JAI4y5DYmaO8OwAgbSSIbGX50YoFUy7nNcw8pgLngS KQ5ulOfINilo0ke0FwM9kLfklR1jgI6CcEDn2mm+nFoXxKnjfAdWyjtDHV6jfXMJJSgkRR c9a8szbFsBGEtNJEXE98GIjG14NPVdnQFFneOaW805Mezv17wNqmlw70LZW1lQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698341854; a=rsa-sha256; cv=none; b=oaT9ubttz4ukuGCPhcUhKvk5jy+7HoyzOkvjDcquS+3Dx34Xf2Y0WBl8asZSZJtKpcJ6jo 46pZglnLUTsGHDoJX4bH/OAYghlg3FNG/k0biLGPHw8lD9sPhJLARjrEkEKFJ0LOuTSwrn ZEnR8J/EEQnM1cI6VGcT+TtS2R39TSqa07MTyHO2UBzjkYhZM4/Te2hAUa1csS4oO5w6me xrEqYFuOXtBWICLBq4vHVodeVF+4oUc8gq7t7jmWT10MITOLAs+Nz+5YrsmKcPEeqLKKjM mW3B4bnW7y0x4XS+reMmVPTH4sfawWLxI5O5DFouvC7fIM9haLd2VyKnVfiWOw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SGY0G0xwVzgcs; Thu, 26 Oct 2023 17:37: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 39QHbYb1089711; Thu, 26 Oct 2023 17:37:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39QHbY84089708; Thu, 26 Oct 2023 17:37:34 GMT (envelope-from git) Date: Thu, 26 Oct 2023 17:37:34 GMT Message-Id: <202310261737.39QHbY84089708@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Brooks Davis Subject: git: d65a002ded1f - stable/14 - libprocstat: simplify auxv value conversion List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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/stable/14 X-Git-Reftype: branch X-Git-Commit: d65a002ded1fef6a9dce796252a73bd65104e1af Auto-Submitted: auto-generated The branch stable/14 has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=d65a002ded1fef6a9dce796252a73bd65104e1af commit d65a002ded1fef6a9dce796252a73bd65104e1af Author: Brooks Davis AuthorDate: 2023-10-16 16:52:57 +0000 Commit: Brooks Davis CommitDate: 2023-10-25 23:30:45 +0000 libprocstat: simplify auxv value conversion Avoid a weird dance through the union and treat all 32-bit values as unsigned integers. This avoids sign extension of flags and userspace pointers. Reviewed by: markj Sponsored by: DARPA Differential Revision: https://reviews.freebsd.org/D42198 (cherry picked from commit 9735cc0e41825bb9e95d16433d381ffe4c190f38) --- lib/libprocstat/libprocstat.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/lib/libprocstat/libprocstat.c b/lib/libprocstat/libprocstat.c index a302310dfb9a..e5481c53eea1 100644 --- a/lib/libprocstat/libprocstat.c +++ b/lib/libprocstat/libprocstat.c @@ -2414,7 +2414,6 @@ procstat_getauxv32_sysctl(pid_t pid, unsigned int *cntp) { Elf_Auxinfo *auxv; Elf32_Auxinfo *auxv32; - void *ptr; size_t len; unsigned int i, count; int name[4]; @@ -2448,8 +2447,17 @@ procstat_getauxv32_sysctl(pid_t pid, unsigned int *cntp) * necessarily true. */ auxv[i].a_type = auxv32[i].a_type; - ptr = &auxv32[i].a_un; - auxv[i].a_un.a_val = *((uint32_t *)ptr); + /* + * Don't sign extend values. Existing entries are positive + * integers or pointers. Under freebsd32, programs typically + * have a full [0, 2^32) address space (perhaps minus the last + * page) and treating this as a signed integer would be + * confusing since these are not kernel pointers. + * + * XXX: A more complete translation would be ABI and + * type-aware. + */ + auxv[i].a_un.a_val = (uint32_t)auxv32[i].a_un.a_val; } *cntp = count; out: From nobody Thu Oct 26 17:37:35 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SGY0H3r3Hz4y5Fn; Thu, 26 Oct 2023 17:37: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 4SGY0H2vbPz4ZQg; Thu, 26 Oct 2023 17:37:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698341855; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Og/RGHdOFHlDXLNSSgqowtj0B73c6+rNIIpNWytt+dI=; b=wYORRVn5imR3MiD7B0E8dgd6jlmtvfieb/sG6vfHjAZrTk0CN6HC5NvBe10WB4i9u+eJL5 UMjGOLZBhX1DxaCJaYZC3t7J77C/UqjCv86o9PA6BsU8QJtampRQdw9R/tVG63qtbbglhO oF/FdfoeH2pRhzW7132R7ThlOedSghzFly8iS1fsJy2KU4zWoIKwFNZoC3/9D8kGFmp0+f SmUQt3NtOdRElrqOadDZfO4UNd/SsoX+F4tIomozoMxijdPchwGwiYZ3UExRzsM9DwlrDB gvF+lwalAxL0gQM6vQYSwDBO/bTI5SwNfPoqEMERY57XoZjXpVtAILeGs4Su2g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698341855; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Og/RGHdOFHlDXLNSSgqowtj0B73c6+rNIIpNWytt+dI=; b=oS/Bs8Cuod3PhxBQQzgN8MXfrYWt8TCpf3vTLHt28Y6J+JGELrKLu5lomSz7SdHw/OfLfC DkmkEOOYGeHYPTqPc00KdH6IO7mA4m6BjdBZdjXgCuO9pzcavJkgnkBKw4KaLXF6Zxzr4r Idakhik4DBCZZZgPmPZJyj0aZZqNuYuo1Plic5c/kAXPCApsOGvOq4SQscaU92SzNB1L8I ur1tX2HwxRMKzdQ6yOG1XJ3//Uqhb4stjEUwmLf5YBhEY6WKkGsUVzxTxjVRho2f3xEnrm sfVIXfOjZcVEpafcgx5Nftu4mHHoeUrQnJYYIIkruh4uYujHVM7x2KdRvv1rCw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698341855; a=rsa-sha256; cv=none; b=DXsE0nsvgoH1c10B60eeAuLVNuybPJakJbRQHlDQ5NaT0Z412NSbiuSbi1YGlSRtv1SK90 A3XTPBzYtX7eu5nZ7liBu3AP93iGwoHWBfYthtthzzcYnans+TcGLUDCwO8a/0MoQBo9rg TigboVYxF6WNqG6M3FRoPjJ48TgGoYI58gRPjgL+yPKOvHTg6YWO7d8CMLA7VN+JkxKO9O Xjug0qKTYC8MGf84aezeYj5uG9R4cGubSzJEAVaezs6p9slSNkXEguD67urbpr6sjsJp1v YdrprQWh587rXiklx4rqLSx2DRsc+hyfJ3JT/86qf7Zf9fpVJsYGm8H+z4C5oQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SGY0H1xfGzgq4; Thu, 26 Oct 2023 17:37: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 39QHbZBQ089758; Thu, 26 Oct 2023 17:37:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39QHbZml089755; Thu, 26 Oct 2023 17:37:35 GMT (envelope-from git) Date: Thu, 26 Oct 2023 17:37:35 GMT Message-Id: <202310261737.39QHbZml089755@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Brooks Davis Subject: git: 9b48cb8e89c8 - stable/14 - libprocstat: make sv_name not static List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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/stable/14 X-Git-Reftype: branch X-Git-Commit: 9b48cb8e89c86128c1d9d89eea67ef4b28a38c52 Auto-Submitted: auto-generated The branch stable/14 has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=9b48cb8e89c86128c1d9d89eea67ef4b28a38c52 commit 9b48cb8e89c86128c1d9d89eea67ef4b28a38c52 Author: Brooks Davis AuthorDate: 2023-10-16 16:53:11 +0000 Commit: Brooks Davis CommitDate: 2023-10-25 23:30:51 +0000 libprocstat: make sv_name not static Making this variable static makes is_elf32_sysctl() and callers thread unsafe. Use a less absurd length for sv_name. The longest name in the system is "FreeBSD ELF64 V2" which tips the scales at 16+1 bytes. We'll almost certainly have other problems if we exceed 32 characters. Reviewed by: markj Sponsored by: DARPA Differential Revision: https://reviews.freebsd.org/D42199 (cherry picked from commit 72a4ee26a7c665ae1c31abe1c6feeaa7ccaba140) --- lib/libprocstat/libprocstat.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/libprocstat/libprocstat.c b/lib/libprocstat/libprocstat.c index e5481c53eea1..84502bb895b7 100644 --- a/lib/libprocstat/libprocstat.c +++ b/lib/libprocstat/libprocstat.c @@ -2392,7 +2392,7 @@ is_elf32_sysctl(pid_t pid) { int error, name[4]; size_t len, i; - static char sv_name[256]; + char sv_name[32]; name[0] = CTL_KERN; name[1] = KERN_PROC; From nobody Thu Oct 26 17:37:36 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SGY0J4QLZz4y5Jj; Thu, 26 Oct 2023 17:37: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 4SGY0J3xSjz4ZqQ; Thu, 26 Oct 2023 17:37:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698341856; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=O0D7yc17cAmU54B5DFFb0m3hZxzN3o3S6AqtUkh7fhQ=; b=FMSDfT+YZjmdTiw1V317IuU5nMWMDm/k8TngPwBcWUYgHOebYhIcjg/TcqUkk+QZllVzcy 0mv6dohIsYhhTUnZljgqFDc61KXCsj2cf9dsQgD1hvz/eJxuzaziJiBYT6M9sq74PPbud0 M3Fx2UnaKlm/D+PP6dSVKk3EImbdXiTPu2U06g4figI6DLFqft80sxRUvadBkfggSWQaz/ PtyYQRWN23dbZiCvfmvSyMSC7f22nuHCXKfW3QqLCsGG1JTdNMCBvh3wXRFcm0/yQR8vni lwuHCa7+8FqPWtLkpoVs16FD4iNIRwF7azrX2UxW1f2wpIt/1Ljn4rik6H6u8g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698341856; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=O0D7yc17cAmU54B5DFFb0m3hZxzN3o3S6AqtUkh7fhQ=; b=U6xF2Rrlzn9E83+BOn3ssTC6s8hVOtLzhth1l3AqgOwm9K5sEZ6R1jClPtO1hH6e6TWPW2 /VbW4EJx1IJmhRfqcDokLzLEXOIEPS+atb71BA1fNins40FdVWAOlfgAO23kJqk3XtycER Xx8XvIWR20ft1Xl6W5i1VaY91TG0+vftvMSnTkX0T9CZKB9iHbZXbnZXII0sW2F/eIuCpb r742lBgy9gKYDACHf/gZyXVRB55x3lncWkl5/wzjp8KHfJQ1hdatFLqiYs0QxXH8nKddJ5 yQjY80k7hmfGhkpgsTxUjx0r2YvDhwvO/PW6d7Ie2r2NYHbSx0pPKyWCjztQkw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698341856; a=rsa-sha256; cv=none; b=kmeaa853T++z5SlEOG5ZXWiOuRI2pMfwUBXOyWB/zjT6ZLfJqdTnLQrU5/yaz5c6sdJPyT 64riU28xA0RGyIF6+YdB+k2Ee5DdRhHGdykvvXOcoD6UyQ4ns92jSKvOYbkdxYtuhodreN cGu/yoDndE5TsR66sirleaZ4pRtRBVXjHsEopB0bBjOGMQdgJFnAaU9LHefFXcQaq9DA5R f63XQHyeWp/tmZ+U5U6DluZ7nWK2/naASV9zQBdLXLg64OIsZR+1TyYtShs6Yeb/ubDcV7 Wqqc5GwMspId++kCceF9Bppn1shdMglQ2aHNJiFkSI0sJ5roJBI+CEZS6c9IUA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SGY0J2xxWzglv; Thu, 26 Oct 2023 17:37: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 39QHbaaq089809; Thu, 26 Oct 2023 17:37:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39QHbabT089806; Thu, 26 Oct 2023 17:37:36 GMT (envelope-from git) Date: Thu, 26 Oct 2023 17:37:36 GMT Message-Id: <202310261737.39QHbabT089806@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Brooks Davis Subject: git: ff90744045e3 - stable/14 - libprocstat: copy all the 32-bit auxv entries List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: ff90744045e310acae79669c07f70f0ecb5fbc0a Auto-Submitted: auto-generated The branch stable/14 has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=ff90744045e310acae79669c07f70f0ecb5fbc0a commit ff90744045e310acae79669c07f70f0ecb5fbc0a Author: Brooks Davis AuthorDate: 2023-10-16 16:53:22 +0000 Commit: Brooks Davis CommitDate: 2023-10-25 23:30:56 +0000 libprocstat: copy all the 32-bit auxv entries Use source struct size not the destination struct size so we copy all the auxv entries, not just the first half of them. Fix a style issue on an adjacent line. Reviewed by: markj Sponsored by: DARPA Differential Revision: https://reviews.freebsd.org/D42200 (cherry picked from commit 8f06fabe39ac3ebca4ab448a456945008305a23f) --- lib/libprocstat/libprocstat.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/libprocstat/libprocstat.c b/lib/libprocstat/libprocstat.c index 84502bb895b7..031294387ca7 100644 --- a/lib/libprocstat/libprocstat.c +++ b/lib/libprocstat/libprocstat.c @@ -2434,8 +2434,8 @@ procstat_getauxv32_sysctl(pid_t pid, unsigned int *cntp) warn("sysctl: kern.proc.auxv: %d: %d", pid, errno); goto out; } - count = len / sizeof(Elf_Auxinfo); - auxv = malloc(count * sizeof(Elf_Auxinfo)); + count = len / sizeof(Elf32_Auxinfo); + auxv = malloc(count * sizeof(Elf_Auxinfo)); if (auxv == NULL) { warn("malloc(%zu)", count * sizeof(Elf_Auxinfo)); goto out; From nobody Thu Oct 26 17:37:37 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SGY0L0Gpwz4y5Fx; Thu, 26 Oct 2023 17:37: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 4SGY0K57WCz4ZnZ; Thu, 26 Oct 2023 17:37:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698341857; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qrtA6uTStpwpzJDd8TWWHcy7C0EUbv7PaGVC2afbbWk=; b=HGUaSV1k36wOykTN05GWpHpU3r6hLaZcGwaPShGGqj1Ttt2NoLk+dZTy8uT4pcNhYKAFhR 3cf9H88SzpTTIhYp9Xi5YySd8t9hv73Sl4h+n+O9HCE4ducXeNh0Ehm+HG8tlLXEBkGbV9 DzuEdEVSnsoBlZZCUYEzhq5867pOeOLcxz7ax5j5t8aqtrVOfw2jeqFRSHOGxNq/ghGiKt /C5xdDUq6ZZk1O9io/8ODpHGaHzVQ3I94ipbROygEyU7qb+vkxXfY0BfIU/u3kR50cvu+1 7z0Z8pnS8VaZ52z21tuJNF+TQafANDjKnwc3+CAVsHBfN0tw+oS0j3W5HmkVZg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698341857; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qrtA6uTStpwpzJDd8TWWHcy7C0EUbv7PaGVC2afbbWk=; b=axePVlxEYOLxW1rbihdSo88LK0VNIBhh+nc0Web9uHlMy5bq6EZApjFMm2P2rtHtbgdEVH /WRX318XH+Enpq6A97cawB+l3lMet+IurTLTK/nxl5RlkLEXVLpJH6p6DFJDcKSTQYuSKP u3z0RUUg61H/tZ6NNCyqP0ZimMsVSUX5lP78NJ7/2Mh7HNCBHmbMip+d+wRRM+Zf1rZoT7 dOtVWteJq5SUraDEoKopIPzOrdldQx//9BIxXQpMevMtppfZIIc07UpNqZ1fhdDR7vmGzi NqWUPGRfYiURzn7b9a5g8jz1teHA7PKIGUeZMiSi1yy7U3Dz1YO4PAcDI3h8XA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698341857; a=rsa-sha256; cv=none; b=HluPcW3hxLgMrLbtnHTReYyt3o3PNXaOMiveG5EAp9xpOPRQ64bS9NG6ofbpqYsMnkFyBq /73ThGmEk6SjLfJrAihStAIKl+yW4/3oFnCyqkzk4yQIaENUPlwlvLOrOHax3QK/FCCzH4 W0kull8aTze7BwWAVY2EQcuITKBQocOj+bkIsEnPn9dd+pVRI6MRGHdg2RR1pYLss3coog 77EBIpKXDyI4IpV2M1CJ6rKSHs2gSrMuj0ZxVhaM65nWcIG8Tw7ytVhpKfK6mqqboaqPLP Eu2KaZYebDXYlTLDp0oxUaAzfMKif3D/CtqJLrirk5C3V0k/XcB8k6Oe6+/qVQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SGY0K3y7Qzgfy; Thu, 26 Oct 2023 17:37: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 39QHbbFg089859; Thu, 26 Oct 2023 17:37:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39QHbbHJ089857; Thu, 26 Oct 2023 17:37:37 GMT (envelope-from git) Date: Thu, 26 Oct 2023 17:37:37 GMT Message-Id: <202310261737.39QHbbHJ089857@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Brooks Davis Subject: git: 58a50eabf390 - stable/14 - libprocstat: improve conditional for 32-bit compat List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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/stable/14 X-Git-Reftype: branch X-Git-Commit: 58a50eabf390afd621a00dad46ea15fd343189fc Auto-Submitted: auto-generated The branch stable/14 has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=58a50eabf390afd621a00dad46ea15fd343189fc commit 58a50eabf390afd621a00dad46ea15fd343189fc Author: Brooks Davis AuthorDate: 2023-10-16 16:53:29 +0000 Commit: Brooks Davis CommitDate: 2023-10-25 23:31:02 +0000 libprocstat: improve conditional for 32-bit compat Include support for translating 32-bit auxv vectors on non-64-bit platforms that aren't riscv (which has no 32-bit ABI support and probably never will). Reviewed by: markj Sponsored by: DARPA Differential Revision: https://reviews.freebsd.org/D42201 (cherry picked from commit 248fe3d3483cb3ec2c78dd31dc02a467060a6577) --- lib/libprocstat/libprocstat.c | 6 +++--- lib/libprocstat/libprocstat.h | 5 +++++ 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/lib/libprocstat/libprocstat.c b/lib/libprocstat/libprocstat.c index 031294387ca7..c6a225a021a7 100644 --- a/lib/libprocstat/libprocstat.c +++ b/lib/libprocstat/libprocstat.c @@ -2381,7 +2381,7 @@ procstat_getosrel(struct procstat *procstat, struct kinfo_proc *kp, int *osrelp) #define PROC_AUXV_MAX 256 -#if __ELF_WORD_SIZE == 64 +#ifdef PS_ARCH_HAS_FREEBSD32 static const char *elf32_sv_names[] = { "Linux ELF32", "FreeBSD ELF32", @@ -2464,7 +2464,7 @@ out: free(auxv32); return (auxv); } -#endif /* __ELF_WORD_SIZE == 64 */ +#endif /* PS_ARCH_HAS_FREEBSD32 */ static Elf_Auxinfo * procstat_getauxv_sysctl(pid_t pid, unsigned int *cntp) @@ -2473,7 +2473,7 @@ procstat_getauxv_sysctl(pid_t pid, unsigned int *cntp) int name[4]; size_t len; -#if __ELF_WORD_SIZE == 64 +#ifdef PS_ARCH_HAS_FREEBSD32 if (is_elf32_sysctl(pid)) return (procstat_getauxv32_sysctl(pid, cntp)); #endif diff --git a/lib/libprocstat/libprocstat.h b/lib/libprocstat/libprocstat.h index 0df01817663e..3d30b4db4018 100644 --- a/lib/libprocstat/libprocstat.h +++ b/lib/libprocstat/libprocstat.h @@ -102,6 +102,11 @@ #define PS_FST_FFLAG_EXEC 0x2000 #define PS_FST_FFLAG_HASLOCK 0x4000 +#if !defined(__ILP32__) && !defined(__riscv) +/* Target architecture supports 32-bit compat */ +#define PS_ARCH_HAS_FREEBSD32 1 +#endif + struct kinfo_kstack; struct kinfo_proc; struct kinfo_vmentry; From nobody Thu Oct 26 17:40:13 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SGY3K3PqMz4y5LJ; Thu, 26 Oct 2023 17:40:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SGY3K2V9bz4c0y; Thu, 26 Oct 2023 17:40:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698342013; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YwE7PQPZcXGBoS0131PMoQvF7H07ad+notENr7OWmJc=; b=C6IqLqo1xjrh1yKgBmShtHqU0GpVW077DxwR4kpOqIcbpQQe0iq/RG19RDeYqoRfpB9ZaE jgAUNqm2Ds9uKAgZVjKRQEhPJamGWKaqCPjZU+nCn4QtCkM1MkYFAJeEUH/rERL8aMJUov KU/wC9/TVdz83xV3pzpzGulLHKELjQdc8VPjvVskunZw2Z/7CCi22x14gt7aUkxpTYdCbb Er60wIeMQ5uslOc+Lr+cufIdx8PYsNinXPOPkoKFfWTXK6cRgxRgYzjoiQTAWSVKrdWe9z 8X+afhgWtqf4kbQGQwzAdUy052W0S2jmMo6Ta2YRLkx/OmBimVJk9NIEesvBjg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698342013; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YwE7PQPZcXGBoS0131PMoQvF7H07ad+notENr7OWmJc=; b=B972kZN+nXT/D+Ucz8ZnvZY56lmV3uBGSHM1TaV4QEfvPtSMmJGz0JOZ6VJDy12NRuN7hX KF0flaCOOp9X9MJDAyqkmY115I8vpyhXIl4u/URLQKrZQkVv4SAJe/W/7cWOf1GLvtgcMj 5V3Xekb4I6RgZw41ROzo6c2Qw5zXS0nhDqAy4V8MmYgiOGzNvzX8H3SY5jXmf+Xg66SfJ8 PNvQ4ZfUnwILT7IFSnFW84vn0p+QaEpVa3HEbkx73NV8irWOqNODfu6Dzo07FzWuZhthTc Ix2+MwBqyvci6rO9jgOqi2Oe8rv/dUw0PoMUEQ7aKBa2d9G9LSLpyLJlc7CVKQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698342013; a=rsa-sha256; cv=none; b=cf7x/2GMI8kRvhExx1OAEupmYylUCtKYAR3lhok0EgkoCI7jK1V81Xvpb+1kz8OMK3RjQ2 Hqbpl6eJPMKYKzhx3uWIpSEQS7WfNHRN08gwW2PdGl1lA0oH/ZtxHAF0pFpz243Sn34lv5 +BLCdpRFKZ/nA/ZHi26+psHYeMgLnYxxGfRIXvu/uqJI2kNUbs6ajcNgwNx9VFN/oHkbPR ULonscaFQaWAirbCjhOQe4Vul2BRxo2x1bL4Uod+M++/goMEiMUsKItisKM6CSsrkc0q6/ WTWsqZcxDKjL3Zp+xWYXF8/EP0Cyk66Y3Xr3VCrQPDv73Mqj9PFDIGlcPaDQ3g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SGY3K1Xv4zgZN; Thu, 26 Oct 2023 17:40: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 39QHeDLM096204; Thu, 26 Oct 2023 17:40:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39QHeDuc096195; Thu, 26 Oct 2023 17:40:13 GMT (envelope-from git) Date: Thu, 26 Oct 2023 17:40:13 GMT Message-Id: <202310261740.39QHeDuc096195@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: 489420548255 - main - procctl.2: improve phrasing for ASLR disable List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 4894205482555447c6b3372598c7589a66596724 Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=4894205482555447c6b3372598c7589a66596724 commit 4894205482555447c6b3372598c7589a66596724 Author: Brooks Davis AuthorDate: 2023-10-26 17:38:14 +0000 Commit: Brooks Davis CommitDate: 2023-10-26 17:40:08 +0000 procctl.2: improve phrasing for ASLR disable Reported by: jrtc27 Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D42364 --- lib/libc/sys/procctl.2 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/libc/sys/procctl.2 b/lib/libc/sys/procctl.2 index e269edb8acaa..cb5234b6e40c 100644 --- a/lib/libc/sys/procctl.2 +++ b/lib/libc/sys/procctl.2 @@ -27,7 +27,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd April 15, 2023 +.Dd October 26, 2023 .Dt PROCCTL 2 .Os .Sh NAME @@ -85,8 +85,8 @@ Controls the Address Space Layout Randomization (ASLR) in the program images created by .Xr execve 2 -in the specified process or its descendants that did not changed -the control nor modified it by other means. +in the specified process or its descendants that do not either change +the control or modify it by other means. The .Fa data parameter must point to the integer variable holding one of the following From nobody Thu Oct 26 17:40:14 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SGY3L3yDQz4y5NQ; Thu, 26 Oct 2023 17:40: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 4SGY3L3DRxz4cKQ; Thu, 26 Oct 2023 17:40:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698342014; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dK+cqvGyU/LHCyCTnrLUKtDN+XExgVmB5hOhrdqZL5g=; b=UbN+LaiJN9Hb62iAJuLqA3p9nxzQOsk05VRC2WMcDUXUJKfBYBUqKJZt6c6enDMXzAVWQZ FixUnFSY7ViFCBa2BJLbRf84Y68s7zr1DmsXwL4hGVUxzXY+LRfld7hZ5XGo6bxXqEgJC6 FKSFivY/1ByVqog+1A3+EeTcgs5FmlwDiXdCFDBAe9elM9oTTxQdySWTvlYiCt5GR7v3tS qwd+m38bI3EqFhPPmjPpFQOOGyxcgwJZ9yoQLeDjKHkdPJ0o9jvezNRfeFbE/D2/2VppAw rUWhui3t8qEogIMHg1xyH+6z5hGeEZz28s9FJ2FXGX0kw+l9LodzuG+oPnw1JQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698342014; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dK+cqvGyU/LHCyCTnrLUKtDN+XExgVmB5hOhrdqZL5g=; b=fuglVeVQk4MKspdK5LxnmUZiOfUayJ9rk0SgRRtY53DTcYajpv/K6Zs63AZ6XXl2Yc3jJQ g3cpXACUYteww93t5y4u3uUwiEBq5dhz7qbxWQeFdDuVK+jA3PRkBaWksGvR0Dr27ctH37 TNp4aO25Q0ZHrFrn+fLBZr8kO7NXinG11NS8xBrvjVr0nfIm4IEQXUmWOxK4EtXKXpxvjQ y0HGKeHYORXZu+whfxiz8A+8eKFg1wzeoUb0n3R8N9NleMe5/Hn35TLND2tui2maihpmdj y5pTrlkRbm3SbzDNDhbV9/uKf73IvHCIyL+2ZO8qN46nfIme8JvX4YSL+jBshA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698342014; a=rsa-sha256; cv=none; b=U3QdyinKeYDPSkLvVoq8ShrecJ0vRnPBbV7Uchu5Ny5HTycwee+zpHI3UZQgIQZeoupdjn rn6o+/3kyym57SxPv9TiiNFz1EWp7+qTpxaMX+AAZtW+7aqkFbIC3O/En0pk2ODSX9wTmU BhP+6CWboc1LZX6l4SiNwJF/OiixxNZ3qVzte1wElmvr4Qv+7NgocSBcLnppxD05yvUyrF FH6S98f7D+H6BcAxpyR8GxooZTx1mFepwPH/i20049q4hNQosW/qhwKvVtxGeR8vsThxd5 uvPYNHA/kKJ3j9meYNAaeaBqGRIYFZfJ1HizxFSBcXl18/i7gALvLHzVuFcAPA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SGY3L25knzg8Q; Thu, 26 Oct 2023 17:40: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 39QHeEXf096884; Thu, 26 Oct 2023 17:40:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39QHeEdi096880; Thu, 26 Oct 2023 17:40:14 GMT (envelope-from git) Date: Thu, 26 Oct 2023 17:40:14 GMT Message-Id: <202310261740.39QHeEdi096880@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: 326bf5089ca7 - main - auxv: make AT_BSDFLAGS unsigned List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 326bf5089ca788d5ff1951eed7a9067281a2b65e Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=326bf5089ca788d5ff1951eed7a9067281a2b65e commit 326bf5089ca788d5ff1951eed7a9067281a2b65e Author: Brooks Davis AuthorDate: 2023-10-26 17:38:35 +0000 Commit: Brooks Davis CommitDate: 2023-10-26 17:40:08 +0000 auxv: make AT_BSDFLAGS unsigned AT_BSDFLAGS shouldn't be sign extended on 64-bit systems so use a uint32_t instead of an int. Reviewed by: imp, kib Differential Revision: https://reviews.freebsd.org/D42365 --- sys/kern/imgact_elf.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/kern/imgact_elf.c b/sys/kern/imgact_elf.c index 4ebd08082545..dfa874e307e5 100644 --- a/sys/kern/imgact_elf.c +++ b/sys/kern/imgact_elf.c @@ -1434,7 +1434,8 @@ __elfN(freebsd_copyout_auxargs)(struct image_params *imgp, uintptr_t base) Elf_Auxinfo *argarray, *pos; struct vmspace *vmspace; rlim_t stacksz; - int error, bsdflags, oc; + int error, oc; + uint32_t bsdflags; argarray = pos = malloc(AT_COUNT * sizeof(*pos), M_TEMP, M_WAITOK | M_ZERO); From nobody Thu Oct 26 18:41:08 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SGZPc5bpsz4y8Dm; Thu, 26 Oct 2023 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 4SGZPc5794z3JhN; Thu, 26 Oct 2023 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=1698345668; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GAqSNetmYRJcwTuVU4RcN66fhGmKY7r9ZbMR/eiki90=; b=BST6dnn2Eg4k1jZSuOglI8OLGZkL7OHGzKzMqIH5/4SHktuAylHG4o+izXcmU/DSPwU+B3 T/R5zvXakrMTdjxurZvVpc5otaJ93rWqDBaJxjjc9dTg/61MmL5N+GqWNAF5KGtF7fMwZv 0FuiuPgAAjlWUbPQXbpHfEzU9pZP3g72/3rURyKm7sSbAGlMTy/EIR2eHFTNS0n/DkUpDI W5H1nk14aD9jbTEaXGAU9jfq5FiBrANmwezUblnXrwCC/+dZDjzd0f7rLq63RFpEEW8xJl W5+S5U6OHOUmlMfv04uI9vdlDN20vxfUjFN6AV0MH6q+ITax0XLldClgIeOdJA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698345668; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GAqSNetmYRJcwTuVU4RcN66fhGmKY7r9ZbMR/eiki90=; b=AwtnmyGY8QtOye9N5x1mdjR19tAJYwkcUZ2ANp/QqfUnNOD033a0EJLowpsS7hn/E+7Vl0 /b//S0BU6jPLn0lrgg2ce8Ilsqi0ho0JFZN1byXvIFWzSfBWWKmHAOKQGkzGV7fW+F4aXy JNro+2UBO+AtjP+0Hfjr1ER7dODqpjGyG2HxLHwlJkDKosDWtLCrMnGNPuDP/7kpDEwxqe bP7dNlj7JMIpqlCAeM7sEADZ7t1LwULMP0Pcu/BquXp7fcPzY2eC77Xymr/uv/mQ3zER8b jsjYWOwBjD/iWHPan1vrZA3AvvPpKpJxZD9npERkz09HhFiskwcs2p5cpD5VKQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698345668; a=rsa-sha256; cv=none; b=HXuLV758nKlv0l42atRejLXeH1XbDUQIH51oWwV5HsSWavJrB+kewNrrmAs58RsVZlCMbQ sfFLXGCfm6QgxaC/+syM4L4nItFtvNGZs0Er8nzMC58WQe2ffYr2KjaELOyYEdZPabftW3 eAn0ddyuUy9jt/yKYxkYYqf3aiN/YjhWVZHs8V2j+VZX7PaMh5tk901wukUTMyLbqx6hFB LeckhKEv28A2c6yex0GXFHSMZ+Q32VpbCaLWXqSVGTUCqUsRvIkOTeCxQecIegThVDk4bu kwqZuGDQ51/UVxjf6CR1fAWKkFRCK9T3PQgzOQkJgxWboZ2pax/GUNJeyiHiBA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SGZPc4CjNzhZc; Thu, 26 Oct 2023 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 39QIf8IQ002643; Thu, 26 Oct 2023 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 39QIf8Wv002640; Thu, 26 Oct 2023 18:41:08 GMT (envelope-from git) Date: Thu, 26 Oct 2023 18:41:08 GMT Message-Id: <202310261841.39QIf8Wv002640@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: 99c20ec65706 - main - ttys: bump date List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 99c20ec65706a2ee15326763732e5d333bdd1b41 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=99c20ec65706a2ee15326763732e5d333bdd1b41 commit 99c20ec65706a2ee15326763732e5d333bdd1b41 Author: Warner Losh AuthorDate: 2023-10-26 18:37:51 +0000 Commit: Warner Losh CommitDate: 2023-10-26 18:38:22 +0000 ttys: bump date --- libexec/getty/ttys.5 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libexec/getty/ttys.5 b/libexec/getty/ttys.5 index 132b921084d8..5138172c48a7 100644 --- a/libexec/getty/ttys.5 +++ b/libexec/getty/ttys.5 @@ -27,7 +27,7 @@ .\" .\" from: @(#)ttys.5 8.1 (Berkeley) 6/4/93 .\" " -.Dd June 1, 2021 +.Dd October 26, 2023 .Dt TTYS 5 .Os .Sh NAME From nobody Thu Oct 26 18:52:06 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SGZfM1HSfz4y8yf; Thu, 26 Oct 2023 18:52:11 +0000 (UTC) (envelope-from yaneurabeya@gmail.com) Received: from mail-pf1-x430.google.com (mail-pf1-x430.google.com [IPv6:2607:f8b0:4864:20::430]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SGZfL46KVz3Ktw; Thu, 26 Oct 2023 18:52:10 +0000 (UTC) (envelope-from yaneurabeya@gmail.com) Authentication-Results: mx1.freebsd.org; dkim=pass header.d=gmail.com header.s=20230601 header.b="nL8L/v7x"; spf=pass (mx1.freebsd.org: domain of yaneurabeya@gmail.com designates 2607:f8b0:4864:20::430 as permitted sender) smtp.mailfrom=yaneurabeya@gmail.com; dmarc=pass (policy=none) header.from=gmail.com Received: by mail-pf1-x430.google.com with SMTP id d2e1a72fcca58-6b87c1edfd5so1204761b3a.1; Thu, 26 Oct 2023 11:52:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1698346329; x=1698951129; darn=freebsd.org; h=to:references:message-id:cc:date:in-reply-to:from:subject :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=Ps5aWoumvsYkTdqurmF24S+usJFCMPG3sdr/qqhnMUk=; b=nL8L/v7x5LJ9GP4ClXXcDcsFl/jWO/qxsxGc0um3/CVh3n+EKmLiINo0v+h/h1l/Tr BU3qhProWP6U3h/tBxt2qOonZUGyWoMc+c/yhd8PF/pliVnbpmQxnBpe+jF5abJuiKvV e8BNWdpRRB7ZjmSNUS5Sun2k6tQhT3vJKvjhpgcVPzbzdYADJpQxv+KrF/U2n1aQyZZw rKjFBKM4IMf6PFsE1fRaisj492vaAZrRCFTVjmQfTmR/HHcJsUb72qO49y7x4w4ajocw wXwiJIafPHD9rIutFp9D1wHH3RsL5EQ18HkJCYNit+GjgvKKcxn7Xcf4gtbJZPfcsaG6 35Yg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698346329; x=1698951129; h=to:references:message-id:cc:date:in-reply-to:from:subject :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=Ps5aWoumvsYkTdqurmF24S+usJFCMPG3sdr/qqhnMUk=; b=V/SeO03Kh08tnhZYlc47enkIsJWXcMpc94famQZr6O4X3jZqnIcsFzcM4/9cfUfNor x++waHzzte4LmetT0tpd/tifT7A1iuePM1FaE3nsKzyJXrdI2bnJKwOmVh6i3hJ7EJ4h pFrNRT5AwRu/W4ZJXqYB8VEgIFiXADWEf+vpIBMQaLdM9bnZxCyeS7j5ChdC9OuitG5Z RIfO/2mdB0RnhtmAPiCg2aTXqeSv1qhYqSlzfr8B1cwTSuyW+afuZCWATtLAzZYs5wFS gI39k11zGEwohRDz+NYMFtOANDolzGAwjUSiSKZUH9EaygdRxWta/7ytK5VI4oED9R1v ESfw== X-Gm-Message-State: AOJu0YyUBmmnucE/UKw2A0Rg0kfQz3V+zwz3o4r1ovrGXOJ6ocOXt4lL XVMbTstSyp8YlLeJ6VdkwjPnYiQx/H8AtA== X-Google-Smtp-Source: AGHT+IEegOpsWFEI28UKAeqi+NxjP+dPtoZghK0UyPpY/ZxdZBd1yuqgVBlZ/mHGWQ4M3QPIn0TtyQ== X-Received: by 2002:a05:6a00:2356:b0:6b1:bf32:4fb5 with SMTP id j22-20020a056a00235600b006b1bf324fb5mr391866pfj.28.1698346328537; Thu, 26 Oct 2023 11:52:08 -0700 (PDT) Received: from smtpclient.apple (c-73-35-248-51.hsd1.wa.comcast.net. [73.35.248.51]) by smtp.gmail.com with ESMTPSA id b4-20020aa79504000000b0068fe76cdc62sm5758009pfp.93.2023.10.26.11.52.07 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 26 Oct 2023 11:52:07 -0700 (PDT) Content-Type: multipart/signed; boundary="Apple-Mail=_A84BD7E4-2FC4-4DC4-AF9D-6549544C566F"; protocol="application/pgp-signature"; micalg=pgp-sha256 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3696.120.41.1.4\)) Subject: Re: git: 6120673f7566 - main - tests: fix ATF_TESTS_PYTEST no clean build From: Enji Cooper In-Reply-To: Date: Thu, 26 Oct 2023 11:52:06 -0700 Cc: Dimitry Andric , markj@freebsd.org, "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Message-Id: <8962DE73-16C0-4DF0-87B9-53A5ECC3D158@gmail.com> References: <202310201747.39KHlUgB005433@gitrepo.freebsd.org> To: Gleb Smirnoff X-Mailer: Apple Mail (2.3696.120.41.1.4) X-Spamd-Result: default: False [-5.55 / 15.00]; SIGNED_PGP(-2.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_SHORT(-0.95)[-0.953]; MV_CASE(0.50)[]; DMARC_POLICY_ALLOW(-0.50)[gmail.com,none]; R_SPF_ALLOW(-0.20)[+ip6:2607:f8b0:4000::/36]; R_DKIM_ALLOW(-0.20)[gmail.com:s=20230601]; MIME_GOOD(-0.20)[multipart/signed,text/plain]; DWL_DNSWL_NONE(0.00)[gmail.com:dkim]; ARC_NA(0.00)[]; TO_DN_EQ_ADDR_SOME(0.00)[]; FROM_HAS_DN(0.00)[]; MID_RHS_MATCH_FROM(0.00)[]; RCVD_IN_DNSWL_NONE(0.00)[2607:f8b0:4864:20::430:from]; TO_MATCH_ENVRCPT_ALL(0.00)[]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US]; MIME_TRACE(0.00)[0:+,1:+,2:~]; MLMMJ_DEST(0.00)[dev-commits-src-all@freebsd.org,dev-commits-src-main@freebsd.org]; FREEMAIL_FROM(0.00)[gmail.com]; TO_DN_SOME(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; FREEMAIL_ENVFROM(0.00)[gmail.com]; HAS_ATTACHMENT(0.00)[]; DKIM_TRACE(0.00)[gmail.com:+]; RCPT_COUNT_FIVE(0.00)[6]; RCVD_TLS_LAST(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; RCVD_COUNT_TWO(0.00)[2] X-Rspamd-Queue-Id: 4SGZfL46KVz3Ktw X-Spamd-Bar: ----- --Apple-Mail=_A84BD7E4-2FC4-4DC4-AF9D-6549544C566F Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=utf-8 > On Oct 22, 2023, at 3:13 PM, Gleb Smirnoff = wrote: >=20 > On Sat, Oct 21, 2023 at 09:07:26PM +0200, Dimitry Andric wrote: > D> > commit 6120673f7566c35023921540d2d682572d1bf1ce > D> > Author: Gleb Smirnoff > D> > AuthorDate: 2023-10-20 17:47:08 +0000 > D> > Commit: Gleb Smirnoff > D> > CommitDate: 2023-10-20 17:47:08 +0000 > D> > > D> > tests: fix ATF_TESTS_PYTEST no clean build > D> > > D> > The hack with .xtmp file was effectively making the make to > D> > ignore changes to the sources, breaking NO_CLEAN builds. The > D> > hack can be actually omitted as setting SCRIPTSNAME_${_T} for > D> > every test is sufficient to prevent renaming by bsd.prog.mk. > D> > > D> > Reviewed by: melifaro > D> > Differential Revision: https://reviews.freebsd.org/D42283 > D> > D> This appears to break clean builds, in that it now deletes files > D> mentioned in ATF_TESTS_PYTEST in the _source_ directories, leaving = your > D> git checkout looking as follows: >=20 > Oh shit... Sorry. :( When I come up with a better change, who would > be a good reviewer for the change? Hi Gleb! If you include the tests group, we might be able to help (it=E2=80= =99s a bit larger than asomers@/jmmv@). jmmv@FreeBSD.org has been = inactive these days too =E2=80=94 it would probably be a good idea to = mark his account disabled (if possible). bdrewery@ might have been a = good resource as well. Cheers, -Enji PS I=E2=80=99m swamped with work/life stuff, but I try to give my input = if/when I can. --Apple-Mail=_A84BD7E4-2FC4-4DC4-AF9D-6549544C566F Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=signature.asc Content-Type: application/pgp-signature; name=signature.asc Content-Description: Message signed with OpenPGP -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEEtvtxN6kOllEF3nmX5JFNMZeDGN4FAmU6tVYACgkQ5JFNMZeD GN7vYg/9Ha/8FGf0PpdQ8kPee2iSn/00L6D9cfs9nZT92JhqNl817+7KAVPhRXdG SdV7jatFIlFRzUMXHgdCi1A7j1desfdCthNmX9RM3rTZ16KfG+U9Mg7FrWvTIXFz pa3gunbUXJbF8y+ZfK73ziabqQqkMfyWB3UkdMaSgNcpjF9CKxLxsgZrpjiRJAf0 hEmPF0R+eFxRn+fewmYpG1Fz5b8lPAU6GgqofRVcZIMbwdM1U7GnEJsL2ekhSEI0 2b53Y4BUXrDkwHr5x2MrpQdlacQKQtE3klwxJkS42Fxbi82mOp3sujXfklQ3qtAh 69GV6ywH56wj49a6ezdnMFOxUdLzapdClFO/ye5e5fa6nlJDFWshAwT4U/V+RL7/ pNvzuAhdHZKTfLZg1SFhcszHXjUB6bJyd4CQtOQd+iygWhAXYMjuTsmulBtph5+g CNmJN7/L1OMzlmChkeQAqj5j+rBzAI6Al6Sh7tDL4p1rtKAxTmQNwUfFa7POl0KB NI3ecIBdCAwhvDu1iCZRr/hvsLynkXyEc2gmzx0E7K9pggXwi5hlRXa52W27TSl+ ovkt156xxJWygGIPX46Kgf1aD8OYWnz/ZKH2nD534OVVcNY6oIP5wqDWIRGNjetU 8DR9Jyzes33mkmA09VSsZUisi4hTBS9qNr3ENbsjAUYRr39uxUs= =FD7x -----END PGP SIGNATURE----- --Apple-Mail=_A84BD7E4-2FC4-4DC4-AF9D-6549544C566F-- From nobody Thu Oct 26 19:07:46 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SGb0M0wmqz4y9Mm; Thu, 26 Oct 2023 19:07: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 4SGb0M09Dbz3LfT; Thu, 26 Oct 2023 19:07:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698347267; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9VD+gSndxr00YMoqBkCqMpXEQGcjRPTWV7mr8xQkggI=; b=GKRf3arhRqsaB2ssosKj30lg5NJLg+3u6oaj42hJrajYxafW94kCxdiGmvQULZGJh+J7Ru V5moOmp00G1Wot1AL+gxDi4Q1FVQKArXmiZCggHjC8aeXU/yUb7XNKX+9gwFgzn23A+96x hOHh1kF688DNLmSLm0+M/GhbDzt8qb6+7Qlj0w79RSceqkmy66W2z7ciRRTpKCwuWRiRIr ZonGAo3HVqSTbBNjj/d1yRBWKydMUn2l2YtkrIdvlgTEzsAPI3zpFXd3kkRovcssVnOyWu CPHke3jL6TrsO9ZiEVwhwpfPnUXoerzZKC/PgdArZOfkEl8a32Bnw//KEVxnhg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698347267; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9VD+gSndxr00YMoqBkCqMpXEQGcjRPTWV7mr8xQkggI=; b=Jlp20l28i+/DB0COYplvvQqhPnYIn4IUwGRB/gXfUbcwkU/D0xaX+1OpP1H3MpcMwahHGb IIY7g40iLyhm7YgvVEAWy0b26uGf672elQZV8c2DnbzjdpDVkxVNWzovsebWh57/XQC66y 9Rc/KSLn5O29iGceTE/yrIwgeE5StNepbtZ3Bf1GnlL4UYHNudvWUXlyyOUp4as4NjXJbc K3MUdmPtnZY2U8XpYoaookr/Kfj1ZzqDbGQvm0rG8a9+VdRyGP2yC2qLfcncrU2DIoBjup 2SICr896ofKHiqhVj8I+d9C43SLJhqEtg+C0J/oghH8EdLfivC21caAnhURdpA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698347267; a=rsa-sha256; cv=none; b=gx74Nr9v0x3nk5DsQEjIK+R5Dk6yix4B94ER9M+wU+RTPJFE5iXRfRoocZ1zWNNPQmVFVb iZsHr1TrCkmwJdL6RA6UE+iWdfqNeDf/KFX27lOsIzCa4nWr9Vtxeky/An+DnrdJ1Ulo/Z CGV3dBBpqXK5KDdvVDU1XAaSvERN8nQYazA34dBXj/0IvsKYCiFw54bpfijN/pxlnxoMV4 wJgyhZhOf/Lj3bTypacuKiWPyT/OAOK0kY+NvH3dBtOBuXldMo+kIxJDmTAmexdfXBlXh4 LP1EHrNe34ATyEFWBA9l/MJYDaQQ3EN66UbXaDiCL5hGV+gd1pZ7Dl30eCqFQA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SGb0L6LjQzjGP; Thu, 26 Oct 2023 19:07: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 39QJ7kNg041026; Thu, 26 Oct 2023 19:07:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39QJ7k5t041023; Thu, 26 Oct 2023 19:07:46 GMT (envelope-from git) Date: Thu, 26 Oct 2023 19:07:46 GMT Message-Id: <202310261907.39QJ7k5t041023@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: 27272d3d97c8 - stable/13 - add pmap_active_cpus() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 27272d3d97c8e363e3f454f1de3b1be307c8a033 Auto-Submitted: auto-generated The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=27272d3d97c8e363e3f454f1de3b1be307c8a033 commit 27272d3d97c8e363e3f454f1de3b1be307c8a033 Author: Konstantin Belousov AuthorDate: 2021-10-07 22:25:54 +0000 Commit: Konstantin Belousov CommitDate: 2023-10-26 04:07:29 +0000 add pmap_active_cpus() (cherry picked from commit 8882b7852acf2588d87ccb6d4c6bf7694511fc56) --- sys/amd64/amd64/pmap.c | 6 ++++++ sys/arm/arm/pmap-v6.c | 6 ++++++ sys/arm64/include/pmap.h | 2 ++ sys/i386/i386/pmap_base.c | 6 ++++++ sys/powerpc/powerpc/pmap_dispatch.c | 6 ++++++ sys/riscv/riscv/pmap.c | 6 ++++++ sys/vm/pmap.h | 2 ++ sys/vm/vm_kern.c | 26 ++++++++++++++++++++++++++ 8 files changed, 60 insertions(+) diff --git a/sys/amd64/amd64/pmap.c b/sys/amd64/amd64/pmap.c index 4fba61269352..8f1541bc8637 100644 --- a/sys/amd64/amd64/pmap.c +++ b/sys/amd64/amd64/pmap.c @@ -10000,6 +10000,12 @@ pmap_activate_boot(pmap_t pmap) PCPU_SET(ucr3, PMAP_NO_CR3); } +void +pmap_active_cpus(pmap_t pmap, cpuset_t *res) +{ + *res = pmap->pm_active; +} + void pmap_sync_icache(pmap_t pm, vm_offset_t va, vm_size_t sz) { diff --git a/sys/arm/arm/pmap-v6.c b/sys/arm/arm/pmap-v6.c index f00589a75c6d..0446a67bdbcf 100644 --- a/sys/arm/arm/pmap-v6.c +++ b/sys/arm/arm/pmap-v6.c @@ -6212,6 +6212,12 @@ pmap_activate(struct thread *td) critical_exit(); } +void +pmap_active_cpus(pmap_t pmap, cpuset_t *res) +{ + *res = pmap->pm_active; +} + /* * Perform the pmap work for mincore(2). If the page is not both referenced and * modified by this pmap, returns its physical address so that the caller can diff --git a/sys/arm64/include/pmap.h b/sys/arm64/include/pmap.h index 7305b8d32e87..a8e1041163be 100644 --- a/sys/arm64/include/pmap.h +++ b/sys/arm64/include/pmap.h @@ -149,6 +149,8 @@ extern struct pmap kernel_pmap_store; (uint64_t)(asid) << TTBR_ASID_SHIFT; \ }) +#define PMAP_WANT_ACTIVE_CPUS_NAIVE + extern vm_offset_t virtual_avail; extern vm_offset_t virtual_end; diff --git a/sys/i386/i386/pmap_base.c b/sys/i386/i386/pmap_base.c index cc840865218f..8e2403682a78 100644 --- a/sys/i386/i386/pmap_base.c +++ b/sys/i386/i386/pmap_base.c @@ -944,6 +944,12 @@ pmap_kremove(vm_offset_t va) pmap_methods_ptr->pm_kremove(va); } +void +pmap_active_cpus(pmap_t pmap, cpuset_t *res) +{ + *res = pmap->pm_active; +} + extern struct pmap_methods pmap_pae_methods, pmap_nopae_methods; int pae_mode; SYSCTL_INT(_vm_pmap, OID_AUTO, pae_mode, CTLFLAG_RDTUN | CTLFLAG_NOFETCH, diff --git a/sys/powerpc/powerpc/pmap_dispatch.c b/sys/powerpc/powerpc/pmap_dispatch.c index 0b899a8e6020..2e7539cf09cb 100644 --- a/sys/powerpc/powerpc/pmap_dispatch.c +++ b/sys/powerpc/powerpc/pmap_dispatch.c @@ -253,3 +253,9 @@ pmap_is_valid_memattr(pmap_t pmap __unused, vm_memattr_t mode) return (FALSE); } } + +void +pmap_active_cpus(pmap_t pmap, cpuset_t *res) +{ + *res = pmap->pm_active; +} diff --git a/sys/riscv/riscv/pmap.c b/sys/riscv/riscv/pmap.c index 665d257fe6c5..d1996dabbc2c 100644 --- a/sys/riscv/riscv/pmap.c +++ b/sys/riscv/riscv/pmap.c @@ -4693,6 +4693,12 @@ pmap_activate_boot(pmap_t pmap) PCPU_SET(curpmap, pmap); } +void +pmap_active_cpus(pmap_t pmap, cpuset_t *res) +{ + *res = pmap->pm_active; +} + void pmap_sync_icache(pmap_t pmap, vm_offset_t va, vm_size_t sz) { diff --git a/sys/vm/pmap.h b/sys/vm/pmap.h index 7272882132e0..65e909df9b8f 100644 --- a/sys/vm/pmap.h +++ b/sys/vm/pmap.h @@ -90,6 +90,7 @@ typedef struct pmap_statistics *pmap_statistics_t; #include #ifdef _KERNEL +#include struct thread; /* @@ -118,6 +119,7 @@ extern vm_offset_t kernel_vm_end; #define PMAP_TS_REFERENCED_MAX 5 void pmap_activate(struct thread *td); +void pmap_active_cpus(pmap_t pmap, cpuset_t *res); void pmap_advise(pmap_t pmap, vm_offset_t sva, vm_offset_t eva, int advice); void pmap_align_superpage(vm_object_t, vm_ooffset_t, vm_offset_t *, diff --git a/sys/vm/vm_kern.c b/sys/vm/vm_kern.c index 4c50d32a1e33..2d5d20d931d3 100644 --- a/sys/vm/vm_kern.c +++ b/sys/vm/vm_kern.c @@ -77,6 +77,7 @@ #include #include #include +#include #include #include #include @@ -883,6 +884,31 @@ kmem_bootstrap_free(vm_offset_t start, vm_size_t size) #endif } +#ifdef PMAP_WANT_ACTIVE_CPUS_NAIVE +void +pmap_active_cpus(pmap_t pmap, cpuset_t *res) +{ + struct thread *td; + struct proc *p; + struct vmspace *vm; + int c; + + CPU_ZERO(res); + CPU_FOREACH(c) { + td = cpuid_to_pcpu[c]->pc_curthread; + p = td->td_proc; + if (p == NULL) + continue; + vm = vmspace_acquire_ref(p); + if (vm == NULL) + continue; + if (pmap == vmspace_pmap(vm)) + CPU_SET(c, res); + vmspace_free(vm); + } +} +#endif + /* * Allow userspace to directly trigger the VM drain routine for testing * purposes. From nobody Thu Oct 26 19:07:47 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SGb0N2G5vz4y9nC; Thu, 26 Oct 2023 19:07: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 4SGb0N1M2rz3Lqc; Thu, 26 Oct 2023 19:07:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698347268; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Z7NzxqD6Gy2gyo2NkAt/eVcL7XHiLbFcp1B2Kpbz79I=; b=htcEPeM0xszcFF62VEjPFKtl6TyI/vskHBFHuN1SDFiiyQf0c5PWhQHFrVS0ateC8sLfej fWiWex6/d4lFU2lM0aORHncdFEhQDZUamRAE+7L7ARapWrYJoE0wyKNFZmMyHbc/UthVKM EA1O399MLC/2Tb6aCMPuMonV65ghXuy6Ydj024ORBszifFPAEnq1HmtTaiJblhvlSlsKcF s4HjgjGxY24Y6+DKUbba/TiESxkK0oj7XdGYjpciD1IuYePDlrkdIi3bOOhX3/gks6Lyt4 ScheXOr30KVkYUxkYHVh8u0jYiO7HuWaxdHbAzr6D5CIT9dexfd3OlbuK4oYuA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698347268; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Z7NzxqD6Gy2gyo2NkAt/eVcL7XHiLbFcp1B2Kpbz79I=; b=VsWZnR1Ln4LxYL1kGkvUTCwekEYKguODSo+iXg4u2wO/oSbdoFotgWWwsDa+U5lSXgieKJ xvX0AAtbjuo1GuU7w3BjfnT+MEHtioC5ZSQSZcbQsCyMSvNRVJgB1s8i8aUr7iJBJo+HVZ y5jw2CQc3AkSpSXXcd1oH2OpUHEno8sGujUUWJK5wI8QUoLBIuXTYSUJCueF57EmFE0awu oQ2waeOoT4qsHvKCX4gSewnISqjdcD3yCkOJzBtFX6H8Nql362yB6zqs/bZFwFXYo5TcH+ PUtKLkdtypVkVKF+n/4lG4wTGvH8kPja+Pj7XR/cb3TNH7/aGBiKV49PAck46g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698347268; a=rsa-sha256; cv=none; b=rLt94ZHUW7sZadJqgfpRJ/W9yQenvPoqLtF1yGaPAyGvV//nmyw2OxheykABf6bfJx7v1S sPMN5Bi3R1foKhs1u7udigr0SHpacDqF4w7hHN9u1BwVz5QH3bSKnrFC/om1kVVdXQLzz3 EccozykYgMTqdpNVEQ5RH7Aew9Esptd91/jhsyWrkTGjJs525hlPZ7mREkwOcGzHY4phyw GIyd33LhpNqEaJmKWUah322gsGdEtr9do/g+2r6HqIQK/usy/BsPaQuuH6Ud+gbWFAriPv ygrKjgppJWvmlG/h2+kbp8gJyyQsQNZEIyVFHFmGLJ/LA+PlCuE+eS8jU2z7ZQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SGb0N0BxxzjwC; Thu, 26 Oct 2023 19:07: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 39QJ7lPq041060; Thu, 26 Oct 2023 19:07:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39QJ7lHw041057; Thu, 26 Oct 2023 19:07:47 GMT (envelope-from git) Date: Thu, 26 Oct 2023 19:07:47 GMT Message-Id: <202310261907.39QJ7lHw041057@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: ef71fbf692af - stable/13 - Add cpu_sync_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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: ef71fbf692af963b1a4fa072e88d0d1256f1f897 Auto-Submitted: auto-generated The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=ef71fbf692af963b1a4fa072e88d0d1256f1f897 commit ef71fbf692af963b1a4fa072e88d0d1256f1f897 Author: Konstantin Belousov AuthorDate: 2021-10-07 21:57:55 +0000 Commit: Konstantin Belousov CommitDate: 2023-10-26 04:07:29 +0000 Add cpu_sync_core() (cherry picked from commit 74ccb8ecf6c115a79f008bc32d4981f1126b63a8) --- sys/amd64/amd64/support.S | 21 +++++++++++++++++++++ sys/arm/arm/vm_machdep.c | 5 +++++ sys/arm64/arm64/vm_machdep.c | 11 +++++++++++ sys/i386/i386/support.s | 8 ++++++++ sys/powerpc/powerpc/vm_machdep.c | 10 ++++++++++ sys/riscv/riscv/vm_machdep.c | 7 +++++++ sys/sys/proc.h | 1 + 7 files changed, 63 insertions(+) diff --git a/sys/amd64/amd64/support.S b/sys/amd64/amd64/support.S index f070973913a0..936065a78879 100644 --- a/sys/amd64/amd64/support.S +++ b/sys/amd64/amd64/support.S @@ -1970,3 +1970,24 @@ ENTRY(mds_handler_silvermont) popq %rax retq END(mds_handler_silvermont) + +/* + * Do the same as Linux and execute IRET explicitly, despite IPI + * return does it as well. + */ +ENTRY(cpu_sync_core) +/* + * Can utilize SERIALIZE when instruction is moved from + * 'future extensions' to SDM. + */ + movq (%rsp), %rdx + movl %ss, %eax + pushq %rax + pushq %rsp + addq $16, (%rsp) + pushfq + movl %cs, %eax + pushq %rax + pushq %rdx + iretq +END(cpu_sync_core) diff --git a/sys/arm/arm/vm_machdep.c b/sys/arm/arm/vm_machdep.c index 2dcd0158fd93..03816df5760f 100644 --- a/sys/arm/arm/vm_machdep.c +++ b/sys/arm/arm/vm_machdep.c @@ -305,3 +305,8 @@ cpu_procctl(struct thread *td __unused, int idtype __unused, id_t id __unused, return (EINVAL); } + +void +cpu_sync_core(void) +{ +} diff --git a/sys/arm64/arm64/vm_machdep.c b/sys/arm64/arm64/vm_machdep.c index f1ff0742418a..ea8e88b7201d 100644 --- a/sys/arm64/arm64/vm_machdep.c +++ b/sys/arm64/arm64/vm_machdep.c @@ -302,3 +302,14 @@ cpu_procctl(struct thread *td __unused, int idtype __unused, id_t id __unused, return (EINVAL); } + +void +cpu_sync_core(void) +{ + /* + * Do nothing. According to ARM ARMv8 D1.11 Exception return + * If FEAT_ExS is not implemented, or if FEAT_ExS is + * implemented and the SCTLR_ELx.EOS field is set, exception + * return from ELx is a context synchronization event. + */ +} diff --git a/sys/i386/i386/support.s b/sys/i386/i386/support.s index e017e67d0fa7..2995469405df 100644 --- a/sys/i386/i386/support.s +++ b/sys/i386/i386/support.s @@ -634,3 +634,11 @@ ENTRY(mds_handler_silvermont) movl %eax, %cr0 3: ret END(mds_handler_silvermont) + +ENTRY(cpu_sync_core) + popl %eax + pushfl + pushl %cs + pushl %eax + iretl +END(cpu_sync_core) diff --git a/sys/powerpc/powerpc/vm_machdep.c b/sys/powerpc/powerpc/vm_machdep.c index 47a4dd0d4c4a..c99748149f39 100644 --- a/sys/powerpc/powerpc/vm_machdep.c +++ b/sys/powerpc/powerpc/vm_machdep.c @@ -234,3 +234,13 @@ cpu_procctl(struct thread *td __unused, int idtype __unused, id_t id __unused, return (EINVAL); } + +void +cpu_sync_core(void) +{ + /* + * Linux performs "rfi" there. Our rendezvous IPI handler on + * the target cpu does "rfi" before and lwsync/sync after the + * action, which is stronger than required. + */ +} diff --git a/sys/riscv/riscv/vm_machdep.c b/sys/riscv/riscv/vm_machdep.c index 3b2553996bb8..58acf5df9e14 100644 --- a/sys/riscv/riscv/vm_machdep.c +++ b/sys/riscv/riscv/vm_machdep.c @@ -49,6 +49,7 @@ #include #include +#include #include #include #include @@ -267,3 +268,9 @@ cpu_procctl(struct thread *td __unused, int idtype __unused, id_t id __unused, return (EINVAL); } + +void +cpu_sync_core(void) +{ + fence_i(); +} diff --git a/sys/sys/proc.h b/sys/sys/proc.h index 0e8156e308b6..369bc607e9c7 100644 --- a/sys/sys/proc.h +++ b/sys/sys/proc.h @@ -1162,6 +1162,7 @@ void cpu_idle(int); int cpu_idle_wakeup(int); extern void (*cpu_idle_hook)(sbintime_t); /* Hook to machdep CPU idler. */ void cpu_switch(struct thread *, struct thread *, struct mtx *); +void cpu_sync_core(void); void cpu_throw(struct thread *, struct thread *) __dead2; bool curproc_sigkilled(void); void userret(struct thread *, struct trapframe *); From nobody Thu Oct 26 19:07:49 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SGb0Q2b5qz4y9hC; Thu, 26 Oct 2023 19:07: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 4SGb0P5dB7z3Ll6; Thu, 26 Oct 2023 19:07:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698347269; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=q4PyG08kZ6Wum/HNSDVZjSe6qbyIPnA/HD9Pxxoo138=; b=T1Q6qtLEN1UW6xZPja7tZ39fB+8Zl1luhW1GRpk02cejfXqkpaowgIZO4KWVsP5ybQEsLM cb70AhLOGHuoSqBtTcrl6CgbrnCdRn2WnoIAdwA4vzOeANpFfLK4r+nXJMGCD5jqSMirpO Py3aUWqn5wPVLhjYHpnjlkRo1+Pyrs7ArTSf4IuJ0q86EqbA/I+OXqxWP+tufqNzFSas9a 2TIXYC2wcFbZ5vKYxI93jVaiC9mKnD7F2DK2UBUQevRccTQ4OLdsq/VTd7HwrTpXCl8PsM 73Sns9FnOwPZQEqgF4SQS6AbUGICHN/kKsiU0rx9phbIQU0ZZUsv68Icu1aSKg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698347269; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=q4PyG08kZ6Wum/HNSDVZjSe6qbyIPnA/HD9Pxxoo138=; b=ysZK7X6IkNFscLgLuv1jY39tE4zDtjVPGQ4LZ0pRzbygozI8VZc+EABl8vEtfgfm3udBUg ULJKNSuUMiGpwsqNPntek/53UyWMePqRIVwc/qClT6ftYoEFz6NtvooMKaw5lApNmyVNKh RLBGGmcZjw+Bk1K6uA7nI95dHTeNdsx147LJYmBzKbHa6XFx9ZR3U/08cY0bDmnwPYOLp4 96U57C6DMhN6KIgZlW+apSsSCTQ8XlpCxAsCOpYZwMx5sDjV49W1BmwF3LGj0+Qz7Ajd9U 6Guxx0Jgvz1FxN5MthGPoa9/O6PSM5GttHxxxCaUf1fJXc16hTAQh4WlrVL0SA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698347269; a=rsa-sha256; cv=none; b=wWYexasDBEkG2ZPfpCVRz8eiuZjLeok9wuMJIjJUbbPZ5q/07cg3huD/u/qIMd0mNguTPH QxwgrGPTVLRqgYAHIV221HeTWwd7qInt9Ih7i0Cb60gf79nlLJxfvEx3negUjvzEOhRNcb DXwbhbmo8Ersv/4GcgjdFEzHf6xJIWnuPQ7J6owKi7tm/molMq49Qt3W9FzjWJy99Xl2ik VSU4Pub8kIRgibQ0wx7j5Bst1mE0UjlAdiH30wfOBRMf+/1hAHJqtdGIU9EUKjWyr+34Xv zPkiP2qMo0zRQXjUSjwa5XQpc+MsaHVlRAUWTqWv+rVDPPidnpeLOn7UiI2D5Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SGb0P1jjlzjGQ; Thu, 26 Oct 2023 19:07: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 39QJ7nHP041093; Thu, 26 Oct 2023 19:07:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39QJ7nux041090; Thu, 26 Oct 2023 19:07:49 GMT (envelope-from git) Date: Thu, 26 Oct 2023 19:07:49 GMT Message-Id: <202310261907.39QJ7nux041090@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: 46a2f8227470 - stable/13 - Add membarrier(2) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 46a2f82274701912ef16ba2ef48ab30f4eb6a227 Auto-Submitted: auto-generated The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=46a2f82274701912ef16ba2ef48ab30f4eb6a227 commit 46a2f82274701912ef16ba2ef48ab30f4eb6a227 Author: Konstantin Belousov AuthorDate: 2021-10-07 21:10:07 +0000 Commit: Konstantin Belousov CommitDate: 2023-10-26 04:07:29 +0000 Add membarrier(2) (cherry picked from commit 4a69fc16a583face922319c476f3e739d9ce9140) --- lib/libc/sys/Symbol.map | 1 + sys/conf/files | 1 + sys/kern/kern_exec.c | 2 + sys/kern/kern_membarrier.c | 239 +++++++++++++++++++++++++++++++++++++++++++++ sys/kern/syscalls.master | 8 ++ sys/sys/membarrier.h | 70 +++++++++++++ sys/sys/proc.h | 6 ++ sys/sys/syscallsubr.h | 2 + 8 files changed, 329 insertions(+) diff --git a/lib/libc/sys/Symbol.map b/lib/libc/sys/Symbol.map index a5cafd1977b3..f9af2922ed3c 100644 --- a/lib/libc/sys/Symbol.map +++ b/lib/libc/sys/Symbol.map @@ -418,6 +418,7 @@ FBSD_1.6 { FBSD_1.7 { _Fork; kqueuex; + membarrier; swapoff; }; diff --git a/sys/conf/files b/sys/conf/files index 5f2e09eb8c2f..4b624a71c772 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -3874,6 +3874,7 @@ kern/kern_lockstat.c optional kdtrace_hooks kern/kern_loginclass.c standard kern/kern_malloc.c standard kern/kern_mbuf.c standard +kern/kern_membarrier.c standard kern/kern_mib.c standard kern/kern_module.c standard kern/kern_mtxpool.c standard diff --git a/sys/kern/kern_exec.c b/sys/kern/kern_exec.c index c02e644aae91..e8e3d8d8801d 100644 --- a/sys/kern/kern_exec.c +++ b/sys/kern/kern_exec.c @@ -827,6 +827,8 @@ interpret: p->p_flag2 &= ~P2_NOTRACE; if ((p->p_flag2 & P2_STKGAP_DISABLE_EXEC) == 0) p->p_flag2 &= ~P2_STKGAP_DISABLE; + p->p_flag2 &= ~(P2_MEMBAR_PRIVE | P2_MEMBAR_PRIVE_SYNCORE | + P2_MEMBAR_GLOBE); if (p->p_flag & P_PPWAIT) { p->p_flag &= ~(P_PPWAIT | P_PPTRACE); cv_broadcast(&p->p_pwait); diff --git a/sys/kern/kern_membarrier.c b/sys/kern/kern_membarrier.c new file mode 100644 index 000000000000..eabd00e8ddf4 --- /dev/null +++ b/sys/kern/kern_membarrier.c @@ -0,0 +1,239 @@ +/*- + * Copyright (c) 2021 The FreeBSD Foundation + * + * This software were developed by Konstantin Belousov + * under sponsorship from the FreeBSD Foundation. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 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 + +#define MEMBARRIER_SUPPORTED_CMDS ( \ + MEMBARRIER_CMD_GLOBAL | \ + MEMBARRIER_CMD_GLOBAL_EXPEDITED | \ + MEMBARRIER_CMD_REGISTER_GLOBAL_EXPEDITED | \ + MEMBARRIER_CMD_PRIVATE_EXPEDITED | \ + MEMBARRIER_CMD_REGISTER_PRIVATE_EXPEDITED | \ + MEMBARRIER_CMD_PRIVATE_EXPEDITED_SYNC_CORE | \ + MEMBARRIER_CMD_REGISTER_PRIVATE_EXPEDITED_SYNC_CORE) + +static void +membarrier_action_seqcst(void *arg __unused) +{ + atomic_thread_fence_seq_cst(); +} + +static void +membarrier_action_seqcst_sync_core(void *arg __unused) +{ + atomic_thread_fence_seq_cst(); + cpu_sync_core(); +} + +static void +do_membarrier_ipi(cpuset_t *csp, void (*func)(void *)) +{ + atomic_thread_fence_seq_cst(); + smp_rendezvous_cpus(*csp, smp_no_rendezvous_barrier, func, + smp_no_rendezvous_barrier, NULL); + atomic_thread_fence_seq_cst(); +} + +static void +check_cpu_switched(int c, cpuset_t *csp, uint64_t *swt, bool init) +{ + struct pcpu *pc; + uint64_t sw; + + if (CPU_ISSET(c, csp)) + return; + + pc = cpuid_to_pcpu[c]; + if (pc->pc_curthread == pc->pc_idlethread) { + CPU_SET(c, csp); + return; + } + + /* + * Sync with context switch to ensure that override of + * pc_curthread with non-idle thread pointer is visible before + * reading of pc_switchtime. + */ + atomic_thread_fence_acq(); + + sw = pc->pc_switchtime; + if (init) + swt[c] = sw; + else if (sw != swt[c]) + CPU_SET(c, csp); +} + +/* + * + * XXXKIB: We execute the requested action (seq_cst and possibly + * sync_core) on current CPU as well. There is no guarantee that + * current thread executes anything with the full fence semantics + * during syscall execution. Similarly, cpu_core_sync() semantics + * might be not provided by the syscall return. E.g. on amd64 we + * typically return without IRET. + */ +int +kern_membarrier(struct thread *td, int cmd, unsigned flags, int cpu_id) +{ + struct proc *p, *p1; + struct thread *td1; + cpuset_t cs; + uint64_t *swt; + int c, error; + bool first; + + if (flags != 0 || (cmd & ~MEMBARRIER_SUPPORTED_CMDS) != 0) + return (EINVAL); + + if (cmd == MEMBARRIER_CMD_QUERY) { + td->td_retval[0] = MEMBARRIER_SUPPORTED_CMDS; + return (0); + } + + p = td->td_proc; + error = 0; + + switch (cmd) { + case MEMBARRIER_CMD_GLOBAL: + swt = malloc((mp_maxid + 1) * sizeof(*swt), M_TEMP, M_WAITOK); + CPU_ZERO(&cs); + sched_pin(); + CPU_SET(PCPU_GET(cpuid), &cs); + for (first = true; error == 0; first = false) { + CPU_FOREACH(c) + check_cpu_switched(c, &cs, swt, first); + if (CPU_CMP(&cs, &all_cpus) == 0) + break; + error = pause_sig("mmbr", 1); + if (error == EWOULDBLOCK) + error = 0; + } + sched_unpin(); + free(swt, M_TEMP); + atomic_thread_fence_seq_cst(); + break; + + case MEMBARRIER_CMD_GLOBAL_EXPEDITED: + if ((td->td_proc->p_flag2 & P2_MEMBAR_GLOBE) == 0) { + error = EPERM; + } else { + CPU_ZERO(&cs); + CPU_FOREACH(c) { + td1 = cpuid_to_pcpu[c]->pc_curthread; + p1 = td1->td_proc; + if (p1 != NULL && + (p1->p_flag2 & P2_MEMBAR_GLOBE) != 0) + CPU_SET(c, &cs); + } + do_membarrier_ipi(&cs, membarrier_action_seqcst); + } + break; + + case MEMBARRIER_CMD_REGISTER_GLOBAL_EXPEDITED: + if ((p->p_flag2 & P2_MEMBAR_GLOBE) == 0) { + PROC_LOCK(p); + p->p_flag2 |= P2_MEMBAR_GLOBE; + PROC_UNLOCK(p); + } + break; + + case MEMBARRIER_CMD_PRIVATE_EXPEDITED: + if ((td->td_proc->p_flag2 & P2_MEMBAR_PRIVE) == 0) { + error = EPERM; + } else { + pmap_active_cpus(vmspace_pmap(p->p_vmspace), &cs); + do_membarrier_ipi(&cs, membarrier_action_seqcst); + } + break; + + case MEMBARRIER_CMD_REGISTER_PRIVATE_EXPEDITED: + if ((p->p_flag2 & P2_MEMBAR_PRIVE) == 0) { + PROC_LOCK(p); + p->p_flag2 |= P2_MEMBAR_PRIVE; + PROC_UNLOCK(p); + } + break; + + case MEMBARRIER_CMD_PRIVATE_EXPEDITED_SYNC_CORE: + if ((td->td_proc->p_flag2 & P2_MEMBAR_PRIVE_SYNCORE) == 0) { + error = EPERM; + } else { + /* + * Calculating the IPI multicast mask from + * pmap active mask means that we do not call + * cpu_sync_core() on CPUs that were missed + * from pmap active mask but could be switched + * from or to meantime. This is fine at least + * on amd64 because threads always use slow + * (IRETQ) path to return from syscall after + * context switch. + */ + pmap_active_cpus(vmspace_pmap(p->p_vmspace), &cs); + + do_membarrier_ipi(&cs, + membarrier_action_seqcst_sync_core); + } + break; + + case MEMBARRIER_CMD_REGISTER_PRIVATE_EXPEDITED_SYNC_CORE: + if ((p->p_flag2 & P2_MEMBAR_PRIVE_SYNCORE) == 0) { + PROC_LOCK(p); + p->p_flag2 |= P2_MEMBAR_PRIVE_SYNCORE; + PROC_UNLOCK(p); + } + break; + + default: + error = EINVAL; + break; + } + + return (error); +} + +int +sys_membarrier(struct thread *td, struct membarrier_args *uap) +{ + return (kern_membarrier(td, uap->cmd, uap->flags, uap->cpu_id)); +} diff --git a/sys/kern/syscalls.master b/sys/kern/syscalls.master index d383a50ce3d1..0a977ca0eff3 100644 --- a/sys/kern/syscalls.master +++ b/sys/kern/syscalls.master @@ -3287,6 +3287,14 @@ u_int flags ); } +584 AUE_NULL STD|CAPENABLED { + int membarrier( + int cmd, + unsigned flags, + int cpu_id + ); + } + ; Please copy any additions and changes to the following compatability tables: ; sys/compat/freebsd32/syscalls.master diff --git a/sys/sys/membarrier.h b/sys/sys/membarrier.h new file mode 100644 index 000000000000..958b769da23e --- /dev/null +++ b/sys/sys/membarrier.h @@ -0,0 +1,70 @@ +/*- + * Copyright (c) 2021 The FreeBSD Foundation + * + * This software were developed by Konstantin Belousov + * under sponsorship from the FreeBSD Foundation. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#ifndef __SYS_MEMBARRIER_H__ +#define __SYS_MEMBARRIER_H__ + +#include + +/* + * The enum membarrier_cmd values are bits. The MEMBARRIER_CMD_QUERY + * command returns a bitset indicating which commands are supported. + * Also the value of MEMBARRIER_CMD_QUERY is zero, so it is + * effectively not returned by the query. + */ +enum membarrier_cmd { + MEMBARRIER_CMD_QUERY = 0x00000000, + MEMBARRIER_CMD_GLOBAL = 0x00000001, + MEMBARRIER_CMD_SHARED = MEMBARRIER_CMD_GLOBAL, + MEMBARRIER_CMD_GLOBAL_EXPEDITED = 0x00000002, + MEMBARRIER_CMD_REGISTER_GLOBAL_EXPEDITED = 0x00000004, + MEMBARRIER_CMD_PRIVATE_EXPEDITED = 0x00000008, + MEMBARRIER_CMD_REGISTER_PRIVATE_EXPEDITED = 0x00000010, + MEMBARRIER_CMD_PRIVATE_EXPEDITED_SYNC_CORE = 0x00000020, + MEMBARRIER_CMD_REGISTER_PRIVATE_EXPEDITED_SYNC_CORE = 0x00000040, + + /* + * RSEQ constants are defined for source compatibility but are + * not yes supported, MEMBARRIER_CMD_QUERY does not return + * them in the mask. + */ + MEMBARRIER_CMD_PRIVATE_EXPEDITED_RSEQ = 0x00000080, + MEMBARRIER_CMD_REGISTER_PRIVATE_EXPEDITED_RSEQ = 0x00000100, +}; + +enum membarrier_cmd_flag { + MEMBARRIER_CMD_FLAG_CPU = 0x00000001, +}; + +#ifndef _KERNEL +__BEGIN_DECLS +int membarrier(int, unsigned, int); +__END_DECLS +#endif /* _KERNEL */ + +#endif /* __SYS_MEMBARRIER_H__ */ diff --git a/sys/sys/proc.h b/sys/sys/proc.h index 369bc607e9c7..b279839dbf8d 100644 --- a/sys/sys/proc.h +++ b/sys/sys/proc.h @@ -838,6 +838,12 @@ struct proc { external thread_single() is permitted */ #define P2_REAPKILLED 0x00080000 +#define P2_MEMBAR_PRIVE 0x00100000 /* membar private expedited + registered */ +#define P2_MEMBAR_PRIVE_SYNCORE 0x00200000 /* membar private expedited + sync core registered */ +#define P2_MEMBAR_GLOBE 0x00400000 /* membar global expedited + registered */ /* Flags protected by proctree_lock, kept in p_treeflags. */ #define P_TREE_ORPHANED 0x00000001 /* Reparented, on orphan list */ diff --git a/sys/sys/syscallsubr.h b/sys/sys/syscallsubr.h index de3c7780fc2c..aabcb19448cc 100644 --- a/sys/sys/syscallsubr.h +++ b/sys/sys/syscallsubr.h @@ -201,6 +201,8 @@ int kern_minherit(struct thread *td, uintptr_t addr, size_t len, int inherit); int kern_mkdirat(struct thread *td, int fd, const char *path, enum uio_seg segflg, int mode); +int kern_membarrier(struct thread *td, int cmd, unsigned flags, + int cpu_id); int kern_mkfifoat(struct thread *td, int fd, const char *path, enum uio_seg pathseg, int mode); int kern_mknodat(struct thread *td, int fd, const char *path, From nobody Thu Oct 26 19:07:50 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SGb0R4Lr6z4y9qD; Thu, 26 Oct 2023 19:07: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 4SGb0Q4qLLz3LlC; Thu, 26 Oct 2023 19:07:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698347270; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/gJnI3uIG92yx17uHM8enDkbK914L9Xn7Pn8jGmhadQ=; b=lWpE5n9tS/fw9iJEJ6TbvpVGt0bFd/BQXm9nWvHRbOZoB9ZAUxy77S27QoIU4GrIwQ7JZT T15UgnSpcMxm/b3jJl0gfCwl/aDFpjNpXSSub5ln8fIw5hSQ+TNGxuhpQzgWwtXN9WhODr e56SqDl0FOVKva5cbubxC3oj2DzKHUMvVEWt8+E0lcAqTe0J75HrnQ7JjzI8W9KyZZtWgG Q/qfufA4BkLkmsH/ZSgZj05EYx7+ifWvI44aQZvCgRdV7RqitOoXtSE+hy1iAVVJEkEVju sDfE9/oNSQOVd2Bwd3pQzYnFSU/zKuTIW7M+YBFel7AgrCedyJV23NYtis54rA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698347270; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/gJnI3uIG92yx17uHM8enDkbK914L9Xn7Pn8jGmhadQ=; b=UtbT+BrdJm+mxM7Fe2aIz9N2XWnbwfyM51QJM7XVMDTZBqmRa5mCikV0zAWu0B+XN4pK/o k7EHPwyXM2/r7DPLPomWJwe32TOIWmWMBRkoOAf5d0/lC+OgdZew20PwAO5htvzU2a3OG3 BTT9xi9PeWscgQYLB93i+UyMrIDgbnPNKFOHcIeMrELAW01kzx30es3pHqfAp9Ou/vGyDz Ujq15JFa/g0Mj5YTQn3crDzO56YvpLUBxLJmKPDQt+ms+BIB5N9btgqTy/ZNCVvCS93t1A npuvKKgp0hmU4pN9Y8TIvp7q0G8kIG7Xg18i7kRm2vkRwN8Yn0ItTTQjxlvm6Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698347270; a=rsa-sha256; cv=none; b=Z+lcwCOTCmWcwSsfnzekFa53mgloi/HbyDmBAqvLLBwCGRhxn/ZOt8RbICsmCCcZVp1SR4 Aa+ysbfQvyrMGxjWwens6RqP/Crtz3s7tO25yoVa94HR6zeGvV2vDYjNLLO+7rUcOJdMUy 4mswnl/ukoEjFagxWgK/vO6WnG7kiNy6PRHMGc1xlI5aF62mBFQabX77mvR58IMEauV7Pv b6GWsXUH3OHoTnfCbS739WSeUShQxwkHVQBH5Zxhip57CXNxtQ51fi3rkd1xT1BrhXV9h+ RDaQu3Dlp/JT8igyp/o1fID+jJOXh1LKdccl7QNnN4Vej2yIXPHAg107r+SNNA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SGb0Q23RHzjyd; Thu, 26 Oct 2023 19:07: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 39QJ7o6U041123; Thu, 26 Oct 2023 19:07:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39QJ7oKL041120; Thu, 26 Oct 2023 19:07:50 GMT (envelope-from git) Date: Thu, 26 Oct 2023 19:07:50 GMT Message-Id: <202310261907.39QJ7oKL041120@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: 0437db781b7c - stable/13 - 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 0437db781b7cf3b011665d0e21b9a035ab3e0272 Auto-Submitted: auto-generated The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=0437db781b7cf3b011665d0e21b9a035ab3e0272 commit 0437db781b7cf3b011665d0e21b9a035ab3e0272 Author: Konstantin Belousov AuthorDate: 2023-10-26 04:06:56 +0000 Commit: Konstantin Belousov CommitDate: 2023-10-26 04:07:29 +0000 Regen --- sys/kern/init_sysent.c | 1 + sys/kern/syscalls.c | 1 + sys/kern/systrace_args.c | 30 ++++++++++++++++++++++++++++++ sys/sys/syscall.h | 3 ++- sys/sys/syscall.mk | 3 ++- sys/sys/sysproto.h | 7 +++++++ 6 files changed, 43 insertions(+), 2 deletions(-) diff --git a/sys/kern/init_sysent.c b/sys/kern/init_sysent.c index 26e2d93e2eb7..b2d0120da519 100644 --- a/sys/kern/init_sysent.c +++ b/sys/kern/init_sysent.c @@ -638,4 +638,5 @@ struct sysent sysent[] = { { .sy_narg = 0, .sy_call = (sy_call_t *)sys_sched_getcpu, .sy_auevent = AUE_NULL, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 581 = sched_getcpu */ { .sy_narg = AS(swapoff_args), .sy_call = (sy_call_t *)sys_swapoff, .sy_auevent = AUE_SWAPOFF, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 582 = swapoff */ { .sy_narg = AS(kqueuex_args), .sy_call = (sy_call_t *)sys_kqueuex, .sy_auevent = AUE_KQUEUE, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 583 = kqueuex */ + { .sy_narg = AS(membarrier_args), .sy_call = (sy_call_t *)sys_membarrier, .sy_auevent = AUE_NULL, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 584 = membarrier */ }; diff --git a/sys/kern/syscalls.c b/sys/kern/syscalls.c index e0f0bd3b4148..22475e2ee226 100644 --- a/sys/kern/syscalls.c +++ b/sys/kern/syscalls.c @@ -589,4 +589,5 @@ const char *syscallnames[] = { "sched_getcpu", /* 581 = sched_getcpu */ "swapoff", /* 582 = swapoff */ "kqueuex", /* 583 = kqueuex */ + "membarrier", /* 584 = membarrier */ }; diff --git a/sys/kern/systrace_args.c b/sys/kern/systrace_args.c index b24cae6c1207..00e3bead052e 100644 --- a/sys/kern/systrace_args.c +++ b/sys/kern/systrace_args.c @@ -3418,6 +3418,15 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args) *n_args = 1; break; } + /* membarrier */ + case 584: { + struct membarrier_args *p = params; + iarg[0] = p->cmd; /* int */ + uarg[1] = p->flags; /* unsigned */ + iarg[2] = p->cpu_id; /* int */ + *n_args = 3; + break; + } default: *n_args = 0; break; @@ -9133,6 +9142,22 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) break; }; break; + /* membarrier */ + case 584: + switch (ndx) { + case 0: + p = "int"; + break; + case 1: + p = "unsigned"; + break; + case 2: + p = "int"; + break; + default: + break; + }; + break; default: break; }; @@ -11091,6 +11116,11 @@ systrace_return_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) if (ndx == 0 || ndx == 1) p = "int"; break; + /* membarrier */ + case 584: + if (ndx == 0 || ndx == 1) + p = "int"; + break; default: break; }; diff --git a/sys/sys/syscall.h b/sys/sys/syscall.h index 7f65d6eb994e..26d541f4548c 100644 --- a/sys/sys/syscall.h +++ b/sys/sys/syscall.h @@ -519,4 +519,5 @@ #define SYS_sched_getcpu 581 #define SYS_swapoff 582 #define SYS_kqueuex 583 -#define SYS_MAXSYSCALL 584 +#define SYS_membarrier 584 +#define SYS_MAXSYSCALL 585 diff --git a/sys/sys/syscall.mk b/sys/sys/syscall.mk index fdab69b1291e..2be42554587d 100644 --- a/sys/sys/syscall.mk +++ b/sys/sys/syscall.mk @@ -424,4 +424,5 @@ MIASM = \ aio_readv.o \ sched_getcpu.o \ swapoff.o \ - kqueuex.o + kqueuex.o \ + membarrier.o diff --git a/sys/sys/sysproto.h b/sys/sys/sysproto.h index ab327d43a0fb..64ee28267df3 100644 --- a/sys/sys/sysproto.h +++ b/sys/sys/sysproto.h @@ -1856,6 +1856,11 @@ struct swapoff_args { struct kqueuex_args { char flags_l_[PADL_(u_int)]; u_int flags; char flags_r_[PADR_(u_int)]; }; +struct membarrier_args { + char cmd_l_[PADL_(int)]; int cmd; char cmd_r_[PADR_(int)]; + char flags_l_[PADL_(unsigned)]; unsigned flags; char flags_r_[PADR_(unsigned)]; + char cpu_id_l_[PADL_(int)]; int cpu_id; char cpu_id_r_[PADR_(int)]; +}; int nosys(struct thread *, struct nosys_args *); void sys_sys_exit(struct thread *, struct sys_exit_args *); int sys_fork(struct thread *, struct fork_args *); @@ -2253,6 +2258,7 @@ int sys_aio_readv(struct thread *, struct aio_readv_args *); int sys_sched_getcpu(struct thread *, struct sched_getcpu_args *); int sys_swapoff(struct thread *, struct swapoff_args *); int sys_kqueuex(struct thread *, struct kqueuex_args *); +int sys_membarrier(struct thread *, struct membarrier_args *); #ifdef COMPAT_43 @@ -3200,6 +3206,7 @@ int freebsd12_closefrom(struct thread *, struct freebsd12_closefrom_args *); #define SYS_AUE_sched_getcpu AUE_NULL #define SYS_AUE_swapoff AUE_SWAPOFF #define SYS_AUE_kqueuex AUE_KQUEUE +#define SYS_AUE_membarrier AUE_NULL #undef PAD_ #undef PADL_ From nobody Thu Oct 26 20:21:59 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SGcdz3htXz4yF4N; Thu, 26 Oct 2023 20:21: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 4SGcdz36nVz3RGP; Thu, 26 Oct 2023 20:21:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698351719; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XE2KSkIKeTUrSONsXV9hWNEtB+kh7CGxRM2oBsS0fyM=; b=coFJZ4z4MuhI2qtYnyXAh/Bh6y1KGHaAmgRUbUASn8jPkgHfB1YTxxxZ2Yfil2atqP/OSk mPcXkWwpiMRtsX+4ww/zMz2GxyADL5WKoqWI7m7AS4HEEfBbEvEfPtyU9Uqr8uj5JQ1JpN Dz8EFnGXy/R2zHyz280MjI1uT5e286agWFJAlu33vLALV2vDw5qBWnkHwjk7VfT5xYIe+T ppise6rI64lV5w6Zga7kb1PYqr84KRYop5yvZ1km9nHu7NSnTE2WA9AjNPl9OMPBVcWCl7 R+fKjXR9bXR2dBwawAmFHJClTLVdHxLCtkYaeQ3D27p1uVgfhGiLZyy3WGEUpA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698351719; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XE2KSkIKeTUrSONsXV9hWNEtB+kh7CGxRM2oBsS0fyM=; b=rbcB8/VgmR7FnmMyk5om4G5aFUngAb9ZxrGdb5aBJdDNKKQzMvSVzlHieWO9yWpMZenL0+ N4Pkxj8QIZNx+HqsEPalilXv5miAk13w5wMYNkC/cjVJ4ovZ7vq+8N8WG5QVCgWAamiAys fLRlzXE+qARI+ug5BGpzY/Okc63c6RvKdNQZjzyVotm4+NmlIjkyFEyzFDbP49Uj5qK1ug 98O6CreKlg3sbS9sjRn35Exjgb0NveIZkBhF2c+Sy7aB8Wj2E1fTert3a39qjG4iLTrIsd 8HaykuI2Y4yEHmXe9W8E9Xiaaxi9e3l266Q1Tq90/5muA6clcOG6TNpXfGQoSw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698351719; a=rsa-sha256; cv=none; b=jSknGDJ/+7gnniDyZ1OmKwNrMHjabb28r6fIW+PDQZwALrIQp7Rmhi8Vt9OIQ5wvih41Pl 1ixi2O2qWqRE9hseddbJHuQoNsV8xNrOtglMhHf3D+x6XGvmSV5cp7k+Aer6lYoZ9PxXZk Ymt86Bh/T8LQY8qN6TOZHhwg3mJ09TJkfZLmTtG/t8kU4nOa6J38syGzK2pi+LFKSnl1/7 z9j7cMPyeSOoB+fCg8fvev+C4vkPB7RcDTIzQaq4oA9M9boGW69taL4reIsRMQgnA46lTH z9uP2psgnquM2B3kFY143lMEJv9vllR47Ewy6Eof5fWKgXEAPM6Bu0g7Tzb7+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 4SGcdz29PyzlFQ; Thu, 26 Oct 2023 20:21: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 39QKLxSJ070976; Thu, 26 Oct 2023 20:21:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39QKLxm9070973; Thu, 26 Oct 2023 20:21:59 GMT (envelope-from git) Date: Thu, 26 Oct 2023 20:21:59 GMT Message-Id: <202310262021.39QKLxm9070973@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 6f1ccbd58790 - stable/14 - bhyve: fix arguments to ioctl(VMIO_SIOCSIFFLAGS) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 6f1ccbd587907c5eaf05ddd77d1e9f5e16b7aedc Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=6f1ccbd587907c5eaf05ddd77d1e9f5e16b7aedc commit 6f1ccbd587907c5eaf05ddd77d1e9f5e16b7aedc Author: Gleb Smirnoff AuthorDate: 2023-10-26 09:59:21 +0000 Commit: Mark Johnston CommitDate: 2023-10-26 20:21:22 +0000 bhyve: fix arguments to ioctl(VMIO_SIOCSIFFLAGS) ioctl(2)'s with integer argument shall pass command argument by value, not by pointer. The ioctl(2) manual page is not very clear about that. See sys/kern/sys_generic.c:sys_ioctl() near IOC_VOID. Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D42366 Fixes: fd8b9c73a5a63a7aa438a73951d7a535b4f25d9a (cherry picked from commit f407a72a506d2630d60d9096c42058f12dff874e) --- usr.sbin/bhyve/net_backends.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/bhyve/net_backends.c b/usr.sbin/bhyve/net_backends.c index 99781cfdcbb6..de6afab53854 100644 --- a/usr.sbin/bhyve/net_backends.c +++ b/usr.sbin/bhyve/net_backends.c @@ -238,7 +238,7 @@ tap_init(struct net_backend *be, const char *devname, goto error; } - if (ioctl(be->fd, VMIO_SIOCSIFFLAGS, &up)) { + if (ioctl(be->fd, VMIO_SIOCSIFFLAGS, up)) { WPRINTF(("tap device link up failed")); goto error; } From nobody Thu Oct 26 20:29:03 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SGcp80cHKz4yFMr; Thu, 26 Oct 2023 20:29: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 4SGcp805cnz3RLW; Thu, 26 Oct 2023 20:29:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698352144; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lAl2iyVubCbQXUQI6PfZsPDN9neZOktLTRDiz0TLt2Q=; b=jHavH+4rix87V/UVrrdRS7FzcTWSKHj2E4q/kJA79oMPMCSJN0ORRcTv86cfRqJn720X5f EzuQL++ic5heSCj7bSabIW81uXAHnH2UZ7y/ZiST7Vd3lDyxIh0viQRNC7eJwmtoU/QUVL XRXQfCdG/DMkd/2z541jahsrvPQedEtJn0LrHk2HXdQSWfojFuHTbd8r9HkxFxEjJ7iE7C ssFmafx6cXB/GZZ6rJjlwIhFfBxOQM4vqAqPNnjJaC72X1eYubqaFzE9It7Rk4sBXMjepo OOtmC/TP83D7DepKlbaHx5YmSSMoWmHioFLbmHzpNVczaQto18h9Z/bTZl5zdw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698352144; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lAl2iyVubCbQXUQI6PfZsPDN9neZOktLTRDiz0TLt2Q=; b=sWCx1qYfIG9PorAtRhIWAgzXCP3xtGWhgkWQJqZcrFDQL+M1G6T7HEcDfScOQYE/6SEG0J lelg12ffq/1yc4esokiX0bIfQ6hzd0pwDwl8CTtgkiZv0rbg9II1TG1yVIvFyxkRHS5umZ 4+HdRLMJvRE7UZ+BXMWw3R3p6JCMetp+GBHzBvCNyUF0onUvIeoT1NVLlC1q2Wiu3bseyV S+LUvJJr2WjmbeRMHo5gpYAhkKfOhZgWLrNYwPYPfABx605rl88Nz611H82h5jZECbW+as Fy+9myEi9F9gZfJnXQWWh57WY6vHHQAi1bOK4Yf4zqh/j2OX2cyV2E3c3eAwGw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698352144; a=rsa-sha256; cv=none; b=ZJpfPuqYTMta3rKHQRyfN/sPfzcVwDX4PRy01w9I9d2vEcirUI60GqGoNZpb4b/WQkQOit G1r7tyj7t6rmtEEvUOPrkPMpgTtPs9PFUYfpS5hukIp6wO9AM63NP7WCrbi5oOaEert8EL zWsVhrKQ5EtGGnwml136ZxGOF0+S3NNGsCBuIbSUApDF4BwDX2NPSxDR9WDOpd1lFVTese qcb1N8RfQZQyjTGejeRooKmLz/a5P2lRMXUPpSktp/zqrSXkieGj4iaDgCtvdS2fJ3i04T JSESuGSZ5MdNf/VVXeoDOdBzmE0rxosPrlU4Sy9PVuXuQ+nYLIzQhi5zSI7A8Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SGcp76GGnzlj3; Thu, 26 Oct 2023 20:29: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 39QKT3g7074206; Thu, 26 Oct 2023 20:29:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39QKT346074203; Thu, 26 Oct 2023 20:29:03 GMT (envelope-from git) Date: Thu, 26 Oct 2023 20:29:03 GMT Message-Id: <202310262029.39QKT346074203@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: abf5807ffc36 - releng/14.0 - bhyve: fix arguments to ioctl(VMIO_SIOCSIFFLAGS) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.0 X-Git-Reftype: branch X-Git-Commit: abf5807ffc36516976426a83d94caf135d3ea814 Auto-Submitted: auto-generated The branch releng/14.0 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=abf5807ffc36516976426a83d94caf135d3ea814 commit abf5807ffc36516976426a83d94caf135d3ea814 Author: Gleb Smirnoff AuthorDate: 2023-10-26 09:59:21 +0000 Commit: Mark Johnston CommitDate: 2023-10-26 20:28:23 +0000 bhyve: fix arguments to ioctl(VMIO_SIOCSIFFLAGS) ioctl(2)'s with integer argument shall pass command argument by value, not by pointer. The ioctl(2) manual page is not very clear about that. See sys/kern/sys_generic.c:sys_ioctl() near IOC_VOID. Approved by: re (gjb) Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D42366 Fixes: fd8b9c73a5a63a7aa438a73951d7a535b4f25d9a (cherry picked from commit f407a72a506d2630d60d9096c42058f12dff874e) (cherry picked from commit 6f1ccbd587907c5eaf05ddd77d1e9f5e16b7aedc) --- usr.sbin/bhyve/net_backends.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/bhyve/net_backends.c b/usr.sbin/bhyve/net_backends.c index 99781cfdcbb6..de6afab53854 100644 --- a/usr.sbin/bhyve/net_backends.c +++ b/usr.sbin/bhyve/net_backends.c @@ -238,7 +238,7 @@ tap_init(struct net_backend *be, const char *devname, goto error; } - if (ioctl(be->fd, VMIO_SIOCSIFFLAGS, &up)) { + if (ioctl(be->fd, VMIO_SIOCSIFFLAGS, up)) { WPRINTF(("tap device link up failed")); goto error; } From nobody Thu Oct 26 20:39:11 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SGd1q5qLYz4yFjN; Thu, 26 Oct 2023 20: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 4SGd1q5Grzz3Sy8; Thu, 26 Oct 2023 20: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=1698352751; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=htNyb1Cwo//dhFEltxTTZko1IjS64omwZpiOGNjRPsE=; b=VThQemXGhf12ErMzoWETYP/sziENmDQnmaNlUHFtWJcFdrCuC6BwzQydLk5P4sxNab0u9O xAcGXi/pLyXuwmbfuy+JedLdMo3r343k2un8WulTniaLUP/0vllZp27cDAyKjS1mhDET7m x0elcrFGOI/fqnKEbgateQ6XUUMhiLwjzPFgFES3B0CV4nOMfZIMjOZauD6kWil7tSmSQT vE9U4EAClGA7Eo8FhCBtOp25i5Sg8NvDsHPwkRTqtlpeY2Gsv+5/ErkZUtdooLYmm9M5XS luqivZb7wAXoCOc7HzVwDYZptjIjzBZ/6VQd0ZcSHV83K6IiHTubD6zn7xYbbw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698352751; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=htNyb1Cwo//dhFEltxTTZko1IjS64omwZpiOGNjRPsE=; b=owHrMr9vCN9r+R7YX9HEk6+Gj8X6z98KvsSqq7LUDIuFuFCwoSPBg2RBp9zMF3l09m5AA1 lKkb3SldmEaD3A3pw8AtztCQyvoJI/uMh9idQInM/OANcKn+9HTxl6GTmYJQ4UCWsRdt/4 VLEhE2MVdha6MVqVbHgWZjfF/BhLN3TGJI6PEEqBLSTZh4YzyGGL2mVctHrD4DtQTa6WrE mJYwVOyXnpv05xwbchLghKOxnbG5YQkKn4YECgOUjzzeEiav87cG2OMAOc1Vv7ZE548MQ2 jJ60hrLf6gVBsgxURf4jdDbVXwCtR2IfuPOYPnBUPFiyuOi3w2GohEGvz8conA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698352751; a=rsa-sha256; cv=none; b=PNyxA9YN/RO9lIueCLKWg5Q7caV+bEGXNUy9cXEdxGjAq6pt2+H+umpbM18nySt+Vx+wOD nCPRPOin1TjkiZPgR/mrp0ZsKVvh5/TEwuC0uk6/f9bw7VOps0lkgifLpr9DoP9MvxUwyr 3IAnsZ9nAlsvnA6sYWKw6EIk3Cf9SVVNi6fZzKgOrAb6qBpwWxZb74XoDZDHwEp6o2Chgs TCBsGKe39bUO+XCJdzlBkjaeJTVQZUCAkZJFSrTU4ueuOfMCo3J/VWUZ3bt1MP1mRbpjEb q/coRo2QpkkE+L5WHYWq392Jr32QPxAunrJT907WVS947o07aNxcZzBWRlrNlQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SGd1q41m3zm5t; Thu, 26 Oct 2023 20: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 39QKdBQh091458; Thu, 26 Oct 2023 20: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 39QKdBhn091455; Thu, 26 Oct 2023 20:39:11 GMT (envelope-from git) Date: Thu, 26 Oct 2023 20:39:11 GMT Message-Id: <202310262039.39QKdBhn091455@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Brooks Davis Subject: git: 8888b14f1b77 - stable/13 - libprocstat: style: space after switch List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 8888b14f1b771e65013601801a82b27ca539a5e0 Auto-Submitted: auto-generated The branch stable/13 has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=8888b14f1b771e65013601801a82b27ca539a5e0 commit 8888b14f1b771e65013601801a82b27ca539a5e0 Author: Brooks Davis AuthorDate: 2023-10-26 20:38:40 +0000 Commit: Brooks Davis CommitDate: 2023-10-26 20:38:40 +0000 libprocstat: style: space after switch Style demands a space after the switch keyword. Noticed reviewing code in CheriBSD that propagated the style bug. Reported by: markj Sponsored by: DARPA Reviewed by: kib, markj Differential Revision: https://reviews.freebsd.org/D42041 (cherry picked from commit ccac440f7cbb013de41aa3933f3f7be77225c44f) --- lib/libprocstat/libprocstat.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/lib/libprocstat/libprocstat.c b/lib/libprocstat/libprocstat.c index 3a676c3e0ffc..d27c9f773151 100644 --- a/lib/libprocstat/libprocstat.c +++ b/lib/libprocstat/libprocstat.c @@ -350,7 +350,7 @@ struct filestat_list * procstat_getfiles(struct procstat *procstat, struct kinfo_proc *kp, int mmapped) { - switch(procstat->type) { + switch (procstat->type) { case PROCSTAT_KVM: return (procstat_getfiles_kvm(procstat, kp, mmapped)); case PROCSTAT_SYSCTL: @@ -1530,7 +1530,7 @@ procstat_get_socket_info_kvm(kvm_t *kd, struct filestat *fst, /* * Protocol specific data. */ - switch(dom.dom_family) { + switch (dom.dom_family) { case AF_INET: case AF_INET6: if (proto.pr_protocol == IPPROTO_TCP) { @@ -1603,7 +1603,7 @@ procstat_get_socket_info_sysctl(struct filestat *fst, struct sockstat *sock, /* * Protocol specific data. */ - switch(sock->dom_family) { + switch (sock->dom_family) { case AF_INET: case AF_INET6: if (sock->proto == IPPROTO_TCP) { @@ -1964,7 +1964,7 @@ procstat_getvmmap(struct procstat *procstat, struct kinfo_proc *kp, unsigned int *cntp) { - switch(procstat->type) { + switch (procstat->type) { case PROCSTAT_KVM: warnx("kvm method is not supported"); return (NULL); @@ -2069,7 +2069,7 @@ gid_t * procstat_getgroups(struct procstat *procstat, struct kinfo_proc *kp, unsigned int *cntp) { - switch(procstat->type) { + switch (procstat->type) { case PROCSTAT_KVM: return (procstat_getgroups_kvm(procstat->kd, kp, cntp)); case PROCSTAT_SYSCTL: @@ -2147,7 +2147,7 @@ int procstat_getumask(struct procstat *procstat, struct kinfo_proc *kp, unsigned short *maskp) { - switch(procstat->type) { + switch (procstat->type) { case PROCSTAT_KVM: return (procstat_getumask_kvm(procstat->kd, kp, maskp)); case PROCSTAT_SYSCTL: @@ -2237,7 +2237,7 @@ int procstat_getrlimit(struct procstat *procstat, struct kinfo_proc *kp, int which, struct rlimit* rlimit) { - switch(procstat->type) { + switch (procstat->type) { case PROCSTAT_KVM: return (procstat_getrlimit_kvm(procstat->kd, kp, which, rlimit)); @@ -2296,7 +2296,7 @@ int procstat_getpathname(struct procstat *procstat, struct kinfo_proc *kp, char *pathname, size_t maxlen) { - switch(procstat->type) { + switch (procstat->type) { case PROCSTAT_KVM: /* XXX: Return empty string. */ if (maxlen > 0) @@ -2369,7 +2369,7 @@ procstat_getosrel_core(struct procstat_core *core, int *osrelp) int procstat_getosrel(struct procstat *procstat, struct kinfo_proc *kp, int *osrelp) { - switch(procstat->type) { + switch (procstat->type) { case PROCSTAT_KVM: return (procstat_getosrel_kvm(procstat->kd, kp, osrelp)); case PROCSTAT_SYSCTL: @@ -2509,7 +2509,7 @@ Elf_Auxinfo * procstat_getauxv(struct procstat *procstat, struct kinfo_proc *kp, unsigned int *cntp) { - switch(procstat->type) { + switch (procstat->type) { case PROCSTAT_KVM: warnx("kvm method is not supported"); return (NULL); @@ -2623,7 +2623,7 @@ struct kinfo_kstack * procstat_getkstack(struct procstat *procstat, struct kinfo_proc *kp, unsigned int *cntp) { - switch(procstat->type) { + switch (procstat->type) { case PROCSTAT_KVM: warnx("kvm method is not supported"); return (NULL); @@ -2752,7 +2752,7 @@ fail: struct advlock_list * procstat_getadvlock(struct procstat *procstat) { - switch(procstat->type) { + switch (procstat->type) { case PROCSTAT_KVM: warnx("kvm method is not supported"); return (NULL); From nobody Thu Oct 26 20:39:12 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SGd1r67lDz4yFpv; Thu, 26 Oct 2023 20:39: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 4SGd1r5XMdz3T6K; Thu, 26 Oct 2023 20:39:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698352752; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JETW80MqBT+TnU1u8L4IB6qkwrqlBWsHp63Eh4CG6hI=; b=voP072H+aNKaUy4JHmNh2fRpAZ89mtsMR/HoUWU75F7LWSJ2lo/bMyqlRAMZQfeHTkt3nz iniQcGxb7vuxlsvoPcG6xPA4aCepAM8wbyQgG5shwWPIuXE4WNsTMy64ZikoctfHGKfzPp bYPmZeCoW8HN5jqJbwSVnXKUt4mvBuKeH6eL8TO+BaKkInJlJLDOe+hsI7VlwOMrMulmlp 7bprj1XcB2jlua8iNTEB36BHBOfHvPN+R7+00F5rgjU1MA+DX+oqIeLTe8oKFrvj9WcHIi BJqZUGmrvLrfWwDpvdGwZDasIoVlR735JY7cPP8CBfgQx+strILln0bhR0dabw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698352752; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JETW80MqBT+TnU1u8L4IB6qkwrqlBWsHp63Eh4CG6hI=; b=ekdywGnxEl5UjQzs/4LpOsn2fn4CI2n6GY7kCIP3/St4zeRNlXqsuRC2UjOykId+nCbD+B CGohTWWe2QrZnFxjJG9Esk+MCjPImRZZdO/jECE1SPsVo8t4eRvrh+3dnviJN9veev1PYG gRMw3UKyra1HTluMlg9pluHS6ONIjy29ow8L4kn5wiMitPVP8q4yfnxF/DKofnFcWtJj3N Xmet7eP6NWy6Jp9o7QVpARPPhGQsGtbiEtBKGAbPJemOsJVqnn3WUuds0xJkhD/EpNsCze EmZLz3H8QuN8Rl4sMdU6INzyHMTxH6NiEMCQ/uLLW67eVC+cSZKLZ62g1ARn+Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698352752; a=rsa-sha256; cv=none; b=lPquzjwxunStPOoXllvEY+wjcAtXp/1mWi7EglzokMfqesFTb3nJNHiXQ/uwuUDtrCCcOm nWSkt0y4kvjXqJ8lUuNhecnVKscSzRWdPGSunhDTwpShLxFCGzV+Dbppfj06N/Fds2Jc0w pOfL3FnxmLSnM1VfpkxYivrU7hGXLlJPpjsjqVBBOSGfVX4rfJlDyB34GT344rPwt3OUbu w0e39vwLLA1OgI44/AUbBpZnJoJhHYbeW7z9K403R9+8z7rVTDap90euqxl3vH7YOC0LjU H3lh2Bug+U/LzawFtDef+deky/cqufaR+965WuarBIYdakNT8IaU762By7LkTA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SGd1r4dYlzldJ; Thu, 26 Oct 2023 20:39: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 39QKdCDO091506; Thu, 26 Oct 2023 20:39:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39QKdCAi091503; Thu, 26 Oct 2023 20:39:12 GMT (envelope-from git) Date: Thu, 26 Oct 2023 20:39:12 GMT Message-Id: <202310262039.39QKdCAi091503@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Brooks Davis Subject: git: 9fcbd4c0d19c - stable/13 - libprocstat: simplify auxv value conversion List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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/stable/13 X-Git-Reftype: branch X-Git-Commit: 9fcbd4c0d19cdbfa1fb4711c00c9c9cf84dbefb0 Auto-Submitted: auto-generated The branch stable/13 has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=9fcbd4c0d19cdbfa1fb4711c00c9c9cf84dbefb0 commit 9fcbd4c0d19cdbfa1fb4711c00c9c9cf84dbefb0 Author: Brooks Davis AuthorDate: 2023-10-26 20:38:41 +0000 Commit: Brooks Davis CommitDate: 2023-10-26 20:38:41 +0000 libprocstat: simplify auxv value conversion Avoid a weird dance through the union and treat all 32-bit values as unsigned integers. This avoids sign extension of flags and userspace pointers. Reviewed by: markj Sponsored by: DARPA Differential Revision: https://reviews.freebsd.org/D42198 (cherry picked from commit 9735cc0e41825bb9e95d16433d381ffe4c190f38) --- lib/libprocstat/libprocstat.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/lib/libprocstat/libprocstat.c b/lib/libprocstat/libprocstat.c index d27c9f773151..0d7a0bcc2649 100644 --- a/lib/libprocstat/libprocstat.c +++ b/lib/libprocstat/libprocstat.c @@ -2417,7 +2417,6 @@ procstat_getauxv32_sysctl(pid_t pid, unsigned int *cntp) { Elf_Auxinfo *auxv; Elf32_Auxinfo *auxv32; - void *ptr; size_t len; unsigned int i, count; int name[4]; @@ -2451,8 +2450,17 @@ procstat_getauxv32_sysctl(pid_t pid, unsigned int *cntp) * necessarily true. */ auxv[i].a_type = auxv32[i].a_type; - ptr = &auxv32[i].a_un; - auxv[i].a_un.a_val = *((uint32_t *)ptr); + /* + * Don't sign extend values. Existing entries are positive + * integers or pointers. Under freebsd32, programs typically + * have a full [0, 2^32) address space (perhaps minus the last + * page) and treating this as a signed integer would be + * confusing since these are not kernel pointers. + * + * XXX: A more complete translation would be ABI and + * type-aware. + */ + auxv[i].a_un.a_val = (uint32_t)auxv32[i].a_un.a_val; } *cntp = count; out: From nobody Thu Oct 26 20:39:13 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SGd1t1rqYz4yFjX; Thu, 26 Oct 2023 20:39: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 4SGd1s6FkMz3TBw; Thu, 26 Oct 2023 20:39:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698352753; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=g3i9QPbFafHPgntWqKAR6UCxNv971L66ENduTHU1OUQ=; b=xht+nczeJnFFdmogciyszdBqyEdM9JmO4Fy7SP1WgqtP9WHxynUG2A/V+A3iVkBphAaoTc 9gli1lnFTOviC0YVMQhW4sTuP/IDvAmiFjbvdx867BGvkm+fxc250bdbEmYT2mNwecdQ5k hv3/B8cnr21lHphxkry8/wVN3Fb8qlBG2nwBdT4BChADgeMc1pt4tY8r7TPoyFUOhUhGNB QmSuhf/TmK498DjdxkVjFCaf3KoMGEkH/CQgRnbY/K0KaWklmszQvM9WAntxbo0gN3Dkit HAqlm9clWuffbpWm/l9BVPe4x7h87hScvvTJ4k3f5RvCAYEaj0mLfwmtt3TUDQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698352753; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=g3i9QPbFafHPgntWqKAR6UCxNv971L66ENduTHU1OUQ=; b=l4PwUINslqQTj+HU3SOa7GkiXBqXnkGB8c0FY1T0aRQhwD/2+LfFihQ8qUMUhZgA5xxAwh AoJOzIqtmcde0MoMbKIRM8cZvl0oe/zE9jWJV0Wne+L2xnAwx8oWYWMLF/6sU8UYOn2U9y r1FXedUdPAWYvsqHpcKvzEeNAQ1tJYAu0V8xztM5BfSwwhvKmS2I/sK1rwp2eHHuOhfMma SwHy/VMqH4ARYfody6mQb/1jvdSTNyLVEDO7HAUptqkWjufME+Dr0g2qmcO/1r8ejY2GSj 0Qt+FKksMQ+/gswirFAFz4gn7YCqImwhGfLbm7JMhQnHMgmhNri7sYkwnOAIRA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698352753; a=rsa-sha256; cv=none; b=KKPqjpmpC+1EmcFL71JTNeALjtRP4J4hyI99GwQl7wdCSLK/jOh8ldFcfHDkJ8RPtNIP2n JKEfGAh1wfq/Bsh/dx3VtbuLt/FZ/fGcx15MLjN7ja0j9eauvqfqyzmtZQaFpn14NFkx3H jud42TcwCRNZ9j2F+XSYP2E9KG2IixMALwmiO8Krxh6Eo/k8DENFxPtkBHUgQlM9YDrXWu lGqPvDQ7+anKfgud/rFH+ZzB4px+bzjfG8gUWai4WAHYuuggkeg2Q4j0WuOgcBRxT7l9wo ZDZM6CtdAyEDcSo3xIs7OIyusJ2mUj+3uPhMDXZx5TLXc4oTfqjZAI2tI8PIdg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SGd1s5McKzm47; Thu, 26 Oct 2023 20:39:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39QKdDpF091549; Thu, 26 Oct 2023 20:39:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39QKdD3S091546; Thu, 26 Oct 2023 20:39:13 GMT (envelope-from git) Date: Thu, 26 Oct 2023 20:39:13 GMT Message-Id: <202310262039.39QKdD3S091546@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Brooks Davis Subject: git: efeba8da1d2d - stable/13 - libprocstat: make sv_name not static List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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/stable/13 X-Git-Reftype: branch X-Git-Commit: efeba8da1d2da9d2c471936415cfad5f63daae76 Auto-Submitted: auto-generated The branch stable/13 has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=efeba8da1d2da9d2c471936415cfad5f63daae76 commit efeba8da1d2da9d2c471936415cfad5f63daae76 Author: Brooks Davis AuthorDate: 2023-10-26 20:38:41 +0000 Commit: Brooks Davis CommitDate: 2023-10-26 20:38:41 +0000 libprocstat: make sv_name not static Making this variable static makes is_elf32_sysctl() and callers thread unsafe. Use a less absurd length for sv_name. The longest name in the system is "FreeBSD ELF64 V2" which tips the scales at 16+1 bytes. We'll almost certainly have other problems if we exceed 32 characters. Reviewed by: markj Sponsored by: DARPA Differential Revision: https://reviews.freebsd.org/D42199 (cherry picked from commit 72a4ee26a7c665ae1c31abe1c6feeaa7ccaba140) --- lib/libprocstat/libprocstat.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/libprocstat/libprocstat.c b/lib/libprocstat/libprocstat.c index 0d7a0bcc2649..b23a0a5b2120 100644 --- a/lib/libprocstat/libprocstat.c +++ b/lib/libprocstat/libprocstat.c @@ -2395,7 +2395,7 @@ is_elf32_sysctl(pid_t pid) { int error, name[4]; size_t len, i; - static char sv_name[256]; + char sv_name[32]; name[0] = CTL_KERN; name[1] = KERN_PROC; From nobody Thu Oct 26 20:39:14 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SGd1v0tHPz4yFwQ; Thu, 26 Oct 2023 20:39: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 4SGd1v0JvLz3TN4; Thu, 26 Oct 2023 20:39:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698352755; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OTsb2L1LODZZav1AMB6YX4WaXAMGiCa1waJ4KDZu/3M=; b=LCyUaWiArx2IWjhty3kdb1sQL2/3z1pD/aA5DWgVS0aLZgdrlvLko98jKERwnnDjy4zObp YC/pQZL0rkMP9X/QhbCSWHeRbn12mtMZz/pex6o0VnSb+CoxcsI1vZNfRPy+P2h+Im5kaN N/ctvOo4+LLZ8pV9KfEURD84zd5+nhK8Hkxb/a1NMtYUy6gLQlDekDnZQCPZo0061hj/6m RLXcehHvkk7oCbXGp9fc5l8W2ocI5hxe6owJ5jMES1hCozWv1xgtrq/SYVYINku35lt9Gf 5gaJYJRL0j4WHFED3jAefhQhPcN5hoxMgQZnen9Mbp4E+6BSu9C4KgV/Um6bZQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698352755; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OTsb2L1LODZZav1AMB6YX4WaXAMGiCa1waJ4KDZu/3M=; b=YgkIcfm5rrrYIBq5NuBkfgI0eSRAO5WmjAGfF3U62sMwmSmB62B+MP1HCYYV/jCQ4eY1AU JlgdlOgUGWCQtk+gUNCagG0Pej1MPDBvZAixQSL5zugWrcyI3EitNCBa35nS6av6OhWEx/ jLkYRrpMrh8jOPVNz7Ti1Wk3v5hEXqYyjJkIQ/TiKzbq64+BzUnKnq7aB6oDYPndQgV31H tnNZv7tY4WLQpsHGL4ASRlG6+pTqr749xUhxoLeX6joJ0RNzhCr6Fc/IjM0cJxyHO5BMKS v2YCqu1d2FAGSz2g0KZh/KMU9RqahY0FNi80YYwX9MRYvAnHhCphB7YKzoBmcw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698352755; a=rsa-sha256; cv=none; b=RJVvpxYbYfyXE+uV8wKbrUaUgfTMzAxMxBSIJP2+0FfGODInRP1zxgKSnBYPZDHyFseC9j llOjwyBNM89Ag/M8DYWf13S0CzF9DJNxP7YZGQemXkX79tRrKXESf6MWXL6tj8aBUOW9/l qOzUYquNdiR9bCiP/oY4ARkhgvi6SIs9iCq2aFoyXpwWJSsVrPASs7vhIFauvZxfc2LYZb Oni73ELeUNMi24tTgY4TSJvgKpknJQ44GEoV923MXsJzGKT2qSFkzFWQ1eDQXC3ozYS/sF 1OMY2aIzmF2OUjhsZ8oF3ommzZNYdf0ZyTDrJKM0K16VKkeI5ivxbh/WNaTEEQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SGd1t6Pt7zlV7; Thu, 26 Oct 2023 20:39: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 39QKdE9d091597; Thu, 26 Oct 2023 20:39:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39QKdEAg091594; Thu, 26 Oct 2023 20:39:14 GMT (envelope-from git) Date: Thu, 26 Oct 2023 20:39:14 GMT Message-Id: <202310262039.39QKdEAg091594@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Brooks Davis Subject: git: ea7f064a780b - stable/13 - libprocstat: copy all the 32-bit auxv entries List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: ea7f064a780b6f6bb023757a5eb8b997bd272687 Auto-Submitted: auto-generated The branch stable/13 has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=ea7f064a780b6f6bb023757a5eb8b997bd272687 commit ea7f064a780b6f6bb023757a5eb8b997bd272687 Author: Brooks Davis AuthorDate: 2023-10-26 20:38:41 +0000 Commit: Brooks Davis CommitDate: 2023-10-26 20:38:41 +0000 libprocstat: copy all the 32-bit auxv entries Use source struct size not the destination struct size so we copy all the auxv entries, not just the first half of them. Fix a style issue on an adjacent line. Reviewed by: markj Sponsored by: DARPA Differential Revision: https://reviews.freebsd.org/D42200 (cherry picked from commit 8f06fabe39ac3ebca4ab448a456945008305a23f) --- lib/libprocstat/libprocstat.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/libprocstat/libprocstat.c b/lib/libprocstat/libprocstat.c index b23a0a5b2120..f0542587cbdb 100644 --- a/lib/libprocstat/libprocstat.c +++ b/lib/libprocstat/libprocstat.c @@ -2437,8 +2437,8 @@ procstat_getauxv32_sysctl(pid_t pid, unsigned int *cntp) warn("sysctl: kern.proc.auxv: %d: %d", pid, errno); goto out; } - count = len / sizeof(Elf_Auxinfo); - auxv = malloc(count * sizeof(Elf_Auxinfo)); + count = len / sizeof(Elf32_Auxinfo); + auxv = malloc(count * sizeof(Elf_Auxinfo)); if (auxv == NULL) { warn("malloc(%zu)", count * sizeof(Elf_Auxinfo)); goto out; From nobody Thu Oct 26 20:39:15 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SGd1w1ng2z4yFyP; Thu, 26 Oct 2023 20:39: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 4SGd1w1P5lz3TCw; Thu, 26 Oct 2023 20:39:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698352756; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xDIGF93MN3WVTYdi+FPyCRBbvW8lGLkvswlgp1YD6AU=; b=A+DFAIZutfm+tRX3durvNBLLtvRXPc6dNPi1nEUua4MqVqAb6bsWiD3/hRCPX0zQ0WX8tE Y5V/pSXpUagpfDHfjRDAbZafyJEtuYP6kBo2J+Yvk5rwxxH3LqpuPsjmRqRM5/SRCz8hzl S12VmvbJeExKfuYTGg6U9lvVQg13az0DH+dBsTVG90WrnZ6GZa0+gVY6zeZ/LxzcyL8GJp b0DBXyO4Fpttt/D9oW3KAd+pByuOeRimu7aH+qGD4Mme3hs1dF09MtD7I4mm52PVstzRRK glNfZKqbdMH+0epj9N8zwG9VDO+3I3HAx7oSEEpcS3UxkdRdttHRd2gIkV05gw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698352756; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xDIGF93MN3WVTYdi+FPyCRBbvW8lGLkvswlgp1YD6AU=; b=Qp8LnrGRvdh6lbjrhtm5Ccha2v9Nh7YtZWmi7jzkube1YLNu1rYfOXQuiFzYW7wlBLN1eR isOD5pKR5s6eLQvUTUkt0HI8WdlWusIPU1ZdnZX7NEWgj321c4vYWQsBXhPlw0qe9Jeqrf EnWL7zVugye0toNi62+Jqoizs4B1jTIMkSLsmud1s4DF7edAERjJgP/n0c2gc1fT/Ggc+q g8rTTW62BKuYpplMIfRtfVTtc/QG9DcZ/huO2WqH1BJESj8j1/3L8nuury9i2Inuhu+AiH Rn+VtZZPDZcJ7pRxlG+uRhnNB0VMykSP44E1+Iz3Dj4CqtnOsgPwooU9NgkJZQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698352756; a=rsa-sha256; cv=none; b=UdmmaKiD4mPKlQRoYqhji/pqtTcre4hysVNQl1gmA193TsmzmG/4iy7szlrg2ascNkbVsL CftWlq5Tm1LaHiLsCDHW/vZCAAgBDOEorrsFBwSHoL8BG3hGj8mUpIVAQkWkENTlsxYfSg nEtbvlgMMFfsIs9Tw7SYn7HVCxVcLI+2PTK+JBo/mDGIwZOBxtYgBU/V8c4b1H4BOlTGdC sHy5smHjnQgCJGbs+n8hchdSal/jwUrY5BnY9v4yfrYtGxRyOBf1zXibyJjRUd52wkojbb KHFjCXfvri1j4Zd9GZl7CCFl191bak12wMmG5BRaNljbjEoNx9xZH7/RN1jRfw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SGd1w0NBBzlsd; Thu, 26 Oct 2023 20:39: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 39QKdFd4091642; Thu, 26 Oct 2023 20:39:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39QKdFml091639; Thu, 26 Oct 2023 20:39:15 GMT (envelope-from git) Date: Thu, 26 Oct 2023 20:39:15 GMT Message-Id: <202310262039.39QKdFml091639@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Brooks Davis Subject: git: 302ff7e6aff0 - stable/13 - libprocstat: improve conditional for 32-bit compat List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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/stable/13 X-Git-Reftype: branch X-Git-Commit: 302ff7e6aff0da1ea3b4de79940aac8103e4bb9c Auto-Submitted: auto-generated The branch stable/13 has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=302ff7e6aff0da1ea3b4de79940aac8103e4bb9c commit 302ff7e6aff0da1ea3b4de79940aac8103e4bb9c Author: Brooks Davis AuthorDate: 2023-10-26 20:38:41 +0000 Commit: Brooks Davis CommitDate: 2023-10-26 20:38:41 +0000 libprocstat: improve conditional for 32-bit compat Include support for translating 32-bit auxv vectors on non-64-bit platforms that aren't riscv (which has no 32-bit ABI support and probably never will). Reviewed by: markj Sponsored by: DARPA Differential Revision: https://reviews.freebsd.org/D42201 (cherry picked from commit 248fe3d3483cb3ec2c78dd31dc02a467060a6577) --- lib/libprocstat/libprocstat.c | 6 +++--- lib/libprocstat/libprocstat.h | 5 +++++ 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/lib/libprocstat/libprocstat.c b/lib/libprocstat/libprocstat.c index f0542587cbdb..936bf867328a 100644 --- a/lib/libprocstat/libprocstat.c +++ b/lib/libprocstat/libprocstat.c @@ -2384,7 +2384,7 @@ procstat_getosrel(struct procstat *procstat, struct kinfo_proc *kp, int *osrelp) #define PROC_AUXV_MAX 256 -#if __ELF_WORD_SIZE == 64 +#ifdef PS_ARCH_HAS_FREEBSD32 static const char *elf32_sv_names[] = { "Linux ELF32", "FreeBSD ELF32", @@ -2467,7 +2467,7 @@ out: free(auxv32); return (auxv); } -#endif /* __ELF_WORD_SIZE == 64 */ +#endif /* PS_ARCH_HAS_FREEBSD32 */ static Elf_Auxinfo * procstat_getauxv_sysctl(pid_t pid, unsigned int *cntp) @@ -2476,7 +2476,7 @@ procstat_getauxv_sysctl(pid_t pid, unsigned int *cntp) int name[4]; size_t len; -#if __ELF_WORD_SIZE == 64 +#ifdef PS_ARCH_HAS_FREEBSD32 if (is_elf32_sysctl(pid)) return (procstat_getauxv32_sysctl(pid, cntp)); #endif diff --git a/lib/libprocstat/libprocstat.h b/lib/libprocstat/libprocstat.h index 0df01817663e..3d30b4db4018 100644 --- a/lib/libprocstat/libprocstat.h +++ b/lib/libprocstat/libprocstat.h @@ -102,6 +102,11 @@ #define PS_FST_FFLAG_EXEC 0x2000 #define PS_FST_FFLAG_HASLOCK 0x4000 +#if !defined(__ILP32__) && !defined(__riscv) +/* Target architecture supports 32-bit compat */ +#define PS_ARCH_HAS_FREEBSD32 1 +#endif + struct kinfo_kstack; struct kinfo_proc; struct kinfo_vmentry; From nobody Thu Oct 26 21:12:15 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SGdlz6xxsz4yHcf; Thu, 26 Oct 2023 21:12: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 4SGdlz6XFPz3Wny; Thu, 26 Oct 2023 21:12:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698354735; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2tBvIffe65uftuaSprDjVrjQVLTZ3v4hIMY/i6SN0lQ=; b=abzbpS+xWQTrnY9UDvMsuGcje2nxp3dLTdAn9+nTQbxCmkeah4Soo0Ra4YFyMaokTSn9ZX B+C880Wj8AD7agaKBCte6ROF3Dl4E4goMOF7RY9/L+9dD6H6QxT9wf6EDVHWiSsduM3HCo alGnfMdlcuaJj1ouWJra7ChU0rMFOaMSipQlZozvgmNED+J+g88OCDldfTSSm9/AJf3Hv0 SDyOudbgquoaw5nWu6RsTrmN9B9zNlJ0aik2Z+u0YTa335sbjDFt0BTRG2taiErqO4mb/s JWWkQJSgpCYj9xHQZT4OzqZeHIiYtxGiYYsUOKwM/FaON8FRSPhzFzNd4HkKag== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698354735; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2tBvIffe65uftuaSprDjVrjQVLTZ3v4hIMY/i6SN0lQ=; b=CHBrYS3ovmRIjfchS88Q2jJkt6slMVG1H4bqpOqQISD9fzyKNJhBDG+WyLFBnlCmVEByin czFUCm6MbN1kSF7GFyaKktqSnpx/daFCF4ZxWEmGdj8sh0rhVfneY3RGOZouKBtvH2THME qSoayFAqiYqeT+DvrUB96HpHYhglSY1IQfQJ4ehb2rehhRrDp3Wg9TS62gOR7MdBtfbQO5 NEf1Q+wWfc3LSTFkNFaxPqViqSu/QNK7zN31sqs4ASFMrQ9nGY3k/Q9XicrEytdXdZ3U5d bp85VUOItpyZUPQRiDF4EsWHAS5M67YMEwaQgcnbSHLzBzxuUoanocn8l/MW1A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698354735; a=rsa-sha256; cv=none; b=UxIZI3tIgnzAUIgSOPkXEI7nHxcoXiGgxHd4QBesavSvdvt9G0r7HQkb1AkaYAmENw8oXz RzrzWNPH41pMvcJb+VTCSwj+J3jRm3ECiJINQKDRcl74BS6+5qI77HKK0T867LJvALpelC ILFhBO2OfIoIlm6YYSkQlvtCR7lOKnsfA7ctupsoLYUeUSHshVCKuhgjoSVgxBKXOmNKmj Jo41tj32qovZeRoUcwc+bb4w04Ou9Vaaj8dTyE3TBTIqDjK+tEC8rMDhH1jjuJ8hK+n6sW C44s+7AGryHWTmd6M0q6AjEHhTOB2OSRh9XXxLbhbH55pf1E4fVzAQcSsjzmhQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SGdlz5bRMzn2b; Thu, 26 Oct 2023 21:12: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 39QLCFCc056509; Thu, 26 Oct 2023 21:12:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39QLCF6F056506; Thu, 26 Oct 2023 21:12:15 GMT (envelope-from git) Date: Thu, 26 Oct 2023 21:12:15 GMT Message-Id: <202310262112.39QLCF6F056506@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: 2152c4e2db88 - main - pthread_mutexattr_init(3): describe pthread_mutexattr_{set,get}pshared List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2152c4e2db88b9264c6400f2510440465d39c7b8 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=2152c4e2db88b9264c6400f2510440465d39c7b8 commit 2152c4e2db88b9264c6400f2510440465d39c7b8 Author: Konstantin Belousov AuthorDate: 2023-10-23 22:54:54 +0000 Commit: Konstantin Belousov CommitDate: 2023-10-26 21:05:29 +0000 pthread_mutexattr_init(3): describe pthread_mutexattr_{set,get}pshared PR: 274678 Reviewed by: emaste Sponsored by: The FreeBSD Foundation MFC after: 3 days Differential revision: https://reviews.freebsd.org/D42344 --- share/man/man3/pthread_mutexattr.3 | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/share/man/man3/pthread_mutexattr.3 b/share/man/man3/pthread_mutexattr.3 index 8e457b87dc8f..30537b9a9f86 100644 --- a/share/man/man3/pthread_mutexattr.3 +++ b/share/man/man3/pthread_mutexattr.3 @@ -132,6 +132,26 @@ all threads waiting on any mutex owned by this thread. .El .Pp The +.Fn pthread_mutexattr_setpshared +function sets the process-shared attribute of +.Fa attr +to the value specified in +.Fa pshared . +The argument +.Fa pshared +may have one of the following values: +.Bl -tag -width ".Dv PTHREAD_PROCESS_PRIVATE" +.It Dv PTHREAD_PROCESS_PRIVATE +The mutex may only be used by threads in the same process as the one +that created the object. +.It Dv PTHREAD_PROCESS_SHARED +The mutex may be used by +threads in processes other than the one that created the object, +assuming other processes share access to the memory where the mutex +was allocated. +.El +.Pp +The .Fn pthread_mutexattr_setrobust function specifies robustness attribute of the mutex. Possible values for the From nobody Thu Oct 26 21:12:16 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SGdm1367Wz4yHck; Thu, 26 Oct 2023 21:12:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SGdm10fyzz3X3B; Thu, 26 Oct 2023 21:12:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698354737; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7cjXBRTnn/61HJ8FltDaIvopbeqwHI0bl6S1slztPis=; b=ITRGGU/2lgJ7VguXX0lBXzxt39yxpPeRO4oBf7ZZmCviBVio5FAevAggW0WMYFbYGP2P4+ up9UclNMPOMvXjr69ItVJxveDlQEJo1mWLYbp0wuSvs4sGPj2beEUmbImb9C7liXDdx6ly knpKCwxU+pVAETBNNKaQPxpXfHx9b4IeSqGDX2pD1HfnbYrisEWoSCPEJv5L0oJoKbGoMN +7WbVdJmf6BOqDN0nVFZtfGTllJXF32jukkBlxKAN0pwKC2rCq7Zn4V3vpK535q7uC9kEm Sfs+tkntT3XOdS9S3cv83XVmP8ZmDvm9uvgcbLvTbgfxKE+ZE0SHtJtIPR9ZrA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698354737; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7cjXBRTnn/61HJ8FltDaIvopbeqwHI0bl6S1slztPis=; b=AUm7BbKAsP6hNp7rSIvar3bjyz21Dp9PQaKvo0x7YwhFafTAcUpa8myo9eyaCstkEL9n+4 GdeKPCFhzZb8a2992p1Otu0035HWGG27qExoGNWsyDHNGN3iTYD9K+GFzdHPukpiw4Vc5q Rh6Iq/xIKEGdL6M/nJ777aQTpD2gnMw9a+pTdkjQAH3hnFkw/dKHBJkQEqSwZ+QszA/q/Z tO8PeHDgpF9pkmz7s5FzMkLJaS1HM3a1jqOXOmZ54XTTwh2WXt+tEr04EACtOtAp2tVIIy o1PGfOXTsyz5Aoi3RYthj2G0fq3aIoN2r9EYv6BQ70RFXYgfVyq/rNsRMk/Wyw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698354737; a=rsa-sha256; cv=none; b=acXUHXYQlqJv9o8taVXzR/tTkXC/5LdQasplagTj/u9kmjBkjQeS+kINa3HyvE2MHb052Q 47PdpjME1mDP9fT+KdGH2jCJ1ZzuoMKh1XurTax7sMP096wpAUcQcAOY4pxx3bwKGAuO0Z er7atJwBV8OyD2T5BnvcaduV+Xl/nsvEJ545t5vwRO/S1LWmh5JWLpviL1YerjXyd+W0ss PNY4ZtzA0FOihFvUjfYxxmZaZid3By2E7oGRih/JLHg29f4TUr/UY0DvEt9HRzUUwjvWP/ IXGmnk1ykCReVgqGhFKBjXv4eRemAC8z/4cHqXeM8FfIDGJbOA3wgq0NBbTiOg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SGdm06bnlzmqm; Thu, 26 Oct 2023 21:12:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39QLCGaR056549; Thu, 26 Oct 2023 21:12:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39QLCGI5056546; Thu, 26 Oct 2023 21:12:16 GMT (envelope-from git) Date: Thu, 26 Oct 2023 21:12:16 GMT Message-Id: <202310262112.39QLCGI5056546@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: 4f03a2cae8ae - main - pthread_mutexattr(3), _condattr(3): reference libthr(3) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4f03a2cae8ae96446064da4e8a533ab24172bdcb Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=4f03a2cae8ae96446064da4e8a533ab24172bdcb commit 4f03a2cae8ae96446064da4e8a533ab24172bdcb Author: Konstantin Belousov AuthorDate: 2023-10-23 23:03:42 +0000 Commit: Konstantin Belousov CommitDate: 2023-10-26 21:11:53 +0000 pthread_mutexattr(3), _condattr(3): reference libthr(3) Reviewed by: emaste Sponsored by: The FreeBSD Foundation MFC after: 3 days Differential revision: https://reviews.freebsd.org/D42344 --- share/man/man3/pthread_condattr.3 | 7 ++++++- share/man/man3/pthread_mutexattr.3 | 7 ++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/share/man/man3/pthread_condattr.3 b/share/man/man3/pthread_condattr.3 index f11b50070d3d..f3b1d3639827 100644 --- a/share/man/man3/pthread_condattr.3 +++ b/share/man/man3/pthread_condattr.3 @@ -24,7 +24,7 @@ .\" WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE .\" OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, .\" EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -.Dd May 31, 2016 +.Dd October 27, 2023 .Dt PTHREAD_CONDATTR 3 .Os .Sh NAME @@ -112,6 +112,10 @@ threads in the same process as the one that created the object. The condition variable it is attached to may be accessed by threads in processes other than the one that created the object. .El +See +.Xr libthr 3 +for details of the implementation of shared condition variables, +and their limitations. .Sh RETURN VALUES If successful, these functions return 0. Otherwise, an error number is returned to indicate the error. @@ -153,6 +157,7 @@ The value specified in is not one of the allowed values. .El .Sh SEE ALSO +.Xr libthr 3 , .Xr pthread_cond_init 3 , .Xr pthread_cond_timedwait 3 .Sh STANDARDS diff --git a/share/man/man3/pthread_mutexattr.3 b/share/man/man3/pthread_mutexattr.3 index 30537b9a9f86..8f4d0d9a06a4 100644 --- a/share/man/man3/pthread_mutexattr.3 +++ b/share/man/man3/pthread_mutexattr.3 @@ -29,7 +29,7 @@ .\" WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE .\" OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, .\" EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -.Dd October 1, 2021 +.Dd October 27, 2023 .Dt PTHREAD_MUTEXATTR 3 .Os .Sh NAME @@ -150,6 +150,10 @@ threads in processes other than the one that created the object, assuming other processes share access to the memory where the mutex was allocated. .El +See +.Xr libthr 3 +for details of the implementation of the shared mutexes, +and their limitations. .Pp The .Fn pthread_mutexattr_setrobust @@ -334,6 +338,7 @@ Invalid value for .Fa attr . .El .Sh SEE ALSO +.Xr libthr 3 , .Xr pthread_mutex_init 3 .Sh STANDARDS The From nobody Thu Oct 26 21:38:19 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SGfL417v0z4yJxr; Thu, 26 Oct 2023 21:38: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 4SGfL375jTz3bCn; Thu, 26 Oct 2023 21:38:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698356300; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=f5/ZStNOU3IE4GlaZvGT0QXl2/RKpN7Zkt6wOTVAdX4=; b=ndtGRM1UJY+/GX3/+yB/1HXtNWzIyIDCp2yVar/ruCOPd6m6hX0fTZiYbPS3MOu0SOu83M 8FMvaxYmcmOLZuI1iTi70LDtj4Bmzqv2rmQk/q5CElUL3aqdfxNg6xSrbKeeZiMw5egrHn Kz5uoyHptMENDiS8kH82iOkPiL8JJrAMevfUmvzJXVNe4gr9V5OCBCSJ5ihL7uYtS3mvqq 1EfrWJXBrTtzEAoFvuq7bkBb2uN26o+L2LBnJxAgLiGbAkdrBpSnR3BEe4FMGmUo7HaXyN XwVY1rsfBun2AYD+jMSN5/w7931U0yMvfcyIJBHSBVwhy42Oa2rWQ4A8azH3gg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698356300; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=f5/ZStNOU3IE4GlaZvGT0QXl2/RKpN7Zkt6wOTVAdX4=; b=IILQnS8JWbC/SvFXIjP5tTFaFVtppEOFSlOIkbzkZrDEeJUSWzBRc3JcGPiLTwC39ETSUP yz64oEUK5qDFd69icWYj5jua7nNIGtwekmvybbprNnrzSZ7OhIyaL3OUGXF3D8S01uEOLw bNL6T8lxNbz2REFFPnO6EqOPqOEPTV7eH99byHTfDusqdq8qkUrlDnvwt6adQ9OM8BAC6q /UjtYmxUr9qt5/bp2DLV5hcwECcQZ+J804wDnFPdtexjfqmrWHOulN3gWJJ1NHGlbFMFEK tl7bnzV7UhaFUEhmIgEhTQBS89dF+J9FobTDax6WunO8xnmAAvDQ0P7ZZqiYnQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698356300; a=rsa-sha256; cv=none; b=mf8PLtbNzAk6M1f5s/KcwaxaJLtaW07F4khBg5HTwhea3DzevF3HxHoebt2C67uCxVsEh8 uVc55bMelXTZEx+HpSr13CA0J+cfgwfpaQt5+4KTWOdTE8vnYhi0VOgyvTrz3xTG4sFTnG lCGDa/U+vdG0GCyr/eNjkdaxoIGUCBZpHdszdLv0srB5G7ITOExToODrGmDU2gmVjp6Pen dNra0F41eg+IGMTBOADUdJwIAbrgU2RPB2g0MtuQEW9pBsbFOPSxNSLXBgMUlCThMVLqVF 169UwF57xTEFOUVy99JttJ2zPXFNCm4LhMW9hPBJQf+if2TWezTyP4JpS1++Ew== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SGfL3691hznM3; Thu, 26 Oct 2023 21:38: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 39QLcJCj092082; Thu, 26 Oct 2023 21:38:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39QLcJiV092079; Thu, 26 Oct 2023 21:38:19 GMT (envelope-from git) Date: Thu, 26 Oct 2023 21:38:19 GMT Message-Id: <202310262138.39QLcJiV092079@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: 859d674e1745 - stable/14 - gpart: Be less picky about GPT Tables in some cases List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 859d674e1745d0a37c9c8d77e21a3fadd713ef49 Auto-Submitted: auto-generated The branch stable/14 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=859d674e1745d0a37c9c8d77e21a3fadd713ef49 commit 859d674e1745d0a37c9c8d77e21a3fadd713ef49 Author: Warner Losh AuthorDate: 2023-10-26 16:14:54 +0000 Commit: Warner Losh CommitDate: 2023-10-26 21:34:25 +0000 gpart: Be less picky about GPT Tables in some cases When we're recoverying a damangae GPT, or when we're restoring a backed up partition tables, don't enforce the 4k alignment for start/end LBAs. This is useful for 512e/4kn drives when we're creating a new partition table or partition. However, when we're trying to fix / restore an old partition, we shouldn't force this alignment, since in that case it's more important to use the partition table as is than to optimize performance by rounding (which isn't required by the standard). MFC After: 1 week (pushed more quickly per re@) Sponsored by: Netflix Differential Revision: https://reviews.freebsd.org/D42359 (cherry picked from commit 5c9f0f72f47ea5315e5147185e47c2efca2e8c85) --- sys/geom/part/g_part_gpt.c | 41 +++++++++++++++++++++++++++++------------ 1 file changed, 29 insertions(+), 12 deletions(-) diff --git a/sys/geom/part/g_part_gpt.c b/sys/geom/part/g_part_gpt.c index 990ace4a25d4..c4cc840f583d 100644 --- a/sys/geom/part/g_part_gpt.c +++ b/sys/geom/part/g_part_gpt.c @@ -103,7 +103,8 @@ struct g_part_gpt_entry { static void g_gpt_printf_utf16(struct sbuf *, uint16_t *, size_t); static void g_gpt_utf8_to_utf16(const uint8_t *, uint16_t *, size_t); -static void g_gpt_set_defaults(struct g_part_table *, struct g_provider *); +static void g_gpt_set_defaults(struct g_part_table *, struct g_provider *, + struct g_part_parms *); static int g_part_gpt_add(struct g_part_table *, struct g_part_entry *, struct g_part_parms *); @@ -717,7 +718,7 @@ g_part_gpt_create(struct g_part_table *basetable, struct g_part_parms *gpp) table->hdr->hdr_entries = basetable->gpt_entries; table->hdr->hdr_entsz = sizeof(struct gpt_ent); - g_gpt_set_defaults(basetable, pp); + g_gpt_set_defaults(basetable, pp, gpp); return (0); } @@ -1083,7 +1084,7 @@ g_part_gpt_recover(struct g_part_table *basetable) table = (struct g_part_gpt_table *)basetable; pp = LIST_FIRST(&basetable->gpt_gp->consumer)->provider; gpt_create_pmbr(table, pp); - g_gpt_set_defaults(basetable, pp); + g_gpt_set_defaults(basetable, pp, NULL); basetable->gpt_corrupt = 0; return (0); } @@ -1300,7 +1301,8 @@ g_part_gpt_write(struct g_part_table *basetable, struct g_consumer *cp) } static void -g_gpt_set_defaults(struct g_part_table *basetable, struct g_provider *pp) +g_gpt_set_defaults(struct g_part_table *basetable, struct g_provider *pp, + struct g_part_parms *gpp) { struct g_part_entry *baseentry; struct g_part_gpt_entry *entry; @@ -1334,14 +1336,29 @@ g_gpt_set_defaults(struct g_part_table *basetable, struct g_provider *pp) if (entry->ent.ent_lba_end > max) max = entry->ent.ent_lba_end; } - spb = 4096 / pp->sectorsize; - if (spb > 1) { - lba = start + ((start % spb) ? spb - start % spb : 0); - if (lba <= min) - start = lba; - lba = end - (end + 1) % spb; - if (max <= lba) - end = lba; + /* + * Don't force alignment of any kind whatsoever on resize, restore or + * recover. resize doesn't go through this path, recover has a NULL gpp + * and restore has flags == restore (maybe with an appended 'C' to + * commit the operation). For these operations, we have to trust the + * user knows what they are doing. + * + * Otherwise it some flavor of creation of a new partition, so we align + * to a 4k offset on the drive, to make 512e/4kn drives more performant + * by default. + */ + if (gpp == NULL || + (gpp->gpp_parms & G_PART_PARM_FLAGS) == 0 || + strstr(gpp->gpp_flags, "restore") == NULL) { + spb = 4096 / pp->sectorsize; + if (spb > 1) { + lba = start + ((start % spb) ? spb - start % spb : 0); + if (lba <= min) + start = lba; + lba = end - (end + 1) % spb; + if (max <= lba) + end = lba; + } } table->hdr->hdr_lba_start = start; table->hdr->hdr_lba_end = end; From nobody Thu Oct 26 22:27:49 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SGgR949dtz4yMGt; Thu, 26 Oct 2023 22:27: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 4SGgR91zfFz3djk; Thu, 26 Oct 2023 22:27:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698359269; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4g5IhfTi+ZetaMK5WQuvSkBvjP8cBHsiGzVyl5Z8GkU=; b=sgYw/qs0H0IlA+U63gN//CbHfdbBsgmaX4l4YDIi5ooMNCDXAA/5OXF7tWBkuuE2W4Q9r+ Deck6LSbfHSHKgX6de7yz544fH08Zy6ZOLOO6tSkE707f9ZTCN5TDBhGOa5+C37pesp795 1Y9J6RwvUUGdudTcqqQULCiun3ceWSKmBWpk0gPOBv6rxs704qoABi3/lFAlJX5DADL18G +meWlF0/LG2P9o6DZP0H6mJG9XhpgBlixhlnc+uXsOXgpqyQ/BDMxXHhHMy2oqao/LONYu zEokxFoiljjMtKV8w4uNpOj8bW+vV92pzpEU33eUrfwxva2FauY1vKrNdzaPgA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698359269; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4g5IhfTi+ZetaMK5WQuvSkBvjP8cBHsiGzVyl5Z8GkU=; b=F7op36TxLsAARh0Ul72jKntMFrhQP46nT69srJU4BYOZXaGMdZPwMlaQcYeCilDvAVs0mB 58YV+pMb88y7uEzV1PqCvRhHekV1+eRIfg/BRBxiWiQ1tNcXPrsAhATnxzRXV0BYA8L9By TpCkExZDSnevTxXeHLnmScoM9Z1ZwNXBp9b9nYee8/sbLBvuIazL4P9pd0EspcmiYDEvqP ymomdRMM50Fodw4vmXNQcu4ymPgipGB5lP8uPpvwmmaWQTHcS+R0tjYKl1hzXJ9KefrMRb 9NTKNrH9u/pbah3vQIG0ThiEECFhD/ktmS90swh6GIrLX3RrNfncy8SMfb8Wgg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698359269; a=rsa-sha256; cv=none; b=HntTOtlYMD54G9+OJ7966rJuFLlvqOMuTSRhSIqtWcZYJB79vGRkS5VQetfMAG5q/GDY83 Mmlkhs9I5xQkx58gCN7p7f8BLGIhrMY/aBCxzPo+Dk8J6Pv6jpJMj5QmmNhV2D2dFe0c8R Rzsu1LbWUGSJVFNwf5YZDTw/EJodrutvFd6/B6h5Y6mitDDLXEvEBOYkzCvfLntmo3hIks gFmm6bxI4H1GKKNyfVQ3+V8bxoHF8tQQp7IVSLn0UZPwtuujNZ8TQTn1gQxKwanxJGwAF3 f/zpSbmNHQyQ4wf/fKo9Fqbgz9ettN6zzHsQiiM+VJdFOiYiTk10/bFtSK9P9w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SGgR913GSzpl9; Thu, 26 Oct 2023 22:27: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 39QMRnZ8075010; Thu, 26 Oct 2023 22:27:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39QMRnBd075007; Thu, 26 Oct 2023 22:27:49 GMT (envelope-from git) Date: Thu, 26 Oct 2023 22:27:49 GMT Message-Id: <202310262227.39QMRnBd075007@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: 4e24a146dca4 - stable/13 - mips: add enough glue for membarrier(2) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 4e24a146dca44b84a29bffc52e346ae6a6f5da51 Auto-Submitted: auto-generated The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=4e24a146dca44b84a29bffc52e346ae6a6f5da51 commit 4e24a146dca44b84a29bffc52e346ae6a6f5da51 Author: Konstantin Belousov AuthorDate: 2023-10-26 22:26:46 +0000 Commit: Konstantin Belousov CommitDate: 2023-10-26 22:27:25 +0000 mips: add enough glue for membarrier(2) This is direct commit to stable/13. --- sys/mips/include/pmap.h | 2 ++ sys/mips/mips/vm_machdep.c | 5 +++++ 2 files changed, 7 insertions(+) diff --git a/sys/mips/include/pmap.h b/sys/mips/include/pmap.h index b38895c9c8c2..eeff154a297d 100644 --- a/sys/mips/include/pmap.h +++ b/sys/mips/include/pmap.h @@ -161,6 +161,8 @@ extern vm_paddr_t physmem_desc[PHYS_AVAIL_COUNT]; extern vm_offset_t virtual_avail; extern vm_offset_t virtual_end; +#define PMAP_WANT_ACTIVE_CPUS_NAIVE + #define pmap_page_get_memattr(m) (((m)->md.pv_flags & PV_MEMATTR_MASK) >> PV_MEMATTR_SHIFT) #define pmap_page_is_mapped(m) (!TAILQ_EMPTY(&(m)->md.pv_list)) #define pmap_page_is_write_mapped(m) (((m)->a.flags & PGA_WRITEABLE) != 0) diff --git a/sys/mips/mips/vm_machdep.c b/sys/mips/mips/vm_machdep.c index 3758cdb7152f..48b5ff405628 100644 --- a/sys/mips/mips/vm_machdep.c +++ b/sys/mips/mips/vm_machdep.c @@ -470,6 +470,11 @@ cpu_set_user_tls(struct thread *td, void *tls_base) return (0); } +void +cpu_sync_core(void) +{ +} + #ifdef DDB #include From nobody Thu Oct 26 23:22:28 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SGhfD70ttz4yPmq; Thu, 26 Oct 2023 23:22: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 4SGhfD6KCbz4F7s; Thu, 26 Oct 2023 23:22:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698362548; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KaJMMHAo5hmTN4j2czb2NeAU/x4I6zloeeBUZyJCne4=; b=YP5y6LGxmO/MjXWXML1uIBJbvcRgVZXMGQizMc9xX63RYG4hjMbb4Fk96Ifwvdr+9liAaw i9OSWC0ufNITa2SV3DXVAe70C/M6G+WhIRymd+4ghxE1R9Gz06YCDbGb6GApvgWj5MJcix uuE1uCedcE368CUrA1TfNl4ZKQm1h+AEZrIRKiTWZGp9gUNbdtvGVUvuHieP6RgICzaI+R HdvFb2aAqDqP9ooAQn6kubi5lk4cF2mL9t+MNA+hOosT+jtdElCtVb8vIB5cAD/zcAuRvU Tcx/rV5DYnffObJ1hIeI1xL6mfDeTN0WUrZBkv9r71q10QUJyPWtPyaRKz2eFQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698362548; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KaJMMHAo5hmTN4j2czb2NeAU/x4I6zloeeBUZyJCne4=; b=ggWj2xLuakSUFvZ/TdVJJsCP30hHCqu6kccy4uDn2B1q+ZnXUeCBEagYJ6jiOWZlsVw+ew nW7pujjkgCpQWg561xLNKBBnEwUMIYgyGE57dIAFLElINTj3I8LNp4U3u4+imVhRpwJKcV QTKcWIVZR2K71X+/jZYwAgJcvX0nLuk6azSuNP4nl2IKXWcnAcLyX9QFLt/hczH5Vj6f8D rCAp7bjYPKb/Or8shIQAVEYNa4yhNkI6sWLlXLeUt/HLd6Ja9qZEh+oXRJCF+7dTSuVQEi csQ7oew5xMdeGvJzMLBtIsidZm4AEyhGS6PFvTijAqYTUTdlbxAH6+APpxjTow== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698362548; a=rsa-sha256; cv=none; b=HQbGzkukdocRKcdwtnQOop8AnMFm1mfTGLRYGtTQOZj6Ggpo5dIb6NIr9EQNN2NhjGFQtB 9qDHduLQ79Pe6MUED/Nh7Od8wp1Wl2Xzb3B4yklYOgZxDxBzHyflWwFQou0oN1OBAusqKM ikV/tnJuZhAIL27o+vJStSIa8qWGcioJAC3aFbLumdjxbE82BF6lwE+4xKjsd75IGg8dFh M6dCuTikMki3Z3RKNlFRyFHP+l6YV2hZedZTtEtOmM7XZOjlTfMyK3pCZ2wzCmQVFk7gHz 54x7av0OB85oC0nplNKBw841pca3iemoy5Ly6wJsErWVuZNjk6DgqL8uzHK78w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SGhfD5Q1gzqnk; Thu, 26 Oct 2023 23:22: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 39QNMSbZ074071; Thu, 26 Oct 2023 23:22:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39QNMS3D074068; Thu, 26 Oct 2023 23:22:28 GMT (envelope-from git) Date: Thu, 26 Oct 2023 23:22:28 GMT Message-Id: <202310262322.39QNMS3D074068@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: 7bdb67cb1cfe - releng/14.0 - gpart: Be less picky about GPT Tables in some cases List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.0 X-Git-Reftype: branch X-Git-Commit: 7bdb67cb1cfe161de68bfe0cd35bab73d4c77e3c Auto-Submitted: auto-generated The branch releng/14.0 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=7bdb67cb1cfe161de68bfe0cd35bab73d4c77e3c commit 7bdb67cb1cfe161de68bfe0cd35bab73d4c77e3c Author: Warner Losh AuthorDate: 2023-10-26 16:14:54 +0000 Commit: Warner Losh CommitDate: 2023-10-26 23:18:38 +0000 gpart: Be less picky about GPT Tables in some cases When we're recoverying a damangae GPT, or when we're restoring a backed up partition tables, don't enforce the 4k alignment for start/end LBAs. This is useful for 512e/4kn drives when we're creating a new partition table or partition. However, when we're trying to fix / restore an old partition, we shouldn't force this alignment, since in that case it's more important to use the partition table as is than to optimize performance by rounding (which isn't required by the standard). MFC After: 1 week (pushed more quickly per re@) Sponsored by: Netflix Differential Revision: https://reviews.freebsd.org/D42359 (cherry picked from commit 5c9f0f72f47ea5315e5147185e47c2efca2e8c85) (cherry picked from commit 859d674e1745d0a37c9c8d77e21a3fadd713ef49) Approved-by: re (gjb) --- sys/geom/part/g_part_gpt.c | 41 +++++++++++++++++++++++++++++------------ 1 file changed, 29 insertions(+), 12 deletions(-) diff --git a/sys/geom/part/g_part_gpt.c b/sys/geom/part/g_part_gpt.c index 990ace4a25d4..c4cc840f583d 100644 --- a/sys/geom/part/g_part_gpt.c +++ b/sys/geom/part/g_part_gpt.c @@ -103,7 +103,8 @@ struct g_part_gpt_entry { static void g_gpt_printf_utf16(struct sbuf *, uint16_t *, size_t); static void g_gpt_utf8_to_utf16(const uint8_t *, uint16_t *, size_t); -static void g_gpt_set_defaults(struct g_part_table *, struct g_provider *); +static void g_gpt_set_defaults(struct g_part_table *, struct g_provider *, + struct g_part_parms *); static int g_part_gpt_add(struct g_part_table *, struct g_part_entry *, struct g_part_parms *); @@ -717,7 +718,7 @@ g_part_gpt_create(struct g_part_table *basetable, struct g_part_parms *gpp) table->hdr->hdr_entries = basetable->gpt_entries; table->hdr->hdr_entsz = sizeof(struct gpt_ent); - g_gpt_set_defaults(basetable, pp); + g_gpt_set_defaults(basetable, pp, gpp); return (0); } @@ -1083,7 +1084,7 @@ g_part_gpt_recover(struct g_part_table *basetable) table = (struct g_part_gpt_table *)basetable; pp = LIST_FIRST(&basetable->gpt_gp->consumer)->provider; gpt_create_pmbr(table, pp); - g_gpt_set_defaults(basetable, pp); + g_gpt_set_defaults(basetable, pp, NULL); basetable->gpt_corrupt = 0; return (0); } @@ -1300,7 +1301,8 @@ g_part_gpt_write(struct g_part_table *basetable, struct g_consumer *cp) } static void -g_gpt_set_defaults(struct g_part_table *basetable, struct g_provider *pp) +g_gpt_set_defaults(struct g_part_table *basetable, struct g_provider *pp, + struct g_part_parms *gpp) { struct g_part_entry *baseentry; struct g_part_gpt_entry *entry; @@ -1334,14 +1336,29 @@ g_gpt_set_defaults(struct g_part_table *basetable, struct g_provider *pp) if (entry->ent.ent_lba_end > max) max = entry->ent.ent_lba_end; } - spb = 4096 / pp->sectorsize; - if (spb > 1) { - lba = start + ((start % spb) ? spb - start % spb : 0); - if (lba <= min) - start = lba; - lba = end - (end + 1) % spb; - if (max <= lba) - end = lba; + /* + * Don't force alignment of any kind whatsoever on resize, restore or + * recover. resize doesn't go through this path, recover has a NULL gpp + * and restore has flags == restore (maybe with an appended 'C' to + * commit the operation). For these operations, we have to trust the + * user knows what they are doing. + * + * Otherwise it some flavor of creation of a new partition, so we align + * to a 4k offset on the drive, to make 512e/4kn drives more performant + * by default. + */ + if (gpp == NULL || + (gpp->gpp_parms & G_PART_PARM_FLAGS) == 0 || + strstr(gpp->gpp_flags, "restore") == NULL) { + spb = 4096 / pp->sectorsize; + if (spb > 1) { + lba = start + ((start % spb) ? spb - start % spb : 0); + if (lba <= min) + start = lba; + lba = end - (end + 1) % spb; + if (max <= lba) + end = lba; + } } table->hdr->hdr_lba_start = start; table->hdr->hdr_lba_end = end; From nobody Fri Oct 27 00:02:18 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SGjXC58S4z4xSFp; Fri, 27 Oct 2023 00:02: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 4SGjXC1PZqz4HBT; Fri, 27 Oct 2023 00:02:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698364939; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NUJTt93O2H80zE8RHgQbQW4MjuRptV0poJxpcYcNKyY=; b=NNnXaaEAE4T5A2x+pvz66bNH9cSGy1/61mxScEVeefCFOpUSPIsOpVV8X3cCPLp3EyCNQg 8m+64SlM2GOGOZMubEb4Vzf8CFEKMzNtDCGDLN0+jWoclBEFcq9loV73nyyHFtFRcMPndY BxiwzwzPaH5p/ofNTZzDDDK34T1o1JMQmyz7dDXRc2PTIUrRYoZUgqsiWAGZ+2oHK4KwVz /V1bisZmU8x+sG/wAfla3+p01KQr7IFvf8IvbUgRGavsNa16kb7aRYSRUw65E87cHiidKn zSs/7PRGw/hhKPIimmS3mIYCnYxyB9+pWeFR5ZxRIBwfcvuoWQDcm5IKG7A+Wg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698364939; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NUJTt93O2H80zE8RHgQbQW4MjuRptV0poJxpcYcNKyY=; b=XpOpd5SWt5ZdhfK1yi28mikNwF2VeEVfK8WaikLlR4mJuF9zTyvqc87GXsGXfkcGKa1d9m jWHSMWrt6fVuEszefAijWz+wowPfK9UNqChWHBPL1McD6ehg5EKQGLkfkmr2wP5ZTJ6ixr 5iILE7lOQb+hdtJmdKgL0UrgNi7ukBX02J0+8jaLEiOxY0FQa1O33OYAOaSQEcrld7lgWs MOi0XXyOeofGuwMSyN5DQ7C6Sn3W89YnJiVhfQ6v3Q/MzWZCSGLQKDePnVkk9BRdciLbRn u/N56050x0EVh1BOh9zjAzzHyvebevOIcdT/qylr4SRzyJKXrAWqorQVIMcICw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698364939; a=rsa-sha256; cv=none; b=cBq7lAfu7PDrFv7TZAi3+jAInUhNUvOKq3rbBvYhLf8W14j5CgdQXpMd/GyNq+WxU8ZcYI PKqwY+AWnqbSqLtQn9xlhvXO6OJjBs2CCoMx7XkOdcK1zsEx24TwSj9YKJ4KP+VDVu4FPp SahXgeksttbSBjL1pZC8oBiTGCYcpYItD8BomEnxEC/lxR3EV06wurvE+UmvL0yoROEYSp +Q9Oi2c0jOngmZlaNfmy2NXkodaFD39ovf7BkpNVND9PFZSA+icsYg725x19y9HB9SJS9g 8Cq678Tky6bfk+ggrkAvk5H4oNKlR12AMTBUDFBXfIpDRmPObEl+Wkh9nN3OGA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SGjXC0VG0zrnn; Fri, 27 Oct 2023 00:02: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 39R02Iih040283; Fri, 27 Oct 2023 00:02:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39R02IRh040280; Fri, 27 Oct 2023 00:02:18 GMT (envelope-from git) Date: Fri, 27 Oct 2023 00:02:18 GMT Message-Id: <202310270002.39R02IRh040280@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Glen Barber Subject: git: c6cfdc130554 - releng/14.0 - release: update releng/14.0 to RC3 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gjb X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.0 X-Git-Reftype: branch X-Git-Commit: c6cfdc130554c42c02538622cc627c3d737104f7 Auto-Submitted: auto-generated The branch releng/14.0 has been updated by gjb: URL: https://cgit.FreeBSD.org/src/commit/?id=c6cfdc130554c42c02538622cc627c3d737104f7 commit c6cfdc130554c42c02538622cc627c3d737104f7 Author: Glen Barber AuthorDate: 2023-10-27 00:01:56 +0000 Commit: Glen Barber CommitDate: 2023-10-27 00:01:56 +0000 release: update releng/14.0 to RC3 Approved by: re (implicit) Sponsored by: GoFundMe https://www.gofundme.com/f/gjbbsd Sponsored by: PayPal https://paypal.me/gjbbsd --- sys/conf/newvers.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh index b2bd54bb1ee9..26ed02969303 100644 --- a/sys/conf/newvers.sh +++ b/sys/conf/newvers.sh @@ -53,7 +53,7 @@ TYPE="FreeBSD" REVISION="14.0" -BRANCH="RC2" +BRANCH="RC3" if [ -n "${BRANCH_OVERRIDE}" ]; then BRANCH=${BRANCH_OVERRIDE} fi From nobody Fri Oct 27 03:18:59 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SGnv73y88z4xfDN; Fri, 27 Oct 2023 03:18: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 4SGnv73RCQz4YrY; Fri, 27 Oct 2023 03:18:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698376739; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NUoKwPjVcS8DUEYLps2WKJDdX9TwuMmvW/cnFmo1FYg=; b=tzdnXnlj9qBo/bJ6YcptaWVKT24cgFnGFsyx8E2/LSxhNQcWiengE5fE4zqqgDbv5kNYAt zSO6MrObft5he+vMbgLjGUmcsQYcDe4nZKORACJUVxyBDYjYBnADzy06kx3dqj8qcsERBd so5PwTmrvF1APGPQYjHqyAmVKRbt7SDisN2E1UtD9FnoXBJoZaC1hComE60QSKCcFyNLJJ YziOWbVeSWisIuatu29V84mH6w0yRvUuvs6ffuiX4dW18UYiewnsmDYagm1LKKwwhLsucX BZ+Hz22RW0uguyx7cApl94MUwvdl+FG6IM/YYDY3Zi3WpcXclxMPbyVrJKejQw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698376739; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NUoKwPjVcS8DUEYLps2WKJDdX9TwuMmvW/cnFmo1FYg=; b=E/N6iD0ClUX0kis7sBHK3jFzt0RUgMM75ppMZiw0w8K6rnb91sRshjA8T2Hmbf/xOfJDnK 3dy4DIfpM8xpXVYHX7GQYNJgx2gyesBFOIA1Pf8v35mUzN8coQ45x8+8FTbhKCPj5kLmRI V2aWvMXs35c+WqLp/YzPYMGPrQmFByFhT4XR5YRhcdrieEQb6tNKTrT2FKfoZog5eMML1a CLg1V/JAd3bm8XNk/MqK4Tq+GB99TfCwOrODQ7yaJB2xBzlIAV42DLpX0ZsB4/STSSSQOv bJ7t6v3aZ95US37dDmnGTalKY8JdUajUT/1NJtS1RqGr7kz/ZFSCxHCURcJ6Fw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698376739; a=rsa-sha256; cv=none; b=Yl/DYkHeuIQSoNUGLw2OMh8o3cu1TLp23ct2x0yNi4oPyqkMOCnGIo/QRGHAw5syO4Dwhg A+Qi71LZOiIi0WV5FEOLv7osZWjTTvRRODliPMYfu/xSto5NQw5WVLuKYOzr35NHss7ILJ lxqm5F/tcT33nEZ8/wz2I9w+bL7Ud7OLBKGqZ6LA3vs9ReoBcYjdkBcrBhq9Xwtug9es5q ZHcUTSUO6WY70WGAL3Ma25q2DGctIr2k2trX5b1KTGN9FBSWruHkcJKkvAwxkP6AXqbJbQ XLwRGS+rZugiFC+2t7xF3+Xek0o5OAJJVDgV+ElSG3gQj1cRoXt5Rj6UNed9Gw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SGnv72TWwzxS6; Fri, 27 Oct 2023 03:18: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 39R3IxiO056805; Fri, 27 Oct 2023 03:18:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39R3Ixli056802; Fri, 27 Oct 2023 03:18:59 GMT (envelope-from git) Date: Fri, 27 Oct 2023 03:18:59 GMT Message-Id: <202310270318.39R3Ixli056802@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: 34632ed1a495 - main - arm: Introduce MK_KERNEL_BIN to control generation of kernel.bin List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 34632ed1a49512f52968736abca66c0420bb576a Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=34632ed1a49512f52968736abca66c0420bb576a commit 34632ed1a49512f52968736abca66c0420bb576a Author: Warner Losh AuthorDate: 2023-10-27 03:10:36 +0000 Commit: Warner Losh CommitDate: 2023-10-27 03:10:36 +0000 arm: Introduce MK_KERNEL_BIN to control generation of kernel.bin It's sometimes desirable to generate kernel.bin and install it. While the mainstream has moved on to UEFI booting on arm, some specialized gear can't support it. For that gear, we unconditionally generate kernel.bin. Add a knob so that WITH_KERNEL_BIN or WITHOUT_KERNEL_BIN control its generation and installation. config files should add 'makeoptions WITH_KERNEL_BIN=t' to enable it. Since its use is specialized, it is off by default now since the arm world has largely moved on to UEFI. It only affects arm and arm64 (since those are the only two that support it). Sponsored by: Netflix Reviewed by: mmel Differential Revision: https://reviews.freebsd.org/D39013 --- sys/conf/Makefile.arm | 5 ----- sys/conf/Makefile.arm64 | 6 ------ sys/conf/kern.opts.mk | 19 ++++++++++++------- sys/conf/kern.post.mk | 9 +++++++++ tools/build/options/WITH_KERNEL_BIN | 8 ++++++++ 5 files changed, 29 insertions(+), 18 deletions(-) diff --git a/sys/conf/Makefile.arm b/sys/conf/Makefile.arm index af6ce7136636..d3047406e31c 100644 --- a/sys/conf/Makefile.arm +++ b/sys/conf/Makefile.arm @@ -69,9 +69,6 @@ SYSTEM_LD= \ # Generate the .bin (no elf headers) kernel as an extra build output. # We must relink to generate the .bin kernel, because without headers the # location of everything changes. We also strip the ARM marker symbols. -KERNEL_EXTRA+= ${KERNEL_KO}.bin -KERNEL_EXTRA_INSTALL+= ${KERNEL_KO}.bin - ${KERNEL_KO}.bin: ${SYSTEM_DEP} vers.o @echo "linking ${.TARGET}" @${SYSTEM_LD_BASECMD} \ @@ -100,8 +97,6 @@ genassym.o: bus_if.h device_if.h %CLEAN -CLEAN+= ${KERNEL_KO}.bin - %RULES .include "$S/conf/kern.post.mk" diff --git a/sys/conf/Makefile.arm64 b/sys/conf/Makefile.arm64 index 77c36fa6ce6c..435326cadd9d 100644 --- a/sys/conf/Makefile.arm64 +++ b/sys/conf/Makefile.arm64 @@ -56,11 +56,6 @@ SYSTEM_LD= \ --strip-symbol='$$[adtx]*' \ ${.TARGET} -# Generate the .bin (booti images) kernel as an extra build output. -# The targets and rules to generate these appear near the end of the file. -KERNEL_EXTRA+= ${KERNEL_KO}.bin -KERNEL_EXTRA_INSTALL+= ${KERNEL_KO}.bin - .if !empty(DDB_ENABLED) || !empty(DTRACE_ENABLED) || !empty(HWPMC_ENABLED) CFLAGS += -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer .endif @@ -76,7 +71,6 @@ CFLAGS += -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer %FILES.m %CLEAN -CLEAN+= ${KERNEL_KO}.bin %RULES diff --git a/sys/conf/kern.opts.mk b/sys/conf/kern.opts.mk index cc6f8a1d8755..d9d96a133250 100644 --- a/sys/conf/kern.opts.mk +++ b/sys/conf/kern.opts.mk @@ -56,18 +56,18 @@ __DEFAULT_YES_OPTIONS = \ __DEFAULT_NO_OPTIONS = \ BHYVE_SNAPSHOT \ + KERNEL_BIN \ KERNEL_RETPOLINE \ RATELIMIT \ REPRODUCIBLE_BUILD \ VERIEXEC -# Some options are totally broken on some architectures. We disable -# them. If you need to enable them on an experimental basis, you -# must change this code. -# Note: These only apply to the list of modules we build by default -# and sometimes what is in the opt_*.h files by default. -# Kernel config files are unaffected, though some targets can be -# affected by KERNEL_SYMBOLS, FORMAT_EXTENSIONS, CTF and SSP. +# Some options are totally broken on some architectures. We disable them. If you +# need to enable them on an experimental basis, you must change this code. +# Note: These only apply to the list of modules we build by default and +# sometimes what is in the opt_*.h files by default. Kernel config files are +# unaffected, though some targets can be affected by KERNEL_BIN, KERNEL_SYMBOLS, +# FORMAT_EXTENSIONS, CTF and SSP. # Broken on 32-bit arm, kernel module compile errors .if ${MACHINE_CPUARCH} == "arm" @@ -84,6 +84,11 @@ BROKEN_OPTIONS+= KERNEL_RETPOLINE BROKEN_OPTIONS+=EFI .endif +# We only generate kernel.bin on arm and arm64, otherwise they break the build. +.if ${MACHINE} != "arm" && ${MACHINE} != "arm64" +BROKEN_OPTIONS+=KERNEL_BIN +.endif + .if ${MACHINE_CPUARCH} == "i386" || ${MACHINE_CPUARCH} == "amd64" __DEFAULT_NO_OPTIONS += FDT .else diff --git a/sys/conf/kern.post.mk b/sys/conf/kern.post.mk index bea29507a736..5258cea9441c 100644 --- a/sys/conf/kern.post.mk +++ b/sys/conf/kern.post.mk @@ -466,4 +466,13 @@ embedfs_${MFS_IMAGE:T:R}.o: ${MFS_IMAGE} $S/dev/md/embedfs.S .endif .endif +# Generate the .bin (booti images) kernel as an extra build output. +# The targets and rules to generate these appear in Makefile.$MACHINE +# if the platform supports it. +.if ${MK_KERNEL_BIN} != "no" +KERNEL_EXTRA+= ${KERNEL_KO}.bin +KERNEL_EXTRA_INSTALL+= ${KERNEL_KO}.bin +CLEAN+= ${KERNEL_KO}.bin +.endif + .include "kern.mk" diff --git a/tools/build/options/WITH_KERNEL_BIN b/tools/build/options/WITH_KERNEL_BIN new file mode 100644 index 000000000000..b5e008dbd6f0 --- /dev/null +++ b/tools/build/options/WITH_KERNEL_BIN @@ -0,0 +1,8 @@ +Generate and install kernel.bin from kernel as part of the normal build and +install processes for the kernel. Available only on arm and arm64. + +Usually this will be added to the kernel config file with: + +makeoptions WITH_KERNEL_BIN=1 + +though it can also be used on the command line. From nobody Fri Oct 27 03:55:58 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SGpjp3DG6z4xhK0; Fri, 27 Oct 2023 03:55:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SGpjp2rZjz4c8g; Fri, 27 Oct 2023 03:55:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698378958; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=S/pfGsRvBImZ38U9ToBoljpq9ERN46Olq21whGClskU=; b=l76RCDaj2gGS00CHtaF8KR4MGKC0f+yzes221jTlRlWG6KYjnBfClRSB3C3rwbyqFpt9au XPvKQCNF+VNdGbYkz1S43zvQ635FRstIO+DtyuOasJ1RDUAUcoikfKmpwX7qTrNGuM74MY FPZzJbWEkVXJ1CUF5uKTLbrF+HYOxTFnIKDWuN0Y52RO2MLxF6je2UP6EedIn/9fn05RCX +upSBs/uHHgFZdVx+IC4hS8Phqp8mw7Srie6lYYlAL/zHQ0Rs2zeOSc9ajQ0vgcEHUgDuP ecWHCYeqi8K5w0qmUPScoeVkr1adKaMSRLqlJ1/xVR3UZz2vtIfiCc1gZG+53Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698378958; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=S/pfGsRvBImZ38U9ToBoljpq9ERN46Olq21whGClskU=; b=dHoYg64Ms99Xk9de3YeEK7HVf8mT0SeKZHfonwX60CMsk5BFXobVhfCpz6EAbyR3jolVb+ 4GGJTAmnjjmXXky49Jb2qgevBjW35allYhbk723UGHINbmRAGdHG3eYHJkSSm7vcVIIexj jWyOIrJD1WgDZa8D4huKRrAyQ1tHbtIhtFgPBUfzZv6ZyGyKdRcC5ty4NVKDr8icfhPN/x Gys8lcB8jyhEzGdANT4WtNyUEw4xfmfH7AIRyo6frKUfDSf70S7E18LyDDt8tfArfyY4Sx GHmCaWZoxxMypXk+FOu8ap276lidAHpFo2R2xCh0tEWkZk4YMFtS8VYAM4I5TQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698378958; a=rsa-sha256; cv=none; b=mxyYmT61NuwuBwYiTGgFf4QvpMfItq9VGfADkItg/5cLvd+ThY+KvV1BbDynaF7RLImqM7 Y4avlEONgzrH1VIFVd+oyBqtN8lpTMrRFRTw4i+jsNTdO6Xt2Qdva/95v46kRzn+8SUQgQ MxUHhpm+lE5UVRU2NqD2/sDl4MiMyWRBXuSF1byR8r/dEdJJVx9uh6IsB12N4fxWPcaAMr lY2He378am8+Aok+WCM3C/tdsacbaesoyP3thk5NNV9aVVcibbe56zylrrq7e0/tJGQAvU pWptAzwgg85/vCvjJ8iiTMNYEgSxlopH41VW4l1isGQQHFEyvufXhig4fIXGHw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SGpjp1qVnzyMK; Fri, 27 Oct 2023 03:55: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 39R3twKw022545; Fri, 27 Oct 2023 03:55:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39R3twhZ022542; Fri, 27 Oct 2023 03:55:58 GMT (envelope-from git) Date: Fri, 27 Oct 2023 03:55:58 GMT Message-Id: <202310270355.39R3twhZ022542@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kyle Evans Subject: git: 93d4bad6453a - main - arm: prune imx5 support from the tree List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 93d4bad6453a2b32191428de69beb4766167db9d Auto-Submitted: auto-generated The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=93d4bad6453a2b32191428de69beb4766167db9d commit 93d4bad6453a2b32191428de69beb4766167db9d Author: Kyle Evans AuthorDate: 2023-10-27 03:55:17 +0000 Commit: Kyle Evans CommitDate: 2023-10-27 03:55:17 +0000 arm: prune imx5 support from the tree The IMX5 configs were removed in advance of FreeBSD 14.0 in cdb0c2a73df ("arm: Remove IMX5 specific kernel configs"). This code isn't built with GENERIC and doesn't actually build today as-is, so let's remove it to avoid needless maintenance work to it that won't be tested. As usual, revival is welcome with a committed user and work to maintain it with upstream DTS and, ideally, in GENERIC. I note that vt_early_fb is now effectively orphaned as nothing else will use it, but I haven't yet removed it since I have not done anything to ascertain if it could be integrated easily enough for other SoC. It is among the files that doesn't actually build with today's clang, though. Reviewed by: imp, manu Differential Revision: https://reviews.freebsd.org/D41836 --- sys/arm/freescale/imx/files.imx5 | 54 -- sys/arm/freescale/imx/imx51_ccm.c | 656 ----------------------- sys/arm/freescale/imx/imx51_ccmreg.h | 257 --------- sys/arm/freescale/imx/imx51_ccmvar.h | 110 ---- sys/arm/freescale/imx/imx51_dpllreg.h | 105 ---- sys/arm/freescale/imx/imx51_ipuv3.c | 872 ------------------------------ sys/arm/freescale/imx/imx51_ipuv3_fbd.c | 360 ------------- sys/arm/freescale/imx/imx51_ipuv3reg.h | 922 -------------------------------- sys/arm/freescale/imx/imx51_machdep.c | 102 ---- sys/arm/freescale/imx/imx51_sdmareg.h | 141 ----- sys/arm/freescale/imx/imx51_ssireg.h | 179 ------- sys/arm/freescale/imx/imx51_tzicreg.h | 85 --- sys/arm/freescale/imx/imx53_machdep.c | 98 ---- sys/arm/freescale/imx/imx_nop_usbphy.c | 115 ---- sys/arm/freescale/imx/std.imx51 | 5 - sys/arm/freescale/imx/std.imx53 | 5 - sys/arm/freescale/imx/tzic.c | 306 ----------- sys/conf/options.arm | 2 - sys/dev/ata/chipsets/ata-fsl.c | 234 -------- 19 files changed, 4608 deletions(-) diff --git a/sys/arm/freescale/imx/files.imx5 b/sys/arm/freescale/imx/files.imx5 deleted file mode 100644 index 4522bf5021bd..000000000000 --- a/sys/arm/freescale/imx/files.imx5 +++ /dev/null @@ -1,54 +0,0 @@ - -# Init -arm/freescale/imx/imx_machdep.c standard -arm/freescale/imx/imx51_machdep.c optional soc_imx51 -arm/freescale/imx/imx53_machdep.c optional soc_imx53 - -# Special serial console for debuging early boot code -#arm/freescale/imx/imx_console.c standard - -# UART driver (includes serial console support) -dev/uart/uart_dev_imx.c optional uart - -# TrustZone Interrupt Controller -arm/freescale/imx/tzic.c standard - -# IOMUX - external pins multiplexor -arm/freescale/imx/imx_iomux.c standard - -# GPIO -arm/freescale/imx/imx_gpio.c optional gpio - -# Generic Periodic Timer -arm/freescale/imx/imx_gpt.c standard - -# Clock Configuration Manager -arm/freescale/imx/imx51_ccm.c standard - -# i.MX5xx PATA controller -dev/ata/chipsets/ata-fsl.c optional imxata - -# SDHCI/MMC -dev/sdhci/fsl_sdhci.c optional sdhci - -# USB OH3 controller (1 OTG, 3 EHCI) -arm/freescale/imx/imx_nop_usbphy.c optional ehci -dev/usb/controller/ehci_imx.c optional ehci - -# Watchdog -arm/freescale/imx/imx_wdog.c optional imxwdt - -# i2c -arm/freescale/imx/imx_i2c.c optional fsliic - -# IPU - Image Processing Unit (frame buffer also) -arm/freescale/imx/imx51_ipuv3.c optional sc -arm/freescale/imx/imx51_ipuv3_fbd.c optional vt -dev/vt/hw/fb/vt_early_fb.c optional vt - -# Fast Ethernet Controller -dev/ffec/if_ffec.c optional ffec - -# SPI -arm/freescale/imx/imx_spi.c optional imx_spi - diff --git a/sys/arm/freescale/imx/imx51_ccm.c b/sys/arm/freescale/imx/imx51_ccm.c deleted file mode 100644 index 3501a945b6ab..000000000000 --- a/sys/arm/freescale/imx/imx51_ccm.c +++ /dev/null @@ -1,656 +0,0 @@ -/* $NetBSD: imx51_ccm.c,v 1.1 2012/04/17 09:33:31 bsh Exp $ */ -/*- - * SPDX-License-Identifier: BSD-2-Clause - * - * Copyright (c) 2010, 2011, 2012 Genetec Corporation. All rights reserved. - * Written by Hashimoto Kenichi for Genetec Corporation. - * - * 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 GENETEC CORPORATION ``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 GENETEC CORPORATION - * 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. - */ - -/*- - * Copyright (c) 2012, 2013 The FreeBSD Foundation - * All rights reserved. - * - * Portions of this software were developed by Oleksandr Rybalko - * 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. - */ - -/* - * Clock Controller Module (CCM) - */ - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include -#include - -#include -#include - -#include -#include -#include -#include -#include - -#define IMXCCMDEBUG -#undef IMXCCMDEBUG - -#ifndef IMX51_OSC_FREQ -#define IMX51_OSC_FREQ (24 * 1000 * 1000) /* 24MHz */ -#endif - -#ifndef IMX51_CKIL_FREQ -#define IMX51_CKIL_FREQ 32768 -#endif - -/* - * The fdt data does not provide reg properties describing the DPLL register - * blocks we need to access, presumably because the needed addresses are - * hard-coded within the linux driver. That leaves us with no choice but to do - * the same thing, if we want to run with vendor-supplied fdt data. So here we - * have tables of the physical addresses we need for each soc, and we'll use - * bus_space_map() at attach() time to get access to them. - */ -static uint32_t imx51_dpll_addrs[IMX51_N_DPLLS] = { - 0x83f80000, /* DPLL1 */ - 0x83f84000, /* DPLL2 */ - 0x83f88000, /* DPLL3 */ -}; - -static uint32_t imx53_dpll_addrs[IMX51_N_DPLLS] = { - 0x63f80000, /* DPLL1 */ - 0x63f84000, /* DPLL2 */ - 0x63f88000, /* DPLL3 */ -}; - -#define DPLL_REGS_SZ (16 * 1024) - -struct imxccm_softc { - device_t sc_dev; - struct resource *ccmregs; - u_int64_t pll_freq[IMX51_N_DPLLS]; - bus_space_tag_t pllbst; - bus_space_handle_t pllbsh[IMX51_N_DPLLS]; -}; - -struct imxccm_softc *ccm_softc = NULL; - -static uint64_t imx51_get_pll_freq(u_int); - -static int imxccm_match(device_t); -static int imxccm_attach(device_t); - -static device_method_t imxccm_methods[] = { - DEVMETHOD(device_probe, imxccm_match), - DEVMETHOD(device_attach, imxccm_attach), - - DEVMETHOD_END -}; - -static driver_t imxccm_driver = { - "imxccm", - imxccm_methods, - sizeof(struct imxccm_softc), -}; - -EARLY_DRIVER_MODULE(imxccm, simplebus, imxccm_driver, 0, 0, BUS_PASS_CPU); - -static inline uint32_t -pll_read_4(struct imxccm_softc *sc, int pll, int reg) -{ - - return (bus_space_read_4(sc->pllbst, sc->pllbsh[pll - 1], reg)); -} - -static inline uint32_t -ccm_read_4(struct imxccm_softc *sc, int reg) -{ - - return (bus_read_4(sc->ccmregs, reg)); -} - -static inline void -ccm_write_4(struct imxccm_softc *sc, int reg, uint32_t val) -{ - - bus_write_4(sc->ccmregs, reg, val); -} - -static int -imxccm_match(device_t dev) -{ - - if (!ofw_bus_status_okay(dev)) - return (ENXIO); - - if (!ofw_bus_is_compatible(dev, "fsl,imx51-ccm") && - !ofw_bus_is_compatible(dev, "fsl,imx53-ccm")) - return (ENXIO); - - device_set_desc(dev, "Freescale Clock Control Module"); - return (BUS_PROBE_DEFAULT); -} - -static int -imxccm_attach(device_t dev) -{ - struct imxccm_softc *sc; - int idx; - u_int soc; - uint32_t *pll_addrs; - - sc = device_get_softc(dev); - sc->sc_dev = dev; - - switch ((soc = imx_soc_type())) { - case IMXSOC_51: - pll_addrs = imx51_dpll_addrs; - break; - case IMXSOC_53: - pll_addrs = imx53_dpll_addrs; - break; - default: - device_printf(dev, "No support for SoC type 0x%08x\n", soc); - goto noclocks; - } - - idx = 0; - sc->ccmregs = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &idx, - RF_ACTIVE); - if (sc->ccmregs == NULL) { - device_printf(dev, "could not allocate resources\n"); - goto noclocks; - } - - sc->pllbst = fdtbus_bs_tag; - for (idx = 0; idx < IMX51_N_DPLLS; ++idx) { - if (bus_space_map(sc->pllbst, pll_addrs[idx], DPLL_REGS_SZ, 0, - &sc->pllbsh[idx]) != 0) { - device_printf(dev, "Cannot map DPLL registers\n"); - goto noclocks; - } - } - - ccm_softc = sc; - - imx51_get_pll_freq(1); - imx51_get_pll_freq(2); - imx51_get_pll_freq(3); - - device_printf(dev, "PLL1=%lluMHz, PLL2=%lluMHz, PLL3=%lluMHz\n", - sc->pll_freq[0] / 1000000, - sc->pll_freq[1] / 1000000, - sc->pll_freq[2] / 1000000); - device_printf(dev, "CPU clock=%d, UART clock=%d\n", - imx51_get_clock(IMX51CLK_ARM_ROOT), - imx51_get_clock(IMX51CLK_UART_CLK_ROOT)); - device_printf(dev, - "mainbus clock=%d, ahb clock=%d ipg clock=%d perclk=%d\n", - imx51_get_clock(IMX51CLK_MAIN_BUS_CLK), - imx51_get_clock(IMX51CLK_AHB_CLK_ROOT), - imx51_get_clock(IMX51CLK_IPG_CLK_ROOT), - imx51_get_clock(IMX51CLK_PERCLK_ROOT)); - - return (0); - -noclocks: - - panic("Cannot continue without clock support"); -} - -u_int -imx51_get_clock(enum imx51_clock clk) -{ - u_int freq; - u_int sel; - uint32_t cacrr; /* ARM clock root register */ - uint32_t ccsr; - uint32_t cscdr1; - uint32_t cscmr1; - uint32_t cbcdr; - uint32_t cbcmr; - uint32_t cdcr; - - if (ccm_softc == NULL) - return (0); - - switch (clk) { - case IMX51CLK_PLL1: - case IMX51CLK_PLL2: - case IMX51CLK_PLL3: - return ccm_softc->pll_freq[clk-IMX51CLK_PLL1]; - case IMX51CLK_PLL1SW: - ccsr = ccm_read_4(ccm_softc, CCMC_CCSR); - if ((ccsr & CCSR_PLL1_SW_CLK_SEL) == 0) - return ccm_softc->pll_freq[1-1]; - /* step clock */ - /* FALLTHROUGH */ - case IMX51CLK_PLL1STEP: - ccsr = ccm_read_4(ccm_softc, CCMC_CCSR); - switch ((ccsr & CCSR_STEP_SEL_MASK) >> CCSR_STEP_SEL_SHIFT) { - case 0: - return imx51_get_clock(IMX51CLK_LP_APM); - case 1: - return 0; /* XXX PLL bypass clock */ - case 2: - return ccm_softc->pll_freq[2-1] / - (1 + ((ccsr & CCSR_PLL2_DIV_PODF_MASK) >> - CCSR_PLL2_DIV_PODF_SHIFT)); - case 3: - return ccm_softc->pll_freq[3-1] / - (1 + ((ccsr & CCSR_PLL3_DIV_PODF_MASK) >> - CCSR_PLL3_DIV_PODF_SHIFT)); - } - /*NOTREACHED*/ - case IMX51CLK_PLL2SW: - ccsr = ccm_read_4(ccm_softc, CCMC_CCSR); - if ((ccsr & CCSR_PLL2_SW_CLK_SEL) == 0) - return imx51_get_clock(IMX51CLK_PLL2); - return 0; /* XXX PLL2 bypass clk */ - case IMX51CLK_PLL3SW: - ccsr = ccm_read_4(ccm_softc, CCMC_CCSR); - if ((ccsr & CCSR_PLL3_SW_CLK_SEL) == 0) - return imx51_get_clock(IMX51CLK_PLL3); - return 0; /* XXX PLL3 bypass clk */ - - case IMX51CLK_LP_APM: - ccsr = ccm_read_4(ccm_softc, CCMC_CCSR); - return (ccsr & CCSR_LP_APM) ? - imx51_get_clock(IMX51CLK_FPM) : IMX51_OSC_FREQ; - - case IMX51CLK_ARM_ROOT: - freq = imx51_get_clock(IMX51CLK_PLL1SW); - cacrr = ccm_read_4(ccm_softc, CCMC_CACRR); - return freq / (cacrr + 1); - - /* ... */ - case IMX51CLK_MAIN_BUS_CLK_SRC: - cbcdr = ccm_read_4(ccm_softc, CCMC_CBCDR); - if ((cbcdr & CBCDR_PERIPH_CLK_SEL) == 0) - freq = imx51_get_clock(IMX51CLK_PLL2SW); - else { - freq = 0; - cbcmr = ccm_read_4(ccm_softc, CCMC_CBCMR); - switch ((cbcmr & CBCMR_PERIPH_APM_SEL_MASK) >> - CBCMR_PERIPH_APM_SEL_SHIFT) { - case 0: - freq = imx51_get_clock(IMX51CLK_PLL1SW); - break; - case 1: - freq = imx51_get_clock(IMX51CLK_PLL3SW); - break; - case 2: - freq = imx51_get_clock(IMX51CLK_LP_APM); - break; - case 3: - /* XXX: error */ - break; - } - } - return freq; - case IMX51CLK_MAIN_BUS_CLK: - freq = imx51_get_clock(IMX51CLK_MAIN_BUS_CLK_SRC); - cdcr = ccm_read_4(ccm_softc, CCMC_CDCR); - return freq / (1 + ((cdcr & CDCR_PERIPH_CLK_DVFS_PODF_MASK) >> - CDCR_PERIPH_CLK_DVFS_PODF_SHIFT)); - case IMX51CLK_AHB_CLK_ROOT: - freq = imx51_get_clock(IMX51CLK_MAIN_BUS_CLK); - cbcdr = ccm_read_4(ccm_softc, CCMC_CBCDR); - return freq / (1 + ((cbcdr & CBCDR_AHB_PODF_MASK) >> - CBCDR_AHB_PODF_SHIFT)); - case IMX51CLK_IPG_CLK_ROOT: - freq = imx51_get_clock(IMX51CLK_AHB_CLK_ROOT); - cbcdr = ccm_read_4(ccm_softc, CCMC_CBCDR); - return freq / (1 + ((cbcdr & CBCDR_IPG_PODF_MASK) >> - CBCDR_IPG_PODF_SHIFT)); - - case IMX51CLK_PERCLK_ROOT: - cbcmr = ccm_read_4(ccm_softc, CCMC_CBCMR); - if (cbcmr & CBCMR_PERCLK_IPG_SEL) - return imx51_get_clock(IMX51CLK_IPG_CLK_ROOT); - if (cbcmr & CBCMR_PERCLK_LP_APM_SEL) - freq = imx51_get_clock(IMX51CLK_LP_APM); - else - freq = imx51_get_clock(IMX51CLK_MAIN_BUS_CLK_SRC); - cbcdr = ccm_read_4(ccm_softc, CCMC_CBCDR); - -#ifdef IMXCCMDEBUG - printf("cbcmr=%x cbcdr=%x\n", cbcmr, cbcdr); -#endif - - freq /= 1 + ((cbcdr & CBCDR_PERCLK_PRED1_MASK) >> - CBCDR_PERCLK_PRED1_SHIFT); - freq /= 1 + ((cbcdr & CBCDR_PERCLK_PRED2_MASK) >> - CBCDR_PERCLK_PRED2_SHIFT); - freq /= 1 + ((cbcdr & CBCDR_PERCLK_PODF_MASK) >> - CBCDR_PERCLK_PODF_SHIFT); - return freq; - case IMX51CLK_UART_CLK_ROOT: - cscdr1 = ccm_read_4(ccm_softc, CCMC_CSCDR1); - cscmr1 = ccm_read_4(ccm_softc, CCMC_CSCMR1); - -#ifdef IMXCCMDEBUG - printf("cscdr1=%x cscmr1=%x\n", cscdr1, cscmr1); -#endif - - sel = (cscmr1 & CSCMR1_UART_CLK_SEL_MASK) >> - CSCMR1_UART_CLK_SEL_SHIFT; - - freq = 0; /* shut up GCC */ - switch (sel) { - case 0: - case 1: - case 2: - freq = imx51_get_clock(IMX51CLK_PLL1SW + sel); - break; - case 3: - freq = imx51_get_clock(IMX51CLK_LP_APM); - break; - } - - return freq / (1 + ((cscdr1 & CSCDR1_UART_CLK_PRED_MASK) >> - CSCDR1_UART_CLK_PRED_SHIFT)) / - (1 + ((cscdr1 & CSCDR1_UART_CLK_PODF_MASK) >> - CSCDR1_UART_CLK_PODF_SHIFT)); - case IMX51CLK_IPU_HSP_CLK_ROOT: - freq = 0; - cbcmr = ccm_read_4(ccm_softc, CCMC_CBCMR); - switch ((cbcmr & CBCMR_IPU_HSP_CLK_SEL_MASK) >> - CBCMR_IPU_HSP_CLK_SEL_SHIFT) { - case 0: - freq = imx51_get_clock(IMX51CLK_ARM_AXI_A_CLK); - break; - case 1: - freq = imx51_get_clock(IMX51CLK_ARM_AXI_B_CLK); - break; - case 2: - freq = imx51_get_clock( - IMX51CLK_EMI_SLOW_CLK_ROOT); - break; - case 3: - freq = imx51_get_clock(IMX51CLK_AHB_CLK_ROOT); - break; - } - return freq; - default: - device_printf(ccm_softc->sc_dev, - "clock %d: not supported yet\n", clk); - return 0; - } -} - -static uint64_t -imx51_get_pll_freq(u_int pll_no) -{ - uint32_t dp_ctrl; - uint32_t dp_op; - uint32_t dp_mfd; - uint32_t dp_mfn; - uint32_t mfi; - int32_t mfn; - uint32_t mfd; - uint32_t pdf; - uint32_t ccr; - uint64_t freq = 0; - u_int ref = 0; - - KASSERT(1 <= pll_no && pll_no <= IMX51_N_DPLLS, ("Wrong PLL id")); - - dp_ctrl = pll_read_4(ccm_softc, pll_no, DPLL_DP_CTL); - - if (dp_ctrl & DP_CTL_HFSM) { - dp_op = pll_read_4(ccm_softc, pll_no, DPLL_DP_HFS_OP); - dp_mfd = pll_read_4(ccm_softc, pll_no, DPLL_DP_HFS_MFD); - dp_mfn = pll_read_4(ccm_softc, pll_no, DPLL_DP_HFS_MFN); - } else { - dp_op = pll_read_4(ccm_softc, pll_no, DPLL_DP_OP); - dp_mfd = pll_read_4(ccm_softc, pll_no, DPLL_DP_MFD); - dp_mfn = pll_read_4(ccm_softc, pll_no, DPLL_DP_MFN); - } - - pdf = dp_op & DP_OP_PDF_MASK; - mfi = max(5, (dp_op & DP_OP_MFI_MASK) >> DP_OP_MFI_SHIFT); - mfd = dp_mfd; - if (dp_mfn & 0x04000000) - /* 27bit signed value */ - mfn = (uint32_t)(0xf8000000 | dp_mfn); - else - mfn = dp_mfn; - - switch (dp_ctrl & DP_CTL_REF_CLK_SEL_MASK) { - case DP_CTL_REF_CLK_SEL_COSC: - /* Internal Oscillator */ - /* TODO: get from FDT "fsl,imx-osc" */ - ref = 24000000; /* IMX51_OSC_FREQ */ - break; - case DP_CTL_REF_CLK_SEL_FPM: - ccr = ccm_read_4(ccm_softc, CCMC_CCR); - if (ccr & CCR_FPM_MULT) - /* TODO: get from FDT "fsl,imx-ckil" */ - ref = 32768 * 1024; - else - /* TODO: get from FDT "fsl,imx-ckil" */ - ref = 32768 * 512; - break; - default: - ref = 0; - } - - if (dp_ctrl & DP_CTL_REF_CLK_DIV) - ref /= 2; - - ref *= 4; - freq = (int64_t)ref * mfi + (int64_t)ref * mfn / (mfd + 1); - freq /= pdf + 1; - - if (!(dp_ctrl & DP_CTL_DPDCK0_2_EN)) - freq /= 2; - -#ifdef IMXCCMDEBUG - printf("ref: %dKHz ", ref); - printf("dp_ctl: %08x ", dp_ctrl); - printf("pdf: %3d ", pdf); - printf("mfi: %3d ", mfi); - printf("mfd: %3d ", mfd); - printf("mfn: %3d ", mfn); - printf("pll: %d\n", (uint32_t)freq); -#endif - - ccm_softc->pll_freq[pll_no-1] = freq; - - return (freq); -} - -void -imx51_clk_gating(int clk_src, int mode) -{ - int field, group; - uint32_t reg; - - group = CCMR_CCGR_MODULE(clk_src); - field = clk_src % CCMR_CCGR_NSOURCE; - reg = ccm_read_4(ccm_softc, CCMC_CCGR(group)); - reg &= ~(0x03 << field * 2); - reg |= (mode << field * 2); - ccm_write_4(ccm_softc, CCMC_CCGR(group), reg); -} - -int -imx51_get_clk_gating(int clk_src) -{ - uint32_t reg; - - reg = ccm_read_4(ccm_softc, - CCMC_CCGR(CCMR_CCGR_MODULE(clk_src))); - return ((reg >> (clk_src % CCMR_CCGR_NSOURCE) * 2) & 0x03); -} - -/* - * Code from here down is temporary, in lieu of a SoC-independent clock API. - */ - -void -imx_ccm_usb_enable(device_t dev) -{ - uint32_t regval; - - /* - * Select PLL2 as the source for the USB clock. - * The default is PLL3, but U-boot changes it to PLL2. - */ - regval = ccm_read_4(ccm_softc, CCMC_CSCMR1); - regval &= ~CSCMR1_USBOH3_CLK_SEL_MASK; - regval |= 1 << CSCMR1_USBOH3_CLK_SEL_SHIFT; - ccm_write_4(ccm_softc, CCMC_CSCMR1, regval); - - /* - * Set the USB clock pre-divider to div-by-5, post-divider to div-by-2. - */ - regval = ccm_read_4(ccm_softc, CCMC_CSCDR1); - regval &= ~CSCDR1_USBOH3_CLK_PODF_MASK; - regval &= ~CSCDR1_USBOH3_CLK_PRED_MASK; - regval |= 4 << CSCDR1_USBOH3_CLK_PRED_SHIFT; - regval |= 1 << CSCDR1_USBOH3_CLK_PODF_SHIFT; - ccm_write_4(ccm_softc, CCMC_CSCDR1, regval); - - /* - * The same two clocks gates are used on imx51 and imx53. - */ - imx51_clk_gating(CCGR_USBOH3_IPG_AHB_CLK, CCGR_CLK_MODE_ALWAYS); - imx51_clk_gating(CCGR_USBOH3_60M_CLK, CCGR_CLK_MODE_ALWAYS); -} - -void -imx_ccm_usbphy_enable(device_t dev) -{ - uint32_t regval; - - /* - * Select PLL3 as the source for the USBPHY clock. U-boot does this - * only for imx53, but the bit exists on imx51. That seems a bit - * strange, but we'll go with it until more is known. - */ - if (imx_soc_type() == IMXSOC_53) { - regval = ccm_read_4(ccm_softc, CCMC_CSCMR1); - regval |= 1 << CSCMR1_USBPHY_CLK_SEL_SHIFT; - ccm_write_4(ccm_softc, CCMC_CSCMR1, regval); - } - - /* - * For the imx51 there's just one phy gate control, enable it. - */ - if (imx_soc_type() == IMXSOC_51) { - imx51_clk_gating(CCGR_USB_PHY_CLK, CCGR_CLK_MODE_ALWAYS); - return; - } - - /* - * For imx53 we don't have a full set of clock defines yet, but the - * datasheet says: - * gate reg 4, bits 13-12 usb ph2 clock (usb_phy2_clk_enable) - * gate reg 4, bits 11-10 usb ph1 clock (usb_phy1_clk_enable) - * - * We should use the fdt data for the device to figure out which of - * the two we're working on, but for now just turn them both on. - */ - if (imx_soc_type() == IMXSOC_53) { - imx51_clk_gating(__CCGR_NUM(4, 5), CCGR_CLK_MODE_ALWAYS); - imx51_clk_gating(__CCGR_NUM(4, 6), CCGR_CLK_MODE_ALWAYS); - return; - } -} - -uint32_t -imx_ccm_ecspi_hz(void) -{ - - return (imx51_get_clock(IMX51CLK_CSPI_CLK_ROOT)); -} - -uint32_t -imx_ccm_ipg_hz(void) -{ - - return (imx51_get_clock(IMX51CLK_IPG_CLK_ROOT)); -} - -uint32_t -imx_ccm_sdhci_hz(void) -{ - - return (imx51_get_clock(IMX51CLK_ESDHC1_CLK_ROOT)); -} - -uint32_t -imx_ccm_perclk_hz(void) -{ - - return (imx51_get_clock(IMX51CLK_PERCLK_ROOT)); -} - -uint32_t -imx_ccm_uart_hz(void) -{ - - return (imx51_get_clock(IMX51CLK_UART_CLK_ROOT)); -} - -uint32_t -imx_ccm_ahb_hz(void) -{ - - return (imx51_get_clock(IMX51CLK_AHB_CLK_ROOT)); -} diff --git a/sys/arm/freescale/imx/imx51_ccmreg.h b/sys/arm/freescale/imx/imx51_ccmreg.h deleted file mode 100644 index 5fa56af0227b..000000000000 --- a/sys/arm/freescale/imx/imx51_ccmreg.h +++ /dev/null @@ -1,257 +0,0 @@ -/* $NetBSD: imx51_ccmreg.h,v 1.1 2012/04/17 09:33:31 bsh Exp $ */ -/*- - * SPDX-License-Identifier: BSD-2-Clause - * - * Copyright (c) 2011, 2012 Genetec Corporation. All rights reserved. - * Written by Hashimoto Kenichi for Genetec Corporation. - * - * 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 GENETEC CORPORATION ``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 GENETEC CORPORATION - * 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. - */ - -/*- - * Copyright (c) 2012, 2013 The FreeBSD Foundation - * All rights reserved. - * - * Portions of this software were developed by Oleksandr Rybalko - * under sponsorship from the FreeBSD Foundation. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - -#ifndef _IMX51_CCMREG_H -#define _IMX51_CCMREG_H - -#include - -/* register offset address */ - -#define CCMC_BASE 0x73fd4000 -#define CCMC_CCR 0x0000 -#define CCR_FPM_MULT 0x00001000 -#define CCMC_CCDR 0x0004 -#define CCMC_CSR 0x0008 -#define CCMC_CCSR 0x000c -#define CCSR_LP_APM 0x00000200 -#define CCSR_STEP_SEL_SHIFT 7 -#define CCSR_STEP_SEL_MASK 0x00000180 -#define CCSR_PLL2_DIV_PODF_SHIFT 5 -#define CCSR_PLL2_DIV_PODF_MASK 0x00000060 -#define CCSR_PLL3_DIV_PODF_SHIFT 3 -#define CCSR_PLL3_DIV_PODF_MASK 0x00000030 -#define CCSR_PLL1_SW_CLK_SEL 0x00000004 -#define CCSR_PLL2_SW_CLK_SEL 0x00000002 -#define CCSR_PLL3_SW_CLK_SEL 0x00000001 -#define CCMC_CACRR 0x0010 -#define CCMC_CBCDR 0x0014 -#define CBCDR_DDR_HIGH_FREQ_CLK_SEL 0x40000000 -#define CBCDR_DDR_CLK_PODF_SHIFT 27 -#define CBCDR_DDR_CLK_PODF_MASK 0x38000000 -#define CBCDR_EMI_CLK_SEL 0x04000000 -#define CBCDR_PERIPH_CLK_SEL 0x02000000 -#define CBCDR_EMI_SLOW_PODF_SHIFT 22 -#define CBCDR_EMI_SLOW_PODF_MASK 0x01c00000 -#define CBCDR_AXI_B_PODF_SHIFT 19 -#define CBCDR_AXI_B_PODF_MASK 0x00380000 -#define CBCDR_AXI_A_PODF_SHIFT 16 -#define CBCDR_AXI_A_PODF_MASK 0x1fff0000 -#define CBCDR_NFC_PODF_SHIFT 13 -#define CBCDR_NFC_PODF_MASK 0x00018000 -#define CBCDR_AHB_PODF_SHIFT 10 -#define CBCDR_AHB_PODF_MASK 0x00001c00 -#define CBCDR_IPG_PODF_SHIFT 8 -#define CBCDR_IPG_PODF_MASK 0x00000300 -#define CBCDR_PERCLK_PRED1_SHIFT 6 -#define CBCDR_PERCLK_PRED1_MASK 0x000000c0 -#define CBCDR_PERCLK_PRED2_SHIFT 3 -#define CBCDR_PERCLK_PRED2_MASK 0x00000038 -#define CBCDR_PERCLK_PODF_SHIFT 0 -#define CBCDR_PERCLK_PODF_MASK 0x00000007 -#define CCMC_CBCMR 0x0018 -#define CBCMR_PERIPH_APM_SEL_SHIFT 12 -#define CBCMR_PERIPH_APM_SEL_MASK 0x00003000 -#define CBCMR_IPU_HSP_CLK_SEL_SHIFT 6 -#define CBCMR_IPU_HSP_CLK_SEL_MASK 0x000000c0 -#define CBCMR_PERCLK_LP_APM_SEL 0x00000002 -#define CBCMR_PERCLK_IPG_SEL 0x00000001 -#define CCMC_CSCMR1 0x001c -#define CSCMR1_UART_CLK_SEL_SHIFT 24 -#define CSCMR1_UART_CLK_SEL_MASK 0x03000000 -#define CSCMR1_USBPHY_CLK_SEL_SHIFT 26 -#define CSCMR1_USBPHY_CLK_SEL_MASK 0x04000000 -#define CSCMR1_USBOH3_CLK_SEL_SHIFT 22 -#define CSCMR1_USBOH3_CLK_SEL_MASK 0x00c00000 -#define CCMC_CSCMR2 0x0020 -#define CCMC_CSCDR1 0x0024 -#define CSCDR1_UART_CLK_PRED_SHIFT 3 -#define CSCDR1_UART_CLK_PRED_MASK 0x00000038 -#define CSCDR1_UART_CLK_PODF_SHIFT 0 -#define CSCDR1_UART_CLK_PODF_MASK 0x00000007 -#define CSCDR1_USBOH3_CLK_PRED_SHIFT 8 -#define CSCDR1_USBOH3_CLK_PRED_MASK 0x00000700 -#define CSCDR1_USBOH3_CLK_PODF_SHIFT 6 -#define CSCDR1_USBOH3_CLK_PODF_MASK 0x000000c0 -#define CCMC_CS1CDR 0x0028 -#define CCMC_CS2CDR 0x002c -#define CCMC_CDCDR 0x0030 -#define CCMC_CSCDR2 0x0038 -#define CCMC_CSCDR3 0x003c -#define CCMC_CSCDR4 0x0040 -#define CCMC_CWDR 0x0044 -#define CCMC_CDHIPR 0x0048 -#define CCMC_CDCR 0x004c -#define CDCR_PERIPH_CLK_DVFS_PODF_SHIFT 0 -#define CDCR_PERIPH_CLK_DVFS_PODF_MASK 0x00000003 -#define CCMC_CTOR 0x0050 -#define CCMC_CLPCR 0x0054 -#define CCMC_CISR 0x0058 -#define CCMC_CIMR 0x005c -#define CCMC_CCOSR 0x0060 -#define CCMC_CGPR 0x0064 -#define CCMC_CCGR(n) (0x0068 + (n) * 4) -#define CCMC_CMEOR 0x0084 - -#define CCMC_SIZE 0x88 - -/* CCGR Clock Gate Register */ - -#define CCMR_CCGR_NSOURCE 16 -#define CCMR_CCGR_NGROUPS 7 -#define CCMR_CCGR_MODULE(clk) ((clk) / CCMR_CCGR_NSOURCE) -#define __CCGR_NUM(a, b) ((a) * 16 + (b)) - -#define CCGR_ARM_BUS_CLK __CCGR_NUM(0, 0) -#define CCGR_ARM_AXI_CLK __CCGR_NUM(0, 1) -#define CCGR_ARM_DEBUG_CLK __CCGR_NUM(0, 2) -#define CCGR_TZIC_CLK __CCGR_NUM(0, 3) -#define CCGR_DAP_CLK __CCGR_NUM(0, 4) -#define CCGR_TPIU_CLK __CCGR_NUM(0, 5) -#define CCGR_CTI2_CLK __CCGR_NUM(0, 6) -#define CCGR_CTI3_CLK __CCGR_NUM(0, 7) -#define CCGR_AHBMUX1_CLK __CCGR_NUM(0, 8) -#define CCGR_AHBMUX2_CLK __CCGR_NUM(0, 9) -#define CCGR_ROMCP_CLK __CCGR_NUM(0, 10) -#define CCGR_ROM_CLK __CCGR_NUM(0, 11) -#define CCGR_AIPS_TZ1_CLK __CCGR_NUM(0, 12) -#define CCGR_AIPS_TZ2_CLK __CCGR_NUM(0, 13) -#define CCGR_AHB_MAX_CLK __CCGR_NUM(0, 14) -#define CCGR_IIM_CLK __CCGR_NUM(0, 15) -#define CCGR_TMAX1_CLK __CCGR_NUM(1, 0) -#define CCGR_TMAX2_CLK __CCGR_NUM(1, 1) -#define CCGR_TMAX3_CLK __CCGR_NUM(1, 2) -#define CCGR_UART1_CLK __CCGR_NUM(1, 3) -#define CCGR_UART1_SERIAL_CLK __CCGR_NUM(1, 4) -#define CCGR_UART2_CLK __CCGR_NUM(1, 5) -#define CCGR_UART2_SERIAL_CLK __CCGR_NUM(1, 6) -#define CCGR_UART3_CLK __CCGR_NUM(1, 7) -#define CCGR_UART3_SERIAL_CLK __CCGR_NUM(1, 8) -#define CCGR_I2C1_SERIAL_CLK __CCGR_NUM(1, 9) -#define CCGR_I2C2_SERIAL_CLK __CCGR_NUM(1, 10) -#define CCGR_HSI2C_CLK __CCGR_NUM(1, 11) -#define CCGR_HSI2C_SERIAL_CLK __CCGR_NUM(1, 12) -#define CCGR_FIRI_CLK __CCGR_NUM(1, 13) -#define CCGR_FIRI_SERIAL_CLK __CCGR_NUM(1, 14) -#define CCGR_SCC_CLK __CCGR_NUM(1, 15) - -#define CCGR_USB_PHY_CLK __CCGR_NUM(2, 0) -#define CCGR_EPIT1_CLK __CCGR_NUM(2, 1) -#define CCGR_EPIT1_SERIAL_CLK __CCGR_NUM(2, 2) -#define CCGR_EPIT2_CLK __CCGR_NUM(2, 3) -#define CCGR_EPIT2_SERIAL_CLK __CCGR_NUM(2, 4) -#define CCGR_PWM1_CLK __CCGR_NUM(2, 5) -#define CCGR_PWM1_SERIAL_CLK __CCGR_NUM(2, 6) -#define CCGR_PWM2_CLK __CCGR_NUM(2, 7) -#define CCGR_PWM2_SERIAL_CLK __CCGR_NUM(2, 8) -#define CCGR_GPT_CLK __CCGR_NUM(2, 9) -#define CCGR_GPT_SERIAL_CLK __CCGR_NUM(2, 10) -#define CCGR_OWIRE_CLK __CCGR_NUM(2, 11) -#define CCGR_FEC_CLK __CCGR_NUM(2, 12) -#define CCGR_USBOH3_IPG_AHB_CLK __CCGR_NUM(2, 13) -#define CCGR_USBOH3_60M_CLK __CCGR_NUM(2, 14) -#define CCGR_TVE_CLK __CCGR_NUM(2, 15) - -#define CCGR_ESDHC1_CLK __CCGR_NUM(3, 0) *** 3789 LINES SKIPPED *** From nobody Fri Oct 27 04:04:28 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SGpvc6JFjz4xhYX; Fri, 27 Oct 2023 04:04:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SGpvc5gfhz4chc; Fri, 27 Oct 2023 04:04:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698379468; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HAKTogqzwlFztZsNK75yLw9JTrMJJbOlmbO0XXwcnG8=; b=nouxUgjqCS2DBCAlgKZZTWbEBVQ6aYTegGqNnRrxbMqxMa9KAA70dqBQ6+MoMpJsK9ajqk IqmSVvZYXQNRyyN7+qV5Nn0vtli5qAYt97n+ttQ5TC8Avxc6pgEAFw7lnOp5X+qZ9G9bT1 lC1jjXlbItwSpTyf3IKbxeDi0/0bGk5oLzpjosbe79jMgirnCp/CgARxZOFPE4l1aoGPId Sz2bnzRzV0Iskj26lICM5O9+KMRzxekoa+iZRpcac88bFiEczjL1OwBXyVuFnIfIQWoKb6 8dTrZU+diNWWsDwTeiIKsOWqNjssIQ1MYqwCkVH4PfZ4d9JS174+fsT1jupCkw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698379468; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HAKTogqzwlFztZsNK75yLw9JTrMJJbOlmbO0XXwcnG8=; b=VQONr258j8UZcE0wWPXLz9bPDQzdsxZJTAPtbcVndrtjq8cJosUhaSev5TDd3Q2pRU/oIT KKGM5QFrMSzubnkLNG0Q5sY1BGqSG6GS1a7h+KqV9sqg9xePX7iuhGiF6l03XVtOpSTtJg rUVibf/F/IpCokXT9mBpWNmSV/jFv/AdKOSYCGEi9XT+3zkfzEApZWilltUJZ/x9jE8vQe Ncu3SMT8mH9VjFUYkF22WWlZFfwr4D853JbupeIABP31f71neIEos0eT846WgHeLmpjhNQ aCZ1DhQOsQ4x/ruD+Ws+LLxaeOR0pAUC/nULT4xDpHBEaiPiZCZH2zTTFahTeg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698379468; a=rsa-sha256; cv=none; b=p4czWoMO5ZJ+gCtJ0gxTnunzLBydBZtUAI8oYTNiOj/T0Utme+CT7bdwDFYnlkYGRUmvKd ILubFS2DFJTx7bYBdCvitrZFtRlpVDBFj4FjI4qfal01t5JNiYca5FmFluM+SZt7JYnzxX 25KreJHyf+MD+SGNS/+1lV/mzKhtPfXLTOaTD4AVs+Grc1+koLP8TwBLoOJSprffRWPNE2 QTvNXE1qmTe8IUJtb6vHK5k3RlavmoCKzHp/I6ysHXdUi5Ah7nyHJVsdOPXvx8ITKH1GOO n1zm1DTZj3A9OeJY3rw1a8Ls9KYoHeY4aLAhmT18SrC+9p4ELVayNAxSp+IHsA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SGpvc4kFqzyVx; Fri, 27 Oct 2023 04:04:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39R44SNe040653; Fri, 27 Oct 2023 04:04:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39R44S7e040651; Fri, 27 Oct 2023 04:04:28 GMT (envelope-from git) Date: Fri, 27 Oct 2023 04:04:28 GMT Message-Id: <202310270404.39R44S7e040651@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: 98d2608a2a68 - main - efibootmgr: support '-b bootXXXX' as an alias for '-b XXXX' List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 98d2608a2a686a300fdaeb45e666ff1661244260 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=98d2608a2a686a300fdaeb45e666ff1661244260 commit 98d2608a2a686a300fdaeb45e666ff1661244260 Author: Warner Losh AuthorDate: 2022-05-17 16:47:03 +0000 Commit: Warner Losh CommitDate: 2023-10-27 04:01:16 +0000 efibootmgr: support '-b bootXXXX' as an alias for '-b XXXX' Sponsored by: Netflix --- usr.sbin/efibootmgr/efibootmgr.8 | 7 ++++++- usr.sbin/efibootmgr/efibootmgr.c | 6 +++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/usr.sbin/efibootmgr/efibootmgr.8 b/usr.sbin/efibootmgr/efibootmgr.8 index fc8da06719c5..5805b797ff5c 100644 --- a/usr.sbin/efibootmgr/efibootmgr.8 +++ b/usr.sbin/efibootmgr/efibootmgr.8 @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd February 15, 2023 +.Dd October 26, 2023 .Dt EFIBOOTMGR 8 .Os .Sh NAME @@ -115,6 +115,11 @@ When creating or modifying an entry, use .Ar bootnum as the index. When creating a new entry, fail if it already exists. +For convenience, if +.Ar bootnum +is prefixed with +.Dq boot , +that prefix is ignored. .It Fl B -delete Delete the given .Ar bootnum diff --git a/usr.sbin/efibootmgr/efibootmgr.c b/usr.sbin/efibootmgr/efibootmgr.c index 8dcf9876486d..ce7265857391 100644 --- a/usr.sbin/efibootmgr/efibootmgr.c +++ b/usr.sbin/efibootmgr/efibootmgr.c @@ -202,6 +202,7 @@ static void parse_args(int argc, char *argv[]) { int ch; + const char *arg; while ((ch = getopt_long(argc, argv, "AaBb:C:cdDe:EFfhk:L:l:NnOo:pTt:v", lopts, NULL)) != -1) { @@ -214,7 +215,10 @@ parse_args(int argc, char *argv[]) break; case 'b': opts.has_bootnum = true; - opts.bootnum = strtoul(optarg, NULL, 16); + arg = optarg; + if (strncasecmp(arg, "boot", 4) == 0) + arg += 4; + opts.bootnum = strtoul(arg, NULL, 16); break; case 'B': opts.delete = true; From nobody Fri Oct 27 04:04:29 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SGpvf0S9gz4xhkD; Fri, 27 Oct 2023 04:04:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SGpvd6tMbz4cj6; Fri, 27 Oct 2023 04:04:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698379470; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PKBjE4br09KvKPztyJ97/zB9FZKuDZlD6yqCmC8WmFY=; b=OI+fb2wgEVn8dA5YhBIErxbr5OQeuIAFFOCinokm8qIRgSckvGM+jqbPe3tYbqfUkXGy0V I8fgs8f02hEJwFKLv+v+Rg3El+Bupr3zVWiORK3F2YCchoJfndgHWeWH8uuulHY/e1PEjx Dvc7OPAJpymho3mrequU8sMeS/1gvp5fI/OGFUezPBhge5pNJUEf2bGgmfda0203s+9aUq ev4ZHBmT0yJ8N4Ox/VCVxmWuNERSxKyf6dn8ANAnyUpvlMiBRSZDLCCxokc9lpNpRzEewO QrzbtJbJQBTOQsjLK/RFQnUcWUYZLtkXZjltoycVErC4q5S2JW0njE4jisOocA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698379470; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PKBjE4br09KvKPztyJ97/zB9FZKuDZlD6yqCmC8WmFY=; b=A3UMN6F/HrJ+jYJTlox3e+T4ha8aI5vJKXxGhrkyI1xWIFUl2BE3lCj4AWvKVP8Ayj7a4K AWXJcVgc0663N7MbtIG4TZJ0510o38xBYIt15ZpJLBAdMBXhe5/BHACi3eAZbgbItlrIIu SU39Ym9FdaIJHxM0mjBjrEPMW4ozvjvDtmFLXI9pTKHquWKeGjVDl97jvi3C58alebLIYX 1ynloD31/rI7A2jVmSvSB28MnipajMM0NDALYjqg7UpkbMX/V5pkA4HZpEuieYt3fbbvod SCcI/NG2BIfun5XM032Kfv8BSGSHi+AiFHZs/dUhPGBLEBv5usveo3H2V3N7rQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698379470; a=rsa-sha256; cv=none; b=OlfehtMkIfwdfwsdC8Yco77e/MynNlCbF+Gham4Fy+wbhSdMKWL3El1o4BXngKKqHCySio uSCO1tgydMYDXCSWEV2euRBjglOsvGb0DifmZfLDEcph8nUIevEmna6k5Ry/puyNR04dQp 3V++HUSMe7qcp18oeXkDLjgF1ITrjQ5ojhPVxJ+SY4gDMJRG01Lrnh4+/e8UOXOLqXVQ46 7oC6BFUCk1xLRq/2AKB51BZOgnpO9gEfWu3qGrr1tgUCG1TR0BFZ4pDud0G0+VkZeeUjL3 GqcnO+oc2JEb3szOFSpOklx8NAigOKUXEF6n93c8TXhhsrfHCJWkhZ/SavhcSg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SGpvd5gkXzygY; Fri, 27 Oct 2023 04:04:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39R44T5g040693; Fri, 27 Oct 2023 04:04:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39R44TQx040690; Fri, 27 Oct 2023 04:04:29 GMT (envelope-from git) Date: Fri, 27 Oct 2023 04:04:29 GMT Message-Id: <202310270404.39R44TQx040690@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: 731f91c0770b - main - efibootmgr: -C isn't implemented List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 731f91c0770be0d6666f483449878b60e5319924 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=731f91c0770be0d6666f483449878b60e5319924 commit 731f91c0770be0d6666f483449878b60e5319924 Author: Warner Losh AuthorDate: 2022-05-17 16:47:50 +0000 Commit: Warner Losh CommitDate: 2023-10-27 04:01:16 +0000 efibootmgr: -C isn't implemented -C isn't implemented, so just errx out until it is. It's not listed in the man page, but is parsed for compatibility with the Linux efibootmgr(8) command. Sponsored by: Netflix --- usr.sbin/efibootmgr/efibootmgr.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/usr.sbin/efibootmgr/efibootmgr.c b/usr.sbin/efibootmgr/efibootmgr.c index ce7265857391..65ab247fb271 100644 --- a/usr.sbin/efibootmgr/efibootmgr.c +++ b/usr.sbin/efibootmgr/efibootmgr.c @@ -226,6 +226,8 @@ parse_args(int argc, char *argv[]) case 'C': opts.copy = true; opts.cp_src = strtoul(optarg, NULL, 16); + errx(1, "Copy not implemented"); + break; case 'c': opts.create = true; break; From nobody Fri Oct 27 04:20:09 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SGqFj2Ndkz4xjQQ; Fri, 27 Oct 2023 04:20: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 4SGqFj1t4Sz4dl4; Fri, 27 Oct 2023 04:20:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698380409; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=h4GBgaNmmisCbuCwdIG9/4edsWlUxBAck3p1xPVknqY=; b=RJie8LE74UctB1qpou3pHNKbnAlmAb+SVc2kTzPTu9N9IOqeElz03SqOSjFtRcw9o5HeCE Nb4BGwIBnXhHcFNhxdWPnr4MuNvb5aJaO0uaF/HTcAQPODFtvmFXI0kE8pRmkRAuE8mDCS aCIBwxKJVze/NdrnbQo9cXq3qfmS5aP2RSncTK/5zz9fVO18fFWNcaY87Gcs6YeAF9MaGI wwtnAV67YsIohw2LgWPv9bgZK6W8Qp+3OXDWaeHJfuZ9hRRtLbLDqe7x3OBPHndMmRLcxS /Glnlm7YHh9TUrvR8WNU000tbA7tn7Ma9f2efoGMU0wIcYF6wn5V27Tbualm7w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698380409; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=h4GBgaNmmisCbuCwdIG9/4edsWlUxBAck3p1xPVknqY=; b=ZxYlqjvngKy4NFMGfhShEmkeOHl5yAvxH4sVznqxnTg3mWxw20/3Kit92I06dZsZow+iJG QlC4+ohB2TV/a5CU5KVBXG5NEnRGy2++cDeXVA6AlXiKs20/mtMMczxS9yAUmjPGPCeXRR arXWZmJtokNwqsgVA1eVE7xMq+texky5j2unP8/hyav3H3Lktiww2vDVTUg6RVEAUsN1dR GtKzs1WXI+aQ/h6VhgZmG9z7THd4wpGYeXoUuLkxcOJVZPDGYKqa5oh6f24Z/ZeTTb5pk+ lO0MDp7uFA2KjbgJR/0JtXoFFpKTQsO27fV3jxdsrW2eMDSDNikhzMZyJGOtOg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698380409; a=rsa-sha256; cv=none; b=YvQyUgIBCYbSN2XvBshEb9Rynf7KWiEdYK2Yx6UJoD4MxVPSDFyEvuXMaLJ2DTtromyaCe XGLT26Sb2Vg4NO2Zzz9JIGdIfHahrt+oWN4kW52qFg1xifMsf9NJCFbVmu/RckoZ6M/4dh dPDlmEfQYG8I7mZt6uDuT97WoKxe3wI4PUJUXzbrbrCMvGUhAUxOYOAL7TAQycV0RU5rQW OC1dKr2NH4HawzZzeVL0IlUdRCllpMdiXmhknUa6BvxJCbgKomfrDM93RH4jVlhl4I08Mr HHBANneqf4E4E4sLsvVofHRYwHZTWn7YLXnuMQ+pcasysqImA0rdqQnvOYI6AA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SGqFj0wnxzyh6; Fri, 27 Oct 2023 04:20: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 39R4K968061250; Fri, 27 Oct 2023 04:20:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39R4K9Xw061244; Fri, 27 Oct 2023 04:20:09 GMT (envelope-from git) Date: Fri, 27 Oct 2023 04:20:09 GMT Message-Id: <202310270420.39R4K9Xw061244@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: cb0259b6dfba - main - UPDATING: Document branch creation List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: cb0259b6dfbacf437442856024fff48e44e94b96 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=cb0259b6dfbacf437442856024fff48e44e94b96 commit cb0259b6dfbacf437442856024fff48e44e94b96 Author: Warner Losh AuthorDate: 2023-10-27 04:14:23 +0000 Commit: Warner Losh CommitDate: 2023-10-27 04:14:23 +0000 UPDATING: Document branch creation Document when stable/12, stable/13 and stable/14 were created. Once we release 14.0, I'll trim the stable/11 branchpoint through stable/12 brnachpoint. Documenting all of these will make it easier in the future. Sponsored by: Netflix --- UPDATING | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/UPDATING b/UPDATING index 9334ebf0dd5e..722d7d66acbe 100644 --- a/UPDATING +++ b/UPDATING @@ -109,6 +109,9 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 15.x IS SLOW: for out of tree changes. The SIMs were not updated since most of the old u_intXX_t uses weren't due to CAM interfaces. +20230713: + stable/14 branch created. + 20230629: The heuristic for detecting old chromebooks with an EC bug that requires atkbdc driver workarounds has changed. There should be no functional @@ -486,6 +489,9 @@ https://lists.freebsd.org/archives/freebsd-current/2021-June/000153.html Please update your drm-kmod port to after the __FreeBSD_version 1400003 update. +20210121: + stable/13 branch created. + 20210108: PC Card attachments for all devices have been removed. In the case of wi and cmx, the entire drivers were removed because they were only @@ -1021,6 +1027,9 @@ https://lists.freebsd.org/archives/freebsd-current/2021-June/000153.html being included using the command: $ newsyslog -Nrv +20181019: + Stable/12 was branched created. + 20181015: Ports for the DRM modules have been simplified. Now, amd64 users should just install the drm-kmod port. All others should install From nobody Fri Oct 27 08:35:17 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SGww56ylcz4xyQF; Fri, 27 Oct 2023 08:35: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 4SGww56Mn0z3TZh; Fri, 27 Oct 2023 08:35:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698395717; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EXrfmuRVBUJ3JAPIT9la4X9cyqtoM5N1dXftHja3uVQ=; b=I2L6wpTmbAQvqrx9xNQ6QgKRSbAqA6hh4+wsOTZiebsK6MffIyHkWiKXjhqzwRNrR5ehP8 Bgj43TISgG2KQZa36LurgkjA3Y+w7QNCE/Av4Rhcx3/GCCCCFWAJCbH68HoeKln6QQlKwq nQmiGeI0jtjY+8zgRgPKjReVMLWrMYxtv3FN26W4aX18i0pPcSUeE8LKahsIWwG965z8mW ONv5Lhh+xoBPVhNplNps3cMhj5cd8Q2BofV+EvoPiwVWqRbWYJGOqjw08qB5cW2FFIxnfa 1np0e+vY9zmcemDbcw1HQK5xveaSUJzdpR9jVhBUaTNrSMhyYRKiX3zK1sE4Tw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698395717; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EXrfmuRVBUJ3JAPIT9la4X9cyqtoM5N1dXftHja3uVQ=; b=wsYrkDh8wSHH7wJh5gZR3V7pzfoL4jRMd/LM8Yt/FAZ/LiwWsUFK6lTC4tI4FH1e8SElj+ o3ModT1Ytp13IXxX8KOuv0pgXww4A0a1f1AW6Cz3K3Uod3MnOyH1r7idLI5lSjF/20sUbc 9oLXrPjwKa6zxQimum2/7mDkmPaHoKuxTS69YgiWxmbhCrT2/HdgfB7wIDKmmZr4CcisNh kPXZ+wgK7zGZdphjFS7HgrUKUfBM0yPqNbOQOc2tpGYr9LrMzq0ToETMGrChyRxybrTdVE D5M0BACnDeLZmi4tiriG3POOAfS2FoS1jiKDa05Yv3dJXbqGzm9p0q32vDuX6A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698395717; a=rsa-sha256; cv=none; b=avd+1R7Ge7tpBo2dghmMrjXIzgwZd6P4SLu0kjHg9zttIg/3R0g9jG+d922a0j2t5ZfEQh 6Hc5mdt/ta/8f8npmiLklmeb5+TUWnEbUdWWMyEofV9Vnj1Wdq/qwk5xgRb3GTAzVVSNZi 9fMFk6vaLJscdPQ4suVEusSPO+UyNxcPXMWJ/I5RJqus0u1cBEci8YIsw2fcQ6qE+uyxuO 2gbd1FF22O8vSziJ7/h6pq41O69wmFZTv/P6saFhwEUXHJaRGYPphDhhUJcSCmciuUsGSa fXXQ8nc3mZmBXIbnNxY+voxeYpxDGZM5DSD2ESujNnJkZIctKc5m30501GD4cA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SGww55PvRz168D; Fri, 27 Oct 2023 08:35: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 39R8ZH0q091902; Fri, 27 Oct 2023 08:35:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39R8ZH40091899; Fri, 27 Oct 2023 08:35:17 GMT (envelope-from git) Date: Fri, 27 Oct 2023 08:35:17 GMT Message-Id: <202310270835.39R8ZH40091899@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kristof Provost Subject: git: 4671836d7ba3 - stable/14 - pfctl: fix incorrect mask on dynamic address List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 4671836d7ba30db56bc3efbfe64859e314aae7d9 Auto-Submitted: auto-generated The branch stable/14 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=4671836d7ba30db56bc3efbfe64859e314aae7d9 commit 4671836d7ba30db56bc3efbfe64859e314aae7d9 Author: Kristof Provost AuthorDate: 2023-10-06 12:20:17 +0000 Commit: Kristof Provost CommitDate: 2023-10-27 07:45:55 +0000 pfctl: fix incorrect mask on dynamic address A PF rule using an IPv4 address followed by an IPv6 address and then a dynamic address, e.g. "pass from {192.0.2.1 2001:db8::1} to (pppoe0)", will have an incorrect /32 mask applied to the dynamic address. MFC after: 3 weeks Obtained from: OpenBSD See also: https://ftp.openbsd.org/pub/OpenBSD/patches/5.6/common/007_pfctl.patch.sig Sponsored by: Rubicon Communications, LLC ("Netgate") Event: Oslo Hackathon at Modirum (cherry picked from commit 7ce98cf2f87a22240b66e4c38fd887431a25bf7d) --- sbin/pfctl/parse.y | 39 +++++++++++++++++++++++++++++++++++- sbin/pfctl/pfctl_parser.c | 30 ++++++++++++++++++++++----- sbin/pfctl/pfctl_parser.h | 1 + sbin/pfctl/tests/files/pf0102.ok | 4 ++-- sbin/pfctl/tests/files/pf1018.in | 1 + sbin/pfctl/tests/files/pf1018.ok | 2 ++ sbin/pfctl/tests/pfctl_test_list.inc | 1 + 7 files changed, 70 insertions(+), 8 deletions(-) diff --git a/sbin/pfctl/parse.y b/sbin/pfctl/parse.y index 041dcb0587b3..17227b674814 100644 --- a/sbin/pfctl/parse.y +++ b/sbin/pfctl/parse.y @@ -4720,6 +4720,10 @@ natrule : nataction interface af proto fromto tag tagged rtable remove_invalid_hosts(&$9->host, &r.af); if (invalid_redirect($9->host, r.af)) YYERROR; + if ($9->host->addr.type == PF_ADDR_DYNIFTL) { + if (($9->host = gen_dynnode($9->host, r.af)) == NULL) + err(1, "calloc"); + } if (check_netmask($9->host, r.af)) YYERROR; @@ -4936,6 +4940,10 @@ binatrule : no BINAT natpasslog interface af proto FROM ipspec toipspec tag yyerror("binat ip versions must match"); YYERROR; } + if ($8->addr.type == PF_ADDR_DYNIFTL) { + if (($8 = gen_dynnode($8, binat.af)) == NULL) + err(1, "calloc"); + } if (check_netmask($8, binat.af)) YYERROR; memcpy(&binat.src.addr, &$8->addr, @@ -4951,6 +4959,10 @@ binatrule : no BINAT natpasslog interface af proto FROM ipspec toipspec tag yyerror("binat ip versions must match"); YYERROR; } + if ($9->addr.type == PF_ADDR_DYNIFTL) { + if (($9 = gen_dynnode($9, binat.af)) == NULL) + err(1, "calloc"); + } if (check_netmask($9, binat.af)) YYERROR; memcpy(&binat.dst.addr, &$9->addr, @@ -4980,6 +4992,10 @@ binatrule : no BINAT natpasslog interface af proto FROM ipspec toipspec tag "a single address"); YYERROR; } + if ($13->host->addr.type == PF_ADDR_DYNIFTL) { + if (($13->host = gen_dynnode($13->host, binat.af)) == NULL) + err(1, "calloc"); + } if (check_netmask($13->host, binat.af)) YYERROR; @@ -5982,7 +5998,7 @@ expand_rule(struct pfctl_rule *r, char tagname[PF_TAG_NAME_SIZE]; char match_tagname[PF_TAG_NAME_SIZE]; struct pf_pooladdr *pa; - struct node_host *h; + struct node_host *h, *osrch, *odsth; u_int8_t flags, flagset, keep_state; memcpy(label, r->label, sizeof(r->label)); @@ -6043,6 +6059,18 @@ expand_rule(struct pfctl_rule *r, sizeof(r->match_tagname)) >= sizeof(r->match_tagname)) errx(1, "expand_rule: strlcpy"); + osrch = odsth = NULL; + if (src_host->addr.type == PF_ADDR_DYNIFTL) { + osrch = src_host; + if ((src_host = gen_dynnode(src_host, r->af)) == NULL) + err(1, "expand_rule: calloc"); + } + if (dst_host->addr.type == PF_ADDR_DYNIFTL) { + odsth = dst_host; + if ((dst_host = gen_dynnode(dst_host, r->af)) == NULL) + err(1, "expand_rule: calloc"); + } + error += check_netmask(src_host, r->af); error += check_netmask(dst_host, r->af); @@ -6121,6 +6149,15 @@ expand_rule(struct pfctl_rule *r, added++; } + if (osrch && src_host->addr.type == PF_ADDR_DYNIFTL) { + free(src_host); + src_host = osrch; + } + if (odsth && dst_host->addr.type == PF_ADDR_DYNIFTL) { + free(dst_host); + dst_host = odsth; + } + )))))))))); FREE_LIST(struct node_if, interfaces); diff --git a/sbin/pfctl/pfctl_parser.c b/sbin/pfctl/pfctl_parser.c index 936c5ec53759..925848055bba 100644 --- a/sbin/pfctl/pfctl_parser.c +++ b/sbin/pfctl/pfctl_parser.c @@ -1306,16 +1306,12 @@ int check_netmask(struct node_host *h, sa_family_t af) { struct node_host *n = NULL; - struct pf_addr *m; + struct pf_addr *m; for (n = h; n != NULL; n = n->next) { if (h->addr.type == PF_ADDR_TABLE) continue; m = &h->addr.v.a.mask; - /* fix up netmask for dynaddr */ - if (af == AF_INET && h->addr.type == PF_ADDR_DYNIFTL && - unmask(m, AF_INET6) > 32) - set_ipmask(n, 32); /* netmasks > 32 bit are invalid on v4 */ if (af == AF_INET && (m->addr32[1] || m->addr32[2] || m->addr32[3])) { @@ -1327,6 +1323,30 @@ check_netmask(struct node_host *h, sa_family_t af) return (0); } +struct node_host * +gen_dynnode(struct node_host *h, sa_family_t af) +{ + struct node_host *n; + struct pf_addr *m; + + if (h->addr.type != PF_ADDR_DYNIFTL) + return (NULL); + + if ((n = calloc(1, sizeof(*n))) == NULL) + return (NULL); + bcopy(h, n, sizeof(*n)); + n->ifname = NULL; + n->next = NULL; + n->tail = NULL; + + /* fix up netmask */ + m = &n->addr.v.a.mask; + if (af == AF_INET && unmask(m, AF_INET6) > 32) + set_ipmask(n, 32); + + return (n); +} + /* interface lookup routines */ static struct node_host *iftab; diff --git a/sbin/pfctl/pfctl_parser.h b/sbin/pfctl/pfctl_parser.h index 83a4880106a8..d0f3bc3c303c 100644 --- a/sbin/pfctl/pfctl_parser.h +++ b/sbin/pfctl/pfctl_parser.h @@ -360,6 +360,7 @@ extern const struct pf_timeout pf_timeouts[]; void set_ipmask(struct node_host *, u_int8_t); int check_netmask(struct node_host *, sa_family_t); int unmask(struct pf_addr *, sa_family_t); +struct node_host *gen_dynnode(struct node_host *, sa_family_t); void ifa_load(void); int get_query_socket(void); struct node_host *ifa_exists(char *); diff --git a/sbin/pfctl/tests/files/pf0102.ok b/sbin/pfctl/tests/files/pf0102.ok index 3233ca5a2643..1c76ec2725ba 100644 --- a/sbin/pfctl/tests/files/pf0102.ok +++ b/sbin/pfctl/tests/files/pf0102.ok @@ -1,8 +1,8 @@ pass inet from 1.1.1.1 to (self) flags S/SA keep state -pass inet6 from 2002:: to (self)/32 flags S/SA keep state +pass inet6 from 2002:: to (self) flags S/SA keep state pass inet6 from 2002:: to (self) flags S/SA keep state pass inet from 1.1.1.1 to (self) flags S/SA keep state pass inet from 1.1.1.1 to (self) flags S/SA keep state -pass inet6 from 2002:: to (self)/32 flags S/SA keep state +pass inet6 from 2002:: to (self)/40 flags S/SA keep state pass inet6 from 2002:: to (self)/40 flags S/SA keep state pass inet from 1.1.1.1 to (self) flags S/SA keep state diff --git a/sbin/pfctl/tests/files/pf1018.in b/sbin/pfctl/tests/files/pf1018.in new file mode 100644 index 000000000000..90f0a3a0bab7 --- /dev/null +++ b/sbin/pfctl/tests/files/pf1018.in @@ -0,0 +1 @@ +pass from { 192.0.2.1 2001:db8::1 } to (pppoe0) diff --git a/sbin/pfctl/tests/files/pf1018.ok b/sbin/pfctl/tests/files/pf1018.ok new file mode 100644 index 000000000000..04950f0035b8 --- /dev/null +++ b/sbin/pfctl/tests/files/pf1018.ok @@ -0,0 +1,2 @@ +pass inet from 192.0.2.1 to (pppoe0) flags S/SA keep state +pass inet6 from 2001:db8::1 to (pppoe0) flags S/SA keep state diff --git a/sbin/pfctl/tests/pfctl_test_list.inc b/sbin/pfctl/tests/pfctl_test_list.inc index 98ea3257d492..4a63c0ba48b7 100644 --- a/sbin/pfctl/tests/pfctl_test_list.inc +++ b/sbin/pfctl/tests/pfctl_test_list.inc @@ -126,3 +126,4 @@ PFCTL_TEST(1014, "Ethernet rule with one label") PFCTL_TEST(1015, "Ethernet rule with several labels") PFCTL_TEST(1016, "Ethernet rule with ridentifier and one label") PFCTL_TEST(1017, "Ethernet rule with ridentifier and several labels") +PFCTL_TEST(1018, "Test dynamic address mask") From nobody Fri Oct 27 08:35:18 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SGww71FTdz4xyQH; Fri, 27 Oct 2023 08:35: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 4SGww70Mzdz3TgF; Fri, 27 Oct 2023 08:35:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698395719; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IhNpg+rcvH4YpzGSnDN3i8h/rjjZFctoBSS9OjJbVck=; b=QZNTqjl6RsD1vaxo4Sf8LSKTtANZzV3bY7t8NNzqEouciOE1EwNKHvDIvnoELdw7Q4uNSX QBVE4L/xKQfNr/70cMpiOzU8QtGYeRk4m0dM3fD1nR/aZNQT/5GRbb9ALuU9dflDQZFKqh qlaT8T0G2Yz6bnSSOmf8W1GyMUEL5M96zU4n3KlGfvK2w/0NxvOhb2eHz8owwcK2FJ1mIv jD3IxeK4TBO62TGY+tYLAkbAiNp92W9h5fWLiXr+U8Dx/ecUJidw7wMpE3aeFxteHBriQM PxjlF0BPAAq+SPIPm27a1Z08dbDsf1qRQvLVPxwFAYlzGrhyxx6A36l9tF5msQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698395719; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IhNpg+rcvH4YpzGSnDN3i8h/rjjZFctoBSS9OjJbVck=; b=YX4ZudfEYTBfV902LWmHcCXHjcj7aCac+ZXeQSbugOtTuLRI3JfieoK3JpOZGU57y9g5Vz 1GV6yzuUz3g2OXsRWlSM8HtbeRzPvi5R2MfNjAPMDXXo0DVP0ECm+WMtX44aTqPhsxu5kN WzVsCvhxRpPTaps2LyrQQ+gaFmzLaZjIbhMYekVP7S4ZSCYaNd0SE7MGtnGE94GX1Cc3Fm q6ESb96tfRcskS/ikWlRpIiV4RX6E5en+hh8t4FNZgDUBmtTQVzsx6/OvJF4Zj8kO+kv+a eAHZtNOVsN+3r5/OCY0rRR9AxP7qpfrOTQJxY2eM8gagj4F7TDnGuRy6mpX0mQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698395719; a=rsa-sha256; cv=none; b=wXx32invXlWnG224J2Umto0iVtprvYwUNm5N7NO/yD8NNZjiKDDCIFh5TBjkh7bq7Ivrn1 5iYh6IoRTnBU1pPnxJIFHng+k7kHGeoQfaty5P5aJnoDx0LO0iBESQwyiDC8qDrb6KuNJG 6K1L5l7lrbk1+9IunGE+Rn4Mp3G/u+ydb2bW+whNwHPomZKcOLQEOKsY+tpap1S/3JYP3Z jghwtT7cZJHNSttbWfWz/wDFLpQfNeyuIpi9Ix9/NVtS8ZSRzGID6EkO1X9XjSYKmO9P+O MMtQsXTLBKXlHrTlpUzTlZ6Udj41DKF/hlIlrWtucAS3na/l1TYR9IXJzw6Ctg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SGww6666sz168F; Fri, 27 Oct 2023 08:35: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 39R8ZIZV092041; Fri, 27 Oct 2023 08:35:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39R8ZII4092038; Fri, 27 Oct 2023 08:35:18 GMT (envelope-from git) Date: Fri, 27 Oct 2023 08:35:18 GMT Message-Id: <202310270835.39R8ZII4092038@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kristof Provost Subject: git: dfaadbb4661d - stable/13 - pfctl: fix incorrect mask on dynamic address List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: dfaadbb4661de6d1a410205bf1e6653ca24f7610 Auto-Submitted: auto-generated The branch stable/13 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=dfaadbb4661de6d1a410205bf1e6653ca24f7610 commit dfaadbb4661de6d1a410205bf1e6653ca24f7610 Author: Kristof Provost AuthorDate: 2023-10-06 12:20:17 +0000 Commit: Kristof Provost CommitDate: 2023-10-27 07:46:19 +0000 pfctl: fix incorrect mask on dynamic address A PF rule using an IPv4 address followed by an IPv6 address and then a dynamic address, e.g. "pass from {192.0.2.1 2001:db8::1} to (pppoe0)", will have an incorrect /32 mask applied to the dynamic address. MFC after: 3 weeks Obtained from: OpenBSD See also: https://ftp.openbsd.org/pub/OpenBSD/patches/5.6/common/007_pfctl.patch.sig Sponsored by: Rubicon Communications, LLC ("Netgate") Event: Oslo Hackathon at Modirum (cherry picked from commit 7ce98cf2f87a22240b66e4c38fd887431a25bf7d) --- sbin/pfctl/parse.y | 39 +++++++++++++++++++++++++++++++++++- sbin/pfctl/pfctl_parser.c | 30 ++++++++++++++++++++++----- sbin/pfctl/pfctl_parser.h | 1 + sbin/pfctl/tests/files/pf0102.ok | 4 ++-- sbin/pfctl/tests/files/pf1018.in | 1 + sbin/pfctl/tests/files/pf1018.ok | 2 ++ sbin/pfctl/tests/pfctl_test_list.inc | 1 + 7 files changed, 70 insertions(+), 8 deletions(-) diff --git a/sbin/pfctl/parse.y b/sbin/pfctl/parse.y index e0b9cdc1ee1f..6313e6dfcd15 100644 --- a/sbin/pfctl/parse.y +++ b/sbin/pfctl/parse.y @@ -4244,6 +4244,10 @@ natrule : nataction interface af proto fromto tag tagged rtable remove_invalid_hosts(&$9->host, &r.af); if (invalid_redirect($9->host, r.af)) YYERROR; + if ($9->host->addr.type == PF_ADDR_DYNIFTL) { + if (($9->host = gen_dynnode($9->host, r.af)) == NULL) + err(1, "calloc"); + } if (check_netmask($9->host, r.af)) YYERROR; @@ -4460,6 +4464,10 @@ binatrule : no BINAT natpasslog interface af proto FROM ipspec toipspec tag yyerror("binat ip versions must match"); YYERROR; } + if ($8->addr.type == PF_ADDR_DYNIFTL) { + if (($8 = gen_dynnode($8, binat.af)) == NULL) + err(1, "calloc"); + } if (check_netmask($8, binat.af)) YYERROR; memcpy(&binat.src.addr, &$8->addr, @@ -4475,6 +4483,10 @@ binatrule : no BINAT natpasslog interface af proto FROM ipspec toipspec tag yyerror("binat ip versions must match"); YYERROR; } + if ($9->addr.type == PF_ADDR_DYNIFTL) { + if (($9 = gen_dynnode($9, binat.af)) == NULL) + err(1, "calloc"); + } if (check_netmask($9, binat.af)) YYERROR; memcpy(&binat.dst.addr, &$9->addr, @@ -4504,6 +4516,10 @@ binatrule : no BINAT natpasslog interface af proto FROM ipspec toipspec tag "a single address"); YYERROR; } + if ($13->host->addr.type == PF_ADDR_DYNIFTL) { + if (($13->host = gen_dynnode($13->host, binat.af)) == NULL) + err(1, "calloc"); + } if (check_netmask($13->host, binat.af)) YYERROR; @@ -5412,7 +5428,7 @@ expand_rule(struct pfctl_rule *r, char tagname[PF_TAG_NAME_SIZE]; char match_tagname[PF_TAG_NAME_SIZE]; struct pf_pooladdr *pa; - struct node_host *h; + struct node_host *h, *osrch, *odsth; u_int8_t flags, flagset, keep_state; memcpy(label, r->label, sizeof(r->label)); @@ -5473,6 +5489,18 @@ expand_rule(struct pfctl_rule *r, sizeof(r->match_tagname)) >= sizeof(r->match_tagname)) errx(1, "expand_rule: strlcpy"); + osrch = odsth = NULL; + if (src_host->addr.type == PF_ADDR_DYNIFTL) { + osrch = src_host; + if ((src_host = gen_dynnode(src_host, r->af)) == NULL) + err(1, "expand_rule: calloc"); + } + if (dst_host->addr.type == PF_ADDR_DYNIFTL) { + odsth = dst_host; + if ((dst_host = gen_dynnode(dst_host, r->af)) == NULL) + err(1, "expand_rule: calloc"); + } + error += check_netmask(src_host, r->af); error += check_netmask(dst_host, r->af); @@ -5551,6 +5579,15 @@ expand_rule(struct pfctl_rule *r, added++; } + if (osrch && src_host->addr.type == PF_ADDR_DYNIFTL) { + free(src_host); + src_host = osrch; + } + if (odsth && dst_host->addr.type == PF_ADDR_DYNIFTL) { + free(dst_host); + dst_host = odsth; + } + )))))))))); FREE_LIST(struct node_if, interfaces); diff --git a/sbin/pfctl/pfctl_parser.c b/sbin/pfctl/pfctl_parser.c index c850056216ec..a3863cb23ac6 100644 --- a/sbin/pfctl/pfctl_parser.c +++ b/sbin/pfctl/pfctl_parser.c @@ -1146,16 +1146,12 @@ int check_netmask(struct node_host *h, sa_family_t af) { struct node_host *n = NULL; - struct pf_addr *m; + struct pf_addr *m; for (n = h; n != NULL; n = n->next) { if (h->addr.type == PF_ADDR_TABLE) continue; m = &h->addr.v.a.mask; - /* fix up netmask for dynaddr */ - if (af == AF_INET && h->addr.type == PF_ADDR_DYNIFTL && - unmask(m, AF_INET6) > 32) - set_ipmask(n, 32); /* netmasks > 32 bit are invalid on v4 */ if (af == AF_INET && (m->addr32[1] || m->addr32[2] || m->addr32[3])) { @@ -1167,6 +1163,30 @@ check_netmask(struct node_host *h, sa_family_t af) return (0); } +struct node_host * +gen_dynnode(struct node_host *h, sa_family_t af) +{ + struct node_host *n; + struct pf_addr *m; + + if (h->addr.type != PF_ADDR_DYNIFTL) + return (NULL); + + if ((n = calloc(1, sizeof(*n))) == NULL) + return (NULL); + bcopy(h, n, sizeof(*n)); + n->ifname = NULL; + n->next = NULL; + n->tail = NULL; + + /* fix up netmask */ + m = &n->addr.v.a.mask; + if (af == AF_INET && unmask(m, AF_INET6) > 32) + set_ipmask(n, 32); + + return (n); +} + /* interface lookup routines */ static struct node_host *iftab; diff --git a/sbin/pfctl/pfctl_parser.h b/sbin/pfctl/pfctl_parser.h index 06d52caf8e99..8cabf7e5bec2 100644 --- a/sbin/pfctl/pfctl_parser.h +++ b/sbin/pfctl/pfctl_parser.h @@ -340,6 +340,7 @@ extern const struct pf_timeout pf_timeouts[]; void set_ipmask(struct node_host *, u_int8_t); int check_netmask(struct node_host *, sa_family_t); int unmask(struct pf_addr *, sa_family_t); +struct node_host *gen_dynnode(struct node_host *, sa_family_t); void ifa_load(void); int get_query_socket(void); struct node_host *ifa_exists(char *); diff --git a/sbin/pfctl/tests/files/pf0102.ok b/sbin/pfctl/tests/files/pf0102.ok index 3233ca5a2643..1c76ec2725ba 100644 --- a/sbin/pfctl/tests/files/pf0102.ok +++ b/sbin/pfctl/tests/files/pf0102.ok @@ -1,8 +1,8 @@ pass inet from 1.1.1.1 to (self) flags S/SA keep state -pass inet6 from 2002:: to (self)/32 flags S/SA keep state +pass inet6 from 2002:: to (self) flags S/SA keep state pass inet6 from 2002:: to (self) flags S/SA keep state pass inet from 1.1.1.1 to (self) flags S/SA keep state pass inet from 1.1.1.1 to (self) flags S/SA keep state -pass inet6 from 2002:: to (self)/32 flags S/SA keep state +pass inet6 from 2002:: to (self)/40 flags S/SA keep state pass inet6 from 2002:: to (self)/40 flags S/SA keep state pass inet from 1.1.1.1 to (self) flags S/SA keep state diff --git a/sbin/pfctl/tests/files/pf1018.in b/sbin/pfctl/tests/files/pf1018.in new file mode 100644 index 000000000000..90f0a3a0bab7 --- /dev/null +++ b/sbin/pfctl/tests/files/pf1018.in @@ -0,0 +1 @@ +pass from { 192.0.2.1 2001:db8::1 } to (pppoe0) diff --git a/sbin/pfctl/tests/files/pf1018.ok b/sbin/pfctl/tests/files/pf1018.ok new file mode 100644 index 000000000000..04950f0035b8 --- /dev/null +++ b/sbin/pfctl/tests/files/pf1018.ok @@ -0,0 +1,2 @@ +pass inet from 192.0.2.1 to (pppoe0) flags S/SA keep state +pass inet6 from 2001:db8::1 to (pppoe0) flags S/SA keep state diff --git a/sbin/pfctl/tests/pfctl_test_list.inc b/sbin/pfctl/tests/pfctl_test_list.inc index 0def88f4d7e1..b73bcf2522b7 100644 --- a/sbin/pfctl/tests/pfctl_test_list.inc +++ b/sbin/pfctl/tests/pfctl_test_list.inc @@ -116,3 +116,4 @@ PFCTL_TEST(1004, "ALTQ with Codel") PFCTL_TEST(1005, "PR 231323") PFCTL_TEST(1006, "pfctl crashes with certain fairq configurations") PFCTL_TEST(1010, "POM_STICKYADDRESS test") +PFCTL_TEST(1018, "Test dynamic address mask") From nobody Fri Oct 27 09:43:13 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SGyQV0TJ3z4y3D4; Fri, 27 Oct 2023 09:43: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 4SGyQT702Dz3cVY; Fri, 27 Oct 2023 09:43:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698399794; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CPV658sJv7l2+S+KrZr7pjfiLGDXHJgLwle+uMQxtlw=; b=KgXRWbPrYuHe/wz1rC8pKWTHS+6a0jct2B0t9IFC+cX3vnzzznGbLZSdsBlEzY9O9tVWt8 L+nEo/rBpsFmeVPLYZ83Kk2nT63uogb4/zc/R+wFG40WpSyb2jOdHwM0eUaQw6+2bQPtrC juPd3/MFPCPRn1i65mn9UUpz+7RUmTaHTTgIUAwNif0PNzwgqm/P1oDb8CZY3tbVtQx849 yVG3TNxIUtrnjMkNh26zCkJYuWf2SLAKNauqmjRd+7WYrdm7gmp6hasgOrC0EkPcuUbnGc W3JUjnvikURGfuGsvaWqAQGv3yEse1mesP96VfPhUV7voiG4i6x6RrxanJ2IbQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698399794; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CPV658sJv7l2+S+KrZr7pjfiLGDXHJgLwle+uMQxtlw=; b=l5fmOmly1pcq/xIB4p1UBnIkvJ2Ln+9PYUawVcJyNvd/nQ+O2KnRIDMJAELxSLPmh2lX/S 0nEFVtXkDxPaKj70hSp6aco4wN05kbh/ApIrz7R7tHg8jzxqdspSsCe5DQxJA3fjoXo45o 9yQwKlKn2t5K5LJnJxW0Gh/F/OhFv437A++/bV17cTTtzckiAVC5FPilhJ5EvoArelqSZ2 P+hce0h6SrwjkjjLdwlPNdIHjYK+NNbjTtfvWoe2D7ZtRDsShsKHGyavJDXJM7FCUDRC97 uidQR+AYZNtx9kDNU1tZeslLPSM2IMrC6+7psFeMT22UBozRh2AIbY78bGHDVQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698399794; a=rsa-sha256; cv=none; b=Jza1yYu/NRXCnTM01SU30ZcMdBkV5O7QEaumKLdiIXiX6bMl0B0xTfYkmtQ+uMDGZxDy4G KasQbw1ARDmJP2uuZ6SqX8LhZCoCSK32Xf1oBJ/hHrDFQGIjTiLF2nxNFgKnruU0CiFsgW fRaFIoQoJTDvSfab46dgEO6NSWjqCnYI5ylr7Mo/23apvUGMKu2hwfZ4ZFtc9Wn7oeVx1E PEzGjxLTftLHkDWy/NK9FX2+z8jtUa6GoF9uGONXhC2sgU11m5mpzY00y8HeVI7URXX211 NSW6ZUOMAw9KT1AWhjC8nqnCOfxAfxiBnPci6Z4vuKhPj2H4sh1UvYM6OD+3tQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SGyQT60hdz187x; Fri, 27 Oct 2023 09:43: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 39R9hDtg008925; Fri, 27 Oct 2023 09:43:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39R9hDsc008922; Fri, 27 Oct 2023 09:43:13 GMT (envelope-from git) Date: Fri, 27 Oct 2023 09:43:13 GMT Message-Id: <202310270943.39R9hDsc008922@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: 070a4ff82a34 - main - arm64: Use the Linux sigframe to restore registers List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 070a4ff82a34652d533f9315ae9ad0aa8f1fdeb2 Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=070a4ff82a34652d533f9315ae9ad0aa8f1fdeb2 commit 070a4ff82a34652d533f9315ae9ad0aa8f1fdeb2 Author: Andrew Turner AuthorDate: 2023-10-25 09:50:11 +0000 Commit: Andrew Turner CommitDate: 2023-10-27 09:32:24 +0000 arm64: Use the Linux sigframe to restore registers When returning from a Linux signal use the Linux sigframe to find the register values to restore. Remove the FreeBSD ucontext from the stack as it's now unneeded. Reviewed by: dchagin, emaste Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D42360 --- sys/arm64/linux/linux_sigframe.h | 1 - sys/arm64/linux/linux_sysvec.c | 96 ++++++++++++++++++++++++++++++++++++---- 2 files changed, 88 insertions(+), 9 deletions(-) diff --git a/sys/arm64/linux/linux_sigframe.h b/sys/arm64/linux/linux_sigframe.h index e903fea295dc..2a004f4db74d 100644 --- a/sys/arm64/linux/linux_sigframe.h +++ b/sys/arm64/linux/linux_sigframe.h @@ -76,7 +76,6 @@ struct l_sigframe { /* frame_record */ uint64_t fp; uint64_t lr; - ucontext_t uc; }; #define LINUX_MINSIGSTKSZ roundup(sizeof(struct l_sigframe), 16) diff --git a/sys/arm64/linux/linux_sysvec.c b/sys/arm64/linux/linux_sysvec.c index a850d5e34bc0..4b5544841313 100644 --- a/sys/arm64/linux/linux_sysvec.c +++ b/sys/arm64/linux/linux_sysvec.c @@ -187,28 +187,109 @@ linux_exec_setregs(struct thread *td, struct image_params *imgp, bzero(&pcb->pcb_dbg_regs, sizeof(pcb->pcb_dbg_regs)); } +static bool +linux_parse_sigreturn_ctx(struct thread *td, struct l_sigcontext *sc) +{ + struct l_fpsimd_context *fpsimd; + struct _l_aarch64_ctx *ctx; + int offset; + + offset = 0; + while (1) { + /* The offset must be 16 byte aligned */ + if ((offset & 15) != 0) + return (false); + + /* Check for buffer overflow of the ctx */ + if ((offset + sizeof(*ctx)) > + sizeof(sc->__reserved)) + return (false); + + ctx = (struct _l_aarch64_ctx *)&sc->__reserved[offset]; + + /* Check for buffer overflow of the data */ + if ((offset + ctx->size) > sizeof(sc->__reserved)) + return (false); + + switch(ctx->magic) { + case 0: + if (ctx->size != 0) + return (false); + return (true); + case L_ESR_MAGIC: + /* Ignore */ + break; +#ifdef VFP + case L_FPSIMD_MAGIC: + fpsimd = (struct l_fpsimd_context *)ctx; + + /* + * Discard any vfp state for the current thread, we + * are about to override it. + */ + critical_enter(); + vfp_discard(td); + critical_exit(); + + td->td_pcb->pcb_fpustate.vfp_fpcr = fpsimd->fpcr; + td->td_pcb->pcb_fpustate.vfp_fpsr = fpsimd->fpsr; + memcpy(td->td_pcb->pcb_fpustate.vfp_regs, + fpsimd->vregs, sizeof(fpsimd->vregs)); + + break; +#endif + default: + return (false); + } + + offset += ctx->size; + } + +} + int linux_rt_sigreturn(struct thread *td, struct linux_rt_sigreturn_args *args) { + struct l_rt_sigframe *sf; struct l_sigframe *frame; - ucontext_t uc; struct trapframe *tf; + sigset_t bmask; int error; + sf = malloc(sizeof(*sf), M_LINUX, M_WAITOK | M_ZERO); + tf = td->td_frame; frame = (struct l_sigframe *)tf->tf_sp; + error = copyin((void *)&frame->sf, sf, sizeof(*sf)); + if (error != 0) { + free(sf, M_LINUX); + return (error); + } - if (copyin((void *)&frame->uc, &uc, sizeof(uc))) - return (EFAULT); + memcpy(tf->tf_x, sf->sf_uc.uc_sc.regs, sizeof(tf->tf_x)); + tf->tf_lr = sf->sf_uc.uc_sc.regs[30]; + tf->tf_sp = sf->sf_uc.uc_sc.sp; + tf->tf_elr = sf->sf_uc.uc_sc.pc; - error = set_mcontext(td, &uc.uc_mcontext); - if (error != 0) - return (error); + if ((sf->sf_uc.uc_sc.pstate & PSR_M_MASK) != PSR_M_EL0t || + (sf->sf_uc.uc_sc.pstate & PSR_AARCH32) != 0 || + (sf->sf_uc.uc_sc.pstate & PSR_DAIF) != + (td->td_frame->tf_spsr & PSR_DAIF)) + goto einval; + tf->tf_spsr = sf->sf_uc.uc_sc.pstate; + + if (!linux_parse_sigreturn_ctx(td, &sf->sf_uc.uc_sc)) + goto einval; /* Restore signal mask. */ - kern_sigprocmask(td, SIG_SETMASK, &uc.uc_sigmask, NULL, 0); + linux_to_bsd_sigset(&sf->sf_uc.uc_sigmask, &bmask); + kern_sigprocmask(td, SIG_SETMASK, &bmask, NULL, 0); + free(sf, M_LINUX); return (EJUSTRETURN); +einval: + free(sf, M_LINUX); + return (EINVAL); } static void @@ -310,7 +391,6 @@ linux_rt_sendsig(sig_t catcher, ksiginfo_t *ksi, sigset_t *mask) } memcpy(&frame->sf.sf_uc.uc_stack, &uc_stack, sizeof(uc_stack)); - memcpy(&frame->uc, &uc, sizeof(uc)); /* Copy the sigframe out to the user's stack. */ if (copyout(frame, fp, sizeof(*fp)) != 0) { From nobody Fri Oct 27 09:47:48 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SGyWm4BFwz4y3NY; Fri, 27 Oct 2023 09:47:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SGyWm3fQhz3cgy; Fri, 27 Oct 2023 09:47:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698400068; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EcPwMwiyE/aTZpcqHz8FlDaw97aAzvw9DNeYZlGlH6o=; b=H5hcXVM+61UqSAy8CW0d/shIRoC2TWQwJqYNMeTT0+DBbbV+1NaKa7FOPJsseM7E767sIm M0hn6fwkZiLKIaKn5Qp3nMK1j7Q4ZnglZ/edYxWMvzRtF3F86az9MOC5u8jjJFf/mqP6/e VDs8+g2Zdd2FRPCz7TOucOLaPXUdiiwIdYV7rwyHq5VSXQRqvWhvxBvNybJ3XQOFDrHDi3 5lvqYcL5h73Ha1Uep7vOT6qGgBR5RxmxzhLJv5sLd1ZAUakLuWHWmQCQPf7QKzOyiCYeBx M08X5+SDyAtX022Rn6gMf76TfZt0q5R72bTnrJNTLTx2gRDDLRxXbZtMp83QcA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698400068; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EcPwMwiyE/aTZpcqHz8FlDaw97aAzvw9DNeYZlGlH6o=; b=q9Sq804J1pN44cWm2oI5irHD7Tgh/xeXrSzGgPLG7ugtOOtK96oEvEZT1+yCIz1rmxynSW HF0ABw65lS5BBPCVOj6AZ+VwBNHnSiOmYQbRMvEit4/qr9USlLa5HHT8NKDA38LxGDqDkN MxWxPGBl8TCJdmwOVLQhoQ/kxPsGs+G7gWqLYfGr5+blTw6f0q4yJh31BwWqtt1uJACGz8 iLwTD1jlZxpjw1EwT3z8El1QDWcERU/zLYz64eTcQSI2pMjZNTlcjT5Jed0sifecA54+hE MC2sxTuuurOxSSvaP1xD0ycoibG9aoHw/Soczu9VredjyvcYA80hw8QAaj1FuQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698400068; a=rsa-sha256; cv=none; b=vGEiAgrq6OasRR/IDTbN6q+OV2856/eg3YVtG0wFCPuaJmwWo6xzzOwMxR+1KokuIP7KhN o4L7O8fCFxpQIpHhjYVcuWXP88XflB+2s1AO2EIlJ7p3OyMD/tIvwsaPGXUtJyvJ/tOkrh UDZnBPIc36tirtWpclViJDtsQZweQHLt8FdkK/VOxZqpjXokM4l1xm0Gu7vRFOXkwMDd0r LQhcxe42SM3EjzLdoZn+dru5Jsoob2EuTCCufkn4X6IM3yrAa/WkyJ1Bo4SchdzH+B1M5Y umW5lWBru8D08M8ER1ktU+jbgmYZRQCC/eDnoMsAxCkGFVd2snmgsHQ4kACdrQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SGyWm2cRrz17v7; Fri, 27 Oct 2023 09:47:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39R9lmND009756; Fri, 27 Oct 2023 09:47:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39R9lmq7009753; Fri, 27 Oct 2023 09:47:48 GMT (envelope-from git) Date: Fri, 27 Oct 2023 09:47:48 GMT Message-Id: <202310270947.39R9lmq7009753@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Baptiste Daroussin Subject: git: 820fbcf25bb2 - main - pkgbase: compress packages with zstandard List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 820fbcf25bb2c7f1c570c0d408b2ab7d05bd771c Auto-Submitted: auto-generated The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=820fbcf25bb2c7f1c570c0d408b2ab7d05bd771c commit 820fbcf25bb2c7f1c570c0d408b2ab7d05bd771c Author: Baptiste Daroussin AuthorDate: 2023-10-26 20:34:00 +0000 Commit: Baptiste Daroussin CommitDate: 2023-10-27 09:47:46 +0000 pkgbase: compress packages with zstandard MFC After: 3 days Reviewed by: manu Differential Revision: https://reviews.freebsd.org/D42375 --- Makefile.inc1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index 512c4049fd76..b3503c93cffc 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -1943,7 +1943,7 @@ PORTSDIR?= /usr/ports WSTAGEDIR?= ${OBJTOP}/worldstage KSTAGEDIR?= ${OBJTOP}/kernelstage REPODIR?= ${OBJROOT}repo -PKG_FORMAT?= txz +PKG_FORMAT?= tzst PKG_REPO_SIGNING_KEY?= # empty PKG_OUTPUT_DIR?= ${PKG_VERSION} From nobody Fri Oct 27 15:16:38 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SH5qB6zHhz4yMCl; Fri, 27 Oct 2023 15:16: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 4SH5qB5xMhz3Dwn; Fri, 27 Oct 2023 15:16:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698419798; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UBY856DyY5/ovhcbvz20FQbty5ow9XFC9DcctKnA0eE=; b=Qv95brxAMVU/5mCsLKNU88bvj+50epG1NgfFvPOgcMFCfga9NKitZD2WVRU6HMkuWnKZ6G PsCFSwZRV+hL6KnVLXFDZZabZRH+pUMWwfAJ360+7IhlcqadoxnKmnZrdomM8vAraErAyP aJKCBYacUQZPtje4R+lfM4U1eJ4A1oOEdBS0M6K+BL/sM9VfIskWXw0hkEyMc4iHVhm80t cgNlVmIMlijHOdlIBKujCRS4SmKm3PQtCMIph4XJL+6+VavUXpZ1ibBAQ2aBj6SlPmOPGx 2/fivSVau+Zc/FbCd6aT9OG/CHE3ckxZL8eV5WgrcmbahivqlUwpqk9uKakFig== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698419798; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UBY856DyY5/ovhcbvz20FQbty5ow9XFC9DcctKnA0eE=; b=UvmP+Ejb6WmUvPvFMWcmCy7y9iiT09H91rwp/+Qw4BMNqK0pGJFR7DKXh5fcpv7yglKEtv nEGPR6hWCylRkgdR3B1nvVLnvUjO8IeILMCqnRwdzLhkLvU6ur0HI9GgKy6CZ3WO6w0kAp sA3GZXhZm2YrGVyO6ADl0d1MpHwbSn+U+mhYrsV8a18Y5dKi76QenLb1HxHs5HquZoB41F nJnKcfaVCTjl8+o0zpw3FgES2KFhCIAFjHO+1PYe6azixihj5NUx0M5UFcJZu0VB1y6aUs yEMk2/VTWG+62wWPOJvQR8xf5siikvPLyzmOd1JhfjeLupmgxj06lGClSC34gg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698419798; a=rsa-sha256; cv=none; b=NvdY6HZbKWRharh19ji+RWY3HMVU2zob+q0N8I/9N1eOJ9/i5uEj+UFgPK/CYLxmuJpVWS 8OyKWw0HXGa6Cnv+nttEfT5bhqLthqfenJ23A+/DQonOs0AwjpFMqNJpc/lDKwhK/+pDq6 xJCGuzVRaM6FRQispDQIGUqJs2Js+dBYK8u25HeAZ+IqNyztQeTETIEPWJ6PtH1FE3dGjw 7ADYwpIi+Qwu5/hNsb8FHrFSvOE0uNH9aXcYMDyAgKAJF72TEsvCxnOCPQ46cQuY+Ok+g9 bXS7jR/XslbjBNsJenEQ1LRRvh6CAbuR0HdpqQ1yvVKG6eEAmTn5XnhyOoOSjA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SH5qB50Wgz3kp; Fri, 27 Oct 2023 15:16: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 39RFGc7n058400; Fri, 27 Oct 2023 15:16:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39RFGcHM058397; Fri, 27 Oct 2023 15:16:38 GMT (envelope-from git) Date: Fri, 27 Oct 2023 15:16:38 GMT Message-Id: <202310271516.39RFGcHM058397@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: afd155c72bf6 - main - netinet: The tailq_hash code doesn't reference tcpoutflags List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: afd155c72bf65c056d19473569cc78c6e5807b3b Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=afd155c72bf65c056d19473569cc78c6e5807b3b commit afd155c72bf65c056d19473569cc78c6e5807b3b Author: Warner Losh AuthorDate: 2023-10-27 14:39:31 +0000 Commit: Warner Losh CommitDate: 2023-10-27 14:41:25 +0000 netinet: The tailq_hash code doesn't reference tcpoutflags Don't define TCPOUTFLAGS to get the static definition from tcp_fsm.h. tailq_hash.c doesn't refernce tcpoutflag. Only files that reference this should define TCPOUTFLAGS. clang is fine with it, but gcc12 complained. Sponsored by: Netflix --- sys/netinet/tcp_stacks/tailq_hash.c | 1 - 1 file changed, 1 deletion(-) diff --git a/sys/netinet/tcp_stacks/tailq_hash.c b/sys/netinet/tcp_stacks/tailq_hash.c index 0792905e0128..5977bf874950 100644 --- a/sys/netinet/tcp_stacks/tailq_hash.c +++ b/sys/netinet/tcp_stacks/tailq_hash.c @@ -58,7 +58,6 @@ #include #include #include -#define TCPOUTFLAGS #include #include #include From nobody Fri Oct 27 16:17:45 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SH79j5llTz4yQp3; Fri, 27 Oct 2023 16: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 4SH79j5HYBz3MdL; Fri, 27 Oct 2023 16: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=1698423465; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oXFV69qQzuO3gpw3atAgyiJ0tcJ/dnyQqTq22Evaw5U=; b=KIbQMK/NRmeR8YHUkxUH/lTifFfC5T692H01y9pB9XguF1hlTYAlrB+B3avlsQ3n6LDQ+f Bkn3KXANOArU4/Hp4Z4GNVPg99/59iHiR27ZbSMcyEl94TMES1fMSRaszWJQZKQrkJcuN6 XJuEDP+fD9bLWVQgKEBx1hDrMOTddW8/EJUb07MjHGmJcyT5h7k6Ge2epy0yGywhQWdd4A XyyytN6ShMhw1YpC8lkXzzwUbLXpMwTLlUNn1Uuud3E5Y4ymlRo72hT7Q0/39Ugy3dKJiy o4BQeEfEhqqZwNCY2jqHLee5MJcmbGmH/5Y9fa16h50iJTmYn1TUP9KBBxEdzA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698423465; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oXFV69qQzuO3gpw3atAgyiJ0tcJ/dnyQqTq22Evaw5U=; b=xrXZu1A0nSrHb5GJnnhTXCFC0qwRbGi+shyHa/LJGnfe1Sdjj6MHwPfHv6cb8FjazCNOJh K/lu8APGp9Bq/yFksSvWggYsmS5qCYq/nIsa8xLznCMZlJ/g3Hqv49+swyAppWnh4wfghH xBUJd15g1TM5SAw3KTsphaF6mt9ea596+HHkqDtJHEH+uVu8Acmh+QzsTsg1jaFMI10imS DhUlJWTYLQbnyXbe/SJx/6GbtHnWpLqJ/QMdLgUsDHCQu5jKW7vUOsjy7+nEKqRLiVhnyd X00dBIctlAEmPwHKcJJJubaEAU7Sxq51RDsAqrgnd0+Yw2+cGD7hffGCK6YfHg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698423465; a=rsa-sha256; cv=none; b=eM9RIj6RXb+EByT8mOSWugwjZTlPdO4crUTUY2+kkr7/UnfKqs35i1PE8fUs9aPP0DmU1F hpSyHFwphIy8KVh0y1bhlMl72LguY1yQhOcsS6weCYKSGAEe5UnupSPOuWyoY7lAnzMOQ+ 81crX7ZerzylbUZF3wUAzWPYCG9KTh8kSQnTzQVWkffYUHyb7SwBErz7gBe1yCbt3cf9VC fhczgEQI8LpzfCzQ8QCGA0AtnvEjysXyzVZdUjAX5TXpAJxLI+v/AN8f6smuiLWBklaW/h 1kv1sG+F1ontsOV6fGakMCePlN3zsJQYBwE6osC4MtfYgZC3o+igsA/kbIAx+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 4SH79j4MPpz5rB; Fri, 27 Oct 2023 16: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 39RGHjJS059276; Fri, 27 Oct 2023 16: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 39RGHj3J059273; Fri, 27 Oct 2023 16:17:45 GMT (envelope-from git) Date: Fri, 27 Oct 2023 16:17:45 GMT Message-Id: <202310271617.39RGHj3J059273@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: 5e50a0f39ff7 - main - strlcpy/strlcat: Remove references to snprintf List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 5e50a0f39ff7fce651a0d36ee686740b70ad9f0e Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=5e50a0f39ff7fce651a0d36ee686740b70ad9f0e commit 5e50a0f39ff7fce651a0d36ee686740b70ad9f0e Author: Warner Losh AuthorDate: 2023-10-27 16:11:29 +0000 Commit: Warner Losh CommitDate: 2023-10-27 16:13:50 +0000 strlcpy/strlcat: Remove references to snprintf While strlcpy and snprintf are somewhat similar, there's big differences between strlcat and snprintf which leads to confusion. Remove the comparison, since it's ultimately not that useful: the snprintf man page has similar language to strlcpy, so it doesn't provide a better reference. The two implementations are otherwise unrelated. Reviewed by: bcr Sponsored by: Netflix Differential Revision: https://reviews.freebsd.org/D27228 --- lib/libc/string/strlcpy.3 | 27 +++++++-------------------- 1 file changed, 7 insertions(+), 20 deletions(-) diff --git a/lib/libc/string/strlcpy.3 b/lib/libc/string/strlcpy.3 index 148afcbbd2bd..89c9d62c5a25 100644 --- a/lib/libc/string/strlcpy.3 +++ b/lib/libc/string/strlcpy.3 @@ -25,7 +25,7 @@ .\" OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF .\" ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.Dd May 1, 2020 +.Dd October 27, 2023 .Dt STRLCPY 3 .Os .Sh NAME @@ -45,9 +45,11 @@ The .Fn strlcpy and .Fn strlcat -functions copy and concatenate strings with the -same input parameters and output result as -.Xr snprintf 3 . +functions copy and concatenate strings with the same input parameters and output result as +.Xr strcpy 3 +and +.Xr strcat 3 +with proper overflow protection. They are designed to be safer, more consistent, and less error prone replacements for the easily misused functions .Xr strncpy 3 @@ -100,22 +102,7 @@ and .Fa dst strings overlap, the behavior is undefined. .Sh RETURN VALUES -Besides quibbles over the return type -.Pf ( Va size_t -versus -.Va int ) -and signal handler safety -.Pf ( Xr snprintf 3 -is not entirely safe on some systems), the -following two are equivalent: -.Bd -literal -offset indent -n = strlcpy(dst, src, len); -n = snprintf(dst, len, "%s", src); -.Ed -.Pp -Like -.Xr snprintf 3 , -the +The .Fn strlcpy and .Fn strlcat From nobody Fri Oct 27 17:26:55 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SH8jW5CSTz4yTJc; Fri, 27 Oct 2023 17:26:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SH8jW4j4Cz3WjC; Fri, 27 Oct 2023 17:26:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698427615; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LVrDx3ii/9Qvbyu+WSRsmczK3dRVWlHxyNEL5ZrgMaA=; b=QqPL5RUh4bDz8qOVkOAeKlfCPBLQpuslAEz45RtMmN58sG4kBuHSdMjR+QRjpPJ2187GOV 0eZAbpixrGxtP7lhdU0ZJxXJXFTOzXdfZDlK8G+sSruVC5Pi8ZQFDYjI5v8XZNOuk0Z959 ZSWNd2zLaDm02EvLc5v1qsPDnRApwSc7mWkAJUNJ73mHl2eYTUv1c6ZVcRQugerCPO56EC fEA+zA00CiE5Ri22/TQEzn4nXNZNRwk40vyDA/MUe23F54Os7pFnjkGND/W3qohsLI0mgk qhb4tTH3x9rFpX+DQlm0I+dC2MfY7Tvr8w/JAbdzTiZ3JjLvVvGMRMqCYDcfzg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698427615; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LVrDx3ii/9Qvbyu+WSRsmczK3dRVWlHxyNEL5ZrgMaA=; b=rYTv73wLtrw5mXRFL8Rzt6anh+JG0U/RQb1VrEa5W3I2ZO6ZlbtprbF9CGenWmuuSjsI3M rQHQvquortIw3xNZB58dJ3dtTTLfsPDhjYpvtdOH20LSqdkJa1h8oVIJSUyOzE4t3Y03R4 gOpWHW3tdDqY3SCDjdqPpX40Nq8N9yluCcpLDx9KAv1MH2u2ExgyJAdycUa1v8wlqWYnUI rpONe3DZRB3qp7IKm583ADwlDqfYWaDZyjfeV/f++isjaSEBUYeZ3nffxSWaE9EDWnnzzu SFEgK43CmIIp33yGRlKNyEmdlHjTsWHFiYYakUecmkIuIrmYIpO9kOEJIrFn0Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698427615; a=rsa-sha256; cv=none; b=e2eK1vlo1dGLtOcxEBMc7tTCDWZvVPj5Y5aCq+LmUJBUiiJTcl0aq+Qwwp+1/il98oAgYI sg8/o1slrm7A3PKOurz9j7pMibMdY034RrN+DDdrlgsBLS6WpWIb96J81gEOOtOLUcr64l tER2ry1lzSK87X767HowJ6XHsAl0jG8BIUxUXEymEx2p8tXKtk0gCef/im1IR9yMj4tP8n a3g28T2OCb72hVEvcdfR4oW6LBCupizlOJl+FfHQ/t/byL2iD/jRCCNLFv+tO0iYdmZ774 v0jNS3kKiWL6GcpEBNq5tqNyL2AF7SpS4CMAOQloeMZ/6y0rgY4Y12yWzkh8iw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SH8jW3g6cz7lc; Fri, 27 Oct 2023 17:26:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39RHQtm7076353; Fri, 27 Oct 2023 17:26:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39RHQt8v076350; Fri, 27 Oct 2023 17:26:55 GMT (envelope-from git) Date: Fri, 27 Oct 2023 17:26:55 GMT Message-Id: <202310271726.39RHQt8v076350@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: 314542de6d0a - main - clock_gettime: Minor clarification List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 314542de6d0a044640d349d68b2d1a1fe5f427ff Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=314542de6d0a044640d349d68b2d1a1fe5f427ff commit 314542de6d0a044640d349d68b2d1a1fe5f427ff Author: Warner Losh AuthorDate: 2022-08-03 16:24:47 +0000 Commit: Warner Losh CommitDate: 2023-10-27 17:20:28 +0000 clock_gettime: Minor clarification Add a note saying that the CLOCK_BOOTTIME is unrelated to FreeBSD's kern.boottime sysctl. Make a minor tweak to markup. Feedback from: pauammu Sponsored by: Netflix Differential Revsion: https://reviews.freebsd.org/D36037 --- lib/libc/sys/clock_gettime.2 | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/lib/libc/sys/clock_gettime.2 b/lib/libc/sys/clock_gettime.2 index ed469153a40e..a0f1274f0eff 100644 --- a/lib/libc/sys/clock_gettime.2 +++ b/lib/libc/sys/clock_gettime.2 @@ -27,7 +27,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd July 8, 2022 +.Dd October 27, 2023 .Dt CLOCK_GETTIME 2 .Os .Sh NAME @@ -120,10 +120,12 @@ and are aliases of corresponding IDs with _FAST suffix for compatibility with other systems. Finally, -.Dv CLOCK_BOOTTIME +.Fa CLOCK_BOOTTIME is an alias for -.Dv CLOCK_UPTIME -for compatibility with other systems. +.Fa CLOCK_UPTIME +for compatibility with other systems and is unrelated to the +.Fa kern.boottime +.Xr sysctl 8 . .Pp The structure pointed to by .Fa tp From nobody Fri Oct 27 17:33:48 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SH8sT1wKHz4yVC9; Fri, 27 Oct 2023 17:33: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 4SH8sT1RNjz3XqJ; Fri, 27 Oct 2023 17:33:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698428029; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VV/YHokPzRCkWCm8pr90k9VUexLxt9v9rxyyOx6eZVI=; b=qvdKVi7OmtmdN0Wht883/Cdn+50YyLrCv71DUx6myJNDz+sauQ2epVGSmYTxkMxzUpwc17 2cefd5BECaHEdcKbA/u4PoRkFkJ2GjuTDOpnqCxiTsf7f2mm52j3BUjbADLC+a82gFiVSI poFr2xF5dV88QnN3MggUUdZDuCw1h1QsmgNr5mdhKZSK+4fuzBQCE7sfcMqX07kvMo3Eld 366mOaoS49jTJrOSAB47dy+f4+nMLaHjy13WKybyu3nFzsgNYrB41nLDsyh9b7hXNzzayM zPvVoiVDj6MbE9bx/GhXuQYYSEE/TC+WXF4tyEGW6vdwLIyD9CdrwlRbovr+Jg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698428029; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VV/YHokPzRCkWCm8pr90k9VUexLxt9v9rxyyOx6eZVI=; b=oAKgkf1mMWSkiF/y6XzawD6lbuJvRuZ45VZJsip5x92017NlbGkGDoKMnG4lNg31RiqQcS qZ/ieaGnqYlsspQqcoAJd6j+uZkWTG30LMozb21HNjb5jLZGJl4FMUu6S/bG+z8VX50a+n uCHl5bBy3+J8B2fHlfBwDWtIISJChNvjkKy596ABYvhTuLWYtYqyocaPB4ae02i7w+gHFS 8H49zErXy2uAIQUGUuMnb5CCNsLrg0HpKf5AoxFSNnOLmoKfLPpsLBqy9suWDS5jaiiT0Q 0cZ9O3YhXYp8E4NKUjBVIVFHXHyFDSIVo8Nv45cXh10lUvWPTsRAdy86WPG8Jw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698428029; a=rsa-sha256; cv=none; b=GH6+M0W5dosK/OWa5QyT/veF+oZ3JcHNnd1r59HFUtRgZSu2roToEYtckj8TJiqct9bmKU 1U0JEWtaEvof/Xk6G95VA+f7lKUyAVfUcL+jVUhjTSK/U86zs7tft20luG1DYTMrFMC5Q3 tKFcsabitYWkynylD5hvyDfGbXezBiU4TvSY3ScBimmYLqMUV4g0CiST1YH1yN53GG432r 8D2TtMxatWGfMUri48+02CAhl/3KS/f3Vo3GoQex2Klc/9dif8cA1S6nK21h1sQ6cW7Uv3 yVIITSyBsKiXizxLCpONSyAQG4spEFcCQLz5Mr1KG4Fibegx5HX9vaesqsqEdg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SH8sT0Vv0z7mB; Fri, 27 Oct 2023 17:33: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 39RHXmJv092475; Fri, 27 Oct 2023 17:33:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39RHXmI7092472; Fri, 27 Oct 2023 17:33:48 GMT (envelope-from git) Date: Fri, 27 Oct 2023 17:33:48 GMT Message-Id: <202310271733.39RHXmI7092472@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: ef161a35012f - stable/13 - bhyve: fix arguments to ioctl(VMIO_SIOCSIFFLAGS) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: ef161a35012f187273dafc634751c5eb5db06092 Auto-Submitted: auto-generated The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=ef161a35012f187273dafc634751c5eb5db06092 commit ef161a35012f187273dafc634751c5eb5db06092 Author: Gleb Smirnoff AuthorDate: 2023-10-26 09:59:21 +0000 Commit: Mark Johnston CommitDate: 2023-10-27 17:33:34 +0000 bhyve: fix arguments to ioctl(VMIO_SIOCSIFFLAGS) ioctl(2)'s with integer argument shall pass command argument by value, not by pointer. The ioctl(2) manual page is not very clear about that. See sys/kern/sys_generic.c:sys_ioctl() near IOC_VOID. Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D42366 Fixes: fd8b9c73a5a63a7aa438a73951d7a535b4f25d9a (cherry picked from commit f407a72a506d2630d60d9096c42058f12dff874e) --- usr.sbin/bhyve/net_backends.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/bhyve/net_backends.c b/usr.sbin/bhyve/net_backends.c index 99781cfdcbb6..de6afab53854 100644 --- a/usr.sbin/bhyve/net_backends.c +++ b/usr.sbin/bhyve/net_backends.c @@ -238,7 +238,7 @@ tap_init(struct net_backend *be, const char *devname, goto error; } - if (ioctl(be->fd, VMIO_SIOCSIFFLAGS, &up)) { + if (ioctl(be->fd, VMIO_SIOCSIFFLAGS, up)) { WPRINTF(("tap device link up failed")); goto error; } From nobody Fri Oct 27 20:19:45 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SHDXx3N1cz4yd0D; Fri, 27 Oct 2023 20:19: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 4SHDXx2bqGz4GMg; Fri, 27 Oct 2023 20:19:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698437985; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZNXVOiUnqgnj3kVw6zkkKmZsy2G+mFBqZjWa349sfkY=; b=XJVfRmjS2DKLjrLsrJrxUoDV+/FPTqHbgCNSHBA8giwyIo2QlPMM/tyfSf1ReIT/nFWjG4 SykJQcgZvf8AsUt8nq+SsAEOibO6x4kCNModoWtBbxR+1WpVlk18cS/Fc8n+4fght/burR qDAxmUKyvPRHy7e7kWocdVZWHmvenJLTRkbu7s/imPOdQt42irnj/g6gLzOpGwzP1PZwyG +2P/jFxdi6h/NqrygL2+PVaecJnhfdPhTNiHz7eyFlFCeWk/hF8Yv4pECb7wvbEPMURQs9 svdKBrCe0Zyj/tquh8VDB55YH7k1FPNAEdPDjymYtomSCzgQbN9K7fGVi+NoYA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698437985; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZNXVOiUnqgnj3kVw6zkkKmZsy2G+mFBqZjWa349sfkY=; b=RKIJULaKQKUok9nxgpZCK3w4z9l9gbaV3epoMhJ0Jad7iu58pSpwGt/x4hs7G1vbKGJSk1 s55AIYRedvKIkmwJ0HmtEE57y8IfY6zA3lX0aqpzbbS028vOb/6Xu/BUp2g5mbYulHZ8Rn KgY+apLsTmqUWPsLEyE9EZ8Qc+ubl5PqSARxXD/t+2T5pUz2nvvfTsBqvrFGvy3KT0FpR1 9ORnlOUkL2aWx18kVKrkiETezGcpW+oDjupCjGlqMiItjKb9jwJHmThvtKJs26vNVQbq+P C2ZvXkMQbG9u83WO2frOsf281j3mO5XmrE9wC+XYWORKEN6l9DGyzDroha52aA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698437985; a=rsa-sha256; cv=none; b=fpW/JnY/vZKWeswF2kRSrgM3tRz5Q8KtjvaB//X0JTjLIl6r1cImagSWWytdjnJf+/oXqn NZXuuRfA9ApKaw9Ifs0MX+D8uIuQH2tZPvZzCJz0n9uxsfgmOAMp6XfTkmgRm9RSMGIaxs LV29lbjmGbaywy6LsJ1rycYOm86Ib9w+7PGKjIsZAaLgCymcS1CeSQrjA8WV4bCzh8aqYS euJYuvpCsdvrhnuZlFvDs+fNI8ZHwxxG8LU7/CL65KgSAcnKNtbCwO7TS2c4jK7dkMdatv YlUOQsnzy5YQoz5+Hz7rWWKp52JRQZgI70P+gN1TP6gZ7/L1Uyug2v+gIBjdsg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SHDXx1gPwzCTC; Fri, 27 Oct 2023 20:19: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 39RKJjVP061470; Fri, 27 Oct 2023 20:19:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39RKJjuT061467; Fri, 27 Oct 2023 20:19:45 GMT (envelope-from git) Date: Fri, 27 Oct 2023 20:19:45 GMT Message-Id: <202310272019.39RKJjuT061467@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: 8c0955cbd902 - main - netgraph: Fix obsolete comment List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8c0955cbd902b8acea82838ab1b3b12422f207ff Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=8c0955cbd902b8acea82838ab1b3b12422f207ff commit 8c0955cbd902b8acea82838ab1b3b12422f207ff Author: Warner Losh AuthorDate: 2023-10-27 20:00:37 +0000 Commit: Warner Losh CommitDate: 2023-10-27 20:00:37 +0000 netgraph: Fix obsolete comment splnet is no more, adjust the comment. Sponsored by: Netflix --- sys/netgraph/ng_sample.c | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/sys/netgraph/ng_sample.c b/sys/netgraph/ng_sample.c index 54b7f2026fa1..6647247fc634 100644 --- a/sys/netgraph/ng_sample.c +++ b/sys/netgraph/ng_sample.c @@ -354,17 +354,8 @@ ng_xxx_rcvdata(hook_p hook, item_p item ) NG_FREE_M(m); return (ENETUNREACH); } - /* If we were called at splnet, use the following: - * NG_SEND_DATA_ONLY(error, otherhook, m); if this - * node is running at some SPL other than SPLNET - * then you should use instead: error = - * ng_queueit(otherhook, m, NULL); m = NULL; - * This queues the data using the standard NETISR - * system and schedules the data to be picked - * up again once the system has moved to SPLNET and - * the processing of the data can continue. After - * these are run 'm' should be considered - * as invalid and NG_SEND_DATA actually zaps them. */ + /* After this are run 'm' should be considered + * as invalid. */ NG_FWD_NEW_DATA(error, item, xxxp->channel[chan].hook, m); xxxp->packets_in++; From nobody Fri Oct 27 20:19:46 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SHDXy4b3wz4ydWr; Fri, 27 Oct 2023 20:19:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SHDXy3vpDz4Ghc; Fri, 27 Oct 2023 20:19:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698437986; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6Blw9FJB4MKlPolVTraDh4WSlGE81KjfcUB7IcwBAns=; b=uDPoWKGVSDMe5sROFGat6HWbHTPHF6XXuwWeZ59Cu3jRpxtRrZW7mVttjlhrMVACGuifG5 ozVBlOiz+rKdGhjefBpjS/n0vDGVzsP0pGllb+lPSwes35fTtCSU2Aik/rWOaGakRAlkO/ W3dftzkkq+0TLtI/Jn8QGvz94F2R5JNwh6Qizyo5yFFXrhz2cXP+rFNGbaM3EpCpmdxzvQ JZV6D70NtFt5c75jP8OaH8kQUL+TD+xEJYKTrL2GR2zWqRp/vmPRjr29ZYxjHvioe/EyST tFKbSMJQpYuJKekG8s+fwwHZ2TJdX5EfJp3MzJF0JZAxjyfdlkj7Zi5zeor/Cg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698437986; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6Blw9FJB4MKlPolVTraDh4WSlGE81KjfcUB7IcwBAns=; b=fKQmqvXEFAiBvOqmFAC12Zlolhyp5Rrnw3cbXIKNGNLm7ZrEbukD+G8+8E+VeKxbt0UIua CAzHaj2F873auA2sObtzNvnBDoHaYQ5WfWlORJ5WGXtK4sJjCZVwa2FSVA3B4480Mgg90N r3OwL5yKzFfUsg+i6kaMIsgEckR+ewAJL9q7WsIa6ZNewO5Sv3PTvZtSTQ6RUMck4n8wJi 0/gIAXhdWkjkLDAMpQLyK4o/inwXEneO/ufqPd1Ht8qmDOYPRJMefxhB8LMTcIlc2JMOL+ 9XyBZg5/ySYffh2fbox2slZPZbvfpF7Llanl1QDj4lzmFR4Utn0plAtQLQKftQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698437986; a=rsa-sha256; cv=none; b=r6W8lOj539JOOwaCjWQwdqyWYGbo3tcc9e/9Yx0wgVwM2amnx+weKJA7ZwWp2wAblj1fnQ rxkX2tCcmPo1r9nwRWfjI3Qiw5r3dBmblITd7slD9acNM1JStmWCigBk9AieKP3ulAXTqD Am0mLax9vMdbROCYntWbgsocPxHxQKS86HrI6fp6U9hJCiWE5xT3d2ukaFoB7ZXWPsMb8j KL/+3msf5YMk1cN2Ojudbtu7CNMH5SH5jo13rOx0KHB1jB2Ubr3BYYDp5zUnwXPfxqe8Hm k6WCR0KNPxSw43cOUkGdwyHxgNdb/ZSx+h/p/zRh7uQW56sveZL+6kN+Ih01fQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SHDXy2gskzCrM; Fri, 27 Oct 2023 20:19: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 39RKJkNZ061526; Fri, 27 Oct 2023 20:19:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39RKJkqV061523; Fri, 27 Oct 2023 20:19:46 GMT (envelope-from git) Date: Fri, 27 Oct 2023 20:19:46 GMT Message-Id: <202310272019.39RKJkqV061523@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: 538f8bdc8bc4 - main - otus: splnet isn't a thing, remove place holders List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 538f8bdc8bc4ebb868ab0ae12537815d27e310eb Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=538f8bdc8bc4ebb868ab0ae12537815d27e310eb commit 538f8bdc8bc4ebb868ab0ae12537815d27e310eb Author: Warner Losh AuthorDate: 2023-10-27 20:03:51 +0000 Commit: Warner Losh CommitDate: 2023-10-27 20:03:51 +0000 otus: splnet isn't a thing, remove place holders Even though it's if 0'd code, remove splnet/splx. This code can't possibly run on FreeBSD, but having it here as a marker isn't especially helpful. It causes a false positive on grepping otherwise. Sponsored by: Netflix --- sys/dev/otus/if_otus.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/sys/dev/otus/if_otus.c b/sys/dev/otus/if_otus.c index aee765ff4ac8..c27b982d2d6e 100644 --- a/sys/dev/otus/if_otus.c +++ b/sys/dev/otus/if_otus.c @@ -3059,17 +3059,14 @@ otus_calibrate_to(void *arg, int pending) device_printf(sc->sc_dev, "%s: called\n", __func__); struct ieee80211com *ic = &sc->sc_ic; struct ieee80211_node *ni; - int s; if (usbd_is_dying(sc->sc_udev)) return; usbd_ref_incr(sc->sc_udev); - s = splnet(); ni = ic->ic_bss; ieee80211_amrr_choose(&sc->amrr, ni, &((struct otus_node *)ni)->amn); - splx(s); if (!usbd_is_dying(sc->sc_udev)) timeout_add_sec(&sc->calib_to, 1); From nobody Fri Oct 27 20:19:47 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SHDXz5FQ6z4ydWw; Fri, 27 Oct 2023 20:19: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 4SHDXz4MJWz4GlS; Fri, 27 Oct 2023 20:19:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698437987; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OnTzIBz2EL3k8rjZCbBQiokRgHVIVL0SSY/1Hwq5PtA=; b=BtdbRYZvJVvo29FRR1m88FjROM7KTH4ROhm5Jl+HcIPcFOqNyeOi3U3azCHFLv5+HChH1J uA5fNQJ/eZA/7mq99LxfR/cAtN8LnmFEYQFouRmAo1JNlpHvbfUUXbMEJor2pOKC56yERw 84RDfgnhsSvJFMDAix9SaJSw/iFpHq0nlbyCGTVtW5OyFshkx0wC0KBwIW144ZBJjxj2us h/y+r0sg+QY3Dpx/7KI/EVi8qy/P5kG3E2QwBuxYcn/xy6VmdKpYwiYMIcIUGudFr9amjS 7+mqjjJa4useo7Zj3dVCxY25SXkLbMXT7UZ4wdR/ZRy64m/EYRu5rmpUG298SA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698437987; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OnTzIBz2EL3k8rjZCbBQiokRgHVIVL0SSY/1Hwq5PtA=; b=EBO7Uibf/Il34mbl4ifZRSziVfO91G28DfB5ZMFMmvUoBVIKbvXeAB5SzCcglH4IqWKEoU FN22lS871GdNmfsQ/T8Xgtc94XtbZuEbCTFY7acWmHMLGzPZcHKkaa+7xMnjoDozBdSoLF /085GVqK7g1L5vpS5ILUwwjoKcXBUfJlZP/mILRqWrV6rD7GJtRPLwrB63/DL4EXzhrbmX nPC18oWxmDtbPyWgckR0jK5TqAlq77HO2OohtR55hqMek7mzqrBN3hB2xvHeuKOfty80YN YQ4Op55DL8eZaML9iJ4Npg0HJpv6CTs4aAo8r/OMLwDMPXNOwC2KpBrrjEaZEA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698437987; a=rsa-sha256; cv=none; b=owZCidE5gRitb4DoPl3/jLIOdIw/yu2TvDfhW4o8SXX/5WTL3FI+CQGRILP3hmVQyk7Bop 5fW/yChWLvwK3eh5BTizzN9xpS8WLkDMbH+CjRHzukZZ9uVB90/CBzQr1r5eVSGoH69p+a IG7bCyGV9ArvRGccq8bKVFq9TgqFctSP9s0R+vsZFs6oOMf2QZNAVWuuNNEWIW+XpfZPoL t/ZQiMnvvMyPfGgZyxItURGSUd1DijJNwrQOghAk/yfMoP86dipserO61n1XskRC9y5PvF E4Soy50v03JoA56J7RUBIV1Sd9eysYT282xrdxObeJ5+7R2KO/xv0Sd/+f0T/A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SHDXz3Qy4zCdd; Fri, 27 Oct 2023 20:19: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 39RKJl3B061571; Fri, 27 Oct 2023 20:19:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39RKJl9Z061568; Fri, 27 Oct 2023 20:19:47 GMT (envelope-from git) Date: Fri, 27 Oct 2023 20:19:47 GMT Message-Id: <202310272019.39RKJl9Z061568@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: ca062b4d291f - main - mwl: Remove stale reference to splnet/splvm. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: ca062b4d291f434f4eef02df59691d3dd50db5aa Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=ca062b4d291f434f4eef02df59691d3dd50db5aa commit ca062b4d291f434f4eef02df59691d3dd50db5aa Author: Warner Losh AuthorDate: 2023-10-27 20:10:46 +0000 Commit: Warner Losh CommitDate: 2023-10-27 20:10:46 +0000 mwl: Remove stale reference to splnet/splvm. Sponsored by: Netflix --- sys/dev/mwl/if_mwl.c | 1 - 1 file changed, 1 deletion(-) diff --git a/sys/dev/mwl/if_mwl.c b/sys/dev/mwl/if_mwl.c index 2bffff0bf8b8..95655aa33e2f 100644 --- a/sys/dev/mwl/if_mwl.c +++ b/sys/dev/mwl/if_mwl.c @@ -2529,7 +2529,6 @@ mwl_ext_free(struct mbuf *m) /* * If we were previously blocked by a lack of rx dma buffers * check if we now have enough to restart rx interrupt handling. - * NB: we know we are called at splvm which is above splnet. */ if (sc->sc_rxblocked && sc->sc_nrxfree > mwl_rxdmalow) { sc->sc_rxblocked = 0; From nobody Fri Oct 27 20:19:48 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SHDY06LRYz4ydPW; Fri, 27 Oct 2023 20:19: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 4SHDY05lqtz4GrQ; Fri, 27 Oct 2023 20:19:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698437988; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UXm9BRMP5nWquPOLeo6+LPdEyJ7VyNH42SiWlVcj45M=; b=B5Ptc4PTTdGoJimo8VaZsEPE+Cu0kKU2j45iJk4IKnUjMbbBAkPkgXVSTyj/DKoXanaY19 /2VI1X+c77XqP6Uy/CMz1hpEhFaxOViMn7r3bc89T1aDOV283bSMxFbiQVowCHaU/Z3eTB vKcDbFEPygYBWRQzobKdF33hyTLFBOwuBd0CmeAAv2y/VYt75hvjO3zUMY+bW5kmeNMPbG d0Ecvrsz5RXn1CCqL5KLMAUffZCeOinBvmTjieSdwqQ8ZiWrMmTkptWO4zxzNME5vBGBqu URY27icFWN65EaRkaNf8a6hs4k0zg0xQczN3dn60WC5g6qHgb5sn0LJ78TaOUw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698437988; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UXm9BRMP5nWquPOLeo6+LPdEyJ7VyNH42SiWlVcj45M=; b=NdCgNrE5AiQ1moiuyR/l0U5dvY6GkhGRBY1RkWPUUbsf55hyqm7Tpx/k25LTwI3cJKw0Pc ZRr/ziLUjRckbdsQyc6izAmHPd2HdtDxV0fsEEGz4kmyFOP38ukVeViTmJoxFP2neXMhD7 aeWWSpIH7YItjiU2wwoQNJWU9QMJ8UTvO+UbvaOKOWioNzMjl/KfkzoxNFTNBspguXglgy aADwJCjVsKkKcq85ynAcDVRulsTfmZGtYnIkBRMGjKAuFzJFVIVlc2YS2l8Q0pta8/pGYN aUDnbbjjeCSco+Eoajtkjpmy9nekVvn3sneEQi30aFs2/HnoGBhiTeWNBgBZag== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698437988; a=rsa-sha256; cv=none; b=VXnhHG7j8AGEuj/p+SQJ7gx7YKdVaWNdSX+WHm42X49M79c47aHInpthUsmrmwrNpVsDGv itsYmkKfPL1X5LTyLEfNXttA0PpYuzZMZp8maWOawPshbDVZVvI5hGHX5zac9Ru628Xgc/ LyK+fv3NiB72TR8B5MNLca5XJztrAMASFm5svPssxrDIH8jdQ76U1r+Y2dNdil+1YvNISt YWIH0XljftGt36eC/YfD8qnkuUdac07jk8x0Q0W5IjIWjQqUXUV12S8N0vM0zZbSePgiL5 mUPx025fTKWRNUXTbGU33dcLxbi17zBCTBDJD+QEIRinp5+xHb0SYLP4+2MdQQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SHDY04s2czCNp; Fri, 27 Oct 2023 20:19: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 39RKJmSE061613; Fri, 27 Oct 2023 20:19:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39RKJmfJ061610; Fri, 27 Oct 2023 20:19:48 GMT (envelope-from git) Date: Fri, 27 Oct 2023 20:19:48 GMT Message-Id: <202310272019.39RKJmfJ061610@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: f42bb99ad5f0 - main - udbp: Remove stale splnet comment List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f42bb99ad5f0b04b96c929276b5fbbdf13925285 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=f42bb99ad5f0b04b96c929276b5fbbdf13925285 commit f42bb99ad5f0b04b96c929276b5fbbdf13925285 Author: Warner Losh AuthorDate: 2023-10-27 20:12:04 +0000 Commit: Warner Losh CommitDate: 2023-10-27 20:12:04 +0000 udbp: Remove stale splnet comment netgraph no longer needs splnet. Document that we're forcing queueing. Sponsored by: Netflix --- sys/dev/usb/misc/udbp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/usb/misc/udbp.c b/sys/dev/usb/misc/udbp.c index 68caf368b683..61f77837ffbd 100644 --- a/sys/dev/usb/misc/udbp.c +++ b/sys/dev/usb/misc/udbp.c @@ -787,7 +787,7 @@ ng_udbp_connect(hook_p hook) { struct udbp_softc *sc = NG_NODE_PRIVATE(NG_HOOK_NODE(hook)); - /* probably not at splnet, force outward queueing */ + /* force outward queueing */ NG_HOOK_FORCE_QUEUE(NG_HOOK_PEER(hook)); mtx_lock(&sc->sc_mtx); From nobody Fri Oct 27 21:24:26 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SHFzZ2wVKz4xxr2; Fri, 27 Oct 2023 21:24: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 4SHFzZ2SJhz4P9C; Fri, 27 Oct 2023 21:24:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698441866; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TrQQitmqramdKu6JMb9pq2mdp+aHd/Z+54osF0DOFs4=; b=XuFEWtVfpkAvObT2FTX6rgw9x6U7o/b97EN8Ij2dtzr3LaWctfV1VPyxb2pxW1owNbYA5q 7Zs99f6YP8B0bQSTrZoizSpmyBCisQE0zk2ElPhjDsN2ZhIFE34arM+6tYJ+aEGpvL4azO Z2+bsxq+8hYQRlXiFAnyhosW6nlDPoed4NDKH3o7mFm82b+y35jYQ0ipZ5XNIysqz1YnX+ QE92ypk36v2a5sP4RXfOrnlTiuJeMMxxMwzz/TygRF7AnuCSDGRQcSEAVAPqGrZ2GQ+Mqk X+C4vljl7mZfHsAL0l18jyXbu9Au4BfOx7FGetM5w6h8Boe2shxfxtU5jlXZYg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698441866; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TrQQitmqramdKu6JMb9pq2mdp+aHd/Z+54osF0DOFs4=; b=mk8BzPxN9kOwv7L7NelknMBUbI6OBBS173AMlIMk7Gx3dhNQVOjkmMi28wQ+cNEVnnzMnL jhr9DkqPoLPP1QbU+6rE+pP/cj9JFh8e8EPp0cKo/b6q2XLP+lcrGJIi45E9RhgpWa4xKY 3Hnb1bk9DV6PCiPvcMvX7qCSPLuRCrp+mqTfbeOpuTNQ4Qf4FTtxbBbmdY9chBIabsZwNV DAANbr5ynTZ23/spQg0KDLrDjL/wQat433N++y0IHZ5XlqjvNdU0/3nhhp0bPJ9tFgr6HJ 5gr8zDctLf71BMlb9+D1RzoolYoM6A0OaaCEt8yO6jXKfaWSbgR5qN97p87Y+A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698441866; a=rsa-sha256; cv=none; b=MoI4PpQBmjslbqxEZY232npf2NOVdLN9yPEvec+MpIIXjBqsWxQqT3tQgyATbfH8X5Ng7p tY7h7fkWnTx2/uJq4Hlvi5Ub6DYQg4CPcNGqfLoN0PbllAJr2QwmzIgOW/eDcwA2gqgh5i 9joGV3thnd04rQCcDo7ybTfBf7Belb26a21r7EnJ9FuTEc10k7h4pQmwEsL0qgM8KGIvwm vc2WDtqHTCyQsO0JyIw/kj895joSKlDjVwdjE1lkrlOgpnOKA+1ItT6pVMdITzWN4d0pr6 YrRklXfhD7Yhr2Rs1dda/f+8bAcUvAHUFqyfU/MKGpqOKIGhozqGvtrW2n0vpg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SHFzZ1WRMzVrq; Fri, 27 Oct 2023 21:24: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 39RLOQUn077634; Fri, 27 Oct 2023 21:24:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39RLOQXU077631; Fri, 27 Oct 2023 21:24:26 GMT (envelope-from git) Date: Fri, 27 Oct 2023 21:24:26 GMT Message-Id: <202310272124.39RLOQXU077631@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: dbf203548b6b - main - devd: Remove obsolete / wrong nomatch examples List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: dbf203548b6b6188c290f4ef9b70c5b7c65fefea Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=dbf203548b6b6188c290f4ef9b70c5b7c65fefea commit dbf203548b6b6188c290f4ef9b70c5b7c65fefea Author: Warner Losh AuthorDate: 2023-10-27 21:23:40 +0000 Commit: Warner Losh CommitDate: 2023-10-27 21:24:19 +0000 devd: Remove obsolete / wrong nomatch examples These examples are wrong, and with devmatch, nobody would ever see them (since it's a higher priority). Sponsored by: Netflix Differential Revision: https://reviews.freebsd.org/D42325 --- sbin/devd/devd.conf | 23 ----------------------- 1 file changed, 23 deletions(-) diff --git a/sbin/devd/devd.conf b/sbin/devd/devd.conf index ea8421e76d61..d793dd296437 100644 --- a/sbin/devd/devd.conf +++ b/sbin/devd/devd.conf @@ -75,29 +75,6 @@ detach 100 { # action "sleep 2 && /usr/sbin/ath3kfw -d $device-name -f /usr/local/etc/ath3k-1.fw"; #}; -# Don't even try to second guess what to do about drivers that don't -# match here. Instead, pass it off to syslog. Commented out for the -# moment, as the pnpinfo variable isn't set in devd yet. Individual -# variables within the bus supplied pnpinfo are set. -nomatch 0 { -# action "logger Unknown device: $pnpinfo $location $bus"; -}; - -# Various logging of unknown devices. -nomatch 10 { - match "bus" "uhub[0-9]+"; - action "logger Unknown USB device: vendor $vendor product $product \ - bus $bus"; -}; - -# Some Cardbus cards don't offer numerical manufacturer/product IDs, just -# show the CIS info there. -nomatch 10 { - match "bus" "cardbus[0-9]+"; - action "logger Unknown Cardbus device: device $device class $class \ - vendor $vendor bus $bus"; -}; - # Notify all users before beginning emergency shutdown when we get # a _CRT or _HOT thermal event and we're going to power down the system # very soon. From nobody Fri Oct 27 21:24:27 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SHFzb6hkdz4xxY8; Fri, 27 Oct 2023 21:24: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 4SHFzb3vJ1z4PJp; Fri, 27 Oct 2023 21:24:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698441867; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bPKydzoZ5z/eOJ8BlOhq7DD2qxk4J/cNNDtlUABReEU=; b=lu87+o4ey30J4MznxIvdJqoKRsxj5Z22Bbs1cVOsmlT/BoUWEo2rQefG/toL4wpnlGKKpc qJbAdWzCkGkSoS90MDOlmPdr6ckGZVvevdc3iNXEyDWl0+bHcWpFPGpCmbva7eklI5Euo7 KepW8nbkF9mZ+AKuP9a1qS6neREjdI710WLLzzyA3SbHFGNtgF+dKR1bflSflFZqbf8TVP sJZf1N0utM+dvOnNNayIsvx1/LjIbx+eda4hOFmf2fWVacZIWVfZBG4853NGyJp0vWDipR DZBPBQULbzojgUu8xXtv74PYgdQ+m3S8Vyq+d3vr2Y3Ejn1o9LbEyKaYZhLlrQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698441867; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bPKydzoZ5z/eOJ8BlOhq7DD2qxk4J/cNNDtlUABReEU=; b=KiTuEdbT5Sxl7T0Lwl54dokDH/qkMDNivt262t4bscZpTMDJPg28aV6RWdnapYLLCUkdpH epHnXXiN3BnCGM9vS9+6+iZ9tDk8wLV99rR0owKRlSAf3i6cie5Y+qBRiHepiS1bRxXKtt 2XjWZUAsFZOBF/VLvDZKMSkzky2gBjr3Js+uUGgheH4jm3FbyoWDSpF5s2nrbWKdE95guB aDSbk7lCBmFfLGZt4OMuX/9hu4VYSkUYbbijC+/Hmmvj4hy5hI5ejGd53qrnS8V9YlPSlz G7qhIrGhTqz6eEN8oA4/rBpkbd0iPbpcOErpsI9rVW5AiQn/B3uI2NwadeoG4g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698441867; a=rsa-sha256; cv=none; b=nYe5RMoJK4TG4KHYw8RzICyPCkpu/nDsrX9+/2JlvkZdEJy6yQk1SwBCHyeBMg9Jkb9+XN k2uq/06zIDc5RK9IZHvK+76LIxkX5D+znVX4iZ19m58QBsc1XXQX5E6b8bjyPzHlk888pI BfOq2LERF56HSuTl3VwlpVVQmHUUhqcSVHQK/snMz72dfjKOGOrtJ8WZgHblK6lYQy3Vnx WDZIYuQBEzChXZ2o5YQ31+nisg8IrqtNOKZXohsYbEL6DAiDj04t2dLIDS3hKMnoVs7m1B R63umxoAUv3OvINY5Ws4O8ig3e7TXFAsEiSsKYZodtJrpImdBGwqaArpeUIKtA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SHFzb2kQ2zVYv; Fri, 27 Oct 2023 21:24: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 39RLORRg077675; Fri, 27 Oct 2023 21:24:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39RLORn6077672; Fri, 27 Oct 2023 21:24:27 GMT (envelope-from git) Date: Fri, 27 Oct 2023 21:24:27 GMT Message-Id: <202310272124.39RLORn6077672@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: aa7c028adbb4 - main - devd: Improve devmatch support List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: aa7c028adbb48bfb5404c567d66cab313d471cfc Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=aa7c028adbb48bfb5404c567d66cab313d471cfc commit aa7c028adbb48bfb5404c567d66cab313d471cfc Author: Warner Losh AuthorDate: 2023-10-27 21:23:47 +0000 Commit: Warner Losh CommitDate: 2023-10-27 21:24:19 +0000 devd: Improve devmatch support We know that calling devmatch will be futile if there's no plug and play information for it to match on. Avoid this generically when we see "? at +on" which happens only when the location and pnpinfo aren't provided. Don't call "service devmatch quietstart" here. We also ignore ACPI devices with a _HID of none. These also will never load a new driver, so avoid calling "service devmatch quietstart" here too. Use the more compatct "$*" instead of "'?'$_" when calling "service devmatch quietstart" since it will evaluate to the same thing. On my laptop, this eliminates 45% of the calls to devmatch. While it would be even better to integrate devmatch into devd (so we only parse linker.hints once), that will have to wait for another day as it's a bit more complex to arrange that avoiding easy to avoid calls. Sponsored by: Netflix Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D42326 --- sbin/devd/devmatch.conf | 26 ++++++++++++++++++++++---- 1 file changed, 22 insertions(+), 4 deletions(-) diff --git a/sbin/devd/devmatch.conf b/sbin/devd/devmatch.conf index 085338eabca4..a7c27857c0bd 100644 --- a/sbin/devd/devmatch.conf +++ b/sbin/devd/devmatch.conf @@ -1,14 +1,32 @@ +# Implement the run-time component of devmatch by reacting to nomatch events. + # +# Ignore those devices that can't possibly match. When there's neither a +# location, nor a pnpinfo string, we know that there's nothing devmatch can +# match on. When it's only a location, it'd debateable, but for nomatch +# events, we can't disambiguate between the two reliably. # +nomatch 101 { + match "_" " +at +on .*"; +}; # -# Example devd configuration file for automatically -# loading what modules we can based on nomatch -# events. +# Ignore ACPI devices whose _HID is none. These cannot tell us what to load, +# since 'none' is not a valid id. There's no need to call devvmatch for these either. +# +nomatch 101 { + match "_HID" "none"; + match "bus" "acpi[0-9]+"; +}; + # # Generic NOMATCH event +# +# Note: It would be better to have some internal-to-devd action that will do +# what devmatch does without re-parsing loader.hints for each invocation +# nomatch 100 { - action "service devmatch quietstart '?'$_"; + action "service devmatch quietstart $*"; }; # Add the following to devd.conf to prevent this from running: From nobody Fri Oct 27 23:41:06 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SHK1G3rTCz4y684; Fri, 27 Oct 2023 23: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 4SHK1G3GF8z4jb3; Fri, 27 Oct 2023 23: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=1698450066; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VwecQl5H/33rQ5cPFBjscY6I2VYjST/M7XaP2vSUERk=; b=GwzxAATZYAheri3EaS+LQ80WZPjuYe35jZ7anDFtiFZAkhEc1nWY5teFvt2q80Z+gXQXig ccFU0rAmwn+IOPvltFl49qbW3Ni74rDASEehSVsI9u8RiX0fIx9Lq67E3wqlGrW1kng2Xp GkbI16u1drryzJqwmg53kY6ifkav2+3pu8opbf6h6hcIdPw78O9vjY/eVQq5Cg1YMePwdv Oo9bMvTz1Liey9id1fnaasMMsqTXoE/OEzUq/JUPJyNF12Pxa1HlqCKOnG9Ddd24DaSSFy Kqfw7TLQpbk4cKR5UAM04tUtCJ/uFNIjJSxOE8RUrPstfzKUpHzFnPtWLJmyJA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698450066; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VwecQl5H/33rQ5cPFBjscY6I2VYjST/M7XaP2vSUERk=; b=C9upQt9Y0G4kDvEEV86A4IAozcdXi75erc6su/9VRfZM61SPqv9NWZXtCefxE+WKIl0uwK mK9fxVVWvhqznfKyP/wLArzjSy3kK8FmnY3a5/+/Of+kbu44C4lyP3TUWoLja0nT53MGMT wyNHFVuNhHEH//cLIBneby1/bhLTE+posHPmFY1fe6RZYKoZM6Ek5OebKgkEXQ6s/mOSgs gKPFRk/O341i4Kszfz5h/BDlnY/mU5Kxq6MjKQrtj0m3eYRg/4dhyuEUof+BHwn+a/fQfd D2ejfJxxpLCrIm+Q5IcgWb/iHao2R4xhPpIFtwJxiBFcrVGnb3z77OOsJDAjZA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698450066; a=rsa-sha256; cv=none; b=Fp18gblf0VUabff8Wq+ySBrM7VWzsO2NM/Awa7+uhkHAkzS8dXtKfrORE/kADV6bRivwX/ 8eCfJ8WlZSpTcIn8KQtirKqfB8MSU74660iRfcvK9e74q5LArKDq0ltuXhJPV5qSQp+aN/ O1YKXb+e11QPDMxPs5AawkyOQdw0tc/DnYvuvJNrXSB6EKlGSqtJDssaNw3PIZGXUZmPLA 0ndRayLQGmF02hz3ILJG8DtM0GVdKdRn4V3J1TTuCEeaTZcuKSAO5E2Py6yvkVGVw8zy9J PVKrGPZS8wxfhkso+L15hOzbfK/KbmjZSl4E8xulCntevYN2RO0PdAeUv6jOnw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SHK1G2KfSzZDj; Fri, 27 Oct 2023 23:41: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 39RNf6NP005310; Fri, 27 Oct 2023 23:41:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39RNf6et005307; Fri, 27 Oct 2023 23:41:06 GMT (envelope-from git) Date: Fri, 27 Oct 2023 23:41:06 GMT Message-Id: <202310272341.39RNf6et005307@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Navdeep Parhar Subject: git: c656f5c1a6f8 - main - Fix build with gcc12. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: np X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c656f5c1a6f8482f24a5a716267311c3e62b3114 Auto-Submitted: auto-generated The branch main has been updated by np: URL: https://cgit.FreeBSD.org/src/commit/?id=c656f5c1a6f8482f24a5a716267311c3e62b3114 commit c656f5c1a6f8482f24a5a716267311c3e62b3114 Author: Navdeep Parhar AuthorDate: 2023-10-27 23:39:12 +0000 Commit: Navdeep Parhar CommitDate: 2023-10-27 23:39:12 +0000 Fix build with gcc12. --- sys/fs/ext2fs/ext2_inode.c | 6 ++++++ sys/ufs/ffs/ffs_inode.c | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/sys/fs/ext2fs/ext2_inode.c b/sys/fs/ext2fs/ext2_inode.c index 3ab566ee53fc..2c1cf9736fb5 100644 --- a/sys/fs/ext2fs/ext2_inode.c +++ b/sys/fs/ext2fs/ext2_inode.c @@ -232,7 +232,9 @@ ext2_ind_truncate(struct vnode *vp, off_t length, int flags, struct ucred *cred, struct inode *oip; e4fs_daddr_t bn, lbn, lastiblock[EXT2_NIADDR], indir_lbn[EXT2_NIADDR]; uint32_t oldblks[EXT2_NDADDR + EXT2_NIADDR]; +#ifdef INVARIANTS uint32_t newblks[EXT2_NDADDR + EXT2_NIADDR]; +#endif struct m_ext2fs *fs; struct buf *bp; int offset, size, level; @@ -348,11 +350,15 @@ ext2_ind_truncate(struct vnode *vp, off_t length, int flags, struct ucred *cred, * when we are done. */ for (i = 0; i < EXT2_NDADDR; i++) { +#ifdef INVARIANTS newblks[i] = oip->i_db[i]; +#endif oip->i_db[i] = oldblks[i]; } for (i = 0; i < EXT2_NIADDR; i++) { +#ifdef INVARIANTS newblks[EXT2_NDADDR + i] = oip->i_ib[i]; +#endif oip->i_ib[i] = oldblks[EXT2_NDADDR + i]; } oip->i_size = osize; diff --git a/sys/ufs/ffs/ffs_inode.c b/sys/ufs/ffs/ffs_inode.c index fb6e8dfb2f76..8ecd37e694e8 100644 --- a/sys/ufs/ffs/ffs_inode.c +++ b/sys/ufs/ffs/ffs_inode.c @@ -238,7 +238,9 @@ ffs_truncate(struct vnode *vp, struct inode *ip; ufs2_daddr_t bn, lbn, lastblock, lastiblock[UFS_NIADDR]; ufs2_daddr_t indir_lbn[UFS_NIADDR], oldblks[UFS_NDADDR + UFS_NIADDR]; +#ifdef INVARIANTS ufs2_daddr_t newblks[UFS_NDADDR + UFS_NIADDR]; +#endif ufs2_daddr_t count, blocksreleased = 0, blkno; struct bufobj *bo __diagused; struct fs *fs; @@ -546,11 +548,15 @@ ffs_truncate(struct vnode *vp, * when we are done. */ for (i = 0; i < UFS_NDADDR; i++) { +#ifdef INVARIANTS newblks[i] = DIP(ip, i_db[i]); +#endif DIP_SET(ip, i_db[i], oldblks[i]); } for (i = 0; i < UFS_NIADDR; i++) { +#ifdef INVARIANTS newblks[UFS_NDADDR + i] = DIP(ip, i_ib[i]); +#endif DIP_SET(ip, i_ib[i], oldblks[UFS_NDADDR + i]); } ip->i_size = osize; From nobody Sat Oct 28 01:28:26 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SHMP71CYKz4yCcH; Sat, 28 Oct 2023 01:28: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 4SHMP70ltrz4tJD; Sat, 28 Oct 2023 01:28:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698456507; h=from:from:reply-to:subject:subject: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/A0WWRPBam81cuBjwrtMTp2rJ2XBF/xMuSFyw6xJGA=; b=CLGIfMjtbMlPqj7nkRyadBzBq1hRTSZZvxscatFl544ZRugRO/tH3PiITmMRFEm90iTXwg eeGUp2GNv4AeTI9cQGeg0raL0JbbjNRh+oBNn0+Br9kLnWyGqF0zvB3YGHpYaxMPrO/Fn0 vPAZS93dcK8Sk4Iz+PEl8QdjDvCI7Myl4Qz5U3ln+eIBLc9j9NIRqGNnheBpGFMFCar/5q tj7/l8WTEXP8tCUbKpR8llDg91S26ARQw5Mr1p3X1DDHVRKaSTE+GSa+xTPrxqpgtbieih Zsi9Yqax/O5KkRQM5vZ6/wPPbMYgdwb+X1T9cqJ5VMHsXFMpkXuACozjjPcVJQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698456507; h=from:from:reply-to:subject:subject: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/A0WWRPBam81cuBjwrtMTp2rJ2XBF/xMuSFyw6xJGA=; b=pAfYy+oZxQf5hcfMDmig0lodg5Ka8ZbkoKF+QOEO6ecPj+qHxpxbtqpxBK476xkygNaK2y EbVeVHVKuSI1AIQgUrOX+AgVoq1Fc+gkuO5MuhpJDicnhJO2azv2SMaRLIiN2c6MvJagWZ EDjYMsQufcvXRrMlZyacgO2O8YxLu0WrCoNHqm5e718jIZkWmKa6MeJEUoZPSJe8GMalO4 YgcaQMq7d6NFzMaHIEYzYG2j397m120m6tTud2lnTox80KEAv/UF+8ReBPtOms/C3cyvTP IAFc4XIS1u6qfPCMTinpXayuMPAyXr7dhgNf1+93OY98uXXdGiIblfbEmcsCOw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698456507; a=rsa-sha256; cv=none; b=uxItqN1wAyXXZFhYjomemyrNZgjpfNCEvTKEg0PMK8DVOJh8pmcwV872IbCeskXDS4gstF YWeOIPXW4+Zl/oNTod20tt8/ffU0w0AD7wdjaZb+CxR0DY5DqJTjbEOjoR2WYUtJPu93UZ 4husrvvvyVKo71rIwF3IR+tFasvzBTUe9piNwD7QR2W2y/MTEikeYD1ePG1UbqjbYpYm/g MIGaS0RR8ZdyXQqA3vEWBDWOSutxZgQhKTq2WI8QQ4vBvjiOsnJuI47aQM1EerT0wrcIND +vat1YmiXZKPxP1Jnmrcl/J98A6bRlmAnLm7SYRMqlKv5s2iizVGQ6icpjNMaw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SHMP66yKxzc3b; Sat, 28 Oct 2023 01:28: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 39S1SQW6077173; Sat, 28 Oct 2023 01:28:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39S1SQkk077170; Sat, 28 Oct 2023 01:28:26 GMT (envelope-from git) Date: Sat, 28 Oct 2023 01:28:26 GMT Message-Id: <202310280128.39S1SQkk077170@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Enji Cooper Subject: git: 8ef8da882ff4 - main - lib/libcrypt: remove trailing whitespace List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ngie X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8ef8da882ff475e3da3bde57d97593a68f7d97b2 Auto-Submitted: auto-generated The branch main has been updated by ngie: URL: https://cgit.FreeBSD.org/src/commit/?id=8ef8da882ff475e3da3bde57d97593a68f7d97b2 commit 8ef8da882ff475e3da3bde57d97593a68f7d97b2 Author: Enji Cooper AuthorDate: 2023-10-28 01:10:39 +0000 Commit: Enji Cooper CommitDate: 2023-10-28 01:28:01 +0000 lib/libcrypt: remove trailing whitespace No functional change intended. MFC after: 2 weeks --- lib/libcrypt/crypt-nthash.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/libcrypt/crypt-nthash.c b/lib/libcrypt/crypt-nthash.c index 28c832dd6f9f..8bd880e625cc 100644 --- a/lib/libcrypt/crypt-nthash.c +++ b/lib/libcrypt/crypt-nthash.c @@ -57,17 +57,17 @@ crypt_nthash(const char *pw, const char *salt __unused, char *buffer) u_char hash[MD4_SIZE]; const char *s; MD4_CTX ctx; - - bzero(unipw, sizeof(unipw)); + + bzero(unipw, sizeof(unipw)); /* convert to unicode (thanx Archie) */ unipwLen = 0; for (s = pw; unipwLen < sizeof(unipw) / 2 && *s; s++) unipw[unipwLen++] = htons(*s << 8); - + /* Compute MD4 of Unicode password */ MD4Init(&ctx); MD4Update(&ctx, (u_char *)unipw, unipwLen*sizeof(u_int16_t)); - MD4Final(hash, &ctx); + MD4Final(hash, &ctx); buffer = stpcpy(buffer, magic); *buffer++ = '$'; From nobody Sat Oct 28 01:45:39 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SHMmz2kGSz4yDYq; Sat, 28 Oct 2023 01:45: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 4SHMmz240Hz4vGr; Sat, 28 Oct 2023 01:45:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698457539; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RDH4NJV3fe/z0MvmOuxHUlcfxj0sV92Zl0tW1m3u5ik=; b=Mn1aeeN1wxvB6M2++fyTdXH678EQdntEGbWGsLrH1EhLeIrAClmKSP0kPpwaX4iaMWfXFl g2h/RdQya4/hoewK+Ude3WzMVZ+rAPC03zCFcRLZ6nbtxjSbCvZkw1XeueYduZUppkCaQZ nRXfusSlGGyWwfD7nGm3y4AcKuLv3yjWKahZySVAdNlA+CZfqaMrCFcMx1UV0ZRU4WWHEO qKOgbCnYaTFpj/ukO4Tk0CiLlAduAf26VdJXZDPKXzzYAWnNC+/E0FLK2LipR5OaVDRoXQ t3/fBzI9VAM9AgPvHccNrLBwQLcQBN2oTJrc4J7DsjkGW+Cb9WrxlxwWOsrUjg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698457539; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RDH4NJV3fe/z0MvmOuxHUlcfxj0sV92Zl0tW1m3u5ik=; b=eTNeGRmeeGgb6TTFTA1zAQC7BH9s8e325FRmjCjQnw77dHBLyL42z+gm9BFYnKAa/yDviF Syja+4ywb9pxW6z6TAneK3iaRPH8+K3TcYqpl2iJ7KhKFNl+q+5cPgQOdf8QrrgXdjcbdm Qx62W3T8cFUIC1ojpOWI7K1W4y3qO6x/BlNb0AzCJw29fEVs7ahZ5xE+Its0Bm0rP1VKGu 16eey00rqEnp7kIkZpGZD79tP+0mCEvKbtO5HN6Te5wP604ggdKbCgItxoktltaY99E76i 7NkJbiLybPvBPUDb2ITfJss4w5420xyBrP0ExBqEWAN2Ieb2dbQfYoLwiJNnaw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698457539; a=rsa-sha256; cv=none; b=y2FWNSM6oSum1ngj3CBeKYLIId92dKGZPgKDc1ilhk9RAdgbYhWRgPj8KGiWt1geZIeu+s 9ZwsGhGp9pmTgivd1AfxCsrfaAXKcOzO7/axUQAk+Bx/3ia0c1gtX/x1AQrPOkD9lod2bf c0TvwI5yK6N93d0z45Ti+dDFJJR3fNs62st+U/i4ugnPLs1PCSS/i52j8MdRIhUxdbaenQ zAJk3Xck0WA6RSGMGrBmVDmfWksHDR3feLREJVdcZs1bHlIkIv5viJNVm5+YdJ94BeFMn4 R+5bCcYSyJ97hZ1yPlEHc9t021in5u5scsUhZMRQT0nmalqfG7gtOs1MzpFPTw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SHMmz104kzd49; Sat, 28 Oct 2023 01:45: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 39S1jdxi009670; Sat, 28 Oct 2023 01:45:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39S1jd64009667; Sat, 28 Oct 2023 01:45:39 GMT (envelope-from git) Date: Sat, 28 Oct 2023 01:45:39 GMT Message-Id: <202310280145.39S1jd64009667@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: 1c1f229e9156 - main - libc: Strip plentiful trailing whitespace from aarch64+arm makecontext.c List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1c1f229e9156dd75cab5e0e3e586c5ef319d68ee Auto-Submitted: auto-generated The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=1c1f229e9156dd75cab5e0e3e586c5ef319d68ee commit 1c1f229e9156dd75cab5e0e3e586c5ef319d68ee Author: Jessica Clarke AuthorDate: 2023-10-28 01:45:06 +0000 Commit: Jessica Clarke CommitDate: 2023-10-28 01:45:06 +0000 libc: Strip plentiful trailing whitespace from aarch64+arm makecontext.c --- lib/libc/aarch64/gen/makecontext.c | 10 +++++----- lib/libc/arm/gen/makecontext.c | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/lib/libc/aarch64/gen/makecontext.c b/lib/libc/aarch64/gen/makecontext.c index ae23ad87d3a2..d4dcffa6cd6f 100644 --- a/lib/libc/aarch64/gen/makecontext.c +++ b/lib/libc/aarch64/gen/makecontext.c @@ -40,16 +40,16 @@ void _ctx_start(void); void ctx_done(ucontext_t *ucp) -{ - +{ + if (ucp->uc_link == NULL) { exit(0); - } else { + } else { setcontext((const ucontext_t *)ucp->uc_link); abort(); - } + } } - + __weak_reference(__makecontext, makecontext); void diff --git a/lib/libc/arm/gen/makecontext.c b/lib/libc/arm/gen/makecontext.c index bf24e1f741c9..1051d4e4de15 100644 --- a/lib/libc/arm/gen/makecontext.c +++ b/lib/libc/arm/gen/makecontext.c @@ -43,15 +43,15 @@ extern void _ctx_start(void); void ctx_done(ucontext_t *ucp) -{ - +{ + if (ucp->uc_link == NULL) exit(0); - else { + else { setcontext((const ucontext_t *)ucp->uc_link); abort(); - } -} + } +} __weak_reference(__makecontext, makecontext); From nobody Sat Oct 28 01:59:28 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SHN4w4rDCz4yDhg; Sat, 28 Oct 2023 01:59: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 4SHN4w4KyXz3Bnl; Sat, 28 Oct 2023 01:59:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698458368; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vcv0hTEQak8dOEDb4YDq4pj8H4GQvxap7PWStqW4ezo=; b=acvmDtxB4tByUn3qkIbgdMJYRKKXsG1ddfGdGuxAck6nZPwnAJnVLlp9p2f+UapQuQTToE OQe0BJyawOV5Y0B+G/RUQTxrREFJxe4FNntByqA3fd+LZIuvxypAlB++yOHt6RSus2zPlP V4qDLL+Ir9WQVdoraDLm3wYaVo3C6exwYaPnVUroAfC5NqgHk50a1xp9Rknd9Gp4IXo8Xy EojiePtatbYSSI9+obH7LQnjr1vjiamW+eRCfFeg/qM2Jjcx8krRUz9McQL4mwq61mj2a1 w+SaWPEkTkWRo3x/QOm0+rzjTkgodNKXoS5Ro/bBOhwCOI2n4ZHCXAYem0lF1g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698458368; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vcv0hTEQak8dOEDb4YDq4pj8H4GQvxap7PWStqW4ezo=; b=yecWx5eZl6eAPqKJhdr9UHHQugvBRokefXBCR6xvnjJryVMY4bv/6ItBAZt0J1LDm4XxMM lgaF4ZxGuds7p90lXdpWNLLayS6nH5++i6FvWtntAQ5vRYwebdqROHT3H02Gqgdo11qdAf 5gE263OuAgrEa0w4aAZFbz1ntVFzxHwqqEeYV9yrCqc0zMYxIxLvuwy5cs9nkPy3OG++Vb keLgTHfmHPMcUPgwOn+AlsUrSy0KBZ98UuJGaK63LoqV8FFBT5fsmn0WTm/vqKvG4NlSHE wnmhM8BDh39dlJZ19tRGdQ65J44s2mGtLCFm92xgg0xge5liDDmwgOondf4FzQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698458368; a=rsa-sha256; cv=none; b=DiudhJQ6+zmpeTzl80u3fo41evPmUuWdICmGfjJQ4380ENJHRUgSkktaeOR/JP5ZwCTAG5 k3UQpg3xXXYEU9nENZVkfRiQU2KQc8k6ghpeMK5X3YMf0fWo83AAS4LOyw/oQFcLJqbNme 0JhO9yV5LY1qS20mzlxR3suNW41tBAaiDKfeHKAJsnSSiP9WoIp4XdRRun5UUE+Vtcu8xD TQ010SdVDRYWp0zCbl4oydGRN30IZUBySeb+lEQl7OS8nzbK15oNPHhKqe7xmR3txnPYK6 dIAFYuyuUwjI0SC8/zawAqq5+4uRE6qCNUipbZ7CkgiP2XoaKgzRCWprrLYODQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SHN4w3JQDzdVj; Sat, 28 Oct 2023 01:59: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 39S1xSpL026489; Sat, 28 Oct 2023 01:59:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39S1xSv8026486; Sat, 28 Oct 2023 01:59:28 GMT (envelope-from git) Date: Sat, 28 Oct 2023 01:59:28 GMT Message-Id: <202310280159.39S1xSv8026486@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Enji Cooper Subject: git: 61b15e6dfc96 - main - lib/libcrypt: another trivial style change List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ngie X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 61b15e6dfc963a0c67dbaeae7f4590674976111f Auto-Submitted: auto-generated The branch main has been updated by ngie: URL: https://cgit.FreeBSD.org/src/commit/?id=61b15e6dfc963a0c67dbaeae7f4590674976111f commit 61b15e6dfc963a0c67dbaeae7f4590674976111f Author: Enji Cooper AuthorDate: 2023-10-28 01:56:41 +0000 Commit: Enji Cooper CommitDate: 2023-10-28 01:59:23 +0000 lib/libcrypt: another trivial style change Normalize on hard tabs. I didn't catch this before pushing the previous commit. No functional changes intended. MFC after: 2 weeks MFC with: 8ef8da882ff475e3da3bde57d97593a68f7d97b2 --- lib/libcrypt/crypt-nthash.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/libcrypt/crypt-nthash.c b/lib/libcrypt/crypt-nthash.c index 8bd880e625cc..cc9dbf7533cd 100644 --- a/lib/libcrypt/crypt-nthash.c +++ b/lib/libcrypt/crypt-nthash.c @@ -65,7 +65,7 @@ crypt_nthash(const char *pw, const char *salt __unused, char *buffer) unipw[unipwLen++] = htons(*s << 8); /* Compute MD4 of Unicode password */ - MD4Init(&ctx); + MD4Init(&ctx); MD4Update(&ctx, (u_char *)unipw, unipwLen*sizeof(u_int16_t)); MD4Final(hash, &ctx); From nobody Sat Oct 28 04:45:19 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SHRmH4Mnwz4yNyc; Sat, 28 Oct 2023 04:45: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 4SHRmH3mSMz3Rbx; Sat, 28 Oct 2023 04:45:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698468319; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qlgd9jVxf0PRa5f6oX8g35k8i74Ku/ZxYCT+EOUltUA=; b=skn1Ubn4tB68oU0n+ozRBJEWC/mKCUt0lZdRM/t2XqczfhSKVs/riz0RiKEN04uKFakndl C6USmiOHquk/XDSnModAAQLKrGqMjIEtG4Myq5c6ZAc0DOaiu3xVxKbX41gwzYcfMPW5ZK ft+aZTscK/NZ8tuIHjJydpNFdgoG9B0WX4MiFhYWhbRVgae84F8A+uKoymuwokGP2wCbOK vQsvP+ND/lA7Mv+CcE1X3ufVc7jeSuO70qxDjcqSeU6utenmvrTxMlz5DEk+Q8B1yrcVuV dCjGKgadqX1ghHZAaLDctm2YmhcSba9FIk1RCqrVyF0VQ/DE7qDACTIqsYYjxQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698468319; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qlgd9jVxf0PRa5f6oX8g35k8i74Ku/ZxYCT+EOUltUA=; b=L44nsP3Z3qfL+KoO/7jZ1O17SkD7vMN0gVQq6ohIK9cnOHt0u4+IzxBxHsK8E9e7UMQ/JR Ohuv+nbVnwXtPzg5HE7DB4DNnfvyIML1/NrfzrkL5o+HLRCzjbtnWisNAkG1GyTcqQOnMy a/eTTREtoR0zp7o20dgeYSsT1+fC/veFgPfsGxT1IuYrR5sJpVuS0TAQBmSUymL1Iya0YF Yr5Zfh2gaBVXS72JF56SuYGk/Kir8LogLNTHyB8LRgThN4UTw2K7U9kZ4FFHjDnuhTE4pp C8UbDRCSpX6qVN/sYEO0AnbTZDqQs+igrqiXJS/jKbVJ+YZXpGdYYPiMe8mJiA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698468319; a=rsa-sha256; cv=none; b=aRTU71n4L2fY5tihUDcOKZ5Ttp58QbjoPXUQLEUPFXGJsWk/sf2YPtBLe2yLRbP8R/ALWe TrZ0oJOm2ibfQxPf8PcQ8H8OogFVBoawfvE//bDg5fsODKWW5ZXfCFGQ13RN50IPAVtxcY nhkJllekncWia7FI2ZrV6d75q9BQMKf04DHP1embTDIcQNAJibCukXUjjm/G7meGDD1tFI iG/oKAclr2hYraFbCeAZBKoRNt++CAN42puCwnZrqIwpeOJHShN7V7O+9FC1qKJXDedpfZ 3ebAuu16bEY5rmQQf3ONuvenq/P0M///4HZeaOUHguCHNTEPX57UV0HLiwG4Aw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SHRmH2qmTzjZj; Sat, 28 Oct 2023 04:45: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 39S4jJ0U012005; Sat, 28 Oct 2023 04:45:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39S4jJGi012002; Sat, 28 Oct 2023 04:45:19 GMT (envelope-from git) Date: Sat, 28 Oct 2023 04:45:19 GMT Message-Id: <202310280445.39S4jJGi012002@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: 6ce903e8a8a7 - stable/13 - ufs quotas: fix configuring soft quota grace time List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 6ce903e8a8a78cea2b8ff269c5accbf5529e3045 Auto-Submitted: auto-generated The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=6ce903e8a8a78cea2b8ff269c5accbf5529e3045 commit 6ce903e8a8a78cea2b8ff269c5accbf5529e3045 Author: Mikel Lechner AuthorDate: 2023-10-21 06:08:38 +0000 Commit: Konstantin Belousov CommitDate: 2023-10-28 04:44:44 +0000 ufs quotas: fix configuring soft quota grace time PR: 274552 (cherry picked from commit 2fee3974603bce6f2dc153eb6af459cb4f864ab4) --- sys/ufs/ufs/ufs_quota.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/sys/ufs/ufs/ufs_quota.c b/sys/ufs/ufs/ufs_quota.c index 0119c5ba9eeb..8b53c4d2e61f 100644 --- a/sys/ufs/ufs/ufs_quota.c +++ b/sys/ufs/ufs/ufs_quota.c @@ -584,6 +584,15 @@ quotaon(struct thread *td, struct mount *mp, int type, void *fname) VN_LOCK_DSHARE(vp); VOP_UNLOCK(vp); *vpp = vp; + + /* + * Allow the getdq from getinoquota below to read the quota + * from file. + */ + UFS_LOCK(ump); + ump->um_qflags[type] &= ~QTF_CLOSING; + UFS_UNLOCK(ump); + /* * Save the credential of the process that turned on quotas. * Set up the time limits for this quota. @@ -598,13 +607,6 @@ quotaon(struct thread *td, struct mount *mp, int type, void *fname) ump->um_itime[type] = dq->dq_itime; dqrele(NULLVP, dq); } - /* - * Allow the getdq from getinoquota below to read the quota - * from file. - */ - UFS_LOCK(ump); - ump->um_qflags[type] &= ~QTF_CLOSING; - UFS_UNLOCK(ump); /* * Search vnodes associated with this mount point, * adding references to quota file being opened. From nobody Sat Oct 28 04:45:56 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SHRn033l9z4yP1x; Sat, 28 Oct 2023 04:45:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SHRn02Qtgz3Rty; Sat, 28 Oct 2023 04:45:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698468356; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/3fKB8U8bIfY53ikB7lES7KSRM8NW75H38pqj1Ikz70=; b=mtrxBMbMzCWabt5SLu7ofLrqSMtTBAurnj8yCRy1jXzKdMDFEtGjVly43F/6Kdboz6q/dd Ql6L0YdyBhEZY5+RcrdoXo3ErGSX346R+yG5NoNGfisaXLszrZvSvgxc9/vsWfa4vDuCmF DIbgEHWCsZ4EYKDVeGggUxgElfUG1s6zmT0D9QQhTUhh4fe6u1KnmDsKWgjY6oF2odUNLh PNJwd5Plqw1XFDkz58WWRlBtJbicUvmzwGk3e+7FRWBeMt+zMV9h4KqEf+tC/Bk+trzPTE o+uS3c6PobEIkiWOg/V1iT1wuV/JFPD/dvtum3NeE6nGDNK4L0pUJyYRsPHdOg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698468356; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/3fKB8U8bIfY53ikB7lES7KSRM8NW75H38pqj1Ikz70=; b=jMH8lE7IQwINqaHLCOWjw0w/GdENya7vnsfaSPOlS4SxSZwXgPhKM0fu775stfTxU2uxsJ foQ+lomFrHahC1jyPa07ZLf9F3eAI/yWG8h0+AtlWWb/k9lFudcEjA1BtjRysH1GN6yDHF TBYwTWKxUR6afNJiQaeMn/H/TTb32+pAWEFr1xBV8GuD4vwU1npbzn/HFITdirsy+rYpRe p46M0o+p2TK7QIPJXYlt1pJPkjJwln4OkepORmmjHs38x52fkEeNsWyxJgAIE1bh+FzWil mmKSl3bCoh3fOPPCFoZSRN4UujDR/Vep/DWXDOcHdWSsUDzz3akaiCDDYAldEg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698468356; a=rsa-sha256; cv=none; b=EyvF0MlhlR2PNFJ8DXlWvoMh7xilTiXAwvytHIr8wA9c0acsEgahuaplYUWtkQHDDriNLo gXfpwpf/V5p1wENNwhIngeJgf6o4FBy/rrkTatrxkrjFCiupqAulgFf30WwatPRZttK8AD T3z5XYi0EHafE/hzzhDMDk4jS74Vi7OxCl29GNkV3lN7GZA8POvKGlngByaPE4I4H96xZ3 oFxnOLGlOLKtuwIzykTeGHb9xLkNcy07qFnYdCa60fmYowXuimfUUN0iufnAAGAs68CWEa k9+MDbI76VrqcPxmd7m7MS7LOo9Thn0teWt3uuz1nrxs1qS3apt6f6TsMxImlA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SHRn01TZqzjJg; Sat, 28 Oct 2023 04:45:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39S4juL9012239; Sat, 28 Oct 2023 04:45:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39S4juG2012236; Sat, 28 Oct 2023 04:45:56 GMT (envelope-from git) Date: Sat, 28 Oct 2023 04:45:56 GMT Message-Id: <202310280445.39S4juG2012236@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: 9db5ae255127 - stable/14 - ufs quotas: fix configuring soft quota grace time List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 9db5ae255127e4b897d777d0a2fe22843644ceba Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=9db5ae255127e4b897d777d0a2fe22843644ceba commit 9db5ae255127e4b897d777d0a2fe22843644ceba Author: Mikel Lechner AuthorDate: 2023-10-21 06:08:38 +0000 Commit: Konstantin Belousov CommitDate: 2023-10-28 04:45:34 +0000 ufs quotas: fix configuring soft quota grace time MFC after: 1 week (cherry picked from commit 2fee3974603bce6f2dc153eb6af459cb4f864ab4) --- sys/ufs/ufs/ufs_quota.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/sys/ufs/ufs/ufs_quota.c b/sys/ufs/ufs/ufs_quota.c index 8f77fb3a95d2..78f539bcabd2 100644 --- a/sys/ufs/ufs/ufs_quota.c +++ b/sys/ufs/ufs/ufs_quota.c @@ -580,6 +580,15 @@ quotaon(struct thread *td, struct mount *mp, int type, void *fname, VN_LOCK_DSHARE(vp); VOP_UNLOCK(vp); *vpp = vp; + + /* + * Allow the getdq from getinoquota below to read the quota + * from file. + */ + UFS_LOCK(ump); + ump->um_qflags[type] &= ~QTF_CLOSING; + UFS_UNLOCK(ump); + /* * Save the credential of the process that turned on quotas. * Set up the time limits for this quota. @@ -594,13 +603,6 @@ quotaon(struct thread *td, struct mount *mp, int type, void *fname, ump->um_itime[type] = dq->dq_itime; dqrele(NULLVP, dq); } - /* - * Allow the getdq from getinoquota below to read the quota - * from file. - */ - UFS_LOCK(ump); - ump->um_qflags[type] &= ~QTF_CLOSING; - UFS_UNLOCK(ump); /* * Search vnodes associated with this mount point, * adding references to quota file being opened. From nobody Sat Oct 28 20:32:30 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SHrnC0CZfz4y0qP; Sat, 28 Oct 2023 20:32: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 4SHrnB6lkmz4P7H; Sat, 28 Oct 2023 20:32:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698525150; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SEYJ26h4ZaGngXZmey9uuEt9/3C0wA509Yg297jvcaI=; b=EWkclCK7Ba5xnwAEyn7h2vrYSzCQTSeP+pynpJzbbnUUrBEjldWk62eyGxfQGyVm1e9Ihb Owi22vZgelPrXJjxjwHH91JTAZ9FBgMT9A5Lt2NEx3knIflJUERzVPZ55nVnQKtpzd+2rn iecGJOWbcaVZMlhy3mRLW7T35JkaxOmgRNE9fOQmxzU33VQGyES/+7XDWJR8Urpkhb/fTH PdbwywRR7DYUpn3weSO8+Ej7tLLPX+vtfNMV1NpMDdmeJzn4TYRw9xQMVf3Grf0tJlRGyh gVFwrcHaL4MFePJ4TMrkaORuAfXNregyeaTDWxz0AFLusDZuL4HihKFcWGbaFg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698525150; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SEYJ26h4ZaGngXZmey9uuEt9/3C0wA509Yg297jvcaI=; b=kmefMgFfxisxk4iGOsLkAwA5GpwRprDCPX/gQaKEXTcUNN9HiNc5M3Wtgnq6O5L10+ErhK TksQM+83RIZMPBVA59QhVpbmYt9rrIQGN0obASD3l4ZA8d6mFE7G17b1PIwvRtDJ7pa+do fasllYS1skNlIYw3vZz0GdpjvF+vC5HQH7+Sv19nRpSMNdfAquJYqhrlmkBefwyyZ5b5j2 uDH90fjDmwjLiQDTeiXYLzVSYtGoqcQXVFbaBtIPMfcyEXNtNBEqjGF+nmqoQy9+8Ovseu uejPvXa672NhiK2Yom0MY9qH1yas/cmPvcX/nfSBuTkGRtFtP27vdkFrSz9H/A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698525150; a=rsa-sha256; cv=none; b=BSodGruzB6feN+9SXdqo3E5WZFQ1YRwRg54l0HDEjsaMmBB9FuzsF6Ojuh2NNYBpcdTKwh 2RV8htFJHD1wJ7g2oKNTWkL2ucIenskHo1ODtySHk5aK7Py6o8aoD21HOmYufs3+Suj2zJ QN0UtRYvhaKQm3ec7xSDRo7Nj5G04xoeSRTNpX1o8qlz0OQwESSs1kZzgehk01y1cFZVAu JRLpKiekug2RvK0oHkmykhw9XxPPMA0a+D3MTDvsZoHxfJBa+AdBhu3Oi6HgPENYSk23LR coRa8n87i9RGDZ0GLwY8vyH5iG61TNaWmOrRsJd25B7WIT00881D37xGOsurGg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SHrnB5nqKz18vc; Sat, 28 Oct 2023 20:32: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 39SKWUxA092460; Sat, 28 Oct 2023 20:32:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39SKWUbr092457; Sat, 28 Oct 2023 20:32:30 GMT (envelope-from git) Date: Sat, 28 Oct 2023 20:32:30 GMT Message-Id: <202310282032.39SKWUbr092457@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: 98a670cdd672 - main - isa: Postpone removal of the non-PNP driver until 15 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 98a670cdd6720da4988f902192177fa368b9f9e9 Auto-Submitted: auto-generated The branch main has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=98a670cdd6720da4988f902192177fa368b9f9e9 commit 98a670cdd6720da4988f902192177fa368b9f9e9 Author: Zhenlei Huang AuthorDate: 2023-10-28 20:31:11 +0000 Commit: Zhenlei Huang CommitDate: 2023-10-28 20:31:11 +0000 isa: Postpone removal of the non-PNP driver until 15 Reviewed by: imp MFC after: 1 day Differential Revision: https://reviews.freebsd.org/D42387 --- sys/isa/isa_common.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/isa/isa_common.c b/sys/isa/isa_common.c index 3abbff68ea02..b6f99a0922e5 100644 --- a/sys/isa/isa_common.c +++ b/sys/isa/isa_common.c @@ -570,7 +570,7 @@ isa_probe_children(device_t dev) strcmp(kern_ident, "GENERIC") == 0 && device_is_attached(child)) device_printf(child, - "non-PNP ISA device will be removed from GENERIC in FreeBSD 14.\n"); + "non-PNP ISA device will be removed from GENERIC in FreeBSD 15.\n"); } /* From nobody Sat Oct 28 21:02:17 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SHsRY5ZGbz4y1vx; Sat, 28 Oct 2023 21:02: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 4SHsRY54Skz4R9k; Sat, 28 Oct 2023 21:02:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698526937; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JhWjAUwNKTN1s8UjrKVvqq8VWFh+1EFSr64rgQ3rwKY=; b=LlzMOdyermpzdQAgZcONDJP39M3pX+7fTvZzGlSx4HBeOxLUdUcCiSC0YXTfGGZZR/HHW2 NWuUMYhGVAKbCjmvZn/jCGSn0ShEoSMCtsycC3Hgfw3kUvZevh2jp8BaARf+442w4poa98 iTUvfspzOaI9s4WruZf+L8gxzxJW5A9dscVnt0Hx4eS3O+oelXxqVSA+02K4ftM/qDYjdm 3smmdX77oYfH5UW8Py4BRGwuI1H482eghsb7dRsQyF1Fgq0cLXAz+n1dbtNhbpGcldtkrB MSzWyMPZPXaqPo47ZbXVc8zPbKuC+ph4EnXSg1Uhgq9hz4thjzhc9nNh0VXwGQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698526937; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JhWjAUwNKTN1s8UjrKVvqq8VWFh+1EFSr64rgQ3rwKY=; b=sHyEZo7TACQnbmKxkrxCCze8EBjTr4HyNrl+dUbcSN6yDk4RKdNiHdX+kj00ATbmqD2VlX L1Ztr9Jjji9HPxH93vOP/4KZVatJZ5zP02GFsnqp3i/8jJt2hVdD1UZ8JZk6ffSHCVrLJv ASzoL466D2hSw5c6symDe62uiuiROyk//nbS0Cz2yErYBBj2YdKPG8uP47P+dW8vqfS+VO H3FoA19NvEw+BoxTtRw0gPmnDjXD6RBCJtgul2MsSOIGe6EeiFq2EMfiUuyiqqsdiKHUtf dTbKx9HIgZu4HK5uDJKyf4goeusc5ZEaaDGFgBVwXJp+syCAlCmP4c/LaSXK5w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698526937; a=rsa-sha256; cv=none; b=r9pVOjhleUF8eOL5D8HFz93AndeUSZxdXBnO/Cd4aNxKoPUVlxChoxng1gICVF7ZmAMefe qE6cCkeTn7cvNVGkC/Qy2pSx/akqye578Kbz9ZV/Q0Ta2g85/HwUe8UfEry5MBMynLgoYn v3OYVy/Okb5C0MIX+OiQXquKhfCeLIu+sW9JdNYKusPoNkhkpq6x6EC6g5OAvWGImg7tyy cN1Yma6+OZCSu0PEcy3AsZ4MomKNZuZZT7FykYrcbgQHw4yVhr12KGxoYbi7GdLgo8tqMj pj3ed+EW3w2wPrFQHlMPz8COeIIQ6Np0ssvh1baVlYTnWTAksNBKqX/lOlEVzA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SHsRY47wsz1BJF; Sat, 28 Oct 2023 21:02: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 39SL2HbD040705; Sat, 28 Oct 2023 21:02:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39SL2Hqr040702; Sat, 28 Oct 2023 21:02:17 GMT (envelope-from git) Date: Sat, 28 Oct 2023 21:02:17 GMT Message-Id: <202310282102.39SL2Hqr040702@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ka Ho Ng Subject: git: 3b173281764b - main - mlx5ib: Fix ethertype to be ETH_P_IPV6 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: khng X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3b173281764ba7c02f9de0a67caa1c4eca604413 Auto-Submitted: auto-generated The branch main has been updated by khng: URL: https://cgit.FreeBSD.org/src/commit/?id=3b173281764ba7c02f9de0a67caa1c4eca604413 commit 3b173281764ba7c02f9de0a67caa1c4eca604413 Author: Ka Ho Ng AuthorDate: 2023-10-28 20:54:32 +0000 Commit: Ka Ho Ng CommitDate: 2023-10-28 20:59:05 +0000 mlx5ib: Fix ethertype to be ETH_P_IPV6 Sponsored by: Juniper Networks, Inc. MFC after: 7 days Reviewed by: ae, kib, zlei Differential Revision: https://reviews.freebsd.org/D42184 --- sys/dev/mlx5/mlx5_ib/mlx5_ib_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/mlx5/mlx5_ib/mlx5_ib_main.c b/sys/dev/mlx5/mlx5_ib/mlx5_ib_main.c index 232309f79266..1b02c8741a56 100644 --- a/sys/dev/mlx5/mlx5_ib/mlx5_ib_main.c +++ b/sys/dev/mlx5/mlx5_ib/mlx5_ib_main.c @@ -1925,7 +1925,7 @@ static int parse_flow_attr(u32 *match_c, u32 *match_v, MLX5_SET(fte_match_set_lyr_2_4, outer_headers_c, ethertype, 0xffff); MLX5_SET(fte_match_set_lyr_2_4, outer_headers_v, - ethertype, IPPROTO_IPV6); + ethertype, ETH_P_IPV6); memcpy(MLX5_ADDR_OF(fte_match_set_lyr_2_4, outer_headers_c, src_ipv4_src_ipv6.ipv6_layout.ipv6), From nobody Sat Oct 28 21:02:18 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SHsRb068jz4y2cb; Sat, 28 Oct 2023 21:02: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 4SHsRZ6TDGz4RCn; Sat, 28 Oct 2023 21:02:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698526938; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HffRY6NrXcNu189za1MOxF58odKzrRsBqDTLnGghLXk=; b=MfWVCyaNudUSDFTholtkTKBkWlmIlSkx3F37E10Z5qY9MNYfb+972QmTQhsdjNAHmqrGDj sGnSA0+BxbO6IIA65aeX/FbUJoNbP5JkWXaz+F8tnkpt+GJaJy878Dx3XShLeseQL7ZCpi blDxnzMBedMgCFexfNKQV/43593gYTKhZMlU8zf+7Socb7UqGNo4Cfkn1JAxEbnXmdxtmy +gpual61iKyv+x2MQWlmb8OIajV8V5zT8gDMXTYgLlAH8cmtU/aaI2k9OllUsHRpn0A4Yf REDGbksn1MS8Cj7fSttcGDnwofzVQH65xqKyVS3Dh/fjCyPQiVLD2t61r7YKSw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698526938; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HffRY6NrXcNu189za1MOxF58odKzrRsBqDTLnGghLXk=; b=ntpl30Cj88CKYxXLfGOG3yeRCo0hC1XPffDhyQo57aIQ0lgpdi08hGiYRCmroQfyy2yzmT G0G9UcrYB4TW7FDURhdvAed+SVmVvCnhkjCgiEAbZvjnbs4uA/Mr4iYrvRABK9cYGFrfNR LnC/+uN4iZ5IxTs/HC5tohXUQ1MWtzBB4h/MfpShd0smpcZfZeSXEWeemZV2s0ZP9xJWKI X3YgpYcJbUDcxripsxWCHjOVOgKhefjVcbXEpfs0KBpS5UVJICgLdBa9PUnJPY26zzqwpf v6ivataZuB7dDIo0B1hQhrpFnSFhG06calIrKPiGcsF622Qvq1odWg7nIZX3rw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698526938; a=rsa-sha256; cv=none; b=fT0G4zDNjeFVDPTBC2NRHUCgg+sHlrUD5qnInD9QvIjqSUDszwiZrwrf8EU2pgEBRtYPJU XQvqeOaTCDWA0wSLF2d93GKWSoiPw1wfYWh2feo40ncrAxcsYu/1zhNOfXAQETXG7MH2IT RarzRZA26+EY00J5vX0Ko4zehPpUE3dsRyqPbS6PznsNxlf7qH5iLPOkbT5LEkgWBS36Tu GCNh70acP+rV3Q4RuWQi/tNWRjV2WuHlsi81TdB1g9ZgdoysH9V64+xEHdLs/GwfovTgLp Ekju2t6994Z+NQCDuAw2BIIDgHq5D36s+l3GlTrxay4Dh0IIjYDb06+hBUopeg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SHsRZ5SNTz1B9R; Sat, 28 Oct 2023 21:02: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 39SL2IRo040771; Sat, 28 Oct 2023 21:02:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39SL2Ixv040768; Sat, 28 Oct 2023 21:02:18 GMT (envelope-from git) Date: Sat, 28 Oct 2023 21:02:18 GMT Message-Id: <202310282102.39SL2Ixv040768@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ka Ho Ng Subject: git: 813d981e1e78 - main - mlx5ib: Fix RSS Toeplitz setup to be aligned with the HW specification List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: khng X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 813d981e1e78daffde4b2a05df35d054fcb4343f Auto-Submitted: auto-generated The branch main has been updated by khng: URL: https://cgit.FreeBSD.org/src/commit/?id=813d981e1e78daffde4b2a05df35d054fcb4343f commit 813d981e1e78daffde4b2a05df35d054fcb4343f Author: Yishai Hadas AuthorDate: 2023-10-28 20:55:47 +0000 Commit: Ka Ho Ng CommitDate: 2023-10-28 20:59:09 +0000 mlx5ib: Fix RSS Toeplitz setup to be aligned with the HW specification The specification for the Toeplitz function doesn't require to set the key explicitly to be symmetric. In case a symmetric functionality is required a symmetric key can be simply used. Wrongly forcing the algorithm to symmetric causes the wrong packet distribution and a performance degradation. Link: https://lore.kernel.org/r/20190723065733.4899-7-leon@kernel.org Fixes: 28d6137008b2 ("IB/mlx5: Add RSS QP support") Signed-off-by: Yishai Hadas Reviewed-by: Alex Vainman Signed-off-by: Leon Romanovsky Signed-off-by: Jason Gunthorpe [khng: cherry-picked from Linux b7165bd0d6cbb93732559be6ea8774653b204480] Sponsored by: Juniper Networks, Inc. MFC after: 7 days Reviewed by: kib, zlei Differential Revision: https://reviews.freebsd.org/D42178 --- sys/dev/mlx5/mlx5_ib/mlx5_ib_qp.c | 1 - 1 file changed, 1 deletion(-) diff --git a/sys/dev/mlx5/mlx5_ib/mlx5_ib_qp.c b/sys/dev/mlx5/mlx5_ib/mlx5_ib_qp.c index 08e73a6dedd8..a504f1ff1788 100644 --- a/sys/dev/mlx5/mlx5_ib/mlx5_ib_qp.c +++ b/sys/dev/mlx5/mlx5_ib/mlx5_ib_qp.c @@ -1449,7 +1449,6 @@ static int create_rss_raw_qp_tir(struct mlx5_ib_dev *dev, struct mlx5_ib_qp *qp, } MLX5_SET(tirc, tirc, rx_hash_fn, MLX5_RX_HASH_FUNC_TOEPLITZ); - MLX5_SET(tirc, tirc, rx_hash_symmetric, 1); memcpy(rss_key, ucmd.rx_hash_key, len); break; } From nobody Sat Oct 28 21:02:19 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SHsRc1HzHz4y2cv; Sat, 28 Oct 2023 21:02: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 4SHsRc0SfCz4Qx7; Sat, 28 Oct 2023 21:02:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698526940; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ww23hxKu9Ck2eXSrjwJuENSj+1sKjEt37cmGLzXLn4k=; b=XNQ0eIWEwPlQbOR6wTkSl0rTCB2jCy3qmWdQFIyFYabB3QqloDlAEb48qwLyINh9Q1/CZ+ PRljn3afSnun9na676yZbe8vCFwNx5L/XjHX5tC8xZRijWLP0VfGdSyFm8dBzhykLjtUx7 DdpK58PTQWdEywss/QhplCxpwq+h24rrS3/i7cJbSyxG0xnJKU5sHYWKwCooBgaaA+vMHN gi3H1KgfNPxYlOZzE2WSdhj92PSeJWe0ClCWJuTEif00/quRkPdBAoIy1HHUB6c7AkfDKT Bwj6kCJCMq82YlPXWK+V+wJNvZTBIhc7BLJ8CMPCVMerRMYgbGWBQYgmVYDgEA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698526940; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ww23hxKu9Ck2eXSrjwJuENSj+1sKjEt37cmGLzXLn4k=; b=wxqryAnsrgbX7Ii0eHyRDrpZPgarElzkjdwV7ah1kOYExEPR1RgABY4R/UC+z2FfUT+xho n3mafAP7Y7nw1gXaaw1NNM4LrsGwQHntyRCywoTnOKUjAN7w7X5+rEyth4T02+XszZjy1c qUNsSzYclVhLaM2uU+XSK9vBP9fvDDQQydgHTYDzVdI2SqacvTbQxrb4AC8cwLAN5WQEGv W062TbcsZbncUiWnfr4p3KWWWfDDoO/5jQHyl+Q3klTgIx7/K1ypoBgBqC0q5vG9eJFaz0 MvQv+dKUMwX0SIQM27f7KRx/YT24CB8BWWzuaYLd0h6eT7GfWBvoFBEz8hat/A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698526940; a=rsa-sha256; cv=none; b=B0HB3BvFJdHAkI3s7aJGUZP0jJ41xUmAOtrEnK3xOfWDgysYFYngWnGRRxdBJTuk7v5EHS TYqrqJeT2HwYNpDbE/b+2CwReYLzDSHGtiZXP5wh5dRRY7rd31QkMFQHga/NO0xnOsxBjM Da5oye0E8plYGM49l+lEpoAztnJPf5H+A/WQvJ9NK0bKV2v6jylYYm0dn2ESWDyeypMK99 xmtyYxEidL/70nKB4+o6GV0T7HNfj3D+vWSsQmpRon3DWH7CqlFirF5IyJisE3YBQD11l8 Nfrbcn0ymwvLuI/M6ZHRGEJEMWpAnXS1GfWrbQXen74FLZZXV9lTfg3F8vRJbg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SHsRb5v28z19t2; Sat, 28 Oct 2023 21:02: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 39SL2JIV040830; Sat, 28 Oct 2023 21:02:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39SL2JIi040826; Sat, 28 Oct 2023 21:02:19 GMT (envelope-from git) Date: Sat, 28 Oct 2023 21:02:19 GMT Message-Id: <202310282102.39SL2JIi040826@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ka Ho Ng Subject: git: a69b6af2024f - main - ibcore: Introduce enum ib_raw_packet_caps from Linux 4.11 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: khng X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a69b6af2024fdd501b4bbc674092fb2b6d466364 Auto-Submitted: auto-generated The branch main has been updated by khng: URL: https://cgit.FreeBSD.org/src/commit/?id=a69b6af2024fdd501b4bbc674092fb2b6d466364 commit a69b6af2024fdd501b4bbc674092fb2b6d466364 Author: Ka Ho Ng AuthorDate: 2023-10-28 20:57:49 +0000 Commit: Ka Ho Ng CommitDate: 2023-10-28 20:59:14 +0000 ibcore: Introduce enum ib_raw_packet_caps from Linux 4.11 This enum also exists as enum ibv_raw_packet_caps in libibverbs/verbs.h. [khng: cherry-picked from Linux ebaaee253ad3a3c573ab7d3d77e849056bdfa9ea] Sponsored by: Juniper Networks, Inc. MFC after: 7 days Reviewed by: kib, zlei Differential Revision: https://reviews.freebsd.org/D42177 --- sys/ofed/include/rdma/ib_verbs.h | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/sys/ofed/include/rdma/ib_verbs.h b/sys/ofed/include/rdma/ib_verbs.h index 406e1bc4d570..78aa0af4fa2b 100644 --- a/sys/ofed/include/rdma/ib_verbs.h +++ b/sys/ofed/include/rdma/ib_verbs.h @@ -226,6 +226,7 @@ enum ib_device_cap_flags { IB_DEVICE_MEM_WINDOW_TYPE_2A = (1 << 23), IB_DEVICE_MEM_WINDOW_TYPE_2B = (1 << 24), IB_DEVICE_RC_IP_CSUM = (1 << 25), + /* Deprecated. Please use IB_RAW_PACKET_CAP_IP_CSUM. */ IB_DEVICE_RAW_IP_CSUM = (1 << 26), /* * Devices should set IB_DEVICE_CROSS_CHANNEL if they @@ -239,6 +240,7 @@ enum ib_device_cap_flags { IB_DEVICE_ON_DEMAND_PAGING = (1ULL << 31), IB_DEVICE_SG_GAPS_REG = (1ULL << 32), IB_DEVICE_VIRTUAL_FUNCTION = (1ULL << 33), + /* Deprecated. Please use IB_RAW_PACKET_CAP_SCATTER_FCS. */ IB_DEVICE_RAW_SCATTER_FCS = (1ULL << 34), IB_DEVICE_KNOWSEPOCH = (1ULL << 35), }; @@ -1493,6 +1495,18 @@ struct ib_srq { } ext; }; +enum ib_raw_packet_caps { + /* Strip cvlan from incoming packet and report it in the matching work + * completion is supported. + */ + IB_RAW_PACKET_CAP_CVLAN_STRIPPING = (1 << 0), + /* Scatter FCS field of an incoming packet to host memory is supported. + */ + IB_RAW_PACKET_CAP_SCATTER_FCS = (1 << 1), + /* Checksum offloads are supported (for both send and receive). */ + IB_RAW_PACKET_CAP_IP_CSUM = (1 << 2), +}; + enum ib_wq_type { IB_WQT_RQ }; From nobody Sat Oct 28 21:11:11 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SHsdq49ZNz4y2pK; Sat, 28 Oct 2023 21:11: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 4SHsdq2TsSz4SWY; Sat, 28 Oct 2023 21:11:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698527471; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5k1rmCHHZLM2kUerXudgxyPjqgA6rR5XCJXf2VJCXCU=; b=BxuZyTA73Wnf3Q6stCoe2el+FR/MQ6LOCw1fw9XMJTgKirtiu5SG8Y9tWTq7rKF+UYYSH0 rIJ12CekT7066JHWwsChFqA64/QfHaGy5p+YpoBB+FjdVfJFB/K9HGIjm4R2p4eTXO1K0y mDDxRM0VAxn2UAMIsNs8krA1NF2qdRfOfM3A2jniAtIJRqIPRoqdmBoeK5AttNR8YElmtZ Xbt0wjfbF7zrUwBPP/l/X/uSSsNiokmF7FE5aEF6cmT7VZ6+jPYpFlSRmEHHtW/qNUV606 yVtFnhGriH93DiHdIRPfDPKRFNWUYpyItT1BnGelJx6b0x5yNnotZoWpsd92gQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698527471; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5k1rmCHHZLM2kUerXudgxyPjqgA6rR5XCJXf2VJCXCU=; b=m9NAYTtRQZjlgsYg1ueOA9PDZGXJts4rG1bmFmknK6GDtuMaC4DI6Dh+LO1uBlmPnsQNyS HLwaPdLIy1//NezaJe17VSkT8g4e9Pzy4nH8IeISvqylHRpjR70ZUCTm9D2pHvyyNW7+IH xmmbTC7qAJn0fu1e6lZBlFSo7dfd8sGsohBv0C3Ba8OeSYlFUgs22CjF1TPzhL9y0FqGVa DTsUjIOyJ+OoVKmXSRTdLLCW7yuMP+SrrA7YorVoGFPWtb9c2Y+0yGvBTZoYQaZLLeZEIm mf4R1nXbfZBfX01DM5CCFHoMvJ8KsJh3IuDznKKwjlo1mnR4X2h72t0VNltOxA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698527471; a=rsa-sha256; cv=none; b=r/flbr7e49tiu+AdZcEzVgUbJSg0qutC9yW2KwnyA2f6MTO78cd5B8wFlcUXPNb6iOIbj9 gQ6Xojv/v5PxFdnuCr/bvD60/RlYmBdVEXofj0V9XSwpoxiPPD/jBL/UnsyfqBuTqkBtfV FjzDlbY1zpA0hfJqjHmseSysi1z4rmJb2B3BhZLPg2HiRBFJ5dDHgi+zVGah0wksDRJz8w pVG6ApeAVl2Aof1BJyrFl6+JaEf5t7mdTy7Q7fAvXFFbXR3r0FvDUp8MpIRVtxivDi5hJ/ e3jCKQ8Cau7esS5bPvydHzwYosY1jqS14plF9dnfTfl8RbBeADbtig16Pib/8Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SHsdq1YXqz1BJS; Sat, 28 Oct 2023 21:11: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 39SLBB06055583; Sat, 28 Oct 2023 21:11:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39SLBB8X055580; Sat, 28 Oct 2023 21:11:11 GMT (envelope-from git) Date: Sat, 28 Oct 2023 21:11:11 GMT Message-Id: <202310282111.39SLBB8X055580@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kirk McKusick Subject: git: 0bd8274c8529 - stable/14 - Fix a bug in fsck_ffs(8) triggered by corrupted filesystems. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mckusick X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 0bd8274c8529145fb1cba77b538291545cd34c39 Auto-Submitted: auto-generated The branch stable/14 has been updated by mckusick: URL: https://cgit.FreeBSD.org/src/commit/?id=0bd8274c8529145fb1cba77b538291545cd34c39 commit 0bd8274c8529145fb1cba77b538291545cd34c39 Author: Kirk McKusick AuthorDate: 2023-10-20 22:14:46 +0000 Commit: Kirk McKusick CommitDate: 2023-10-28 21:09:36 +0000 Fix a bug in fsck_ffs(8) triggered by corrupted filesystems. Reported-by: Andreas Bock PR: 274404 (cherry picked from commit 1e39a0886e0999520a7e7136e3f7d09e9cd9a5f2) --- sbin/fsck_ffs/setup.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sbin/fsck_ffs/setup.c b/sbin/fsck_ffs/setup.c index 49e89f9221b0..d1d09d07b43a 100644 --- a/sbin/fsck_ffs/setup.c +++ b/sbin/fsck_ffs/setup.c @@ -299,6 +299,8 @@ checksnapinfo(struct inode *snapip) size = fragroundup(fs, DIP(snapip->i_dp, di_size) - lblktosize(fs, lbn)); bp = getdatablk(idesc.id_parent, size, BT_DATA); + if (bp->b_errs != 0) + return (0); snapblklist = (daddr_t *)bp->b_un.b_buf; /* * snapblklist[0] is the size of the list From nobody Sat Oct 28 21:15:01 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SHskF2mPdz4y35H; Sat, 28 Oct 2023 21:15:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SHskF2H4hz4TFl; Sat, 28 Oct 2023 21:15:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698527701; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DupY1EfyTwFGvE2dRATduGXmJ+MyWLBGvxnY+u/OILE=; b=pzPhL9ZMtQxcV7kiDJHwxcKTnPr54lx1W7G46pwqoWuZ86FMGdGNxIOGDO6BixG5GquM+o L0nz+QmeFhhjCe13JFPLnSwLlpFKWRUze0axpRq+h05BjoJc0vxSKUvOKoKqG1ztmdi54+ Jko0KzBnNrmkAEJeQaADbd2iAffjKXnwHM+dfXou3m+va7/HUjNJocJWFjJoGOwtCoyqe+ VQQkb/w1TdYAn8R50wHO2i8zKGjGtppKPSFAOjmhhsGahYJLl8Q5Z7lIkS0wSdkaMLkv5V ktqoUJXK+mkD1br4lGlbkzA4eR6c+l/Fz6OyiMM0QVFkBbWveUqAYtigwHYoeg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698527701; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DupY1EfyTwFGvE2dRATduGXmJ+MyWLBGvxnY+u/OILE=; b=cJNH3oFqhXHiGZOeSby7DsWBWIoXCnhtDi3xAFp/1tqUjGznr9VCn1Ydw7MKv+sacLN6pu dktbbPHrXtcrCLrDFbE24n35NOT71/XqT6AIdB4vong7yzmrEpTJTKwVKri96x/UCwfPXn AlWNw44XusIKeLlBGjh9VjOgLia6XlE4QmzPe44D69Gbn5sWSR/pJyfK3ax8ngYbc0Yrr2 nGyX9XPUJF5q7c2cwVq13UIvXCtcTrtkANHCILVaLN3rH5+k0eiXzgQWxZ0TRCskGMfdOq DtIGekiZflV6PgwqWtCVMO4BWpCqpV6I96t8w6t8jirwz7Myu6MPyDIkkqVfAA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698527701; a=rsa-sha256; cv=none; b=T+EbCr3y9evhNpS9WhM4FG1VQsDi79t6B2MxrOEhblVdecMs+RBe+1Bk+vMdJY5OLb1qnN L9OPuCDlIM74g8EE2SO7JFAe3j2LnASR9TFc45okMLNCoGPtv+cSCk9bCtsWY6+tHSmsIo xCxiiJ4BReai2kJpxUrOqxJLDFyHW5UAhVaWej/8lNkXVTBPHn76q7KXgA4MXXY8Jji3zO /DEVXI8z+eiDLw0eZ38tp4By0KxNTYxI7NIkODIMf4zJRoxVpS00kit9XI2ih+AE9HvHxU 6rrl6bse16yNLY5Fe08Wyao61YjzhqChUWuya2KJSBPZUpkE0/KcwXry5SIOzA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SHskF1M1Dz19tv; Sat, 28 Oct 2023 21:15:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39SLF1bc061051; Sat, 28 Oct 2023 21:15:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39SLF1fs061048; Sat, 28 Oct 2023 21:15:01 GMT (envelope-from git) Date: Sat, 28 Oct 2023 21:15:01 GMT Message-Id: <202310282115.39SLF1fs061048@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kirk McKusick Subject: git: b08c5c8acf1e - stable/13 - Fix a bug in fsck_ffs(8) triggered by corrupted filesystems. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mckusick X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: b08c5c8acf1e85bd719cc1f65a304948ae39bc4f Auto-Submitted: auto-generated The branch stable/13 has been updated by mckusick: URL: https://cgit.FreeBSD.org/src/commit/?id=b08c5c8acf1e85bd719cc1f65a304948ae39bc4f commit b08c5c8acf1e85bd719cc1f65a304948ae39bc4f Author: Kirk McKusick AuthorDate: 2023-10-20 22:14:46 +0000 Commit: Kirk McKusick CommitDate: 2023-10-28 21:14:32 +0000 Fix a bug in fsck_ffs(8) triggered by corrupted filesystems. Reported-by: Andreas Bock PR: 274404 (cherry picked from commit 1e39a0886e0999520a7e7136e3f7d09e9cd9a5f2) --- sbin/fsck_ffs/setup.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sbin/fsck_ffs/setup.c b/sbin/fsck_ffs/setup.c index d33311c79250..4584456d8a64 100644 --- a/sbin/fsck_ffs/setup.c +++ b/sbin/fsck_ffs/setup.c @@ -318,6 +318,8 @@ checksnapinfo(struct inode *snapip) size = fragroundup(fs, DIP(snapip->i_dp, di_size) - lblktosize(fs, lbn)); bp = getdatablk(idesc.id_parent, size, BT_DATA); + if (bp->b_errs != 0) + return (0); snapblklist = (daddr_t *)bp->b_un.b_buf; /* * snapblklist[0] is the size of the list